- Switch to options helpers

- While here, add some NO_ARCHes

Approved by:	portmgr blanket

5 files changed, 12 insertions, 23 deletions

diff --git a/dns/dnscheckengine/Makefile b/dns/dnscheckengine/Makefile
index 693c29778b22..5f6bc5cd28f5 100644
--- a/dns/dnscheckengine/Makefile
+++ b/dns/dnscheckengine/Makefile
@@ -12,6 +12,7 @@ MAINTAINER=	portmaster@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>
diff --git a/dns/dnsjava/Makefile b/dns/dnsjava/Makefile
index af2a537a287d..96b8a9374f23 100644
--- a/dns/dnsjava/Makefile
+++ b/dns/dnsjava/Makefile
@@ -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}/
 
diff --git a/dns/dnsperf/Makefile b/dns/dnsperf/Makefile
index 150d9ad7d26a..13f497d18c9c 100644
--- a/dns/dnsperf/Makefile
+++ b/dns/dnsperf/Makefile
@@ -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>
diff --git a/dns/pdnsd/Makefile b/dns/pdnsd/Makefile
index ce1f762b62de..f3e17de1df76 100644
--- a/dns/pdnsd/Makefile
+++ b/dns/pdnsd/Makefile
@@ -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>
diff --git a/dns/rbldnsd/Makefile b/dns/rbldnsd/Makefile
index 2eedeb447044..466f0141ad5b 100644
--- a/dns/rbldnsd/Makefile
+++ b/dns/rbldnsd/Makefile
@@ -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>