5 files changed, 26 insertions, 25 deletions

diff --git a/security/samhain/Makefile b/security/samhain/Makefile
index c81b674f924b..d7ccaa4956ae 100644
--- a/security/samhain/Makefile
+++ b/security/samhain/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	samhain
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.4
 CATEGORIES=	security
 MASTER_SITES=	http://la-samhna.de/archive/ \
 		http://redundancy.redundancy.org/mirror/
@@ -35,6 +35,7 @@ BUILD_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
 .endif
 
 GNU_CONFIGURE=	yes
+USE_RC_SUBR=	yes
 CONFIGURE_ARGS=	--enable-login-watch --localstatedir=/var \
 		--mandir=${PREFIX}/man --enable-suidcheck
 
@@ -136,11 +137,11 @@ pre-install:
 
 post-install:
 .if !defined(WITH_SERVER)
-	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${PREFIX}/etc/rc.d/samhain.sh.sample
+	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${PREFIX}/etc/rc.d/samhain.sh
 	@${CP} ${WRKSRC}/samhainrc ${PREFIX}/etc/samhainrc.sample
 	@${CHGRP} wheel ${PREFIX}/etc/samhainrc.sample
 .else
-	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${PREFIX}/etc/rc.d/yule.sh.sample
+	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${PREFIX}/etc/rc.d/yule.sh
 	@${CP} ${WRKSRC}/yulerc ${PREFIX}/etc/yulerc.sample
 .endif
 .if !defined(NOPORTDOCS)
@@ -158,4 +159,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/sh_userfiles.txt ${DOCSDIR}
 .endif
 
+	@${CAT} ${PKGMESSAGE}
 .include <bsd.port.post.mk>
diff --git a/security/samhain/distinfo b/security/samhain/distinfo
index 5ba9327d8c67..cfe860c9569a 100644
--- a/security/samhain/distinfo
+++ b/security/samhain/distinfo
@@ -1,3 +1,3 @@
-MD5 (samhain_signed-2.2.1.tar.gz) = 24d9f7b5043266bed81cb66fd8786212
-SHA256 (samhain_signed-2.2.1.tar.gz) = 822efb7c8c8025ed11e2296d1b2c204af1aece264c0f49e1ee4c457728fcbd14
-SIZE (samhain_signed-2.2.1.tar.gz) = 1506866
+MD5 (samhain_signed-2.2.4.tar.gz) = e6b981dd4d8f91f1fd73f2b011a3468c
+SHA256 (samhain_signed-2.2.4.tar.gz) = 298ed40bb7115883e974ebcd677f6b5a3901c99b64a10c9a4f5eedb15a4207cf
+SIZE (samhain_signed-2.2.4.tar.gz) = 1520568
diff --git a/security/samhain/files/patch-src__sh_extern.c b/security/samhain/files/patch-src__sh_extern.c
deleted file mode 100644
index c3753ebef477..000000000000
--- a/security/samhain/files/patch-src__sh_extern.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/sh_extern.c.orig	Fri Apr  7 20:07:53 2006
-+++ src/sh_extern.c	Mon May 22 08:18:29 2006
-@@ -1067,9 +1067,11 @@
-  */
- int sh_ext_add_default (const char * dummy)
- {
--  (void) dummy;
--  char * p = NULL;
-+  char * p;
-   int    i;
-+  (void) dummy;
-+
-+  p = NULL;
- 
-   SL_ENTER(_("sh_ext_add_default"));
-   if (dummy[0] == 'n' ||  dummy[0] == 'N' ||
diff --git a/security/samhain/pkg-message b/security/samhain/pkg-message
new file mode 100644
index 000000000000..ad336fa9bea9
--- /dev/null
+++ b/security/samhain/pkg-message
@@ -0,0 +1,15 @@
+
+###############################################################
+
+To start the samhain daemon at system boot, add:
+
+samhain_enable="YES"
+
+and/or
+
+yule_enable="YES"
+
+to /etc/rc.conf.
+
+###############################################################
+
diff --git a/security/samhain/pkg-plist b/security/samhain/pkg-plist
index f6cc0a1b3565..deb251568913 100644
--- a/security/samhain/pkg-plist
+++ b/security/samhain/pkg-plist
@@ -3,11 +3,11 @@
 %%YULE%%sbin/yule_setpwd
 %%YULE%%sbin/yule
 %%YULE%%sbin/yulectl
-%%YULE%%etc/rc.d/yule.sh.sample
-%%YULE%%@unexec echo To delete the yule user permanently, use 'pw userdel ${USER}'"
+%%YULE%%etc/rc.d/yule.sh
+%%YULE%%@unexec echo "To delete the yule user permanently, use 'pw userdel ${USER}'"
 %%YULE%%@unexec rmdir /var/lib/yule 2>/dev/null || true
 %%SAMHAIN%%sbin/samhain
-%%SAMHAIN%%etc/rc.d/samhain.sh.sample
+%%SAMHAIN%%etc/rc.d/samhain.sh
 %%SAMHAIN%%etc/samhainrc.sample
 %%SAMHAIN%%@unexec rmdir /var/lib/samhain 2>/dev/null || true
 %%SETPWD%%sbin/samhain_setpwd