1 files changed, 18 insertions, 19 deletions
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"