The following diff changes the default bootstrap depend from jdk/1.5 to
lang/jamvm + Eclipse compiler (ecj).
Tested on i386 and amd64: builds ok, builds native_bootstrap ok and jdk/1.7
ok.
After this goes in we can remove jdk/1.5 which is EOL since 2009.
okay?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/1.6/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 9 Apr 2011 00:38:09 -0000 1.22
+++ Makefile 1 Oct 2011 18:00:21 -0000
@@ -8,9 +8,9 @@ COMMENT-jre= Java2(TM) Standard Edition
V= 1.6.0.03
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
-REVISION-main = 13
+REVISION-main = 14
PKGNAME-jre= jre-${V}
-REVISION-jre = 13
+REVISION-jre = 14
CATEGORIES= devel/jdk java
@@ -29,6 +29,7 @@ DISTFILES= ${JRLSRC} \
${JRLBIN} \
${JRLMOZ} \
${PATCHSET}
+DIST_SUBDIR= jdk
MASTER_SITES= http://download.java.net/jdk6/6u3/promoted/b05/
@@ -102,8 +103,22 @@ ERRORS += "Fatal: This flavor requires a
BUILD_DEPENDS+= jdk->=1.6,<1.7:devel/jdk/1.6
MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/${JDKHOME}"
.else
-BUILD_DEPENDS+= jdk->=1.5,<1.6:devel/jdk/1.5
-MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/jdk-1.5.0"
+DISTFILES+= bsd-jdk16-gensrc.tar.gz \
+ xalan-j_2_7_0-bin.tar.gz \
+ ecj-3.7.1.jar
+FETCH_MANUALLY+= "Get the file:"
+FETCH_MANUALLY+= " bsd-jdk16-gensrc.tar.gz"
+FETCH_MANUALLY+= "from
http:://www.intricatesoftware.com/distfiles/bsd-jdk16-gensrc.tar.gz"
+FETCH_MANUALLY+= "Get the Apache Xalan Java file:"
+FETCH_MANUALLY+= " xalan-j_2_7_0-bin.tar.gz"
+FETCH_MANUALLY+= "from http://archive.apache.org/dist/xml/xalan-j/";
+FETCH_MANUALLY+= "Get the Eclipse Java Compiler file:"
+FETCH_MANUALLY+= " ecj-3.7.1.jar"
+FETCH_MANUALLY+= "from
http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/ecj-3.7.1.jar";
+BUILD_DEPENDS+= lang/jamvm>=1.5.4
+MAKE_ENV+= ALT_BOOTDIR=${WRKDIST} \
+ ALT_BOOTSTRAP=yes \
+ ECJ_JAR=${FULLDISTDIR}/ecj-3.7.1.jar
.endif
.if !${FLAVOR:L:Mno_web}
@@ -164,6 +179,16 @@ post-extract:
pre-patch:
@cd ${WRKDIR} && \
${PATCH} -p0 -z .orig.bsd --quiet < ${WRKDIR}/jdk16.patches
+
+.if !${FLAVOR:L:Mnative_bootstrap}
+post-patch:
+ @cd ${WRKDIR}/bin && \
+ ${CHMOD} +x bootscript
+.for prog in java javac javah jar
+ @cd ${WRKDIR}/bin && \
+ ln -s bootscript ${prog}
+.endfor
+.endif
post-build:
@rm -rf ${JDKIMAGEDIR}/man/ja \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/jdk/1.6/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 17 Mar 2008 03:28:26 -0000 1.2
+++ distinfo 1 Oct 2011 18:00:21 -0000
@@ -1,20 +1,35 @@
-MD5 (bsd-jdk16-patches-4.tar.bz2) = YyBltgOkKKYDg9t/DLBM3w==
-MD5 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = i28bjY3sBRwYOFU5ERFB7A==
-MD5 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) =
bcr3rxYhFhet/11nKot59A==
-MD5 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = gzkDefufMZPpOp1e7Vsx2Q==
-RMD160 (bsd-jdk16-patches-4.tar.bz2) = uejP2jkrnE/N6uIs1eiqI6jk2GA=
-RMD160 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) =
fxvCv48G8stpoPfAsC32v6s2cn0=
-RMD160 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) =
6KePLdZ5CJHIE0i1UpkmkryDaXE=
-RMD160 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) =
eSRJxzWuLx5FTpC900Bbski15AQ=
-SHA1 (bsd-jdk16-patches-4.tar.bz2) = iUIf2iB8nGMEftEynEEf3HclN8Q=
-SHA1 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = xhtWgGJxWxRwvW/B5V+oG+c0iMU=
-SHA1 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) =
Sb8hpRWgp7n0W373J3/J09dvkwk=
-SHA1 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = EqmNoH2CNAWabtr/pgWe/yY35GE=
-SHA256 (bsd-jdk16-patches-4.tar.bz2) =
XcdTvuFWdvNbBjD4dP3QnhUoIUTdSiXPEiLnwogB+MY=
-SHA256 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) =
C7zELB/3uA2OPqXMB7mmB3j+x6gmc7QrPlS7mnqy6b4=
-SHA256 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) =
M23boc1LxqlLzRGFUMXHo6gI5Lvjm7ITQkupiD8gCcQ=
-SHA256 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) =
0ci9lFhM1SgY46HcPwOxELOSQ9VRJQSgnAbFHAadK/k=
-SIZE (bsd-jdk16-patches-4.tar.bz2) = 960930
-SIZE (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = 2116124
-SIZE (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = 8608204
-SIZE (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = 116791442
+MD5 (jdk/bsd-jdk16-gensrc.tar.gz) = YqixvW5QHuntj2X5muIYEw==
+MD5 (jdk/bsd-jdk16-patches-4.tar.bz2) = YyBltgOkKKYDg9t/DLBM3w==
+MD5 (jdk/ecj-3.7.1.jar) = XdYKNUidOpzUsUklWSoBZQ==
+MD5 (jdk/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = i28bjY3sBRwYOFU5ERFB7A==
+MD5 (jdk/jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) =
bcr3rxYhFhet/11nKot59A==
+MD5 (jdk/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = gzkDefufMZPpOp1e7Vsx2Q==
+MD5 (jdk/xalan-j_2_7_0-bin.tar.gz) = 1SbQhIyIYHzk46Ck7bddUA==
+RMD160 (jdk/bsd-jdk16-gensrc.tar.gz) = Jzug24cPOLB/Sydx+OT4icgpG5c=
+RMD160 (jdk/bsd-jdk16-patches-4.tar.bz2) = uejP2jkrnE/N6uIs1eiqI6jk2GA=
+RMD160 (jdk/ecj-3.7.1.jar) = jfhzWz2GBLB3c0cbqykm/EUTDX0=
+RMD160 (jdk/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) =
fxvCv48G8stpoPfAsC32v6s2cn0=
+RMD160 (jdk/jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) =
6KePLdZ5CJHIE0i1UpkmkryDaXE=
+RMD160 (jdk/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) =
eSRJxzWuLx5FTpC900Bbski15AQ=
+RMD160 (jdk/xalan-j_2_7_0-bin.tar.gz) = VCV7ypsrLPuG/Wl08Oj27CD31H8=
+SHA1 (jdk/bsd-jdk16-gensrc.tar.gz) = BpnUsDODv/HzF/ydODUBSS/G3NU=
+SHA1 (jdk/bsd-jdk16-patches-4.tar.bz2) = iUIf2iB8nGMEftEynEEf3HclN8Q=
+SHA1 (jdk/ecj-3.7.1.jar) = W3m/7ghSymheM8q3RJb6NAAnG1s=
+SHA1 (jdk/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) =
xhtWgGJxWxRwvW/B5V+oG+c0iMU=
+SHA1 (jdk/jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) =
Sb8hpRWgp7n0W373J3/J09dvkwk=
+SHA1 (jdk/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) =
EqmNoH2CNAWabtr/pgWe/yY35GE=
+SHA1 (jdk/xalan-j_2_7_0-bin.tar.gz) = z4jlU+j6W2nfk7rgbtsplS2sWWo=
+SHA256 (jdk/bsd-jdk16-gensrc.tar.gz)
= /+zotVt3Yaj664FSqGUR6JSzHqikxInwi9SwSoY14cU=
+SHA256 (jdk/bsd-jdk16-patches-4.tar.bz2) =
XcdTvuFWdvNbBjD4dP3QnhUoIUTdSiXPEiLnwogB+MY=
+SHA256 (jdk/ecj-3.7.1.jar) = jquPk1LRyHAsHVtQ2j+CvAx+wt8hZWsv643R3MjbfYs=
+SHA256 (jdk/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) =
C7zELB/3uA2OPqXMB7mmB3j+x6gmc7QrPlS7mnqy6b4=
+SHA256 (jdk/jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) =
M23boc1LxqlLzRGFUMXHo6gI5Lvjm7ITQkupiD8gCcQ=
+SHA256 (jdk/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) =
0ci9lFhM1SgY46HcPwOxELOSQ9VRJQSgnAbFHAadK/k=
+SHA256 (jdk/xalan-j_2_7_0-bin.tar.gz) =
h4yOtu7hVRrkMMLboFQmMphW/8BBOyAX3S1O5kjFxfc=
+SIZE (jdk/bsd-jdk16-gensrc.tar.gz) = 1744
+SIZE (jdk/bsd-jdk16-patches-4.tar.bz2) = 960930
+SIZE (jdk/ecj-3.7.1.jar) = 1748770
+SIZE (jdk/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = 2116124
+SIZE (jdk/jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = 8608204
+SIZE (jdk/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = 116791442
+SIZE (jdk/xalan-j_2_7_0-bin.tar.gz) = 13516702
Index: patches/patch-bin_bootscript
===================================================================
RCS file: patches/patch-bin_bootscript
diff -N patches/patch-bin_bootscript
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bin_bootscript 1 Oct 2011 18:00:21 -0000
@@ -0,0 +1,91 @@
+$OpenBSD: patch-bin_bootscript,v 1.2 2006/05/15 18:11:22 ian Exp $
+--- bin/bootscript.orig Sat Oct 1 08:17:38 2011
++++ bin/bootscript Sat Oct 1 10:10:04 2011
+@@ -0,0 +1,87 @@
++#!/bin/sh
++
++progname=`basename $0`
++
++case $progname in
++ java)
++ # this makes sure the sanity check passes
++ case $1 in
++ -version|-fullversion)
++ echo 'java version "1.5.0"'
++ exit 0
++ ;;
++ esac;
++
++ exec jamvm $@
++ ;;
++ jar)
++ exec gjar $@
++ ;;
++ javah)
++ exec gjavah -force $@
++ ;;
++ javac)
++ # move -J args to jamvm
++ # ecj doesn't like multiple -source, -target or
++ # -encoding arguments. only keep the last of each
++ # to make ecj happy
++
++ JARGS=""
++ SRC=""
++ TRG=""
++ TRG_ARG=""
++ ENC=""
++ ARGS=""
++
++ while [ $# -gt 0 ]; do
++ case "$1" in
++ -J-Xbootclasspath*gjc.jar)
++ # we're using ecj instead
++ ;;
++ -J-XX:ThreadStackSize=*)
++ JARGS="$JARGS -Xss${1#-J-XX:ThreadStackSize=}K"
++ ;;
++ -J*)
++ JARGS="$JARGS ${1#-J}"
++ ;;
++ -source)
++ SRC="$1 $2"
++ shift
++ ;;
++ -target)
++ TRG="$1 $2"
++ TRG_ARG="$2"
++ shift
++ ;;
++ -encoding)
++ ENC="$1 $2"
++ shift
++ ;;
++ *)
++ ARGS="$ARGS $1"
++ ;;
++ esac;
++
++ shift
++ done
++
++ # ecj errors out if -target is specified but not -source
++ if [ "$TRG" != "" -a "$SRC" = "" ] ; then
++ if [ "$TRG_ARG" = "jsr14" ] ; then
++ TRG_ARG="1.5"
++ fi
++ SRC="-source $TRG_ARG"
++ fi
++
++ # if no source specified use 1.5
++ if [ "$SRC" == "" ] ; then
++ SRC="-source 1.5"
++ fi
++
++ exec jamvm $JARGS -classpath $ECJ_JAR \
++ org.eclipse.jdt.internal.compiler.batch.Main -nowarn \
++ $SRC $TRG $ENC $ARGS
++ ;;
++esac;
++
++exit 1
Index: patches/patch-deploy_make_common_DeployRules-solaris_gmk
===================================================================
RCS
file:
/cvs/ports/devel/jdk/1.6/patches/patch-deploy_make_common_DeployRules-solaris_gmk,v
retrieving revision 1.2
diff -u -p -r1.2 patch-deploy_make_common_DeployRules-solaris_gmk
--- patches/patch-deploy_make_common_DeployRules-solaris_gmk 17 Mar 2008
03:28:26 -0000 1.2
+++ patches/patch-deploy_make_common_DeployRules-solaris_gmk 1 Oct 2011
18:00:21 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-deploy_make_common_DeployRules-solaris_gmk,v 1.2 2008/03/17
03:28:26 kurt Exp $
---- deploy/make/common/DeployRules-solaris.gmk.orig Sun Mar 16 09:33:23 2008
-+++ deploy/make/common/DeployRules-solaris.gmk Sun Mar 16 09:33:27 2008
+--- deploy/make/common/DeployRules-solaris.gmk.orig Thu Sep 29 13:19:57 2011
++++ deploy/make/common/DeployRules-solaris.gmk Thu Sep 29 22:36:13 2011
@@ -34,9 +34,9 @@ ifeq ($(PLATFORM), solaris)
LDFLAGS = -xnolib -norunpath -lCrun -lnsl -ldl -lc
@@ -14,3 +14,25 @@ $OpenBSD: patch-deploy_make_common_Deplo
ifeq ($(OS_VENDOR),Apple)
# Option used to create a shared library
+@@ -61,8 +61,8 @@ $(DEPLOY_COMMON_LIB): $(SO_o)
+
+ $(DEPLOYOBJDIR)/%.o: %.c
+ @$(prep-target)
+- $(CC) -I$(BOOTDIR)/include \
+- -I$(BOOTDIR)/include/$(PLATFORM_JNI_INCLUDE) \
++ $(CC) -I$(JAVAWS_BOOTDIR)/include \
++ -I$(JAVAWS_BOOTDIR)/include/$(PLATFORM_JNI_INCLUDE) \
+ -I$(DEPLOY_SHARE_SRC)/native \
+ -I$(DEPLOY_PLATFORM_SRC)/native \
+ -I$(DEPLOYCLASSHDRDIR) \
+@@ -71,8 +71,8 @@ $(DEPLOYOBJDIR)/%.o: %.c
+
+ $(DEPLOYOBJDIR)/%.o: %.cpp
+ @$(prep-target)
+- $(CXX) -I$(BOOTDIR)/include \
+- -I$(BOOTDIR)/include/$(PLATFORM_JNI_INCLUDE) \
++ $(CXX) -I$(JAVAWS_BOOTDIR)/include \
++ -I$(JAVAWS_BOOTDIR)/include/$(PLATFORM_JNI_INCLUDE) \
+ -I$(DEPLOY_SHARE_SRC)/native \
+ -I$(DEPLOY_PLATFORM_SRC)/native \
+ -I$(DEPLOYCLASSHDRDIR) \
Index: patches/patch-hotspot_build_bsd_Makefile
===================================================================
RCS file: patches/patch-hotspot_build_bsd_Makefile
diff -N patches/patch-hotspot_build_bsd_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-hotspot_build_bsd_Makefile 1 Oct 2011 18:00:21 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- hotspot/build/bsd/Makefile.orig Mon Sep 26 16:56:07 2011
++++ hotspot/build/bsd/Makefile Mon Sep 26 16:59:17 2011
+@@ -237,8 +237,7 @@ endif
+ XSLT_CHECK = $(RUN.JAVAP) javax.xml.transform.TransformerFactory
+ # If not found then fail fast.
+ check_j2se_version:
+- $(QUIETLY) $(XSLT_CHECK) > /dev/null 2>&1; \
+- if [ $$? -ne 0 ]; then \
++ $(QUIETLY) if [ `$(RUN.JAVA) -fullversion 2>&1 | grep -c '1\.[4567]'`
-eq
0 ] ; then \
+ $(RUN.JAVA) -version; \
+ echo "*** An XSLT processor (J2SE 1.4.x or newer) is required" \
+ "to bootstrap this build" 1>&2; \
Index: patches/patch-hotspot_build_bsd_makefiles_jvmti_make
===================================================================
RCS file: patches/patch-hotspot_build_bsd_makefiles_jvmti_make
diff -N patches/patch-hotspot_build_bsd_makefiles_jvmti_make
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-hotspot_build_bsd_makefiles_jvmti_make 1 Oct 2011
18:00:21 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- hotspot/build/bsd/makefiles/jvmti.make.orig Mon Sep 26 17:04:53 2011
++++ hotspot/build/bsd/makefiles/jvmti.make Mon Sep 26 17:05:24 2011
+@@ -39,7 +39,15 @@ JvmtiGenClass = $(JvmtiOutDir)/jvmtiGen.class
+
+ JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%)
+
+-XSLT = $(QUIETLY) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen
++ifndef ALT_BOOTSTRAP
++ XSLT = $(QUIETLY) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen
++else
++XSLT = $(QUIETLY) $(RUN.JAVA) \
++
-Djavax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
\
++
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
\
++
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
\
++ -classpath $(GAMMADIR)/../xalan-j_2_7_0/xalan.jar:$(JvmtiOutDir)
jvmtiGen
++endif
+
+ .PHONY: all jvmtidocs clean cleanall
+
Index: patches/patch-hotspot_build_bsd_makefiles_sa_make
===================================================================
RCS file: patches/patch-hotspot_build_bsd_makefiles_sa_make
diff -N patches/patch-hotspot_build_bsd_makefiles_sa_make
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-hotspot_build_bsd_makefiles_sa_make 1 Oct 2011
18:00:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- hotspot/build/bsd/makefiles/sa.make.orig Mon Sep 26 19:36:05 2011
++++ hotspot/build/bsd/makefiles/sa.make Mon Sep 26 20:17:48 2011
+@@ -28,7 +28,7 @@ AGENT_ALLFILES := $(shell /bin/test -d $(AGENT_DIR) &&
+
+ all:
+ if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
+- $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
++ echo Disabled $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
+ fi
+
+ $(GENERATED)/sa-jdi.jar: $(AGENT_ALLFILES)
Index: patches/patch-hotspot_make_Makefile
===================================================================
RCS file: patches/patch-hotspot_make_Makefile
diff -N patches/patch-hotspot_make_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-hotspot_make_Makefile 1 Oct 2011 18:00:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- hotspot/make/Makefile.orig Mon Sep 26 19:51:17 2011
++++ hotspot/make/Makefile Mon Sep 26 19:52:48 2011
+@@ -488,7 +488,7 @@ ifeq ($(OSNAME),bsd)
+ ifneq ($(ARCH),ia64)
+ # FIXME: Reenable when SA builds correctly.
+ # EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
++# EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
+ endif
+ endif
+
Index: patches/patch-j2se_make_common_Release_gmk
===================================================================
RCS file: patches/patch-j2se_make_common_Release_gmk
diff -N patches/patch-j2se_make_common_Release_gmk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-j2se_make_common_Release_gmk 1 Oct 2011 18:00:21 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- j2se/make/common/Release.gmk.orig Fri Sep 30 16:36:59 2011
++++ j2se/make/common/Release.gmk Fri Sep 30 17:18:19 2011
+@@ -487,6 +487,7 @@ $(NOT_RT_JAR_LIST): FRC
+ $(ECHO) "sun/tools/jstack/" >> $@
+ $(ECHO) "sun/tools/jinfo/" >> $@
+ $(ECHO) "sun/tools/jmap/" >> $@
++ $(ECHO) "java/net/URLClassLoader\$$4\$$1.class" >> $@
+
+
+ ifeq ($(PLATFORM), windows)
Index: patches/patch-j2se_make_java_text_Makefile
===================================================================
RCS file: patches/patch-j2se_make_java_text_Makefile
diff -N patches/patch-j2se_make_java_text_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-j2se_make_java_text_Makefile 1 Oct 2011 18:00:21 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- j2se/make/java/text/Makefile.orig Thu Sep 29 20:52:26 2011
++++ j2se/make/java/text/Makefile Thu Sep 29 21:16:38 2011
+@@ -62,18 +62,18 @@ BUILDER_CLASS = $(GENBIDOUT)/GenerateBreakIteratorData
+
+ $(BUILDER_CLASS): $(BUILDER)
+ $(prep-target)
+- $(JAVAC_BOOT) -d $(GENBIDOUT) -sourcepath $(GENBIDSRC) $(BUILDER)
++ $(JAVAC) -d $(GENBIDOUT) -sourcepath $(GENBIDSRC) $(BUILDER)
+ @$(java-vm-cleanup)
+
+ $(BIRULES_CLASS): $(BIRULES)
+ $(prep-target)
+- $(JAVAC_BOOT) -d $(GENBIDOUT) \
++ $(JAVAC) -d $(GENBIDOUT) \
+ -sourcepath $(SHARE_SRC)/classes/sun/text/resources $(BIRULES)
+ @$(java-vm-cleanup)
+
+ $(BIINFO_CLASS): $(BIINFO)
+ $(prep-target)
+- $(JAVAC_BOOT) -d $(GENBIDOUT) \
++ $(JAVAC) -d $(GENBIDOUT) \
+ -sourcepath $(SHARE_SRC)/classes/sun/text/resources $(BIINFO)
+ @$(java-vm-cleanup)
+
Index: patches/patch-j2se_make_sun_text_Makefile
===================================================================
RCS file: patches/patch-j2se_make_sun_text_Makefile
diff -N patches/patch-j2se_make_sun_text_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-j2se_make_sun_text_Makefile 1 Oct 2011 18:00:21 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- j2se/make/sun/text/Makefile.orig Thu Sep 29 21:14:15 2011
++++ j2se/make/sun/text/Makefile Thu Sep 29 21:15:00 2011
+@@ -72,7 +72,7 @@ BUILDER_CLASS = $(GENBIDOUT)/GenerateBreakIteratorData
+ $(GENBIDOUT)/SupplementaryCharacterData.class
+
+ $(BUILDER_CLASS): $(GENBIDOUT) $(BUILDER)
+- $(JAVAC_BOOT) -d $(GENBIDOUT) -sourcepath $(GENBIDSRC) $(BUILDER)
++ $(JAVAC) -d $(GENBIDOUT) -sourcepath $(GENBIDSRC) $(BUILDER)
+ @$(java-vm-cleanup)
+
+ $(GENBIDOUT):
+@@ -80,13 +80,13 @@ $(GENBIDOUT):
+
+ $(BIRULES_CLASS): $(GENBIDOUT)/sun/text/resources $(BIRULES)
+ $(RM) $@
+- $(JAVAC_BOOT) -d $(GENBIDOUT) \
++ $(JAVAC) -d $(GENBIDOUT) \
+ -sourcepath $(SHARE_SRC)/classes/sun/text/resources $(BIRULES)
+ @$(java-vm-cleanup)
+
+ $(BIINFO_CLASS): $(GENBIDOUT)/sun/text/resources $(BIINFO)
+ $(RM) $@
+- $(JAVAC_BOOT) -d $(GENBIDOUT) \
++ $(JAVAC) -d $(GENBIDOUT) \
+ -sourcepath $(SHARE_SRC)/classes/sun/text/resources $(BIINFO)
+ @$(java-vm-cleanup)
+
Index: patches/patch-j2se_src_share_classes_java_lang_Double_java
===================================================================
RCS file: patches/patch-j2se_src_share_classes_java_lang_Double_java
diff -N patches/patch-j2se_src_share_classes_java_lang_Double_java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-j2se_src_share_classes_java_lang_Double_java 1 Oct 2011
18:00:21 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- j2se/src/share/classes/java/lang/Double.java.orig Thu Sep 29 13:44:58
2011
++++ j2se/src/share/classes/java/lang/Double.java Thu Sep 29 13:45:43 2011
+@@ -59,7 +59,7 @@ public final class Double extends Number implements Co
+ * <code>0x1.fffffffffffffP+1023</code> and also equal to
+ * <code>Double.longBitsToDouble(0x7fefffffffffffffL)</code>.
+ */
+- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; //
1.7976931348623157e+308
++ public static final double MAX_VALUE = 1.7976931348623157e+308; //
0x1.fffffffffffffP+1023
+
+ /**
+ * A constant holding the smallest positive normal value of type
+@@ -69,7 +69,7 @@ public final class Double extends Number implements Co
+ *
+ * @since 1.6
+ */
+- public static final double MIN_NORMAL = 0x1.0p-1022; //
2.2250738585072014E-308
++ public static final double MIN_NORMAL = 2.2250738585072014E-308; //
0x1.0p-1022
+
+ /**
+ * A constant holding the smallest positive nonzero value of type
+@@ -78,7 +78,7 @@ public final class Double extends Number implements Co
+ * <code>0x0.0000000000001P-1022</code> and also equal to
+ * <code>Double.longBitsToDouble(0x1L)</code>.
+ */
+- public static final double MIN_VALUE = 0x0.0000000000001P-1022; //
4.9e-324
++ public static final double MIN_VALUE = 4.9e-324; //
0x0.0000000000001P-1022
+
+ /**
+ * Maximum exponent a finite {@code double} variable may have.
Index: patches/patch-j2se_src_share_classes_java_lang_Float_java
===================================================================
RCS file: patches/patch-j2se_src_share_classes_java_lang_Float_java
diff -N patches/patch-j2se_src_share_classes_java_lang_Float_java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-j2se_src_share_classes_java_lang_Float_java 1 Oct 2011
18:00:21 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- j2se/src/share/classes/java/lang/Float.java.orig Thu Sep 29 13:42:28 2011
++++ j2se/src/share/classes/java/lang/Float.java Thu Sep 29 13:45:01 2011
+@@ -59,7 +59,7 @@ public final class Float extends Number implements Com
+ * <code>0x1.fffffeP+127f</code> and also equal to
+ * <code>Float.intBitsToFloat(0x7f7fffff)</code>.
+ */
+- public static final float MAX_VALUE = 0x1.fffffeP+127f; //
3.4028235e+38f
++ public static final float MAX_VALUE = 3.4028235e+38f; //
0x1.fffffeP+127f
+
+ /**
+ * A constant holding the smallest positive normal value of type
+@@ -69,7 +69,7 @@ public final class Float extends Number implements Com
+ *
+ * @since 1.6
+ */
+- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
++ public static final float MIN_NORMAL = 1.17549435E-38f; // 0x1.0p-126f
+
+ /**
+ * A constant holding the smallest positive nonzero value of type
+@@ -77,7 +77,7 @@ public final class Float extends Number implements Com
+ * hexadecimal floating-point literal <code>0x0.000002P-126f</code>
+ * and also equal to <code>Float.intBitsToFloat(0x1)</code>.
+ */
+- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
++ public static final float MIN_VALUE = 1.4e-45f; // 0x0.000002P-126f
+
+ /**
+ * Maximum exponent a finite {@code float} variable may have. It
