2 files changed, 27 insertions, 30 deletions

diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index d6e8b6fd2d54..cf98946c88d6 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -27,14 +27,11 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 \
 		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
 
-OPTIONS=	ALSA "Build ALSA I/O module" off \
-		DSSI "Build DSSI/LADSPA host opcodes" off \
-		FLUIDSYNTH "Building FluidSynth opcodes" off \
-		JACK "Build Jack I/O module and opcodes" off \
-		OSC "Build OSC opcodes" off \
-		PORTAUDIO "Build the PortAudio I/O module" off \
-		PULSEAUDIO "Build the PulseAudio I/O module" off \
-		FLTKGUI "Build FLTK plugin and GUI" on
+OPTIONS_DEFINE=	ALSA LADSPA FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO FLTK
+OPTIONS_DEFAULT=	FLTK
+FLTK_DESC=		Build FLTK plugin and GUI
+OSC_DESC=		Build OSC opcodes
+FLUIDSYNTH_DESC=	Build FluidSynth opcodes
 
 CONFLICTS_INSTALL=	outguess-*
 
@@ -56,7 +53,7 @@ SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_ALSA)
+.if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
 SCONS_ARGS+=	useALSA=1
 PLIST_SUB+=	ALSA=""
@@ -67,17 +64,17 @@ PLIST_SUB+=	ALSA="@comment "
 ALSA_H=		##alsa/asoundlib.h##
 .endif
 
-.if defined(WITH_DSSI)
+.if ${PORT_OPTIONS:MLADSPA}
 BUILD_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
 RUN_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
-SCONS_ARGS+=	buildDSSI=1
-PLIST_SUB+=	DSSI=""
+SCONS_ARGS+=	buildLADSPA=1
+PLIST_SUB+=	LADSPA=""
 .else
-SCONS_ARGS+=	buildDSSI=0
-PLIST_SUB+=	DSSI="@comment "
+SCONS_ARGS+=	buildLADSPA=0
+PLIST_SUB+=	LADSPA="@comment "
 .endif
 
-.if defined(WITH_FLUIDSYNTH)
+.if ${PORT_OPTIONS:MFLUIDSYNTH}
 LIB_DEPENDS+=	fluidsynth.1:${PORTSDIR}/audio/fluidsynth
 PLIST_SUB+=	FLUIDSYNTH=""
 FLUIDSYNTH_H=	fluidsynth.h
@@ -86,7 +83,7 @@ PLIST_SUB+=	FLUIDSYNTH="@comment "
 FLUIDSYNTH_H=	##fluidsynth.h##
 .endif
 
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 SCONS_ARGS+=	useJack=1
 PLIST_SUB+=	JACK=""
@@ -95,7 +92,7 @@ SCONS_ARGS+=	useJack=0
 PLIST_SUB+=	JACK="@comment "
 .endif
 
-.if defined(WITH_OSC)
+.if ${PORT_OPTIONS:MOSC}
 LIB_DEPENDS+=	lo.7:${PORTSDIR}/audio/liblo
 SCONS_ARGS+=	useOSC=1
 PLIST_SUB+=	OSC=""
@@ -104,7 +101,7 @@ SCONS_ARGS+=	useOSC=0
 PLIST_SUB+=	OSC="@comment "
 .endif
 
-.if defined(WITH_PORTAUDIO)
+.if ${PORT_OPTIONS:MPORTAUDIO}
 BUILD_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 RUN_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 SCONS_ARGS+=	usePortAudio=1
@@ -118,7 +115,7 @@ PORTAUDIO_L=	# empty
 PORTAUDIO_R=	# empty
 .endif
 
-.if defined(WITH_PULSEAUDIO)
+.if ${PORT_OPTIONS:MPULSEAUDIO}
 LIB_DEPENDS+=	pulse-simple.0:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSEAUDIO=""
 PULSEAUDIO_H=	pulse/simple.h
@@ -127,16 +124,16 @@ PLIST_SUB+=	PULSEAUDIO="@comment "
 PULSEAUDIO_H=	##pulse/simple.h##
 .endif
 
-.if !defined(WITHOUT_FLTKGUI)
+.if ${PORT_OPTIONS:MFLTK}
 LIB_DEPENDS+=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
-PLIST_SUB+=	FLTKGUI=""
+PLIST_SUB+=	FLTK=""
 SCONS_ARGS+=	buildCsound5GUI=1 buildCSEditor=1 buildWinsound=1 useFLTK=1
 .else
-PLIST_SUB+=	FLTKGUI="@comment "
+PLIST_SUB+=	FLTK="@comment "
 SCONS_ARGS+=	buildCsound5GUI=0 buildCSEditor=0 buildWinsound=0 useFLTK=0
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 EXTRACT_DEPENDS+=${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 DISTFILES+=	Csound${PORTVERSION:R}_manual_html.zip:manual
 .endif
@@ -148,7 +145,7 @@ CMAKE_ARGS+=	Word64=1
 .endif
 
 post-extract:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -qo \
 		Csound${PORTVERSION:R}_manual_html.zip -d ${WRKDIR})
 .endif
@@ -197,7 +194,7 @@ post-patch:
 
 post-install:
 	@${LN} -sf libcsound64.so.5 ${PREFIX}/lib/libcsound64.so
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${ECHO_MSG} " Installing the manual."
 	@(cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${DOCSDIR})
diff --git a/audio/csound/pkg-plist b/audio/csound/pkg-plist
index 89e4cdef434f..b2b9e07b0de3 100644
--- a/audio/csound/pkg-plist
+++ b/audio/csound/pkg-plist
@@ -4,7 +4,7 @@ bin/csb64enc
 bin/csbeats
 bin/csmixer
 bin/csound
-%%FLTKGUI%%bin/csound5gui
+%%FLTK%%bin/csound5gui
 bin/cvanal
 bin/dnoise
 bin/envext
@@ -27,7 +27,7 @@ bin/scsort
 bin/sdif2ad
 bin/sndinfo
 bin/srconv
-%%FLTKGUI%%bin/winsound
+%%FLTK%%bin/winsound
 include/csound/CppSound.hpp
 include/csound/CsoundFile.hpp
 include/csound/OpcodeBase.hpp
@@ -53,7 +53,7 @@ lib/csound/plugins64/libcellular.so
 lib/csound/plugins64/libcontrol.so
 lib/csound/plugins64/libcs_date.so
 lib/csound/plugins64/libdoppler.so
-%%DSSI%%lib/csound/plugins64/libdssi4cs.so
+%%LADSPA%%lib/csound/plugins64/libdssi4cs.so
 lib/csound/plugins64/libfareygen.so
 %%FLUIDSYNTH%%lib/csound/plugins64/libfluidOpcodes.so
 lib/csound/plugins64/libfractalnoise.so
@@ -75,8 +75,8 @@ lib/csound/plugins64/libsystem_call.so
 lib/csound/plugins64/libudprecv.so
 lib/csound/plugins64/libudpsend.so
 lib/csound/plugins64/liburandom.so
-%%FLTKGUI%%lib/csound/plugins64/libvirtual.so
-%%FLTKGUI%%lib/csound/plugins64/libwidgets.so
+%%FLTK%%lib/csound/plugins64/libvirtual.so
+%%FLTK%%lib/csound/plugins64/libwidgets.so
 lib/libcsladspa.so
 lib/libcsnd.so.5
 lib/libcsound64.so