Tue Jun 3 03:20:16 2014 UTC ()
Bump PKGREVISION

Fix PR pkg/48246 again.
Add rhino.jar to library path.
And remove stale patch


(ryoon)
diff -r1.66 -r1.67 pkgsrc/lang/openjdk7/Makefile
diff -r1.46 -r1.47 pkgsrc/lang/openjdk7/distinfo
diff -r1.1 -r0 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_share_vm_code_relocInfo.hpp
diff -r0 -r1.3 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_os.cpp
cvs diff -r1.66 -r1.67 pkgsrc/lang/openjdk7/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/Makefile 2014/06/01 17:55:33 1.66
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2014/06/03 03:20:15 1.67
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.66 2014/06/01 17:55:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.67 2014/06/03 03:20:15 ryoon Exp $
2 2
3DISTNAME= openjdk-1.7.55-20140501 3DISTNAME= openjdk-1.7.55-20140501
4PKGNAME= openjdk7-1.7.55 4PKGNAME= openjdk7-1.7.55
5PKGREVISION= 1 5PKGREVISION= 2
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
10# Note: Remember to set sun-jre-jce when updating distinfo 10# Note: Remember to set sun-jre-jce when updating distinfo
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://openjdk.java.net/ 13HOMEPAGE= http://openjdk.java.net/
14COMMENT= Open-source implementation of the Java Platform, Standard Edition 14COMMENT= Open-source implementation of the Java Platform, Standard Edition
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17DISTFILES= ${DEFAULT_DISTFILES} 17DISTFILES= ${DEFAULT_DISTFILES}
18EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 18EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -32,27 +32,27 @@ JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} @@ -32,27 +32,27 @@ JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
32JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \ 32JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \
33 policytool rmid rmiregistry servertool tnameserv 33 policytool rmid rmiregistry servertool tnameserv
34 34
35MAKE_ENV+= PKGSRC_ZIPEXE=${TOOLS_PATH.zip} 35MAKE_ENV+= PKGSRC_ZIPEXE=${TOOLS_PATH.zip}
36MAKE_ENV+= PKGSRC_UNZIP=${TOOLS_PATH.unzip} 36MAKE_ENV+= PKGSRC_UNZIP=${TOOLS_PATH.unzip}
37MAKE_ENV+= PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx 37MAKE_ENV+= PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx
38 38
39DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf 39DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
40#DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf 40#DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf
41#DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf 41#DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf
42 42
43NO_CONFIGURE= yes 43NO_CONFIGURE= yes
44USE_LANGUAGES= c c++ 44USE_LANGUAGES= c c++
45USE_TOOLS+= gmake pax unzip:run zip:run patch 45USE_TOOLS+= gmake pax unzip:run zip:run # patch
46UNLIMIT_RESOURCES= datasize stacksize 46UNLIMIT_RESOURCES= datasize stacksize
47WRKSRC= ${WRKDIR}/openjdk 47WRKSRC= ${WRKDIR}/openjdk
48 48
49BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR} 49BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
50PREPEND_PATH+= ${ALT_BOOTDIR}/bin 50PREPEND_PATH+= ${ALT_BOOTDIR}/bin
51 51
52MAKE_ENV+= ALT_BOOTDIR=${ALT_BOOTDIR} 52MAKE_ENV+= ALT_BOOTDIR=${ALT_BOOTDIR}
53MAKE_ENV+= ALT_DROPS_DIR=${DISTDIR}/${DIST_SUBDIR} 53MAKE_ENV+= ALT_DROPS_DIR=${DISTDIR}/${DIST_SUBDIR}
54MAKE_ENV+= ALT_FREETYPE_LIB_PATH=${BUILDLINK_PREFIX.freetype2}/lib 54MAKE_ENV+= ALT_FREETYPE_LIB_PATH=${BUILDLINK_PREFIX.freetype2}/lib
55MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include 55MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include
56MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include 56MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include
57MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin 57MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin
58MAKE_ENV+= ALT_PACKAGE_PATH=${PREFIX} 58MAKE_ENV+= ALT_PACKAGE_PATH=${PREFIX}
cvs diff -r1.46 -r1.47 pkgsrc/lang/openjdk7/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/distinfo 2014/06/01 17:55:33 1.46
+++ pkgsrc/lang/openjdk7/Attic/distinfo 2014/06/03 03:20:15 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.46 2014/06/01 17:55:33 wiz Exp $ 1$NetBSD: distinfo,v 1.47 2014/06/03 03:20:15 ryoon Exp $
2 2
3SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 3SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
4RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f 4RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
5Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes 5Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
6SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = d9e3e83dd9664cfe1dcd4841c082db3f559af922 6SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = d9e3e83dd9664cfe1dcd4841c082db3f559af922
7RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = a23e122b76b3dfed5be7bef3388041649df0b346 7RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = a23e122b76b3dfed5be7bef3388041649df0b346
8Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes 8Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes
9SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2 9SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2
10RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7 10RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7
11Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes 11Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes
12SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4 12SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4
13RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe 13RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe
14Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes 14Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes
@@ -107,26 +107,27 @@ SHA1 (patch-hotspot_make_solaris_makefil @@ -107,26 +107,27 @@ SHA1 (patch-hotspot_make_solaris_makefil
107SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5 107SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5
108SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43 108SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43
109SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = d72c16b90479c5df0dc33f3b30916b0552dcc17a 109SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = d72c16b90479c5df0dc33f3b30916b0552dcc17a
110SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6 110SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
111SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c 111SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
112SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41 112SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41
113SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b 113SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b
114SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666 114SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666
115SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2 115SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2
116SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8 116SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8
117SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 117SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
118SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68 118SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68
119SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553 119SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553
 120SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b
120SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2 121SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2
121SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e 122SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
122SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b 123SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b
123SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 124SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46
124SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664 125SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664
125SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 126SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3
126SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50 127SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50
127SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 128SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70
128SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6 129SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6
129SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239 130SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239
130SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2 131SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2
131SHA1 (patch-jdk_make_common_shared_Defs-java.gmk) = f7c11d33da19e9f255fde7cab387c91e0287509c 132SHA1 (patch-jdk_make_common_shared_Defs-java.gmk) = f7c11d33da19e9f255fde7cab387c91e0287509c
132SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91 133SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91
File Deleted: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_share_vm_code_relocInfo.hpp
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_share_vm_runtime_os.cpp
$NetBSD: patch-hotspot_src_share_vm_runtime_os.cpp,v 1.3 2014/06/03 03:20:15 ryoon Exp $

--- hotspot/src/share/vm/runtime/os.cpp.orig	2014-05-01 13:10:09.000000000 +0000
+++ hotspot/src/share/vm/runtime/os.cpp
@@ -1132,6 +1132,7 @@ bool os::set_boot_path(char fileSep, cha
         "%/lib/jce.jar:"
         "%/lib/charsets.jar:"
         "%/lib/jfr.jar:"
+        "%/lib/rhino.jar:"
         "%/classes";
     char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
     if (sysclasspath == NULL) return false;