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

5 files changed, 37 insertions, 78 deletions

diff --git a/www/seamonkey-bin/Makefile b/www/seamonkey-bin/Makefile
index d7a57f062f3..a146923b225 100644
--- a/www/seamonkey-bin/Makefile
+++ b/www/seamonkey-bin/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2007/07/26 08:50:17 ghen Exp $
+# $NetBSD: Makefile,v 1.15 2007/07/29 05:20:03 jlam Exp $
 
 MOZILLA=		seamonkey
 MOZ_VER=		1.1.3
 MOZ_DISTVER=		${MOZ_VER}
 
 HOMEPAGE=		http://www.mozilla.org/projects/seamonkey/
-COMMENT=		Full featured gecko-based browser (binary package)
+COMMENT=		Full-featured gecko-based browser suite (binary package)
 
 DIST_SUBDIR=		${MOZILLA}/${MOZ_DISTDIR}
 
-MOZ_GTK2=		YES
-
-ONLY_FOR_PLATFORM+=	Linux-*-i386
+EMUL_PLATFORMS=		linux-i386
 
 .include "../../www/seamonkey-bin/Makefile.common"
diff --git a/www/seamonkey-bin/Makefile.Linux.i386 b/www/seamonkey-bin/Makefile.Linux.i386
deleted file mode 100644
index 12efd8a644c..00000000000
--- a/www/seamonkey-bin/Makefile.Linux.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2006/03/30 19:18:20 ghen Exp $
-
-DISTNAME=		${MOZILLA}-${MOZ_DISTVER}.en-US.linux-i686
-MOZ_DISTDIR=		releases/${MOZ_DIR}
-MASTER_SITES=		http://ftp.mozilla.org/pub/mozilla.org/seamonkey/${MOZ_DISTDIR}/
-
-MOZ_PLATFORM=		linux
diff --git a/www/seamonkey-bin/Makefile.NetBSD.i386 b/www/seamonkey-bin/Makefile.NetBSD.i386
deleted file mode 100644
index 5633eec5caa..00000000000
--- a/www/seamonkey-bin/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2006/03/30 19:18:20 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/seamonkey-bin/Makefile.common b/www/seamonkey-bin/Makefile.common
index e499da044f8..0529b82edc8 100644
--- a/www/seamonkey-bin/Makefile.common
+++ b/www/seamonkey-bin/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.3 2006/11/25 21:38:51 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/07/29 05:20:04 jlam Exp $
 
-DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
+DISTNAME=		${MOZILLA}${MOX_EXTRA}-bin	# overridden below
 PKGNAME=		${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
 CATEGORIES=		www
 
@@ -8,25 +8,38 @@ MAINTAINER=		grant@NetBSD.org
 HOMEPAGE?=		http://www.mozilla.org/
 
 WRKSRC?=		${WRKDIR}/${MOZILLA}
-NO_CONFIGURE=		yes
+BUILD_DIRS?=		# empty
 USE_LANGUAGES=		# empty
 
 FILESDIR=		${.CURDIR}/../../www/seamonkey-bin/files
 MOZILLA_SCRIPT?=	${FILESDIR}/mozilla.sh
 
+.if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
+EMUL_MODULES.linux=	compat gtk2 locale
+SUSE_VERSION_REQD=	9.1
+.else
+EMUL_MODULES.linux=	compat gtk
+SUSE_VERSION_REQD=	7.3
+.endif
 
 .include "../../mk/bsd.prefs.mk"
 
-# everything specific to your OS/Arch goes into its own Makefile
-# group together i386, i486, i586 and i686 (for Linux)
-ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
-
-.if exists(${.CURDIR}/Makefile.${OPSYS}.${ARCH})
-.  include "${.CURDIR}/Makefile.${OPSYS}.${ARCH}"
+.if !empty(EMUL_DISTRO:Mnative-*)
+.  if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
+DEPENDS+=		gtk2+>=2.2:../../x11/gtk2
+.  else
+DEPENDS+=		gtk2+>=1.2:../../x11/gtk
+.  endif
 .endif
 
+# Include Makefile.${EMUL_PLATFORM} to get definitions for DISTNAME
+# and MOZ_PLATFORM.
+#
+.sinclude "${.CURDIR}/Makefile.${EMUL_PLATFORM}"
+
 MOZILLA_SHORT=		${MOZILLA}
 MOZ_DIR?=		${MOZ_VER}
+MOZ_PLATFORM?=		${LOWER_OPSYS}
 
 .if !defined(MASTER_SITES)
 _MASTER_SITES+=		http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
@@ -51,45 +64,9 @@ FILES_SUBST+=	MOZ_PLATFORM=${MOZ_PLATFORM:Q}
 MESSAGE_SUBST+=	PKGBASE=${PKGBASE}
 PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 
-# protect against MOZ_PLATFORM being undefined so we don't bomb, but
-# instead use the result of ONLY_FOR_PLATFORM.
-.if defined(MOZ_PLATFORM)
-
-.  if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux"
+.if (${OPSYS} == "NetBSD") && (${EMUL_OPSYS} == "linux")
 MESSAGE_SRC+=	${.CURDIR}/../../www/seamonkey-bin/MESSAGE.compat_linux
-.  endif
-
-# Linux builds on NetBSD
-.  if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux"
-.    include "../../emulators/suse_linux/Makefile.application"
-.  elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "netbsd"
-# we need libstdc++.so.4 on -current.
-.    if !exists(/usr/lib/libstdc++.so.4)
-DEPENDS+=	compat16>=1.6.0:../../emulators/compat16
-_COMPAT16_LIBSTDCXX=	YES
-.    endif
-.  endif
-
-# GTK2 builds.
-.  if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
-.    if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "netbsd"
-DEPENDS+=	gtk2+>=2.4:../../x11/gtk2
-.    elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux"
-DEPENDS+=	suse_compat>=9.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_gtk2>=9.1:../../emulators/${SUSE_DIR_PREFIX}_gtk2
-DEPENDS+=	suse_locale>=9.1:../../emulators/${SUSE_DIR_PREFIX}_locale
-.    else
-DEPENDS+=	gtk2+>=2.2:../../x11/gtk2
-.    endif
-.  elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux"
-DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk
-.  else
-# default to at least gtk-1.2.
-DEPENDS+=	gtk+>=1.2:../../x11/gtk
-.  endif
-
-.endif	# defined(MOZ_PLATFORM)
+.endif
 
 INSTALLATION_DIRS=	bin
 
@@ -107,8 +84,6 @@ post-extract:
 	@${RM} -f ${WRKSRC}/plugins/libnullplugin.so
 	${CP} ${MOZILLA_SCRIPT} ${WRKDIR}/${MOZILLA}.sh
 
-do-build:
-
 do-install:
 	${INSTALL_DATA_DIR} ${MOZILLA_LIB}
 	cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB}
@@ -123,8 +98,8 @@ do-install:
 # builds typically want exactly 'libgtk-1.2.so.0', etc. symlink them
 # into the mozilla directory.
 post-install:
-.if ${OPSYS} != "NetBSD"
-.  if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES"
+.if !empty(EMUL_DISTRO:Mnative-*)
+.  if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
 	@cd ${MOZILLA_LIB} && \
 	${LN} -s ${PREFIX}/lib/libatk-1.0.*so* .;			\
 	${LN} -s ${X11PREFIX}/lib/libgdk-x11-2.0.*so* .;		\
@@ -159,10 +134,6 @@ post-install:
 	${LN} -s libgmodule.so libgmodule-1.2.so.0
 .  endif
 .endif
-.if defined(_COMPAT16_LIBSTDCXX) && ${_COMPAT16_LIBSTDCXX} == "YES"
-	@cd ${MOZILLA_LIB} && \
-		${LN} -s ${PREFIX}/emul/netbsd16/usr/lib/libstdc++.so* .
-.endif
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/mozilla-linux/plugins
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
 	@${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} >> ${PLIST_SRC}
diff --git a/www/seamonkey-bin/Makefile.linux-i386 b/www/seamonkey-bin/Makefile.linux-i386
new file mode 100644
index 00000000000..0b2174d3ae4
--- /dev/null
+++ b/www/seamonkey-bin/Makefile.linux-i386
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:20:04 jlam Exp $
+
+DISTNAME=	seamonkey-${MOZ_DISTVER}.en-US.linux-i686
+MOZ_DISTDIR=	releases/${MOZ_DIR}
+MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/seamonkey/${MOZ_DISTDIR}/
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux