- update to version 4.31.4

- use old version of update.pl instead of new broken one

PR:		ports/65983
Submitted by:	Serge Negodyuck <petr@petrovich.kiev.ua>

4 files changed, 32 insertions, 21 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index 10545ee80db9..39c540d6e9fa 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	drweb
-PORTVERSION=	4.31.3
-PORTREVISION=	1
+PORTVERSION=	4.31.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.drweb.ru/pub/unix/ \
+MASTER_SITES=	ftp://ftp.drweb.ru/pub/unix/generic/ \
 		ftp://ftp.drweb.ru/pub/unix/archive/ \
 		ftp://ftp.drweb.ru/pub/unix/archive/${PORTNAME}-${PORTVERSION}/
 
@@ -44,32 +43,32 @@ do-install:
 		${TAR} -xf - -C ${DRWEB_PREFIX}
 	${CHMOD} 755 ${DRWEB_PREFIX}/bases ${DRWEB_PREFIX}/doc \
 		${DRWEB_PREFIX}/lib ${DRWEB_PREFIX}/updates
-	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drweb.key \
-		${DRWEB_PREFIX}/drweb.key-dist
-	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drwebd.key \
-		${DRWEB_PREFIX}/drwebd.key-dist
+	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drweb.key-distr \
+		${DRWEB_PREFIX}/drweb.key-distr
+	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drwebd.key-distr \
+		${DRWEB_PREFIX}/drwebd.key-distr
 	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
 		< ${WRKSRC}/usr/local/drweb/update/update.pl \
 		> ${DRWEB_PREFIX}/update/update.pl
 	${CHMOD} 750 ${DRWEB_PREFIX}/update/update.pl
 	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
 		< ${WRKSRC}/usr/local/etc/drweb/drweb32.ini \
-		> ${PREFIX}/drweb/drweb32.ini-dist
+		> ${PREFIX}/drweb/drweb32.ini-distr
 	${RM} -f ${PREFIX}/bin/drweb
 	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
 		< ${WRKSRC}/usr/local/etc/rc.d/00drwebd.sh \
 		> ${PREFIX}/etc/rc.d/00drwebd.sh
 	${CHMOD} 755 ${PREFIX}/etc/rc.d/00drwebd.sh
 	if [ ! -f ${PREFIX}/drweb/drweb32.ini ] ; then \
-		${CP} ${PREFIX}/drweb/drweb32.ini-dist \
+		${CP} ${PREFIX}/drweb/drweb32.ini-distr \
 		      ${PREFIX}/drweb/drweb32.ini; \
 	fi
 	if [ ! -f ${DRWEB_PREFIX}/drweb.key ] ; then \
-		${CP} ${DRWEB_PREFIX}/drweb.key-dist \
+		${CP} ${DRWEB_PREFIX}/drweb.key-distr \
 		      ${DRWEB_PREFIX}/drweb.key; \
 	fi
 	if [ ! -f ${DRWEB_PREFIX}/drwebd.key ] ; then \
-		${CP} ${DRWEB_PREFIX}/drwebd.key-dist \
+		${CP} ${DRWEB_PREFIX}/drwebd.key-distr \
 		      ${DRWEB_PREFIX}/drwebd.key; \
 	fi
 	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
