CVS commit: pkgsrc/audio/csound6

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sat Dec  7 10:24:02 UTC 2019

Modified Files:
        pkgsrc/audio/csound6: Makefile PLIST
Added Files:
        pkgsrc/audio/csound6: options.mk

Log Message:
add options.mk to csound6 and use it to (optionally, non default)
disable including pulseaudio support.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/audio/csound6/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/csound6/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/csound6/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/csound6/Makefile
diff -u pkgsrc/audio/csound6/Makefile:1.41 pkgsrc/audio/csound6/Makefile:1.42
--- pkgsrc/audio/csound6/Makefile:1.41  Sun Nov  3 11:51:01 2019
+++ pkgsrc/audio/csound6/Makefile       Sat Dec  7 10:24:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/11/03 11:51:01 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2019/12/07 10:24:02 mrg Exp $
 
 DISTNAME=              csound-${CSOUND_VERSION}
 PKGNAME=               csound6-${CSOUND_VERSION}
@@ -41,10 +41,11 @@ post-install:
                rm -f bin/csound6 && \
                ${LN} -s ../lib/csound6/csound bin/csound6
 
+.include "options.mk"
+
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/audio/csound6/PLIST
diff -u pkgsrc/audio/csound6/PLIST:1.6 pkgsrc/audio/csound6/PLIST:1.7
--- pkgsrc/audio/csound6/PLIST:1.6      Sat Nov  2 22:25:46 2019
+++ pkgsrc/audio/csound6/PLIST  Sat Dec  7 10:24:02 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/11/02 22:25:46 mrg Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/12/07 10:24:02 mrg Exp $
 bin/csound6
 include/csound6/CppSound.hpp
 include/csound6/CsoundFile.hpp
@@ -82,7 +82,7 @@ lib/csound6/plugins-6.0/libplaterev.so
 lib/csound6/plugins-6.0/libpvsops.so
 lib/csound6/plugins-6.0/libpy.so
 lib/csound6/plugins-6.0/libquadbezier.so
-lib/csound6/plugins-6.0/librtpulse.so
+${PLIST.pulseaudio}lib/csound6/plugins-6.0/librtpulse.so
 lib/csound6/plugins-6.0/libscansyn.so
 lib/csound6/plugins-6.0/libscugens.so
 lib/csound6/plugins-6.0/libselect.so

Added files:

Index: pkgsrc/audio/csound6/options.mk
diff -u /dev/null pkgsrc/audio/csound6/options.mk:1.1
--- /dev/null   Sat Dec  7 10:24:02 2019
+++ pkgsrc/audio/csound6/options.mk     Sat Dec  7 10:24:02 2019
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2019/12/07 10:24:02 mrg Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.csound6
+PKG_SUPPORTED_OPTIONS= pulseaudio
+PKG_SUGGESTED_OPTIONS= pulseaudio
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=            pulseaudio
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+PLIST.pulseaudio=      yes
+.endif