* Add new emulator framework in pkgsrc/mk/emulator that handles all

  binary-only packages that require binary "emulation" on the native
  operating system.  Please see pkgsrc/mk/emulator/README for more
  details.

* Teach the plist framework to automatically use any existing
  PLIST.${EMUL_PLATFORM} as part of the default PLIST_SRC definition.

* Convert all of the binary-only packages in pkgsrc to use the
  emulator framework.  Most of them have been tested to install and
  deinstall correctly.  This involves the following cleanup actions:

    * Remove use of custom PLIST code and use PLIST.${EMUL_PLATFORM}
      more consistently.

    * Simplify packages by using default INSTALL and DEINSTALL scripts
      instead of custom INSTALL/DEINSTALL code.

    * Remove "SUSE_COMPAT32" and "PKG_OPTIONS.suse" from pkgsrc.
      Packages only need to state exactly which emulations they support,
      and the framework handles any i386-on-x86_64 or sparc-on-sparc64
      uses.

    * Remove "USE_NATIVE_LINUX" from pkgsrc.  The framework will
      automatically detect when the package is installing on Linux.

  Specific changes to packages include:

    * Bump the PKGREVISIONs for all of the suse100* and suse91* packages
      due to changes in the +INSTALL/+DEINSTALL scripts used in all
      of the packages.

    * Remove pkgsrc/emulators/suse_linux, which is unused by any
      packages.

    * cad/lc -- remove custom code to create the distinfo file for
	all supported platforms; just use "emul-fetch" and "emul-distinfo"
	instead.

    * lang/Cg-compiler -- install the shared libraries under ${EMULDIR}
	instead of ${PREFIX}/lib so that compiled programs will find
	the shared libraries.

    * mail/thunderbird-bin-nightly -- update to latest binary
	distributions for supported platforms.

    * multimedia/ns-flash -- update Linux version to 9.0.48 as the
	older version is no longer available for interactive fetch.

    * security/uvscan -- set LD_LIBRARY_PATH explicitly so that
	it's not necessary to install library symlinks into
	${EMULDIR}/usr/local/lib.

    * www/firefox-bin-flash -- update Linux version to 9.0.48 as the
	older version is no longer available for interactive fetch.

4 files changed, 20 insertions, 38 deletions

diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 8dd37997b99..ec956d6568c 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2007/07/16 20:18:58 njoly Exp $
+# $NetBSD: Makefile,v 1.43 2007/07/29 05:19:50 jlam Exp $
 
 DISTNAME=		vlp4510e
 PKGNAME=		uvscan-5.10
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://download.nai.com/products/evaluation/virusscan/english/cmdline/linux/v5.10/
 EXTRACT_SUFX=		.tar.Z
@@ -12,17 +13,6 @@ COMMENT=		Evaluation version of a DOS/Windows file virus scanner
 
 CONFLICTS=		uvscan-dat-[0-9]*
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-WRKSRC=			${WRKDIR}
-NO_BUILD=		yes
-NO_CONFIGURE=		yes
 LICENSE=		uvscan-license
 RESTRICTED=		restrictive 30 day evaluation license
 NO_BIN_ON_FTP=		${RESTRICTED}
@@ -30,6 +20,12 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat
+
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
+
 DOCDIR=			${PREFIX}/share/doc/uvscan
 EGDATDIR=		${PREFIX}/share/examples/uvscan
 UVSCANDIR=		${PREFIX}/libexec/uvscan
@@ -48,35 +44,22 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 sbin
 USE_TOOLS+=		gtar:run
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${WRKDIR}/update_dat
-SUBST_SED.paths+=	-e 's,@UVSCANDIR@,${UVSCANDIR},g'
-SUBST_SED.paths+=	-e 's,@DATFILES@,${DATFILES},g'
-SUBST_SED.paths+=	-e 's,@AWK@,${AWK},g' -e 's,@CP@,${CP},g'
-SUBST_SED.paths+=	-e 's,@BASENAME@,${BASENAME},g'
-SUBST_SED.paths+=	-e 's,@ECHO@,${ECHO},g' -e 's,@GREP@,${GREP},g'
-SUBST_SED.paths+=	-e 's,@GTAR@,${GTAR},g' -e 's,@MKDIR@,${MKDIR},g'
-SUBST_SED.paths+=	-e 's,@MV@,${MV},g' -e 's,@RM@,${RM},g'
-SUBST_SED.paths+=	-e 's,@SED@,${SED},g'
+SUBST_FILES.paths=	update_dat.sh uvscan.sh
+SUBST_VARS.paths=	AWK BASENAME CP DATFILES ECHO GTAR MKDIR MV	\
+			PREFIX RM SED UVSCAN
 SUBST_STAGE.paths=	post-patch
 
 post-extract:
