From ae8156233368d03eca4a22b1a759f2ec2d8bd611 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 22 Aug 2007 14:03:47 +0000
Subject: Fix error that happened during conversion to the emulator framework:
 the Sun JDK/JRE packages require the "compat" Linux module, so make that a
 hard requirement in EMUL_MODULES.linux.

Bump the PKGREVISION for sun-{jdk,jre}{13,14,15,6}.
---
 lang/sun-jre6/Makefile        | 3 ++-
 lang/sun-jre6/Makefile.common | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'lang/sun-jre6')

diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 23a492b696b..ce93f76cd1e 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2007/08/02 17:55:17 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/08/22 14:03:49 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=	jre-6u1-linux-${DIST_ARCH}
 PKGNAME=	sun-jre6-6.0.1
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u1
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index bf05be4e319..c8832d7e561 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2007/07/29 05:19:32 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/08/22 14:03:49 jlam Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -20,10 +20,7 @@ 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
+EMUL_MODULES.linux=	compat locale x11
 
 DIST_ARCH.i386=		i586
 .if defined(DIST_ARCH.${EMUL_ARCH})
-- 
cgit v1.2.3