diff options
| author | mef <mef@pkgsrc.org> | 2015-12-06 15:34:15 +0000 |
|---|---|---|
| committer | mef <mef@pkgsrc.org> | 2015-12-06 15:34:15 +0000 |
| commit | 731b0f723355b6d05eb791f67c0131d53bcfa5af (patch) | |
| tree | 9d270949e06302f932ff716e65b6feb209d631f5 /ham | |
| parent | 18b912967b3a59590e664b9cc6435a2a229effaf (diff) | |
| download | pkgsrc-731b0f723355b6d05eb791f67c0131d53bcfa5af.tar.gz | |
Fix EGDIR issue for gr-wxgui.conf and gr-audio-oss.conf, thanks gdt@ for patch.
Diffstat (limited to 'ham')
| -rw-r--r-- | ham/gnuradio-core/Makefile.common | 4 | ||||
| -rw-r--r-- | ham/gnuradio-core/PLIST.oss | 3 | ||||
| -rw-r--r-- | ham/gnuradio-wxgui/Makefile | 4 | ||||
| -rw-r--r-- | ham/gnuradio-wxgui/PLIST | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common index c371ecdfb7d..5badce01bd8 100644 --- a/ham/gnuradio-core/Makefile.common +++ b/ham/gnuradio-core/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2015/12/05 21:25:46 adam Exp $ +# $NetBSD: Makefile.common,v 1.11 2015/12/06 15:34:15 mef Exp $ # This Makefile fragment is included in the package Makefiles for # GNU Radio distributed packages (they all share common configure and build # settings). @@ -58,7 +58,7 @@ PY_PATCHPLIST= yes CONFIGURE_DIRS= build -EGDIR= share/examples/gnuradio/conf.d +EGDIR= share/gnuradio/examples PKG_SYSCONFSUBDIR= gnuradio/conf.d LDFLAGS.DragonFly+= -lboost_system diff --git a/ham/gnuradio-core/PLIST.oss b/ham/gnuradio-core/PLIST.oss index 88045097900..7043d0f45a3 100644 --- a/ham/gnuradio-core/PLIST.oss +++ b/ham/gnuradio-core/PLIST.oss @@ -1 +1,2 @@ -@comment $NetBSD: PLIST.oss,v 1.2 2015/09/01 04:13:43 mef Exp $ +@comment $NetBSD: PLIST.oss,v 1.3 2015/12/06 15:34:15 mef Exp $ +share/gnuradio/examples/gr-audio-oss.conf diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile index 1c6e2d44d80..b175a888ad7 100644 --- a/ham/gnuradio-wxgui/Makefile +++ b/ham/gnuradio-wxgui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2015/09/01 04:14:55 mef Exp $ +# $NetBSD: Makefile,v 1.57 2015/12/06 15:34:15 mef Exp $ PKGNAME= gnuradio-wxgui-${VERSION} COMMENT= WxGTK Toolkit module of GNU Radio @@ -6,7 +6,7 @@ COMMENT= WxGTK Toolkit module of GNU Radio .include "../../ham/gnuradio-core/Makefile.common" .include "../../ham/gnuradio-core/Nocore.mk" -#CONF_FILES+= ${EGDIR}/gr-wxgui.conf ${PKG_SYSCONFDIR}/gr-wxgui.conf +CONF_FILES+= ${EGDIR}/gr-wxgui.conf ${PKG_SYSCONFDIR}/gr-wxgui.conf CMAKE_ARGS+= -DENABLE_DEFAULT=False CMAKE_ARGS+= -DENABLE_GR_WXGUI=True diff --git a/ham/gnuradio-wxgui/PLIST b/ham/gnuradio-wxgui/PLIST index 99cb77190ac..84403d3ff1e 100644 --- a/ham/gnuradio-wxgui/PLIST +++ b/ham/gnuradio-wxgui/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2015/09/01 04:14:55 mef Exp $ +@comment $NetBSD: PLIST,v 1.12 2015/12/06 15:34:15 mef Exp $ include/gnuradio/swig/wxgui_swig.i include/gnuradio/swig/wxgui_swig_doc.i include/gnuradio/wxgui/api.h @@ -143,6 +143,7 @@ ${PYSITELIB}/grc_gnuradio/wxgui/panel.pyo ${PYSITELIB}/grc_gnuradio/wxgui/top_block_gui.py ${PYSITELIB}/grc_gnuradio/wxgui/top_block_gui.pyc ${PYSITELIB}/grc_gnuradio/wxgui/top_block_gui.pyo +share/gnuradio/examples/gr-wxgui.conf share/gnuradio/grc/blocks/notebook.xml share/gnuradio/grc/blocks/variable_check_box.xml share/gnuradio/grc/blocks/variable_chooser.xml |