- Update to 1.6.1_2

- Minor fixes

PR:		ports/114390
Submitted by:	Paul Schmehl <pauls@utdallas.edu> (maintainer)
Approved by:	sat (mentor)

6 files changed, 31 insertions, 39 deletions

diff --git a/security/sancp/Makefile b/security/sancp/Makefile
index da348f358132..5b16e9cf91bd 100644
--- a/security/sancp/Makefile
+++ b/security/sancp/Makefile
@@ -7,41 +7,34 @@
 
 PORTNAME=	sancp
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+DISTVERSIONSUFFIX=	-stable
+PORTREVISION=	2
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	sancp
-
-PATCH_SITES=	http://sancp.sourceforge.net/
-PATCHFILES=	sancp-1.6.1.fix200511.a.patch \
-		sancp-1.6.1.fix200606.bd.patch \
-		sancp-1.6.1.fix200601.c.patch
-PATCH_DIST_STRIP=-p1
+MASTER_SITES=	SF
 
 MAINTAINER=	pauls@utdallas.edu
 COMMENT=	A network connection profiler
 
-ALL_TARGET=	final
+ALL_TARGET=	bsd
 USE_RC_SUBR=	sancp.sh
 SUB_FILES=	pkg-message
 
-PORTDOCS=	CHANGES INSTALL ISSUES README SETUP fields.LIST
+PORTDOCS=	CHANGES INSTALL ISSUES README \
+		SETUP fields.LIST LICENSE
+
+post-extract:
+	@cd ${WRKSRC} && ${MV} LICENSE docs/
 
-.include <bsd.port.pre.mk>
+do-install:
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${INSTALL_PROGRAM} ${WRKSRC}/sancp ${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/etc/sancp/sancp.conf ${PREFIX}/etc/sancp.conf-dist
+	@${CP} -n ${PREFIX}/etc/sancp.conf-dist ${PREFIX}/etc/sancp.conf
 
-post-install:
-	${SH} ${PKGINSTALL}
-	${INSTALL_PROGRAM} ${WRKSRC}/sancp ${PREFIX}/bin
-.for f in sancp.conf
-	${INSTALL_DATA} ${WRKSRC}/etc/sancp/${f} ${PREFIX}/etc/${f}-dist
-	[ -f ${PREFIX}/etc/${f} ] || \
-		${INSTALL_DATA} ${WRKSRC}/etc/sancp/${f} ${PREFIX}/etc/${f}
-.endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} LICENSE ${DOCSDIR}
+	@${INSTALL} -d ${DOCSDIR}/
 	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/sancp/distinfo b/security/sancp/distinfo
index 62f4dd7ef326..939f39c5ac0b 100644
--- a/security/sancp/distinfo
+++ b/security/sancp/distinfo
@@ -1,12 +1,3 @@
-MD5 (sancp-1.6.1.tar.gz) = b83e2f4abb2bf7b10fd874aa58f6324c
-SHA256 (sancp-1.6.1.tar.gz) = 58e487a4bd83716e90ff19d0d7fab352e28bbe143be60f4ee61c34d5fa6380a3
-SIZE (sancp-1.6.1.tar.gz) = 69986
-MD5 (sancp-1.6.1.fix200511.a.patch) = 7b357ec3371fc399c7589261f0d8d11b
-SHA256 (sancp-1.6.1.fix200511.a.patch) = f80ea77873f03de40399c2c9247590829f02421d68758425cd139c48151eb13c
-SIZE (sancp-1.6.1.fix200511.a.patch) = 662
-MD5 (sancp-1.6.1.fix200606.bd.patch) = c073023ce198326e5724704f50a926dc
-SHA256 (sancp-1.6.1.fix200606.bd.patch) = d8c773a879944011a6e43b6632e7f11e8c0bb267e5750be76873d1d172b49c27
-SIZE (sancp-1.6.1.fix200606.bd.patch) = 6902
-MD5 (sancp-1.6.1.fix200601.c.patch) = 67be8fb2d747db03b61b157a340fc24c
-SHA256 (sancp-1.6.1.fix200601.c.patch) = 38fe2e2db7419fb79c57b1e0505dbfda9958f56ab85259a84485111eb644880f
-SIZE (sancp-1.6.1.fix200601.c.patch) = 3578
+MD5 (sancp-1.6.1-stable.tar.gz) = ffa64f2fdb49afd7ef16fbefda21e251
+SHA256 (sancp-1.6.1-stable.tar.gz) = 9836262aaf02bde116a9e79d342ea3af8b4991c7ba27b816fb54ed6c0863ff48
+SIZE (sancp-1.6.1-stable.tar.gz) = 71748
diff --git a/security/sancp/pkg-deinstall b/security/sancp/pkg-deinstall
index 185e78234c89..212c8c38918f 100644
--- a/security/sancp/pkg-deinstall
+++ b/security/sancp/pkg-deinstall
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ "$2" != "POST-DEINSTALL" ]; then
+        exit 0
+fi
+
 PATH=/bin:/usr/sbin
 USER=sancp
 GROUP=${USER}
diff --git a/security/sancp/pkg-descr b/security/sancp/pkg-descr
index 659dd3137fd9..6150d36c4d24 100644
--- a/security/sancp/pkg-descr
+++ b/security/sancp/pkg-descr
@@ -10,3 +10,5 @@ be validated through some means. Sancp uses rules to identify,
 record, and tag traffic of interest. 'Tagging' a connection 
 is a new feature since v1.4.0 Connections ('stats') can be 
 loaded into a database for further analysis. 
+
+WWW: http://www.metre.net/sancp.html
diff --git a/security/sancp/pkg-install b/security/sancp/pkg-install
index 5a20c14d416d..d6856cb2c95e 100644
--- a/security/sancp/pkg-install
+++ b/security/sancp/pkg-install
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ "$2" != "POST-INSTALL" ]; then
+	exit 0
+fi
+
 PATH=/bin:/usr/sbin
 USER=sancp
 GROUP=${USER}
diff --git a/security/sancp/pkg-plist b/security/sancp/pkg-plist
index 53689f4b4544..7a1cb524d2f0 100644
--- a/security/sancp/pkg-plist
+++ b/security/sancp/pkg-plist
@@ -1,6 +1,4 @@
 bin/sancp
-@unexec if [ -f %D/etc/sancp.conf ]  && cmp -s %D/etc/sancp.conf %D/etc/sancp.conf-dist; then rm -f %D/etc/sancp.conf; fi
-@unexec if [ -f %D/etc/sancp.conf ]; then    echo "WARNING: The %D/etc/sancp.conf file was not removed!"; fi
+@unexec if cmp -s %D/etc/sancp.conf %D/etc/sancp.conf-dist; then rm -f %D/etc/sancp.conf; fi
 etc/sancp.conf-dist
-@exec if [ ! -f %D/etc/sancp.conf-dist ] ; then cp -p %D/%F %B/sancp.conf; fi
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+@exec cp -n %D/%F %B/sancp.conf