svn commit: r360485 - in head/games: dodgindiamond2 doom-freedoom moria pinball sol unnethack xroads

[Adam Weinberger]

Author: adamw
Date: Thu Jul  3 23:27:49 2014
New Revision: 360485
URL: http://svnweb.freebsd.org/changeset/ports/360485
QAT: https://qat.redports.org/buildarchive/r360485/

Log:
  Remove NOPORTDOCS.

Modified:
  head/games/dodgindiamond2/Makefile
  head/games/doom-freedoom/Makefile
  head/games/moria/Makefile
  head/games/pinball/Makefile
  head/games/sol/Makefile
  head/games/unnethack/Makefile
  head/games/xroads/Makefile

Modified: head/games/dodgindiamond2/Makefile
==============================================================================
--- head/games/dodgindiamond2/Makefile	Thu Jul  3 23:24:47 2014	(r360484)
+++ head/games/dodgindiamond2/Makefile	Thu Jul  3 23:27:49 2014	(r360485)
@@ -15,9 +15,13 @@ USE_SDL=		sdl image mixer
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--localstatedir=/var/games
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|COPYING||g' ${WRKSRC}/Makefile.in
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} '/install-data-am:/s/install-docsDATA//' \
 		${WRKSRC}/Makefile.in
 .endif

Modified: head/games/doom-freedoom/Makefile
==============================================================================
--- head/games/doom-freedoom/Makefile	Thu Jul  3 23:24:47 2014	(r360484)
+++ head/games/doom-freedoom/Makefile	Thu Jul  3 23:27:49 2014	(r360485)
@@ -22,15 +22,15 @@ PLIST_FILES=	%%DATADIR%%/doom2.wad
 PLIST_DIRS=	%%DATADIR%%
 PORTDOCS=	ChangeLog NEWS README
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/doom2.wad ${STAGEDIR}${DATADIR}
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include "${.CURDIR}/../doom-data/Makefile.include"
 

Modified: head/games/moria/Makefile
==============================================================================
--- head/games/moria/Makefile	Thu Jul  3 23:24:47 2014	(r360484)
+++ head/games/moria/Makefile	Thu Jul  3 23:27:49 2014	(r360485)
@@ -17,9 +17,9 @@ ALL_TARGET=	moria
 MAKE_ENV+=	DOCSDIR="${DOCSDIR}" MKDIR="${MKDIR}" TOUCH="${TOUCH}" \
 		STAGEDIR="${STAGEDIR}" DATADIR="${DATADIR}"
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
+
+OPTIONS_DEFINE=	DOCS
 
 do-configure:
 	${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:g" ${WRKSRC}/source/config.h
@@ -28,8 +28,6 @@ do-configure:
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
 	${INSTALL_MAN} ${WRKSRC}/doc/moria.6 ${STAGEDIR}${PREFIX}/man/man6/
-.if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
-.endif
 
 .include <bsd.port.mk>

Modified: head/games/pinball/Makefile
==============================================================================
--- head/games/pinball/Makefile	Thu Jul  3 23:24:47 2014	(r360484)
+++ head/games/pinball/Makefile	Thu Jul  3 23:27:49 2014	(r360485)
@@ -19,6 +19,8 @@ USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --without-debug
 
+OPTIONS_DEFINE=	DOCS
+
 .if defined(WITH_ALLEGRO)
 BROKEN=		support with Allegro is (temporarily?) broken as of version 0.3.1
 LIB_DEPENDS+=	liballeg.so:${PORTSDIR}/devel/allegro
@@ -40,11 +42,9 @@ pre-configure:
 		${REINPLACE_CMD} -e 's,^dnl,# dnl,;/echo.*RANLIB/,+1d'
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/games/sol/Makefile
==============================================================================
--- head/games/sol/Makefile	Thu Jul  3 23:24:47 2014	(r360484)
+++ head/games/sol/Makefile	Thu Jul  3 23:27:49 2014	(r360485)
@@ -20,7 +20,7 @@ CONFLICTS=	gnome-games-*
 USES=		gmake
 USE_XORG=	xpm x11 xaw
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} readme.var
@@ -35,10 +35,8 @@ do-install:
 	@${CHMOD} 2755 ${STAGEDIR}${PREFIX}/bin/sol
 	@${CHMOD} 770 ${STAGEDIR}${PREFIX}/share/sol
 	@${CHMOD} 660 ${STAGEDIR}${PREFIX}/share/sol/sol.score
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/sol
 	${INSTALL_DATA} ${WRKSRC}/CREDITS ${STAGEDIR}${PREFIX}/share/doc/sol
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/sol
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/games/unnethack/Makefile
==============================================================================
--- head/games/unnethack/Makefile	Thu Jul  3 23:24:47 2014	(r360484)
+++ head/games/unnethack/Makefile	Thu Jul  3 23:27:49 2014	(r360485)
@@ -28,6 +28,8 @@ SUB_FILES=	pkg-deinstall
 SUB_LIST=	VARDIR="${VARDIR}"
 PLIST_SUB=	VARDIR="${VARDIR_REL}"
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${MV} ${WRKSRC}/doc/nethack.6 ${WRKSRC}/doc/${PORTNAME}.6
 
@@ -40,9 +42,7 @@ post-install:
 			*) ${MV} $$fn unnethack_$$fn ;; \
 		esac; \
 	done
-.if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${FILESDIR}/sample.unnethackrc ${STAGEDIR}${DOCSDIR}
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/games/xroads/Makefile
==============================================================================
--- head/games/xroads/Makefile	Thu Jul  3 23:24:47 2014	(r360484)
+++ head/games/xroads/Makefile	Thu Jul  3 23:27:49 2014	(r360485)
@@ -13,7 +13,7 @@ COMMENT=	Commodore 64 "Crossroads"-like 
 
 USE_XORG=	x11 xpm xext
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xroads ${STAGEDIR}${PREFIX}/bin
@@ -21,11 +21,9 @@ do-install:
 .for file in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18
 	${INSTALL_DATA} ${WRKSRC}/map${file}.xrm ${STAGEDIR}${PREFIX}/share/xroads
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xroads
 .for file in BUGS CHANGELOG README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/share/doc/xroads
 .endfor
-.endif
 
 .include <bsd.port.post.mk>