Convert dhn's ports to the new options framework

While here trim headers and convert some USE_GNOME=pkgconfig to
USE_PKGCONFIG=build

Approved by:	maintainer (dhn)

2 files changed, 33 insertions, 42 deletions

diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 3584dbea6abe..0334df5951bd 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ncmpcpp
-# Date created:		August 25 2008
-# Whom:			Dennis Herrmann <adox@mcx2.org>
-#
+# Created by: Dennis Herrmann <adox@mcx2.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ncmpcpp
 PORTVERSION=	0.5.10
@@ -30,14 +26,15 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 MAN1=	ncmpcpp.1
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	CURL "Enable fetching lyrics from the Internet" on \
-		CLOCK "Enable clock-screen support" on \
-		UTF8 "Enable UTF8 support" on \
-		TAGLIB "Enable taglib support" off \
-		OUTPUTS "Enable outputs screen" on \
-		VISUALIZER "Enable music visualizer screen" on
+OPTIONS_DEFINE=	CURL CLOCK UTF8 TAGLIB OUTPUTS VISUALIZER
+OPTIONS_DEFAULT=	CURL CLOCK OUTPUTS VISUALIZER
+CURL_DESC=	Enable fetching lyrics from the Internet
+CLOCK_DESC=	clock-screen support
+TAGLIB_DESC=	taglib support
+OUTPUTS_DESC=	Enable outputs screen
+VISUALIZER_DESC=	Enable music visualizer screen
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_NCURSES_BASE)
 # no need to use ncurses-config if we use ncurses from the base system
@@ -52,46 +49,46 @@ PLIST_FILES=	bin/ncmpcpp \
 		%%DOCSDIR%%/COPYING
 PLIST_DIRS=	%%DOCSDIR%%
 
-.if !defined(WITHOUT_CURL)
+.if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-curl
 .else
 CONFIGURE_ARGS+=	--with-curl=no
 .endif
 
-.if !defined(WITHOUT_CLOCK)
+.if ${PORT_OPTIONS:MCLOCK}
 CONFIGURE_ARGS+=	--enable-clock
 .else
 CONFIGURE_ARGS+=	--disable-clock
 .endif
 
-.if !defined(WITHOUT_UTF8)
+.if ${PORT_OPTIONS:MUTF8}
 CONFIGURE_ARGS+=	--enable-unicode
 .else
 CONFIGURE_ARGS+=	--disable-unicode
 .endif
 
-.if !defined(WITHOUT_TAGLIB)
+.if ${PORT_OPTIONS:MTAGLIB}
 LIB_DEPENDS+=	tag:${PORTSDIR}/audio/taglib
 CONFIGURE_ARGS+=	--with-taglib
 .else
 CONFIGURE_ARGS+=	--with-taglib=no
 .endif
 
-.if !defined(WITHOUT_OUTPUTS)
+.if ${PORT_OPTIONS:MOUTPUTS}
 CONFIGURE_ARGS+=	--enable-outputs
 .else
 CONFIGURE_ARGS+=	--disable-outputs
 .endif
 
-.if !defined(WITHOUT_VISUALIZER)
+.if ${PORT_OPTIONS:MVISUALIZER}
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
 CONFIGURE_ARGS+=	--enable-visualizer
 .endif
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}/NEWS
@@ -105,4 +102,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 8b81d0579219..35cb81bbc337 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	snd
-# Date created:				2000-10-05
-# Whom:					trevor
-#
+# Created by: trevor
 # $FreeBSD$
-#
 
 PORTNAME=	snd
 PORTVERSION=	13.0
@@ -14,13 +10,11 @@ MASTER_SITES=	ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Multitracking sound editor and utilities
 
-OPTIONS=	FFTW3	"Use FFTW"				on  \
-		GSL	"Use GNU Scientific Library"		on  \
-		S7	"Use S7 as the extension language"	off  \
-		LADSPA	"Include support for LADSPA plugins"	on  \
-		MOTIF	"Make Snd with Motif graphics support"	off \
-		GTK2	"Make Snd with Gtk+ graphics support"	on \
-		X11	"Make Snd with GUI support"	on
+OPTIONS_DEFINE=	FFTW3 GSL S7 LADSPA MOTIF GTK2 X11 DOCS EXAMPLES
+OPTIONS_DEFAULT=	FFTW3 GSL LADSPA GTK2 X11
+FFTW3_DESC=	Use FFTW
+GSL_DESC=	Use GNU Scientific Library
+S7_DESC=	Use S7 as the extension language
 
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
@@ -41,41 +35,41 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 BROKEN=		does not compile on sparc64
 .endif
 
-.if !defined(WITHOUT_FFTW3)
+.if ${PORT_OPTIONS:MFFTW3}
 LIB_DEPENDS+=	fftw3:${PORTSDIR}/math/fftw3
 .else
 CONFIGURE_ARGS+=	--without-fftw
 .endif
 
-.if !defined(WITHOUT_GSL)
+.if ${PORT_OPTIONS:MGSL}
 LIB_DEPENDS+=	gsl.16:${PORTSDIR}/math/gsl
 .else
 CONFIGURE_ARGS+=	--without-gsl
 .endif
 
-.if !defined(WITHOUT_S7)
+.if ${PORT_OPTIONS:MS7}
 CONFIGURE_ARGS+=	--with-s7
 .else
 CONFIGURE_ARGS+=	--without-s7
 .endif
 
-.if !defined(WITHOUT_LADSPA)
+.if ${PORT_OPTIONS:MLADSPA}
 BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 RUN_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 .else
 CONFIGURE_ARGS+=	--without-ladspa
 .endif
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--with-gtk
 .endif
-.if defined(WITH_MOTIF)
+.if ${PORT_OPTIONS:MMOTIG}
 USE_MOTIF=	yes
 CONFIGURE_ARGS+=	--with-motif
 .endif
 
-.if defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--with-no-gui
 .endif
 
@@ -91,7 +85,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/snd.1 ${MANPREFIX}/man/man1/
-.if !defined(WITHOUT_S7)
+.if ${PORT_OPTIONS:MS7}
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${DATADIR}
 	@${MKDIR} ${DATADIR}/tools
@@ -99,7 +93,7 @@ do-install:
 	@${MKDIR} ${DATADIR}/sndins/samples
 	${INSTALL_DATA} ${WRKSRC}/sndins/samples/*.scm ${DATADIR}/sndins/samples
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in HISTORY.Snd README.Snd
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -109,7 +103,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pix/*.png ${DOCSDIR}/pix
 	cd ${WRKSRC} && ${PAX} -r -w tutorial ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/DotEmacs ${EXAMPLESDIR}
 .endif