svn commit: r395395 - in head: graphics/lfview graphics/libwmf graphics/py-gvgen graphics/py-webcolors graphics/waffle graphics/xoris graphics/xournal graphics/zbar irc/darkbot irc/eggdrop irc/eggd...

Wed Aug 26 19:38:05 UTC 2015

Author: amdmi3
Date: Wed Aug 26 19:37:57 2015
New Revision: 395395
URL: https://svnweb.freebsd.org/changeset/ports/395395

Log:
  - Switch to options helpers
  - While here, add some NO_ARCHes
  
  Approved by:	portmgr blanket

Modified:
  head/graphics/lfview/Makefile
  head/graphics/libwmf/Makefile
  head/graphics/py-gvgen/Makefile
  head/graphics/py-webcolors/Makefile
  head/graphics/waffle/Makefile
  head/graphics/xoris/Makefile
  head/graphics/xournal/Makefile
  head/graphics/zbar/Makefile
  head/irc/darkbot/Makefile
  head/irc/eggdrop-devel/Makefile
  head/irc/eggdrop/Makefile
  head/irc/irssi-fish/Makefile
  head/irc/srvx/Makefile
  head/irc/tircproxy/Makefile
  head/irc/xchat-fish/Makefile
  head/japanese/font-mplus/Makefile
  head/japanese/kakasi/Makefile
  head/japanese/mh/Makefile
  head/lang/adacontrol/Makefile
  head/lang/ferite/Makefile
  head/lang/groovy/Makefile
  head/lang/malbolge/Makefile
  head/lang/onyx/Makefile
  head/lang/opendylan/Makefile

Modified: head/graphics/lfview/Makefile
==============================================================================

--- head/graphics/lfview/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/graphics/lfview/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -28,9 +28,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lfview ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/plugins/liblfv_leaf.so.1 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf liblfv_leaf.so.1 ${STAGEDIR}${PREFIX}/lib/liblfv_leaf.so
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/libwmf/Makefile
==============================================================================
--- head/graphics/libwmf/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/graphics/libwmf/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -36,8 +36,6 @@ OPTIONS_SUB=	yes
 X11_USE=	XORG=x11
 X11_CONFIGURE_OFF=--with-x=no
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \
 		${WRKSRC}/Makefile.in
@@ -46,11 +44,9 @@ post-patch:
 		 s|@LIBWMF_GDK_PIXBUF_FALSE@||g ; \
 		 s|: install-loaderLTLIBRARIES|:|g' ${WRKSRC}/src/Makefile.in
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \
 		${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/py-gvgen/Makefile
==============================================================================
--- head/graphics/py-gvgen/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/graphics/py-gvgen/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -17,6 +17,7 @@ USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	stricaud
 GH_TAGNAME=	777ab06
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
@@ -25,14 +26,10 @@ PORTDOCS=	crypto-folks.png gvgen-legend.
 		gvgen-propertylink.png gvgen-styles.png gvgen-defaultstyle.png \
    		gvgen-links.png gvgen-smartmode-1.png
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/py-webcolors/Makefile
==============================================================================
--- head/graphics/py-webcolors/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/graphics/py-webcolors/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -14,18 +14,15 @@ LICENSE=	BSD3CLAUSE
 
 USES=		python
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/waffle/Makefile
==============================================================================
--- head/graphics/waffle/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/graphics/waffle/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -29,11 +29,7 @@ CMAKE_ARGS+=	-Dwaffle_has_glx=ON
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-off:
 	${RM} -rf ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/xoris/Makefile
==============================================================================
--- head/graphics/xoris/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/graphics/xoris/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -15,11 +15,7 @@ USE_XORG=	x11
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-SUB_FILES=	pkg-message
-.endif
+DOCS_SUB_FILES=	pkg-message
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/xoris-run.sh ${STAGEDIR}${PREFIX}/bin

Modified: head/graphics/xournal/Makefile
==============================================================================
--- head/graphics/xournal/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/graphics/xournal/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -65,19 +65,15 @@ PORTDOCS=	${PORTDOCS_MAIN} \
 		html-doc/pixmaps/black.png \
 		html-doc/pixmaps/text-tool.png
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|$$(DESTDIR)/usr/share/|$$(DESTDIR)$$$$desktopdir/|g' \
 		${WRKSRC}/Makefile.in
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS_MAIN:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html-doc
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} html-doc/ ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/zbar/Makefile
==============================================================================
--- head/graphics/zbar/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/graphics/zbar/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -52,15 +52,13 @@ QT4_CONFIGURE_OFF=	--with-qt=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
-.if empty(PORT_OPTIONS:MDOCS)
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \
 		${WRKSRC}/Makefile.in
-.endif
 
 post-install:
 	# make check-plist happy

Modified: head/irc/darkbot/Makefile
==============================================================================
--- head/irc/darkbot/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/irc/darkbot/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -21,8 +21,6 @@ PLIST_DIRSTRY=	%%ETCDIR%%/logs/ %%ETCDIR
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 pre-configure:
 	${CP} ${WRKSRC}/configure ${WRKSRC}/config
 
