[144830] trunk/dports/science
michaelld at macports.org
michaelld at macports.org
Tue Jan 19 12:16:26 PST 2016
Revision: 144830
https://trac.macports.org/changeset/144830
Author: michaelld at macports.org
Date: 2016-01-19 12:16:26 -0800 (Tue, 19 Jan 2016)
Log Message:
-----------
various gnuradio ports: remove legacy subports and related patches, comments, and code.
Modified Paths:
--------------
trunk/dports/science/gnuradio/Portfile
trunk/dports/science/gr-air-modes/Portfile
trunk/dports/science/gr-ais/Portfile
trunk/dports/science/gr-baz/Portfile
trunk/dports/science/gr-dvbs/Portfile
trunk/dports/science/gr-dvbs2/Portfile
trunk/dports/science/gr-dvbt/Portfile
trunk/dports/science/gr-fcdproplus/Portfile
trunk/dports/science/gr-foo/Portfile
trunk/dports/science/gr-fosphor/Portfile
trunk/dports/science/gr-ieee802-11/Portfile
trunk/dports/science/gr-ieee802-15-4/Portfile
trunk/dports/science/gr-iqbalance/Portfile
trunk/dports/science/gr-mac/Portfile
trunk/dports/science/gr-osmosdr/Portfile
trunk/dports/science/gr-pyqt/Portfile
trunk/dports/science/gr-rds/Portfile
trunk/dports/science/volk/Portfile
Removed Paths:
-------------
trunk/dports/science/gnuradio/files/patch-gnuradio-core_src_lib_io_ppio_ppdev.h.diff
trunk/dports/science/gnuradio/files/patch-gnuradio-core_swig_include-std_string.i.diff
trunk/dports/science/gnuradio/files/patch-gnuradio-core_swig_std_std_container.i.diff
trunk/dports/science/gnuradio/files/patch-path-order.diff
trunk/dports/science/gnuradio/files/patch-volk_gen_archs.xml.legacy.diff
trunk/dports/science/gnuradio/files/patch-volk_lib_CMakeLists.txt.legacy.diff
trunk/dports/science/gr-iqbalance/files/
Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gnuradio/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -27,7 +27,7 @@
long_description ${description}: \
This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
- conflicts gnuradio-legacy gnuradio-next gnuradio-devel
+ conflicts gnuradio-next gnuradio-devel
checksums \
rmd160 541bcf585bd3a29989f2d1a2e192e24ef6214f73 \
@@ -40,57 +40,13 @@
}
-subport gnuradio-legacy {
-
- name gnuradio-legacy
- github.setup gnuradio gnuradio 3.6.5.1 v
- revision 16
-
- 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
-
- checksums \
- rmd160 f5d5890fca81e5c379d32b3504976bc24b7ac12f \
- sha256 1af7840b9b46aaa85786bf58274da4334b84192e04990b4f3132c1a84b84956f
-
- # fix INCLUDE_DIRECTORIES path order such that internal
- # directories are searched before ${prefix}/include or system
- # ones.
-
- patchfiles-append patch-path-order.diff
-
- # add checks for xgetbv instruction and cvtpi32_ps intrinsic
-
- patchfiles-append patch-volk_lib_CMakeLists.txt.legacy.diff
-
- # fix VOLK arch generators to include clang
-
- patchfiles-append patch-volk_gen_archs.xml.legacy.diff
-
- # fix SWIG include of std_string to come before anything else,
- # otherwise it will not be properly defined later on.
-
- patchfiles-append patch-gnuradio-core_swig_include-std_string.i.diff
-
- # fix friend function API declaration
-
- patchfiles-append patch-gnuradio-core_src_lib_io_ppio_ppdev.h.diff
-
- # 3.6.5.1 is the last of the 3.6 API development
-
- livecheck.type none
-
-}
-
subport gnuradio-devel {
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 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.
name gnuradio-devel
- conflicts gnuradio-legacy gnuradio gnuradio-next
+ conflicts gnuradio gnuradio-next
github.setup gnuradio gnuradio bd69c31ef8ae402520819939194ee3060db0062d
version 20160117
@@ -106,7 +62,7 @@
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.
name gnuradio-next
- conflicts gnuradio-legacy gnuradio gnuradio-devel
+ conflicts gnuradio gnuradio-devel
github.setup gnuradio gnuradio 6f866a6f6f6eb088c6d92cf06dd257c0a748c46a
version 20160117
@@ -120,154 +76,24 @@
}
-# Volk split off on 2015-03-29, so it is relevant for devel and next,
-# and will come with release 3.7.6.2 / 3.7.7. legacy will always
-# provide Volk.
+# temporary patch to fix header creation to be before dependencies
+# are determined, such that local (to the build) headers are found
+# before already-installed ones.
-if {${subport} eq "gnuradio-legacy"} {
+if {${subport} eq "gnuradio"} {
- # now conflicts with the Volk port
+ # patches for release only
+ patchfiles-append \
+ patch-cmake-expand.release.diff
- conflicts volk volk-devel
-
- # always enable VOLK, with or without orc
-
- configure.args-append -DENABLE_VOLK=ON
-
- default_variants +orc
-
- variant orc description "Install GNU Radio Volk with support for ORC" {
-
- depends_lib-append \
- port:orc
-
- configure.args-append \
- -DORCC_EXECUTABLE=${prefix}/bin/orcc
-
- }
-
- if {![variant_isset orc]} {
-
- configure.args-append \
- -DORCC_EXECUTABLE=
-
- }
} else {
- # release, devel, and next can use either the Volk
- # release or devel port as of Volk 1.2 and GR 3.7.9.
+ # patches for devel and next (which are kept aligned for now)
+ patchfiles-append \
+ patch-cmake-expand.devel.diff
- depends_lib-append path:lib/libvolk.dylib:volk
-
- # disable using internal VOLK
-
- configure.args-append \
- -DENABLE_INTERNAL_VOLK=OFF
-
- # can be removed 2016-Apr-01
-
- variant orc description "deprecated variant" {}
-
}
-if {${subport} ne "gnuradio-legacy"} {
-
- # GNU Radio 3.7 has requirements that 3.6 does not, and provides
- # features that 3.6 does not have.
-
- depends_lib-append port:log4cpp
-
- # need matplotlib for polar encoder/decoder, runtime
- # only. This is not checked for at configure.
-
- depends_run-append port:py27-matplotlib
-
- # temporary patch to fix header creation to be before dependencies
- # are determined, such that local (to the build) headers are found
- # before already-installed ones.
-
- if {${subport} eq "gnuradio"} {
-
- # patches for release only
- patchfiles-append \
- patch-cmake-expand.release.diff
-
- } else {
-
- # patches for devel and next (which are kept aligned for now)
-
- patchfiles-append \
- patch-cmake-expand.devel.diff
-
- }
-
- # 3.7 API variants
-
- variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {}
-
- if {[variant_isset ctrlport]} {
-
-# as of commit 2e691d87 (2014-08-08), all CTRLPORT calls are noops
-# because of an issue with ICE. So, allow +ctrlport, but it won't do
-# anything until this is fixed.
-
-# as of commit 621c086b (2015-04-16), CTRLPORT has been moved to using
-# thrift, which needs debugging when building on OSX. Just disable
-# CTRLPORT for now.
-
- configure.args-append -DENABLE_GR_CTRLPORT=OFF
-
- } else {
-
- configure.args-append -DENABLE_GR_CTRLPORT=OFF
-
- }
-
- variant performance_counters description {Enable support for performance counters (EXPERIMENTAL)} {}
-
- if {[variant_isset performance_counters]} {
-
- # these are not checked for at configure, but are
- # required for runtime; so use depends_run.
-
- depends_run-append \
- port:py27-pygraphviz \
- port:py27-networkx
-
- configure.args-append \
- -DENABLE_PERFORMANCE_COUNTERS=ON
-
- } else {
-
- configure.args-append \
- -DENABLE_PERFORMANCE_COUNTERS=OFF
-
- }
-
- variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {}
-
- if {[variant_isset zeromq]} {
-
- depends_lib-append \
- port:cppzmq
-
- # pyzmq is not checked for at configure, but is
- # required for runtime; so use depends_run.
-
- depends_run-append \
- port:py27-zmq
-
- configure.args-append \
- -DENABLE_GR_ZEROMQ=ON
-
- } else {
-
- configure.args-append \
- -DENABLE_GR_ZEROMQ=OFF
-
- }
-}
-
# override githib PortGroup homepage setting
homepage http://gnuradio.org/
@@ -277,23 +103,37 @@
depends_lib-append \
port:boost \
port:cppunit \
- port:fftw-3-single
+ port:fftw-3-single \
+ port:log4cpp
+# need matplotlib for polar encoder/decoder, runtime
+# only. This is not checked for at configure.
+
+depends_run-append port:py27-matplotlib
+
# do VPATH (out of source tree) build
cmake.out_of_source yes
-# remove top-level library path, such that internal libraries are used
-# instead of any already-installed ones.
+# remove top-level library path, such that internal libraries
+# are used instead of any already-installed ones.
configure.ldflags-delete -L${prefix}/lib
-# install CMake files into this directory;
-# for 3.7+, but will not hurt for legacy.
+# install CMake files into this directory.
configure.args-append \
-DCMAKE_MODULES_DIR=${prefix}/share/cmake
+# release, devel, and next can use either the Volk.
+
+depends_lib-append path:lib/libvolk.dylib:volk
+
+# disable using internal VOLK
+
+configure.args-append \
+ -DENABLE_INTERNAL_VOLK=OFF
+
post-destroot {
# fix residual cmake module install location when
@@ -576,6 +416,69 @@
}
+variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {
+# as of commit 2e691d87 (2014-08-08), all CTRLPORT calls are noops
+# because of an issue with ICE. So, allow +ctrlport, but it won't do
+# anything until this is fixed.
+
+# as of commit 621c086b (2015-04-16), CTRLPORT has been moved to using
+# thrift, which needs debugging when building on OSX. Just disable
+# CTRLPORT for now.
+
+ configure.args-append -DENABLE_GR_CTRLPORT=OFF
+
+}
+
+if {![variant_isset ctrlport]} {
+
+ configure.args-append -DENABLE_GR_CTRLPORT=OFF
+
+}
+
+variant performance_counters description {Enable support for performance counters (EXPERIMENTAL)} {
+
+ # these are not checked for at configure, but are
+ # required for runtime; so use depends_run.
+
+ depends_run-append \
+ port:py27-pygraphviz \
+ port:py27-networkx
+
+ configure.args-append \
+ -DENABLE_PERFORMANCE_COUNTERS=ON
+
+}
+
+if {![variant_isset performance_counters]} {
+
+ configure.args-append \
+ -DENABLE_PERFORMANCE_COUNTERS=OFF
+
+}
+
+variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {
+
+ depends_lib-append \
+ port:cppzmq
+
+ # pyzmq is not checked for at configure, but is
+ # required for runtime; so use depends_run.
+
+ depends_run-append \
+ port:py27-zmq
+
+ configure.args-append \
+ -DENABLE_GR_ZEROMQ=ON
+
+}
+
+if {![variant_isset zeromq]} {
+
+ configure.args-append \
+ -DENABLE_GR_ZEROMQ=OFF
+
+}
+
variant cxx11 description "Compile using C++11" {
# require C++11
Deleted: trunk/dports/science/gnuradio/files/patch-gnuradio-core_src_lib_io_ppio_ppdev.h.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-gnuradio-core_src_lib_io_ppio_ppdev.h.diff 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gnuradio/files/patch-gnuradio-core_src_lib_io_ppio_ppdev.h.diff 2016-01-19 20:16:26 UTC (rev 144830)
@@ -1,22 +0,0 @@
---- gnuradio-core/src/lib/io/ppio_ppdev.h.orig 2014-04-25 12:10:07.000000000 -0400
-+++ gnuradio-core/src/lib/io/ppio_ppdev.h 2014-04-25 12:10:28.000000000 -0400
-@@ -35,7 +35,7 @@
- */
-
- class GR_CORE_API ppio_ppdev : public ppio {
-- friend GR_CORE_API ppio_ppdev_sptr make_ppio_ppdev (int which = 0);
-+ friend GR_CORE_API ppio_ppdev_sptr make_ppio_ppdev (int which);
- ppio_ppdev (int which = 0);
-
- public:
-@@ -54,8 +54,8 @@
- int d_fd;
- };
-
--ppio_ppdev_sptr
--make_ppio_ppdev (int which);
-+GR_CORE_API ppio_ppdev_sptr
-+make_ppio_ppdev (int which = 0);
-
-
- #endif /* INCLUDED_PPIO_PPDEV_H */
Deleted: trunk/dports/science/gnuradio/files/patch-gnuradio-core_swig_include-std_string.i.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-gnuradio-core_swig_include-std_string.i.diff 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gnuradio/files/patch-gnuradio-core_swig_include-std_string.i.diff 2016-01-19 20:16:26 UTC (rev 144830)
@@ -1,10 +0,0 @@
---- gnuradio-core/src/lib/swig/gnuradio.i.orig 2013-05-26 16:07:07.000000000 -0400
-+++ gnuradio-core/src/lib/swig/gnuradio.i 2013-11-18 10:17:07.000000000 -0500
-@@ -28,6 +28,7 @@
- // SWIG interface definition
- ////////////////////////////////////////////////////////////////////////
-
-+%include "std_string.i"
- %include <gruel_common.i>
-
- ////////////////////////////////////////////////////////////////////////
Deleted: trunk/dports/science/gnuradio/files/patch-gnuradio-core_swig_std_std_container.i.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-gnuradio-core_swig_std_std_container.i.diff 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gnuradio/files/patch-gnuradio-core_swig_std_std_container.i.diff 2016-01-19 20:16:26 UTC (rev 144830)
@@ -1,24 +0,0 @@
---- gnuradio-core/src/lib/swig/std/std_container.i.orig 2013-09-16 11:55:57.000000000 -0400
-+++ gnuradio-core/src/lib/swig/std/std_container.i 2013-11-13 15:55:21.000000000 -0500
-@@ -46,8 +46,8 @@
- void resize(size_type new_size);
-
- #ifdef SWIG_EXPORT_ITERATOR_METHODS
-- iterator erase(iterator pos);
-- iterator erase(iterator first, iterator last);
-+ iterator erase(const_iterator pos);
-+ iterator erase(const_iterator first, const_iterator last);
- #endif
-
- %enddef
-@@ -68,8 +68,8 @@
- void resize(size_type new_size, const value_type& x);
-
- #ifdef SWIG_EXPORT_ITERATOR_METHODS
-- iterator insert(iterator pos, const value_type& x);
-- void insert(iterator pos, size_type n, const value_type& x);
-+ iterator insert(const_iterator pos, const value_type& x);
-+ void insert(const_iterator pos, size_type n, const value_type& x);
- #endif
-
- %enddef
Deleted: trunk/dports/science/gnuradio/files/patch-path-order.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-path-order.diff 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gnuradio/files/patch-path-order.diff 2016-01-19 20:16:26 UTC (rev 144830)
@@ -1,132 +0,0 @@
---- cmake/Modules/GrSwig.cmake.orig
-+++ cmake/Modules/GrSwig.cmake
-@@ -118,8 +118,8 @@ macro(GR_SWIG_MAKE name)
- find_package(PythonLibs)
- list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH}) #deprecated name (now dirs)
- list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
-- list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
-- list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
-+ list(INSERT GR_SWIG_INCLUDE_DIRS 0 ${CMAKE_CURRENT_SOURCE_DIR})
-+ list(INSERT GR_SWIG_INCLUDE_DIRS 0 ${CMAKE_CURRENT_BINARY_DIR})
-
- #determine include dependencies for swig file
- execute_process(
---- gr-audio/lib/CMakeLists.txt.orig
-+++ gr-audio/lib/CMakeLists.txt
-@@ -20,18 +20,6 @@
- ########################################################################
- # Setup the include and linker paths
- ########################################################################
--include_directories(
-- ${CMAKE_CURRENT_SOURCE_DIR}
-- ${GR_AUDIO_INCLUDE_DIRS}
-- ${GNURADIO_CORE_INCLUDE_DIRS}
-- ${GRUEL_INCLUDE_DIRS}
-- ${Boost_INCLUDE_DIRS}
--)
--
--link_directories(${Boost_LIBRARY_DIRS})
--
--include_directories(${LOG4CPP_INCLUDE_DIRS})
--link_directories(${LOG4CPP_LIBRARY_DIRS})
-
- list(APPEND gr_audio_libs gnuradio-core ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES})
- list(APPEND gr_audio_sources gr_audio_registry.cc)
-@@ -44,7 +32,8 @@ find_package(ALSA)
-
- if(ALSA_FOUND)
-
-- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/alsa ${ALSA_INCLUDE_DIRS})
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/alsa)
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${ALSA_INCLUDE_DIRS})
- list(APPEND gr_audio_libs ${ALSA_LIBRARIES})
- list(APPEND gr_audio_sources
- ${CMAKE_CURRENT_SOURCE_DIR}/alsa/gri_alsa.cc
-@@ -62,7 +51,8 @@ find_package(OSS)
-
- if(OSS_FOUND)
-
-- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/oss ${OSS_INCLUDE_DIRS})
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/oss)
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${OSS_INCLUDE_DIRS})
- list(APPEND gr_audio_sources
- ${CMAKE_CURRENT_SOURCE_DIR}/oss/audio_oss_source.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/oss/audio_oss_sink.cc
-@@ -79,7 +69,8 @@ find_package(Jack)
-
- if(JACK_FOUND)
-
-- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jack ${JACK_INCLUDE_DIRS})
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/jack)
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${JACK_INCLUDE_DIRS})
- list(APPEND gr_audio_libs ${JACK_LIBRARIES})
- add_definitions(${JACK_DEFINITIONS})
- list(APPEND gr_audio_sources
-@@ -100,7 +91,7 @@ CHECK_INCLUDE_FILE_CXX(AudioToolbox/AudioToolbox.h AUDIO_TOOLBOX_H)
-
- if(AUDIO_UNIT_H AND AUDIO_TOOLBOX_H)
-
-- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/osx)
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/osx)
- list(APPEND gr_audio_libs
- "-framework AudioUnit"
- "-framework CoreAudio"
-@@ -121,7 +112,8 @@ find_package(Portaudio)
-
- if(PORTAUDIO_FOUND)
-
-- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio ${PORTAUDIO_INCLUDE_DIRS})
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/portaudio)
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${PORTAUDIO_INCLUDE_DIRS})
- list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES})
- add_definitions(${PORTAUDIO_DEFINITIONS})
- list(APPEND gr_audio_sources
-@@ -138,7 +130,8 @@ endif(PORTAUDIO_FOUND)
- ########################################################################
- if(WIN32)
-
-- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/windows)
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/windows)
-+ list(APPEND GR_AUDIO_INCLUDE_DIRS_AFTER ${PORTAUDIO_INCLUDE_DIRS})
- list(APPEND gr_audio_libs winmm.lib)
- list(APPEND gr_audio_sources
- ${CMAKE_CURRENT_SOURCE_DIR}/windows/audio_windows_source.cc
-@@ -162,8 +155,28 @@ if(WIN32)
- endif(WIN32)
-
- ########################################################################
-+# deal with paths
-+########################################################################
-+
-+include_directories(
-+ ${GR_AUDIO_INCLUDE_DIRS_BEFORE}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${GR_AUDIO_INCLUDE_DIRS}
-+ ${GNURADIO_CORE_INCLUDE_DIRS}
-+ ${GRUEL_INCLUDE_DIRS}
-+ ${Boost_INCLUDE_DIRS}
-+ ${GR_AUDIO_INCLUDE_DIRS_AFTER}
-+)
-+
-+link_directories(${Boost_LIBRARY_DIRS})
-+
-+include_directories(${LOG4CPP_INCLUDE_DIRS})
-+link_directories(${LOG4CPP_LIBRARY_DIRS})
-+
-+########################################################################
- # Setup library
- ########################################################################
-+
- add_library(gnuradio-audio SHARED ${gr_audio_sources})
- target_link_libraries(gnuradio-audio ${gr_audio_libs})
- GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
---- gruel/CMakeLists.txt.orig
-+++ gruel/CMakeLists.txt
-@@ -37,7 +37,6 @@ include(GrMiscUtils)
- GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS
- ${CMAKE_CURRENT_SOURCE_DIR}/src/include
- ${CMAKE_CURRENT_BINARY_DIR}/src/include
-- ${Boost_INCLUDE_DIRS}
- )
-
- ########################################################################
Deleted: trunk/dports/science/gnuradio/files/patch-volk_gen_archs.xml.legacy.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-volk_gen_archs.xml.legacy.diff 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gnuradio/files/patch-volk_gen_archs.xml.legacy.diff 2016-01-19 20:16:26 UTC (rev 144830)
@@ -1,106 +0,0 @@
---- volk/gen/archs.xml.orig
-+++ volk/gen/archs.xml
-@@ -33,6 +33,7 @@
- <param>29</param> <!-- bit shift -->
- </check>
- <flag compiler="gnu">-m64</flag>
-+ <flag compiler="clang">-m64</flag>
- </arch>
-
- <arch name="3dnow">
-@@ -42,6 +43,7 @@
- <param>31</param>
- </check>
- <flag compiler="gnu">-m3dnow</flag>
-+ <flag compiler="clang">-m3dnow</flag>
- <alignment>8</alignment>
- </arch>
-
-@@ -52,6 +54,7 @@
- <param>5</param>
- </check>
- <flag compiler="gnu">-msse4.2</flag>
-+ <flag compiler="clang">-msse4.2</flag>
- <alignment>16</alignment>
- </arch>
-
-@@ -62,6 +65,7 @@
- <param>23</param>
- </check>
- <flag compiler="gnu">-mpopcnt</flag>
-+ <flag compiler="clang">-mpopcnt</flag>
- <flag compiler="msvc">/arch:AVX</flag>
- </arch>
-
-@@ -72,6 +76,7 @@
- <param>23</param>
- </check>
- <flag compiler="gnu">-mmmx</flag>
-+ <flag compiler="clang">-mmmx</flag>
- <flag compiler="msvc">/arch:SSE</flag>
- <alignment>8</alignment>
- </arch>
-@@ -83,6 +88,7 @@
- <param>25</param>
- </check>
- <flag compiler="gnu">-msse</flag>
-+ <flag compiler="clang">-msse</flag>
- <flag compiler="msvc">/arch:SSE</flag>
- <environment>_MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);</environment>
- <include>xmmintrin.h</include>
-@@ -96,6 +102,7 @@
- <param>26</param>
- </check>
- <flag compiler="gnu">-msse2</flag>
-+ <flag compiler="clang">-msse2</flag>
- <flag compiler="msvc">/arch:SSE2</flag>
- <alignment>16</alignment>
- </arch>
-@@ -114,6 +121,7 @@
- <param>0</param>
- </check>
- <flag compiler="gnu">-msse3</flag>
-+ <flag compiler="clang">-msse3</flag>
- <flag compiler="msvc">/arch:AVX</flag>
- <environment>_MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);</environment>
- <include>pmmintrin.h</include>
-@@ -127,6 +135,7 @@
- <param>9</param>
- </check>
- <flag compiler="gnu">-mssse3</flag>
-+ <flag compiler="clang">-mssse3</flag>
- <flag compiler="msvc">/arch:AVX</flag>
- <alignment>16</alignment>
- </arch>
-@@ -138,6 +147,7 @@
- <param>6</param>
- </check>
- <flag compiler="gnu">-msse4a</flag>
-+ <flag compiler="clang">-msse4a</flag>
- <alignment>16</alignment>
- </arch>
-
-@@ -148,6 +158,7 @@
- <param>19</param>
- </check>
- <flag compiler="gnu">-msse4.1</flag>
-+ <flag compiler="clang">-msse4.1</flag>
- <flag compiler="msvc">/arch:AVX</flag>
- <alignment>16</alignment>
- </arch>
-@@ -159,6 +170,7 @@
- <param>20</param>
- </check>
- <flag compiler="gnu">-msse4.2</flag>
-+ <flag compiler="clang">-msse4.2</flag>
- <flag compiler="msvc">/arch:AVX</flag>
- <alignment>16</alignment>
- </arch>
-@@ -178,6 +190,7 @@
- <!-- check to see that the OS has enabled AVX -->
- <check name="get_avx_enabled"></check>
- <flag compiler="gnu">-mavx</flag>
-+ <flag compiler="clang">-mavx</flag>
- <flag compiler="msvc">/arch:AVX</flag>
- <alignment>32</alignment>
- </arch>
Deleted: trunk/dports/science/gnuradio/files/patch-volk_lib_CMakeLists.txt.legacy.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-volk_lib_CMakeLists.txt.legacy.diff 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gnuradio/files/patch-volk_lib_CMakeLists.txt.legacy.diff 2016-01-19 20:16:26 UTC (rev 144830)
@@ -1,70 +0,0 @@
---- volk/lib/CMakeLists.txt.orig 2013-11-19 13:41:47.000000000 -0500
-+++ volk/lib/CMakeLists.txt 2013-11-19 13:42:28.000000000 -0500
-@@ -118,15 +118,60 @@
- endmacro(OVERRULE_ARCH)
-
- ########################################################################
--# eliminate AVX on GCC < 4.4
--# even though it accepts -mavx, as won't assemble xgetbv, which we need
-+# eliminate AVX on if not on x86, or if the compiler does not accept
-+# the xgetbv instruction, or {if not cross-compiling and the xgetbv
-+# executable does not function correctly}.
-+########################################################################
-+set(HAVE_XGETBV 0)
-+if(CPU_IS_x86)
-+ # check to see if the compiler/linker works with xgetb instruction
-+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c "unsigned long long _xgetbv(unsigned int index) { unsigned int eax, edx; __asm__ __volatile__(\"xgetbv\" : \"=a\"(eax), \"=d\"(edx) : \"c\"(index)); return ((unsigned long long)edx << 32) | eax; } int main (void) { (void) _xgetbv(0); return (0); }")
-+ execute_process(COMMAND ${CMAKE_C_COMPILER} -o
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c
-+ OUTPUT_QUIET ERROR_QUIET
-+ RESULT_VARIABLE avx_compile_result)
-+ if(NOT ${avx_compile_result} EQUAL 0)
-+ OVERRULE_ARCH(avx "Compiler or linker missing xgetbv instruction")
-+ elseif(NOT CROSSCOMPILE_MULTILIB)
-+ execute_process(COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv
-+ OUTPUT_QUIET ERROR_QUIET
-+ RESULT_VARIABLE avx_exe_result)
-+ if(NOT ${avx_exe_result} EQUAL 0)
-+ OVERRULE_ARCH(avx "CPU missing xgetbv.")
-+ else()
-+ set(HAVE_XGETBV 1)
-+ endif()
-+ else()
-+ # cross compiling and compiler/linker seems to work; assume working
-+ set(HAVE_XGETBV 1)
-+ endif()
-+ file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c)
-+endif()
-+
- ########################################################################
--if(CPU_IS_x86 AND COMPILER_NAME MATCHES "GNU")
-- execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-- OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-- if(GCC_VERSION VERSION_LESS "4.4")
-- OVERRULE_ARCH(avx "GCC missing xgetbv")
-+# eliminate AVX if cvtpi32_ps intrinsic fails on Apple
-+########################################################################
-+
-+if(${HAVE_XGETBV} AND APPLE)
-+ # check to see if the compiler/linker works with cvtpi32_ps instrinsic
-+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps.c "#include <immintrin.h>\nint main (void) {__m128 __a; __m64 __b; __m128 foo = _mm_cvtpi32_ps(__a, __b); return (0); }")
-+ execute_process(COMMAND ${CMAKE_C_COMPILER} -mavx -o
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps.c
-+ OUTPUT_QUIET ERROR_QUIET
-+ RESULT_VARIABLE avx_compile_result)
-+ if(NOT ${avx_compile_result} EQUAL 0)
-+ OVERRULE_ARCH(avx "Compiler missing cvtpi32_ps instrinsic")
-+ set(HAVE_XGETBV 0)
- endif()
-+ file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps.c)
-+endif()
-+
-+if(${HAVE_XGETBV})
-+ add_definitions(-DHAVE_XGETBV)
- endif()
-
- ########################################################################
Modified: trunk/dports/science/gr-air-modes/Portfile
===================================================================
--- trunk/dports/science/gr-air-modes/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-air-modes/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -15,14 +15,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-air-modes does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-air-modes does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-ais/Portfile
===================================================================
--- trunk/dports/science/gr-ais/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-ais/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -19,14 +19,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-ais does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-ais does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
@@ -61,8 +56,7 @@
configure.ldflags-delete -L${prefix}/lib
-# install CMake files into this directory;
-# for 3.7+, but will not hurt for legacy.
+# install CMake files into this directory.
configure.args-append \
-DCMAKE_MODULES_DIR=${prefix}/share/cmake
Modified: trunk/dports/science/gr-baz/Portfile
===================================================================
--- trunk/dports/science/gr-baz/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-baz/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -7,55 +7,26 @@
name gr-baz
-if {"${subport}" eq "${name}"} {
+github.setup balint256 gr-baz e96b4023afaf3d777784c58d95fe41a2f08dbc6c
+version 20151125
+revision 3
+checksums rmd160 6da4b15627196bdbf12ef25c7553982d14503db5 \
+ sha256 fc5beff2a52575099754495694dc33084608e32f81660a2833cca9cf5d94b80e
- github.setup balint256 gr-baz e96b4023afaf3d777784c58d95fe41a2f08dbc6c
- version 20151125
- revision 3
- checksums rmd160 6da4b15627196bdbf12ef25c7553982d14503db5 \
- sha256 fc5beff2a52575099754495694dc33084608e32f81660a2833cca9cf5d94b80e
+# allow gr-baz to work with both gnuradio and gnuradio-devel ...
- conflicts gr-baz-legacy
+depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
- # allow gr-baz to work with both gnuradio and gnuradio-devel ...
+# ... but not with gnuradio-next
- depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-
- # ... but not with gnuradio-legacy or gnuradio-next
-
- pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
- if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
- # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-next"
- }
+pre-fetch {
+ if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
+ # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
+ ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
+ return -code error "Invalid port dependency: gnuradio-next"
}
}
-subport gr-baz-legacy {
-
- github.setup balint256 gr-baz dd9540661065308eb9529b81d1580b861dd8aa0e
- version 20130329
- revision 4
- checksums rmd160 06b6152d541169116219d701970fc03710e0fbba \
- sha256 377a0058ec72ed963edbc65ef062180d6937d4fda334bc2e7469146f0abfd626
-
- conflicts gr-baz
-
- # fix name from github setup
-
- name gr-baz-legacy
-
- # requires gnuradio-legacy
-
- depends_lib-append port:gnuradio-legacy
-}
-
homepage http://wiki.spench.net/wiki/Gr-baz
categories science comms
Modified: trunk/dports/science/gr-dvbs/Portfile
===================================================================
--- trunk/dports/science/gr-dvbs/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-dvbs/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -28,14 +28,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-dvbs does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-dvbs does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-dvbs2/Portfile
===================================================================
--- trunk/dports/science/gr-dvbs2/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-dvbs2/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -28,14 +28,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-dvbs2 does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-dvbs2 does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-dvbt/Portfile
===================================================================
--- trunk/dports/science/gr-dvbt/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-dvbt/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -29,14 +29,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-dvbt does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-dvbt does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-fcdproplus/Portfile
===================================================================
--- trunk/dports/science/gr-fcdproplus/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-fcdproplus/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -28,14 +28,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-fcdproplus does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-fcdproplus does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-foo/Portfile
===================================================================
--- trunk/dports/science/gr-foo/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-foo/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -16,14 +16,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-fosphor/Portfile
===================================================================
--- trunk/dports/science/gr-fosphor/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-fosphor/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -90,15 +90,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
-
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-forphor does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-forphor does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-ieee802-11/Portfile
===================================================================
--- trunk/dports/science/gr-ieee802-11/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-ieee802-11/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -16,14 +16,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-ieee802-11 does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-ieee802-11 does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-ieee802-15-4/Portfile
===================================================================
--- trunk/dports/science/gr-ieee802-15-4/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-ieee802-15-4/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -16,14 +16,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-ieee802-15-4 does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-ieee802-15-4 does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-iqbalance/Portfile
===================================================================
--- trunk/dports/science/gr-iqbalance/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-iqbalance/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -15,77 +15,38 @@
license GPL-3
platforms darwin macosx
-if {${subport} eq ${name}} {
+long_description ${description}. \
+ This port is kept up with the gr-iqbal GIT 'master' branch, which is typically updated monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.
- long_description ${description}. \
- This port is kept up with the gr-iqbal GIT 'master' branch, which is typically updated monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.
+set commit 44ab02f671dbc8765391a83d8186779fbb38baea
+version 20140825
+revision 6
+checksums rmd160 8ec7b22e2ac37c972c4f7df187f66830ab38cb1e \
+ sha256 e2c8f0ecc97eaebdf0178a5375181c957484c02985c8e3d018dac1cc14567232
- set commit 44ab02f671dbc8765391a83d8186779fbb38baea
- version 20140825
- revision 6
- checksums rmd160 8ec7b22e2ac37c972c4f7df187f66830ab38cb1e \
- sha256 e2c8f0ecc97eaebdf0178a5375181c957484c02985c8e3d018dac1cc14567232
+distname gr-iqbal-${commit}
+master_sites http://cgit.osmocom.org/gr-iqbal/snapshot/
- distname gr-iqbal-${commit}
- master_sites http://cgit.osmocom.org/gr-iqbal/snapshot/
+conflicts gr-iqbalance-legacy
- conflicts gr-iqbalance-legacy
+# allow gr-iqbalance to work with both gnuradio and gnuradio-devel ...
- # allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
+depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
- depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
+# ... but not with gnuradio-next
- # ... but not with gnuradio-legacy or gnuradio-next
-
- pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
- if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
- # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-next"
- }
+pre-fetch {
+ if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
+ # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
+ ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
+ return -code error "Invalid port dependency: gnuradio-next"
}
-
- livecheck.url http://cgit.osmocom.org/gr-iqbal/log/?h=master
- livecheck.version ${commit}
- livecheck.regex id=(\[a-f0-9\]+).*>HEAD<
-
}
-subport gr-iqbalance-legacy {
+livecheck.url http://cgit.osmocom.org/gr-iqbal/log/?h=master
+livecheck.version ${commit}
+livecheck.regex id=(\[a-f0-9\]+).*>HEAD<
- long_description ${description}. \
- This port is for the gr-iqbal gr3.6 branch, providing compatibility with GNU Radio release 3.6 API: the gnuradio-legacy port.
-
- set commit bd3abaa3b55d4918acd054ea1f119c73cee625df
- version 20130919
- revision 3
- checksums rmd160 f46f06b442b458d464302088498cf8100d31d287 \
- sha256 ae2f8f31eb68c3864bb148b5099837bc6808388f018864d871e1bbfc0a65ed28
-
- distname gr-iqbal-${commit}
- master_sites http://cgit.osmocom.org/gr-iqbal/snapshot/
-
- conflicts gr-iqbalance
-
- # gr-osmosdr-legacy works with gnuradio-legacy only
-
- depends_lib-append port:gnuradio-legacy
-
- # patch to fix boost dependency
-
- patchfiles-append patch-CMakeLists.txt_legacy.diff
-
- livecheck.url http://cgit.osmocom.org/gr-iqbal/log/?h=gr3.6
- livecheck.version ${commit}
- livecheck.regex id=(\[a-f0-9\]+).*>gr3.6<
-
-}
-
depends_build-append port:pkgconfig
depends_lib-append port:boost \
Modified: trunk/dports/science/gr-mac/Portfile
===================================================================
--- trunk/dports/science/gr-mac/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-mac/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -15,14 +15,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-mac does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-mac does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
@@ -57,8 +52,7 @@
configure.ldflags-delete -L${prefix}/lib
-# install CMake files into this directory;
-# for 3.7+, but will not hurt for legacy.
+# install CMake files into this directory.
configure.args-append \
-DCMAKE_MODULES_DIR=${prefix}/share/cmake
Modified: trunk/dports/science/gr-osmosdr/Portfile
===================================================================
--- trunk/dports/science/gr-osmosdr/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-osmosdr/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -9,80 +9,39 @@
maintainers michaelld openmaintainer
description gr-osmosdr provides support for OsmoSDR hardware within GNU Radio
+long_description Includes OSMO SDR support GNU Radio source and sink blocks in C++, Python, and GNU Radio Companion (grc). This port also offers a wrapper functionality for the FunCube Dongle, FunCube Dongle Pro+, HackRF, RFSpace, Ettus UHD, and rtl-sdr radios and software. By using gr-osmosdr source you can take advantage of a common software API in your applications independent of the underlying radio hardware. This port is kept up with the gr-osmosdr GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.
categories science comms
homepage http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
license GPL-3
platforms darwin macosx
-set description_common {Includes OSMO SDR support GNU Radio source and sink blocks in C++, Python, and GNU Radio Companion (grc). This port also offers a wrapper functionality for the FunCube Dongle, FunCube Dongle Pro+, HackRF, RFSpace, Ettus UHD, and rtl-sdr radios and software. By using gr-osmosdr source you can take advantage of a common software API in your applications independent of the underlying radio hardware.}
-
-if {${subport} eq ${name}} {
-
- long_description ${description}. \
- This port is kept up with the gr-osmosdr GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports. ${description_common}
-
- set commit ac15e7897bb740d083c71bf02729467ca6528635
- version 20160110
- checksums rmd160 8ee09be55819a797ae504bbbf9b0543f1121a310 \
+set commit ac15e7897bb740d083c71bf02729467ca6528635
+version 20160110
+checksums rmd160 8ee09be55819a797ae504bbbf9b0543f1121a310 \
sha256 c709fdd22c9e8484d272f576d11bcbd81b3fe80cb79be2c7b68dce38fd31f5c2
- distname ${name}-${commit}
- master_sites http://cgit.osmocom.org/gr-osmosdr/snapshot/
+distname ${name}-${commit}
+master_sites http://cgit.osmocom.org/gr-osmosdr/snapshot/
- conflicts gr-osmosdr-legacy
+# allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
- # allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
+depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
- depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
+# ... but not with gnuradio-next
- # ... but not with gnuradio-legacy or gnuradio-next
-
- pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
- if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
- # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-next"
- }
+pre-fetch {
+ if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
+ # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
+ ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
+ return -code error "Invalid port dependency: gnuradio-next"
}
-
- livecheck.url http://cgit.osmocom.org/gr-osmosdr/log/?h=master
- livecheck.version ${commit}
- livecheck.regex id=(\[a-f0-9\]+).*>HEAD<
-
}
-subport gr-osmosdr-legacy {
+livecheck.url http://cgit.osmocom.org/gr-osmosdr/log/?h=master
+livecheck.version ${commit}
+livecheck.regex id=(\[a-f0-9\]+).*>HEAD<
- long_description ${description}. \
- This port is for the gr-osmosdr gr3.6 branch, providing compatibility with GNU Radio release 3.6 API: the gnuradio-legacy port. ${description_common}
-
- set commit c7cb045fcb091243aee3e47dd6fdfd0faba89f69
- version 20140503
- revision 12
- checksums rmd160 e01366b76fbe3cdf9d7634c32b276ab73cce115e \
- sha256 4d5587c677bd1e2395fec19f67a3a1a5366fe2196ceda1e1954503fb89b94d91
-
- distname ${name}-${commit}
- master_sites http://cgit.osmocom.org/gr-osmosdr/snapshot/
-
- conflicts gr-osmosdr
-
- # gr-osmosdr-legacy works with gnuradio-legacy only
-
- depends_lib-append port:gnuradio-legacy
-
- livecheck.url http://cgit.osmocom.org/gr-osmosdr/log/?h=gr3.6
- livecheck.version ${commit}
- livecheck.regex id=(\[a-f0-9\]+).*>gr3.6<
-
-}
-
# do VPATH (out of source tree) build
cmake.out_of_source yes
@@ -150,17 +109,9 @@
# require gnuradio to also have this variant
- if {${subport} eq "gr-osmosdr-legacy"} {
+ require_active_variants \
+ path:lib/libgnuradio-runtime.dylib:gnuradio uhd
- require_active_variants port:gnuradio-legacy uhd
-
- } else {
-
- require_active_variants \
- path:lib/libgnuradio-runtime.dylib:gnuradio uhd
-
- }
-
configure.args-append \
-DENABLE_UHD=ON \
-DGNURADIO_UHD_INCLUDE_DIRS=${prefix}/include \
@@ -188,17 +139,9 @@
# require gnuradio to also have this variant
- if {${subport} eq "gr-osmosdr-legacy"} {
+ require_active_variants \
+ path:lib/libgnuradio-runtime.dylib:gnuradio swig
- require_active_variants port:gnuradio-legacy swig
-
- } else {
-
- require_active_variants \
- path:lib/libgnuradio-runtime.dylib:gnuradio swig
-
- }
-
configure.args-append \
-DSWIG_EXECUTABLE=${prefix}/bin/swig
@@ -224,23 +167,17 @@
}
-# fcdproplus works with gnuradio 3.7+ API only; it does not provide a
-# 3.6 API legacy version
+variant fcdproplus description "Install ${name} with support for FunCube Dongle Pro+ (fcdproplus)" {
-if {${subport} eq ${name}} {
+ depends_lib-append port:gr-fcdproplus
+ configure.args-append -DENABLE_FCDPP=ON
- variant fcdproplus description "Install ${name} with support for FunCube Dongle Pro+ (fcdproplus)" {
+}
- depends_lib-append port:gr-fcdproplus
- configure.args-append -DENABLE_FCDPP=ON
+if {![variant_isset fcdproplus]} {
- }
+ configure.args-append -DENABLE_FCDPP=OFF
- if {![variant_isset fcdproplus]} {
-
- configure.args-append -DENABLE_FCDPP=OFF
-
- }
}
variant rtlsdr description "Install ${name} with support for rtl-sdr" {
Modified: trunk/dports/science/gr-pyqt/Portfile
===================================================================
--- trunk/dports/science/gr-pyqt/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-pyqt/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -15,14 +15,9 @@
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-pyqt does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-pyqt does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
Modified: trunk/dports/science/gr-rds/Portfile
===================================================================
--- trunk/dports/science/gr-rds/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/gr-rds/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -5,11 +5,10 @@
PortGroup cmake 1.0
PortGroup github 1.0
-github.setup bastibl gr-rds 201f32bb15e738fc8491039c7176b9b1643c27e2
-version 20150512
-revision 3
-checksums rmd160 8c3f95fd214dd890aedbf72b72d2de17a57688a6 \
- sha256 c98efac2472fe025a6d1f62e53e513783783a4bb887ffc7a9cf4ae6155ba3a47
+github.setup bastibl gr-rds 74f231d60d1533e3491360eba1b4372312b55d73
+version 20160114
+checksums rmd160 107f7fe75f15dbd9be8c5746b2df994a253e09c2 \
+ sha256 7c3941d0570ae33e34e46a4739a12c3b6e63332f16aeb8a0fefbcf1612e8c2da
categories science comms
maintainers michaelld openmaintainer
@@ -25,20 +24,15 @@
port:swig
depends_run-append port:gr-osmosdr
-# allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
+# allow gr-rds to work with both gnuradio and gnuradio-devel ...
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
-# ... but not with gnuradio-legacy or gnuradio-next
+# ... but not with gnuradio-next
pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
- # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
+ # gnuradio-next is installed; this version of gr-rds does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
return -code error "Invalid port dependency: gnuradio-next"
}
Modified: trunk/dports/science/volk/Portfile
===================================================================
--- trunk/dports/science/volk/Portfile 2016-01-19 18:44:59 UTC (rev 144829)
+++ trunk/dports/science/volk/Portfile 2016-01-19 20:16:26 UTC (rev 144830)
@@ -14,9 +14,6 @@
license GPL-3
platforms darwin
-# gnuradio legacy still provides volk
-conflicts gnuradio-legacy
-
# common directory for storing downloaded tarballs
dist_subdir volk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160119/8a1c5e3f/attachment-0001.html>
More information about the macports-changes
mailing list