- Trim Makefile header

- OptionsNG

7 files changed, 28 insertions, 44 deletions

diff --git a/games/agame/Makefile b/games/agame/Makefile
index 1fb5ca924c4d..caeedc638adf 100644
--- a/games/agame/Makefile
+++ b/games/agame/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	agame
-# Date created:		30 Jul 2006
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	agame
 PORTVERSION=	1577
@@ -35,6 +31,8 @@ DESKTOP_ENTRIES="game" \
 		"Game;BlocksGame;" \
 		false
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -Ee 's,wav/|mp3/|img/,${DATADIR}/&,g' ${WRKSRC}/main.c
 
@@ -45,7 +43,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${dir}/* ${DATADIR}/${dir}/
 .endfor
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/games/rezerwar/Makefile b/games/rezerwar/Makefile
index 0fe68ce9f798..d06dc78503c4 100644
--- a/games/rezerwar/Makefile
+++ b/games/rezerwar/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rezerwar
-# Date created:		09 Jul 2009
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	rezerwar
 PORTVERSION=	0.4.2
@@ -26,7 +22,9 @@ CONFIGURE_ENV=	TARGET_BIN=${PREFIX}/bin \
 
 PORTDOCS=	*
 
-.if defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MDOCS}
 post-patch:
 	@${REINPLACE_CMD} -e '/TARGET_DOC/ d' ${WRKSRC}/mkfiles/Makefile.main
 .endif
diff --git a/games/sdl-ball/Makefile b/games/sdl-ball/Makefile
index 2039af142292..2f09b77a73fd 100644
--- a/games/sdl-ball/Makefile
+++ b/games/sdl-ball/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sdl-ball
-# Date created:		22 Apr 2008
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sdl-ball
 PORTVERSION=	1.01
@@ -23,11 +19,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sdl-ball ${PREFIX}/bin/
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/themes && ${COPYTREE_SHARE} . ${DATADIR}/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
 .endif
diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile
index 45a55533126f..69f38bef6a9c 100644
--- a/games/volleyball/Makefile
+++ b/games/volleyball/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	volleyball
-# Date created:		09 Oct 2005
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	volleyball
 PORTVERSION=	0.8.6
@@ -37,6 +33,8 @@ DESKTOP_ENTRIES="Pocket Volleyball" \
 		"Game;SportsGame;ArcadeGame;" \
 		false
 
+.include <bsd.port.options.mk>
+
 post-configure:
 	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
 		${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
@@ -45,7 +43,7 @@ post-install:
 	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
diff --git a/mail/findmaildirs/Makefile b/mail/findmaildirs/Makefile
index f576d09bad96..f455bfae491a 100644
--- a/mail/findmaildirs/Makefile
+++ b/mail/findmaildirs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	findmaildirs
-# Date created:		24 Feb 2012
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	findmaildirs
 PORTVERSION=	0.1
@@ -18,7 +14,9 @@ PLIST_FILES=	bin/${PORTNAME}
 
 PORTDOCS=	README
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
diff --git a/misc/metromap/Makefile b/misc/metromap/Makefile
index 6a772db7e2fd..89d6d6b4fea7 100644
--- a/misc/metromap/Makefile
+++ b/misc/metromap/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	metromap
-# Date created:		2005-07-01
-# Whom:			Vsevolod Stakhov <vsevolod@highsecure.ru>
-#
+# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	metromap
 PORTVERSION=	0.1.4
@@ -26,13 +22,15 @@ USES=		gettext
 
 PORTDOCS=	AUTHORS NEWS README README.data TODO
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,make,${GMAKE},' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/bin/python,${SETENV} python,' ${WRKSRC}/metromap.py
 	@${RM} -f ${WRKSRC}/modules/ReadMap.py.orig
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/security/bruteblock/Makefile b/security/bruteblock/Makefile
index 06910f8a0312..0d7eb61ec295 100644
--- a/security/bruteblock/Makefile
+++ b/security/bruteblock/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	bruteblock
-# Date created:		30 Jul 2006
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	bruteblock
 PORTVERSION=	0.0.5
@@ -28,6 +24,8 @@ CONFDIR=	${PREFIX}/etc/${PORTNAME}
 
 PORTDOCS=	FAQ README CHANGES
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bruteblock ${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${WRKSRC}/bruteblockd ${PREFIX}/sbin/
@@ -39,7 +37,7 @@ do-install:
 	fi
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/doc/bruteblock.8 ${PREFIX}/man/man8/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCSDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCSDIR}/
@@ -47,8 +45,6 @@ do-install:
 .endif
 
 post-install:
-.if !defined(BATCH)
 	@${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.mk>