3 files changed, 56 insertions, 69 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index 72b988523aa0..a999cac42485 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	drweb
-PORTVERSION=	4.33
-PORTREVISION=	5
+PORTVERSION=	4.44.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/61/:f61 \
-		ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/55/:f55 \
-		ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/411/:f411 \
-		http://freebsd.spectrum.ru/distfiles/drweb/:f61,f55,f411
-DIST_SUBDIR=	drweb
+MASTER_SITES=	ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/60/:f60 \
+		http://freebsd.spectrum.ru/distfiles/drweb/:f60
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	support@spectrum.ru
 COMMENT=	DrWeb antivirus suite
@@ -23,18 +20,22 @@ RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 IA32_BINARY_PORT=	yes
 NO_BUILD=		yes
 USE_RC_SUBR=		drwebd.sh
+USE_BZIP2=		yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 601000
-DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd61
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:f61
+DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd60
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:f60
 .else
-DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd55
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:f55
+IGNORE=		"Sorry, port is not supported of FreeBSD version < 6.1"
 .endif
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+.if ${OSVERSION} >= 700000
+LIB_DEPENDS+=   stdc++.5:${PORTSDIR}/misc/compat6x
+.endif
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DRWEB_PREFIX=	${PREFIX}/${PORTNAME}
 DRWEB_VARPREFIX=/var/drweb
@@ -42,8 +43,11 @@ DRWEB_VARPREFIX=/var/drweb
 do-install:
 	@${INSTALL} -dv -m 0750 ${DRWEB_PREFIX}
 	@${INSTALL} -dv -m 0750 ${PREFIX}/etc/drweb
+	@${INSTALL} -dv -m 0750 ${PREFIX}/etc/drweb/monitor
 	@${INSTALL} -dv -m 0750 ${DRWEB_VARPREFIX}
-	@${RM} -f ${WRKSRC}${LOCALBASE}/drweb/update.pl
+	@${MKDIR} ${WRKSRC}${LOCALBASE}/drweb/update
+	@${MV} ${WRKSRC}${LOCALBASE}/drweb/update.pl \
+		${WRKSRC}${LOCALBASE}/drweb/update/update.pl
 	@${TAR} -cf - -C ${WRKSRC}${LOCALBASE}/drweb . | \
 		${TAR} -xf - -C ${DRWEB_PREFIX} \
 		--exclude "*.static" --exclude "doc"
@@ -61,6 +65,9 @@ do-install:
 		${CP} ${PREFIX}/etc/drweb/email.ini-distr \
 		${PREFIX}/etc/drweb/email.ini; \
 	fi
+	@${INSTALL_DATA} -m 0640 \
+		${WRKSRC}${LOCALBASE}/etc/drweb/monitor/daemon.mmc \
+		${PREFIX}/etc/drweb/monitor/daemon.mmc
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/security/drweb/distinfo b/security/drweb/distinfo
index 9ca2a82d7473..d1f886b97062 100644
--- a/security/drweb/distinfo
+++ b/security/drweb/distinfo
@@ -1,9 +1,3 @@
-MD5 (drweb/drweb-4.33-freebsd61.tar.gz) = e116406f55afeef1c9e9a2a7ec47ef8a
-SHA256 (drweb/drweb-4.33-freebsd61.tar.gz) = 8954cb57b2dac599daa1f379e587150d87cf59447f6a2526152e93c54446815a
-SIZE (drweb/drweb-4.33-freebsd61.tar.gz) = 4930388
-MD5 (drweb/drweb-4.33-freebsd55.tar.gz) = e822dcd2821ff0f5e0441c7a08a8613e
-SHA256 (drweb/drweb-4.33-freebsd55.tar.gz) = be4369b4d67cad5b16faeb2703317fc7805f38d84a3bed02f7fa1ff46d0e25db
-SIZE (drweb/drweb-4.33-freebsd55.tar.gz) = 4903456
-MD5 (drweb/drweb-4.33-freebsd411.tar.gz) = e1a4a36ddd81a1cd03ba7fc24aba983b
-SHA256 (drweb/drweb-4.33-freebsd411.tar.gz) = 46fe58025e484c5509431f28734d6c66820a8aa795bada9332bd1099f0eb4e97
-SIZE (drweb/drweb-4.33-freebsd411.tar.gz) = 3868905
+MD5 (drweb/drweb-4.44.0-freebsd60.tar.bz2) = f2e3e7a008ef01845a64861ddb86bb8c
+SHA256 (drweb/drweb-4.44.0-freebsd60.tar.bz2) = 04f20cdaba9ab7f8180012df085a4bb013d48bd007d539f8c8c29127af79e41c
+SIZE (drweb/drweb-4.44.0-freebsd60.tar.bz2) = 7379964
diff --git a/security/drweb/pkg-plist b/security/drweb/pkg-plist
index 50337ca8f1af..70b7ff68dc75 100644
--- a/security/drweb/pkg-plist
+++ b/security/drweb/pkg-plist
@@ -1,9 +1,11 @@
 @unexec if [ -f /var/drweb/run/drwebd.pid ] ; then %D/etc/rc.d/drwebd stop ; fi
+drweb/agent/daemon.amc
 drweb/drweb
 drweb/drwebd
 drweb/drwebdc
 drweb/getkey.HOWTO
 drweb/getkey.rus.HOWTO
+drweb/getkey.rus.HOWTO.utf8
 drweb/lib/drweb32.dll
 drweb/lib/ru_daemon.dwl
 drweb/lib/ru_scanner.dwl
