4 files changed, 23 insertions, 32 deletions

diff --git a/security/samhain/Makefile b/security/samhain/Makefile
index ae509ca85c29..fc759b2756aa 100644
--- a/security/samhain/Makefile
+++ b/security/samhain/Makefile
@@ -17,7 +17,7 @@
 #
 
 PORTNAME=	samhain
-PORTVERSION=	1.8.12
+PORTVERSION=	2.0.0
 CATEGORIES=	security
 MASTER_SITES=	http://la-samhna.de/archive/ \
 		http://cold.darkambient.net/
@@ -129,10 +129,18 @@ post-install:
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-1_8.ps ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-1_8.html.tar ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-2_0.ps ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-2_0.html.tar ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/HOWTO-client+server.html ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/HOWTO-client+server-troubleshooting.html ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/HOWTO-samhain+GnuPG.html ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/HOWTO-write-modules.html ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/FAQ.html ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/README.UPGRADE ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/README ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/BUGS ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/sh_mounts.txt ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/sh_userfiles.txt ${DOCSDIR}
 .endif
 
 install-user:
diff --git a/security/samhain/distinfo b/security/samhain/distinfo
index f148334fc6af..ab882de0d55e 100644
--- a/security/samhain/distinfo
+++ b/security/samhain/distinfo
@@ -1,2 +1,2 @@
-MD5 (samhain_signed-1.8.12.tar.gz) = b204d4fbe32f01eea7c0b2d8e7991e09
-SIZE (samhain_signed-1.8.12.tar.gz) = 958403
+MD5 (samhain_signed-2.0.0.tar.gz) = e60b230ac1ecbc6547347fbe73b08a47
+SIZE (samhain_signed-2.0.0.tar.gz) = 1023967
diff --git a/security/samhain/files/patch-aa b/security/samhain/files/patch-aa
deleted file mode 100644
index be66f0127c4c..000000000000
--- a/security/samhain/files/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.in	Thu Mar 20 15:28:01 2003
-+++ Makefile.in.new	Sat Mar 29 15:37:05 2003
-@@ -263,13 +263,6 @@
- #----------------------------------------------------------
- 
- install: install-lkm install-program install-man install-data
--	@echo; \
--	echo "  You can use 'samhain-install.sh uninstall' for uninstalling"; \
--	echo "  i.e. you might consider saving that script for future use";\
--	echo; \
--	echo "  Use 'make install-boot' if you want @install_name@ to start on system boot"; \
--	echo
--
- 
- purge: uninstall-lkm uninstall-program uninstall-man 
- 	@echo "./samhain-install.sh --destdir=$(DESTDIR) --force --verbose uninstall-data"; \
-@@ -419,7 +412,7 @@
- 	    echo "  -----------------------------------------------------";\
- 	    echo "  The server will run as user @myident@ if started with";\
- 	    echo "  root privileges, otherwise as the user of the parent ";\
--	    echo "  process (use --enable-identity=USER to change).";\
-+	    echo "  process (use RUNAS_USER=USER to change).";\
- 	    echo;\
- 	    echo "  You may want to use: make install-user";\
- 	    echo;\
diff --git a/security/samhain/pkg-plist b/security/samhain/pkg-plist
index 0547d976573d..5da5f665f841 100644
--- a/security/samhain/pkg-plist
+++ b/security/samhain/pkg-plist
@@ -9,8 +9,16 @@
 %%SAMHAIN%%etc/samhainrc.sample
 %%SAMHAIN%%@unexec rmdir /var/lib/samhain 2>/dev/null || true
 %%SETPWD%%sbin/samhain_setpwd
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL-1_8.ps
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL-1_8.html.tar
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL-2_0.ps
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL-2_0.html.tar
 %%PORTDOCS%%%%DOCSDIR%%/HOWTO-client+server.html
+%%PORTDOCS%%%%DOCSDIR%%/HOWTO-client+server-troubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%/HOWTO-write-modules.html
 %%PORTDOCS%%%%DOCSDIR%%/HOWTO-samhain+GnuPG.html
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/README.UPGRADE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/sh_mounts.txt
+%%PORTDOCS%%%%DOCSDIR%%/sh_userfiles.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%