From 378ef567de77d2b9fe9450e81c02c1143f67c13b Mon Sep 17 00:00:00 2001 From: mef Date: Tue, 28 Oct 2014 06:41:20 +0000 Subject: Fix problem raised by PR pkg/49313 by Ben Gergely, if xdg-utils are installed already, grc_setup_freedesktop is installed. (gnuradio-companion/Makefile) (gnuradio-companion/PLIST) - Add DEPENDS misc/xdg-utils - Add REPLACE_BASH for above newly installed script - Bump PKGREVISION Related changes, problem was hidden if PKGREVISION was empty. (gnuradio-core/Makefile.common) -> PLIST_SUBST (gnuradio-core/Nocore.mk) -> sed STRING (gnuradio-core/PLIST) - shared library was suffixed as ${PKGVERSION}, but this should be ${PKGVERSION_NOREV} instead. Above files are affected. (gnuradio-core/files/REPLACE_PYTHON) - Add one file grc/python/flow_graph.tmpl --- ham/gnuradio-companion/Makefile | 5 ++++- ham/gnuradio-companion/PLIST | 3 ++- ham/gnuradio-core/Makefile.common | 3 ++- ham/gnuradio-core/Nocore.mk | 4 ++-- ham/gnuradio-core/PLIST | 30 +++++++++++++++--------------- ham/gnuradio-core/files/REPLACE_PYTHON | 1 + 6 files changed, 26 insertions(+), 20 deletions(-) (limited to 'ham') diff --git a/ham/gnuradio-companion/Makefile b/ham/gnuradio-companion/Makefile index c60ba9aa7af..105c3ba0c85 100644 --- a/ham/gnuradio-companion/Makefile +++ b/ham/gnuradio-companion/Makefile @@ -1,11 +1,14 @@ -# $NetBSD: Makefile,v 1.1 2014/10/13 12:51:08 mef Exp $ +# $NetBSD: Makefile,v 1.2 2014/10/28 06:41:20 mef Exp $ PKGNAME= gnuradio-companion-${VERSION} +PKGREVISION= 1 COMMENT= User interface entry of GNU Radio CONF_FILES+= ${EGDIR}/grc.conf ${PKG_SYSCONFDIR}/grc.conf DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml/ +DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils +REPLACE_BASH= grc/freedesktop/grc_setup_freedesktop.in .include "../../ham/gnuradio-core/Makefile.common" .include "../../ham/gnuradio-core/Nocore.mk" diff --git a/ham/gnuradio-companion/PLIST b/ham/gnuradio-companion/PLIST index 78a0237e134..e96c31d508c 100644 --- a/ham/gnuradio-companion/PLIST +++ b/ham/gnuradio-companion/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2014/10/13 12:51:08 mef Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/10/28 06:41:20 mef Exp $ bin/gnuradio-companion ${PYSITELIB}/gnuradio/grc/__init__.py ${PYSITELIB}/gnuradio/grc/__init__.pyc @@ -170,6 +170,7 @@ ${PYSITELIB}/grc_gnuradio/blks2/selector.pyo ${PYSITELIB}/grc_gnuradio/blks2/tcp.py ${PYSITELIB}/grc_gnuradio/blks2/tcp.pyc ${PYSITELIB}/grc_gnuradio/blks2/tcp.pyo +libexec/gnuradio/grc_setup_freedesktop share/examples/gnuradio/conf.d/grc.conf share/gnuradio/examples/grc/simple/variable_config.grc share/gnuradio/examples/grc/xmlrpc/readme.txt diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common index ff0176bea45..8ed142e1ff8 100644 --- a/ham/gnuradio-core/Makefile.common +++ b/ham/gnuradio-core/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2014/10/24 07:57:50 mef Exp $ +# $NetBSD: Makefile.common,v 1.4 2014/10/28 06:41:20 mef Exp $ # This Makefile fragment is included in the package Makefiles for # GNU Radio distributed packages (they all share common configure and build # settings). @@ -53,6 +53,7 @@ PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 3.3.0 PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} PLIST_SUBST+= PYSITELIB=${PYSITELIB} +PLIST_SUBST+= PKGVERSION_NOREV=${PKGVERSION_NOREV} PY_PATCHPLIST= yes CONFIGURE_DIRS= build diff --git a/ham/gnuradio-core/Nocore.mk b/ham/gnuradio-core/Nocore.mk index 32cc32014e6..4a169344cb3 100644 --- a/ham/gnuradio-core/Nocore.mk +++ b/ham/gnuradio-core/Nocore.mk @@ -1,4 +1,4 @@ -# $NetBSD: Nocore.mk,v 1.2 2014/10/17 09:51:56 mef Exp $ +# $NetBSD: Nocore.mk,v 1.3 2014/10/28 06:41:20 mef Exp $ # Default list for reducing PLIST PLIST_MINUS= core DEPENDS+= gnuradio-core-[0-9]*:../../ham/gnuradio-core @@ -14,7 +14,7 @@ post-install: ${RM} -f ${WRKDIR}/.PLIST.minus; for i in ${PLIST_MINUS} ; do \ sed -e 's,$${PYSITELIB},${PYSITELIB},' \ - -e 's,$${PKGVERSION},${PKGVERSION},' \ + -e 's,$${PKGVERSION_NOREV},${PKGVERSION_NOREV},' \ -e '/^@comment/d' \ -e '/^@pkgdir/d' \ ${PKGDIR}/../../ham/gnuradio-$$i/PLIST \ diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST index 6ed3b94f102..66f9ed4e4cd 100644 --- a/ham/gnuradio-core/PLIST +++ b/ham/gnuradio-core/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2014/10/17 09:51:56 mef Exp $ +@comment $NetBSD: PLIST,v 1.16 2014/10/28 06:41:20 mef Exp $ bin/gnuradio-config-info bin/gr_filter_design bin/volk-config-info @@ -609,19 +609,19 @@ lib/cmake/gnuradio/LibFindMacros.cmake lib/cmake/gnuradio/UseSWIG.cmake lib/cmake/volk/VolkConfig.cmake lib/libgnuradio-analog.so -lib/libgnuradio-analog.so.${PKGVERSION} +lib/libgnuradio-analog.so.${PKGVERSION_NOREV} lib/libgnuradio-audio.so -lib/libgnuradio-audio.so.${PKGVERSION} +lib/libgnuradio-audio.so.${PKGVERSION_NOREV} lib/libgnuradio-blocks.so -lib/libgnuradio-blocks.so.${PKGVERSION} +lib/libgnuradio-blocks.so.${PKGVERSION_NOREV} lib/libgnuradio-fft.so -lib/libgnuradio-fft.so.${PKGVERSION} +lib/libgnuradio-fft.so.${PKGVERSION_NOREV} lib/libgnuradio-filter.so -lib/libgnuradio-filter.so.${PKGVERSION} +lib/libgnuradio-filter.so.${PKGVERSION_NOREV} lib/libgnuradio-pmt.so -lib/libgnuradio-pmt.so.${PKGVERSION} +lib/libgnuradio-pmt.so.${PKGVERSION_NOREV} lib/libgnuradio-runtime.so -lib/libgnuradio-runtime.so.${PKGVERSION} +lib/libgnuradio-runtime.so.${PKGVERSION_NOREV} lib/libvolk.so lib/libvolk.so.0.0.0 lib/pkgconfig/gnuradio-analog.pc @@ -871,13 +871,13 @@ ${PYSITELIB}/volk_modtool/cfg.pyo ${PYSITELIB}/volk_modtool/volk_modtool_generate.py ${PYSITELIB}/volk_modtool/volk_modtool_generate.pyc ${PYSITELIB}/volk_modtool/volk_modtool_generate.pyo -share/doc/gnuradio-${PKGVERSION}/README -share/doc/gnuradio-${PKGVERSION}/README.analog -share/doc/gnuradio-${PKGVERSION}/README.audio -share/doc/gnuradio-${PKGVERSION}/README.blocks -share/doc/gnuradio-${PKGVERSION}/README.fft -share/doc/gnuradio-${PKGVERSION}/README.filter -share/doc/gnuradio-${PKGVERSION}/README.hacking +share/doc/gnuradio-${PKGVERSION_NOREV}/README +share/doc/gnuradio-${PKGVERSION_NOREV}/README.analog +share/doc/gnuradio-${PKGVERSION_NOREV}/README.audio +share/doc/gnuradio-${PKGVERSION_NOREV}/README.blocks +share/doc/gnuradio-${PKGVERSION_NOREV}/README.fft +share/doc/gnuradio-${PKGVERSION_NOREV}/README.filter +share/doc/gnuradio-${PKGVERSION_NOREV}/README.hacking share/examples/gnuradio/conf.d/gnuradio-runtime.conf share/examples/gnuradio/conf.d/gr-audio-jack.conf share/examples/gnuradio/conf.d/gr-audio-oss.conf diff --git a/ham/gnuradio-core/files/REPLACE_PYTHON b/ham/gnuradio-core/files/REPLACE_PYTHON index ce3be50107a..967d29c15f6 100644 --- a/ham/gnuradio-core/files/REPLACE_PYTHON +++ b/ham/gnuradio-core/files/REPLACE_PYTHON @@ -14,6 +14,7 @@ REPLACE_PYTHON = \ grc/python/Port.py \ grc/python/Constants.py \ grc/python/expr_utils.py \ + grc/python/flow_graph.tmpl \ grc/python/convert_hier.py \ grc/python/Param.py \ grc/python/Connection.py \ -- cgit v1.2.3