@@ -47,9 +45,9 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/$s ${STAGEDIR}${ETCDIR}
 	${ECHO_CMD} ${ETCDIR_REL}/$s >> ${TMPPLIST}
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/README ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>

Modified: head/irc/eggdrop-devel/Makefile
==============================================================================
--- head/irc/eggdrop-devel/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/irc/eggdrop-devel/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -105,7 +105,9 @@ do-install:
 .for f in banner motd
 	${INSTALL_DATA} ${WRKSRC}/text/${f} ${STAGEDIR}${DATADIR}/text
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eggdrop/*.so
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ABOUT BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \
 	FIRST-SCRIPT KNOWN-PROBLEMS MODULES PARTYLINE PATCH-HOWTO \
@@ -118,7 +120,5 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/settings
 	cd ${WRKSRC}/doc/settings && ${RM} -rf CVS \
 		&& ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/settings
-.endif
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eggdrop/*.so
 
 .include <bsd.port.mk>

Modified: head/irc/eggdrop/Makefile
==============================================================================
--- head/irc/eggdrop/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/irc/eggdrop/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -25,8 +25,6 @@ MAKE_JOBS_UNSAFE=	yes
 SUB_FILES=	pkg-message
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \
 		> ${WRKSRC}/eggdrop.conf.sample
@@ -100,7 +98,8 @@ do-install:
 .for f in banner motd
 	${INSTALL_DATA} ${WRKSRC}/text/${f} ${STAGEDIR}${DATADIR}/text
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ABOUT BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \
 	FIRST-SCRIPT KNOWN-PROBLEMS MODULES PARTYLINE PATCH-HOWTO \
@@ -112,6 +111,5 @@ do-install:
 	cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}/html
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/settings
 	cd ${WRKSRC}/doc/settings && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/settings
-.endif
 
 .include <bsd.port.mk>

Modified: head/irc/irssi-fish/Makefile
==============================================================================
--- head/irc/irssi-fish/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/irc/irssi-fish/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -47,13 +47,13 @@ post-patch:
 	@${REINPLACE_CMD} -e '/mirdef.lnx/d' ${WRKSRC}/Makefile
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
+	${INSTALL_PROGRAM} ${WRKSRC}/libfish.so ${STAGEDIR}${PREFIX}/lib/irssi/modules
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
-	${INSTALL_PROGRAM} ${WRKSRC}/libfish.so ${STAGEDIR}${PREFIX}/lib/irssi/modules
 
 .include <bsd.port.mk>

Modified: head/irc/srvx/Makefile
==============================================================================
--- head/irc/srvx/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/irc/srvx/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -28,8 +28,6 @@ BAHAMUT_DESC=	Enable Bahamut protocol (P
 DEBUG_CONFIGURE_ON=	--enable-debug
 BAHAMUT_CONFIGURE_ON=	--with-protocol=bahamut
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|srvx\.conf|${PREFIX}/etc/srx.conf|' \
 		${WRKSRC}/src/main.c
@@ -37,9 +35,9 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/srvx ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/*.conf.example ${STAGEDIR}${PREFIX}/etc
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/*.help ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/irc/tircproxy/Makefile
==============================================================================
--- head/irc/tircproxy/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/irc/tircproxy/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -15,15 +15,11 @@ GNU_CONFIGURE=	YES
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tircproxy ${STAGEDIR}${PREFIX}/sbin
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/irc/xchat-fish/Makefile
==============================================================================
--- head/irc/xchat-fish/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/irc/xchat-fish/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -30,8 +30,6 @@ PORTDOCS=	FiSH-xchat.txt \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${RM} -f ${WRKSRC}/mir*
 	${CP} -pf ${FILESDIR}/Makefile ${WRKSRC}/
@@ -40,9 +38,9 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins
 	${INSTALL_PROGRAM} ${WRKSRC}/xfish.so \
 		${STAGEDIR}${PREFIX}/lib/xchat/plugins/
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>

Modified: head/japanese/font-mplus/Makefile
==============================================================================
--- head/japanese/font-mplus/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/japanese/font-mplus/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -21,6 +21,7 @@ RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-f
 
 USES=		tar:xz
 NO_BUILD=	yes
+NO_ARCH=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
@@ -40,8 +41,6 @@ X_FONTSDIR=	lib/X11/fonts
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	cd ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4 && \
 	    ${CAT} fonts_e/fonts.alias fonts_e/euro/fonts.alias \
@@ -83,8 +82,7 @@ do-install-outline:
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for F in ${PORTDOCS:M*.bitmap:S,.bitmap$,,}; do \
 		${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/$${F} ${STAGEDIR}${DOCSDIR}/$${F}.bitmap; \
@@ -92,6 +90,5 @@ post-install:
 	for F in ${PORTDOCS:M*.outline:S,.outline$,,}; do \
 		${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/$${F} ${STAGEDIR}${DOCSDIR}/$${F}.outline; \
 	done
-.endif
 
 .include <bsd.port.mk>

Modified: head/japanese/kakasi/Makefile
==============================================================================
--- head/japanese/kakasi/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/japanese/kakasi/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -26,19 +26,17 @@ DOCS=		NEWS README README-ja TODO \
 		doc/ChangeLog.lib doc/JISYO \
 		doc/README.lib doc/README.wakati
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/-Wno-unused-result//' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/kakasi.1.ja \
 		${STAGEDIR}${MAN1PREFIX}/man/ja/man1/kakasi.1
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/japanese/mh/Makefile
==============================================================================
--- head/japanese/mh/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/japanese/mh/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -35,20 +35,18 @@ CONFLICTS=	nmh-[0-9]*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e "s/-O /${CFLAGS} /g" ${WRKSRC}/configure
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc-JP && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-.endif
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmh.so.3
 .for i in ap conflict dp fmtdump install-mh mhl post rcvdist rcvpack rcvstore rcvtty slocal spost
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mh/${i}
 .endfor
 
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc-JP && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
+
 .include <bsd.port.mk>

Modified: head/lang/adacontrol/Makefile
==============================================================================
--- head/lang/adacontrol/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/lang/adacontrol/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -23,8 +23,6 @@ PORTDOCS=	adacontrol*
 
 OPTIONS_DEFINE= DOCS
 
-.include <bsd.port.options.mk>
-
 do-build:
 	(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -Pbuild)
 
@@ -41,10 +39,10 @@ do-install:
 		${STAGEDIR}${PREFIX}/share/gps/plug-ins
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html \
 		${STAGEDIR}${PREFIX}/share/doc/gps/html
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${WRKSRC}/doc/*.html \
 		${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/lang/ferite/Makefile
==============================================================================
--- head/lang/ferite/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/lang/ferite/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -28,11 +28,7 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MDOCS}
-MAKE_ENV+=	NOPORTDOCS=1
-.endif
+DOCS_MAKE_ENV_OFF=	NOPORTDOCS=1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<stdint\.h>|<inttypes.h>|' \

Modified: head/lang/groovy/Makefile
==============================================================================
--- head/lang/groovy/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/lang/groovy/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -28,8 +28,6 @@ OPTIONS_DEFINE=	DOCS
 
 DOCS_DISTFILES=	apache-groovy-docs-${PORTVERSION}${EXTRACT_SUFX}
 
-.include <bsd.port.options.mk>
-
 PLIST_FILES=	${SCRIPTFILES:S,^,bin/,} %%JAVAJARDIR%%/${PORTNAME}.jar
 SUB_FILES=	set-groovy_home.sed
 
@@ -49,13 +47,13 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${ECHO_MSG} -n ">> Staging documentation in ${DOCSDIR}..."
 	@cd ${WRKSRC} \
 	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
 	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
-.endif
 
 post-install:
 	@${FIND} -s ${DATAFILES:S,^,${WRKSRC}/,} -not -type d 2>/dev/null | \

Modified: head/lang/malbolge/Makefile
==============================================================================
--- head/lang/malbolge/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/lang/malbolge/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -13,15 +13,11 @@ PLIST_FILES=	bin/malbolge
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/malbolge ${STAGEDIR}${PREFIX}/bin
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/malbolge.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/lang/onyx/Makefile
==============================================================================
--- head/lang/onyx/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/lang/onyx/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -28,8 +28,6 @@ PLIST_SUB=	ONYX_VERSION=${PORTVERSION}
 
 BROKEN_ia64=	Coredump during build on ia64
 
-.include <bsd.port.options.mk>
-
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} cook)
 
@@ -51,11 +49,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mod/modprompt/nx/modprompt/modprompt.nx ${STAGEDIR}${DATADIR}/nx/modprompt
 	${INSTALL_MAN} ${WRKSRC}/bin/onyx/man/man1/onyx.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/bin/onyx_config/man/man1/onyx_config.1 ${STAGEDIR}${PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	(cd ${WRKSRC}/doc/html/onyx && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
 	${INSTALL_DATA} ${WRKSRC}/doc/pdf/onyx/onyx.pdf ${STAGEDIR}${DOCSDIR}/pdf
-.endif
 
 .include <bsd.port.mk>

Modified: head/lang/opendylan/Makefile
==============================================================================
--- head/lang/opendylan/Makefile	Wed Aug 26 19:36:13 2015	(r395394)
+++ head/lang/opendylan/Makefile	Wed Aug 26 19:37:57 2015	(r395395)
@@ -14,7 +14,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 IA32_BINARY_PORT=	yes
-USES=	tar:bzip2
+USES=		tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 
@@ -22,8 +22,6 @@ WRAPPERS=	dylan-compiler make-dylan-app 
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-build:
 .for f in ${WRAPPERS}
 	@(${ECHO_CMD} "#!${SH}"; \
@@ -39,9 +37,9 @@ do-install:
 .for f in ${WRAPPERS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
