1 files changed, 32 insertions, 47 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index c5eb54ab51c2..7194fa980c35 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	drweb
-PORTVERSION=	4.32.2
-PORTREVISION=	1
+PORTVERSION=	4.33
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.drweb.ru/pub/unix/FreeBSD/49/ \
-		ftp://ftp.drweb.ru/pub/unix/FreeBSD/53/
+MASTER_SITES=	ftp://ftp.drweb.ru/pub/drweb/unix/FreeBSD/411/ \
+		ftp://ftp.drweb.ru/pub/drweb/unix/FreeBSD/54/
 
 MAINTAINER=	support@spectrum.ru
 COMMENT=	DrWeb antivirus suite
@@ -23,9 +22,9 @@ RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd49
+DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd411
 .else
-DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd53
+DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd54
 .if ${OSVERSION} >= 600000
 LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 .endif
@@ -34,53 +33,39 @@ LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 DRWEB_PREFIX=	${PREFIX}/${PORTNAME}
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Warning!"
-	@${ECHO_MSG} "4.32* version not supported in the .key files of 4.31* version and older."
-	@${ECHO_MSG} "Press Ctrl-C if you want to stop installation."
-	@${ECHO_MSG} ""
+DRWEB_VARPREFIX=/var/drweb
 
 do-install:
-	-@${INSTALL} -dv -o ${BINOWN} -g ${BINGRP} ${DRWEB_PREFIX}
-	@cd ${DRWEB_PREFIX}; ${RM} -f drweb drwebd bases/* updates/*; ${MKDIR} updates
-	${TAR} -cf - -C ${WRKSRC}/usr/local/drweb . | \
+	${INSTALL} -dv -m 0750 ${DRWEB_PREFIX}
+	${INSTALL} -dv -m 0750 ${PREFIX}/etc/drweb
+	${INSTALL} -dv -m 0750 ${DRWEB_VARPREFIX}
+	${RM} -f ${WRKSRC}${LOCALBASE}/drweb/update.pl
+	${TAR} -cf - -C ${WRKSRC}${LOCALBASE}/drweb . | \
 		${TAR} -xf - -C ${DRWEB_PREFIX} \
-		--exclude "*.static" \
-		--exclude "update/update.pl*"
-	${TAR} -cf - -C ${WRKSRC}/var/drweb bases | \
-		${TAR} -xf - -C ${DRWEB_PREFIX}
-	${CHMOD} 755 ${DRWEB_PREFIX}/bases ${DRWEB_PREFIX}/doc \
-		${DRWEB_PREFIX}/lib ${DRWEB_PREFIX}/updates
-	${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-distr
-	${RM} -f ${PREFIX}/bin/drweb
-	if [ ! -f ${PREFIX}/drweb/drweb32.ini ] ; then \
-		${CP} ${PREFIX}/drweb/drweb32.ini-distr \
-		      ${PREFIX}/drweb/drweb32.ini; \
+		--exclude "*.static" --exclude "doc"
+	${TAR} -cf - -C ${WRKSRC}/var/drweb/ . | \
+		${TAR} -xf - -C ${DRWEB_VARPREFIX}
+	${INSTALL_DATA} -m 0640 ${WRKSRC}${LOCALBASE}/etc/drweb/drweb32.ini \
+		${PREFIX}/etc/drweb/drweb32.ini-distr
+	if [ ! -f ${PREFIX}/etc/drweb/drweb32.ini ] ; then \
+		${CP} ${PREFIX}/etc/drweb/drweb32.ini-distr \
+		      ${PREFIX}/etc/drweb/drweb32.ini; \
 	fi
-	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
-		< ${FILESDIR}/drweb.sh \
-		> ${WRKDIR}/drweb
-	${INSTALL_SCRIPT} ${WRKDIR}/drweb ${PREFIX}/bin
-	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
-		< ${WRKSRC}/usr/local/etc/rc.d/00.drwebd.sh \
-		> ${PREFIX}/etc/rc.d/00.drwebd.sh
-	${CHMOD} 750 ${PREFIX}/etc/rc.d/00.drwebd.sh
-	${INSTALL_DATA} ${WRKSRC}/usr/local/etc/drweb/email.ini \
-		${PREFIX}/drweb/email.ini-distr
-	if [ ! -f ${PREFIX}/drweb/email.ini ] ; then \
-		${CP} ${PREFIX}/drweb/email.ini-distr \
-		${PREFIX}/drweb/email.ini; \
+	${INSTALL_DATA} -m 0640 ${WRKSRC}${LOCALBASE}/etc/drweb/email.ini \
+		${PREFIX}/etc/drweb/email.ini-distr
+	if [ ! -f ${PREFIX}/etc/drweb/email.ini ] ; then \
+		${CP} ${PREFIX}/etc/drweb/email.ini-distr \
+		${PREFIX}/etc/drweb/email.ini; \
 	fi
+	${INSTALL_SCRIPT} -m 0750 -b ${WRKSRC}${LOCALBASE}/etc/rc.d/00.drwebd.sh \
+		${PREFIX}/etc/rc.d/00.drwebd.sh
 
 post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${TAR} -cf - -C ${WRKSRC}${LOCALBASE}/drweb/doc . | \
+		${TAR} -xf - -C ${DOCSDIR}
+.endif
+	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${DRWEB_PREFIX} ${DRWEB_VARPREFIX}
 
 .include <bsd.port.post.mk>