Sat Dec 7 10:24:02 2019 UTC ()
add options.mk to csound6 and use it to (optionally, non default)
disable including pulseaudio support.


(mrg)
diff -r1.41 -r1.42 pkgsrc/audio/csound6/Makefile
diff -r1.6 -r1.7 pkgsrc/audio/csound6/PLIST
diff -r0 -r1.1 pkgsrc/audio/csound6/options.mk
cvs diff -r1.41 -r1.42 pkgsrc/audio/csound6/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/csound6/Makefile 2019/11/03 11:51:01 1.41
+++ pkgsrc/audio/csound6/Makefile 2019/12/07 10:24:02 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.41 2019/11/03 11:51:01 rillig Exp $ 1# $NetBSD: Makefile,v 1.42 2019/12/07 10:24:02 mrg Exp $
2 2
3DISTNAME= csound-${CSOUND_VERSION} 3DISTNAME= csound-${CSOUND_VERSION}
4PKGNAME= csound6-${CSOUND_VERSION} 4PKGNAME= csound6-${CSOUND_VERSION}
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=csound/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=csound/}
7GITHUB_PROJECT= csound 7GITHUB_PROJECT= csound
8 8
9MAINTAINER= mrg@eterna.com.au 9MAINTAINER= mrg@eterna.com.au
10HOMEPAGE= https://sourceforge.net/projects/csound/ 10HOMEPAGE= https://sourceforge.net/projects/csound/
11COMMENT= Software synthesizer and sequencer 11COMMENT= Software synthesizer and sequencer
12LICENSE= gnu-lgpl-v2.1 # or later 12LICENSE= gnu-lgpl-v2.1 # or later
13 13
14CSOUND_VERSION= 6.13.0 14CSOUND_VERSION= 6.13.0
@@ -31,26 +31,27 @@ INSTALLATION_DIRS= bin @@ -31,26 +31,27 @@ INSTALLATION_DIRS= bin
31 31
32CHECK_PORTABILITY_SKIP+= installer/misc/makedeb.sh \ 32CHECK_PORTABILITY_SKIP+= installer/misc/makedeb.sh \
33 installer/macosx/release-build-10.8.sh \ 33 installer/macosx/release-build-10.8.sh \
34 frontends/max_csound_tilde/installer/build-installer.sh \ 34 frontends/max_csound_tilde/installer/build-installer.sh \
35 frontends/max_csound_tilde/installer/build-installer-windows.sh 35 frontends/max_csound_tilde/installer/build-installer-windows.sh
36 36
37.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
38 38
39post-install: 39post-install:
40 cd ${DESTDIR}${PREFIX} && \ 40 cd ${DESTDIR}${PREFIX} && \
41 rm -f bin/csound6 && \ 41 rm -f bin/csound6 && \
42 ${LN} -s ../lib/csound6/csound bin/csound6 42 ${LN} -s ../lib/csound6/csound bin/csound6
43 43
 44.include "options.mk"
 45
