- Update to 4.1.3

- rcNGfy and add message how activate it
- Add mirror site
- Turn on "fancy cli" by default

PR:		ports/78713
Submitted by:	maintainer

6 files changed, 29 insertions, 46 deletions

diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index 061e12884e58..d9ef6cea3be8 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	osiris
-PORTVERSION=	4.1.2
+PORTVERSION=	4.1.3
 CATEGORIES=	security
-MASTER_SITES=	http://osiris.shmoo.com/data/
+MASTER_SITES=	http://osiris.shmoo.com/data/ \
+		http://darkambient.net/
 
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	The Shmoo client/server host integrity checker
@@ -18,8 +19,10 @@ OPTIONS=	OSIRISMD "Enable to build the management daemon" off \
 		CLI "Enable to build the management CLI" off
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
+			--enable-fancy-cli
 USE_LIBTOOL_VER=	15
+USE_RC_SUBR=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -46,17 +49,19 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${PREFIX}/sbin
 .endif
 .if !defined(WITHOUT_OSIRISD)
-	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	${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.sample
+		${WRKSRC}/src/install/freebsd/osirisd.sh
 	${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh.sample \
+	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh \
 		${PREFIX}/etc/rc.d
 .endif
 .if defined(WITH_OSIRISMD)
-	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	${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.sample
+		${WRKSRC}/src/install/freebsd/osirismd.sh
 	@${MKDIR} ${PREFIX}/osiris/configs
 .for os in aix bsdos darwin freebsd irix linux netbsd openbsd sunos \
 	unix-generic windows2000 windowsnt windowsserver2003 windowsxp \
@@ -66,9 +71,12 @@ do-install:
 .endfor
 	${INSTALL_PROGRAM} -m 4755 -o osiris -g osiris \
 		${WRKSRC}/src/osirismd/osirismd ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirismd.sh.sample \
+	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirismd.sh \
 		${PREFIX}/etc/rc.d
 .endif
 	${CHOWN} -R osiris:osiris ${PREFIX}/osiris
 
+post-install:
+	@${CAT} pkg-message
+
 .include <bsd.port.post.mk>
diff --git a/security/osiris/distinfo b/security/osiris/distinfo
index dd4b346039c6..60bb7e02e240 100644
--- a/security/osiris/distinfo
+++ b/security/osiris/distinfo
@@ -1,2 +1,2 @@
-MD5 (osiris-4.1.2.tar.gz) = 697836f441bf8336ae6688ba1961605a
-SIZE (osiris-4.1.2.tar.gz) = 1883059
+MD5 (osiris-4.1.3.tar.gz) = 1d3e250d1fcc3c654f5eda9d559c1f9a
+SIZE (osiris-4.1.3.tar.gz) = 1884877
diff --git a/security/osiris/files/patch-osirisd-in b/security/osiris/files/patch-osirisd-in
deleted file mode 100644
index afe815acb9a8..000000000000
--- a/security/osiris/files/patch-osirisd-in
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/install/freebsd/osirisd.in.old	Wed Jul  7 15:40:50 2004
-+++ src/install/freebsd/osirisd.in	Wed Jul  7 15:41:50 2004
-@@ -1,11 +1,11 @@
- #!/bin/sh
- 
--OSIRISD=@INSTALLDIR@/osirisd
-+OSIRISD=%%PREFIX%%/sbin/osirisd
- 
- case "$1" in
- 	start)
- 		if [ -x ${OSIRISD} ]; then
--			${OSIRISD} -r @OSIRISDIR@ && echo -n ' osirisd'
-+			${OSIRISD} -r %%PREFIX%%/osiris && echo -n ' osirisd'
- 		fi
- 		;;
- 	stop)
diff --git a/security/osiris/files/patch-osirismd-in b/security/osiris/files/patch-osirismd-in
deleted file mode 100644
index bcc5fc517a81..000000000000
--- a/security/osiris/files/patch-osirismd-in
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/install/freebsd/osirismd.in.old	Wed Jul  7 15:43:07 2004
-+++ src/install/freebsd/osirismd.in	Wed Jul  7 15:43:48 2004
-@@ -1,12 +1,12 @@
- #!/bin/sh
- 
--OSIRISMD=@INSTALLDIR@/osirismd
-+OSIRISMD=%%PREFIX%%/sbin/osirismd
- 
- case "$1" in
- 	start)
- 		if [ -f ${SUDO} ]; then
- 	    	    if [ -x ${OSIRISMD} ]; then
--			${OSIRISMD} -r @OSIRISDIR@ && echo -n ' osirismd'
-+			${OSIRISMD} -r %%PREFIX%%/osiris && echo -n ' osirismd'
- 		    fi
-                 else
- 		    echo ""
diff --git a/security/osiris/files/patch-osirismd.in b/security/osiris/files/patch-osirismd.in
new file mode 100644
index 000000000000..3124730aa24d
--- /dev/null
+++ b/security/osiris/files/patch-osirismd.in
@@ -0,0 +1,8 @@
+--- src/install/freebsd/osirismd.in.orig	Fri Mar 11 15:05:42 2005
++++ src/install/freebsd/osirismd.in	Fri Mar 11 15:06:03 2005
+@@ -25,4 +25,5 @@
+ rcvar=`set_rcvar`
+ command=@INSTALLDIR@/osirismd
+ 
++load_rc_config $name
+ run_rc_command "$1"
diff --git a/security/osiris/pkg-plist b/security/osiris/pkg-plist
index 1b8a45e66001..c8904d2308e4 100644
--- a/security/osiris/pkg-plist
+++ b/security/osiris/pkg-plist
@@ -2,8 +2,8 @@
 %%CLI%%sbin/osiris
 %%OSIRISD%%sbin/osirisd
 %%OSIRISMD%%sbin/osirismd
-%%OSIRISD%%etc/rc.d/osirisd.sh.sample
-%%OSIRISMD%%etc/rc.d/osirismd.sh.sample
+%%OSIRISD%%etc/rc.d/osirisd.sh
+%%OSIRISMD%%etc/rc.d/osirismd.sh
 @exec mkdir -p %D/osiris
 @exec chown osiris:osiris %D/osiris
 %%OSIRISMD%%osiris/configs/default.aix