svn commit: r308561 - in head/comms/gnuradio: . files

Diane Bruce db at FreeBSD.org
Sun Dec 9 20:19:50 UTC 2012 

Author: db
Date: Sun Dec  9 20:19:41 2012
New Revision: 308561
URL: http://svnweb.freebsd.org/changeset/ports/308561

Log:
  - Update to 3.6.2
  - Needs the usrp port
  
  Tested by:	lrk at ovillatx.sytes.net

Added:
  head/comms/gnuradio/files/patch-CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake   (contents, props changed)
  head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake   (contents, props changed)
  head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in   (contents, props changed)
  head/comms/gnuradio/files/patch-gnuradio-core_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-atsc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-audio_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-audio_lib_alsa_audio_alsa_sink.cc   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-audio_lib_alsa_audio_alsa_source.cc   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-audio_lib_oss_audio_oss_sink.cc   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-audio_lib_oss_audio_oss_source.cc   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-comedi_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-digital_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-fcd_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-fft_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-filter_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-noaa_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-pager_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-shd_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-trellis_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-video-sdl_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-vocoder_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-wavelet_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-grc_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-gruel_CMakeLists.txt   (contents, props changed)
  head/comms/gnuradio/files/patch-volk_CMakeLists.txt   (contents, props changed)
Deleted:
  head/comms/gnuradio/files/patch-config_usrp_sdcc.m4
  head/comms/gnuradio/files/patch-configure.ac
  head/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
  head/comms/gnuradio/files/patch-gnuradio-core_src_lib_general_Makefile.in
  head/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_Makefile.in
  head/comms/gnuradio/files/patch-gnuradio-core_src_lib_reed-solomon_Makefile.in
  head/comms/gnuradio/files/patch-gnuradio-core_src_lib_runtime_Makefile.in
  head/comms/gnuradio/files/patch-gnuradio-core_src_lib_swig_Makefile.in
  head/comms/gnuradio/files/patch-gnuradio-core_src_lib_viterbi_Makefile.in
  head/comms/gnuradio/files/patch-gr-audio-oss_Makefile.in
  head/comms/gnuradio/files/patch-gr-trellis_Makefile.in
  head/comms/gnuradio/files/patch-gr-usrp_Makefile.in
  head/comms/gnuradio/files/patch-gr-wxgui_Makefile.in
  head/comms/gnuradio/files/patch-grc_Makefile.in
  head/comms/gnuradio/files/patch-gruel_Makefile.in
  head/comms/gnuradio/files/patch-mblock_Makefile.in
  head/comms/gnuradio/files/patch-omnithread_Makefile.in
  head/comms/gnuradio/files/patch-pmt_Makefile.in
  head/comms/gnuradio/files/patch-usrp_Makefile.in
  head/comms/gnuradio/files/patch-usrp_firmware_include_fx2regs.h
  head/comms/gnuradio/files/patch-usrp_firmware_include_i2c.h
  head/comms/gnuradio/files/patch-usrp_firmware_include_syncdelay.h
  head/comms/gnuradio/files/patch-usrp_firmware_include_usb_common.h
  head/comms/gnuradio/files/patch-usrp_firmware_include_usb_descriptors.h
  head/comms/gnuradio/files/patch-usrp_firmware_lib_delay.c
  head/comms/gnuradio/files/patch-usrp_firmware_lib_fx2utils.c
  head/comms/gnuradio/files/patch-usrp_firmware_lib_i2c.c
  head/comms/gnuradio/files/patch-usrp_firmware_lib_isr.c
  head/comms/gnuradio/files/patch-usrp_firmware_lib_usb_common.c
  head/comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.c
  head/comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.h
  head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_board_specific.c
  head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_eeprom_init.c
  head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_eeprom_io.c
  head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_eeprom_io.h
  head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_fpga_rev2.c
  head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.c
  head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.h
  head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_usrp_main.c
  head/comms/gnuradio/files/patch-usrp_host_lib_legacy_usrp_prims.cc
  head/comms/gnuradio/files/wxgui_src_python_init.py
Modified:
  head/comms/gnuradio/Makefile
  head/comms/gnuradio/distinfo   (contents, props changed)
  head/comms/gnuradio/pkg-descr   (contents, props changed)
  head/comms/gnuradio/pkg-plist   (contents, props changed)

Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile	Sun Dec  9 20:00:19 2012	(r308560)
+++ head/comms/gnuradio/Makefile	Sun Dec  9 20:19:41 2012	(r308561)
@@ -1,55 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
-PORTVERSION=	3.2.2
-PORTREVISION=	4
+PORTVERSION=	3.6.2
 CATEGORIES=	comms astro hamradio
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gnuradio
-DIST_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
 
 MAINTAINER=	db at FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 
