* 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.

7 files changed, 83 insertions, 111 deletions

diff --git a/multimedia/RealPlayerGold/DESCR b/multimedia/RealPlayerGold/DESCR
index c3b3931908c..ea7135ca765 100644
--- a/multimedia/RealPlayerGold/DESCR
+++ b/multimedia/RealPlayerGold/DESCR
@@ -1,5 +1,5 @@
-  RealPlayer for Unix allows you to play streaming audio and video over the
-Internet in real-time.  RealPlayerGold supports RealAudio, RealVideo 10,
-MP3, Ogg Vorbis and Theora, H263, AAC, and more.  Other features include
-a Mozilla compatible plugin, a themeable GTK2 user interface, accelerated
-video, and full screen playback.
+RealPlayer for Unix allows you to play streaming audio and video over
+the Internet in real-time.  RealPlayerGold supports RealAudio, RealVideo
+10, MP3, Ogg Vorbis and Theora, H263, AAC, and more.  Other features
+include a Mozilla compatible plugin, a themeable GTK2 user interface,
+accelerated video, and full screen playback.
diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile
index 03cf0d41b95..0137223f6aa 100644
--- a/multimedia/RealPlayerGold/Makefile
+++ b/multimedia/RealPlayerGold/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:23 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/29 05:19:45 jlam Exp $
 #
 
 DISTNAME=		RealPlayer10GOLD
 # Exact version obtained from  the output of
 #   file RealPlayer10GOLD.rpm
-PKGNAME=		RealPlayerGold-${PKGVER}
+PKGNAME=		RealPlayerGold-10.0.8.805.20060718
 PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		http://forms.real.com/real/player/download.html?f=unix/
@@ -14,45 +14,29 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.real.com/linux/
 COMMENT=		Real Audio and Video Player
 
