[pkgsrc/trunk]: pkgsrc/lang Fix error that happened during conversion to the ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9aea020bb6e4
branches:  trunk
changeset: 532517:9aea020bb6e4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Aug 22 14:03:47 2007 +0000

description:
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:

 lang/sun-jdk13/Makefile        |  3 ++-
 lang/sun-jdk14/Makefile        |  3 ++-
 lang/sun-jdk15/Makefile        |  3 ++-
 lang/sun-jdk6/Makefile         |  3 ++-
 lang/sun-jre13/Makefile        |  3 ++-
 lang/sun-jre13/Makefile.common |  7 ++-----
 lang/sun-jre14/Makefile        |  4 ++--
 lang/sun-jre14/Makefile.common |  7 ++-----
 lang/sun-jre15/Makefile        |  4 ++--
 lang/sun-jre15/Makefile.common |  7 ++-----
 lang/sun-jre6/Makefile         |  3 ++-
 lang/sun-jre6/Makefile.common  |  7 ++-----
 12 files changed, 24 insertions(+), 30 deletions(-)

diffs (196 lines):

diff -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jdk13/Makefile
--- a/lang/sun-jdk13/Makefile   Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jdk13/Makefile   Wed Aug 22 14:03:47 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/07/29 05:19:27 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2007/08/22 14:03:47 jlam Exp $
 
 DISTNAME=      j2sdk-1_3_1_19-linux-${DIST_ARCH}
 PKGNAME=       sun-jdk13-1.0.19
+PKGREVISION=   1
 MASTER_SITES=  # empty
 
 COMMENT=       Sun's Java(tm) Development Kit 1.3.1
diff -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jdk14/Makefile
--- a/lang/sun-jdk14/Makefile   Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jdk14/Makefile   Wed Aug 22 14:03:47 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2007/07/29 05:19:28 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2007/08/22 14:03:47 jlam Exp $
 
 DISTNAME=      j2sdk-1_4_2_14-linux-${DIST_ARCH}
 PKGNAME=       sun-jdk14-2.14
+PKGREVISION=   1
 MASTER_SITES=  # empty
 
 COMMENT=       Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
diff -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jdk15/Makefile
--- a/lang/sun-jdk15/Makefile   Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jdk15/Makefile   Wed Aug 22 14:03:47 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/08/08 16:59:10 abs Exp $
+# $NetBSD: Makefile,v 1.27 2007/08/22 14:03:47 jlam Exp $
 
 DISTNAME=      jdk-1_5_0_12-linux-${DIST_ARCH}
 PKGNAME=       sun-jdk15-5.0.12
+PKGREVISION=   1
 MASTER_SITES=  # empty
 
 SHORT_NAME=    JDK
diff -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jdk6/Makefile
--- a/lang/sun-jdk6/Makefile    Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jdk6/Makefile    Wed Aug 22 14:03:47 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/07/29 05:19:28 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/08/22 14:03:48 jlam Exp $
 
 DISTNAME=      jdk-6u1-linux-${DIST_ARCH}
 PKGNAME=       sun-jdk6-6.0.1
+PKGREVISION=   1
 MASTER_SITES=  # empty
 
 DOWNLOAD_NAME= JDK 6u1
diff -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jre13/Makefile
--- a/lang/sun-jre13/Makefile   Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jre13/Makefile   Wed Aug 22 14:03:47 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2007/07/29 05:19:28 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2007/08/22 14:03:48 jlam Exp $
 
 DISTNAME=      j2re-1_3_1_19-linux-${DIST_ARCH}
 PKGNAME=       sun-jre13-1.0.19
+PKGREVISION=   1
 MASTER_SITES=  # empty
 
 COMMENT=       Sun's Java(tm) Runtime Environment 1.3.1
diff -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jre13/Makefile.common
--- a/lang/sun-jre13/Makefile.common    Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jre13/Makefile.common    Wed Aug 22 14:03:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2007/07/29 05:19:28 jlam Exp $
+# $NetBSD: Makefile.common,v 1.34 2007/08/22 14:03:48 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=    lang java
@@ -20,10 +20,7 @@
 
 .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})
diff -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jre14/Makefile
--- a/lang/sun-jre14/Makefile   Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jre14/Makefile   Wed Aug 22 14:03:47 2007 +0000
@@ -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 -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jre14/Makefile.common
--- a/lang/sun-jre14/Makefile.common    Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jre14/Makefile.common    Wed Aug 22 14:03:47 2007 +0000
@@ -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 @@
 
 .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})
diff -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile   Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jre15/Makefile   Wed Aug 22 14:03:47 2007 +0000
@@ -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 -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jre15/Makefile.common
--- a/lang/sun-jre15/Makefile.common    Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jre15/Makefile.common    Wed Aug 22 14:03:47 2007 +0000
@@ -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 @@
 
 .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
diff -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jre6/Makefile
--- a/lang/sun-jre6/Makefile    Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jre6/Makefile    Wed Aug 22 14:03:47 2007 +0000
@@ -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 -r 9a08328c36ec -r 9aea020bb6e4 lang/sun-jre6/Makefile.common
--- a/lang/sun-jre6/Makefile.common     Wed Aug 22 12:25:46 2007 +0000
+++ b/lang/sun-jre6/Makefile.common     Wed Aug 22 14:03:47 2007 +0000
@@ -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 @@
 
 .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})