svn commit: r395389 - in head: dns/dnscheckengine dns/dnsjava dns/dnsperf dns/pdnsd dns/rbldnsd editors/apel editors/impress editors/tamago emulators/kqemu-kmod emulators/kqemu-kmod-devel emulators...

Wed Aug 26 18:26:22 UTC 2015

Author: amdmi3
Date: Wed Aug 26 18:26:14 2015
New Revision: 395389
URL: https://svnweb.freebsd.org/changeset/ports/395389

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

Modified:
  head/dns/dnscheckengine/Makefile
  head/dns/dnsjava/Makefile
  head/dns/dnsperf/Makefile
  head/dns/pdnsd/Makefile
  head/dns/rbldnsd/Makefile
  head/editors/apel/Makefile
  head/editors/impress/Makefile
  head/editors/tamago/Makefile
  head/emulators/kqemu-kmod-devel/Makefile
  head/emulators/kqemu-kmod/Makefile
  head/emulators/uae/Makefile
  head/finance/sabernetdcs-client/Makefile
  head/french/tvdownloader/Makefile
  head/games/castlevox/Makefile
  head/games/kardsgt/Makefile
  head/graphics/ayam/Makefile
  head/graphics/cairomm/Makefile
  head/graphics/darktable/Makefile
  head/graphics/dataplot/Makefile
  head/graphics/figurine/Makefile
  head/graphics/generic_image_decoder/Makefile
  head/graphics/geoapi/Makefile
  head/graphics/gimp-elsamuko-script/Makefile
  head/graphics/hobbes-icons-xpm/Makefile
  head/graphics/impressive/Makefile

Modified: head/dns/dnscheckengine/Makefile
==============================================================================

--- head/dns/dnscheckengine/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/dns/dnscheckengine/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -12,6 +12,7 @@ MAINTAINER=	portmaster at bsdforge.com
 COMMENT=	DNS checker from the folks that run the .SE top level domain
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILES=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random \
 		p5-Digest-BubbleBabble>=0:${PORTSDIR}/security/p5-Digest-BubbleBabble \
@@ -47,8 +48,6 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC} | \
@@ -62,12 +61,12 @@ post-install:
 	(cd ${STAGEDIR}${PREFIX}/bin && \
 		${LN} -s ../libexec/dnscheck/dnscheck-dispatcher . && \
 		${LN} -s ../libexec/dnscheck/dnscheck dnscheckengine)
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/db
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} '${WRKSRC}/doc/DNSCheck Lib Descriptions.pdf' \
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCSDB:S|^|${WRKSRC}/db/|} ${STAGEDIR}${DOCSDIR}/db
-.endif
 
 .include <bsd.port.mk>

Modified: head/dns/dnsjava/Makefile
==============================================================================
--- head/dns/dnsjava/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/dns/dnsjava/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -13,6 +13,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	jar
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
@@ -33,16 +34,16 @@ PLIST_SUB+=	JDK8=""
 PLIST_SUB+=	JDK8="@comment "
 .endif
 
