Tue May 5 16:20:08 2015 UTC ()
Add jps to the list of wrapped java binaries. Bump PKGREVISION


(abs)
diff -r1.98 -r1.99 pkgsrc/lang/openjdk7/Makefile
diff -r1.12 -r1.13 pkgsrc/lang/openjdk8/Makefile
diff -r1.35 -r1.36 pkgsrc/lang/sun-jdk6/Makefile
diff -r1.15 -r1.16 pkgsrc/lang/sun-jdk7/Makefile
cvs diff -r1.98 -r1.99 pkgsrc/lang/openjdk7/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/Makefile 2015/04/27 19:24:17 1.98
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2015/05/05 16:20:08 1.99
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.98 2015/04/27 19:24:17 jperkin Exp $ 1# $NetBSD: Makefile,v 1.99 2015/05/05 16:20:08 abs Exp $
2 2
3DISTNAME= openjdk-1.7.76-20150127 3DISTNAME= openjdk-1.7.76-20150127
4PKGNAME= openjdk7-1.7.76 4PKGNAME= openjdk7-1.7.76
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openjdk.java.net/ 11HOMEPAGE= http://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 12COMMENT= Open-source implementation of the Java Platform, Standard Edition
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15DISTFILES= ${DEFAULT_DISTFILES} 15DISTFILES= ${DEFAULT_DISTFILES}
16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
17 17
18DIST_SUBDIR= openjdk7 18DIST_SUBDIR= openjdk7
19 19
20JAVA_NAME= openjdk7 20JAVA_NAME= openjdk7
21JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 21JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
22JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \ 22JAVA_WRAPPERS= jar java javac javadoc javah javap jps keytool orbd \
23 policytool rmid rmiregistry servertool tnameserv 23 policytool rmid rmiregistry servertool tnameserv
24 24
25MAKE_ENV+= PKGSRC_ZIPEXE=${TOOLS_PATH.zip} 25MAKE_ENV+= PKGSRC_ZIPEXE=${TOOLS_PATH.zip}
26MAKE_ENV+= PKGSRC_UNZIP=${TOOLS_PATH.unzip} 26MAKE_ENV+= PKGSRC_UNZIP=${TOOLS_PATH.unzip}
27MAKE_ENV+= PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx 27MAKE_ENV+= PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx
28 28
29BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts 29BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
30 30
31NO_CONFIGURE= yes 31NO_CONFIGURE= yes
32USE_LANGUAGES= c c++ 32USE_LANGUAGES= c c++
33USE_TOOLS+= gmake pax unzip:run zip:run # patch 33USE_TOOLS+= gmake pax unzip:run zip:run # patch
34UNLIMIT_RESOURCES= datasize stacksize 34UNLIMIT_RESOURCES= datasize stacksize
35WRKSRC= ${WRKDIR}/openjdk 35WRKSRC= ${WRKDIR}/openjdk
cvs diff -r1.12 -r1.13 pkgsrc/lang/openjdk8/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/Makefile 2015/03/05 16:35:49 1.12
+++ pkgsrc/lang/openjdk8/Makefile 2015/05/05 16:20:08 1.13
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.12 2015/03/05 16:35:49 tnn Exp $ 1# $NetBSD: Makefile,v 1.13 2015/05/05 16:20:08 abs Exp $
2 2
3DISTNAME= openjdk-1.8.31-20150207 3DISTNAME= openjdk-1.8.31-20150207
4PKGNAME= openjdk8-1.8.31 4PKGNAME= openjdk8-1.8.31
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openjdk.java.net/ 11HOMEPAGE= http://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 12COMMENT= Open-source implementation of the Java Platform, Standard Edition
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15DISTFILES= ${DEFAULT_DISTFILES} 15DISTFILES= ${DEFAULT_DISTFILES}
16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
17 17
18# Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles 18# Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles
19DIST_SUBDIR= openjdk7 19DIST_SUBDIR= openjdk7
20 20
21JAVA_NAME= openjdk8 21JAVA_NAME= openjdk8
22JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 22JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
23JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \ 23JAVA_WRAPPERS= jar java javac javadoc javah javap jps keytool orbd \
24 policytool rmid rmiregistry servertool tnameserv 24 policytool rmid rmiregistry servertool tnameserv
25 25
26BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts 26BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
27 27
28GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
29CONFIGURE_SCRIPT= common/autoconf/configure 29CONFIGURE_SCRIPT= common/autoconf/configure
30CONFIG_SHELL= bash 30CONFIG_SHELL= bash
31CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub 31CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub
32CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess 32CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess
33CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess 33CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess
34USE_LANGUAGES= c c++ 34USE_LANGUAGES= c c++
35USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run 35USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run
36UNLIMIT_RESOURCES= datasize stacksize 36UNLIMIT_RESOURCES= datasize stacksize
cvs diff -r1.35 -r1.36 pkgsrc/lang/sun-jdk6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/sun-jdk6/Attic/Makefile 2013/09/07 09:11:52 1.35
+++ pkgsrc/lang/sun-jdk6/Attic/Makefile 2015/05/05 16:20:08 1.36
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.35 2013/09/07 09:11:52 ryoon Exp $ 1# $NetBSD: Makefile,v 1.36 2015/05/05 16:20:08 abs Exp $
2 2
3DISTNAME= jdk-6u45-${DIST_OS}-${DIST_ARCH} 3DISTNAME= jdk-6u45-${DIST_OS}-${DIST_ARCH}
4PKGNAME= sun-jdk6-6.0.45 4PKGNAME= sun-jdk6-6.0.45
5PKGREVISION= 1 5PKGREVISION= 2
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7 7
8LICENSE= sun-jdk6-license 8LICENSE= sun-jdk6-license
9 9
10DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6 10DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
11 11
12WRKSRC= ${WRKDIR}/jdk1.6.0_45 12WRKSRC= ${WRKDIR}/jdk1.6.0_45
13JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ 13JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
14 javac javadoc javah javap jdb rmic serialver 14 javac javadoc javah javap jdb jps rmic serialver
15 15
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18.include "../../lang/sun-jre6/Makefile.common" 18.include "../../lang/sun-jre6/Makefile.common"
19 19
20.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 20.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
21CHECK_SHLIBS_SUPPORTED= no 21CHECK_SHLIBS_SUPPORTED= no
22.endif 22.endif
23 23
24# The 64-bit Solaris downloads for some inexplicable reason only contain 24# The 64-bit Solaris downloads for some inexplicable reason only contain
25# the additional 64-bit files, and you need the main 32-bit file too. 25# the additional 64-bit files, and you need the main 32-bit file too.
26.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "x86_64" 26.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "x86_64"
27DISTFILES= ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/x64/i586/} 27DISTFILES= ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/x64/i586/}
cvs diff -r1.15 -r1.16 pkgsrc/lang/sun-jdk7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/sun-jdk7/Makefile 2014/03/02 09:53:41 1.15
+++ pkgsrc/lang/sun-jdk7/Makefile 2015/05/05 16:20:08 1.16
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: Makefile,v 1.15 2014/03/02 09:53:41 obache Exp $ 1# $NetBSD: Makefile,v 1.16 2015/05/05 16:20:08 abs Exp $
2 2
3# Note: This must be kept in sync with the sun-jre7 package 3# Note: This must be kept in sync with the sun-jre7 package
4# Note: make sure you include sums for both the x86_64 and the x86_32 4# Note: make sure you include sums for both the x86_64 and the x86_32
5# in distinfo (make makesum will eat one of them) 5# in distinfo (make makesum will eat one of them)
6 6
7DISTNAME= jdk-7u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH} 7DISTNAME= jdk-7u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH}
8PKGNAME= sun-jdk7-7.0.${UPDATE_NUMBER} 8PKGNAME= sun-jdk7-7.0.${UPDATE_NUMBER}
 9PKGREVISION= 1
