- Switch to options helpers

- Add some NO_ARCHes
- Fix and unsilence some installation commands
- Other minor fixes

Approved by:	portmgr blanket

1 files changed, 3 insertions, 4 deletions

diff --git a/sysutils/usermatic/Makefile b/sysutils/usermatic/Makefile
index 659106eb610a..8f4475d96888 100644
--- a/sysutils/usermatic/Makefile
+++ b/sysutils/usermatic/Makefile
@@ -14,6 +14,7 @@ COMMENT=	Scripts to automate the maintenance of accounts
 RUN_DEPENDS=	${PREFIX}/sbin/userneu.pl:${PORTSDIR}/sysutils/userneu
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 USES=		perl5 shebangfix
 SHEBANG_FILES=	digestion/digestion.pl hunter-seeker/hunter-seeker.pl \
 		newusers/newusers.pl reaper/reaper.pl
@@ -25,8 +26,6 @@ EXAMPLES=	digestion/list_digested digestion/list_raw \
 		newusers/sums_to_ignore
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	cd ${WRKSRC}/doc && ${INSTALL_MAN} digestion.pl.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	cd ${WRKSRC}/doc && ${INSTALL_MAN} hunter-seeker.pl.8 newusers.pl.8 reaper.pl.8 ${STAGEDIR}${MANPREFIX}/man/man8
@@ -38,9 +37,9 @@ do-install:
 	cd ${WRKSRC}/newusers && ${INSTALL_SCRIPT} newusers.pl ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>