* This package doesn't need suse_libc5 anymore...suse_compat is enough.

* Remove make for loop and replace with shell for loop
* Add an RCS ID and comment to uvscan.sh.
* Remove unnecessary whitespace from DESCR.

3 files changed, 33 insertions, 23 deletions

diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 26aaea5c096..9953e13ce65 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/03/20 08:51:12 rh Exp $
-#
+# $NetBSD: Makefile,v 1.9 2001/08/16 05:09:21 jlam Exp $
 
 DISTNAME=		vlnx414e
 PKGNAME=		uvscan-4.14.0
@@ -9,14 +8,15 @@ MASTER_SITES=		http://download.nai.com/products/evaluation/virusscan/english/uni
 EXTRACT_SUFX=		.tar.Z
 
 MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.nai.com/asp_set/buy_try/try/products_evals.asp
+HOMEPAGE=		http://www.mcafeeb2b.com/products/virusscan/default.asp
 COMMENT=		evaluation version of a DOS/Windows file virus scanner
 
-DEPENDS+=		suse_libc5>=6.1:../../emulators/suse_libc5
+DEPENDS+=		suse_compat>=6.1:../../emulators/suse_base
 DEPENDS+=		uvscan-dat>=4129:../../security/uvscan-dat
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 NO_BUILD=		YES
+CHECK_SHLIBS=		NO
 
 LICENSE=		shareware
 RESTRICTED=		"restrictive 30 day evaluation license"
@@ -25,25 +25,30 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
-CHECK_SHLIBS=		no
+DOCDIR=			${PREFIX}/share/doc/uvscan
+UVSCANDIR=		${PREFIX}/libexec/uvscan
 
 do-configure:
-	${SED} <${FILESDIR}/uvscan.sh >${WRKSRC}/uvscan.sh \
-		-e 's:@@PREFIX@@:${PREFIX}:g'
+	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
+		${FILESDIR}/uvscan.sh > ${WRKDIR}/uvscan.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/uvscan.sh ${PREFIX}/bin/uvscan
-.for file in uvscan liblnxfv.so
-	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/libexec/uvscan
-.endfor
-	${LN} -s ${PREFIX}/libexec/uvscan/liblnxfv.so \
-		${PREFIX}/emul/linux/usr/local/lib
+	${INSTALL_SCRIPT} ${WRKDIR}/uvscan.sh ${PREFIX}/bin/uvscan
 	${INSTALL_MAN} ${WRKSRC}/uvscan.1 ${PREFIX}/man/man1
-.for file in license.dat messages.dat
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/libexec/uvscan
-.endfor
-.for file in unxadmin.pdf license.txt
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/uvscan
-.endfor
+
+	${INSTALL_PROGRAM_DIR} ${UVSCANDIR}
+	cd ${WRKSRC}; for file in uvscan liblnxfv.so; do		\
+		${INSTALL_SCRIPT} $${file} ${UVSCANDIR};		\
+	done
+	${RM} -f ${PREFIX}/emul/linux/usr/local/lib/liblnxfv.so
+	${LN} -s ${UVSCANDIR}/liblnxfv.so ${PREFIX}/emul/linux/usr/local/lib
+	cd ${WRKSRC}; for file in license.dat messages.dat; do		\
+		${INSTALL_DATA} $${file} ${UVSCANDIR};			\
+	done
+
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	cd ${WRKSRC}; for file in unxadmin.pdf license.txt; do		\
+		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR};		\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/uvscan/files/uvscan.sh b/security/uvscan/files/uvscan.sh
index f6cfb53a044..319b542660e 100755
--- a/security/uvscan/files/uvscan.sh
+++ b/security/uvscan/files/uvscan.sh
@@ -1,2 +1,7 @@
 #!/bin/sh
-@@PREFIX@@/libexec/uvscan/uvscan $*
+#
+# $NetBSD: uvscan.sh,v 1.2 2001/08/16 05:09:22 jlam Exp $
+#
+# Wrapper script to execute McAfee(R) VirusScan
+
+@PREFIX@/libexec/uvscan/uvscan $*
diff --git a/security/uvscan/pkg/DESCR b/security/uvscan/pkg/DESCR
index 1632dbef097..3293253ab1c 100644
--- a/security/uvscan/pkg/DESCR
+++ b/security/uvscan/pkg/DESCR
@@ -1,4 +1,4 @@
-  uvscan is an evaluation VirusScan running on NetBSD under Linux
+uvscan is an evaluation VirusScan running on NetBSD under Linux
 emulation.
 
         THIS IS AN EVALUATION COPY OF THIS SOFTWARE.
@@ -7,5 +7,5 @@ emulation.
         the software from Network Associates, Inc. or
         stop using it and remove it from your computer. 
 
-  Please see ${PREFIX}/share/doc/uvscan/license.txt for more
-information!
+Please see ${PREFIX}/share/doc/uvscan/license.txt for more
+information.