Fri Jan 9 16:29:04 2015 UTC ()
lang/openjdk7: make it work on FreeBSD 10.* x86_64

* -Wno-new-returns-null is not currently known to installed clang on fbsd, make it optional
* on fbsd, openjdk builds libjsoundalsa and libsctp, add them optionally to PLIST
* add necessary patches to make it build on fbsd

Reviewed by wiz


(rumko)
diff -r1.81 -r1.82 pkgsrc/lang/openjdk7/Makefile
diff -r1.16 -r1.17 pkgsrc/lang/openjdk7/PLIST
diff -r1.13 -r1.14 pkgsrc/lang/openjdk7/bootstrap.mk
diff -r1.60 -r1.61 pkgsrc/lang/openjdk7/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c
cvs diff -r1.81 -r1.82 pkgsrc/lang/openjdk7/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/Makefile 2014/12/30 23:48:57 1.81
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2015/01/09 16:29:04 1.82
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.81 2014/12/30 23:48:57 ryoon Exp $ 1# $NetBSD: Makefile,v 1.82 2015/01/09 16:29:04 rumko Exp $
2 2
3DISTNAME= openjdk-1.7.71-20141102 3DISTNAME= openjdk-1.7.71-20141102
4PKGNAME= openjdk7-1.7.71 4PKGNAME= openjdk7-1.7.71
5PKGREVISION= 2 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
@@ -117,37 +117,41 @@ SUBST_SED.mapfix= -e '/__fsr_init_value/ @@ -117,37 +117,41 @@ SUBST_SED.mapfix= -e '/__fsr_init_value/
117SUBST_SED.mapfix+= -e '/__progname/d' 117SUBST_SED.mapfix+= -e '/__progname/d'
118 118
119# environ should only be removed from this file (added by patches) 119# environ should only be removed from this file (added by patches)
120SUBST_CLASSES+= mapfix2 120SUBST_CLASSES+= mapfix2
121SUBST_STAGE.mapfix2= pre-build 121SUBST_STAGE.mapfix2= pre-build
122SUBST_FILES.mapfix2= jdk/make/com/sun/java/pack/mapfile-vers 122SUBST_FILES.mapfix2= jdk/make/com/sun/java/pack/mapfile-vers
123SUBST_SED.mapfix2= -e '/environ/d' 123SUBST_SED.mapfix2= -e '/environ/d'
124.endif 124.endif
125 125
126.if !empty(PKGSRC_COMPILER:Mclang) 126.if !empty(PKGSRC_COMPILER:Mclang)
127_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \ 127_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \
128 -Wno-shorten-64-to-32 -Wno-conversion \ 128 -Wno-shorten-64-to-32 -Wno-conversion \
129 -Wno-unused-value -Wno-switch-enum -Wno-switch \ 129 -Wno-unused-value -Wno-switch-enum -Wno-switch \
130 -Wno-tautological-compare -Wno-new-returns-null \ 130 -Wno-tautological-compare \
131 -Wno-delete-non-virtual-dtor \ 131 -Wno-delete-non-virtual-dtor \
132 -Wno-return-type -Wno-unused-parameter \ 132 -Wno-return-type -Wno-unused-parameter \
133 -Wno-parentheses-equality -Wno-empty-body 133 -Wno-parentheses-equality -Wno-empty-body
134CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \ 134CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \
135 -Wno-shorten-64-to-32 -Wno-conversion \ 135 -Wno-shorten-64-to-32 -Wno-conversion \
136 -Wno-unused-value -Wno-switch-enum -Wno-switch \ 136 -Wno-unused-value -Wno-switch-enum -Wno-switch \
137 -Wno-tautological-compare -Wno-new-returns-null \ 137 -Wno-tautological-compare \
138 -Wno-delete-non-virtual-dtor \ 138 -Wno-delete-non-virtual-dtor \
139 -Wno-return-type -Wno-unused-parameter \ 139 -Wno-return-type -Wno-unused-parameter \
140 -Wno-parentheses-equality -Wno-empty-body 140 -Wno-parentheses-equality -Wno-empty-body
 141.if ${OPSYS} != "FreeBSD"
 142_WRAP_EXTRA_ARGS.CXX+= -Wno-new-returns-null
 143CWRAPPERS_APPEND.cxx+= -Wno-new-returns-null
 144.endif
