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

29 files changed, 200 insertions, 236 deletions

diff --git a/lang/Cg-compiler/Makefile b/lang/Cg-compiler/Makefile
index cfae5b6df32..e5a10626829 100644
--- a/lang/Cg-compiler/Makefile
+++ b/lang/Cg-compiler/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:56 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/29 05:19:27 jlam Exp $
 #
 
 DISTNAME=	CgLinux-1.3.0408-0400
 PKGNAME=	Cg-compiler-1.3beta2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://download.nvidia.com/developer/cg/Cg_1.3/Linux/
 
@@ -11,18 +11,15 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://developer.nvidia.com/object/cg_toolkit.html
 COMMENT=	NVIDIA Cg Compiler for Linux
 
-ONLY_FOR_PLATFORM=  *-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
+SUSE_VERSION_REQD=	7.3
 
-WRKSRC=		${WRKDIR}
-NO_BUILD=	yes
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
+RUN_LDCONFIG=		yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Linux"
-DEPENDS+=	suse_base>=7.3:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
-
-INSTALLATION_DIRS=	bin lib ${PKGMANDIR}/man3 share
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man3 share
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/Cg
@@ -32,9 +29,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/cgc ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/usr/include/Cg/* ${PREFIX}/include/Cg
 	${INSTALL_DATA} ${WRKSRC}/usr/include/CgFX/* ${PREFIX}/include/CgFX
-	${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${EMULDIR}/lib
 	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* ${PREFIX}/${PKGMANDIR}/man3
 	cd ${WRKSRC}/usr/local && ${PAX} -rwppm . ${PREFIX}/share/NVIDIA-Cg-linux
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/Cg-compiler/PLIST b/lang/Cg-compiler/PLIST
index 6bbbed6b948..c6633733fba 100644
--- a/lang/Cg-compiler/PLIST
+++ b/lang/Cg-compiler/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/18 21:12:51 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/07/29 05:19:27 jlam Exp $
 bin/cgc
 include/Cg/cg.h
 include/Cg/cgContextManager.h
@@ -14,10 +14,10 @@ include/Cg/cg_profiles.h
 include/CgFX/ICgFX.h
 include/CgFX/ICgFXEffect.h
 include/CgFX/cgfx_stddefs.h
-lib/libCg.so
-lib/libCgFX.so
-lib/libCgFXGL.so
-lib/libCgGL.so
+${EMULSUBDIRSLASH}lib/libCg.so
+${EMULSUBDIRSLASH}lib/libCgFX.so
+${EMULSUBDIRSLASH}lib/libCgFXGL.so
+${EMULSUBDIRSLASH}lib/libCgGL.so
 man/man3/cgCompileProgram.3
 man/man3/cgConnectParameter.3
 man/man3/cgCopyProgram.3
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"
diff --git a/lang/mit-scheme-bin/Makefile b/lang/mit-scheme-bin/Makefile
index be44d0f95d7..bcfa85b8925 100644
--- a/lang/mit-scheme-bin/Makefile
+++ b/lang/mit-scheme-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/12/06 16:33:39 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/29 05:19:27 jlam Exp $
 #
 
 DISTNAME=		mit-scheme-7.7.1-ix86-gnu-linux
@@ -10,7 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/mit-scheme/
 COMMENT=		MIT/GNU Scheme (Linux binary)
 
-DEPENDS+=		suse_base>=6.0:../../emulators/${SUSE_DIR_PREFIX}_base
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
 
 WRKSRC=			${WRKDIR}
 INSTALLATION_DIRS=	bin libexec
@@ -29,5 +30,4 @@ do-install:
 	cd ${WRKSRC}/lib && ${PAX} -rw mit-scheme ${PREFIX}/lib
 	${RMDIR} ${PREFIX}/lib/mit-scheme/lib
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 4bf7dd1c262..7f8f83c5bc5 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2006/09/25 08:00:31 ghen Exp $
+# $NetBSD: Makefile,v 1.41 2007/07/29 05:19:27 jlam Exp $
 
-DISTNAME=	j2sdk-1_3_1_19-linux-i586
+DISTNAME=	j2sdk-1_3_1_19-linux-${DIST_ARCH}
 PKGNAME=	sun-jdk13-1.0.19
 MASTER_SITES=	# empty
 
@@ -10,10 +10,12 @@ SHORT=		JDK
 
 DEPENDS+=	sun-jre13>=1.0.19:../../lang/sun-jre13
 
+WRKSRC=		${WRKDIR}/jdk1.3.1_19
 JAVA_CLASSPATH=	${JAVA_HOME}/src.jar
 JAVA_WRAPPERS=	appletviewer extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
-WRKSRC=		${WRKDIR}/jdk1.3.1_19
+
+.include "../../lang/sun-jre13/Makefile.common"
 
 # Remove parts that are in common with the JRE.
 #
@@ -28,4 +30,4 @@ post-extract:
 	done
 	${LN} -sf . ${WRKSRC}/jre
 
-.include "../../lang/sun-jre13/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jdk13/PLIST.Darwin b/lang/sun-jdk13/PLIST.Darwin
deleted file mode 100644
index 99b06f3ae69..00000000000
--- a/lang/sun-jdk13/PLIST.Darwin
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2002/06/30 15:01:48 schmonz Exp $
-@comment Darwin ships with a JDK based on Sun's 1.3.1 release.
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 486ca86448e..05ad4435790 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2007/04/21 20:40:52 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2007/07/29 05:19:28 jlam Exp $
 
-DISTNAME=	j2sdk-1_4_2_14-linux-i586
+DISTNAME=	j2sdk-1_4_2_14-linux-${DIST_ARCH}
 PKGNAME=	sun-jdk14-2.14
 MASTER_SITES=	# empty
 
@@ -14,6 +14,8 @@ WRKSRC=		${WRKDIR}/j2sdk1.4.2_14
 JAVA_WRAPPERS+=	appletviewer extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
+.include "../../lang/sun-jre14/Makefile.common"
+
 # Remove parts that are in common with the JRE
 #
 post-extract:
@@ -27,4 +29,4 @@ post-extract:
 	done
 	${LN} -sf . ${WRKSRC}/jre
 
-.include "../../lang/sun-jre14/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile
index 9bdf9988cd6..91211c3c270 100644
--- a/lang/sun-jdk15/Makefile
+++ b/lang/sun-jdk15/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2007/02/07 13:07:50 abs Exp $
+# $NetBSD: Makefile,v 1.25 2007/07/29 05:19:28 jlam Exp $
 
-DISTNAME=	jdk-1_5_0_11-linux-i586
+DISTNAME=	jdk-1_5_0_11-linux-${DIST_ARCH}
 PKGNAME=	sun-jdk15-5.0.11
 MASTER_SITES=	# empty
 
@@ -8,11 +8,12 @@ SHORT_NAME=	JDK
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15
 
-CHECK_SHLIBS=	no	# One of the demos is broken.
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//}
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
+.include "../../lang/sun-jre15/Makefile.common"
+
 # Remove parts that are in common with the JRE
 #
 post-extract:
@@ -26,4 +27,4 @@ post-extract:
 	done
 	${LN} -sf . ${WRKSRC}/jre
 
-.include "../../lang/sun-jre15/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 9fbd6c485e4..fadc51c082e 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2007/05/04 04:53:31 markd Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/29 05:19:28 jlam Exp $
 
-DISTNAME=	jdk-6u1-linux-i586
+DISTNAME=	jdk-6u1-linux-${DIST_ARCH}
 PKGNAME=	sun-jdk6-6.0.1
 MASTER_SITES=	# empty
 
@@ -9,11 +9,12 @@ SHORT_NAME=	JDK
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
-CHECK_SHLIBS=	no	# One of the demos is broken.
 WRKSRC=		${WRKDIR}/jdk1.6.0_01
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
+.include "../../lang/sun-jre6/Makefile.common"
+
 # Remove parts that are in common with the JRE
 #
 post-extract:
@@ -27,4 +28,4 @@ post-extract:
 	done
 	${LN} -sf . ${WRKSRC}/jre
 
-.include "../../lang/sun-jre6/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index e7870fd2e73..66bdddf72d8 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2006/09/27 06:48:56 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2007/07/29 05:19:28 jlam Exp $
 
-DISTNAME=	j2re-1_3_1_19-linux-i586
+DISTNAME=	j2re-1_3_1_19-linux-${DIST_ARCH}
 PKGNAME=	sun-jre13-1.0.19
 MASTER_SITES=	# empty
 
@@ -8,8 +8,11 @@ COMMENT=	Sun's Java(tm) Runtime Environment 1.3.1
 
 SHORT=		JRE
 
-JAVA_WRAPPERS=	java keytool policytool rmid rmiregistry tnameserv
 WRKSRC=		${WRKDIR}/jre1.3.1_19
+JAVA_WRAPPERS=	java keytool policytool rmid rmiregistry tnameserv
+
+.include "../../lang/sun-jre13/Makefile.common"
+
 REQD_DIRS=	${JAVA_HOME}
 REQD_DIRS+=	${JAVA_HOME}/lib
 REQD_DIRS+=	${JAVA_HOME}/lib/images
@@ -37,4 +40,4 @@ do-configure:
 		${MV} -f $$file $$file.default;				\
 	done
 
-.include "../../lang/sun-jre13/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index 36aec2553ec..9b27f3dfee9 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2007/02/22 19:26:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33 2007/07/29 05:19:28 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=	lang java
@@ -16,29 +16,27 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
-INTERACTIVE_STAGE=	fetch
-
-CHECK_SHLIBS=	no	# expected to fail
+EMUL_PLATFORMS=		linux-i386
 
 .include "../../mk/bsd.prefs.mk"
 
-JAVA_HOME=	${LOCALBASE}/java/sun-1.3.1
-JAVA_NAME=	sun13
-
-NO_MTREE=	yes	# since we change PREFIX
-LDD=		${TRUE}
+EMUL_MODULES.linux=	locale x11
+.if !empty(EMUL_DISTRO:Msuse-[0-9].*)
+EMUL_MODULES.linux+=	compat
+.endif
 
-ONLY_FOR_PLATFORM=	*-*-i386
+DIST_ARCH.i386=		i586
+.if defined(DIST_ARCH.${EMUL_ARCH})
+DIST_ARCH=		${DIST_ARCH.${EMUL_ARCH}}
+.else
+DIST_ARCH=		${EMUL_ARCH}
+.endif
 
-.include "../../emulators/suse_linux/Makefile.application"
+INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# empty
 
-.if !defined(USE_NATIVE_LINUX)
-.  if ${SUSE_DIR_PREFIX} == "suse91"
-DEPENDS+=	suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
-.  endif
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
+JAVA_HOME=	${LOCALBASE}/java/sun-1.3.1
+JAVA_NAME=	sun13
 
 FETCH_MESSAGE= 								\
 	"The file ${DISTNAME}${EXTRACT_SUFX} containing:" 		\
@@ -58,8 +56,6 @@ post-fetch:
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
 	fi
 
-do-build:	# nothing
-
 post-build:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
@@ -68,4 +64,3 @@ do-install:
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre13/PLIST.Darwin b/lang/sun-jre13/PLIST.Darwin
deleted file mode 100644
index 87cd9f48e6a..00000000000
--- a/lang/sun-jre13/PLIST.Darwin
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2002/06/30 15:01:49 schmonz Exp $
-@comment Darwin ships with a JRE based on Sun's 1.3.1 release.
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 0ec87ead9ba..e1d3a9c58f6 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/06/22 11:21:23 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2007/07/29 05:19:29 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=	j2re-1_4_2_14-linux-i586
+DISTNAME=	j2re-1_4_2_14-linux-${DIST_ARCH}
 PKGNAME=	sun-jre14-2.14
 PKGREVISION=	1
 MASTER_SITES=	# empty
@@ -14,6 +14,9 @@ SHORT=		JRE
 WRKSRC=		${WRKDIR}/j2re1.4.2_14
 JAVA_WRAPPERS=	java keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
+
+.include "../../lang/sun-jre14/Makefile.common"
+
 REQD_DIRS=	${JAVA_HOME}
 REQD_DIRS+=	${JAVA_HOME}/lib
 REQD_DIRS+=	${JAVA_HOME}/lib/applet
@@ -42,10 +45,21 @@ PLIST_SRC=	${WRKDIR}/PLIST
 
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-1_4_2.zip
+PLIST_SUBST+=	SUN_JRE14_USE_JCE=""
+
+END_MESSAGE=								\
+	""								\
+	"The file jce_policy-1_4_2.zip must be fetched into:"		\
+	"    ${DISTDIR}/jce_policy-1_4_2.zip"				\
+	""								\
+	"Under 'Other Downloads' / 'Java Cryptography Extension'"	\
+	"click 'Download' and choose the .zip file."
+.else
+PLIST_SUBST+=	SUN_JRE14_USE_JCE="@comment "
 .endif
 
 post-extract:
-	cd ${WRKSRC} && chmod -R go-w .
+	cd ${WRKSRC} && ${CHMOD} -R go-w .
 
 do-configure:
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
@@ -55,9 +69,6 @@ do-configure:
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 	cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security
-	${SED} 's/@SUN_JRE14_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC}
-.else
-	${SED} '/@SUN_JRE14_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC}
 .endif
 
-.include "../../lang/sun-jre14/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index 8dbfd5a5125..db0d55b4c64 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2007/04/21 20:26:13 rillig Exp $
+# $NetBSD: Makefile.common,v 1.36 2007/07/29 05:19:29 jlam Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -15,31 +15,31 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
-INTERACTIVE_STAGE=	fetch
+EMUL_PLATFORMS=		linux-i386
 
 .include "../../mk/bsd.prefs.mk"
 
+EMUL_MODULES.linux=	locale x11
+.if !empty(EMUL_DISTRO:Msuse-[0-9].*)
+EMUL_MODULES.linux+=	compat
+.endif
+
+DIST_ARCH.i386=		i586
+.if defined(DIST_ARCH.${EMUL_ARCH})
+DIST_ARCH=		${DIST_ARCH.${EMUL_ARCH}}
+.else
+DIST_ARCH=		${EMUL_ARCH}
+.endif
+
+INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# empty
+
 JAVA_HOME=	${LOCALBASE}/java/sun-1.4
 JAVA_NAME=	sun14
 JAVA_UNLIMIT=	datasize
 
 MESSAGE_SUBST+=	JAVA_HOME="${JAVA_HOME}"
 
-NO_MTREE=	yes	# since we change PREFIX
-LDD=		${TRUE}
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-.  if ${SUSE_DIR_PREFIX} == "suse91"
-DEPENDS+=	suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
-.  endif
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
 FETCH_MESSAGE= 								\
 	"The file ${DISTNAME}${EXTRACT_SUFX} containing:"		\
 	"    ${COMMENT}"						\
@@ -55,26 +55,13 @@ FETCH_MESSAGE= 								\
 
 EXTRACT_ENV+=	HOME=${WRKDIR}/fake_home
 
-.if !empty(PKG_OPTIONS:Msun-jre-jce)
-END_MESSAGE=								\
-	""								\
-	"The file jce_policy-1_4_2.zip must be fetched into:"		\
-	"    ${DISTDIR}/jce_policy-1_4_2.zip"				\
-	""								\
-	"Under 'Other Downloads' / 'Java Cryptography Extension'"	\
-	"click 'Download' and choose the .zip file."
-.endif
-
 post-fetch:
 	@if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then	\
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
 	fi
 
-do-build:	# nothing
-
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index a132233a487..2eef0fc94b2 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2007/04/21 20:40:52 rillig Exp $
+@comment $NetBSD: PLIST,v 1.21 2007/07/29 05:19:29 jlam Exp $
 bin/sun14-java
 bin/sun14-keytool
 bin/sun14-orbd
@@ -188,8 +188,8 @@ java/sun-1.4/lib/plugin.jar
 java/sun-1.4/lib/psfont.properties.ja.default
 java/sun-1.4/lib/psfontj2d.properties.default
 java/sun-1.4/lib/rt.jar
-@SUN_JRE14_USE_JCE@java/sun-1.4/lib/security/COPYRIGHT.html
-@SUN_JRE14_USE_JCE@java/sun-1.4/lib/security/README.txt
+${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/COPYRIGHT.html
+${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/README.txt
 java/sun-1.4/lib/security/US_export_policy.jar
 java/sun-1.4/lib/security/cacerts
 java/sun-1.4/lib/security/java.policy
diff --git a/lang/sun-jre15/DEINSTALL b/lang/sun-jre15/DEINSTALL
new file mode 100644
index 00000000000..d7e1875783d
--- /dev/null
+++ b/lang/sun-jre15/DEINSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:30 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa
+	;;
+esac
diff --git a/lang/sun-jre15/DEINSTALL.tmpl b/lang/sun-jre15/DEINSTALL.tmpl
deleted file mode 100644
index dfd396aafd1..00000000000
--- a/lang/sun-jre15/DEINSTALL.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: DEINSTALL.tmpl,v 1.1 2004/10/09 04:19:10 tv Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa;;
-esac
diff --git a/lang/sun-jre15/INSTALL b/lang/sun-jre15/INSTALL
new file mode 100644
index 00000000000..5a0751acb2e
--- /dev/null
+++ b/lang/sun-jre15/INSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:30 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${PREFIX}/bin/sun15-java -Xshare:dump
+	;;
+esac
diff --git a/lang/sun-jre15/INSTALL.tmpl b/lang/sun-jre15/INSTALL.tmpl
deleted file mode 100644
index fc12924153a..00000000000
--- a/lang/sun-jre15/INSTALL.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: INSTALL.tmpl,v 1.1 2004/10/09 04:19:10 tv Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	${PREFIX}/bin/sun15-java -Xshare:dump;;
-esac
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index ef87e0bb432..450a9c53e4d 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/02/18 15:42:25 tv Exp $
+# $NetBSD: Makefile,v 1.43 2007/07/29 05:19:31 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -18,33 +18,22 @@ REQD_DIRS+=	${JAVA_HOME}/lib/images
 REQD_DIRS+=	${JAVA_HOME}/lib/images/cursors
 REQD_DIRS+=	${JAVA_HOME}/lib/security
 CONF_FILES=	# empty
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-DIST_ARCH=	i586
-.sinclude "sfiles-i386.mk"
-.elif ${MACHINE_ARCH} == "x86_64"
-DIST_ARCH=	amd64
-.sinclude "sfiles-x86_64.mk"
-.endif
+
+.include "../../lang/sun-jre15/Makefile.common"
+
+.sinclude "sfiles-${EMUL_ARCH}.mk"
 
 .for FILE in ${SFILES}
 CONF_FILES+=	${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
+CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sun-jre15
 PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
-HEADER_TEMPLATES+=	${WRKDIR}/HEADER.tmpl
-INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.tmpl
-DEINSTALL_TEMPLATES+=	${PKGDIR}/DEINSTALL.tmpl
-FILES_SUBST+=		JAVA_HOME=${JAVA_HOME:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-
-CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
-
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip
 PLIST_SUBST+=	SUN_JRE15_USE_JCE=""
@@ -61,7 +50,6 @@ do-configure:
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
 		${MV} -f $$file $$file.default;				\
 	done
-	@${ECHO} 'CONF_FILES="${CONF_FILES}"' >${WRKDIR}/HEADER.tmpl
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
@@ -82,4 +70,4 @@ makesfiles:
 		-name \*.cfg -o -name \*.security |			\
 	${SED} 's/^/SFILES+=	/' >> ${PKGDIR}/sfiles-${MACHINE_ARCH}.mk
 
-.include "../../lang/sun-jre15/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre15/Makefile.common b/lang/sun-jre15/Makefile.common
index ed27bfb970a..857f0c1ebce 100644
--- a/lang/sun-jre15/Makefile.common
+++ b/lang/sun-jre15/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2007/04/26 20:07:30 tv Exp $
+# $NetBSD: Makefile.common,v 1.19 2007/07/29 05:19:31 jlam Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -17,10 +17,26 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
-INTERACTIVE_STAGE=	fetch
+EMUL_PLATFORMS=		linux-i386
 
 .include "../../mk/bsd.prefs.mk"
 
+EMUL_MODULES.linux=	locale x11
+.if !empty(EMUL_DISTRO:Msuse-[0-9].*)
+EMUL_MODULES.linux+=	compat
+.endif
+
+DIST_ARCH.i386=		i586
+DIST_ARCH.x86_64=	amd64
+.if defined(DIST_ARCH.${EMUL_ARCH})
+DIST_ARCH=		${DIST_ARCH.${EMUL_ARCH}}
+.else
+DIST_ARCH=		${EMUL_ARCH}
+.endif
+
+INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# empty
+
 JAVA_HOME=	${LOCALBASE}/java/sun-1.5
 JAVA_NAME=	sun15
 JAVA_UNLIMIT=	datasize
@@ -34,20 +50,6 @@ EXTRACT_ENV+=	HOME=${WRKDIR}/fake_home
 # new class sharing in J2SE 5.0... -tvierling
 EXTRACT_ENV+=	UNPACK200_FLAGS=-Htrue
 
-NO_MTREE=	yes	# since we change PREFIX
-LDD=		${TRUE}
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-x86_64
-.  if ${SUSE_DIR_PREFIX} == "suse91"
-DEPENDS+=	suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
-.  endif
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
 FETCH_MESSAGE+=	" The file ${DISTNAME}${EXTRACT_SUFX} containing ${DOWNLOAD_NAME}"
 FETCH_MESSAGE+=	""
 FETCH_MESSAGE+=	" must be fetched into:"
@@ -64,11 +66,8 @@ post-fetch:
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
 	fi
 
-do-build:	# nothing
-
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre6/DEINSTALL b/lang/sun-jre6/DEINSTALL
new file mode 100644
index 00000000000..10194d4479f
--- /dev/null
+++ b/lang/sun-jre6/DEINSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:31 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa
+	;;
+esac
diff --git a/lang/sun-jre6/DEINSTALL.tmpl b/lang/sun-jre6/DEINSTALL.tmpl
deleted file mode 100644
index 95104a55d25..00000000000
--- a/lang/sun-jre6/DEINSTALL.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: DEINSTALL.tmpl,v 1.1 2007/02/18 19:11:27 tv Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa;;
-esac
diff --git a/lang/sun-jre6/INSTALL b/lang/sun-jre6/INSTALL
new file mode 100644
index 00000000000..e34560fae6c
--- /dev/null
+++ b/lang/sun-jre6/INSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:32 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${PREFIX}/bin/sun6-java -Xshare:dump
+	;;
+esac
diff --git a/lang/sun-jre6/INSTALL.tmpl b/lang/sun-jre6/INSTALL.tmpl
deleted file mode 100644
index 0b50223c715..00000000000
--- a/lang/sun-jre6/INSTALL.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: INSTALL.tmpl,v 1.1 2007/02/18 19:11:27 tv Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	${PREFIX}/bin/sun6-java -Xshare:dump;;
-esac
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index d4f53e125a3..1d826c95136 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/04/26 20:35:33 tv Exp $
+# $NetBSD: Makefile,v 1.3 2007/07/29 05:19:32 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -19,30 +19,22 @@ REQD_DIRS+=	${JAVA_HOME}/lib/images
 REQD_DIRS+=	${JAVA_HOME}/lib/images/cursors
 REQD_DIRS+=	${JAVA_HOME}/lib/security
 CONF_FILES=	# empty
-.include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386"
-DIST_ARCH=	i586
-.sinclude "sfiles-i386.mk"
-.endif
+.include "../../lang/sun-jre6/Makefile.common"
+
+.sinclude "sfiles-${EMUL_ARCH}.mk"
 
 .for FILE in ${SFILES}
 CONF_FILES+=	${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
+CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sun-jre6
 PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
-HEADER_TEMPLATES+=	${WRKDIR}/HEADER.tmpl
-INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.tmpl
-DEINSTALL_TEMPLATES+=	${PKGDIR}/DEINSTALL.tmpl
-FILES_SUBST+=		JAVA_HOME=${JAVA_HOME:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-
-CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
-
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-6.zip
 PLIST_SUBST+=	SUN_JRE6_USE_JCE=""
@@ -59,7 +51,6 @@ do-configure:
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
 		${MV} -f $$file $$file.default;				\
 	done
-	@${ECHO} 'CONF_FILES="${CONF_FILES}"' >${WRKDIR}/HEADER.tmpl
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
@@ -80,4 +71,4 @@ makesfiles:
 		-name \*.cfg -o -name \*.security |			\
 	${SED} 's/^/SFILES+=	/' >> ${PKGDIR}/sfiles-${MACHINE_ARCH}.mk
 
-.include "../../lang/sun-jre6/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index cb5f40eb004..bf05be4e319 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2007/06/25 23:20:58 joerg Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/07/29 05:19:32 jlam Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -16,9 +16,27 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
+EMUL_PLATFORMS=		linux-i386
+
+.include "../../mk/bsd.prefs.mk"
+
+EMUL_MODULES.linux=	locale x11
+.if !empty(EMUL_DISTRO:Msuse-[0-9].*)
+EMUL_MODULES.linux+=	compat
+.endif
+
+DIST_ARCH.i386=		i586
+.if defined(DIST_ARCH.${EMUL_ARCH})
+DIST_ARCH=		${DIST_ARCH.${EMUL_ARCH}}
+.else
+DIST_ARCH=		${EMUL_ARCH}
+.endif
+
+# On DragonFly, this just seems to coredump and/or hang around.
 NOT_FOR_PLATFORM=	DragonFly-*-*
 
 INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# empty
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,20 +54,6 @@ EXTRACT_ENV+=	HOME=${WRKDIR}/fake_home
 # new class sharing in Java 5+... -tvierling
 EXTRACT_ENV+=	UNPACK200_FLAGS=-Htrue
 
-NO_MTREE=	yes	# since we change PREFIX
-LDD=		${TRUE}
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-ONLY_FOR_PLATFORM=	*-*-i386
-.  if ${SUSE_DIR_PREFIX} == "suse91"
-DEPENDS+=	suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
-.  endif
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
 FETCH_MESSAGE+=	" The file ${DISTNAME}${EXTRACT_SUFX} containing ${DOWNLOAD_NAME}"
 FETCH_MESSAGE+=	""
 FETCH_MESSAGE+=	" must be fetched into:"
@@ -66,11 +70,8 @@ post-fetch:
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
 	fi
 
-do-build:	# nothing
-
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jre6/PLIST.i386 b/lang/sun-jre6/PLIST.linux-i386
index 8db176eb5a5..e3273c91caf 100644
--- a/lang/sun-jre6/PLIST.i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.2 2007/04/26 20:35:33 tv Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/29 05:19:33 jlam Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool