Revision: 100226 https://trac.macports.org/changeset/100226 Author: michaelld@macports.org Date: 2012-12-04 04:32:05 -0800 (Tue, 04 Dec 2012) Log Message: ----------- gnuradio : update devel and next to latest. Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2012-12-04 05:58:45 UTC (rev 100225) +++ trunk/dports/science/gnuradio/Portfile 2012-12-04 12:32:05 UTC (rev 100226) @@ -60,13 +60,13 @@ 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. - version 3.6.3_20121127 + version 3.6.3_20121203 conflicts gnuradio gnuradio-next fetch.type git git.url git://gnuradio.org/gnuradio.git - git.branch 61b99449eeaaebe5ccc10758549add9c9e23f710 + git.branch ef74b48c155bfcec2f560c9a4a23592814699eda post-configure { @@ -89,13 +89,13 @@ 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. - version 3.7.0_20121127 + version 3.7.0_20121203 conflicts gnuradio gnuradio-devel fetch.type git git.url git://gnuradio.org/gnuradio.git - git.branch e5929906700f3d6fa474fc5d9a8650b1fafbc2a1 + git.branch 744e351c408eba97030aa25c31eeddd6139114db post-configure { @@ -189,7 +189,8 @@ configure.args-append \ -DPYTHON_EXECUTABLE=${prefix}/bin/python${v} \ -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Headers \ - -DPYTHON_LIBRARY=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Python + -DPYTHON_LIBRARY=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Python \ + -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}/site-packages # check for variants that require Python @@ -228,16 +229,15 @@ 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/* - # 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} - + 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} + } } } }