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 | 505cbc44409569125c2837fb29a3d053936fd2a4 (patch) | |
| tree | 55f283723642b386084f39d8eadd32356104745c /lang/sun-jre15 | |
| parent | 6b0514b57adb3715a418d0b9846a5f1e9a56af2a (diff) | |
| download | pkgsrc-505cbc44409569125c2837fb29a3d053936fd2a4.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-jre15')
| -rw-r--r-- | lang/sun-jre15/Makefile | 4 | ||||
| -rw-r--r-- | lang/sun-jre15/Makefile.common | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index 0aa832511b7..a67202cc626 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.46 2007/08/18 17:31:50 veego Exp $ +# $NetBSD: Makefile,v 1.47 2007/08/22 14:03:48 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce DISTNAME= jre-1_5_0_12-linux-${DIST_ARCH} PKGNAME= sun-jre15-5.0.12 -PKGREVISION= 1 +PKGREVISION= 2 MASTER_SITES= # empty SHORT_NAME= JRE diff --git a/lang/sun-jre15/Makefile.common b/lang/sun-jre15/Makefile.common index da2da64924a..fbc1a0aea43 100644 --- a/lang/sun-jre15/Makefile.common +++ b/lang/sun-jre15/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2007/07/30 14:03:18 jlam Exp $ +# $NetBSD: Makefile.common,v 1.21 2007/08/22 14:03:48 jlam Exp $ CATEGORIES= lang java COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME} @@ -21,10 +21,7 @@ EMUL_PLATFORMS= linux-i386 linux-x86_64 .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 DIST_ARCH.x86_64= amd64 |