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

9 files changed, 52 insertions, 69 deletions

diff --git a/emulators/suse100_gtk2/DEINSTALL b/emulators/suse100_gtk2/DEINSTALL
new file mode 100644
index 00000000000..0c1759d2401
--- /dev/null
+++ b/emulators/suse100_gtk2/DEINSTALL
@@ -0,0 +1,15 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:18:48 jlam Exp $
+#
+# Remove gtk/pango module configuration.
+#
+case ${STAGE} in
+DEINSTALL)
+	GNOME_BINDIR="${PKG_PREFIX}/@EMULSUBDIR@/opt/gnome/bin"
+	GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc/opt/gnome"
+
+	${ECHO} "${PKGNAME}: removing GTK/Pango module configuration"
+        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules
+        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
+        ${RM} -f ${GNOME_ETCDIR}/pango/pango.modules
+	;;
+esac
diff --git a/emulators/suse100_gtk2/DESCR b/emulators/suse100_gtk2/DESCR
index 962f8891e8f..bc684571d53 100644
--- a/emulators/suse100_gtk2/DESCR
+++ b/emulators/suse100_gtk2/DESCR
@@ -1,5 +1,6 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
+Linux compatibility package based on the SuSE Linux distribution.
+Please visit http://www.suse.com/ for more information about SuSE
+Linux.
 
-This package supports running ELF binaries linked with glibc2 which require
-GTK2 shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require GTK+-2.x shared libraries.
diff --git a/emulators/suse100_gtk2/INSTALL b/emulators/suse100_gtk2/INSTALL
index ad34cc92f13..1336efe570f 100644
--- a/emulators/suse100_gtk2/INSTALL
+++ b/emulators/suse100_gtk2/INSTALL
@@ -1,15 +1,17 @@
-# $NetBSD: INSTALL,v 1.2 2007/02/18 12:34:19 tonio Exp $
+# $NetBSD: INSTALL,v 1.3 2007/07/29 05:18:48 jlam Exp $
 #
 # Initialize gtk/pango module configuration.
 #
 case ${STAGE} in
-    POST-INSTALL)
-        @EMULDIR@/opt/gnome/bin/gtk-query-immodules-2.0@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/gtk-2.0/gtk.immodules
+POST-INSTALL)
+	GNOME_BINDIR="${PKG_PREFIX}/@EMULSUBDIR@/opt/gnome/bin"
+	GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc/opt/gnome"
 
-        @EMULDIR@/opt/gnome/bin/gdk-pixbuf-query-loaders@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
+	${ECHO} "${PKGNAME}: initializing GTK/Pango module configuration"
+        ${GNOME_BINDIR}/gtk-query-immodules-2.0@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules
 
-        @EMULDIR@/opt/gnome/bin/pango-querymodules@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/pango/pango.modules                
-	;;
-    *)
+        ${GNOME_BINDIR}/gdk-pixbuf-query-loaders@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
+
+        ${GNOME_BINDIR}/pango-querymodules@BINSUFFIX@ > ${GNOME_ETCDIR}/pango/pango.modules
 	;;
 esac
diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile
index 4406d208e1c..70f91b36917 100644
--- a/emulators/suse100_gtk2/Makefile
+++ b/emulators/suse100_gtk2/Makefile
@@ -1,32 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2007/07/29 05:18:48 jlam Exp $
 
-DISTNAME=		suse_gtk2-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_gtk2-${SUSE_VERSION}
+PKGREVISION=	4
+CATEGORIES=	emulators
+DISTFILES=	atk-1.10.3-2.${SUSE_ARCH}.rpm				\
+		glib2-2.8.1-3.${SUSE_ARCH}.rpm				\
+		gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm				\
+		cairo-1.0.0-7.4.${SUSE_ARCH}.rpm			\
+		glitz-0.4.4-4.${SUSE_ARCH}.rpm				\
+		pango-1.10.0-3.${SUSE_ARCH}.rpm
 
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for GTK2 binaries
+MAINTAINER=	tonio@NetBSD.org
+COMMENT=	Linux compatibility package for GTK+-2.x
 
-DEPENDS+=		suse_fontconfig-${SUSE_VERSION}{,nb*}:../../emulators/suse100_fontconfig
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2
-DEPENDS+=		suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg
-DEPENDS+=		suse_libpng-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libpng
-DEPENDS+=		suse_libtiff-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libtiff
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
+EMUL_MODULES.linux=	fontconfig freetype2 jpeg png tiff x11
 
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
+# These files are managed by the +INSTALL/+DEINSTALL scripts.
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/opt/gnome/gtk-2.0/gtk.immodules
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/opt/gnome/pango/pango.modules
 
-# Initialize gtk/pango modules.
-FILES_SUBST+=		EMULDIR=${EMULDIR:Q}
-FILES_SUBST+=		BINSUFFIX=${BINSUFFIX:Q}
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+BINSUFFIX?=	# empty
+FILES_SUBST+=	BINSUFFIX=${BINSUFFIX:Q}
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gtk2/Makefile.i386 b/emulators/suse100_gtk2/Makefile.i386
deleted file mode 100644
index c8ddfeb6c0f..00000000000
--- a/emulators/suse100_gtk2/Makefile.i386
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.4 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
-			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
-			gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \
-			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
-			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
-			pango-1.10.0-3.${SUSE_ARCH}.rpm
-
-BINSUFFIX=
diff --git a/emulators/suse100_gtk2/Makefile.powerpc b/emulators/suse100_gtk2/Makefile.powerpc
deleted file mode 100644
index 2200043a08b..00000000000
--- a/emulators/suse100_gtk2/Makefile.powerpc
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.4 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
-			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
-			gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \
-			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
-			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
-			pango-1.10.0-3.${SUSE_ARCH}.rpm
-
-BINSUFFIX=
diff --git a/emulators/suse100_gtk2/Makefile.x86_64 b/emulators/suse100_gtk2/Makefile.x86_64
deleted file mode 100644
index ada1129d2e6..00000000000
--- a/emulators/suse100_gtk2/Makefile.x86_64
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.4 2007/03/24 21:52:51 salo Exp $
-
-RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
-			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
-			gtk2-2.8.3-4.7.${SUSE_ARCH}.rpm \
-			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
-			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
-			pango-1.10.0-3.${SUSE_ARCH}.rpm
-
-BINSUFFIX=	-64
diff --git a/emulators/suse100_gtk2/PLIST b/emulators/suse100_gtk2/PLIST
deleted file mode 100644
index 72158d5fc79..00000000000
--- a/emulators/suse100_gtk2/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/09 20:38:51 tonio Exp $
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gtk.immodules
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
-${EMULSUBDIR}/etc/opt/gnome/pango/pango.modules
diff --git a/emulators/suse100_gtk2/suse.x86_64.mk b/emulators/suse100_gtk2/suse.x86_64.mk
new file mode 100644
index 00000000000..9f5b0ad0565
--- /dev/null
+++ b/emulators/suse100_gtk2/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:49 jlam Exp $
+
+# Suffix on the GTK+-2.x/Pango binaries used in the INSTALL script
+BINSUFFIX=	-64