ports/112202: security/vscan: patch to fix plist problem

[Scot Hetzel]

>Number:         112202
>Category:       ports
>Synopsis:       security/vscan: patch to fix plist problem
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 28 05:20:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Scot Hetzel
>Release:        FreeBSD/amd64 7.0-CURRENT
>Organization:
Ye Old Computer
>Environment:
FreeBSD hp010.hetzel.org 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Fri Apr 27 00:26:19 CDT 2007     swhetzel at hp010.hetzel.org:/usr/src/7x/sys-p4/amd64/compile/GENERIC.debug  amd64

>Description:
Uninstall of the port fails to remove PREFIX/lib[32,]/libbsdfv.so.
>How-To-Repeat:
Install and then uninstall the port, and you'll find libbsdfv.so is still in the PREFIX/lib[32,] directory.
>Fix:
Apply the attached patch.

Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/vscan/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- Makefile	19 Apr 2007 06:58:49 -0000	1.45
+++ Makefile	28 Apr 2007 05:04:53 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	uvscan
 PORTVERSION=	5.10e
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://download.nai.com/products/evaluation/virusscan/english/cmdline/bsd/v5.10/
 DISTNAME=	vbsd510e
@@ -16,22 +16,22 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Evaluation version of a DOS/Windows/Linux file virus scanner
 
-# misc/compat3x is forbidden, but with FreeBSD 5.1 or later you can use
-# libmap.conf(5) to map against current libc. This may affect the system
-# security. Use at your own risk.
+IA32_BINARY_PORT=	YES
+
 .include <bsd.port.pre.mk>
-.if ${ARCH} == "amd64"
-BROKEN=		Incomplete pkg-plist
+.if ${ARCH} == "amd64" || ${ARCH} =="ia64"
 WITHOUT_COMPAT3=1
-UVSCAN_LIB32=	32
-USE_LDCONFIG32=	${PREFIX}/lib32
 LDCONFIG=	/sbin/ldconfig -32
+LIB32DIR=	lib32
+USE_LDCONFIG32=	${PREFIX}/${LIB32DIR}
 .else
-UVSCAN_LIB32=
 USE_LDCONFIG=	YES
-
+LIB32DIR=	lib
 .endif
 
+# misc/compat3x is forbidden, but with FreeBSD 5.1 or later you can use
+# libmap.conf(5) to map against current libc. This may affect the system
+# security. Use at your own risk.
 .if defined(WITHOUT_COMPAT3)
 .if ${OSVERSION} < 501000
 IGNORE=		requires FreeBSD 5.1 or later
@@ -41,7 +41,6 @@
 .endif
 LIB_DEPENDS+=	m.2:${PORTSDIR}/misc/compat4x
 
-ONLY_FOR_ARCHS=		i386 amd64
 NO_BUILD=		YES
 NO_WRKSUBDIR=		YES
 
@@ -55,8 +54,6 @@
 PROGFILES=	contact.txt license.dat license.txt messages.dat \
 		signlic.txt
 
-PLIST_SUB+=	UVSCAN_LIB32=${UVSCAN_LIB32}
-
 do-configure:
 	${SED} <${FILESDIR}/uvscan.sh >${WRKSRC}/uvscan.sh \
 		-e 's:@@PREFIX@@:${PREFIX}:g'
@@ -68,7 +65,7 @@
 	${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.4 ${PREFIX}/lib${UVSCAN_LIB32}/libbsdfv.so.4
+	${INSTALL_PROGRAM} ${WRKSRC}/libbsdfv.so.4 ${PREFIX}/${LIB32DIR}/libbsdfv.so.4
 .for filename in ${PROGFILES}
 	${INSTALL_DATA} ${WRKSRC}/${filename} ${PREFIX}/libexec/uvscan
 .endfor
@@ -85,11 +82,11 @@
 	@${CAT} ${PKGMESSAGE}
 
 post-install:
-	${LN} -sf ${PREFIX}/lib${UVSCAN_LIB32}/libbsdfv.so.4 ${PREFIX}/lib${UVSCAN_LIB32}/libbsdfv.so
+	${LN} -sf ${PREFIX}/${LIB32DIR}/libbsdfv.so.4 ${PREFIX}/${LIB32DIR}/libbsdfv.so
 .if defined(WITHOUT_COMPAT3) && ${OSVERSION} >= 501000
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "This may affect the system security. Use at your own risk."
-	@${ECHO_CMD} "You need to add the following two lines to your libmap${UVSCAN_LIB32}.conf(5):"
+	@${ECHO_CMD} "You need to add the following two lines to your libmap${LIB32DIR:S/lib//}.conf(5):"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "[/usr/local/libexec/uvscan/uvscan]"
 	@${ECHO_CMD} "libc.so.3         libc.so.4"
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/vscan/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- pkg-plist	14 Jul 2006 19:39:12 -0000	1.13
+++ pkg-plist	28 Apr 2007 04:47:47 -0000
@@ -2,7 +2,8 @@
 bin/uvscan
 bin/uvscan_secure
 sbin/update_dat
-lib%%UVSCAN_LIB32%%/libbsdfv.so.4
+%%LIB32DIR%%/libbsdfv.so
+%%LIB32DIR%%/libbsdfv.so.4
 libexec/uvscan/contact.txt
 libexec/uvscan/license.dat
 libexec/uvscan/license.txt

>Release-Note:
>Audit-Trail:
>Unformatted: