diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-22 14:03:47 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-22 14:03:47 +0000 |
| commit | e825b83b6876780513e14d47a11bc628b7ab4e26 (patch) | |
| tree | 55f283723642b386084f39d8eadd32356104745c /lang/sun-jre14 | |
| parent | 66da55ca7be2ee2293f1341f8b7d8249c9a4af71 (diff) | |
| download | pkgsrc-e825b83b6876780513e14d47a11bc628b7ab4e26.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-jre14')
| -rw-r--r-- | lang/sun-jre14/Makefile | 4 | ||||
| -rw-r--r-- | lang/sun-jre14/Makefile.common | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile index f03a2eb0b85..bf5cb162381 100644 --- a/lang/sun-jre14/Makefile +++ b/lang/sun-jre14/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.43 2007/08/19 11:53:33 obache Exp $ +# $NetBSD: Makefile,v 1.44 2007/08/22 14:03:48 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce DISTNAME= j2re-1_4_2_14-linux-${DIST_ARCH} PKGNAME= sun-jre14-2.14 -PKGREVISION= 1 +PKGREVISION= 2 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.2 diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common index db0d55b4c64..b0f505ebbc2 100644 --- a/lang/sun-jre14/Makefile.common +++ b/lang/sun-jre14/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.36 2007/07/29 05:19:29 jlam Exp $ +# $NetBSD: Makefile.common,v 1.37 2007/08/22 14:03:48 jlam Exp $ CATEGORIES= lang java EXTRACT_SUFX= .bin @@ -19,10 +19,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}) |