@@ -15,81 +17,65 @@ etc/drweb/drweb32.ini-distr
 @unexec if [ -f %D/etc/drweb/email.ini ] && cmp -s %D/etc/drweb/email.ini %D/etc/drweb/email.ini-distr; then rm -f %D/etc/drweb/email.ini ; fi
 etc/drweb/email.ini-distr
 @exec if [ ! -f %B/email.ini ] ; then cp -p %B/%F %B/email.ini ; fi
+etc/drweb/monitor/daemon.mmc
+etc/rc.d/drwebd
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.rus
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.rus.utf8
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.rus
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.rus.utf8
+%%PORTDOCS%%%%DOCSDIR%%/daemon/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/daemon/ChangeLog.rus
+%%PORTDOCS%%%%DOCSDIR%%/daemon/ChangeLog.rus.utf8
 %%PORTDOCS%%%%DOCSDIR%%/daemon/readme.daemon
 %%PORTDOCS%%%%DOCSDIR%%/daemon/readme.daemon.rus
-%%PORTDOCS%%%%DOCSDIR%%/drweb.newsyslog.add
+%%PORTDOCS%%%%DOCSDIR%%/daemon/readme.daemon.rus.utf8
 %%PORTDOCS%%%%DOCSDIR%%/readme.eicar
 %%PORTDOCS%%%%DOCSDIR%%/readme.eicar.rus
+%%PORTDOCS%%%%DOCSDIR%%/readme.eicar.rus.utf8
 %%PORTDOCS%%%%DOCSDIR%%/readme.license
 %%PORTDOCS%%%%DOCSDIR%%/readme.license.rus
+%%PORTDOCS%%%%DOCSDIR%%/readme.license.rus.utf8
+%%PORTDOCS%%%%DOCSDIR%%/scanner/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/scanner/ChangeLog.rus
+%%PORTDOCS%%%%DOCSDIR%%/scanner/ChangeLog.rus.utf8
 %%PORTDOCS%%%%DOCSDIR%%/scanner/readme.scanner
 %%PORTDOCS%%%%DOCSDIR%%/scanner/readme.scanner.rus
+%%PORTDOCS%%%%DOCSDIR%%/scanner/readme.scanner.rus.utf8
 %%PORTDOCS%%%%DOCSDIR%%/update/readme.update
 %%PORTDOCS%%%%DOCSDIR%%/update/readme.update.rus
+%%PORTDOCS%%%%DOCSDIR%%/update/readme.update.rus.utf8
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/update
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/scanner
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/daemon
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/drweb/monitor
 @dirrm etc/drweb
 @dirrm drweb/update
 @dirrm drweb/lib
+@dirrm drweb/agent
 @dirrm drweb
 @cwd /var
-drweb/bases/drw43300.vdb
-drweb/bases/drw43301.vdb
-drweb/bases/drw43302.vdb
-drweb/bases/drw43303.vdb
-drweb/bases/drw43304.vdb
-drweb/bases/drw43305.vdb
-drweb/bases/drw43306.vdb
-drweb/bases/drw43307.vdb
-drweb/bases/drw43308.vdb
-drweb/bases/drw43309.vdb
-drweb/bases/drw43310.vdb
-drweb/bases/drw43311.vdb
-drweb/bases/drw43312.vdb
-drweb/bases/drw43313.vdb
-drweb/bases/drw43314.vdb
-drweb/bases/drw43315.vdb
-drweb/bases/drw43316.vdb
-drweb/bases/drw43317.vdb
-drweb/bases/drw43318.vdb
-drweb/bases/drw43319.vdb
-drweb/bases/drw43320.vdb
-drweb/bases/drw43321.vdb
-drweb/bases/drw43322.vdb
-drweb/bases/drw43323.vdb
-drweb/bases/drw43324.vdb
-drweb/bases/drw43325.vdb
-drweb/bases/drw43326.vdb
-drweb/bases/drw43327.vdb
-drweb/bases/drw43328.vdb
-drweb/bases/drw43329.vdb
-drweb/bases/drw43330.vdb
-drweb/bases/drw43331.vdb
-drweb/bases/drw43332.vdb
-drweb/bases/drw43333.vdb
-drweb/bases/drw43334.vdb
-drweb/bases/drw43335.vdb
-drweb/bases/drw43336.vdb
-drweb/bases/drw43337.vdb
-drweb/bases/drw43338.vdb
-drweb/bases/drw43339.vdb
-drweb/bases/drw43340.vdb
-drweb/bases/drw43341.vdb
+drweb/bases/drw44400.vdb
+drweb/bases/drw44401.vdb
+drweb/bases/drw44402.vdb
+drweb/bases/drw44403.vdb
+drweb/bases/drw44404.vdb
+drweb/bases/drw44405.vdb
+drweb/bases/drw44406.vdb
+drweb/bases/drw44407.vdb
+drweb/bases/drw44408.vdb
+drweb/bases/drw44409.vdb
 drweb/bases/drwebase.vdb
 drweb/bases/drwnasty.vdb
 drweb/bases/drwrisky.vdb
-drweb/bases/dwn43301.vdb
-drweb/bases/dwn43302.vdb
-drweb/bases/dwn43303.vdb
-drweb/bases/dwr43301.vdb
+drweb/bases/drwtoday.vdb
+drweb/bases/dwntoday.vdb
+drweb/bases/dwrtoday.vdb
 drweb/bases/update.drl
 @dirrm drweb/bases
+@dirrm drweb/cache
 @dirrm drweb/infected
 @dirrm drweb/log
 @dirrm drweb/run