-.include <bsd.port.options.mk>
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${TAR} -C ${WRKSRC}/doc -cf - . | ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -
 	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${SAMPLE_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/
 

Modified: head/dns/dnsperf/Makefile
==============================================================================
--- head/dns/dnsperf/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/dns/dnsperf/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -30,9 +30,6 @@ PORTDOCS=	caching-dns-performance.pdf \
 CFLAGS+=	-I.
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=DOCS
-
-.include <bsd.port.options.mk>
 
 # This is a workaround for broken isc/stat.h.
 pre-build:
@@ -40,10 +37,8 @@ pre-build:
 	${ECHO_CMD} "#include <sys/types.h>" > ${WRKSRC}/isc/stat.h
 	${ECHO_CMD} "#include <sys/stat.h>" >> ${WRKSRC}/isc/stat.h
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/dns/pdnsd/Makefile
==============================================================================
--- head/dns/pdnsd/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/dns/pdnsd/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -33,12 +33,8 @@ CFLAGS+=	-pthread
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${DOC_FILES:S@^@${DOCSRCDIR}/@} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/dns/rbldnsd/Makefile
==============================================================================
--- head/dns/rbldnsd/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/dns/rbldnsd/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -23,8 +23,6 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	if [ ! -d ${ROOTDIR} ]; then \
 		${INSTALL} -d -m 710 ${ROOTDIR}; \
@@ -33,7 +31,8 @@ do-install:
 		${FILESDIR}/example ${ROOTDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/rbldnsd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/rbldnsd.8 ${STAGEDIR}${PREFIX}/man/man8
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES-0.81 ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
@@ -43,6 +42,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.default ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.init ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/rbldnsd.spec ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/editors/apel/Makefile
==============================================================================
--- head/editors/apel/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/editors/apel/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -42,13 +42,11 @@ PLIST_SUB+=	EMACS23="" NOEMACS23="@comme
 PLIST_SUB+=	EMACS23="@comment " NOEMACS23=""
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog README.* ; do \
 	    ${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR} ; \
 	done)
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/editors/impress/Makefile
==============================================================================
--- head/editors/impress/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/editors/impress/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -17,23 +17,22 @@ LICENSE_COMB=	dual
 OPTIONS_DEFINE=	DOCS
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES+=		tk
 
 PORTDOCS=	*
 PLIST_FILES=	bin/impress
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|g' \
 	    ${WRKSRC}/src/impress.tcl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/impress.tcl ${STAGEDIR}${PREFIX}/bin/impress
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/src/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/editors/tamago/Makefile
==============================================================================
--- head/editors/tamago/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/editors/tamago/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -29,8 +29,6 @@ PORTDOCS=	AUTHORS ChangeLog ChangeLog.19
 		README.Debian changelog.Debian
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-build:
 	cd ${WRKSRC}/helper && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
@@ -41,9 +39,9 @@ post-build:
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/helper/egg-helper \
 	    ${STAGEDIR}${PREFIX}/bin/egg-helper
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/emulators/kqemu-kmod-devel/Makefile
==============================================================================
--- head/emulators/kqemu-kmod-devel/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/emulators/kqemu-kmod-devel/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -66,10 +66,10 @@ do-install:
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} DESTDIR=${STAGEDIR} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/kqemu
 	${INSTALL_DATA} ${WRKSRC}/kqemu.h ${STAGEDIR}${PREFIX}/include/kqemu
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/kqemu-doc.html ${WRKSRC}/kqemu-tech.html \
 		${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/emulators/kqemu-kmod/Makefile
==============================================================================
--- head/emulators/kqemu-kmod/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/emulators/kqemu-kmod/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -62,10 +62,10 @@ do-install:
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} DESTDIR=${STAGEDIR} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/kqemu
 	${INSTALL_DATA} ${WRKSRC}/kqemu.h ${STAGEDIR}${PREFIX}/include/kqemu
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/kqemu-doc.html ${WRKSRC}/kqemu-tech.html \
 		${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/emulators/uae/Makefile
==============================================================================
--- head/emulators/uae/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/emulators/uae/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -12,6 +12,8 @@ COMMENT=	Commodore Amiga emulator
 
 LICENSE=	GPLv2
 
+BROKEN_powerpc=	does not compile on powerpc
+
 CONFLICTS=	e-uae-[0-9]*
 MAKE_JOBS_UNSAFE=yes
 
@@ -22,24 +24,12 @@ USE_GNOME=	gtk20
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 pre-configure:
 	@${REINPLACE_CMD} -e 's|build68kc|build68k|' \
 		${WRKSRC}/src/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/uae ${WRKSRC}/readdisk ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/COMPATIBILITY ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/CREDITS ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/README.PROGRAMMERS ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/unix/README ${STAGEDIR}${DOCSDIR}/README.unix
-.endif
 	@${MKDIR} ${STAGEDIR}${DATADIR}/amiga/devs/AHI
 	@${MKDIR} ${STAGEDIR}${DATADIR}/amiga/devs/AudioModes
 	${INSTALL_DATA} ${WRKSRC}/amiga/mousehack ${STAGEDIR}${DATADIR}/amiga
@@ -55,8 +45,14 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/amiga/devs/AudioModes/UAE \
 		${STAGEDIR}${DATADIR}/amiga/devs/AudioModes
 
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
-.endif
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/COMPATIBILITY ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/CREDITS ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/README.PROGRAMMERS ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/unix/README ${STAGEDIR}${DOCSDIR}/README.unix
 
 .include <bsd.port.mk>

Modified: head/finance/sabernetdcs-client/Makefile
==============================================================================
--- head/finance/sabernetdcs-client/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/finance/sabernetdcs-client/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -23,16 +23,13 @@ USES=		python tar:bzip2
 DOCSDIR=	${PREFIX}/share/doc/sndcs
 DATADIR=	${PREFIX}/share/sndcs
 SUB_FILES=	pkg-message
+NO_ARCH=	yes
 
 PYDISTUTILS_PKGNAME=	sndcs
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MDOCS)
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-setup.py
-.endif
+DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-setup.py
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/setup.py
@@ -40,6 +37,4 @@ post-patch:
 do-configure:
 	cd ${WRKSRC} && ${CP} "${FILESDIR}/sndcs2.conf" "sndcs/config/sndcs2.conf"
 