141BUILDLINK_TRANSFORM+= rm:-fcheck-new 145BUILDLINK_TRANSFORM+= rm:-fcheck-new
142BUILDLINK_TRANSFORM+= rm:-fpch-deps 146BUILDLINK_TRANSFORM+= rm:-fpch-deps
143. if ${MACHINE_ARCH} == "x86_64" 147. if ${MACHINE_ARCH} == "x86_64"
144_WRAP_EXTRA_ARGS.CXX+= -mstackrealign 148_WRAP_EXTRA_ARGS.CXX+= -mstackrealign
145. endif 149. endif
146.endif 150.endif
147.include "bootstrap.mk" 151.include "bootstrap.mk"
148.include "icedtea-extras.mk" 152.include "icedtea-extras.mk"
149 153
150.include "options.mk" 154.include "options.mk"
151 155
152SUBST_CLASSES+= add-rpaths 156SUBST_CLASSES+= add-rpaths
153SUBST_STAGE.add-rpaths= pre-build 157SUBST_STAGE.add-rpaths= pre-build
@@ -166,26 +170,33 @@ SUBST_MESSAGE.fontpaths= fixing font pat @@ -166,26 +170,33 @@ SUBST_MESSAGE.fontpaths= fixing font pat
166SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties 170SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
167SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c 171SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c
168SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g' 172SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g'
169SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g' 173SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
170 174
171PLIST_VARS+= i386 jce manja 175PLIST_VARS+= i386 jce manja
172.if ${MACHINE_ARCH} == "i386" 176.if ${MACHINE_ARCH} == "i386"
173PLIST.i386= yes 177PLIST.i386= yes
174.endif 178.endif
175.if ${OPSYS} != "SunOS" 179.if ${OPSYS} != "SunOS"
176PLIST.manja= yes 180PLIST.manja= yes
177.endif 181.endif
178 182
 183PLIST_VARS+= sctp alsa
 184.if ${OPSYS} == "FreeBSD"
 185PLIST.sctp= yes
 186PLIST.alsa= yes
 187.include "../../audio/alsa-lib/buildlink3.mk"
 188.endif
 189
