6 files changed, 34 insertions, 23 deletions

diff --git a/security/clamav-unofficial-sigs/Makefile b/security/clamav-unofficial-sigs/Makefile
index 19faef89ade3..8a91a716dee4 100644
--- a/security/clamav-unofficial-sigs/Makefile
+++ b/security/clamav-unofficial-sigs/Makefile
@@ -2,12 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	clamav-unofficial-sigs
-PORTVERSION=	3.7.1
-PORTREVISION=	1
+PORTVERSION=	3.7.2
 CATEGORIES=	security
-MASTER_SITES=	http://www.inetmsg.com/pub/ \
-		http://www.inetmsg.com/pub/archive/ \
-		SF/unofficial-sigs/
+MASTER_SITES=	SF/unofficial-sigs/
 
 MAINTAINER=	sf@maxempire.com
 COMMENT=	Update script for third-party ClamAV databases
@@ -17,7 +14,8 @@ RUN_DEPENDS=	clamscan:${PORTSDIR}/security/clamav \
 		curl:${PORTSDIR}/ftp/curl \
 		gpg:${PORTSDIR}/security/gnupg
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
@@ -31,6 +29,10 @@ SED_CONF=	-e 's|%%CLAM_DBS%%|/var/db/clamav|g' \
 		-e 's|%%START_CLAMD%%|${PREFIX}/etc/rc.d/clamav-clamd start|g' \
 		-e 's|%%WORK_DIR%%|/var/db/clamav-unofficial-sigs|g'
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/clamav-unofficial-sigs.sh
 	@${REINPLACE_CMD} ${SED_CONF} ${WRKSRC}/clamav-unofficial-sigs.conf
@@ -41,7 +43,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/clamav-unofficial-sigs.8 ${MANPREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/clamav-unofficial-sigs.conf ${PREFIX}/etc/clamav-unofficial-sigs.conf.sample
 
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG INSTALL LICENSE README ${DOCSDIR}
 .endif
diff --git a/security/clamav-unofficial-sigs/distinfo b/security/clamav-unofficial-sigs/distinfo
index a51615d1b41c..aa0a1a5ce59f 100644
--- a/security/clamav-unofficial-sigs/distinfo
+++ b/security/clamav-unofficial-sigs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clamav-unofficial-sigs-3.7.1.tar.gz) = 7f8de46da43d8edd06ee1dcd1bc4563e61b23c9bbd368ccf0265576e46f4d90c
-SIZE (clamav-unofficial-sigs-3.7.1.tar.gz) = 36594
+SHA256 (clamav-unofficial-sigs-3.7.2.tar.gz) = 96e98e6e4434c5950fa9831c6a43236fed7eabae44beded16171305cf3f9bdb9
+SIZE (clamav-unofficial-sigs-3.7.2.tar.gz) = 38549
diff --git a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.conf b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.conf
index bc6f5c92c625..1d30b0f14904 100644
--- a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.conf
+++ b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.conf
@@ -1,6 +1,6 @@
---- clamav-unofficial-sigs.conf	2010-06-06 18:43:07.000000000 +0200
-+++ clamav-unofficial-sigs.conf.patched	2010-06-07 18:41:56.000000000 +0200
-@@ -42,10 +42,10 @@
+--- clamav-unofficial-sigs.conf	2013-08-27 18:08:25.000000000 +0200
++++ clamav-unofficial-sigs.conf.patched	2013-09-04 16:19:11.000000000 +0200
+@@ -50,10 +50,10 @@
  
  # Set path to ClamAV database files location.  If unsure, check
  # your clamd.conf file for the "DatabaseDirectory" path setting.
@@ -13,7 +13,7 @@
  
  # To enable "ham" (non-spam) directory scanning and removal of
  # signatures that trigger on ham messages, uncomment the following
-@@ -76,7 +76,7 @@
+@@ -84,7 +84,7 @@
  # the script will still run).  You will also need to set the correct
  # path to your clamd socket file (if unsure of the path, check the
  # "LocalSocket" setting in your clamd.conf file for socket location).
