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

8 files changed, 63 insertions, 26 deletions

diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 416262e27f2..7e37075ab46 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/07/19 18:20:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.31 2007/07/29 05:19:54 jlam Exp $
 
 MOZILLA=		firefox
 MOZ_VER=		2.0.0.5
@@ -8,9 +8,8 @@ HOMEPAGE=		http://www.mozilla.com/en-US/firefox/
 COMMENT=		Lightweight gecko-based web browser (binary package)
 
 DIST_SUBDIR=		${MOZILLA}/releases/${MOZ_DIR}
-# binary package is built against GTK2
-MOZ_GTK2=		YES
 
-ONLY_FOR_PLATFORM+=	Linux-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
 
 .include "../../www/seamonkey-bin/Makefile.common"
diff --git a/www/firefox-bin/Makefile.Linux.i386 b/www/firefox-bin/Makefile.Linux.i386
deleted file mode 100644
index d79def91e49..00000000000
--- a/www/firefox-bin/Makefile.Linux.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.9 2007/05/12 13:53:12 ghen Exp $
-
-DISTNAME=		firefox-${MOZ_DISTVER}
-MOZ_DIR=		${MOZ_DISTVER}/linux-i686/en-US
-MOZ_PLATFORM=		linux
diff --git a/www/firefox-bin/Makefile.NetBSD.i386 b/www/firefox-bin/Makefile.NetBSD.i386
deleted file mode 100644
index f04d7f6fb2b..00000000000
--- a/www/firefox-bin/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.11 2007/05/12 13:53:12 ghen Exp $
-
-BUILD_DEFS+=		MOZILLA_USE_LINUX
-
-.if defined(MOZILLA_USE_LINUX)
-ONLY_FOR_PLATFORM+=	NetBSD-*-i386
-.  include "Makefile.Linux.i386"
-.else
-PKG_SKIP_REASON+=	"No native pre-built NetBSD binary available."
-PKG_SKIP_REASON+=	"Set MOZILLA_USE_LINUX if you want to use the Linux binary."
-.endif
diff --git a/www/firefox-bin/Makefile.SunOS.sparc b/www/firefox-bin/Makefile.SunOS.sparc
deleted file mode 100644
index 3e16ac61fbb..00000000000
--- a/www/firefox-bin/Makefile.SunOS.sparc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.3 2005/04/18 14:24:15 wiz Exp $
-
-DISTNAME=	${MOZILLA}-${MOZ_DISTVER}-sparc-sun-solaris2.8-gtk2
-
-MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin/Makefile.linux-i386 b/www/firefox-bin/Makefile.linux-i386
new file mode 100644
index 00000000000..c12675b7ebd
--- /dev/null
+++ b/www/firefox-bin/Makefile.linux-i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:55 jlam Exp $
+
+DISTNAME=	firefox-${MOZ_DISTVER}
+MOZ_DIR=	${MOZ_DISTVER}/linux-i686/en-US
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux
diff --git a/www/firefox-bin/Makefile.solaris-i386 b/www/firefox-bin/Makefile.solaris-i386
new file mode 100644
index 00000000000..d61b949b056
--- /dev/null
+++ b/www/firefox-bin/Makefile.solaris-i386
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:55 jlam Exp $
+
+.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*)
+SOLARIS_VERSION_REQD?=	10
+.else
+SOLARIS_VERSION_REQD?=	8
+.endif
+
+# Use the Solaris 8 binaries if we're not running at least Solaris 10.
+.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*)
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris10-i386
+MOZ_GTK2=	yes
+.else
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris8-i386-gtk1
+.endif
+
+EXTRACT_SUFX=	.tar.bz2
+MOZ_DIR=	${MOZ_DISTVER}/contrib/solaris_tarball
+
+MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin/Makefile.solaris-sparc b/www/firefox-bin/Makefile.solaris-sparc
new file mode 100644
index 00000000000..dc5407397da
--- /dev/null
+++ b/www/firefox-bin/Makefile.solaris-sparc
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:55 jlam Exp $
+
+.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*)
+SOLARIS_VERSION_REQD?=	10
+.else 
+SOLARIS_VERSION_REQD?=	8
+.endif
+
+# Use the Solaris 8 binaries if we're not running at least Solaris 10.
+.if !empty(SOLARIS_VERSION_REQD:M1[0-9]*)
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris10-respin-sparc
+MOZ_GTK2=	yes
+.else
+DISTNAME=	firefox-${MOZ_DISTVER}.en-US.solaris8-respin-sparc-gtk1
+.endif
+
+EXTRACT_SUFX=	.tar.bz2
+MOZ_DIR=	${MOZ_DISTVER}/contrib/solaris_tarball
+
+MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
index 210de6e7188..7fb1277a85e 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,5 +1,17 @@
-$NetBSD: distinfo,v 1.27 2007/07/19 18:20:58 xtraeme Exp $
+$NetBSD: distinfo,v 1.28 2007/07/29 05:19:56 jlam Exp $
 
 SHA1 (firefox/releases/2.0.0.5/linux-i686/en-US/firefox-2.0.0.5.tar.gz) = 6c4cea59d41584a989f4e0f25ef34ab18ed04bfa
 RMD160 (firefox/releases/2.0.0.5/linux-i686/en-US/firefox-2.0.0.5.tar.gz) = 3e26f5e30eed3be53dc9db22d24397cbffd278ea
 Size (firefox/releases/2.0.0.5/linux-i686/en-US/firefox-2.0.0.5.tar.gz) = 9671891 bytes
+SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-i386.tar.bz2) = e3df86e0d371d9e30d5a40389f7252a46046ce97
+RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-i386.tar.bz2) = fc121b15b3b086316b473c330c620d60c6f28c2a
+Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-i386.tar.bz2) = 11661329 bytes
+SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-respin-sparc.tar.bz2) = 93335eebb4a1afbf54d8e9a270ba2058f3387661
+RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-respin-sparc.tar.bz2) = 189e143d59ffe658ba8843ff858a5d811f929623
+Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris10-respin-sparc.tar.bz2) = 13373878 bytes
+SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-i386-gtk1.tar.bz2) = 1edbe0fdeafa2b05a79079c9f2fc8fca151da464
+RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-i386-gtk1.tar.bz2) = d7e890fae67283de2dd2a2e9293c889f197f3ba9
+Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-i386-gtk1.tar.bz2) = 10927989 bytes
+SHA1 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 9ca16078f11183929adc1c59f73a9fa599e88438
+RMD160 (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 9ab9f410d307adcfa9f61886076db87aa14dc1f4
+Size (firefox/releases/2.0.0.5/contrib/solaris_tarball/firefox-2.0.0.5.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 12867136 bytes