-	${CP} ${FILESDIR}/update_dat.sh ${WRKDIR}/update_dat
+	${CP} ${FILESDIR}/update_dat.sh ${WRKSRC}/update_dat.sh
+	${CP} ${FILESDIR}/uvscan.sh ${WRKSRC}/uvscan.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/update_dat ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/update_dat.sh ${PREFIX}/sbin/update_dat
 	${INSTALL_MAN} ${WRKSRC}/uvscan.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/uvscan ${UVSCANDIR}
-	${RM} -f ${PREFIX}/bin/uvscan
-	${LN} -sf ../${UVSCANDIR:S/${PREFIX}\///}/uvscan ${PREFIX}/bin/uvscan
+	${INSTALL_SCRIPT} ${WRKSRC}/uvscan.sh ${PREFIX}/bin/uvscan
 	${INSTALL_DATA} ${WRKSRC}/liblnxfv.so.4 ${UVSCANDIR}
-	${RM} -f ${UVSCANDIR}/liblnxfv.so
 	${LN} -s liblnxfv.so.4 ${UVSCANDIR}/liblnxfv.so
-	${INSTALL_DATA_DIR} ${PREFIX}/emul/linux/usr/local/lib
-	for file in liblnxfv.so.4 liblnxfv.so; do			\
-		${RM} -f ${PREFIX}/emul/linux/usr/local/lib/$${file};	\
-		${LN} -s ${UVSCANDIR}/$${file}				\
-			${PREFIX}/emul/linux/usr/local/lib;		\
-	done
 	for file in license.dat messages.dat; do			\
 		${INSTALL_DATA} ${WRKSRC}/$${file} ${UVSCANDIR};	\
 	done
diff --git a/security/uvscan/PLIST b/security/uvscan/PLIST
index 0bf30eeca89..c5389965852 100644
--- a/security/uvscan/PLIST
+++ b/security/uvscan/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2007/07/16 20:18:58 njoly Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/07/29 05:19:50 jlam Exp $
 bin/uvscan
-emul/linux/usr/local/lib/liblnxfv.so
-emul/linux/usr/local/lib/liblnxfv.so.4
 libexec/uvscan/uvscan
 libexec/uvscan/liblnxfv.so
 libexec/uvscan/liblnxfv.so.4
@@ -15,6 +13,5 @@ share/doc/uvscan/license.txt
 share/examples/uvscan/clean.dat
 share/examples/uvscan/names.dat
 share/examples/uvscan/scan.dat
-@dirrm emul/linux/usr/local/lib
 @dirrm share/doc/uvscan
 @dirrm share/examples/uvscan
diff --git a/security/uvscan/files/update_dat.sh b/security/uvscan/files/update_dat.sh
index 00f81f4ea5e..6879b765d26 100644
--- a/security/uvscan/files/update_dat.sh
+++ b/security/uvscan/files/update_dat.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+#
+# $NetBSD: update_dat.sh,v 1.4 2007/07/29 05:19:50 jlam Exp $
 
 UVSCANDIR="@UVSCANDIR@"
 DAT_SITE="http://download.nai.com/products/datfiles/4.x/nai/"
diff --git a/security/uvscan/files/uvscan.sh b/security/uvscan/files/uvscan.sh
index 8a606d9249c..a8ee91269b1 100755
--- a/security/uvscan/files/uvscan.sh
+++ b/security/uvscan/files/uvscan.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# $NetBSD: uvscan.sh,v 1.3 2002/10/21 07:12:34 jlam Exp $
+# $NetBSD: uvscan.sh,v 1.4 2007/07/29 05:19:51 jlam Exp $
 #
 # Wrapper script to execute McAfee(R) VirusScan
 
-exec @PREFIX@/libexec/uvscan/uvscan "$@"
+LD_LIBRARY_PATH=@PREFIX@/libexec/uvscan @PREFIX@/libexec/uvscan/uvscan "$@"