179post-extract: 190post-extract:
180 chmod +x ${ANT_BIN}/ant 191 chmod +x ${ANT_BIN}/ant
181 cd ${WRKDIR}/${ICEDTEA_WEB}/plugin/icedteanp/java && pax -rw . \ 192 cd ${WRKDIR}/${ICEDTEA_WEB}/plugin/icedteanp/java && pax -rw . \
182 ${WRKSRC}/jdk/src/share/classes 193 ${WRKSRC}/jdk/src/share/classes
183 cd ${WRKDIR}/${ICEDTEA_WEB}/netx && pax -rw . \ 194 cd ${WRKDIR}/${ICEDTEA_WEB}/netx && pax -rw . \
184 ${WRKSRC}/jdk/src/share/classes 195 ${WRKSRC}/jdk/src/share/classes
185# cd ${WRKSRC} && patch -s -p1 < ${WRKDIR}/${ICEDTEA}/patches/rhino.patch 196# cd ${WRKSRC} && patch -s -p1 < ${WRKDIR}/${ICEDTEA}/patches/rhino.patch
186.if ${OPSYS} == "SunOS" 197.if ${OPSYS} == "SunOS"
187 ${MKDIR} ${ALT_BOOTDIR}/bin 198 ${MKDIR} ${ALT_BOOTDIR}/bin
188 ${LN} -s ${JDK_BOOTDIR}/include ${ALT_BOOTDIR}/include 199 ${LN} -s ${JDK_BOOTDIR}/include ${ALT_BOOTDIR}/include
189 ${LN} -s ${JDK_BOOTDIR}/lib ${ALT_BOOTDIR}/lib 200 ${LN} -s ${JDK_BOOTDIR}/lib ${ALT_BOOTDIR}/lib
190 ${LN} -s ${JDK_BOOTDIR}/bin/java ${ALT_BOOTDIR}/bin 201 ${LN} -s ${JDK_BOOTDIR}/bin/java ${ALT_BOOTDIR}/bin
191 ${LN} -s ${JDK_BOOTDIR}/bin/javac ${ALT_BOOTDIR}/bin 202 ${LN} -s ${JDK_BOOTDIR}/bin/javac ${ALT_BOOTDIR}/bin
cvs diff -r1.16 -r1.17 pkgsrc/lang/openjdk7/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/PLIST 2014/06/14 22:44:53 1.16
+++ pkgsrc/lang/openjdk7/Attic/PLIST 2015/01/09 16:29:04 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.16 2014/06/14 22:44:53 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.17 2015/01/09 16:29:04 rumko Exp $
2bin/openjdk7-jar 2bin/openjdk7-jar
3bin/openjdk7-java 3bin/openjdk7-java
4bin/openjdk7-javac 4bin/openjdk7-javac
5bin/openjdk7-javadoc 5bin/openjdk7-javadoc
6bin/openjdk7-javah 6bin/openjdk7-javah
7bin/openjdk7-javap 7bin/openjdk7-javap
8bin/openjdk7-keytool 8bin/openjdk7-keytool
9bin/openjdk7-orbd 9bin/openjdk7-orbd
10bin/openjdk7-policytool 10bin/openjdk7-policytool
11bin/openjdk7-rmid 11bin/openjdk7-rmid
12bin/openjdk7-rmiregistry 12bin/openjdk7-rmiregistry
13bin/openjdk7-servertool 13bin/openjdk7-servertool
14bin/openjdk7-tnameserv 14bin/openjdk7-tnameserv
@@ -377,35 +377,37 @@ java/openjdk7/jre/lib/${ARCH}/libj2gss.s @@ -377,35 +377,37 @@ java/openjdk7/jre/lib/${ARCH}/libj2gss.s
377java/openjdk7/jre/lib/${ARCH}/libj2pcsc.so 377java/openjdk7/jre/lib/${ARCH}/libj2pcsc.so
378java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.so 378java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.so
379java/openjdk7/jre/lib/${ARCH}/libjaas_unix.so 379java/openjdk7/jre/lib/${ARCH}/libjaas_unix.so
380java/openjdk7/jre/lib/${ARCH}/libjava.so 380java/openjdk7/jre/lib/${ARCH}/libjava.so
381java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.diz 381java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.diz
382java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.so 382java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.so
383java/openjdk7/jre/lib/${ARCH}/libjawt.so 383java/openjdk7/jre/lib/${ARCH}/libjawt.so
384java/openjdk7/jre/lib/${ARCH}/libjdwp.so 384java/openjdk7/jre/lib/${ARCH}/libjdwp.so
385java/openjdk7/jre/lib/${ARCH}/libjpeg.so 385java/openjdk7/jre/lib/${ARCH}/libjpeg.so
386java/openjdk7/jre/lib/${ARCH}/libjsdt.diz 386java/openjdk7/jre/lib/${ARCH}/libjsdt.diz
387java/openjdk7/jre/lib/${ARCH}/libjsdt.so 387java/openjdk7/jre/lib/${ARCH}/libjsdt.so
388java/openjdk7/jre/lib/${ARCH}/libjsig.so 388java/openjdk7/jre/lib/${ARCH}/libjsig.so
389java/openjdk7/jre/lib/${ARCH}/libjsound.so 389java/openjdk7/jre/lib/${ARCH}/libjsound.so
 390${PLIST.alsa}java/openjdk7/jre/lib/${ARCH}/libjsoundalsa.so
390java/openjdk7/jre/lib/${ARCH}/liblcms.so 391java/openjdk7/jre/lib/${ARCH}/liblcms.so
391java/openjdk7/jre/lib/${ARCH}/libmanagement.diz 392java/openjdk7/jre/lib/${ARCH}/libmanagement.diz
392java/openjdk7/jre/lib/${ARCH}/libmanagement.so 393java/openjdk7/jre/lib/${ARCH}/libmanagement.so
393java/openjdk7/jre/lib/${ARCH}/libmlib_image.so 394java/openjdk7/jre/lib/${ARCH}/libmlib_image.so
394java/openjdk7/jre/lib/${ARCH}/libnet.so 395java/openjdk7/jre/lib/${ARCH}/libnet.so
395java/openjdk7/jre/lib/${ARCH}/libnio.so 396java/openjdk7/jre/lib/${ARCH}/libnio.so
396java/openjdk7/jre/lib/${ARCH}/libnpt.diz 397java/openjdk7/jre/lib/${ARCH}/libnpt.diz
397java/openjdk7/jre/lib/${ARCH}/libnpt.so 398java/openjdk7/jre/lib/${ARCH}/libnpt.so
398java/openjdk7/jre/lib/${ARCH}/libsaproc.so 399java/openjdk7/jre/lib/${ARCH}/libsaproc.so
 400${PLIST.sctp}java/openjdk7/jre/lib/${ARCH}/libsctp.so
