Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 May 2013 02:04:46 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r318822 - in head: games/agame games/rezerwar games/sdl-ball games/volleyball mail/findmaildirs misc/metromap security/bruteblock
Message-ID:  <201305230204.r4N24kXT072708@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu May 23 02:04:46 2013
New Revision: 318822
URL: http://svnweb.freebsd.org/changeset/ports/318822

Log:
  - Trim Makefile header
  - OptionsNG

Modified:
  head/games/agame/Makefile
  head/games/rezerwar/Makefile
  head/games/sdl-ball/Makefile
  head/games/volleyball/Makefile
  head/mail/findmaildirs/Makefile
  head/misc/metromap/Makefile
  head/security/bruteblock/Makefile

Modified: head/games/agame/Makefile
==============================================================================
--- head/games/agame/Makefile	Thu May 23 02:04:07 2013	(r318821)
+++ head/games/agame/Makefile	Thu May 23 02:04:46 2013	(r318822)
@@ -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}

Modified: head/games/rezerwar/Makefile
==============================================================================
--- head/games/rezerwar/Makefile	Thu May 23 02:04:07 2013	(r318821)
+++ head/games/rezerwar/Makefile	Thu May 23 02:04:46 2013	(r318822)
@@ -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

Modified: head/games/sdl-ball/Makefile
==============================================================================
--- head/games/sdl-ball/Makefile	Thu May 23 02:04:07 2013	(r318821)
+++ head/games/sdl-ball/Makefile	Thu May 23 02:04:46 2013	(r318822)
@@ -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

Modified: head/games/volleyball/Makefile
==============================================================================
--- head/games/volleyball/Makefile	Thu May 23 02:04:07 2013	(r318821)
+++ head/games/volleyball/Makefile	Thu May 23 02:04:46 2013	(r318822)
@@ -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}/

Modified: head/mail/findmaildirs/Makefile
==============================================================================
--- head/mail/findmaildirs/Makefile	Thu May 23 02:04:07 2013	(r318821)
+++ head/mail/findmaildirs/Makefile	Thu May 23 02:04:46 2013	(r318822)
@@ -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}/

Modified: head/misc/metromap/Makefile
==============================================================================
--- head/misc/metromap/Makefile	Thu May 23 02:04:07 2013	(r318821)
+++ head/misc/metromap/Makefile	Thu May 23 02:04:46 2013	(r318822)
@@ -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}

Modified: head/security/bruteblock/Makefile
==============================================================================
--- head/security/bruteblock/Makefile	Thu May 23 02:04:07 2013	(r318821)
+++ head/security/bruteblock/Makefile	Thu May 23 02:04:46 2013	(r318822)
@@ -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>



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