* 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, 37 insertions, 38 deletions

diff --git a/emulators/suse100_glx/DESCR b/emulators/suse100_glx/DESCR
index 64e8143cf19..15d0f9e4737 100644
--- a/emulators/suse100_glx/DESCR
+++ b/emulators/suse100_glx/DESCR
@@ -1,4 +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 which require GL shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require OpenGL/Mesa shared libraries.
diff --git a/emulators/suse100_glx/Makefile b/emulators/suse100_glx/Makefile
index 9d3b39044e8..0853af4dbcd 100644
--- a/emulators/suse100_glx/Makefile
+++ b/emulators/suse100_glx/Makefile
@@ -1,23 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:45 jlam Exp $
 
-DISTNAME=		suse_glx-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_glx-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the GL library
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for OpenGL/Mesa
 
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
+EMUL_MODULES.linux=	x11
 
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-SUSE_INCLUDE_MAKEFILE_ARCH=	yes
+# This symlink is managed by ldconfig(8).
+CHECK_FILES_SKIP+=	${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libglide.so.3
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_glx/Makefile.i386 b/emulators/suse100_glx/Makefile.i386
deleted file mode 100644
index 4dbf9e56d05..00000000000
--- a/emulators/suse100_glx/Makefile.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/Makefile.powerpc b/emulators/suse100_glx/Makefile.powerpc
deleted file mode 100644
index 67d465aaae1..00000000000
--- a/emulators/suse100_glx/Makefile.powerpc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/Makefile.x86_64 b/emulators/suse100_glx/Makefile.x86_64
deleted file mode 100644
index 06d303bec4b..00000000000
--- a/emulators/suse100_glx/Makefile.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-32bit-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-32bit-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/PLIST_rpmfix.i386 b/emulators/suse100_glx/PLIST_rpmfix.i386
deleted file mode 100644
index 84378627263..00000000000
--- a/emulators/suse100_glx/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 14:15:06 joerg Exp $
-/usr/lib/libglide3.so.3
diff --git a/emulators/suse100_glx/suse.i386.mk b/emulators/suse100_glx/suse.i386.mk
new file mode 100644
index 00000000000..f95fc83424e
--- /dev/null
+++ b/emulators/suse100_glx/suse.i386.mk
@@ -0,0 +1,7 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:18:47 jlam Exp $
+
+# SuSE i386 RPMs; the -devel version is necessary for libGL.so et.al.
+# symlinks only.
+#
+DISTFILES+=	xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/suse.powerpc.mk b/emulators/suse100_glx/suse.powerpc.mk
new file mode 100644
index 00000000000..b3d95cb6282
--- /dev/null
+++ b/emulators/suse100_glx/suse.powerpc.mk
@@ -0,0 +1,7 @@
+# $NetBSD: suse.powerpc.mk,v 1.1 2007/07/29 05:18:47 jlam Exp $
+
+# SuSE PowerPC RPMs; the -devel version is necessary for libGL.so et.al.
+# symlinks only.
+#
+DISTFILES+=	xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/suse.x86_64.mk b/emulators/suse100_glx/suse.x86_64.mk
new file mode 100644
index 00000000000..cfa6ad1584f
--- /dev/null
+++ b/emulators/suse100_glx/suse.x86_64.mk
@@ -0,0 +1,9 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:18:47 jlam Exp $
+
+# SuSE x86_64 RPMs; the -devel version is necessary for libGL.so et.al.
+# symlinks only.
+#
+DISTFILES+=	xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-32bit-6.8.2-100.${SUSE_ARCH}.rpm
+DISTFILES+=	xorg-x11-Mesa-devel-32bit-6.8.2-100.${SUSE_ARCH}.rpm