Index: head/security/osiris/Makefile
===================================================================
--- head/security/osiris/Makefile	(revision 404522)
+++ head/security/osiris/Makefile	(revision 404523)
@@ -1,72 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	osiris
 PORTVERSION=	4.2.3
 PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://osiris.shmoo.com/data/ \
 		http://redundancy.redundancy.org/mirror/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shmoo client/server host integrity checker
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	yes
 
 OPTIONS_DEFINE=	OSIRISMD OSIRISD PRINTDB CLI
 OPTIONS_DEFAULT=	OSIRISD
 OPTIONS_SUB=	yes
 
 OSIRISMD_DESC=	Management daemon
 OSIRISD_DESC=	Scan agent
 PRINTDB_DESC=	Database print tool
 CLI_DESC=	Management CLI
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libreadline.so.6)
 LIB_DEPENDS+=	libreadline.so.6:${PORTSDIR}/devel/readline
 .endif
 
-post-build:
-.if ${PORT_OPTIONS:MPRINTDB}
+post-build-PRINTDB-on:
 	cd ${WRKSRC}/src/tools && ${MAKE}
-.endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/osiris
-.if ${PORT_OPTIONS:MCLI}
+
+do-install-CLI-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${STAGEDIR}${PREFIX}/sbin
-.endif
-.if ${PORT_OPTIONS:MPRINTDB}
+
+do-install-PRINTDB-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/tools/printdb ${STAGEDIR}${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MOSIRISD}
+
+do-install-OSIRISD-on:
 	${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \
 		-e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \
 		${WRKSRC}/src/install/freebsd/osirisd.in > \
 		${WRKSRC}/src/install/freebsd/osirisd.sh
 	${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh \
 		${STAGEDIR}${PREFIX}/etc/rc.d
-.endif
-.if ${PORT_OPTIONS:MOSIRISMD}
+
+do-install-OSIRISMD-on:
 	${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \
 		-e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \
 		${WRKSRC}/src/install/freebsd/osirismd.in > \
 		${WRKSRC}/src/install/freebsd/osirismd.sh
 	@${MKDIR} ${STAGEDIR}${PREFIX}/osiris/configs
 .for os in aix bsdos darwin freebsd irix linux netbsd openbsd sunos \
 	unix-generic windows2000 windowsnt windowsserver2003 windowsxp \
 	wrt54g
 	${INSTALL_DATA} ${WRKSRC}/src/configs/default.${os} \
 		${STAGEDIR}${PREFIX}/osiris/configs
 .endfor
 	${INSTALL_PROGRAM} -m 4755 ${WRKSRC}/src/osirismd/osirismd \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirismd.sh \
 		${STAGEDIR}${PREFIX}/etc/rc.d
-.endif
 
 .include <bsd.port.post.mk>
Index: head/security/osiris/pkg-plist
===================================================================
--- head/security/osiris/pkg-plist	(revision 404522)
+++ head/security/osiris/pkg-plist	(revision 404523)
@@ -1,31 +1,30 @@
 %%CLI%%sbin/osiris
 %%PRINTDB%%bin/printdb
 %%OSIRISD%%sbin/osirisd
 %%OSIRISMD%%@owner osiris
 %%OSIRISMD%%@group osiris
 %%OSIRISMD%%sbin/osirismd
 %%OSIRISMD%%@owner
 %%OSIRISMD%%@group
 %%OSIRISD%%etc/rc.d/osirisd.sh
 %%OSIRISMD%%etc/rc.d/osirismd.sh
 @dir(osiris,osiris,) osiris
 %%OSIRISMD%%@owner osiris
 %%OSIRISMD%%@group osiris
 %%OSIRISMD%%osiris/configs/default.aix
 %%OSIRISMD%%osiris/configs/default.bsdos
 %%OSIRISMD%%osiris/configs/default.darwin
 %%OSIRISMD%%osiris/configs/default.freebsd
 %%OSIRISMD%%osiris/configs/default.irix
 %%OSIRISMD%%osiris/configs/default.linux
 %%OSIRISMD%%osiris/configs/default.netbsd
 %%OSIRISMD%%osiris/configs/default.openbsd
 %%OSIRISMD%%osiris/configs/default.sunos
 %%OSIRISMD%%osiris/configs/default.unix-generic
 %%OSIRISMD%%osiris/configs/default.windows2000
 %%OSIRISMD%%osiris/configs/default.windowsnt
 %%OSIRISMD%%osiris/configs/default.windowsserver2003
 %%OSIRISMD%%osiris/configs/default.windowsxp
 %%OSIRISMD%%osiris/configs/default.wrt54g
 %%OSIRISMD%%@owner
 %%OSIRISMD%%@group
-%%OSIRISMD%%@dirrm osiris/configs