diff --git a/security/drweb/distinfo b/security/drweb/distinfo
index 611d11e522f8..5a684651c107 100644
--- a/security/drweb/distinfo
+++ b/security/drweb/distinfo
@@ -1,4 +1,4 @@
-MD5 (drweb-4.31.3-freebsd4.tar.gz) = 1c6d87efe66fd6bc0bf8aaeb4d4e9b53
-SIZE (drweb-4.31.3-freebsd4.tar.gz) = 2045333
-MD5 (drweb-4.31.3-freebsd5.tar.gz) = 8e87bcd9f53b254ce736ea5c2dd498c3
-SIZE (drweb-4.31.3-freebsd5.tar.gz) = 2350075
+MD5 (drweb-4.31.4-freebsd4.tar.gz) = 5732d40413ac4af4f38148d1260210d5
+SIZE (drweb-4.31.4-freebsd4.tar.gz) = 2137387
+MD5 (drweb-4.31.4-freebsd5.tar.gz) = 0c77bc4aec35cdb4de3376f138e214ed
+SIZE (drweb-4.31.4-freebsd5.tar.gz) = 2440504
diff --git a/security/drweb/pkg-install b/security/drweb/pkg-install
index 5cfd03d1ac4b..01b5035cd3f6 100644
--- a/security/drweb/pkg-install
+++ b/security/drweb/pkg-install
@@ -36,6 +36,7 @@ fi
 
 if ! grep -q "^!${USER}" /etc/syslog.conf; then
   echo "You may also add this lines to your /etc/syslog.conf:"
+  echo "!drwebd"
   echo "*.*             /var/log/drwebd.log"
   echo ""
 fi
diff --git a/security/drweb/pkg-plist b/security/drweb/pkg-plist
index 6315224fdf2b..0e3f84227552 100644
--- a/security/drweb/pkg-plist
+++ b/security/drweb/pkg-plist
@@ -3,6 +3,17 @@ bin/drweb
 drweb/ChangeLog
 drweb/README
 drweb/README.RUS
+drweb/bases/drw43112.vdb
+drweb/bases/drw43111.vdb
+drweb/bases/drw43110.vdb
+drweb/bases/drw43109.vdb
+drweb/bases/drw43108.vdb
+drweb/bases/drw43107.vdb
+drweb/bases/drw43106.vdb
+drweb/bases/drw43105.vdb
+drweb/bases/drw43104.vdb
+drweb/bases/drw43103.vdb
+drweb/bases/drw43102.vdb
 drweb/bases/drw43101.vdb
 drweb/bases/drwebase.vdb
 drweb/doc/readme.daemon
@@ -11,15 +22,15 @@ drweb/doc/readme.eicar
 drweb/doc/readme.scanner
 drweb/doc/readme.scanner.rus
 drweb/drweb
-@unexec if [ -f %D/drweb/drweb.key ] && cmp -s %D/drweb/drweb.key %D/drweb/drweb.key-dist; then rm -f %D/drweb/drweb.key; fi
-drweb/drweb.key-dist
+@unexec if [ -f %D/drweb/drweb.key ] && cmp -s %D/drweb/drweb.key %D/drweb/drweb.key-distr; then rm -f %D/drweb/drweb.key; fi
+drweb/drweb.key-distr
 @exec if [ ! -f %D/drweb/drweb.key ] ; then cp -p %D/%F %B/drweb.key; fi
-@unexec if [ -f %D/drweb/drweb32.ini ] && cmp -s %D/drweb/drweb32.ini %D/drweb/drweb32.ini-dist; then rm -f %D/drweb/drweb32.ini; fi
-drweb/drweb32.ini-dist
+@unexec if [ -f %D/drweb/drweb32.ini ] && cmp -s %D/drweb/drweb32.ini %D/drweb/drweb32.ini-distr; then rm -f %D/drweb/drweb32.ini; fi
+drweb/drweb32.ini-distr
 @exec if [ ! -f %D/drweb/drweb32.ini ] ; then cp -p %D/%F %B/drweb32.ini; fi
 drweb/drwebd
-@unexec if [ -f %D/drweb/drwebd.key ] && cmp -s %D/drweb/drwebd.key %D/drweb/drwebd.key-dist; then rm -f %D/drweb/drwebd.key; fi
-drweb/drwebd.key-dist
+@unexec if [ -f %D/drweb/drwebd.key ] && cmp -s %D/drweb/drwebd.key %D/drweb/drwebd.key-distr; then rm -f %D/drweb/drwebd.key; fi
+drweb/drwebd.key-distr
 @exec if [ ! -f %D/drweb/drwebd.key ] ; then cp -p %D/%F %B/drwebd.key; fi
 drweb/drwebdc
 drweb/lib/drweb32.dll