399java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so 401java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
400java/openjdk7/jre/lib/${ARCH}/libsunec.so 402java/openjdk7/jre/lib/${ARCH}/libsunec.so
401java/openjdk7/jre/lib/${ARCH}/libunpack.so 403java/openjdk7/jre/lib/${ARCH}/libunpack.so
402java/openjdk7/jre/lib/${ARCH}/libverify.diz 404java/openjdk7/jre/lib/${ARCH}/libverify.diz
403java/openjdk7/jre/lib/${ARCH}/libverify.so 405java/openjdk7/jre/lib/${ARCH}/libverify.so
404java/openjdk7/jre/lib/${ARCH}/libzip.so 406java/openjdk7/jre/lib/${ARCH}/libzip.so
405java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt 407java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt
406java/openjdk7/jre/lib/${ARCH}/server/libjsig.so 408java/openjdk7/jre/lib/${ARCH}/server/libjsig.so
407java/openjdk7/jre/lib/${ARCH}/server/libjvm.so 409java/openjdk7/jre/lib/${ARCH}/server/libjvm.so
408java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so 410java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so
409java/openjdk7/jre/lib/applet/.keep 411java/openjdk7/jre/lib/applet/.keep
410java/openjdk7/jre/lib/calendars.properties 412java/openjdk7/jre/lib/calendars.properties
411java/openjdk7/jre/lib/charsets.jar 413java/openjdk7/jre/lib/charsets.jar
cvs diff -r1.13 -r1.14 pkgsrc/lang/openjdk7/Attic/bootstrap.mk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/bootstrap.mk 2014/08/15 19:39:36 1.13
+++ pkgsrc/lang/openjdk7/Attic/bootstrap.mk 2015/01/09 16:29:04 1.14
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: bootstrap.mk,v 1.13 2014/08/15 19:39:36 wiz Exp $ 1# $NetBSD: bootstrap.mk,v 1.14 2015/01/09 16:29:04 rumko Exp $
2 2
3ONLY_FOR_PLATFORM= NetBSD-[567].*-i386 NetBSD-[567].*-x86_64 3ONLY_FOR_PLATFORM= NetBSD-[567].*-i386 NetBSD-[567].*-x86_64
4ONLY_FOR_PLATFORM+= DragonFly-[23].*-* SunOS-*-* 4ONLY_FOR_PLATFORM+= DragonFly-[23].*-* SunOS-*-* FreeBSD-10.*-x86_64
5 5
6BOOT.nb5-i386= bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2 6BOOT.nb5-i386= bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2
7BOOT.nb5-amd64= bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2 7BOOT.nb5-amd64= bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2
8BOOT.nb6-i386= bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2 8BOOT.nb6-i386= bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2
9BOOT.nb6-amd64= bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2 9BOOT.nb6-amd64= bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2
10BOOT.nb7-i386= bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2 10BOOT.nb7-i386= bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2
11BOOT.nb7-amd64= bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2 11BOOT.nb7-amd64= bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2
12BOOT.dfly3.6-amd64= bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2 12BOOT.dfly3.6-amd64= bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2
13BOOT.dfly3.8-amd64= bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2 13BOOT.dfly3.8-amd64= bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2
 14BOOT.fbsd10-amd64= bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2
