From owner-svn-ports-head@FreeBSD.ORG Fri Nov 8 10:49:17 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D6999C0D; Fri, 8 Nov 2013 10:49:17 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A948D20F8; Fri, 8 Nov 2013 10:49:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA8AnHI2038982; Fri, 8 Nov 2013 10:49:17 GMT (envelope-from martymac@svn.freebsd.org) Received: (from martymac@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA8AnHfZ038980; Fri, 8 Nov 2013 10:49:17 GMT (envelope-from martymac@svn.freebsd.org) Message-Id: <201311081049.rA8AnHfZ038980@svn.freebsd.org> From: Ganael LAPLANCHE Date: Fri, 8 Nov 2013 10:49:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333197 - head/comms/gr-osmosdr X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 10:49:17 -0000 Author: martymac Date: Fri Nov 8 10:49:16 2013 New Revision: 333197 URL: http://svnweb.freebsd.org/changeset/ports/333197 Log: - Enable staging - Use new LIB_DEPENDS format - Use new options framework Modified: head/comms/gr-osmosdr/Makefile head/comms/gr-osmosdr/pkg-plist (contents, props changed) Modified: head/comms/gr-osmosdr/Makefile ============================================================================== --- head/comms/gr-osmosdr/Makefile Fri Nov 8 10:45:31 2013 (r333196) +++ head/comms/gr-osmosdr/Makefile Fri Nov 8 10:49:16 2013 (r333197) @@ -15,11 +15,11 @@ LICENSE= GPLv3 BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 \ cheetah:${PORTSDIR}/devel/py-cheetah -LIB_DEPENDS= gnuradio-core:${PORTSDIR}/comms/gnuradio \ - gnuradio-fcd:${PORTSDIR}/comms/gnuradio \ - gruel:${PORTSDIR}/comms/gnuradio \ - boost_system:${PORTSDIR}/devel/boost-libs \ - boost_thread:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= libgnuradio-core.so:${PORTSDIR}/comms/gnuradio \ + libgnuradio-fcd.so:${PORTSDIR}/comms/gnuradio \ + libgruel.so:${PORTSDIR}/comms/gnuradio \ + libboost_system.so:${PORTSDIR}/devel/boost-libs \ + libboost_thread.so:${PORTSDIR}/devel/boost-libs USES= pkgconfig cmake USE_LDCONFIG= yes @@ -32,17 +32,11 @@ CMAKE_ARGS+= -DENABLE_DEFAULT:BOOL=OFF \ OPTIONS_DEFINE= RTLSDR RTLSDR_DESC= Enable rtl-sdr (RTL2832) support OPTIONS_DEFAULT= RTLSDR - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MRTLSDR} -LIB_DEPENDS+= rtlsdr:${PORTSDIR}/comms/rtl-sdr -CMAKE_ARGS+= -DENABLE_RTL:BOOL=ON \ - -DENABLE_RTL_TCP:BOOL=ON -.endif +RTLSDR_LIB_DEPENDS= librtlsdr.so:${PORTSDIR}/comms/rtl-sdr +RTLSDR_CMAKE_ON= -DENABLE_RTL:BOOL=ON -DENABLE_RTL_TCP:BOOL=ON post-install: - ${LN} -s libgnuradio-osmosdr.so.0.0.1git ${PREFIX}/lib/libgnuradio-osmosdr.so.0 + @${LN} -sf libgnuradio-osmosdr.so.0.0.1git \ + ${STAGEDIR}${PREFIX}/lib/libgnuradio-osmosdr.so.0 .include Modified: head/comms/gr-osmosdr/pkg-plist ============================================================================== --- head/comms/gr-osmosdr/pkg-plist Fri Nov 8 10:45:31 2013 (r333196) +++ head/comms/gr-osmosdr/pkg-plist Fri Nov 8 10:49:16 2013 (r333197) @@ -29,4 +29,9 @@ share/gnuradio/grc/blocks/osmosdr_source %%PYTHON_SITELIBDIR%%/osmosdr/__init__.pyo @dirrm include/osmosdr/swig @dirrm include/osmosdr +@dirrmtry share/gnuradio/grc/blocks +@dirrmtry share/gnuradio/grc +@dirrmtry share/gnuradio @dirrm %%PYTHON_SITELIBDIR%%/osmosdr +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%%