5 files changed, 19 insertions, 11 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index 4bf85a7ec8db..10545ee80db9 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	drweb
 PORTVERSION=	4.31.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.drweb.ru/pub/unix/ \
 		ftp://ftp.drweb.ru/pub/unix/archive/ \
 		ftp://ftp.drweb.ru/pub/unix/archive/${PORTNAME}-${PORTVERSION}/
-DISTFILES=	${MAIN_NAME}.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DrWeb antivirus suite
@@ -19,21 +19,21 @@ COMMENT=	DrWeb antivirus suite
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${MAIN_NAME}
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
 LIB_DEPENDS+=	c.4:${PORTSDIR}/misc/compat4x
-MAIN_NAME=	${PORTNAME}-${PORTVERSION}-freebsd4
+DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd4
 .else
-MAIN_NAME=	${PORTNAME}-${PORTVERSION}-freebsd5
+DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd5
 .endif
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
 DRWEB_PREFIX=	${PREFIX}/${PORTNAME}
 
 do-install:
-	-@install -dv -o ${BINOWN} -g ${BINGRP} ${DRWEB_PREFIX}
+	-@${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 . | \
 		${TAR} -xf - -C ${DRWEB_PREFIX} \
@@ -42,7 +42,7 @@ do-install:
 		--exclude "update/update.pl*"
 	${TAR} -cf - -C ${WRKSRC}/var/drweb bases | \
 		${TAR} -xf - -C ${DRWEB_PREFIX}
-	chmod 755 ${DRWEB_PREFIX}/bases ${DRWEB_PREFIX}/doc \
+	${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
@@ -51,7 +51,7 @@ do-install:
 	${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
+	${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
@@ -59,7 +59,7 @@ do-install:
 	${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
+	${CHMOD} 755 ${PREFIX}/etc/rc.d/00drwebd.sh
 	if [ ! -f ${PREFIX}/drweb/drweb32.ini ] ; then \
 		${CP} ${PREFIX}/drweb/drweb32.ini-dist \
 		      ${PREFIX}/drweb/drweb32.ini; \
@@ -72,6 +72,10 @@ do-install:
 		${CP} ${DRWEB_PREFIX}/drwebd.key-dist \
 		      ${DRWEB_PREFIX}/drwebd.key; \
 	fi
+	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
+		< ${FILESDIR}/drweb.sh \
+		> ${WRKDIR}/drweb
+	${INSTALL_SCRIPT} ${WRKDIR}/drweb ${PREFIX}/bin
 
 post-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/security/drweb/files/drweb.sh b/security/drweb/files/drweb.sh
new file mode 100644
index 000000000000..e8b97f4031bf
--- /dev/null
+++ b/security/drweb/files/drweb.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/local/drweb/drweb -ini=%INSTALL%/drweb32.ini $*
diff --git a/security/drweb/files/patch-ac b/security/drweb/files/patch-ac
index 79aab342ad91..7a8d73fe65d0 100644
--- a/security/drweb/files/patch-ac
+++ b/security/drweb/files/patch-ac
@@ -23,6 +23,6 @@
      *)
  	echo -n "Starting Dr. Web daemon..."
 -	/usr/local/drweb/drwebd
-+	%INSTALL%/drwebd -ini:%INSTALL%/drweb32.ini
++	%INSTALL%/drwebd -ini=%INSTALL%/drweb32.ini
  esac
  
diff --git a/security/drweb/pkg-install b/security/drweb/pkg-install
index 4a4f111b698a..5cfd03d1ac4b 100644
--- a/security/drweb/pkg-install
+++ b/security/drweb/pkg-install
@@ -42,7 +42,7 @@ fi
 if ! grep -q ${USER} /etc/crontab; then
   if ! crontab -l -u ${BINOWN} | grep -q ${USER}; then
       echo "You may also add this crontab entry to /etc/crontab"
-      echo "0 12 * * * ${BINOWN} ${PKG_PREFIX}/drweb/update/update.pl ${PKG_PREFIX}/drweb"
+      echo "0 12 * * * ${BINOWN} ${PKG_PREFIX}/drweb/update/update.pl"
       echo ""
   fi
 fi
diff --git a/security/drweb/pkg-plist b/security/drweb/pkg-plist
index 245ce70a2d43..6315224fdf2b 100644
--- a/security/drweb/pkg-plist
+++ b/security/drweb/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+bin/drweb
 drweb/ChangeLog
 drweb/README
 drweb/README.RUS