14 15
15.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo) 16.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
16DISTFILES+= ${BOOT.nb5-i386} 17DISTFILES+= ${BOOT.nb5-i386}
17EXTRACT_ONLY+= ${BOOT.nb5-i386} 18EXTRACT_ONLY+= ${BOOT.nb5-i386}
18.endif 19.endif
19 20
20.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-x86_64) || make(distinfo) 21.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-x86_64) || make(distinfo)
21DISTFILES+= ${BOOT.nb5-amd64} 22DISTFILES+= ${BOOT.nb5-amd64}
22EXTRACT_ONLY+= ${BOOT.nb5-amd64} 23EXTRACT_ONLY+= ${BOOT.nb5-amd64}
23.endif 24.endif
24 25
25.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-i386) || make(distinfo) 26.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-i386) || make(distinfo)
26DISTFILES+= ${BOOT.nb6-i386} 27DISTFILES+= ${BOOT.nb6-i386}
@@ -42,22 +43,27 @@ DISTFILES+= ${BOOT.nb7-amd64} @@ -42,22 +43,27 @@ DISTFILES+= ${BOOT.nb7-amd64}
42EXTRACT_ONLY+= ${BOOT.nb7-amd64} 43EXTRACT_ONLY+= ${BOOT.nb7-amd64}
43.endif 44.endif
44 45
45.if !empty(MACHINE_PLATFORM:MDragonFly-3.6*-x86_64) || make(distinfo) 46.if !empty(MACHINE_PLATFORM:MDragonFly-3.6*-x86_64) || make(distinfo)
46DISTFILES+= ${BOOT.dfly3.6-amd64} 47DISTFILES+= ${BOOT.dfly3.6-amd64}
47EXTRACT_ONLY+= ${BOOT.dfly3.6-amd64} 48EXTRACT_ONLY+= ${BOOT.dfly3.6-amd64}
48.endif 49.endif
49 50
50.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || make(distinfo) 51.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || make(distinfo)
51DISTFILES+= ${BOOT.dfly3.8-amd64} 52DISTFILES+= ${BOOT.dfly3.8-amd64}
52EXTRACT_ONLY+= ${BOOT.dfly3.8-amd64} 53EXTRACT_ONLY+= ${BOOT.dfly3.8-amd64}
53.endif 54.endif
54 55
 56.if !empty(MACHINE_PLATFORM:MFreeBSD-10.*-x86_64) || make(distinfo)
 57DISTFILES+= ${BOOT.fbsd10-amd64}
 58EXTRACT_ONLY+= ${BOOT.fbsd10-amd64}
 59.endif
 60
