[100301] trunk/dports/science/gnuradio

[michaelld at macports.org]

Revision: 100301
          https://trac.macports.org/changeset/100301
Author:   michaelld at macports.org
Date:     2012-12-07 12:43:08 -0800 (Fri, 07 Dec 2012)
Log Message:
-----------
gnuradio : patch the CMake scripts to allow us to set where Python files are installed; remove the post-destroot code that did this, since it is no longer used.

Modified Paths:
--------------
    trunk/dports/science/gnuradio/Portfile

Added Paths:
-----------
    trunk/dports/science/gnuradio/files/patch-GrPython.diff

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2012-12-07 16:52:29 UTC (rev 100300)
+++ trunk/dports/science/gnuradio/Portfile	2012-12-07 20:43:08 UTC (rev 100301)
@@ -22,6 +22,7 @@
         This port is kept up with the GNU Radio release, which is typically updated every few months.
 
     version			3.6.2
+    revision        1
 
     conflicts       gnuradio-next gnuradio-devel
 
@@ -34,9 +35,13 @@
         sha256  4ce84bf9c6591b5ddc2c384e03e40fc2f0cb8cd1add485ee2d6f26052cc6de35
 
     if {${configure.compiler} == "clang"} {
-        patchfiles patch-clang.diff
+        patchfiles-append patch-clang.diff
     }
 
+    # allow us to set where the Python files end up
+
+    patchfiles-append patch-GrPython.diff
+
     post-configure {
 
         # make sure the build depends on the local version of GRUEL,
@@ -97,6 +102,11 @@
     git.url             git://gnuradio.org/gnuradio.git
     git.branch          583ba9b96ce3c3e52173cd847a0c00ff10c1cf85
 
+    # disable control port for now, since ZEROC ICE does not seem to
+    # work correctly yet, and it is integrated into the top block.
+
+    configure.args-append -DENABLE_GR_CTRLPORT=OFF
+
     post-configure {
 
         # make sure the build depends on the local version of GRUEL,
@@ -225,21 +235,6 @@
                     port:py${s}-wxpython-devel
 
             }
-
-            post-destroot {
-
-                if {[variant_isset swig]} {
-                    if {[file exists ${destroot}${prefix}/lib/python${v}/site-packages]} {
-                        # move python scripts from
-                        # ${prefix}/lib/python${v}/site-packages/* to
-                        # ${frameworks_dir}/Python.framework/Versions/${v}/
-                        #   lib/python${v}/site-packages/*
-
-                        xinstall -m 755 -d ${destroot}${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}
-                        move ${destroot}${prefix}/lib/python${v}/site-packages ${destroot}${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}
-                    }
-                }
-            }
         }
     }]
 }

Added: trunk/dports/science/gnuradio/files/patch-GrPython.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-GrPython.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-GrPython.diff	2012-12-07 20:43:08 UTC (rev 100301)
@@ -0,0 +1,16 @@
+--- cmake/Modules/GrPython.cmake.orig	2012-12-07 14:23:33.000000000 -0500
++++ cmake/Modules/GrPython.cmake	2012-12-07 14:25:36.000000000 -0500
+@@ -96,11 +96,13 @@
+ ########################################################################
+ # Sets the python installation directory GR_PYTHON_DIR
+ ########################################################################
++if(NOT DEFINED GR_PYTHON_DIR)
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
+ from distutils import sysconfig
+ print sysconfig.get_python_lib(plat_specific=True, prefix='')
+ " OUTPUT_VARIABLE GR_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
++endif()
+ file(TO_CMAKE_PATH ${GR_PYTHON_DIR} GR_PYTHON_DIR)
+ 
+ ########################################################################
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121207/e7e7f109/attachment.html>