Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Sep 2016 16:03:44 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r422213 - head/audio/csound
Message-ID:  <201609151603.u8FG3iTZ050953@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Thu Sep 15 16:03:44 2016
New Revision: 422213
URL: https://svnweb.freebsd.org/changeset/ports/422213

Log:
  Convert to options helpers

Modified:
  head/audio/csound/Makefile

Modified: head/audio/csound/Makefile
==============================================================================
--- head/audio/csound/Makefile	Thu Sep 15 15:50:41 2016	(r422212)
+++ head/audio/csound/Makefile	Thu Sep 15 16:03:44 2016	(r422213)
@@ -7,8 +7,7 @@ PORTREVISION=	4
 CATEGORIES=	audio lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \
 		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
-DISTFILES=	${PORTNAME:S/c/C/}${PORTVERSION}${EXTRACT_SUFX} \
-		${CSOUND_DOCS:S/$/:manual/}
+DISTFILES=	${PORTNAME:S/c/C/}${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	csound
 
 MAINTAINER=	ports@FreeBSD.org
@@ -24,19 +23,6 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndf
 
 PORTSCOUT=	limit:^5\.
 
-OPTIONS_DEFINE=	ALSA PNG DSSI FLTK FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO DOCS
-OPTIONS_DEFAULT=FLTK
-OPTIONS_SUB=	yes
-ALSA_DESC=	Build ALSA I/O module
-PNG_DESC=	Build image opcodes
-DSSI_DESC=	Build DSSI/LADSPA host opcodes
-FLUIDSYNTH_DESC=Building FluidSynth opcodes
-JACK_DESC=	Build Jack I/O module and opcodes
-OSC_DESC=	Build OSC opcodes
-PORTAUDIO_DESC=	Build the PortAudio I/O module
-PULSEAUDIO_DESC=Build the PulseAudio I/O module
-FLTK_DESC=	Build FLTK plugin and GUI
-
 CONFLICTS_INSTALL=	outguess-* csound6
 
 WRKSRC=		${WRKDIR}/${PORTNAME:S/c/C/}${PORTVERSION}
@@ -58,78 +44,62 @@ LINKFLAGS=	# empty
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:audio/alsa-lib
-MAKE_ARGS+=	useALSA=1
-ALSA_H=		alsa/asoundlib.h
-.else
-MAKE_ARGS+=	useALSA=0
-ALSA_H=		##alsa/asoundlib.h##
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:graphics/png
-MAKE_ARGS+=	buildImageOpcodes=1
-.else
-MAKE_ARGS+=	buildImageOpcodes=0
-.endif
-
-.if ${PORT_OPTIONS:MDSSI}
-BUILD_DEPENDS+=	dssi>=0:audio/dssi
-LIB_DEPENDS+=	libasound.so:audio/alsa-lib
-RUN_DEPENDS+=	dssi>=0:audio/dssi
-MAKE_ARGS+=	buildDSSI=1
-.else
-MAKE_ARGS+=	buildDSSI=0
-.endif
-
-.if ${PORT_OPTIONS:MFLUIDSYNTH}
-LIB_DEPENDS+=	libfluidsynth.so:audio/fluidsynth
-FLUIDSYNTH_H=	fluidsynth.h
-.else
-FLUIDSYNTH_H=	##fluidsynth.h##
-.endif
-
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:audio/jack
-MAKE_ARGS+=	useJack=1
-.else
-MAKE_ARGS+=	useJack=0
-.endif
-
-.if ${PORT_OPTIONS:MOSC}
-LIB_DEPENDS+=	liblo.so:audio/liblo
-MAKE_ARGS+=	useOSC=1
-.else
-MAKE_ARGS+=	useOSC=0
-.endif
-
-.if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+=	libportaudio.so:audio/portaudio
-MAKE_ARGS+=	usePortAudio=1
-.else
-MAKE_ARGS+=	usePortAudio=0
-.endif
+OPTIONS_DEFINE=	ALSA PNG DSSI FLTK FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO DOCS
+OPTIONS_DEFAULT=FLTK
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse-simple.so:audio/pulseaudio
-PULSEAUDIO_H=	pulse/simple.h
-.else
-PULSEAUDIO_H=	##pulse/simple.h##
-.endif
+ALSA_DESC=		ALSA I/O module
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_MAKE_ARGS=		useALSA=1
+ALSA_MAKE_ARGS_OFF=	useALSA=0
+ALSA_VARS=		ALSA_H=alsa/asoundlib.h
+ALSA_VARS_OFF=		ALSA_H=##alsa/asoundlib.h##
+
+PNG_DESC=		Image opcodes
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
+PNG_MAKE_ARGS=		buildImageOpcodes=1
+PNG_MAKE_ARGS_OFF=	buildImageOpcodes=0
+
+DSSI_DESC=		DSSI/LADSPA host opcodes
+DSSI_BUILD_DEPENDS=	dssi>=0:audio/dssi
+DSSI_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+DSSI_RUN_DEPENDS=	dssi>=0:audio/dssi
+DSSI_MAKE_ARGS=		buildDSSI=1
+DSSI_MAKE_ARGS_OFF=	buildDSSI=0
+
+FLUIDSYNTH_DESC=	FluidSynth opcodes
+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
+FLUIDSYNTH_VARS=	FLUIDSYNTH_H=fluidsynth.h
+FLUIDSYNTH_VARS_OFF=	FLUIDSYNTH_H=##fluidsynth.h##
+
+JACK_DESC=		Jack I/O module and opcodes
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_MAKE_ARGS=		useJack=1
+JACK_MAKE_ARGS_OFF=	useJack=0
+
+OSC_DESC=		OSC opcodes
+OSC_LIB_DEPENDS=	liblo.so:audio/liblo
+OSC_MAKE_ARGS=		useOSC=1
+OSC_MAKE_ARGS_OFF=	useOSC=0
+
+PORTAUDIO_DESC=		PortAudio I/O module
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
+PORTAUDIO_MAKE_ARGS=	usePortAudio=1
+PORTAUDIO_MAKE_ARGS_OFF=usePortAudio=0
+
+PULSEAUDIO_DESC=	PulseAudio I/O module
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
+PULSEAUDIO_VARS=	PULSEAUDIO_H=pulse/simple.h
+PULSEAUDIO_VARS_OFF=	PULSEAUDIO_H=##pulse/simple.h##
+
+FLTK_DESC=		FLTK plugin and GUI
+FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
+FLTK_MAKE_ARGS=		buildCsound5GUI=1 buildCSEditor=1 buildWinsound=1 useFLTK=1
+FLTK_MAKE_ARGS_OFF=	buildCsound5GUI=0 buildCSEditor=0 buildWinsound=0 useFLTK=0
 
-.if ${PORT_OPTIONS:MFLTK}
-LIB_DEPENDS+=	libfltk.so:x11-toolkits/fltk
-MAKE_ARGS+=	buildCsound5GUI=1 buildCSEditor=1 buildWinsound=1 useFLTK=1
-.else
-MAKE_ARGS+=	buildCsound5GUI=0 buildCSEditor=0 buildWinsound=0 useFLTK=0
-.endif
+DOCS_DISTFILES=		Csound${PORTVERSION:R}_manual_html.zip:manual
 
-.if ${PORT_OPTIONS:MDOCS}
-CSOUND_DOCS=	Csound${PORTVERSION:R}_manual_html.zip
-.endif
+.include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == sparc64 || ${ARCH} == ia64
 MAKE_ARGS+=	Word64=1
@@ -193,4 +163,4 @@ post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609151603.u8FG3iTZ050953>