Tue Jan 14 17:24:42 2014 UTC ()
Add a compat sem_timedwait() for __NetBSD_Version__ < 699000400 to fix
build on NetBSD 6 (and possibly earlier)
No change for systems which would have built anyway, so no PKGREVISION bump


(abs)
diff -r1.38 -r1.39 pkgsrc/lang/openjdk7/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/options.mk
diff -r1.10 -r1.11 pkgsrc/lang/openjdk7/patches/patch-aa
cvs diff -r1.38 -r1.39 pkgsrc/lang/openjdk7/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/distinfo 2014/01/08 13:09:38 1.38
+++ pkgsrc/lang/openjdk7/Attic/distinfo 2014/01/14 17:24:42 1.39
@@ -1,164 +1,164 @@ @@ -1,164 +1,164 @@
1$NetBSD: distinfo,v 1.38 2014/01/08 13:09:38 jperkin Exp $ 1$NetBSD: distinfo,v 1.39 2014/01/14 17:24:42 abs 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
15SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 08d0003078162c038ed67bb3d59cd2e4073cf4dd 15SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 08d0003078162c038ed67bb3d59cd2e4073cf4dd
16RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 4ea4bd473635d99d9740c10bb815e019f7ad09d5 16RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 4ea4bd473635d99d9740c10bb815e019f7ad09d5
17Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 3422188 bytes 17Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 3422188 bytes
18SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = f7578bfdfc7a952cd83306c97fa87ebf921a0461 18SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = f7578bfdfc7a952cd83306c97fa87ebf921a0461
19RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 74c570fa6ab6e175871229acc45edbb1e9c759ce 19RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 74c570fa6ab6e175871229acc45edbb1e9c759ce
20Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 3837091 bytes 20Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 3837091 bytes
21SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = e9153bab724d415b30b42e320a878aeceb71ed64 21SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = e9153bab724d415b30b42e320a878aeceb71ed64
22RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 8d9742b9288ed5eb965bc7fd50fe709f047665af 22RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 8d9742b9288ed5eb965bc7fd50fe709f047665af
23Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 3486566 bytes 23Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 3486566 bytes
24SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 60ff45ed4c027209fc855919227bb175c60ede08 24SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 60ff45ed4c027209fc855919227bb175c60ede08
25RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = e98c534a6804ecd794d1ffd8975e0c705cf8938c 25RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = e98c534a6804ecd794d1ffd8975e0c705cf8938c
26Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 4082640 bytes 26Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 4082640 bytes
27SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = baa7e0b2010c1cf918a88654b36db39935e532a4 27SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = baa7e0b2010c1cf918a88654b36db39935e532a4
28RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 791f8db986905f2477adcb1784fea957cd9501d2 28RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 791f8db986905f2477adcb1784fea957cd9501d2
29Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 3622007 bytes 29Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 3622007 bytes
30SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = e18704c72646ef4f66e37ea7a2feb8dad9008079 30SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = e18704c72646ef4f66e37ea7a2feb8dad9008079
31RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = b661b7a434d7d3c27614a2527b0fb2ed065d1f05 31RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = b661b7a434d7d3c27614a2527b0fb2ed065d1f05
32Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = 20011172 bytes 32Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = 20011172 bytes
33SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = d7994e2a485c3e4eca44e81f4215bb4c35b54d04 33SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = d7994e2a485c3e4eca44e81f4215bb4c35b54d04
34RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = bb9ba4fc83ec276c5e8decd53a6523eca1f6b819 34RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = bb9ba4fc83ec276c5e8decd53a6523eca1f6b819
35Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = 21142004 bytes 35Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = 21142004 bytes
36SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = b9445fa4cc4674ba8b9330e45ae65c597f5fca10 36SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = b9445fa4cc4674ba8b9330e45ae65c597f5fca10
37RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = aa2443fa202f3ed8694b6d0e4031622b5da52283 37RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = aa2443fa202f3ed8694b6d0e4031622b5da52283
38Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = 20874080 bytes 38Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = 20874080 bytes
39SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = aa44be237fac1b7c9b4044ea32cab9a0c2fb3ab2 39SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = aa44be237fac1b7c9b4044ea32cab9a0c2fb3ab2
40RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 5422564d6a5ba590b0906fdbb9de20091d7dabf2 40RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 5422564d6a5ba590b0906fdbb9de20091d7dabf2
41Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 21676584 bytes 41Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 21676584 bytes
42SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890 42SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890
43RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770 43RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770
44Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes 44Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
45SHA1 (openjdk7/icedtea-web-81dfc0552a1c.tar.bz2) = e3a00a6a4a18b7c1044e8116f1b86e737c6504de 45SHA1 (openjdk7/icedtea-web-81dfc0552a1c.tar.bz2) = e3a00a6a4a18b7c1044e8116f1b86e737c6504de
46RMD160 (openjdk7/icedtea-web-81dfc0552a1c.tar.bz2) = 0c3af827f9c63ba3a7c3f98bb708afd7da8b4b68 46RMD160 (openjdk7/icedtea-web-81dfc0552a1c.tar.bz2) = 0c3af827f9c63ba3a7c3f98bb708afd7da8b4b68
47Size (openjdk7/icedtea-web-81dfc0552a1c.tar.bz2) = 1051891 bytes 47Size (openjdk7/icedtea-web-81dfc0552a1c.tar.bz2) = 1051891 bytes
48SHA1 (openjdk7/icedtea7-02bbff3d71ff.tar.bz2) = ada3415834bfac083a84658157f7031a9ebc64fe 48SHA1 (openjdk7/icedtea7-02bbff3d71ff.tar.bz2) = ada3415834bfac083a84658157f7031a9ebc64fe
49RMD160 (openjdk7/icedtea7-02bbff3d71ff.tar.bz2) = 7b3d6f34bf1b20acd44bd8bd2094d3f2c6f576f5 49RMD160 (openjdk7/icedtea7-02bbff3d71ff.tar.bz2) = 7b3d6f34bf1b20acd44bd8bd2094d3f2c6f576f5
50Size (openjdk7/icedtea7-02bbff3d71ff.tar.bz2) = 3796898 bytes 50Size (openjdk7/icedtea7-02bbff3d71ff.tar.bz2) = 3796898 bytes
51SHA1 (openjdk7/jaxp145_01.zip) = 106db88c8e53abb1a064e83d41cc7acd16b7713c 51SHA1 (openjdk7/jaxp145_01.zip) = 106db88c8e53abb1a064e83d41cc7acd16b7713c
52RMD160 (openjdk7/jaxp145_01.zip) = af91b95e7eb7a68fc62f450dc7b5fe5c2be4a228 52RMD160 (openjdk7/jaxp145_01.zip) = af91b95e7eb7a68fc62f450dc7b5fe5c2be4a228
53Size (openjdk7/jaxp145_01.zip) = 6389175 bytes 53Size (openjdk7/jaxp145_01.zip) = 6389175 bytes
54SHA1 (openjdk7/jdk7-jaf-2010_08_19.zip) = 63ea970dcf129fbbba39a132d8f71add19fbf1f0 54SHA1 (openjdk7/jdk7-jaf-2010_08_19.zip) = 63ea970dcf129fbbba39a132d8f71add19fbf1f0
55RMD160 (openjdk7/jdk7-jaf-2010_08_19.zip) = fbadfbb781dc2aa8cfa384b8d5cd618522e55128 55RMD160 (openjdk7/jdk7-jaf-2010_08_19.zip) = fbadfbb781dc2aa8cfa384b8d5cd618522e55128
56Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes 56Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes
57SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be 57SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be
58RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818 58RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818
59Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes 59Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes
60SHA1 (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = 8c1bb4ce614210eaaa3ec46309cd2533c64e1ce4 60SHA1 (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = 8c1bb4ce614210eaaa3ec46309cd2533c64e1ce4
61RMD160 (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = e4ecfabe920ba796d8f07a9a42899fe6b8bd09ed 61RMD160 (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = e4ecfabe920ba796d8f07a9a42899fe6b8bd09ed
62Size (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = 51817743 bytes 62Size (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = 51817743 bytes
63SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1 63SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
64RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0 64RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
65Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes 65Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
66SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6 66SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6
67SHA1 (patch-aa) = 656265823146be3fd6efee470fccff5fdc4b2a59 67SHA1 (patch-aa) = 69da3f571d37bb461f1d3edb342a56e63a2872af
68SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998 68SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998
69SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 69SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6
70SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8 70SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8
71SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88 71SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88
72SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2 72SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2
73SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec 73SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec
74SHA1 (patch-ak) = 45beaba484a74fb47f74bec786c418781dc478e2 74SHA1 (patch-ak) = 45beaba484a74fb47f74bec786c418781dc478e2
75SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175 75SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175
76SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703 76SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703
77SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd 77SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd
78SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503 78SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503
79SHA1 (patch-ap) = 0ef305622c8d1ee1d5d6361b5af352251d52929a 79SHA1 (patch-ap) = 0ef305622c8d1ee1d5d6361b5af352251d52929a
80SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d 80SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d
81SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec 81SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec
82SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2 82SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2
83SHA1 (patch-at) = fdba3bdfccab8de333de08bcc0c9c52d3469d9a3 83SHA1 (patch-at) = fdba3bdfccab8de333de08bcc0c9c52d3469d9a3
84SHA1 (patch-aw) = b6de59de25cec67f2f8b776529df7bf23a5d870e 84SHA1 (patch-aw) = b6de59de25cec67f2f8b776529df7bf23a5d870e
85SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf 85SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf
86SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423 86SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423
87SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273 87SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273
88SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6 88SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6
89SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a 89SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a
90SHA1 (patch-bn) = e90012a3acbdeec1fe97d53ffa11816379ac90e9 90SHA1 (patch-bn) = e90012a3acbdeec1fe97d53ffa11816379ac90e9
91SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2 91SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2
92SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756 92SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756
93SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf 93SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf
94SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 94SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
95SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 95SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
96SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd 96SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd
97SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 28be4be89a94373ed5f8bee67b581df6d5f2a28c 97SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 28be4be89a94373ed5f8bee67b581df6d5f2a28c
98SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b 98SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b
99SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = c9410ce77a10565e2a811ae053704d9e58978c02 99SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = c9410ce77a10565e2a811ae053704d9e58978c02
100SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a 100SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a
101SHA1 (patch-hotspot_make_solaris_makefiles_jvmg.make) = 4b14c61707d739f612943c41ab7f3ccc34106a18 101SHA1 (patch-hotspot_make_solaris_makefiles_jvmg.make) = 4b14c61707d739f612943c41ab7f3ccc34106a18
102SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 5163ebc52439f6fe1cdfde87b9b930744a485e70 102SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 5163ebc52439f6fe1cdfde87b9b930744a485e70
103SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 690c750d9c0469cd6b71afed2633aa13373c2a7b 103SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 690c750d9c0469cd6b71afed2633aa13373c2a7b
104SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 9fbe6b4e8d4ef9e4ffc8361aa469a9ceacb331ff 104SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 9fbe6b4e8d4ef9e4ffc8361aa469a9ceacb331ff
105SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850 105SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850
106SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5 106SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5
107SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43 107SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43
108SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = d72c16b90479c5df0dc33f3b30916b0552dcc17a 108SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = d72c16b90479c5df0dc33f3b30916b0552dcc17a
109SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6 109SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
110SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c 110SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
111SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41 111SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41
112SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b 112SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b
113SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666 113SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666
114SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2 114SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2
115SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8 115SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8
116SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 116SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
117SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68 117SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68
118SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2 118SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2
119SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e 119SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
120SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b 120SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b
121SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 121SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46
122SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664 122SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664
123SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 123SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3
124SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50 124SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50
125SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 125SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70
126SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6 126SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6
127SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239 127SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239
128SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2 128SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2
129SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91 129SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91
130SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab 130SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab
131SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005 131SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005
132SHA1 (patch-jdk_make_java_instrument_Makefile) = ddd552847d384ebbceff3b4561551d204c4e9d5a 132SHA1 (patch-jdk_make_java_instrument_Makefile) = ddd552847d384ebbceff3b4561551d204c4e9d5a
133SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c 133SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c
134SHA1 (patch-jdk_make_java_npt_Makefile) = f79db8f4bc1388ce95dd5adfd54ba13665bebe47 134SHA1 (patch-jdk_make_java_npt_Makefile) = f79db8f4bc1388ce95dd5adfd54ba13665bebe47
135SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a 135SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a
136SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30 136SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30
137SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125b3460 137SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125b3460
138SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b 138SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b
139SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = fa6e9a60c1e0908c9c31761608a25bffc8093a60 139SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = fa6e9a60c1e0908c9c31761608a25bffc8093a60
140SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d 140SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d
141SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f 141SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f
142SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335 142SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335
143SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44 143SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44
144SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java) = 75f2112f9b0295511b134122b1254cb51f961cda 144SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java) = 75f2112f9b0295511b134122b1254cb51f961cda
145SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java) = c7bbf14f618095e1340849d14ccf130b5d8e0a00 145SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java) = c7bbf14f618095e1340849d14ccf130b5d8e0a00
146SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java) = 6bc7612c49c5878e6d87c565872b1009cdcc9507 146SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java) = 6bc7612c49c5878e6d87c565872b1009cdcc9507
147SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994 147SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994
148SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5 148SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5
149SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155 149SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155
150SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da308daafc135db38e4513347a39368ba 150SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da308daafc135db38e4513347a39368ba
151SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb 151SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb
152SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4 152SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4
153SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716 153SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716
154SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 86ce16bd53c85bc3830ef3f21d52f9a8107b5350 154SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 86ce16bd53c85bc3830ef3f21d52f9a8107b5350
155SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50 155SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50
156SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = d509a6ed567493024e3ce5de8986912da99f4a9d 156SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = d509a6ed567493024e3ce5de8986912da99f4a9d
157SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480 157SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480
158SHA1 (patch-jdk_test_Makefile) = d747987549c2f6e9eb42233edae02d8eae6b4584 158SHA1 (patch-jdk_test_Makefile) = d747987549c2f6e9eb42233edae02d8eae6b4584
159SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb 159SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb
160SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d 160SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d
161SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c 161SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c
162SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 1997194b919a96628568ef469150c1bd39ede295 162SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 1997194b919a96628568ef469150c1bd39ede295
163SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = 142fa7029bfbdbb63354ce4e315ea7f5fd372a32 163SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = 142fa7029bfbdbb63354ce4e315ea7f5fd372a32
164SHA1 (patch-langtools_make_build.xml) = 98fe0f88aaa774e47e1a358c7005b203c3123d09 164SHA1 (patch-langtools_make_build.xml) = 98fe0f88aaa774e47e1a358c7005b203c3123d09
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/Attic/options.mk (switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/options.mk 2011/08/21 22:57:54 1.3
+++ pkgsrc/lang/openjdk7/Attic/options.mk 2014/01/14 17:24:42 1.4
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: options.mk,v 1.3 2011/08/21 22:57:54 tnn Exp $ 1# $NetBSD: options.mk,v 1.4 2014/01/14 17:24:42 abs Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7 3PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7
4PKG_SUPPORTED_OPTIONS= sun-jre-jce # jdk-zero-vm 4PKG_SUPPORTED_OPTIONS= sun-jre-jce # jdk-zero-vm
5PKG_SUGGESTED_OPTIONS= # 5PKG_SUGGESTED_OPTIONS= #
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### Java(TM) Cryptography Extension (JCE) 10### Java(TM) Cryptography Extension (JCE)
11### 11###
12.if !empty(PKG_OPTIONS:Msun-jre-jce) 12.if !empty(PKG_OPTIONS:Msun-jre-jce)
13JCE_DISTFILE= UnlimitedJCEPolicyJDK7.zip 13JCE_DISTFILE= UnlimitedJCEPolicyJDK7.zip
14DISTFILES+= ${JCE_DISTFILE} 14DISTFILES+= ${JCE_DISTFILE}
15EXTRACT_ONLY+= ${JCE_DISTFILE} 15EXTRACT_ONLY+= ${JCE_DISTFILE}
16PLIST.jce= yes 16PLIST.jce= yes
17USE_TOOLS+= pax 17USE_TOOLS+= pax
18# 18#
19.if !exists(${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}) 19. if !exists(${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE})
20FETCH_MESSAGE+= "Please download the Java(TM) Cryptography Extension (JCE) Unlimited" 20FETCH_MESSAGE+= "Please download the Java(TM) Cryptography Extension (JCE) Unlimited"
21FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 7 '${JCE_DISTFILE}' from:" 21FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 7 '${JCE_DISTFILE}' from:"
22FETCH_MESSAGE+= " http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" 22FETCH_MESSAGE+= " http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
23FETCH_MESSAGE+= " and place it in:" 23FETCH_MESSAGE+= " and place it in:"
24FETCH_MESSAGE+= " ${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}" 24FETCH_MESSAGE+= " ${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}"
25FETCH_MESSAGE+= "" 25FETCH_MESSAGE+= ""
26FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again." 26FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again."
27.endif 27. endif
28# 28#
29post-install: 29post-install:
30 cd ${WRKDIR}/UnlimitedJCEPolicy && pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security 30 cd ${WRKDIR}/UnlimitedJCEPolicy && pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security
31.endif 31.endif
32 32
33# this option builds a JVM without assembly optimisation. Useful for porting. 33# this option builds a JVM without assembly optimisation. Useful for porting.
34# NOTE: This is work in progress. 34# NOTE: This is work in progress.
35.if !empty(PKG_OPTIONS:Mjdk-zero-vm) 35.if !empty(PKG_OPTIONS:Mjdk-zero-vm)
36MAKE_ENV+= ZERO_BUILD=true 36MAKE_ENV+= ZERO_BUILD=true
37.include "../../devel/libffi/buildlink3.mk" 37.include "../../devel/libffi/buildlink3.mk"
38.endif 38.endif
cvs diff -r1.10 -r1.11 pkgsrc/lang/openjdk7/patches/Attic/patch-aa (switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-aa 2014/01/02 01:16:35 1.10
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-aa 2014/01/14 17:24:42 1.11
@@ -1,75 +1,110 @@ @@ -1,75 +1,110 @@
1$NetBSD: patch-aa,v 1.10 2014/01/02 01:16:35 ryoon Exp $ 1$NetBSD: patch-aa,v 1.11 2014/01/14 17:24:42 abs Exp $
2 2
3DragonFly support. 3DragonFly support.
 4Add workaround for missing sem_timedwait() in NetBSD < 6.99.4
4 5
5--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-01-01 05:50:05.000000000 +0000 6--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-01-01 05:50:05.000000000 +0000
6+++ hotspot/src/os/bsd/vm/os_bsd.cpp 7+++ hotspot/src/os/bsd/vm/os_bsd.cpp
7@@ -126,8 +126,11 @@ 8@@ -126,8 +126,11 @@
8 # include <inttypes.h> 9 # include <inttypes.h>
9 # include <sys/ioctl.h> 10 # include <sys/ioctl.h>
10  11
11-#if defined(__FreeBSD__) || defined(__NetBSD__) 12-#if defined(__FreeBSD__) || defined(__NetBSD__)
12+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 13+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
13 # include <elf.h> 14 # include <elf.h>
14+#if !defined(EM_ALPHA) 15+#if !defined(EM_ALPHA)
15+#define EM_ALPHA 0x9026 16+#define EM_ALPHA 0x9026
16+#endif 17+#endif
17 #endif 18 #endif
18  19
19 #ifdef __APPLE__ 20 #ifdef __APPLE__
20@@ -340,6 +343,7 @@ void os::Bsd::initialize_system_info() { 21@@ -340,6 +343,7 @@ void os::Bsd::initialize_system_info() {
21 size_t len; 22 size_t len;
22 int cpu_val; 23 int cpu_val;
23 julong mem_val; 24 julong mem_val;
24+ struct rlimit limits; 25+ struct rlimit limits;
25  26
26 /* get processors count via hw.ncpus sysctl */ 27 /* get processors count via hw.ncpus sysctl */
27 mib[0] = CTL_HW; 28 mib[0] = CTL_HW;
28@@ -370,14 +374,11 @@ void os::Bsd::initialize_system_info() { 29@@ -370,14 +374,11 @@ void os::Bsd::initialize_system_info() {
29 _physical_memory = 256*1024*1024; // fallback (XXXBSD?) 30 _physical_memory = 256*1024*1024; // fallback (XXXBSD?)
30 } 31 }
31  32
32-#ifdef __OpenBSD__ 33-#ifdef __OpenBSD__
33- { 34- {
34- // limit _physical_memory memory view on OpenBSD since 35- // limit _physical_memory memory view on OpenBSD since
35- // datasize rlimit restricts us anyway. 36- // datasize rlimit restricts us anyway.
36- struct rlimit limits; 37- struct rlimit limits;
37- getrlimit(RLIMIT_DATA, &limits); 38- getrlimit(RLIMIT_DATA, &limits);
38- _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); 39- _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur);
39- } 40- }
40+ getrlimit(RLIMIT_DATA, &limits); 41+ getrlimit(RLIMIT_DATA, &limits);
41+ _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); 42+ _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur);
42+#if defined(RLIMIT_AS) 43+#if defined(RLIMIT_AS)
43+ getrlimit(RLIMIT_AS, &limits); 44+ getrlimit(RLIMIT_AS, &limits);
44+ _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); 45+ _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur);
45 #endif 46 #endif
46 } 47 }
47 #else 48 #else
48@@ -2222,7 +2223,9 @@ void * os::dll_load(const char *filename 49@@ -2222,7 +2223,9 @@ void * os::dll_load(const char *filename
49 {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, 50 {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
50 {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, 51 {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
51 {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, 52 {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"},
52+#if 0 53+#if 0
53 {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"}, 54 {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"},
54+#endif 55+#endif
55 {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, 56 {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
56 {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, 57 {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
57 {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, 58 {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
58@@ -3880,7 +3883,7 @@ OSReturn os::set_native_priority(Thread* 59@@ -2818,6 +2821,33 @@ bool Semaphore::timedwait(unsigned int s
 60
 61 #else
 62
 63+#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000400)
 64+static inline int sem_timedwait(sem_t *sem, struct timespec *ts) {
 65+ struct timespec onems = { 0, 1000000 };
 66+ struct timespec total = { 0, 0 };
 67+ struct timespec unslept;
 68+ struct timespec elapsed;
 69+ struct timespec tmp;
 70+
 71+ while (timespeccmp(ts, &total, >)) {
 72+ if (sem_trywait(sem) == 0)
 73+ return 0;
 74+
 75+ if (errno != EAGAIN)
 76+ return -1;
 77+
 78+ (void)nanosleep(&onems, &unslept);
 79+
 80+ timespecsub(&onems, &unslept, &elapsed);
 81+ timespecadd(&total, &elapsed, &tmp);
 82+ total.tv_sec = tmp.tv_sec;
 83+ total.tv_nsec = tmp.tv_nsec;
 84+ }
 85+ errno = ETIMEDOUT;
 86+ return -1;
 87+}
 88+#endif /* __NetBSD__ */
 89+
 90 bool Semaphore::trywait() {
 91 return sem_trywait(&_semaphore) == 0;
 92 }
 93@@ -3880,7 +3910,7 @@ OSReturn os::set_native_priority(Thread*
59 #ifdef __OpenBSD__ 94 #ifdef __OpenBSD__
60 // OpenBSD pthread_setprio starves low priority threads 95 // OpenBSD pthread_setprio starves low priority threads
61 return OS_OK; 96 return OS_OK;
62-#elif defined(__FreeBSD__) 97-#elif defined(__FreeBSD__)
63+#elif defined(__FreeBSD__) || defined(__DragonFly__) 98+#elif defined(__FreeBSD__) || defined(__DragonFly__)
64 int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); 99 int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
65 return (ret == 0) ? OS_OK : OS_ERR; 100 return (ret == 0) ? OS_OK : OS_ERR;
66 #elif defined(__APPLE__) || defined(__NetBSD__) 101 #elif defined(__APPLE__) || defined(__NetBSD__)
67@@ -3909,7 +3912,7 @@ OSReturn os::get_native_priority(const T 102@@ -3909,7 +3939,7 @@ OSReturn os::get_native_priority(const T
68 } 103 }
69  104
70 errno = 0; 105 errno = 0;
71-#if defined(__OpenBSD__) || defined(__FreeBSD__) 106-#if defined(__OpenBSD__) || defined(__FreeBSD__)
72+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) 107+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
73 *priority_ptr = pthread_getprio(thread->osthread()->pthread_id()); 108 *priority_ptr = pthread_getprio(thread->osthread()->pthread_id());
74 #elif defined(__APPLE__) || defined(__NetBSD__) 109 #elif defined(__APPLE__) || defined(__NetBSD__)
75 int policy; 110 int policy;