- Switch to options helpers

- While here, add some NO_ARCHes

Approved by:	portmgr blanket

7 files changed, 18 insertions, 30 deletions

diff --git a/irc/darkbot/Makefile b/irc/darkbot/Makefile
index a3f8e554abe..ace066c350f 100644
--- a/irc/darkbot/Makefile
+++ b/irc/darkbot/Makefile
@@ -21,8 +21,6 @@ PLIST_DIRSTRY=	%%ETCDIR%%/logs/ %%ETCDIR%%/dat/ %%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>
diff --git a/irc/eggdrop-devel/Makefile b/irc/eggdrop-devel/Makefile
index 73d26b257c1..6ffe432588f 100644
--- a/irc/eggdrop-devel/Makefile
+++ b/irc/eggdrop-devel/Makefile
@@ -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>
diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
index 2132d03fe8d..4efb3f94405 100644
--- a/irc/eggdrop/Makefile
+++ b/irc/eggdrop/Makefile
@@ -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>
diff --git a/irc/irssi-fish/Makefile b/irc/irssi-fish/Makefile
index b9e85456cff..a0479369e92 100644
--- a/irc/irssi-fish/Makefile
+++ b/irc/irssi-fish/Makefile
@@ -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>
diff --git a/irc/srvx/Makefile b/irc/srvx/Makefile
index 1484fccfe2f..bf708f21bc4 100644
--- a/irc/srvx/Makefile
+++ b/irc/srvx/Makefile
@@ -28,8 +28,6 @@ BAHAMUT_DESC=	Enable Bahamut protocol (P10 is default)
 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>
diff --git a/irc/tircproxy/Makefile b/irc/tircproxy/Makefile
index 09fccf8bcf6..7e95a10384a 100644
--- a/irc/tircproxy/Makefile
+++ b/irc/tircproxy/Makefile
@@ -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>
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index 0c1e4dc0bc2..9344065cf5f 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -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>