4 files changed, 56 insertions, 41 deletions

diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index 9e84c8b36ef2..81c0685e9d0a 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -6,55 +6,68 @@
 #
 
 PORTNAME=	osiris
-PORTVERSION=	4.0.8
+PORTVERSION=	4.1.1
 CATEGORIES=	security
 MASTER_SITES=	http://osiris.shmoo.com/data/
 
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	The Shmoo client/server host integrity checker
 
+OPTIONS=	OSIRISMD "Enable to build the management daemon" off \
+		OSIRISD "Enable to build the osirisd scan agent" on \
+		CLI "Enable to build the management CLI" off
+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LIBTOOL_VER=	15
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_OSIRISMD)
 PLIST_SUB+=	OSIRISMD=""
 .else
 PLIST_SUB+=	OSIRISMD="@comment "
 .endif
+.if defined(WITHOUT_OSIRISD)
+PLIST_SUB+=	OSIRISD="@comment "
+.else
+PLIST_SUB+=	OSIRISD=""
+.endif
+.if defined(WITH_CLI)
+PLIST_SUB+=	CLI=""
+.else
+PLIST_SUB+=	CLI="@comment "
+.endif
 
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Define WITH_OSIRISMD to enable build of the management daemon."
-	@${ECHO_MSG}
-
-post-build:
+do-install:
+	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.if defined(WITH_CLI)
+	${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${PREFIX}/sbin
+.endif
+.if !defined(WITHOUT_OSIRISD)
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/src/install/freebsd/osirisd.in > \
 		${WRKSRC}/src/install/freebsd/osirisd.sh.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh.sample \
+		${PREFIX}/etc/rc.d
+.endif
 .if defined(WITH_OSIRISMD)
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/src/install/freebsd/osirismd.in > \
 		${WRKSRC}/src/install/freebsd/osirismd.sh.sample
-.endif
-
-do-install:
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	@${MKDIR} ${PREFIX}/osiris/configs
-.for os in aix bsdos darwin freebsd irix linux openbsd sunos unix-generic \
-	windows2000 windowsnt windowsserver2003 windowsxp
+.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} \
 		${PREFIX}/osiris/configs
 .endfor
 	${CHOWN} -R osiris:osiris ${PREFIX}/osiris
-	${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh.sample \
-		${PREFIX}/etc/rc.d
-.if defined(WITH_OSIRISMD)
-	${INSTALL_PROGRAM} ${WRKSRC}/src/osirismd/osirismd ${PREFIX}/sbin
+	${INSTALL_PROGRAM} -m 4755 -o osiris -g osiris \
+		${WRKSRC}/src/osirismd/osirismd ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirismd.sh.sample \
 		${PREFIX}/etc/rc.d
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/osiris/distinfo b/security/osiris/distinfo
index dac1e3580448..0e971fbe67f9 100644
--- a/security/osiris/distinfo
+++ b/security/osiris/distinfo
@@ -1,2 +1,2 @@
-MD5 (osiris-4.0.8.tar.gz) = 593eee1967a14e519e27de88f75c9cad
-SIZE (osiris-4.0.8.tar.gz) = 1896413
+MD5 (osiris-4.1.1.tar.gz) = ae7b255492320c9e37d73c8122fc4be9
+SIZE (osiris-4.1.1.tar.gz) = 1882582
diff --git a/security/osiris/pkg-install b/security/osiris/pkg-install
index 1fb8ae3be68c..eca0e185ef1d 100644
--- a/security/osiris/pkg-install
+++ b/security/osiris/pkg-install
@@ -56,7 +56,7 @@ make_account() {
 	echo "You need a user \"${u}\"."
 	if which -s pw && yesno "Would you like me to create it" y
 	then
-	    pw useradd ${u} -g ${g} -h - -d /usr/local/etc/osiris -s /sbin/nologin -c "${gcos}" || exit
+	    pw useradd ${u} -g ${g} -h - -d /nonexistent -s /sbin/nologin -c "${gcos}" || exit
 	    echo "Done."
 	else
 	    echo "Please create it, and try again."
diff --git a/security/osiris/pkg-plist b/security/osiris/pkg-plist
index ea629468ba27..435dc1233f95 100644
--- a/security/osiris/pkg-plist
+++ b/security/osiris/pkg-plist
@@ -1,21 +1,23 @@
 @comment $FreeBSD$
-sbin/osiris
-sbin/osirisd
+%%CLI%%sbin/osiris
+%%OSIRISD%%sbin/osirisd
 %%OSIRISMD%%sbin/osirismd
-etc/rc.d/osirisd.sh.sample
+%%OSIRISD%%etc/rc.d/osirisd.sh.sample
 %%OSIRISMD%%etc/rc.d/osirismd.sh.sample
-osiris/configs/default.aix
-osiris/configs/default.bsdos
-osiris/configs/default.darwin
-osiris/configs/default.freebsd
-osiris/configs/default.irix
-osiris/configs/default.linux
-osiris/configs/default.openbsd
-osiris/configs/default.sunos
-osiris/configs/default.unix-generic
-osiris/configs/default.windows2000
-osiris/configs/default.windowsnt
-osiris/configs/default.windowsserver2003
-osiris/configs/default.windowsxp
-@dirrm osiris/configs
-@dirrm 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%%@dirrm osiris/configs
+%%OSIRISMD%%@dirrm osiris