- Use DOC instead of NOPORTDOCS

- Pacify portlint
- Convert header

10 files changed, 48 insertions, 54 deletions

diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 1fc1a170b45a..1420c9f451c7 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	festalon
-# Date created:				13 Jul 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
+# Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
-#
 
 PORTNAME=	festalon
 PORTVERSION=	0.5.5
@@ -18,7 +14,7 @@ COMMENT?=	A command line player for .nsf and .hes audio files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
@@ -30,7 +26,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 .if ${PKGNAMEPREFIX} == ""
 
@@ -42,7 +40,7 @@ PORTDOCS=	README
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
@@ -52,4 +50,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index 3bbc5ede9a71..ce17e032031a 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -27,7 +27,7 @@ MAN1=		gbsplay.1 gbsinfo.1
 MAN5=		gbsplayrc.5
 PORTDOCS=	COPYRIGHT HISTORY README
 
-OPTIONS_DEFINE=	NAS
+OPTIONS_DEFINE=	NAS DOCS
 
 .endif
 
@@ -85,7 +85,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/po/${l}.mo ${PREFIX}/share/locale/${l}/LC_MESSAGES/gbsplay.mo
 .endfor
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff --git a/audio/malint/Makefile b/audio/malint/Makefile
index 4bd99d599e83..0a76e53df05c 100644
--- a/audio/malint/Makefile
+++ b/audio/malint/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	malint
-# Date created:				20 Jun 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
+# Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
-#
 
 PORTNAME=	malint
 DISTVERSION=	0.2
@@ -23,7 +19,11 @@ MAKE_JOBS_SAFE=	yes
 PORTDOCS=	README
 PLIST_FILES=	bin/malint
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile
index 679245c50593..4e5e132d32ed 100644
--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	milkytracker
-# Date created:				13 Mar 2008
-# Whom:					Emanuel Haupt <ehaupt@FreeBSD.org>
-#
+# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	milkytracker
 PORTVERSION=	0.90.85
@@ -18,7 +14,7 @@ COMMENT=	A free music creation tool inspired by Fast Tracker 2
 LICENSE=	GPLv3
 
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack \
-		zzip.13:${PORTSDIR}/devel/zziplib
+		zzip:${PORTSDIR}/devel/zziplib
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl
@@ -35,23 +31,25 @@ PLIST_FILES=	bin/milkytracker share/pixmaps/milkytracker.ico \
 PORTDOCS=	FAQ.html MilkyTracker.html ChangeLog.html
 ICONS=		carton.ico carton.png
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-install:
 .for f in ${ICONS}
 	${INSTALL_DATA} ${WRKSRC}/resources/pictures/${f} \
 		${LOCALBASE}/share/pixmaps/${f:C/carton/milkytracker/}
 .endfor
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "powerpc"
 BROKEN=		Does not compile on powerpc: fails in assembler
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 44c9cd266ae5..f0ff29ff3ebf 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -52,7 +52,7 @@ PFILES=		configure cpiface/cpianal.c cpiface/cpidots.c \
 		stuff/poutput-dga.c stuff/poutput-keyboard.c \
 		stuff/poutput-vcsa.c stuff/poutput-x11.c
 
-OPTIONS_DEFINE=	ADPLUG FLAC MIDI X11 SDL
+OPTIONS_DEFINE=	ADPLUG FLAC MIDI X11 SDL DOCS
 
 ADPLUG_DESC=	adplug support
 MIDI_DESC=	timidity support
@@ -109,7 +109,7 @@ PLIST_SUB+=		FLAC="@comment "
 CONFIGURE_ARGS+=	--without-flac
 .endif
 
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 MAKE_ENV+=	DOCS="\#"
 .endif
 
diff --git a/audio/openspc/Makefile b/audio/openspc/Makefile
index db896e6150c2..9cbd15a76f45 100644
--- a/audio/openspc/Makefile
+++ b/audio/openspc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openspc
-# Date created:				10 Jul 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
+# Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
-#
 
 PORTNAME=	openspc
 PORTVERSION=	0.3.1
