[101286] trunk/dports/science/gnuradio/Portfile

[michaelld at macports.org]

Revision: 101286
          https://trac.macports.org/changeset/101286
Author:   michaelld at macports.org
Date:     2013-01-07 08:44:12 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
gnuradio : upgrade devel and next to latest.

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

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2013-01-07 16:41:55 UTC (rev 101285)
+++ trunk/dports/science/gnuradio/Portfile	2013-01-07 16:44:12 UTC (rev 101286)
@@ -42,18 +42,6 @@
 
     patchfiles-append patch-GrPython.diff
 
-    post-configure {
-
-        # make sure the build depends on the local version of GRUEL,
-        # not any already-installed version
-
-        if {[file exists ${prefix}/include/gruel/api.h]} {
-            foreach fixfile [exec find ${build.dir} -name "build\.make"] {
-                reinplace "s|${prefix}/include/gruel/|${worksrcpath}/gruel/src/include/gruel/|g" ${fixfile}
-            }
-        }
-    }
-
     livecheck.type  regex
     livecheck.url	http://gnuradio.org/releases/gnuradio/?C=M&O=D
     livecheck.regex gnuradio-(\[0-9\.\]+\[0-9\])\\.
@@ -65,26 +53,14 @@
     long_description    ${description}: \
         This port is kept up with the GNU Radio GIT Master branch, which is typically updated every few days to week.  This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.  Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
 
-    version             3.6.3_20121215
+    version             3.6.3_20130107
 
     conflicts           gnuradio gnuradio-next
 
     fetch.type          git
     git.url             git://gnuradio.org/gnuradio.git
-    git.branch          6f7a9120c08badd42175737faaa896d001073fad
+    git.branch          77884c6bb837464b04031e94007c52e9323b005d
 
-    post-configure {
-
-        # make sure the build depends on the local version of GRUEL,
-        # not any already-installed version
-
-        if {[file exists ${prefix}/include/gruel/api.h]} {
-            foreach fixfile [exec find ${build.dir} -name "build\.make"] {
-                reinplace "s|${prefix}/include/gruel/|${worksrcpath}/gruel/src/include/gruel/|g" ${fixfile}
-            }
-        }
-    }
-
     livecheck.type      none
 
 }
@@ -94,29 +70,25 @@
     long_description    ${description}: \
         This port is kept up with the GNU Radio GIT Next branch, which is typically updated every few days to week.  This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.  Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
 
-    version             3.7.0_20121215
+    version             3.7.0_20130107
 
     conflicts           gnuradio gnuradio-devel
 
     fetch.type          git
     git.url             git://gnuradio.org/gnuradio.git
-    git.branch          0ddcb66881a7cd6e31be0e470097a79da1257be1
+    git.branch          a5dcd13eee561f74715ea537ec93dabfcc24039b
 
-    # disable control port for now, since ZEROC ICE does not seem to
-    # work correctly yet, and it is integrated into the top block.
+    variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {}
 
-    configure.args-append -DENABLE_GR_CTRLPORT=OFF
+    if {[variant_isset ctrlport]} {
 
-    post-configure {
+        depends_lib-append port:zeroc-ice34
+        configure.args-append -DENABLE_GR_CTRLPORT=ON
 
-        # make sure the build depends on the local version of GRUEL,
-        # not any already-installed version
+    } else {
 
-        if {[file exists ${prefix}/include/gruel/api.h]} {
-            foreach fixfile [exec find ${build.dir} -name "build\.make"] {
-                reinplace "s|${prefix}/include/gruel/|${worksrcpath}/gruel/src/include/gruel/|g" ${fixfile}
-            }
-        }
+        configure.args-append -DENABLE_GR_CTRLPORT=OFF
+
     }
 
     livecheck.type      none
@@ -163,7 +135,7 @@
 
 variant full \
     requires docs grc qtgui wxgui uhd orc wavelet jack portaudio swig sdl \
-    description {Enable all variants except python} {}
+    description {Enable all variants except python (and, for next, ctrlport)} {}
 
 # set Python variants
 
@@ -235,6 +207,13 @@
                     port:py${s}-wxpython-devel
 
             }
+
+            if {[variant_exists ctrlport] && \
+                    [variant_isset ctrlport]} {
+
+                depends_lib-append port:py${s}-zeroc-ice34
+
+            }
         }
     }]
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130107/46f50046/attachment.html>