-post-install:
-
 .include <bsd.port.mk>

Modified: head/french/tvdownloader/Makefile
==============================================================================
--- head/french/tvdownloader/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/french/tvdownloader/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -21,11 +21,10 @@ RUN_DEPENDS=	msdl:${PORTSDIR}/multimedia
 USES=		python shebangfix
 SHEBANG_FILES=	doc/installdox
 ALL_TARGET=	build
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 pre-configure:
 	${REINPLACE_CMD} -e 's|@python|${PYTHON_CMD}|'	\
 		${WRKSRC}/Makefile ${WRKSRC}/src/Makefile
@@ -33,10 +32,11 @@ pre-configure:
 		${WRKSRC}/tvdownloader.sh
 	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|'	\
 		${WRKSRC}/tvdownload.desktop
-.if empty(PORT_OPTIONS:MDOCS)
-	${REINPLACE_CMD} -e 's|%%DOC%%|#|' ${WRKSRC}/Makefile
-.else
+
+pre-configure-DOCS-on:
 	${REINPLACE_CMD} -e 's|%%DOC%%||' ${WRKSRC}/Makefile
-.endif
+
+pre-configure-DOCS-off:
+	${REINPLACE_CMD} -e 's|%%DOC%%|#|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>

Modified: head/games/castlevox/Makefile
==============================================================================
--- head/games/castlevox/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/games/castlevox/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -14,6 +14,7 @@ COMMENT=	Fast world domination game
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}PC
 PORTDOCS=	README_Vox.txt
@@ -27,16 +28,13 @@ DESKTOP_ENTRIES="Castle Vox" "${COMMENT}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "Support docs *.jar" ${STAGEDIR}${DATADIR})
 	${INSTALL_DATA} ${WRKSRC}/VoxIcon.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
-.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/games/kardsgt/Makefile
==============================================================================
--- head/games/kardsgt/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/games/kardsgt/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -21,8 +21,6 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|^QT +=|#QT +=|g' \
 		${WRKSRC}/src/src.pro
