7 files changed, 41 insertions, 47 deletions
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