diff options
-rw-r--r-- | lang/sun-jdk13/Makefile | 3 | ||||
-rw-r--r-- | lang/sun-jdk14/Makefile | 3 | ||||
-rw-r--r-- | lang/sun-jdk15/Makefile | 3 | ||||
-rw-r--r-- | lang/sun-jdk6/Makefile | 3 | ||||
-rw-r--r-- | lang/sun-jre13/Makefile | 3 | ||||
-rw-r--r-- | lang/sun-jre13/Makefile.common | 7 | ||||
-rw-r--r-- | lang/sun-jre14/Makefile | 4 | ||||
-rw-r--r-- | lang/sun-jre14/Makefile.common | 7 | ||||
-rw-r--r-- | lang/sun-jre15/Makefile | 4 | ||||
-rw-r--r-- | lang/sun-jre15/Makefile.common | 7 | ||||
-rw-r--r-- | lang/sun-jre6/Makefile | 3 | ||||
-rw-r--r-- | lang/sun-jre6/Makefile.common | 7 |
12 files changed, 24 insertions, 30 deletions
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile index 7f8f83c5bc5..b897d5bc12b 100644 --- a/lang/sun-jdk13/Makefile +++ b/lang/sun-jdk13/Makefile @@ -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 --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile index 05ad4435790..5a32902364d 100644 --- a/lang/sun-jdk14/Makefile +++ b/lang/sun-jdk14/Makefile @@ -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 --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile index 23c2e26594e..5abcde80819 100644 --- a/lang/sun-jdk15/Makefile +++ b/lang/sun-jdk15/Makefile @@ -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 --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile index fadc51c082e..333f9c617da 100644 --- a/lang/sun-jdk6/Makefile +++ b/lang/sun-jdk6/Makefile @@ -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 --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile index 66bdddf72d8..efcab709bdd 100644 --- a/lang/sun-jre13/Makefile +++ b/lang/sun-jre13/Makefile @@ -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 --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common index 9b27f3dfee9..864d50e6afc 100644 --- a/lang/sun-jre13/Makefile.common +++ b/lang/sun-jre13/Makefile.common @@ -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 @@ 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}) 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}) 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 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}) |