summaryrefslogtreecommitdiff
path: root/ham
diff options
context:
space:
mode:
authordbj <dbj@pkgsrc.org>2015-01-27 06:01:44 +0000
committerdbj <dbj@pkgsrc.org>2015-01-27 06:01:44 +0000
commit27b8ed22a39af8a8dad3da46e54f9f1409f9ad40 (patch)
treeae933dc95fd1e77404335cfb6f0097945b1b80a7 /ham
parenta393882a7fd6305250e00ca7ca2041e66b392d4e (diff)
downloadpkgsrc-27b8ed22a39af8a8dad3da46e54f9f1409f9ad40.tar.gz
Don't enable oss if OSS_TYPE is none
Diffstat (limited to 'ham')
-rw-r--r--ham/gnuradio-core/Makefile9
-rw-r--r--ham/gnuradio-core/PLIST3
-rw-r--r--ham/gnuradio-core/PLIST.oss2
-rw-r--r--ham/gnuradio-core/options.mk4
4 files changed, 11 insertions, 7 deletions
diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile
index 86902c61314..884c29544bd 100644
--- a/ham/gnuradio-core/Makefile
+++ b/ham/gnuradio-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2015/01/16 12:54:52 mef Exp $
+# $NetBSD: Makefile,v 1.46 2015/01/27 06:01:44 dbj Exp $
PKGNAME= gnuradio-core-${VERSION}
COMMENT= Core part of GNU Radio, all others need this
@@ -8,10 +8,15 @@ PLIST_MINUS= # empty
CONF_FILES+= ${EGDIR}/gnuradio-runtime.conf ${PKG_SYSCONFDIR}/gnuradio-runtime.conf
CONF_FILES+= ${EGDIR}/gr-audio-jack.conf ${PKG_SYSCONFDIR}/gr-audio-jack.conf
-CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf
CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf
CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf
+.include "../../mk/oss.buildlink3.mk"
+.if ${OSS_TYPE} != "none"
+CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf
+PLIST_SRC+= ${PKGDIR}/PLIST.oss
+.endif
+
# set default as minimum
CMAKE_ARGS+= -DENABLE_DEFAULT=False
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index 909ff2a0fc2..834f211a47f 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2014/10/28 16:59:33 mef Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/01/27 06:01:44 dbj Exp $
bin/gnuradio-config-info
bin/gr_filter_design
bin/volk-config-info
@@ -880,7 +880,6 @@ share/doc/gnuradio-${PKGVERSION}/README.filter
share/doc/gnuradio-${PKGVERSION}/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
share/examples/gnuradio/conf.d/gr-audio-portaudio.conf
share/examples/gnuradio/conf.d/gr-audio.conf
share/gnuradio/examples/analog/fmtest.py
diff --git a/ham/gnuradio-core/PLIST.oss b/ham/gnuradio-core/PLIST.oss
new file mode 100644
index 00000000000..884faab7afa
--- /dev/null
+++ b/ham/gnuradio-core/PLIST.oss
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.oss,v 1.1 2015/01/27 06:01:44 dbj Exp $
+share/examples/gnuradio/conf.d/gr-audio-oss.conf
diff --git a/ham/gnuradio-core/options.mk b/ham/gnuradio-core/options.mk
index 11824ebc376..fcf6b224aea 100644
--- a/ham/gnuradio-core/options.mk
+++ b/ham/gnuradio-core/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/10/17 09:51:56 mef Exp $
+# $NetBSD: options.mk,v 1.3 2015/01/27 06:01:44 dbj Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnuradio
PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
@@ -30,8 +30,6 @@ do-build:
DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
.endif
-# if set optionally, we need to initialize (as an standard)
-PLIST_SRC+= ${PKGDIR}/PLIST
.if !empty(PKG_OPTIONS:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
ALSA_ENABLED=