55.if ${OPSYS} == "SunOS" 61.if ${OPSYS} == "SunOS"
56BUILDLINK_DEPMETHOD.sun-jdk7?= build 62BUILDLINK_DEPMETHOD.sun-jdk7?= build
57.include "../../lang/sun-jdk7/buildlink3.mk" 63.include "../../lang/sun-jdk7/buildlink3.mk"
58#NB: sun-jdk7 includes sun-jre7/buildlink3.mk 64#NB: sun-jdk7 includes sun-jre7/buildlink3.mk
59JDK_BOOTDIR= ${BUILDLINK_JAVA_PREFIX.sun-jre7:tA} 65JDK_BOOTDIR= ${BUILDLINK_JAVA_PREFIX.sun-jre7:tA}
60MAKE_ENV+= ALT_JDK_IMPORT_PATH=${JDK_BOOTDIR} 66MAKE_ENV+= ALT_JDK_IMPORT_PATH=${JDK_BOOTDIR}
61.endif 67.endif
62 68
63ALT_BOOTDIR= ${WRKDIR}/bootstrap 69ALT_BOOTDIR= ${WRKDIR}/bootstrap
cvs diff -r1.60 -r1.61 pkgsrc/lang/openjdk7/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/distinfo 2015/01/06 11:24:02 1.60
+++ pkgsrc/lang/openjdk7/Attic/distinfo 2015/01/09 16:29:04 1.61
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.60 2015/01/06 11:24:02 jperkin Exp $ 1$NetBSD: distinfo,v 1.61 2015/01/09 16:29:04 rumko Exp $
2 2
3SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 3SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
4RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 4RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
5Size (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes 5Size (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes
6SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337 6SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
7RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157 7RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
8Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes 8Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes
9SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d 9SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d
10RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 10RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
11Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes 11Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
12SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = fba2e61d9b6dfa3d582259aa60125762fd3c8931 12SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = fba2e61d9b6dfa3d582259aa60125762fd3c8931
13RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 7a164227b077d9e86a2dd2410e83463d6d3360aa 13RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 7a164227b077d9e86a2dd2410e83463d6d3360aa
14Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 37211292 bytes 14Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 37211292 bytes
@@ -17,26 +17,29 @@ RMD160 (openjdk7/bootstrap-jdk7u60-bin-n @@ -17,26 +17,29 @@ RMD160 (openjdk7/bootstrap-jdk7u60-bin-n
17Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = 39051642 bytes 17Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = 39051642 bytes
18SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 4fac0ed96cfe1b366b50c1b88aabb8d41281f893 18SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 4fac0ed96cfe1b366b50c1b88aabb8d41281f893
19RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = ada7af827e2e47e93f1813f0531b697125d1f44b 19RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = ada7af827e2e47e93f1813f0531b697125d1f44b
20Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 37567181 bytes 20Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 37567181 bytes
21SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 76906b91e8412fefdae5ecb15e01ddbcd586d2ad 21SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 76906b91e8412fefdae5ecb15e01ddbcd586d2ad
22RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 068fb6ad180e8b8d9c4f2cc158c40b3047d8e015 22RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 068fb6ad180e8b8d9c4f2cc158c40b3047d8e015
23Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 39347597 bytes 23Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 39347597 bytes
24SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 8a782d9cb2297b1cb24dfb022b139363d8695616 24SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 8a782d9cb2297b1cb24dfb022b139363d8695616
25RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 607c25a81ae073fb282e5a81169b93d6818e5122 25RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 607c25a81ae073fb282e5a81169b93d6818e5122
26Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 37593509 bytes 26Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 37593509 bytes
27SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 261eb3bf84b6ac60d30a704523efb27e7a7c715a 27SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 261eb3bf84b6ac60d30a704523efb27e7a7c715a
28RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 1d26ee7f6443e1f4389e38d20134fb8e2969254e 28RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 1d26ee7f6443e1f4389e38d20134fb8e2969254e
29Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 40161195 bytes 29Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 40161195 bytes
 30SHA1 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 7e85c42f75f014e88eb62580979f6a0fc9b6e957
 31RMD160 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = d84d7b82205f23827ef9ce672602d0ba8a9a9c72
 32Size (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 37448005 bytes
30SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890 33SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890
31RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770 34RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770
32Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes 35Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
33SHA1 (openjdk7/icedtea-2.5.3.tar.xz) = c509018b108ec6d8e5c8380c9b42d5fba426c632 36SHA1 (openjdk7/icedtea-2.5.3.tar.xz) = c509018b108ec6d8e5c8380c9b42d5fba426c632
34RMD160 (openjdk7/icedtea-2.5.3.tar.xz) = c386237bc07fa535b1cfd0cf95fc0bc50ab067c3 37RMD160 (openjdk7/icedtea-2.5.3.tar.xz) = c386237bc07fa535b1cfd0cf95fc0bc50ab067c3
35Size (openjdk7/icedtea-2.5.3.tar.xz) = 2021560 bytes 38Size (openjdk7/icedtea-2.5.3.tar.xz) = 2021560 bytes
36SHA1 (openjdk7/icedtea-web-1.5.1.tar.gz) = 5daedcc1e962eb952e5ea4b5c9698bb9d6ef700e 39SHA1 (openjdk7/icedtea-web-1.5.1.tar.gz) = 5daedcc1e962eb952e5ea4b5c9698bb9d6ef700e
37RMD160 (openjdk7/icedtea-web-1.5.1.tar.gz) = a2d0ad55919a8ff5d786b56ed26c8a34ed4b259e 40RMD160 (openjdk7/icedtea-web-1.5.1.tar.gz) = a2d0ad55919a8ff5d786b56ed26c8a34ed4b259e
38Size (openjdk7/icedtea-web-1.5.1.tar.gz) = 1616344 bytes 41Size (openjdk7/icedtea-web-1.5.1.tar.gz) = 1616344 bytes
39SHA1 (openjdk7/openjdk-1.7.71-20141102.tar.bz2) = 11ebaf7cc59ea92ba03d6fba491e136a7aab5f28 42SHA1 (openjdk7/openjdk-1.7.71-20141102.tar.bz2) = 11ebaf7cc59ea92ba03d6fba491e136a7aab5f28
40RMD160 (openjdk7/openjdk-1.7.71-20141102.tar.bz2) = 04df0741dc19f6536287b8f6657394620b5c37b2 43RMD160 (openjdk7/openjdk-1.7.71-20141102.tar.bz2) = 04df0741dc19f6536287b8f6657394620b5c37b2
41Size (openjdk7/openjdk-1.7.71-20141102.tar.bz2) = 52222297 bytes 44Size (openjdk7/openjdk-1.7.71-20141102.tar.bz2) = 52222297 bytes
42SHA1 (openjdk7/patches-74a70385c21d) = e711f9af4b8f63e70246aa631191004ff9e94435 45SHA1 (openjdk7/patches-74a70385c21d) = e711f9af4b8f63e70246aa631191004ff9e94435
@@ -112,52 +115,53 @@ SHA1 (patch-jdk_make_com_sun_java_pack_M @@ -112,52 +115,53 @@ SHA1 (patch-jdk_make_com_sun_java_pack_M
112SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664 115SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664
113SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 116SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3
114SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50 117SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50
115SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 118SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70
116SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6 119SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6
117SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239 120SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239
118SHA1 (patch-jdk_make_common_Rules.gmk) = 371fcc33fd44d62d2490bb454abf21815ce2e1ce 121SHA1 (patch-jdk_make_common_Rules.gmk) = 371fcc33fd44d62d2490bb454abf21815ce2e1ce
119SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2 122SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2
120SHA1 (patch-jdk_make_common_shared_Defs-java.gmk) = f7c11d33da19e9f255fde7cab387c91e0287509c 123SHA1 (patch-jdk_make_common_shared_Defs-java.gmk) = f7c11d33da19e9f255fde7cab387c91e0287509c
121SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91 124SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91
122SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab 125SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab
123SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005 126SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005
124SHA1 (patch-jdk_make_java_instrument_Makefile) = ddd552847d384ebbceff3b4561551d204c4e9d5a 127SHA1 (patch-jdk_make_java_instrument_Makefile) = ddd552847d384ebbceff3b4561551d204c4e9d5a
125SHA1 (patch-jdk_make_java_net_FILES__c.gmk) = 085bb17ed92a3858ca357979b7254a8a00b2a180 128SHA1 (patch-jdk_make_java_net_FILES__c.gmk) = 31aefe6781989d98bdb23433fc5b6ed6ab559d0d
126SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c 129SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c
127SHA1 (patch-jdk_make_java_npt_Makefile) = f79db8f4bc1388ce95dd5adfd54ba13665bebe47 130SHA1 (patch-jdk_make_java_npt_Makefile) = f79db8f4bc1388ce95dd5adfd54ba13665bebe47
128SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a 131SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a
129SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30 132SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30
130SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125b3460 133SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125b3460
131SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b 134SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b
132SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = fa6e9a60c1e0908c9c31761608a25bffc8093a60 135SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = fa6e9a60c1e0908c9c31761608a25bffc8093a60
133SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d 136SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d
134SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f 137SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f
135SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335 138SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335
136SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44 139SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44
137SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java) = 75f2112f9b0295511b134122b1254cb51f961cda 140SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java) = 75f2112f9b0295511b134122b1254cb51f961cda
138SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java) = c7bbf14f618095e1340849d14ccf130b5d8e0a00 141SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java) = c7bbf14f618095e1340849d14ccf130b5d8e0a00
139SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java) = 6bc7612c49c5878e6d87c565872b1009cdcc9507 142SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java) = 6bc7612c49c5878e6d87c565872b1009cdcc9507
140SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994 143SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994
141SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5 144SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5
142SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155 145SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155
143SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da308daafc135db38e4513347a39368ba 146SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da308daafc135db38e4513347a39368ba
144SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb 147SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb
145SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4 148SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4
146SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716 149SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716
147SHA1 (patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd) = 41edb9389d4900cd35e52bb29df96d474617a372 150SHA1 (patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd) = 41edb9389d4900cd35e52bb29df96d474617a372
148SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = 265d9f401eff6a39d607c8c8a14ecb56c089ed44 151SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = 265d9f401eff6a39d607c8c8a14ecb56c089ed44
149SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 02e51e702868e1cea4a2628eccbcaa81f231efce 152SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 02e51e702868e1cea4a2628eccbcaa81f231efce
150SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50 153SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50
 154SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 1a7a73c41a35b1719d8a68e9cea2aa47d5e828fc
151SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 205b724aa91169cfe81217893bc5922e5b47da6f 155SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 205b724aa91169cfe81217893bc5922e5b47da6f
152SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 3bc9e099a6c3152645882e4fba128ae8e709efbb 156SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 3bc9e099a6c3152645882e4fba128ae8e709efbb
153SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 63af9eee1f5bbc695a14cab51fa7089eb2a0a04b 157SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 63af9eee1f5bbc695a14cab51fa7089eb2a0a04b
154SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = 883fb8cf76f9a6d47e1c96badb07be162add80f7 158SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = 883fb8cf76f9a6d47e1c96badb07be162add80f7
155SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.h) = c6f3b3bcaf67951a458f01788a9d32e5873c7e5a 159SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.h) = c6f3b3bcaf67951a458f01788a9d32e5873c7e5a
156SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480 160SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480
157SHA1 (patch-jdk_test_Makefile) = 2fb1a5bf1e33cc2d984bfd73af78bf66b31b5acb 161SHA1 (patch-jdk_test_Makefile) = 2fb1a5bf1e33cc2d984bfd73af78bf66b31b5acb
158SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb 162SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb
159SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d 163SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d
160SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c 164SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c
161SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 1997194b919a96628568ef469150c1bd39ede295 165SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 1997194b919a96628568ef469150c1bd39ede295
162SHA1 (patch-jdk_test_jprt.config) = 4eb27e773c564dde79be102e7ccfe2e42ff8f0ca 166SHA1 (patch-jdk_test_jprt.config) = 4eb27e773c564dde79be102e7ccfe2e42ff8f0ca
163SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = 142fa7029bfbdbb63354ce4e315ea7f5fd372a32 167SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = 142fa7029bfbdbb63354ce4e315ea7f5fd372a32
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_java_net_FILES__c.gmk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_java_net_FILES__c.gmk 2014/07/25 20:35:14 1.1
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_java_net_FILES__c.gmk 2015/01/09 16:29:04 1.2
@@ -1,13 +1,19 @@ @@ -1,13 +1,19 @@
1$NetBSD: patch-jdk_make_java_net_FILES__c.gmk,v 1.1 2014/07/25 20:35:14 ryoon Exp $ 1$NetBSD: patch-jdk_make_java_net_FILES__c.gmk,v 1.2 2015/01/09 16:29:04 rumko Exp $
2 2
3--- jdk/make/java/net/FILES_c.gmk.orig 2014-06-14 20:38:28.000000000 +0000 3Use bsd_close.c on all BSD platforms, but avoid duplication on fbsd
 4
 5--- jdk/make/java/net/FILES_c.gmk.orig 2014-11-02 07:18:20.000000000 +0000