-BUILD_DEPENDS=	sdcc>=3.0.0:${PORTSDIR}/lang/sdcc \
-		sdl-config:${PORTSDIR}/devel/sdl12 \
-		swig:${PORTSDIR}/devel/swig13 \
-		cppunit-config:${PORTSDIR}/devel/cppunit \
-		${LOCALBASE}/bin/cheetah:${PORTSDIR}/devel/py-cheetah \
-		py*-lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		guile:${PORTSDIR}/lang/guile
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
-		fftw3f:${PORTSDIR}/math/fftw3-float \
+BUILD_DEPENDS=	sdl-config:${PORTSDIR}/devel/sdl12\
+		swig:${PORTSDIR}/devel/swig13\
+		cheetah:${PORTSDIR}/devel/py-cheetah\
+		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \
+		py*-lxml>=0:${PORTSDIR}/devel/py-lxml\
+		${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2\
+		${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4\
+		xdg-open:${PORTSDIR}/devel/xdg-utils\
+		guile:${PORTSDIR}/lang/guile\
+		git:${PORTSDIR}/devel/git\
+		jackd:${PORTSDIR}/audio/jack\
+		aserver:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3\
+		fftw3f:${PORTSDIR}/math/fftw3-float\
+		qwt:${PORTSDIR}/x11-toolkits/qwt5 \
 		boost_python:${PORTSDIR}/devel/boost-python-libs \
 		gsl:${PORTSDIR}/math/gsl
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem
+		${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem\
+		${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4
 
-USE_GMAKE=	yes
-USE_PYTHON=	2.5+
+USE_CMAKE=	yes
+CMAKE_VERBOSE=	yes
+CMAKE_OUTSOURCE=	yes
+DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
+#CMAKE_ARGS=	--debug-output --trace
+CMAKE_ARGS=+	--debug-output
+USE_PYTHON=	2.7+
 USE_WX=		2.6+
+USE_QT4=	gui xml qmake moc rcc uic
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf libtool
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS=	--with-boost-include-dir="${LOCALBASE}/include/" \
-		--enable-grc \
-		--enable-usrp \
-		--enable-gr-usrp \
-		--disable-gr-audio-jack \
-		--disable-gr-audio-portaudio \
-		--enable-gr-audio-oss \
-		--enable-gr-wxgui \
-		--enable-gnuradio-examples \
-		--disable-doxygen \
-		--disable-html-docs \
-		--disable-latex-docs
 
 .include <bsd.port.pre.mk>
 
@@ -57,42 +48,58 @@ CONFIGURE_ARGS=	--with-boost-include-dir
 LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
 .endif
 
-AUTOTOOLSFILES=	${ACLOCAL}
-
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
+OPTIONS_DEFINE=		USRP TESTING
+OPTIONS_DEFAULT=	USRP
+USRP_DESC=	Include USRP support (UHD) from Ettus
+TESTING_DESC=	Include testing support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
+		${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \
+		dot:${PORTSDIR}/graphics/graphviz \
+		xmlto:${PORTSDIR}/textproc/xmlto \
+		${LOCALBASE}/lib/X11/fonts/freefont-ttf/fonts.scale:${PORTSDIR}/x11-fonts/freefont-ttf \
+		latex:${PORTSDIR}/print/teTeX
+CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="ON"
+HAVE_PORTDOCS=	YES
+.else
+CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="OFF"
+.endif
+
+.if ${PORT_OPTIONS:MUSRP}
+CMAKE_ARGS+=	-DENABLE_GR_UHD:STRING="ON"
+BUILD_DEPENDS+=	${LOCALBASE}/include/uhd/config.hpp:${PORTSDIR}/comms/usrp
+PLIST_SUB+=	UHD=""
+.else
+CMAKE_ARGS+=	-DENABLE_GR_UHD:STRING="OFF"
+PLIST_SUB+=	UHD="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MTESTING}
+CMAKE_ARGS+=	-DENABLE_TESTING:STRING="ON"
+BUILD_DEPENDS+=	cppunit-config:${PORTSDIR}/devel/cppunit
+.else
+CMAKE_ARGS+=	-DENABLE_TESTING:STRING="OFF"
+.endif
+
 post-patch:
-	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
-		-n 10 ${REINPLACE_CMD} -E -e \
-		's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!' \
-		-e 's|/gnuradio/examples|/examples/gnuradio|'
-	@${REINPLACE_CMD} -e 's|^GR_FORTRAN||g' ${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e 's|%%LIBDATA%%|${PREFIX}/libdata|' \
-	    ${WRKSRC}/gnuradio-core/Makefile.in ${WRKSRC}/usrp/Makefile.in \
-	    ${WRKSRC}/omnithread/Makefile.in ${WRKSRC}/pmt/Makefile.in \
-	    ${WRKSRC}/gr-usrp/Makefile.in ${WRKSRC}/gr-wxgui/Makefile.in \
-	    ${WRKSRC}/gruel/Makefile.in ${WRKSRC}/mblock/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
+		${WRKSRC}/docs/doxygen/Doxyfile.in
+
 pre-install:
-	@${CP}	${FILESDIR}/wxgui_src_python_init.py \
-		${WRKSRC}/gr-wxgui/src/python/__init__.py
+	${MKDIR}		${PREFIX}/include/gruel
+	${INSTALL_DATA}		${WRKSRC}/gruel/src/include/gruel/*.h \
+		${PREFIX}/include/gruel
+
 post-install:
-	@${INSTALL_DATA}	${WRKSRC}/gnuradio-core/gnuradio-core.conf \
-	    ${PREFIX}/etc/gnuradio/gnuradio-core.conf.sample
-	@${INSTALL_DATA}	${WRKSRC}/gr-audio-oss/gr-audio-oss.conf \
-	    ${PREFIX}/etc/gnuradio/gr-audio-oss.conf.sample
-	@${INSTALL_DATA}	${WRKSRC}/gr-wxgui/gr-wxgui.conf \
-	    ${PREFIX}/etc/gnuradio/gr-wxgui.conf.sample
-	@${INSTALL_DATA}	${WRKSRC}/grc/grc.conf \
-	    ${PREFIX}/etc/gnuradio/grc.conf.sample
-.if	!defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.hacking ${DOCSDIR}
+.if	defined(HAVE_PORTDOCS)
 	@${ECHO} gnuradio docs are in ${DOCSDIR}
 .endif
-	@${ECHO} sample conf files are in ${PREFIX}/etc/gnuradio
-	@${ECHO} These must be copied to ${PREFIX}/etc/gnuradio/conf.d
-	@${ECHO} without the .sample suffix and edited as needed before use.
+	@${ECHO} conf files are in ${PREFIX}/etc/gnuradio/conf.d
 	@${ECHO}
 
 .include <bsd.port.post.mk>

Modified: head/comms/gnuradio/distinfo
==============================================================================
--- head/comms/gnuradio/distinfo	Sun Dec  9 20:00:19 2012	(r308560)
+++ head/comms/gnuradio/distinfo	Sun Dec  9 20:19:41 2012	(r308561)
@@ -1,2 +1,2 @@
-SHA256 (gnuradio/gnuradio-3.2.2.tar.gz) = 2200b6f5fc8eb1542e893bfc0582c56b430902bd25d6c848d547dcd2fb874c1f
-SIZE (gnuradio/gnuradio-3.2.2.tar.gz) = 6799384
+SHA256 (gnuradio-3.6.2.tar.gz) = 4ce84bf9c6591b5ddc2c384e03e40fc2f0cb8cd1add485ee2d6f26052cc6de35
+SIZE (gnuradio-3.6.2.tar.gz) = 2604075

Added: head/comms/gnuradio/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,55 @@
+--- CMakeLists.txt.orig	2012-09-04 19:43:13.000000000 -0500
++++ CMakeLists.txt	2012-10-26 16:35:52.000000000 -0500
+@@ -96,6 +96,14 @@
+ ########################################################################
+ include(GrPlatform) #define LIB_SUFFIX
+ set(GR_RUNTIME_DIR      bin)
++########################################################################
++# FreeBSD needs libiconv
++########################################################################
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++set(GR_PKGCONFIG_DIR      libdata${LIB_SUFFIX})
++else()
++set(GR_PKGCONFIG_DIR      lib${LIB_SUFFIX})
++endif()
+ set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
+ set(GR_INCLUDE_DIR      include)
+ set(GR_DATA_DIR         share)
+@@ -133,6 +141,22 @@
+ )
+ 
+ ########################################################################
++# FreeBSD needs libiconv
++########################################################################
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++  message( "-- Adding iconv for FreeBSD")
++
++  find_path(ICONV_INCLUDE_DIR
++    NAMES iconv.h
++    PATHS /usr/local/include ${ICONV_INCLUDE_DIRS}
++  )
++
++  find_library(ICONV_LIBRARY
++    NAMES iconv
++    PATHS /usr/local/lib ${ICONV_LIB_DIRS}
++  )
++endif()
++########################################################################
+ # Enable python component
+ ########################################################################
+ find_package(PythonLibs)
+@@ -214,12 +238,13 @@
+ ########################################################################
+ # Distribute the README file
+ ########################################################################
++if(ENABLE_DOXYGEN)
+ install(
+     FILES README README.hacking
+     DESTINATION ${GR_PKG_DOC_DIR}
+     COMPONENT "docs"
+ )
+-
++endif(ENABLE_DOXYGEN)
+ 
+ ########################################################################
+ # Add subdirectories (in order of deps)

Added: head/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,26 @@
+--- cmake/Modules/FindPortaudio.cmake.orig	2012-09-04 19:43:06.000000000 -0500
++++ cmake/Modules/FindPortaudio.cmake	2012-09-28 20:05:36.000000000 -0500
+@@ -6,7 +6,13 @@
+ #  PORTAUDIO_LIBRARIES - Link these to use Portaudio
+ 
+ include(FindPkgConfig)
+-pkg_check_modules(PC_PORTAUDIO portaudio)
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++  message( "--- Using Portaudio2 for FreeBSD")
++  set(PORTAUDIO_FOUND TRUE)
++  set(PORTAUDIO_INCLUDE_DIRS "/usr/local/include/portaudio2")
++  set(PORTAUDIO_LIBRARIES "/usr/local/lib/portaudio2/libportaudio.so")
++else()
++  pkg_check_modules(PC_PORTAUDIO portaudio)
+ 
+ find_path(PORTAUDIO_INCLUDE_DIRS
+   NAMES
+@@ -28,7 +34,7 @@
+   HINTS
+     ${PC_PORTAUDIO_LIBDIR}
+ )
+-
++endif()
+ mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)
+ 
+ INCLUDE(FindPackageHandleStandardArgs)

Added: head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,42 @@
+--- cmake/Modules/FindUSB.cmake.orig	2012-09-04 19:43:06.000000000 -0500
++++ cmake/Modules/FindUSB.cmake	2012-09-27 14:10:21.000000000 -0500
+@@ -1,20 +1,34 @@
+ if(NOT LIBUSB_FOUND)
+-  pkg_check_modules (LIBUSB_PKG libusb-1.0)
+-  find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
++    pkg_check_modules (LIBUSB_PKG libusb-1.0)
++
++    find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
+     PATHS
+     ${LIBUSB_PKG_INCLUDE_DIRS}
+     /usr/include/libusb-1.0
+     /usr/include
+-    /usr/local/include
+   )
+ 
+-  find_library(LIBUSB_LIBRARIES NAMES usb-1.0
++  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++    message(status " Looking for FreeBSD usb")
++    find_library(LIBUSB_LIBRARIES NAMES usb-1.0
++    PATHS
++    ${LIBUSB_PKG_LIBRARY_DIRS}
++    /usr/lib
++  )
++  elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++    find_library(LIBUSB_LIBRARIES NAMES usb-1.0
+     PATHS
+     ${LIBUSB_PKG_LIBRARY_DIRS}
+     /usr/lib
+-    /usr/local/lib
+   )
++  endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ 
++  find_library(LIBUSB_LIBRARIES NAMES usb
++    PATHS
++    ${LIBUSB_PKG_LIBRARY_DIRS}
++    /usr/lib
++    /usr/local/lib
++  )
+ if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+   set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found")
+   message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}")

Added: head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- docs/doxygen/Doxyfile.in.orig	2012-09-04 19:43:06.000000000 -0500
++++ docs/doxygen/Doxyfile.in	2012-10-21 17:33:21.000000000 -0500
+@@ -1411,7 +1411,7 @@
+ # different font using DOT_FONTNAME you can set the path where dot
+ # can find it using this tag.
+ 
+-DOT_FONTPATH           =
++DOT_FONTPATH           =	%%PREFIX%%/lib/X11/fonts/freefont-ttf
+ 
+ # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+ # will generate a graph for each documented class showing the direct and

Added: head/comms/gnuradio/files/patch-gnuradio-core_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gnuradio-core_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,27 @@
+--- gnuradio-core/CMakeLists.txt.orig	2012-09-04 19:43:06.000000000 -0500
++++ gnuradio-core/CMakeLists.txt	2012-10-01 11:39:50.000000000 -0500
+@@ -108,6 +108,15 @@
+     DEPENDS      "gruel_swig;core_python;core_devel"
+ )
+ 
++# Install an original for FreeBSD
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++install(
++    FILES gnuradio-core.conf
++    DESTINATION ${GR_PREFSDIR}
++    RENAME "gnuradio-core.conf.sample"
++    COMPONENT "core_runtime"
++)
++endif()
+ install(
+     FILES gnuradio-core.conf
+     DESTINATION ${GR_PREFSDIR}
+@@ -137,7 +146,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "core_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-atsc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-atsc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-atsc/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-atsc/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -99,7 +99,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-atsc.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "atsc_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-audio_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-audio_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-audio/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-audio/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -105,7 +105,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-audio.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "audio_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,12 @@
+--- gr-audio/doc/CMakeLists.txt.orig	2012-10-26 13:30:24.000000000 -0500
++++ gr-audio/doc/CMakeLists.txt	2012-10-26 13:30:54.000000000 -0500
+@@ -17,7 +17,9 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street,
+ # Boston, MA 02110-1301, USA.
+ 
++if(ENABLE_DOXYGEN)
+ install(
+     FILES README.audio
+     DESTINATION ${GR_PKG_DOC_DIR}
+ )
++endif(ENABLE_DOXYGEN)

Added: head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,24 @@
+--- gr-audio/lib/CMakeLists.txt.orig	2012-09-04 19:43:06.000000000 -0500
++++ gr-audio/lib/CMakeLists.txt	2012-10-01 11:36:39.000000000 -0500
+@@ -116,8 +116,8 @@
+ find_package(Portaudio)
+ 
+ if(PORTAUDIO_FOUND)
+-
+-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio ${PORTAUDIO_INCLUDE_DIRS})
++    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio)
++    include_directories(BEFORE ${PORTAUDIO_INCLUDE_DIRS})
+     list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES})
+     add_definitions(${PORTAUDIO_DEFINITIONS})
+     list(APPEND gr_audio_sources
+@@ -151,3 +151,10 @@
+ GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
+ 
+ install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime")
++# Install an original copy for FreeBSD
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++foreach(conf_file ${gr_audio_confs})
++  get_filename_component(nconf_file ${conf_file} NAME)
++  install(FILES ${conf_file} DESTINATION ${GR_PREFSDIR} RENAME ${nconf_file}.sample COMPONENT "audio_run_time")
++endforeach(conf_file)
++endif()

Added: head/comms/gnuradio/files/patch-gr-audio_lib_alsa_audio_alsa_sink.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-audio_lib_alsa_audio_alsa_sink.cc	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,25 @@
+--- gr-audio/lib/alsa/audio_alsa_sink.cc.orig	2012-11-11 17:25:57.000000000 -0500
++++ gr-audio/lib/alsa/audio_alsa_sink.cc	2012-11-11 17:29:43.000000000 -0500
+@@ -24,6 +24,10 @@
+ #include "config.h"
+ #endif
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ #include "gr_audio_registry.h"
+ #include <audio_alsa_sink.h>
+ #include <gr_io_signature.h>
+@@ -33,7 +37,11 @@
+ #include <stdexcept>
+ #include <gri_alsa.h>
+ 
++#if defined(BSD)
++AUDIO_REGISTER_SINK(REG_PRIO_LOW, alsa)(
++#else
+ AUDIO_REGISTER_SINK(REG_PRIO_HIGH, alsa)(
++#endif
+     int sampling_rate, const std::string &device_name, bool ok_to_block
+ ){
+     return audio_sink::sptr(new audio_alsa_sink(sampling_rate, device_name, ok_to_block));

Added: head/comms/gnuradio/files/patch-gr-audio_lib_alsa_audio_alsa_source.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-audio_lib_alsa_audio_alsa_source.cc	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,25 @@
+--- gr-audio/lib/alsa/audio_alsa_source.cc.orig	2012-11-11 17:33:00.000000000 -0500
++++ gr-audio/lib/alsa/audio_alsa_source.cc	2012-11-11 17:33:39.000000000 -0500
+@@ -24,6 +24,10 @@
+ #include "config.h"
+ #endif
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ #include "gr_audio_registry.h"
+ #include <audio_alsa_source.h>
+ #include <gr_io_signature.h>
+@@ -33,7 +37,11 @@
+ #include <stdexcept>
+ #include <gri_alsa.h>
+ 
++#if defined(BSD)
++AUDIO_REGISTER_SOURCE(REG_PRIO_LOW, alsa)(
++#else
+ AUDIO_REGISTER_SOURCE(REG_PRIO_HIGH, alsa)(
++#endif
+     int sampling_rate, const std::string &device_name, bool ok_to_block
+ ){
+     return audio_source::sptr(new audio_alsa_source(sampling_rate, device_name, ok_to_block));

Added: head/comms/gnuradio/files/patch-gr-audio_lib_oss_audio_oss_sink.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-audio_lib_oss_audio_oss_sink.cc	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,25 @@
+--- gr-audio/lib/oss/audio_oss_sink.cc.orig	2012-11-11 17:30:04.000000000 -0500
++++ gr-audio/lib/oss/audio_oss_sink.cc	2012-11-11 17:30:48.000000000 -0500
+@@ -24,6 +24,10 @@
+ #include "config.h"
+ #endif
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ #include "gr_audio_registry.h"
+ #include <audio_oss_sink.h>
+ #include <gr_io_signature.h>
+@@ -38,7 +42,11 @@
+ #include <iostream>
+ #include <stdexcept>
+ 
++#if defined(BSD)
++AUDIO_REGISTER_SINK(REG_PRIO_HIGH, oss)(
++#else
+ AUDIO_REGISTER_SINK(REG_PRIO_LOW, oss)(
++#endif
+     int sampling_rate, const std::string &device_name, bool ok_to_block
+ ){
+     return audio_sink::sptr(new audio_oss_sink(sampling_rate, device_name, ok_to_block));

Added: head/comms/gnuradio/files/patch-gr-audio_lib_oss_audio_oss_source.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-audio_lib_oss_audio_oss_source.cc	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,25 @@
+--- gr-audio/lib/oss/audio_oss_source.cc.orig	2012-11-11 17:35:33.000000000 -0500
++++ gr-audio/lib/oss/audio_oss_source.cc	2012-11-11 17:36:40.000000000 -0500
+@@ -24,6 +24,10 @@
+ #include "config.h"
+ #endif
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ #include "gr_audio_registry.h"
+ #include <audio_oss_source.h>
+ #include <gr_io_signature.h>
+@@ -38,7 +42,11 @@
+ #include <iostream>
+ #include <stdexcept>
+ 
++#if defined(BSD)
++AUDIO_REGISTER_SOURCE(REG_PRIO_HIGH, oss)(
++#else
+ AUDIO_REGISTER_SOURCE(REG_PRIO_LOW, oss)(
++#endif
+     int sampling_rate, const std::string &device_name, bool ok_to_block
+ ){
+     return audio_source::sptr(new audio_oss_source(sampling_rate, device_name, ok_to_block));

Added: head/comms/gnuradio/files/patch-gr-comedi_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-comedi_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-comedi/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-comedi/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -97,7 +97,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-comedi.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "comedi_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-digital_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-digital_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-digital/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-digital/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -103,7 +103,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-digital.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "digital_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,12 @@
+--- gr-digital/doc/CMakeLists.txt.orig	2012-10-26 14:12:21.000000000 -0500
++++ gr-digital/doc/CMakeLists.txt	2012-10-26 14:12:43.000000000 -0500
+@@ -17,7 +17,9 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street,
+ # Boston, MA 02110-1301, USA.
+ 
++if(ENABLE_DOXYGEN)
+ install(
+     FILES README.digital
+     DESTINATION ${GR_PKG_DOC_DIR}
+ )
++endif(ENABLE_DOXYGEN)

Added: head/comms/gnuradio/files/patch-gr-fcd_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-fcd_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-fcd/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-fcd/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -123,7 +123,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fcd.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "fcd_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,12 @@
+--- gr-fcd/doc/CMakeLists.txt.orig	2012-10-26 14:01:36.000000000 -0500
++++ gr-fcd/doc/CMakeLists.txt	2012-10-26 14:02:32.000000000 -0500
+@@ -17,7 +17,9 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street,
+ # Boston, MA 02110-1301, USA.
+ 
++if(ENABLE_DOXYGEN)
+ install(
+     FILES README.fcd
+     DESTINATION ${GR_PKG_DOC_DIR}
+ )
++endif(ENABLE_DOXYGEN)

Added: head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,21 @@
+--- gr-fcd/lib/CMakeLists.txt.orig	2012-09-27 16:54:12.000000000 -0500
++++ gr-fcd/lib/CMakeLists.txt	2012-09-27 17:09:46.000000000 -0500
+@@ -30,6 +30,7 @@
+     ${CMAKE_CURRENT_SOURCE_DIR}/hid
+     ${CMAKE_CURRENT_SOURCE_DIR}/fcd
+     ${LIBUSB_INCLUDE_DIR}
++    ${ICONV_INCLUDE_DIRS}
+ )
+ 
+ include_directories(${Boost_INCLUDE_DIRS})
+@@ -66,6 +67,10 @@
+ if (LINUX)
+   list(APPEND fcd_libs rt)
+ endif()
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++  message( "--- Adding iconv library for FreeBSD")
++  list(APPEND fcd_libs ${ICONV_LIBRARY})
++endif()
+ target_link_libraries(gnuradio-fcd ${fcd_libs})
+ 
+ 

Added: head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,42 @@
+--- gr-fcd/lib/hid/hid-libusb.c.orig	2012-09-27 14:50:40.000000000 -0500
++++ gr-fcd/lib/hid/hid-libusb.c	2012-09-27 15:45:03.000000000 -0500
+@@ -48,6 +48,12 @@
+ 
+ #include "hidapi.h"
+ 
++#ifdef __FreeBSD__
++#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n)	libusb_get_string_descriptor_ascii(h,i,d,n)
++#else
++#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n)	libusb_get_string_descriptor(h,i,l,d,n)
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -264,7 +270,7 @@
+ 	int len;
+ 
+ 	/* Get the string from libusb. */
+-	len = libusb_get_string_descriptor(dev,
++	len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
+ 			0x0, /* String ID */
+ 			0x0, /* Language */
+ 			(unsigned char*)buf,
+@@ -282,7 +288,7 @@
+ 	int i;
+ 
+ 	/* Get the string from libusb. */
+-	len = libusb_get_string_descriptor(dev,
++	len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
+ 			0x0, /* String ID */
+ 			0x0, /* Language */
+ 			(unsigned char*)buf,
+@@ -327,7 +333,7 @@
+ 		lang = get_first_language(dev);
+ 
+ 	/* Get the string from libusb. */
+-	len = libusb_get_string_descriptor(dev,
++	len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
+ 			idx,
+ 			lang,
+ 			(unsigned char*)buf,

Added: head/comms/gnuradio/files/patch-gr-fft_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-fft_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-fft/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-fft/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -104,7 +104,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fft.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "fft_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,12 @@
+--- gr-fft/doc/CMakeLists.txt.orig	2012-10-26 14:15:37.000000000 -0500
++++ gr-fft/doc/CMakeLists.txt	2012-10-26 14:16:13.000000000 -0500
+@@ -17,7 +17,9 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street,
+ # Boston, MA 02110-1301, USA.
+ 
++if(ENABLE_DOXYGEN)
+ install(
+     FILES README.fft
+     DESTINATION ${GR_PKG_DOC_DIR}
+ )
++endif(ENABLE_DOXYGEN)

Added: head/comms/gnuradio/files/patch-gr-filter_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-filter_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-filter/CMakeLists.txt.orig	2012-09-30 11:27:21.000000000 -0500
++++ gr-filter/CMakeLists.txt	2012-09-30 11:27:21.000000000 -0500
+@@ -106,7 +106,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-filter.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "filter_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,12 @@
+--- gr-filter/doc/CMakeLists.txt.orig	2012-10-26 14:11:17.000000000 -0500
++++ gr-filter/doc/CMakeLists.txt	2012-10-26 14:10:40.000000000 -0500
+@@ -17,7 +17,9 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street,
+ # Boston, MA 02110-1301, USA.
+ 
++if(ENABLE_DOXYGEN)
+ install(
+     FILES README.filter
+     DESTINATION ${GR_PKG_DOC_DIR}
+ )
++endif(ENABLE_DOXYGEN)

Added: head/comms/gnuradio/files/patch-gr-noaa_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-noaa_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-noaa/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-noaa/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -96,7 +96,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-noaa.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "noaa_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-pager_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-pager_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-pager/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-pager/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -95,7 +95,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-pager.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "pager_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-qtgui/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-qtgui/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -123,7 +123,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-qtgui.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "qtgui_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,12 @@
+--- gr-qtgui/doc/CMakeLists.txt.orig	2012-10-26 14:13:45.000000000 -0500
++++ gr-qtgui/doc/CMakeLists.txt	2012-10-26 14:14:17.000000000 -0500
+@@ -17,7 +17,9 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street,
+ # Boston, MA 02110-1301, USA.
+ 
++if(ENABLE_DOXYGEN)
+ install(
+     FILES README.qtgui
+     DESTINATION ${GR_PKG_DOC_DIR}
+ )
++endif(ENABLE_DOXYGEN)

Added: head/comms/gnuradio/files/patch-gr-shd_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-shd_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-shd/CMakeLists.txt.orig	2012-09-30 11:27:21.000000000 -0500
++++ gr-shd/CMakeLists.txt	2012-09-30 11:27:21.000000000 -0500
+@@ -120,7 +120,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-shd.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "shd_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-trellis_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-trellis_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-trellis/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-trellis/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -113,7 +113,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "trellis_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,29 @@
+--- gr-trellis/doc/CMakeLists.txt.orig	2012-09-04 19:43:06.000000000 -0500
++++ gr-trellis/doc/CMakeLists.txt	2012-10-26 16:40:45.000000000 -0500
+@@ -32,12 +32,14 @@
+         ${CMAKE_CURRENT_SOURCE_DIR}/gr-trellis.xml
+ )
+ add_custom_target(gr_trellis_html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html)
++if(ENABLE_DOXYGEN)
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html
+     DESTINATION ${GR_PKG_DOC_DIR}/html
+     COMPONENT "trellis_docs"
+ 
+ )
++endif(ENABLE_DOXYGEN)
+ endif(XMLTO_EXECUTABLE)
+ 
+ ########################################################################
+@@ -65,9 +67,11 @@
+     ${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml
+     ${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml
+ )
++if(ENABLE_DOXYGEN)
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml
+     ${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml
+     DESTINATION ${GR_PKG_DOC_DIR}/xml
+     COMPONENT "trellis_docs"
+ )
++endif(ENABLE_DOXYGEN)

Added: head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-uhd/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-uhd/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -112,7 +112,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "uhd_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,12 @@
+--- gr-uhd/doc/CMakeLists.txt.orig	2012-10-26 14:19:53.000000000 -0500
++++ gr-uhd/doc/CMakeLists.txt	2012-10-26 14:20:52.000000000 -0500
+@@ -17,7 +17,9 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street,
+ # Boston, MA 02110-1301, USA.
+ 
++if(ENABLE_DOXYGEN)
+ install(
+     FILES README.uhd
+     DESTINATION ${GR_PKG_DOC_DIR}
+ )
++endif(ENABLE_DOXYGEN)

Added: head/comms/gnuradio/files/patch-gr-video-sdl_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-video-sdl_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-video-sdl/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-video-sdl/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -92,7 +92,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "video_sdl_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-vocoder_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-vocoder_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-vocoder/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-vocoder/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -106,7 +106,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-vocoder.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "vocoder_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,12 @@
+--- gr-vocoder/doc/CMakeLists.txt.orig	2012-10-26 16:37:48.000000000 -0500
++++ gr-vocoder/doc/CMakeLists.txt	2012-10-26 16:38:11.000000000 -0500
+@@ -17,7 +17,9 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street,
+ # Boston, MA 02110-1301, USA.
+ 
++if(ENABLE_DOXYGEN)
+ install(
+     FILES README.vocoder
+     DESTINATION ${GR_PKG_DOC_DIR}
+ )
++endif(ENABLE_DOXYGEN)

Added: head/comms/gnuradio/files/patch-gr-wavelet_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-wavelet_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gr-wavelet/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gr-wavelet/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -102,7 +102,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-wavelet.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "wavelet_devel"
+ )
+ 

Added: head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,29 @@
+--- gr-wxgui/CMakeLists.txt.orig	2012-09-04 19:43:06.000000000 -0500
++++ gr-wxgui/CMakeLists.txt	2012-10-01 11:49:03.000000000 -0500
+@@ -64,16 +64,24 @@
+     ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.pc.in
+     ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc
+ @ONLY)
+-
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "wxgui"
+ )
+ 
+ ########################################################################
+ # Install the conf file
+ ########################################################################
++# Install an original for FreeBSD
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++install(
++    FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf
++    DESTINATION ${GR_PREFSDIR}
++    RENAME "gr-wxgui.conf.sample"
++    COMPONENT "wxgui"
++)
++endif()
+ install(
+     FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf
+     DESTINATION ${GR_PREFSDIR}

Added: head/comms/gnuradio/files/patch-grc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-grc_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,18 @@
+--- grc/CMakeLists.txt.orig	2012-09-04 19:43:06.000000000 -0500
++++ grc/CMakeLists.txt	2012-10-01 11:39:07.000000000 -0500
+@@ -73,6 +73,15 @@
+     ${CMAKE_CURRENT_BINARY_DIR}/grc.conf
+ @ONLY)
+ 
++# FreeBSD needs an original copy
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++install(
++    FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf
++    DESTINATION ${GR_PREFSDIR}
++    RENAME "grc.conf.sample"
++    COMPONENT "grc"
++)
++endif()
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf
+     DESTINATION ${GR_PREFSDIR}

Added: head/comms/gnuradio/files/patch-gruel_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gruel_CMakeLists.txt	Sun Dec  9 20:19:41 2012	(r308561)
@@ -0,0 +1,11 @@
+--- gruel/CMakeLists.txt.orig	2012-09-30 11:27:22.000000000 -0500
++++ gruel/CMakeLists.txt	2012-09-30 11:27:22.000000000 -0500
+@@ -97,7 +97,7 @@
+ 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list