Upgrade to version 4.40e

3 files changed, 28 insertions, 25 deletions

diff --git a/security/vscan/Makefile b/security/vscan/Makefile
index 554a0ccc7c03..970a27b221a0 100644
--- a/security/vscan/Makefile
+++ b/security/vscan/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	uvscan
-PORTVERSION=	4.32e
-PORTREVISION=	2
+PORTVERSION=	4.40e
 CATEGORIES=	security
-MASTER_SITES=	http://download.nai.com/products/evaluation/virusscan/english/cmdline/bsd/v4.32/
-DISTNAME=	vbsd432e
+MASTER_SITES=	http://download.nai.com/products/evaluation/virusscan/english/cmdline/bsd/v4.40/
+DISTNAME=	vbsd440e
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jeh@FreeBSD.org
@@ -19,46 +18,48 @@ COMMENT=	Evaluation version of a DOS/Windows/Linux file virus scanner
 RUN_DEPENDS+=	${LOCALBASE}/sbin/update_dat:${PORTSDIR}/security/uvscan-dat
 # misc/compat3x is forbidden, but if it is compiled into the system
 # we may still be good to go.
-.if !defined(COMPAT3X)
 LIB_DEPENDS+=	c.3:${PORTSDIR}/misc/compat3x
-.endif
-
-.if !defined(COMPAT4X)
-.if !exists(/usr/lib/libm.so.2) && !exists(/lib/libm.so.2)
 LIB_DEPENDS+=	m.2:${PORTSDIR}/misc/compat4x
-.endif
-.endif
 
 ONLY_FOR_ARCHS=		i386
 NO_BUILD=		YES
 NO_WRKSUBDIR=		YES
-INSTALLS_SHLIBS=	YES
+INSTALLS_SHLIB=		YES
 
 LICENSE=	shareware
 RESTRICTED=	"restrictive 30 day evaluation license"
 
-PORTDOCS=	e4320upg.pdf license.txt
+MAN1=		uvscan.1
+
+PORTDOCS=	e4400upg.pdf readme.txt
+
+PROGFILES=	contact.txt license.dat license.txt messages.dat \
+		signlic.txt
 
 do-configure:
 	${SED} <${FILESDIR}/uvscan.sh >${WRKSRC}/uvscan.sh \
 		-e 's:@@PREFIX@@:${PREFIX}:g'
 
 do-install:
-	${MKDIR} ${PREFIX}/libexec/uvscan
 	${INSTALL_SCRIPT} ${WRKSRC}/uvscan ${PREFIX}/libexec/uvscan
 	${INSTALL_SCRIPT} ${WRKSRC}/uvscan.sh ${PREFIX}/bin/uvscan
 	${INSTALL_SCRIPT} ${WRKSRC}/uvscan_secure ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/libbsdfv.so ${PREFIX}/lib/libbsdfv.so
 	${INSTALL_PROGRAM} ${WRKSRC}/libbsdfv.so.4 ${PREFIX}/lib/libbsdfv.so.4
-.for file in license.dat messages.dat
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/libexec/uvscan
+.for filename in ${PROGFILES}
+	${INSTALL_DATA} ${WRKSRC}/${filename} ${PREFIX}/libexec/uvscan
+.endfor
+.for filename in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${filename} ${MANPREFIX}/man/man1/${filename}
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/uvscan
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	@if ! [ -d ${DOCSDIR} ]; then ${MKDIR} ${DOCSDIR}; fi
+.for filename in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${filename} ${DOCSDIR}
 .endfor
 .endif
 
+post-install:
+	${LN} -sf ${PREFIX}/lib/libbsdfv.so \
+		${PREFIX}/lib/libbsdfv.so.4
+
 .include <bsd.port.mk>
diff --git a/security/vscan/distinfo b/security/vscan/distinfo
index ba876ea72b7b..86ab3ff6b113 100644
--- a/security/vscan/distinfo
+++ b/security/vscan/distinfo
@@ -1,2 +1,2 @@
-MD5 (vbsd432e.tar.Z) = 5188a5b07ed03a033bd112377aff4bab
-SIZE (vbsd432e.tar.Z) = 7990671
+MD5 (vbsd440e.tar.Z) = ed2c815c8d24006c4eddbb2ad074a8a8
+SIZE (vbsd440e.tar.Z) = 9257717
diff --git a/security/vscan/pkg-plist b/security/vscan/pkg-plist
index 17e5e8ed1513..f57ab18094f2 100644
--- a/security/vscan/pkg-plist
+++ b/security/vscan/pkg-plist
@@ -1,8 +1,10 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2000/06/05 12:01:25 rh Exp $
 bin/uvscan
 bin/uvscan_secure
-lib/libbsdfv.so
 lib/libbsdfv.so.4
-libexec/uvscan/uvscan
+libexec/uvscan/contact.txt
 libexec/uvscan/license.dat
+libexec/uvscan/license.txt
 libexec/uvscan/messages.dat
+libexec/uvscan/signlic.txt
+libexec/uvscan/uvscan