4+++ jdk/make/java/net/FILES_c.gmk 6+++ jdk/make/java/net/FILES_c.gmk
5@@ -44,7 +44,7 @@ ifeq ($(PLATFORM), linux) 7@@ -45,11 +45,7 @@ ifeq ($(PLATFORM), linux)
6 FILES_c += linux_close.c 8 FILES_c += linux_close.c
7 endif 9 endif
8  10
9-ifeq ($(PLATFORM), macosx) 11-ifeq ($(PLATFORM), macosx)
 12- FILES_c += bsd_close.c
 13-endif
 14-
 15-ifeq ($(OS_VENDOR), FreeBSD)
10+ifeq ($(PLATFORM), bsd) 16+ifeq ($(PLATFORM), bsd)
11 FILES_c += bsd_close.c 17 FILES_c += bsd_close.c
12 endif 18 endif
13  19
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c
$NetBSD: patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c,v 1.1 2015/01/09 16:29:04 rumko Exp $

On some platforms ESTRPIPE is not defined, make it equal to EPIPE.

--- jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c.orig	2014-11-02 07:18:19.000000000 +0000
+++ jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c
@@ -30,6 +30,10 @@
 #include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
 #include "DirectAudio.h"
 
+#ifndef ESTRPIPE
+#define ESTRPIPE EPIPE
+#endif
+
 #if USE_DAUDIO == TRUE
 
 // GetPosition method 1: based on how many bytes are passed to the kernel driver