Update to 5.6

PR:             178296
Submitted by:   Gerard Seibert <gerard@seibercom.net> (maintainer)

6 files changed, 13 insertions, 11 deletions

diff --git a/security/scamp/Makefile b/security/scamp/Makefile
index e1e7438a2227..b3d847665162 100644
--- a/security/scamp/Makefile
+++ b/security/scamp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scamp
-PORTVERSION=	5.5
+PORTVERSION=	5.6
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -27,6 +27,8 @@ SUB_FILES=	pkg-message
 
 MAN1=		scamp.1
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 post-patch:
diff --git a/security/scamp/distinfo b/security/scamp/distinfo
index 2aaa444f2c40..e67081ad4c14 100644
--- a/security/scamp/distinfo
+++ b/security/scamp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scamp-5.5.tar.gz) = 60ebc2603e457172c16761d2bc9933121f9bcc613673c44853e4b9931c161dce
-SIZE (scamp-5.5.tar.gz) = 137225
+SHA256 (scamp-5.6.tar.gz) = bacdee58ee86dcdb56c1605ae62cca0efc3557a570218d6860e4b75090bddb46
+SIZE (scamp-5.6.tar.gz) = 137317
diff --git a/security/scamp/files/default.sample b/security/scamp/files/default.sample
index 45b288b9b51a..6b882759d098 100644
--- a/security/scamp/files/default.sample
+++ b/security/scamp/files/default.sample
@@ -1,13 +1,12 @@
-# This is the /usr/local/etc/scamp/default file.
-# Created April 27, 2013 @ 19:37:13
+# This is the /etc/scamp/default file.
+# Created Thu, Tue, 02 May 2013
 
-SCAMP_VERSION=5.5
+SCAMP_VERSION=5.6
 CLAMAV_DB=/var/db/clamav
 T_DIR=/var/db/clamav/tmp
 C_GROUP=clamav
 C_PID=/var/run/clamav/clamd.pid
 C_USER=clamav
-CONFIG_DIR=/usr/local/etc/scamp
 GET_LDB=1
 GET_MALWARE=1
 GET_SANE=1
@@ -21,11 +20,10 @@ MW_DIR=/var/db/clamav/tmp/malware
 MW_FILE=mbl.ndb
 MW_URL=http://www.malwarepatrol.com.br/cgi/submit?action=list_clamav_ext
 RELOAD=1
-REST=0
+REST=1
 SANE=rsync://rsync.sanesecurity.net/sanesecurity
 SANE_DB=/var/db/clamav/tmp/sane
 SI_DIR=/var/db/clamav/tmp/securite
 SYS_LOG=1
 WPC=1
 W_SUM=1
-
diff --git a/security/scamp/files/pkg-message.in b/security/scamp/files/pkg-message.in
index 3e3fb360338f..476f030341f0 100644
--- a/security/scamp/files/pkg-message.in
+++ b/security/scamp/files/pkg-message.in
@@ -22,4 +22,7 @@
 * You will need to manually create any additional configuration files. *
 * Read the README or type "man scamp" for further assistance.          *
 *                                                                      *
+* To completely remove "scamp" from your system, delete the config     *
+* directory -- usually "/usr/local/etc/scamp"                          *
+*                                                                      *
 ************************************************************************
diff --git a/security/scamp/pkg-descr b/security/scamp/pkg-descr
index 5c442a5da4ef..2e7afa2344e5 100644
--- a/security/scamp/pkg-descr
+++ b/security/scamp/pkg-descr
@@ -5,6 +5,4 @@ sanesecurity.com
 malware.com.br
 clamav.securiteinfo.com
 
-Site Address:
-
 WWW: https://sourceforge.net/projects/scamp/
diff --git a/security/scamp/pkg-plist b/security/scamp/pkg-plist
index adcf9dd33b55..2ebf99a50ea5 100644
--- a/security/scamp/pkg-plist
+++ b/security/scamp/pkg-plist
@@ -5,6 +5,7 @@ bin/scamp.sh
 %%PORTDOCS%%%%DOCSDIR%%/Release.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %D/etc/scamp
+@unexec if cmp -s %D/etc/scamp/default.sample %D/etc/scamp/default; then rm -f %D/etc/scamp/default; fi
 etc/scamp/default.sample
 @exec if [ ! -f %D/etc/scamp/default ] ; then cp -p %D/%F %B/default; fi
 @dirrmtry etc/scamp