diff options
| author | jlam <jlam> | 2007-08-22 14:03:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2007-08-22 14:03:47 +0000 |
| commit | ae8156233368d03eca4a22b1a759f2ec2d8bd611 (patch) | |
| tree | 55f283723642b386084f39d8eadd32356104745c /lang/sun-jre6 | |
| parent | d3aa9b0842f50eeadadbb1e927f71c9a81786a86 (diff) | |
| download | pkgsrc-ae8156233368d03eca4a22b1a759f2ec2d8bd611.tar.gz | |
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}.
Diffstat (limited to 'lang/sun-jre6')
| -rw-r--r-- | lang/sun-jre6/Makefile | 3 | ||||
| -rw-r--r-- | lang/sun-jre6/Makefile.common | 7 |
2 files changed, 4 insertions, 6 deletions
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}) |