@@ -40,11 +38,11 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/images
 	${INSTALL_DATA} ${WRKSRC}/src/doc/images/*.jpg ${STAGEDIR}${DATADIR}/images
 	${INSTALL_DATA} ${WRKSRC}/src/doc/images/*.png ${STAGEDIR}${DATADIR}/images
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in CREDITS ChangeLog README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/ayam/Makefile
==============================================================================
--- head/graphics/ayam/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/ayam/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -33,8 +33,6 @@ MAKE_JOBS_UNSAFE=	yes
 AYAM_PLUGINS=	csphere mfio
 PLUGINS_DIR=	${PREFIX}/lib/${PORTNAME}
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/tcl/ayam.tcl
 	@${REINPLACE_CMD} -e 's|^MF3DCFLAGS =|MF3DCFLAGS = -fPIC|g' \
@@ -92,7 +90,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/lib/ayam-splash.gif ${STAGEDIR}${DATADIR}
 
 # docs
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Setup.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/ayam.pdf ${STAGEDIR}${DOCSDIR}
@@ -103,6 +101,5 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html/pics
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/pics/* \
 		${STAGEDIR}${DOCSDIR}/html/pics
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/cairomm/Makefile
==============================================================================
--- head/graphics/cairomm/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/cairomm/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -25,12 +25,8 @@ OPTIONS_DEFINE=	DOCS
 
 DOCS_CONFIGURE_ARGS_OFF=	--disable-documentation
 
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MDOCS)
-post-configure:
+post-configure-DOCS-off:
 	@${TOUCH} -f ${WRKSRC}/docs/reference/html/index.html
-.endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcairomm-1.0.so.1.4.0

Modified: head/graphics/darktable/Makefile
==============================================================================
--- head/graphics/darktable/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/darktable/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -103,14 +103,12 @@ CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
-.if ! ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-off:
 	${RM} ${STAGEDIR}${DOCSDIR}/AUTHORS
 	${RM} ${STAGEDIR}${DOCSDIR}/LICENSE
 	${RM} ${STAGEDIR}${DOCSDIR}/README
 	${RM} ${STAGEDIR}${DOCSDIR}/TRANSLATORS
 	${RM} ${STAGEDIR}${DOCSDIR}/darktablerc.html
 	${RMDIR} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/dataplot/Makefile
==============================================================================
--- head/graphics/dataplot/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/dataplot/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -52,13 +52,11 @@ post-extract:
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's/MAXOBV=1000000/MAXOBV=${MAXOBV}/' \
-	${WRKSRC}/DPCOPA.INC
+		${WRKSRC}/DPCOPA.INC
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/dpsnapsh.pdf \
 		${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/figurine/Makefile
==============================================================================
--- head/graphics/figurine/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/figurine/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -24,22 +24,18 @@ PLIST_FILES=	bin/figurine \
 
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 # Optimizations produce bad assembly code on sparc64
-.if ${ARCH} == "sparc64"
-CFLAGS+=	-O0
-.endif
+CFLAGS_sparc64=	-O0
 
 post-patch:
-.if !${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e "s|Doc examples src|src|" \
-		${WRKSRC}/Makefile.in
-.endif
 	@${REINPLACE_CMD} -e 's|datadir = @datadir@|datadir = @datadir@/doc|' \
 		${WRKSRC}/Makefile.in \
 		${WRKSRC}/src/Makefile.in \
 		${WRKSRC}/Doc/Makefile.in \
 		${WRKSRC}/examples/Makefile.in
 
+post-patch-DOCS-off:
+	@${REINPLACE_CMD} -e "s|Doc examples src|src|" \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>

Modified: head/graphics/generic_image_decoder/Makefile
==============================================================================
--- head/graphics/generic_image_decoder/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/generic_image_decoder/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -20,8 +20,6 @@ PORTDOCS=	gid.txt
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	${CP} ${FILESDIR}/construct.gpr ${WRKSRC}
 	${MKDIR} ${WRKSRC}/src ${WRKDIR}/data
@@ -48,9 +46,9 @@ do-install:
 		${STAGEDIR}${PREFIX}/lib/generic_image_decoder
 	(cd ${WRKSRC}/test && ${INSTALL_PROGRAM} to_bmp mini \
 		${STAGEDIR}${PREFIX}/bin)
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/gid.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/geoapi/Makefile
==============================================================================
--- head/graphics/geoapi/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/geoapi/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -12,6 +12,7 @@ COMMENT=	Java interface API based upon O
 
 USES=		zip
 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_JAVA=	yes
 NO_WRKSUBDIR=	yes
 
@@ -20,18 +21,15 @@ DOCS=		README.txt
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 .for jar in ${JARFILES}
 	${INSTALL_DATA} ${WRKDIR}/${jar}.jar ${STAGEDIR}${JAVAJARDIR}
 .endfor
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/javadoc \
 		&& ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \;
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/gimp-elsamuko-script/Makefile
==============================================================================
--- head/graphics/gimp-elsamuko-script/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/gimp-elsamuko-script/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -23,24 +23,23 @@ OPTIONS_DEFINE=	DOCS
 
 USES=		zip
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 GIMP_SCRIPTS_DIR?=	share/gimp/scripts
 
 # installation dir
 PLIST_SUB=	GIMP_SCRIPTS_DIR=${GIMP_SCRIPTS_DIR}
 
-.include <bsd.port.options.mk>
-
 # installed docs
 PORTDOCS=	*
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \*.scm \
 		${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR})
+
 # install docs
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/z_README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/hobbes-icons-xpm/Makefile
==============================================================================
--- head/graphics/hobbes-icons-xpm/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/hobbes-icons-xpm/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -12,24 +12,21 @@ MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	Collection of over 3000 icons in XPM3 format
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 LIBDIR=		${STAGEDIR}${PREFIX}/include/X11/pixmaps
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${MKDIR} ${LIBDIR}
 	${CP} -R ${WRKSRC}/* ${LIBDIR}/
 	-${RM} ${LIBDIR}/README
 	-${RM} ${LIBDIR}/readem.shar
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/*.shar ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/impressive/Makefile
==============================================================================
--- head/graphics/impressive/Makefile	Wed Aug 26 18:22:33 2015	(r395388)
+++ head/graphics/impressive/Makefile	Wed Aug 26 18:26:14 2015	(r395389)
@@ -12,6 +12,7 @@ MAINTAINER=	vg at FreeBSD.org
 COMMENT=	The stylish way of giving presentations
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/license.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
@@ -23,6 +24,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}open
 
 USES=		ghostscript:run python
 NO_BUILD=	yes
+NO_ARCH=	yes
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 
@@ -30,14 +32,12 @@ PORTDOCS=	${PORTNAME}.html demo.pdf
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