@@ -22,7 +22,7 @@
  
  # If you would like to attempt to restart ClamD if detected not running,
  # uncomment the next 2 lines.  Confirm the path to the "clamd_lock" file
-@@ -86,8 +86,8 @@
+@@ -94,8 +94,8 @@
  # NOTE: these 2 variables are dependant on the "clamd_socket" variable
  # shown above - if not enabled, then the following 2 variables will be
  # ignored, whether enabled or not.
@@ -33,7 +33,7 @@
  
  # Enable or disable download time randomization.  This allows the script to
  # be executed via cron, but the actual database file checking will pause
-@@ -219,7 +219,7 @@
+@@ -227,7 +227,7 @@
  # Set working directory paths (edit to meet your own needs). If these
  # directories do not exist, the script will attempt to create them.
  # Top level working directory path:
@@ -42,3 +42,12 @@
  # Sub-directory names:
  ss_dir="$work_dir/ss-dbs"        # Sanesecurity sub-directory
  si_dir="$work_dir/si-dbs"        # SecuriteInfo sub-directory
+@@ -252,7 +252,7 @@
+ comment_silence="no"   # Default is "no" to report script comments
+ 
+ # Log update information to '$log_file_path/$log_file_name'.
+-enable_logging="yes"
++enable_logging="no"
+ log_file_path="/var/log"
+ log_file_name="clamav-unofficial-sigs.log"
+ 
diff --git a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
index 2576a11772da..dd6e7b82b54d 100644
--- a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
+++ b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
@@ -1,15 +1,15 @@
---- clamav-unofficial-sigs.sh	2010-06-06 18:43:07.000000000 +0200
-+++ clamav-unofficial-sigs.sh.patched	2010-06-07 18:42:17.000000000 +0200
-@@ -19,7 +19,7 @@
+--- clamav-unofficial-sigs.sh	2013-08-27 18:08:25.000000000 +0200
++++ clamav-unofficial-sigs.sh.patched	2013-09-04 16:10:35.000000000 +0200
+@@ -16,7 +16,7 @@
  #                                                                              #
  ################################################################################
  
 -default_config="/etc/clamav-unofficial-sigs.conf"
 +default_config="%%PREFIX%%/etc/clamav-unofficial-sigs.conf"
  
- version="v3.7.1 (updated 2010-06-06)"
+ version="v3.7.2 (updated 2013-08-25)"
  output_ver="
-@@ -407,6 +407,8 @@
+@@ -418,6 +418,8 @@
            exit
            ;;
        r)  no_default_config
diff --git a/security/clamav-unofficial-sigs/files/patch-clamd-status.sh b/security/clamav-unofficial-sigs/files/patch-clamd-status.sh
index c3b42c06fde4..cc796c06d8e2 100644
--- a/security/clamav-unofficial-sigs/files/patch-clamd-status.sh
+++ b/security/clamav-unofficial-sigs/files/patch-clamd-status.sh
@@ -1,5 +1,5 @@
---- clamd-status.sh	2010-01-24 02:38:29.000000000 +0100
-+++ clamd-status.sh.patched	2010-03-06 09:57:03.000000000 +0100
+--- clamd-status.sh	2013-08-27 18:08:25.000000000 +0200
++++ clamd-status.sh.patched	2013-09-04 16:09:58.000000000 +0200
 @@ -24,7 +24,7 @@
  export PATH
  
diff --git a/security/clamav-unofficial-sigs/pkg-descr b/security/clamav-unofficial-sigs/pkg-descr
index d4f0c98548e7..92efe7695a91 100644
--- a/security/clamav-unofficial-sigs/pkg-descr
+++ b/security/clamav-unofficial-sigs/pkg-descr
@@ -1,3 +1,3 @@
 The clamav-unofficial-sigs script provides the capability to download, test,
 and update the third-party ClamAV signature databases provided by
-Sanesecurity, SecuriteInfo, MalwarePatrol, OITC, INetMsg and ScamNailer.
+Sanesecurity, SecuriteInfo, MalwarePatrol, OITC, etc.