-PKGVER=			10.0.8.805.20060718
-RPMFILES=		${DISTNAME}${EXTRACT_SUFX}
-RPM2PKGARGS=		-d ${PREFIX} -f ${PLIST_SRC} -p ${REALPLAYER_SUBDIR} -s3
-RPM2PKGSTRIP=		3
-EXTRACT_ONLY=		# empty
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-DIST_SUBDIR=		${PKGNAME_NOREV}
-
-# Verify that the version of the distfile (which changes often without the name changing)
-# is still correct.  This helps sort out download errors vs out of date pkgsrc errors.
-post-fetch:
-	ver=`file ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${SED} -e 's;.*Player-;;g'  -e 's;-;.;g'` ; \
-		if [ "$$ver" != "${PKGVER}" ] ; then \
-			${ECHO} "It appears that real.com has made a new version ($$ver) available so this" ; \
-			${ECHO} "package will need updating to work correctly.  That likely the reason for" ; \
-			${ECHO} "the checksum failure." ; \
-		fi
-
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_base>=9.1:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=		suse_fontconfig>=9.1:../../emulators/${SUSE_DIR_PREFIX}_fontconfig
-DEPENDS+=		suse_freetype2>=9.1:../../emulators/${SUSE_DIR_PREFIX}_freetype2
-DEPENDS+=		suse_x11>=9.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=		suse_gtk2>=9.1:../../emulators/${SUSE_DIR_PREFIX}_gtk2
-.endif
-
-REALPLAYER_SUBDIR=	lib
-REALPLAYER_HOME=	${PREFIX}/${REALPLAYER_SUBDIR}/RealPlayer
-
 RESTRICTED=		Redistribution not permitted
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-ONLY_FOR_PLATFORM=	*-*-i386
+PKGVER=			${PKGNAME_NOREV:S/^RealPlayerGold-//}
+DIST_SUBDIR=		${PKGNAME_NOREV}
+
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
+
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base fontconfig freetype2 gtk2 x11
+
+EMUL_PKG_FMT=		rpm
+RPM2PKG_STRIP=		3
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	lib
+RPM2PKG_STAGE=		do-install
+RUN_LDCONFIG=		no
+
+REALPLAYER_HOME=	${PREFIX}/lib/RealPlayer
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-install
@@ -60,12 +44,24 @@ SUBST_FILES.paths=	${REALPLAYER_HOME}/realplay
 SUBST_SED.paths=	-e 's,/bin/true,${TRUE},g'
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 
+# Verify that the version of the distfile (which changes often without
+# the name changing) is still correct.  This helps sort out download
+# errors vs. out-of-date-pkgsrc errors.
+#
+post-fetch:
+	ver=`file ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${SED} -e 's;.*Player-;;g'  -e 's;-;.;g'` ; \
+		if [ "$$ver" != "${PKGVER}" ] ; then \
+			${ECHO} "It appears that real.com has made a new version ($$ver) available so this" ; \
+			${ECHO} "package will need updating to work correctly.  That likely the reason for" ; \
+			${ECHO} "the checksum failure." ; \
+		fi
+
 do-build:
 	${SED} -e 's|@REALPLAYER_HOME@|${REALPLAYER_HOME}|g'		\
-		${FILESDIR}/realplay.sh > ${WRKDIR}/realplay
+		${FILESDIR}/realplay.sh > ${WRKSRC}/realplay
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/realplay ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/realplay ${PREFIX}/bin
 	${ECHO} bin/realplay >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/divxplayer/Makefile b/multimedia/divxplayer/Makefile
index 7c2933302b9..bdbe4a01282 100644
--- a/multimedia/divxplayer/Makefile
+++ b/multimedia/divxplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/15 22:22:19 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/07/29 05:19:45 jlam Exp $
 
 DISTNAME=	divx-player-installer
 PKGNAME=	divxplayer-0.2.0
@@ -10,19 +10,13 @@ MAINTAINER=	david@silicium.ath.cx
 HOMEPAGE=	http://www.divx.com/
 COMMENT=	DivX(TM) Video Player for Linux from DivX.com
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
+DIST_SUBDIR=	${PKGNAME_NOREV}
 
-ONLY_FOR_PLATFORM= *-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	x11
 
 WRKSRC=		${WRKDIR}/divx-player-installer
-NO_BUILD=	YES
-USE_X11BASE=	YES
-
-DIST_SUBDIR=	${PKGNAME_NOREV}
+BUILD_DIRS=	# empty
 
 BINARY=		divxPlayer.bin
 DATADIR=	${PREFIX}/share/divxplayer
diff --git a/multimedia/libflashsupport/Makefile b/multimedia/libflashsupport/Makefile
index 2e373a4ebc5..b0963ab621f 100644
--- a/multimedia/libflashsupport/Makefile
+++ b/multimedia/libflashsupport/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/06/15 20:10:41 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:45 jlam Exp $
 
 PKGNAME=	libflashsupport-1.0.2098
 DISTNAME=	libflashsupport-1-0-2098-i586
@@ -12,34 +11,23 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://labs.adobe.com/wiki/index.php/Flash_Player:Additional_Interface_Support_for_Linux
 COMMENT=	Additional Interface Support for Linux Flash Player
 
-USE_LANGUAGES=	# none
-NO_BUILD=	YES
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base openssl
+SUSE_VERSION_REQD=	9.1
 
-BUILD_DEPENDS+= rpm2pkg>=1.2:../../pkgtools/rpm2pkg
-RPM2PKG=        ${PREFIX}/sbin/rpm2pkg
-RPM2PKGARGS=	-d ${WRKDIR} -s 3 ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+EMUL_PKG_FMT=		rpm
+RPM2PKG_STRIP=		3
+RPM2PKG_PLIST=		# empty
 
-SUSE_COMPAT32=	yes
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_base>=9.1:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=		suse_openssl>=9.1:../../emulators/${SUSE_DIR_PREFIX}_openssl
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	share/doc
 
-PLIST_SUBST=	EMULSUBDIR=${EMULSUBDIR}
-
-do-extract:
-	${RPM2PKG} ${RPM2PKGARGS}
-
 do-install:
 	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so \
 		${PREFIX}/${EMULSUBDIR}/usr/lib
 	${INSTALL_DATA} ${WRKDIR}/doc/libflashsupport-1.0/README \
 		${PREFIX}/share/doc/libflashsupport.README
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libflashsupport/PLIST b/multimedia/libflashsupport/PLIST
index 94247e08011..e6a34d215de 100644
--- a/multimedia/libflashsupport/PLIST
+++ b/multimedia/libflashsupport/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2007/06/15 20:10:41 joerg Exp $
-${EMULSUBDIR}/usr/lib/libflashsupport.so
+@comment $NetBSD: PLIST,v 1.4 2007/07/29 05:19:45 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libflashsupport.so
 share/doc/libflashsupport.README
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
index a2e88851f7f..0c9e13f7dee 100644
--- a/multimedia/ns-flash/Makefile
+++ b/multimedia/ns-flash/Makefile
@@ -1,33 +1,44 @@
-# $NetBSD: Makefile,v 1.23 2007/07/17 09:31:53 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/07/29 05:19:45 jlam Exp $
 
 CATEGORIES=		multimedia www
-PKGREVISION=		2
 MASTER_SITES=		http://fpdownload.macromedia.com/get/flashplayer/current/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.flash.com/
 COMMENT=		MacroMedia Flash Player Netscape plugin
 
-ONLY_FOR_PLATFORM=	*-*-i386 SunOS-*-sparc
-NOT_FOR_PLATFORM=	SunOS-*-i386
+# Must update communicator/navigator to at least 4.76nb1
+CONFLICTS+=		communicator<=4.76nb1
+CONFLICTS+=		navigator<=4.76nb1
+
+LICENSE=		flash-license
+RESTRICTED=		Redistribution not permitted
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/${WRKNAME}
+BUILD_DIRS=		# empty
 DIST_SUBDIR=		flash/${FLASH_VERS}
 
-SUSE_COMPAT32=		yes
-SUSE_COMPAT32_OPT=	yes
+CRYPTO=			yes
+
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-sparc
+EMUL_MODULES.linux=	compat gtk2 x11
+SUSE_VERSION_REQD=	9.0
+
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
-FLASH_VERS=		9.0r31
-DEPENDS+=		suse_compat>=9.0:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=		suse_x11>=9.0:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=		suse_gtk2>=9.0:../../emulators/${SUSE_DIR_PREFIX}_gtk2
+.if ${EMUL_PLATFORM} == "linux-i386"
+FLASH_VERS=		9.0r48
 DISTUNAME=		linux
 DISTNAME=		install_flash_player_9_${DISTUNAME}
 WRKNAME=		install_flash_player_9_${DISTUNAME}
-.elif ${MACHINE_ARCH} == "sparc" && ${OPSYS} == "SunOS"
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
 FLASH_VERS=		7.0r67
+PKGREVISION=		2
 DISTUNAME=		solaris
 DISTNAME=		install_flash_player_7_${DISTUNAME}_sparc
 WRKNAME=		install_flash_player_7_${DISTUNAME}
@@ -38,30 +49,13 @@ DISTNAME=		flash_player
 .endif
 PKGNAME=		ns-flash-${FLASH_VERS:S/r/./}
 
-# Must update communicator/navigator to at least 4.76nb1
-CONFLICTS+=		communicator<=4.76nb1
-CONFLICTS+=		navigator<=4.76nb1
-
-LICENSE=		flash-license
-RESTRICTED=		Redistribution not permitted
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-CRYPTO=			yes
-
 NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
 
+.include "options.mk"
+
 do-install:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${NS_PLUGINS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}
 
-.include "options.mk"
-.if ${OPSYS} != "SunOS"
-.  include "../../emulators/suse_linux/Makefile.application"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ns-flash/distinfo b/multimedia/ns-flash/distinfo
index 7db83544197..6da55f45c58 100644
--- a/multimedia/ns-flash/distinfo
+++ b/multimedia/ns-flash/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2007/02/01 13:44:14 ghen Exp $
+$NetBSD: distinfo,v 1.13 2007/07/29 05:19:45 jlam Exp $
 
-SHA1 (flash/9.0r31/install_flash_player_9_linux.tar.gz) = ffe59c81d28d8108112b7e372f652328d362a35b
-RMD160 (flash/9.0r31/install_flash_player_9_linux.tar.gz) = bad57e9349c5b1bb0b12a7dee7dea8f24af2f764
-Size (flash/9.0r31/install_flash_player_9_linux.tar.gz) = 2609703 bytes
+SHA1 (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 4bba0b81462394388b4509ecdc845f469c95d6ae
+RMD160 (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 4eea521f45fcd42e6916ba61ba299df8694fbc14
+Size (flash/9.0r48/install_flash_player_9_linux.tar.gz) = 2608602 bytes
 SHA1 (flash/7.0r67/install_flash_player_7_solaris_sparc.tar.gz) = f8dc29f2eee2e91c8856ee4d1bc402021ec7c694
 RMD160 (flash/7.0r67/install_flash_player_7_solaris_sparc.tar.gz) = ad5cf828d4d13bd512c106dfef73e515f4b655b0
 Size (flash/7.0r67/install_flash_player_7_solaris_sparc.tar.gz) = 1074253 bytes