44.include "../../audio/fluidsynth/buildlink3.mk" 46.include "../../audio/fluidsynth/buildlink3.mk"
45.include "../../audio/libsamplerate/buildlink3.mk" 47.include "../../audio/libsamplerate/buildlink3.mk"
46.include "../../audio/libsndfile/buildlink3.mk" 48.include "../../audio/libsndfile/buildlink3.mk"
47.include "../../audio/pulseaudio/buildlink3.mk" 
48.include "../../mk/jpeg.buildlink3.mk" 49.include "../../mk/jpeg.buildlink3.mk"
49.include "../../devel/boost-libs/buildlink3.mk" 50.include "../../devel/boost-libs/buildlink3.mk"
50.include "../../graphics/png/buildlink3.mk" 51.include "../../graphics/png/buildlink3.mk"
51PYTHON_FOR_BUILD_ONLY= yes 52PYTHON_FOR_BUILD_ONLY= yes
52.include "../../lang/python/application.mk" 53.include "../../lang/python/application.mk"
53.include "../../x11/fltk13/buildlink3.mk" 54.include "../../x11/fltk13/buildlink3.mk"
54.include "../../www/curl/buildlink3.mk" 55.include "../../www/curl/buildlink3.mk"
55.include "../../mk/pthread.buildlink3.mk" 56.include "../../mk/pthread.buildlink3.mk"
56.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/audio/csound6/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/csound6/PLIST 2019/11/02 22:25:46 1.6
+++ pkgsrc/audio/csound6/PLIST 2019/12/07 10:24:02 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2019/11/02 22:25:46 mrg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2019/12/07 10:24:02 mrg Exp $
2bin/csound6 2bin/csound6
3include/csound6/CppSound.hpp 3include/csound6/CppSound.hpp
4include/csound6/CsoundFile.hpp 4include/csound6/CsoundFile.hpp
5include/csound6/OpcodeBase.hpp 5include/csound6/OpcodeBase.hpp
6include/csound6/arrays.h 6include/csound6/arrays.h
7include/csound6/cfgvar.h 7include/csound6/cfgvar.h
8include/csound6/csPerfThread.hpp 8include/csound6/csPerfThread.hpp
9include/csound6/cs_par_structs.h 9include/csound6/cs_par_structs.h
10include/csound6/cscore.h 10include/csound6/cscore.h
11include/csound6/csdebug.h 11include/csound6/csdebug.h
12include/csound6/csdl.h 12include/csound6/csdl.h
13include/csound6/csound.h 13include/csound6/csound.h
14include/csound6/csound.hpp 14include/csound6/csound.hpp
@@ -72,27 +72,27 @@ lib/csound6/plugins-6.0/libfractalnoise. @@ -72,27 +72,27 @@ lib/csound6/plugins-6.0/libfractalnoise.
72lib/csound6/plugins-6.0/libframebuffer.so 72lib/csound6/plugins-6.0/libframebuffer.so
73lib/csound6/plugins-6.0/libftsamplebank.so 73lib/csound6/plugins-6.0/libftsamplebank.so
74lib/csound6/plugins-6.0/libgetftargs.so 74lib/csound6/plugins-6.0/libgetftargs.so
75lib/csound6/plugins-6.0/libgtf.so 75lib/csound6/plugins-6.0/libgtf.so
76lib/csound6/plugins-6.0/libimage.so 76lib/csound6/plugins-6.0/libimage.so
77lib/csound6/plugins-6.0/libipmidi.so 77lib/csound6/plugins-6.0/libipmidi.so
78lib/csound6/plugins-6.0/libliveconv.so 78lib/csound6/plugins-6.0/libliveconv.so
79lib/csound6/plugins-6.0/libmixer.so 79lib/csound6/plugins-6.0/libmixer.so
80lib/csound6/plugins-6.0/libpadsynth.so 80lib/csound6/plugins-6.0/libpadsynth.so
81lib/csound6/plugins-6.0/libplaterev.so 81lib/csound6/plugins-6.0/libplaterev.so
82lib/csound6/plugins-6.0/libpvsops.so 82lib/csound6/plugins-6.0/libpvsops.so
83lib/csound6/plugins-6.0/libpy.so 83lib/csound6/plugins-6.0/libpy.so
84lib/csound6/plugins-6.0/libquadbezier.so 84lib/csound6/plugins-6.0/libquadbezier.so
85lib/csound6/plugins-6.0/librtpulse.so 85${PLIST.pulseaudio}lib/csound6/plugins-6.0/librtpulse.so
86lib/csound6/plugins-6.0/libscansyn.so 86lib/csound6/plugins-6.0/libscansyn.so
87lib/csound6/plugins-6.0/libscugens.so 87lib/csound6/plugins-6.0/libscugens.so
88lib/csound6/plugins-6.0/libselect.so 88lib/csound6/plugins-6.0/libselect.so
89lib/csound6/plugins-6.0/libserial.so 89lib/csound6/plugins-6.0/libserial.so
90lib/csound6/plugins-6.0/libsignalflowgraph.so 90lib/csound6/plugins-6.0/libsignalflowgraph.so
91lib/csound6/plugins-6.0/libstackops.so 91lib/csound6/plugins-6.0/libstackops.so
92lib/csound6/plugins-6.0/libstdutil.so 92lib/csound6/plugins-6.0/libstdutil.so
93lib/csound6/plugins-6.0/libsystem_call.so 93lib/csound6/plugins-6.0/libsystem_call.so
94lib/csound6/plugins-6.0/liburandom.so 94lib/csound6/plugins-6.0/liburandom.so
95lib/csound6/plugins-6.0/libvirtual.so 95lib/csound6/plugins-6.0/libvirtual.so
96lib/csound6/plugins-6.0/libwidgets.so 96lib/csound6/plugins-6.0/libwidgets.so
97lib/csound6/pv_export 97lib/csound6/pv_export
98lib/csound6/pv_import 98lib/csound6/pv_import
File Added: pkgsrc/audio/csound6/options.mk
# $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