* 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, 35 deletions

diff --git a/www/firefox15-bin/Makefile b/www/firefox15-bin/Makefile
index 17114f8b776..49eb6d3bba6 100644
--- a/www/firefox15-bin/Makefile
+++ b/www/firefox15-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/05/31 07:26:46 ghen Exp $
+# $NetBSD: Makefile,v 1.3 2007/07/29 05:19:56 jlam Exp $
 
 MOZILLA=		firefox
 MOZ_VER=		1.5.0.12
@@ -8,9 +8,8 @@ HOMEPAGE=		http://www.mozilla.com/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/firefox15-bin/Makefile.Linux.i386 b/www/firefox15-bin/Makefile.Linux.i386
deleted file mode 100644
index 24deedd0809..00000000000
--- a/www/firefox15-bin/Makefile.Linux.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $
-
-DISTNAME=	${MOZILLA}-${MOZ_DISTVER}
-MOZ_DIR=	${MOZ_VER}/linux-i686/en-US
-MOZ_PLATFORM=	linux
diff --git a/www/firefox15-bin/Makefile.NetBSD.i386 b/www/firefox15-bin/Makefile.NetBSD.i386
deleted file mode 100644
index 6ba4ed7023c..00000000000
--- a/www/firefox15-bin/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $
-
-BUILD_DEFS+=	MOZILLA_USE_LINUX
-
-.if defined(MOZILLA_USE_LINUX)
-ONLY_FOR_PLATFORM+=	NetBSD-*-i386
-.  include "Makefile.Linux.i386"
-.  if defined(SUSE_PREFER) && !empty(SUSE_PREFER:M10.0)
-DEPENDS+=	suse_compat>=10.0:../../emulators/suse100_compat
-.  endif
-.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."
-DISTNAME=		${MOZILLA}-${MOZ_DISTVER}-i386-unknown-netbsdelf1.6
-EXTRACT_SUFX=		.tar.bz2
-MOZ_PLATFORM=		netbsd
-
-# no 1.0 build for NetBSD
-#ONLY_FOR_PLATFORM+=	NetBSD-1.6*-i386 NetBSD-2*-i386
-.endif
diff --git a/www/firefox15-bin/Makefile.SunOS.sparc b/www/firefox15-bin/Makefile.SunOS.sparc
deleted file mode 100644
index 3def42f0199..00000000000
--- a/www/firefox15-bin/Makefile.SunOS.sparc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $
-
-DISTNAME=	${MOZILLA}-${MOZ_DISTVER}-sparc-sun-solaris2.8-gtk2
-
-MOZ_PLATFORM=	solaris
diff --git a/www/firefox15-bin/Makefile.linux-i386 b/www/firefox15-bin/Makefile.linux-i386
new file mode 100644
index 00000000000..1c41b0b0785
--- /dev/null
+++ b/www/firefox15-bin/Makefile.linux-i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:57 jlam Exp $
+
+DISTNAME=	firefox-${MOZ_DISTVER}
+MOZ_DIR=	${MOZ_VER}/linux-i686/en-US
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux
diff --git a/www/firefox15-bin/Makefile.solaris-i386 b/www/firefox15-bin/Makefile.solaris-i386
new file mode 100644
index 00000000000..2b6358ead86
--- /dev/null
+++ b/www/firefox15-bin/Makefile.solaris-i386
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:57 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/firefox15-bin/Makefile.solaris-sparc b/www/firefox15-bin/Makefile.solaris-sparc
new file mode 100644
index 00000000000..130d63ff654
--- /dev/null
+++ b/www/firefox15-bin/Makefile.solaris-sparc
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:57 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/firefox15-bin/distinfo b/www/firefox15-bin/distinfo
index 8d483ce3f96..55c2c66f995 100644
--- a/www/firefox15-bin/distinfo
+++ b/www/firefox15-bin/distinfo
@@ -1,5 +1,17 @@
-$NetBSD: distinfo,v 1.2 2007/05/31 07:26:46 ghen Exp $
+$NetBSD: distinfo,v 1.3 2007/07/29 05:19:57 jlam Exp $
 
 SHA1 (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = 0de90446b22a1e175595ebd1d03a81bfedc0f235
 RMD160 (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = e90e7795d686ba5cdabde4143c0ca2e217806f65
 Size (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = 8536567 bytes
+SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-i386.tar.bz2) = 02881f43d0712a31a0d660fe3d36c5200be0e167
+RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-i386.tar.bz2) = 78a69c6d21b298ffc8fcc4c72df423ade8bbbcfb
+Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-i386.tar.bz2) = 10713639 bytes
+SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-respin-sparc.tar.bz2) = 06af23a41e9c1ad7273436a79f75b35cffe1fba5
+RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-respin-sparc.tar.bz2) = 04a3cc83e884caa4b44be65e051450e04b662c17
+Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris10-respin-sparc.tar.bz2) = 27288 bytes
+SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-i386-gtk1.tar.bz2) = 21b840872d5c482bef4e479afe2de3a779f45688
+RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-i386-gtk1.tar.bz2) = 3264b95c0280cbe61b7d10353e08e66bbfb1f9d5
+Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-i386-gtk1.tar.bz2) = 9972234 bytes
+SHA1 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 1577403d476f1857e2bea230d2f8585f82509932
+RMD160 (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = abb1639147e6a37cee7d50ea3c58bef796d5d7ad
+Size (firefox/releases/1.5.0.12/contrib/solaris_tarball/firefox-1.5.0.12.en-US.solaris8-respin-sparc-gtk1.tar.bz2) = 27324 bytes