@@ -25,7 +21,11 @@ PORTDOCS=	README
 PLIST_FILES=	bin/OpenSPClite include/OpenSPC.h lib/libOpenSPC.so \
 		lib/libOpenSPC.so.3 lib/libOpenSPC.la lib/libOpenSPC.a
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/audio/sidplayer/Makefile b/audio/sidplayer/Makefile
index 43b690174a8e..75ca4a1169ad 100644
--- a/audio/sidplayer/Makefile
+++ b/audio/sidplayer/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   sidplayer
-# Date created:		27 May 2005
-# Whom:			Emanuel Haupt <ehaupt@critical.ch>
-#
+# Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
-#
 
 PORTNAME=	sidplayer
 PORTVERSION=	4.4
@@ -24,13 +20,17 @@ MAKE_JOBS_SAFE=	yes
 
 SDLINCLUDEDIR=	SDL
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|SDL/SDL_endian\.h|${SDLINCLUDEDIR}/SDL_endian\.h|' \
 		${WRKSRC}/src/main_sdl.cpp
 
 do-install:
 	${INSTALL} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${CP} ${WRKSRC}/PSID\ Demo/* ${DOCSDIR}/
 .endif
@@ -38,7 +38,7 @@ do-install:
 post-install:
 	@${ECHO_MSG} "=============================================================="
 	@${ECHO_MSG} "A huge SID tune archive can be found at http://hvsc.c64.org/"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "You can find a few examples in ${DOCSDIR}"
 .endif
 	@${ECHO_MSG} "=============================================================="
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index 5e1a98c38249..914262751584 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -32,7 +32,7 @@ PORTDOCS=	BUGS PLANS REDUNDANT_REPLAYERS UAE-CREDITS UAE-README \
 		play_loop_state_diagram.dia play_loop_state_diagram.eps \
 		play_loop_state_diagram.txt uade.html
 
-OPTIONS_DEFINE=	TEXTSCOPE FUSE XMMS
+OPTIONS_DEFINE=	TEXTSCOPE FUSE XMMS DOCS
 
 TEXTSCOPE_DESC=	Audio register debug mode
 XMMS_DESC=	XMMS plugin
@@ -67,7 +67,7 @@ post-patch:
 post-install:
 	@${RM} -rf ${DATADIR}/players/S
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
diff --git a/audio/xmms-sexypsf/Makefile b/audio/xmms-sexypsf/Makefile
index fe2194716f85..ffae65ea8abd 100644
--- a/audio/xmms-sexypsf/Makefile
+++ b/audio/xmms-sexypsf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmms-sexypsf
-# Date created:				10 Jul 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
+# Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
-#
 
 PORTNAME=	xmms-sexypsf
 PORTVERSION=	0.4.8
@@ -34,6 +30,10 @@ SOURCES=	PsxBios PsxCounters PsxDma Spu PsxHw PsxMem Misc \
 
 PLIST_FILES=	lib/xmms/Input/libsexypsf.so
 
+OPTIONS_DEFINE=DOCS
+
+.include <bsd.port.options.mk>
+
 do-build:
 .for f in ${SOURCES}
 	${CC} ${CFLAGS} ${DEFINES} `gtk-config --cflags` -c -o ${WRKSRC}/${f}.o ${WRKSRC}/${f}.c
@@ -44,7 +44,7 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/libsexypsf.so ${PREFIX}/lib/xmms/Input/libsexypsf.so
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/Docs/${f} ${DOCSDIR}
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index c7901655897d..c8085c90bc39 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --disable-arts \
 
 MAN1=		xmp.1
 
-OPTIONS_DEFINE=	ALSA BMP ESOUND NAS PULSEAUDIO UNZIP XMMS
+OPTIONS_DEFINE=	ALSA BMP ESOUND NAS PULSEAUDIO UNZIP XMMS DOCS
 
 BMP_DESC=	Beep media player plugin
 XMMS_DESC=	XMMS plugin
@@ -34,9 +34,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
 
 .if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
@@ -112,7 +110,7 @@ post-install:	.SILENT
 			${ETCDIR}/modules.conf; \
 	fi
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${ECHO_MSG} Installing documentation in ${DOCSDIR}
 	( cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* \
 		${DOCSDIR} '! ( -name Makefile -or -name xmp.1 \