9MASTER_SITES= # empty 10MASTER_SITES= # empty
10 11
11LICENSE= oracle-binary-code-license 12LICENSE= oracle-binary-code-license
12 13
13DOWNLOAD_NAME= Java Development Kit (JDK) 7u${UPDATE_NUMBER} 14DOWNLOAD_NAME= Java Development Kit (JDK) 7u${UPDATE_NUMBER}
14 15
15DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre7 16DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre7
16 17
17WRKSRC= ${WRKDIR}/jdk1.7.0_${UPDATE_NUMBER} 18WRKSRC= ${WRKDIR}/jdk1.7.0_${UPDATE_NUMBER}
18JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ 19JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
19 javac javadoc javah javap jdb rmic serialver 20 javac javadoc javah javap jdb jps rmic serialver
20 21
21MAKE_JOBS_SAFE= no 22MAKE_JOBS_SAFE= no
22 23
23.include "../../lang/sun-jre7/Makefile.common" 24.include "../../lang/sun-jre7/Makefile.common"
24 25
25.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 26.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
26CHECK_SHLIBS_SUPPORTED= no 27CHECK_SHLIBS_SUPPORTED= no
27.endif 28.endif
28 29
29# The 64-bit Solaris downloads for some inexplicable reason only contain 30# The 64-bit Solaris downloads for some inexplicable reason only contain
30# the additional 64-bit files, and you need the main 32-bit file too. 31# the additional 64-bit files, and you need the main 32-bit file too.
31.if ${EMUL_OPSYS} == "solaris" && ${EMUL_ARCH} == "x86_64" 32.if ${EMUL_OPSYS} == "solaris" && ${EMUL_ARCH} == "x86_64"
32DISTFILES= ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/x64/i586/} 33DISTFILES= ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/x64/i586/}