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

2 files changed, 19 insertions, 32 deletions

diff --git a/lang/blackdown-jre13/Makefile b/lang/blackdown-jre13/Makefile
index b77eb84c69a..892a599f51d 100644
--- a/lang/blackdown-jre13/Makefile
+++ b/lang/blackdown-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/18 22:13:23 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/07/29 05:19:27 jlam Exp $
 #
 
 BD_BASENAME=	j2re
@@ -7,13 +7,15 @@ PKGNAME=	blackdown-jre13-1
 PKGREVISION=	2
 COMMENT=	Blackdown's Java(tm) Runtime Environment 1.3.1
 
-.if ${MACHINE_ARCH} == "arm"
-DISTNAME=	${BD_BASENAME}-${RELVERSION}-RC1-linux-arm
-.endif
+EMUL_PLATFORMS=	linux-arm
 
 .include "../../lang/blackdown-jre13/Makefile.common"
 
-ONLY_FOR_PLATFORM+=	NetBSD-*-arm Linux-*-arm
+.if ${BLACKDOWN_ARCH} == "arm"
+BLACKDOWN_REL=	rc1
+DISTNAME=	${BD_BASENAME}-${RELVERSION}-RC1-linux-arm
+EXTRACT_SUFX=	.tar.bz2
+.endif
 
 PLIST_SRC=	${PKGDIR}/PLIST
 .if ${BLACKDOWN_ARCH} == "i386"
diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index 5f167facbc1..30e698430c3 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2007/05/13 21:38:27 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2007/07/29 05:19:27 jlam Exp $
 #
 
 RELVERSION=	1.3.1
@@ -14,23 +14,18 @@ MASTER_SITES=	ftp://ftp.tux.org/pub/java/${BD_SUBDIR}/ \
 		ftp://mirror.aarnet.edu.au/pub/java-linux/${BD_SUBDIR}/ \
 		ftp://ftp.informatik.hu-berlin.de/pub/Java/Linux/${BD_SUBDIR}/
 
-.if ${MACHINE_ARCH} == "powerpc"
-BLACKDOWN_ARCH?=	ppc
-.elif !empty(MACHINE_ARCH:Mi[3-6]86)
-BLACKDOWN_ARCH?=	i386
-.else
-BLACKDOWN_ARCH?=	${MACHINE_ARCH}
-.endif
+EMUL_PLATFORMS+=	linux-i386 linux-powerpc linux-sparc
+EMUL_MODULES.linux+=	base
+SUSE_VERSION_REQD=	7.3
 
-.if ${BLACKDOWN_ARCH} == "arm"
-BLACKDOWN_REL=	rc1
-EXTRACT_SUFX=	.tar.bz2
-.elif ${BLACKDOWN_ARCH} == "ppc"
-DEPENDS+=	suse_base>=7.3:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
+.include "../../mk/bsd.prefs.mk"
 
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.blackdown.org/
+BLACKDOWN_ARCH=			${BLACKDOWN_ARCH.${EMUL_ARCH}}
+BLACKDOWN_ARCH.powerpc=		ppc
+BLACKDOWN_ARCH.${EMUL_ARCH}=	${EMUL_ARCH}
+
+MAINTAINER=		tech-pkg@NetBSD.org
+HOMEPAGE=		http://www.blackdown.org/
 
 RESTRICTED=		Redistribution of repackaged binaries not permitted.
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -39,19 +34,13 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/${BD_BASENAME}${RELVERSION}
-CHECK_SHLIBS_SUPPORTED=	no
-
-.include "../../mk/bsd.prefs.mk"
+BUILD_DIRS=		# empty
 
 JVM_HOME=		${PREFIX}/java/blackdown-${RELVERSION}
 USE_TOOLS+=		gunzip
 
 PLIST_SUBST+=		BLACKDOWN_ARCH=${BLACKDOWN_ARCH:Q}
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \
-			Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc \
-			DragonFly-*-i386
-
 .if ${EXTRACT_SUFX} == ".bin"
 EXTRACT_OPTS_BIN=	--nox11
 post-fetch:
@@ -60,8 +49,6 @@ post-fetch:
 	fi
 .endif
 
-do-build:	# nothing
-
 post-build:
 	${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 	${FIND} ${WRKSRC} -name '*.1.gz' -print | ${XARGS} ${GUNZIP_CMD}
@@ -69,5 +56,3 @@ post-build:
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JVM_HOME}
 	cd ${WRKSRC} && ${PAX} -rw . ${JVM_HOME}
-
-.include "../../emulators/suse_linux/Makefile.application"