From e66830089fd76f01001d2b4ee80ea5af6a09ad01 Mon Sep 17 00:00:00 2001
From: david <david@openbsd.org>
Date: Mon, 21 Jun 2004 04:40:30 +0000
Subject: [PATCH] this port should be fetched manually due to license issuses
 also update to a newer version, since the current distfiles aren't available
 ok pvalchev@ naddy@

---
 security/uvscan/Makefile     | 19 +++++++++++++------
 security/uvscan/distinfo     |  6 +++---
 security/uvscan/pkg/PLIST    |  3 +--
 security/uvscan_dat/Makefile | 14 +++++++++++---
 security/uvscan_dat/distinfo |  6 +++---
 5 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 8f4e4041165..c658657e2a6 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.14 2004/01/14 19:20:39 jakob Exp $
+# $OpenBSD: Makefile,v 1.15 2004/06/21 04:40:30 david Exp $
 # $NetBSD: Makefile,v 1.1.1.1 2000/06/05 12:01:24 rh Exp $
 
 COMMENT=	"evaluation version of a DOS/Windows file virus scanner"
 
-VERSION=	4.16.0
-DISTNAME=	vlnx416e
+VERSION=	4.32
+DISTNAME=	vlnx432e
 PKGNAME=	uvscan-${VERSION}
 CATEGORIES=	security
 
 HOMEPAGE=	http://www.networkassociates.com/us/downloads/evals/
 
-MASTER_SITES=	http://download.nai.com/products/evaluation/virusscan/english/cmdline/linux/version_4.16/
-
 EXTRACT_SUFX=	.tar.Z
 
 PERMIT_PACKAGE_CDROM=	"Commercial software"
@@ -27,6 +25,15 @@ NO_BUILD=	Yes
 NO_REGRESS=	Yes
 WRKDIST=	${WRKDIR}
 
+FETCH_MANUALLY = " You must fetch the distfile for this port manually"
+FETCH_MANUALLY+= " after agreeing to the license agreement at"
+FETCH_MANUALLY+= ""
+FETCH_MANUALLY+= "     http://www.networkassociates.com/us/downloads/evals/"
+FETCH_MANUALLY+= ""
+FETCH_MANUALLY+= " Choose the 'McAfee VirusScan Command Line Scanner for Linux'"
+FETCH_MANUALLY+= " option and place ${DISTFILES} into ${FULLDISTDIR}."
+FETCH_MANUALLY+= ""
+
 do-configure:
 	sed -e 's:@@PREFIX@@:${PREFIX}:g' \
 		<${FILESDIR}/uvscan.sh >${WRKDIR}/uvscan.sh
@@ -42,7 +49,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/libexec/uvscan
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uvscan
-.for file in unxadmin.pdf license.txt readme.txt
+.for file in license.txt readme.txt
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/uvscan
 .endfor
 
diff --git a/security/uvscan/distinfo b/security/uvscan/distinfo
index 77c76070475..d7cd743fbff 100644
--- a/security/uvscan/distinfo
+++ b/security/uvscan/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlnx416e.tar.Z) = 1a50a976792b52529b26e328a7f8dccf
-RMD160 (vlnx416e.tar.Z) = 78994f5bdea11def6f02c0da6d1b4b5629d473c6
-SHA1 (vlnx416e.tar.Z) = 187d2d2cbe45ef74851a31c6c99f7b837e1f3b55
+MD5 (vlnx432e.tar.Z) = 5404c946a08b81c6bbe68a8e9a556d0a
+RMD160 (vlnx432e.tar.Z) = f2f3b779805cad04befa663bb6b3aa4f6c0908dd
+SHA1 (vlnx432e.tar.Z) = e35a14e01d96cc4dabde93c7981e668ceac199c0
diff --git a/security/uvscan/pkg/PLIST b/security/uvscan/pkg/PLIST
index 869114cdf2e..926dbcc3be5 100644
--- a/security/uvscan/pkg/PLIST
+++ b/security/uvscan/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/12/13 17:58:03 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/06/21 04:40:30 david Exp $
 bin/uvscan
 libexec/uvscan/liblnxfv.so
 libexec/uvscan/liblnxfv.so.4
@@ -8,4 +8,3 @@ libexec/uvscan/uvscan
 man/man1/uvscan.1
 share/doc/uvscan/license.txt
 share/doc/uvscan/readme.txt
-share/doc/uvscan/unxadmin.pdf
diff --git a/security/uvscan_dat/Makefile b/security/uvscan_dat/Makefile
index 73353ab6937..6a7e910d010 100644
--- a/security/uvscan_dat/Makefile
+++ b/security/uvscan_dat/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.25 2004/01/14 19:20:39 jakob Exp $
+# $OpenBSD: Makefile,v 1.26 2004/06/21 04:40:30 david Exp $
 # $NetBSD: Makefile,v 1.2 2000/06/19 14:30:02 rh Exp $
 
 COMMENT=	"AntiVirus DAT file for uvscan"
 
-VERSION=	4312
+VERSION=	4367
 DISTNAME=	dat-${VERSION}
 PKGNAME=	uvscan_${DISTNAME}
 CATEGORIES=	security
 
 HOMEPAGE=	http://www.networkassociates.com/us/downloads/updates/
 
-MASTER_SITES=	http://download.nai.com/products/datfiles/4.x/nai/
 EXTRACT_SUFX=	.tar
 SUBST_VARS+=	VERSION
 
@@ -24,6 +23,15 @@ NO_BUILD=	Yes
 NO_REGRESS=	Yes
 WRKDIST=	${WRKDIR}
 
+FETCH_MANUALLY = " You must fetch the distfile for this port manually"
+FETCH_MANUALLY+= " after agreeing to the license agreement at"
+FETCH_MANUALLY+= ""
+FETCH_MANUALLY+= "     http://www.networkassociates.com/us/downloads/updates/dat.asp?ID=1"
+FETCH_MANUALLY+= ""
+FETCH_MANUALLY+= " Choose the 'Weekly v4.x (DAT only)' option and place"
+FETCH_MANUALLY+= " ${DISTFILES} into ${FULLDISTDIR}."
+FETCH_MANUALLY+= ""
+
 do-configure:
 	sed -e 's:@PREFIX@:${PREFIX}:g' \
 		<${FILESDIR}/uvscan_update >${WRKDIR}/uvscan_update
diff --git a/security/uvscan_dat/distinfo b/security/uvscan_dat/distinfo
index 4498166a6bd..760554a746b 100644
--- a/security/uvscan_dat/distinfo
+++ b/security/uvscan_dat/distinfo
@@ -1,3 +1,3 @@
-MD5 (dat-4312.tar) = 74b1cb78a4c4095c1b25cf102e9a80ea
-RMD160 (dat-4312.tar) = e052501340919aa9ce12ba55872830d2f0709cc7
-SHA1 (dat-4312.tar) = 2a8c5fbf89975f00d8a7a179a60fbb8005a7d6ab
+MD5 (dat-4367.tar) = 26b46900e431f0764b730c5fce8b0b75
+RMD160 (dat-4367.tar) = eb1a2fbcf55268c58cad1ece49bc618c685d150e
+SHA1 (dat-4367.tar) = e99c905f9d2881d91ce12ee2b403e4aae0c9df14