Revision: 107525 https://trac.macports.org/changeset/107525 Author: michaelld@macports.org Date: 2013-07-01 19:24:18 -0700 (Mon, 01 Jul 2013) Log Message: ----------- gnuradio: * whitespace: tabs -> spaces; * with the 3.7 release, create gnuradio-legacy for the last 3.6 API release; * update gnuradio to 3.7.0; * update devel to the master branch; * update next (back) to the next branch; * remove patch that was fixed upstream. Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile Removed Paths: ------------- trunk/dports/science/gnuradio/files/patch-no-as-needed-revert.diff Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2013-07-02 01:13:34 UTC (rev 107524) +++ trunk/dports/science/gnuradio/Portfile 2013-07-02 02:24:18 UTC (rev 107525) @@ -6,11 +6,11 @@ PortGroup active_variants 1.1 name gnuradio -maintainers michaelld openmaintainer +maintainers michaelld openmaintainer -description GNU Radio Software Defined Radio (SDR) +description GNU Radio Software Defined Radio (SDR) -categories science comms +categories science comms homepage http://gnuradio.org/ license GPL-3 platforms darwin macosx @@ -19,68 +19,86 @@ if {${subport} == ${name}} { + version 3.7.0 + long_description ${description}: \ - This port is kept up with the GNU Radio release, which is typically updated every few months. + This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months. - version 3.6.5 + conflicts gnuradio-legacy gnuradio-next gnuradio-devel - conflicts gnuradio-next gnuradio-devel - master_sites.mirror_subdir gnuradio - distname gnuradio-${version} - master_sites http://gnuradio.org/releases/gnuradio gnu + distname gnuradio-${version} + master_sites http://gnuradio.org/releases/gnuradio gnu checksums \ - rmd160 b92dad1aab39ad2f76657036ed0ca4e83b03864f \ - sha256 fef4760758d5991ca43c0c5da25bcd2773165499a842638834842d19b07a0546 + rmd160 6b899929b072edf6c3784efbff5836531c558f6a \ + sha256 c18e12f119df5ea49ea2ed8ccde3b13043d9c4adfbbb28ac3f15122c91e646a5 - livecheck.url http://gnuradio.org/releases/gnuradio/?C=M&O=D + livecheck.url http://gnuradio.org/releases/gnuradio/?C=M&O=D livecheck.regex >LATEST-IS-(\[^<\]*)< } +subport gnuradio-legacy { + + version 3.6.5.1 + + long_description ${description}: \ + This port is for GNU Radio ${version}, reflecting the final release in the 3.6 API series. It is for legacy purposes only\; please consider updating your code to the GNU Radio 3.7 API. + + conflicts gnuradio gnuradio-next gnuradio-devel + + master_sites.mirror_subdir gnuradio + distname gnuradio-${version} + master_sites http://gnuradio.org/releases/gnuradio gnu + + checksums \ + rmd160 66bdc05826e9130cf65e7bee355c01f4474c861b \ + sha256 0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 + + patchfiles patch-path-order.diff + patch.pre_args -p1 + + livecheck.type none + +} + subport gnuradio-devel { long_description ${description}: \ - This port is kept up with the GNU Radio GIT 'maint' branch, which is typically updated weekly to monthly. 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. + This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. 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.5_20130625 + version 3.7.1_20130629 conflicts gnuradio gnuradio-next fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch c0b3ce38db0eaaca05fe2f45827fcf6c9184b72b + git.branch 2c05acc1ed2e64a772dfa77db78f378d45760996 depends_lib-append port:log4cpp - patchfiles patch-path-order.diff patch-no-as-needed-revert.diff - patch.pre_args -p1 - - livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=maint + livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=master livecheck.version ${git.branch} - livecheck.regex id=(\[a-f0-9\]+).*>maint< + livecheck.regex id=(\[a-f0-9\]+).*>master< } subport gnuradio-next { long_description ${description}: \ - This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. 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. + This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. 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_20130625 + version 3.8.0_20130629 conflicts gnuradio gnuradio-devel fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch 071e8f8acdb7e38540d6d78141cae8ac64ade052 + git.branch eada0d6fc1c8404b1b33f3b1f7a911db677e4a39 depends_lib-append port:log4cpp - patchfiles patch-no-as-needed-revert.diff - patch.pre_args -p1 - variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {} if {[variant_isset ctrlport]} { @@ -94,15 +112,15 @@ } - livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=master + livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=next livecheck.version ${git.branch} - livecheck.regex id=(\[a-f0-9\]+).*>master< + livecheck.regex id=(\[a-f0-9\]+).*>next< } -use_parallel_build yes +use_parallel_build yes -depends_lib-append \ +depends_lib-append \ port:boost \ port:cppunit \ port:fftw-3-single \ Deleted: trunk/dports/science/gnuradio/files/patch-no-as-needed-revert.diff =================================================================== --- trunk/dports/science/gnuradio/files/patch-no-as-needed-revert.diff 2013-07-02 01:13:34 UTC (rev 107524) +++ trunk/dports/science/gnuradio/files/patch-no-as-needed-revert.diff 2013-07-02 02:24:18 UTC (rev 107525) @@ -1,15 +0,0 @@ -diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt -index 17ed65e..2b5ce09 100644 ---- a/gr-wavelet/lib/CMakeLists.txt -+++ b/gr-wavelet/lib/CMakeLists.txt -@@ -71,10 +71,4 @@ list(APPEND wavelet_libs - - add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources}) - target_link_libraries(gnuradio-wavelet ${wavelet_libs}) -- --# we need -no-as-needed or else -lgslcblas gets stripped out on newer version of gcc --if(CMAKE_COMPILER_IS_GNUCC) -- SET_TARGET_PROPERTIES(gnuradio-wavelet PROPERTIES LINK_FLAGS "-Wl,--no-as-needed") --endif(CMAKE_COMPILER_IS_GNUCC) -- - GR_LIBRARY_FOO(gnuradio-wavelet RUNTIME_COMPONENT "wavelet_runtime" DEVEL_COMPONENT "wavelet_devel")