[pkgsrc/trunk]: pkgsrc/ham/gnuradio-core Don't enable oss if OSS_TYPE is none

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d49cdd432fd
branches:  trunk
changeset: 645330:5d49cdd432fd
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Tue Jan 27 06:01:44 2015 +0000

description:
Don't enable oss if OSS_TYPE is none

diffstat:

 ham/gnuradio-core/Makefile   |  9 +++++++--
 ham/gnuradio-core/PLIST      |  3 +--
 ham/gnuradio-core/PLIST.oss  |  2 ++
 ham/gnuradio-core/options.mk |  4 +---
 4 files changed, 11 insertions(+), 7 deletions(-)

diffs (67 lines):

diff -r 61f9a661863b -r 5d49cdd432fd ham/gnuradio-core/Makefile
--- a/ham/gnuradio-core/Makefile        Tue Jan 27 05:24:49 2015 +0000
+++ b/ham/gnuradio-core/Makefile        Tue Jan 27 06:01:44 2015 +0000
@@ -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 @@
 
 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 -r 61f9a661863b -r 5d49cdd432fd ham/gnuradio-core/PLIST
--- a/ham/gnuradio-core/PLIST   Tue Jan 27 05:24:49 2015 +0000
+++ b/ham/gnuradio-core/PLIST   Tue Jan 27 06:01:44 2015 +0000
@@ -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.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 -r 61f9a661863b -r 5d49cdd432fd ham/gnuradio-core/PLIST.oss
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/gnuradio-core/PLIST.oss       Tue Jan 27 06:01:44 2015 +0000
@@ -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 -r 61f9a661863b -r 5d49cdd432fd ham/gnuradio-core/options.mk
--- a/ham/gnuradio-core/options.mk      Tue Jan 27 05:24:49 2015 +0000
+++ b/ham/gnuradio-core/options.mk      Tue Jan 27 06:01:44 2015 +0000
@@ -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 @@
 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=