3 files changed, 23 insertions, 27 deletions
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.