aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--java/jdk15/Makefile11
-rw-r--r--java/jdk15/distinfo18
-rw-r--r--java/jdk15/files/patch-j2se::ttHints::HintScan.c24
-rw-r--r--java/jdk15/files/patch-vm::globals.hpp26
-rw-r--r--java/jdk15/files/patch-vm::os_bsd.cpp32
5 files changed, 14 insertions, 97 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 81deaf62ac28..385e397fb3bb 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,6 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= java devel
MASTER_SITES= # http://download.java.net/tiger/
@@ -54,10 +53,10 @@ POLICYFILE= jce_policy-${JDK_VERSION:S/./_/g}.zip
TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
JDK_VERSION= 1.5.0
-JDK_UPDATE_VERSION= 12
-JDK_PATCHSET_VERSION= 6
-JDK_BUILD_NUMBER= 04
-JDK_BUILD_DATE= 02_may_2007
+JDK_UPDATE_VERSION= 13
+JDK_PATCHSET_VERSION= 7
+JDK_BUILD_NUMBER= 05
+JDK_BUILD_DATE= 25_sep_2007
LATEST_LINK= jdk15
TZUPDATE_VERSION= 1.2.2
@@ -184,7 +183,7 @@ ECHO_MSG=/usr/bin/printf
IGNORE= :\n\
Due to licensing restrictions, certain files must be fetched manually.\n\n
.if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE})#{
-IGNORE += Please open http://download.java.net/tiger/archive/tiger_u12/\n\
+IGNORE += Please open http://download.java.net/tiger/\n\
in a web browser. Download the\n
.if !exists(${DISTDIR}/${JRL_SRCFILE})#{
IGNORE += Update ${JDK_UPDATE_VERSION} Source, ${JRL_SRCFILE}
diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo
index 2f3930495506..a8591eabf1bc 100644
--- a/java/jdk15/distinfo
+++ b/java/jdk15/distinfo
@@ -1,12 +1,12 @@
-MD5 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = deb204740d2f8a799ba8658c8c768ebe
-SHA256 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 8b93abe500d58a9b2d766ded6f9041e8bc457b785e6751e0e3d1d8308ed23a3f
-SIZE (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 57752561
-MD5 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 80996fbf2db79d9fa4a75e17bc1f6551
-SHA256 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 886c57a62f6691954269a84d4cd0a32c8d61eb4e04c4028933e0e9bfae2cf999
-SIZE (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 2211514
-MD5 (bsd-jdk15-patches-6.tar.bz2) = 9277d3624b9879583c1dc74c798321e2
-SHA256 (bsd-jdk15-patches-6.tar.bz2) = 6f9c225db85f63a0b9c41f0eab50c3e3394dbe163f6cc8d936f2afe76010cdd1
-SIZE (bsd-jdk15-patches-6.tar.bz2) = 777561
+MD5 (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = 84407460d418f12b232ad3d9fdc20326
+SHA256 (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = df0f41c928e526be4e5cd7ec4870ae5af3537fb2cb48afa9d4c044f59004a0e0
+SIZE (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = 57749554
+MD5 (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = 7afca5dd3e2006ff71efa377e1d3dd75
+SHA256 (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = 9c14f976fb4e8b044aef3087d37dff79483ea1ef8928eb5162e4b5642a0e99ce
+SIZE (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = 2211512
+MD5 (bsd-jdk15-patches-7.tar.bz2) = ee8ded1aa4d0cd573227049be75c293c
+SHA256 (bsd-jdk15-patches-7.tar.bz2) = 2c5b83da23234e215f50997a6c2ca7de900951828df777a21089c18e76702370
+SIZE (bsd-jdk15-patches-7.tar.bz2) = 778641
MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
SIZE (jce_policy-1_5_0.zip) = 8826
diff --git a/java/jdk15/files/patch-j2se::ttHints::HintScan.c b/java/jdk15/files/patch-j2se::ttHints::HintScan.c
deleted file mode 100644
index 10f4a6c176a8..000000000000
--- a/java/jdk15/files/patch-j2se::ttHints::HintScan.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/native/sun/font/t2k/ttHints/HintScan.c 6 Mar 2007 16:53:10 -0000 1.1.1.2
-+++ ../../j2se/src/share/native/sun/font/t2k/ttHints/HintScan.c 31 Jul 2007 04:07:56 -0000
-@@ -34,8 +34,6 @@
-
- #include "HintScan.h"
-
--#include "cpu.h" //for fastint
--
- /* copy macros as temporal solution - straightforward including cause compilation issues */
- #define F26Dot6ToFixed(x) ((x) << 10)
- #define IntToFixed(a) ((Fixed)(a) << 16)
-@@ -208,8 +206,8 @@
- F26Dot6 *v, tv, vmin, vmax, ctr;
- F26Dot6 xmin, xmax, ymin, ymax;
- tt_int32 n;
-- fastInt aPoint, startPoint, endPoint;
-- fastInt firstTime = true;
-+ short aPoint, startPoint, endPoint;
-+ short firstTime = true;
- tt_int32 numPts = 0;
-
- if (t->numberOfContours > 0) {
diff --git a/java/jdk15/files/patch-vm::globals.hpp b/java/jdk15/files/patch-vm::globals.hpp
deleted file mode 100644
index 04d6c38413ed..000000000000
--- a/java/jdk15/files/patch-vm::globals.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot/src/share/vm/runtime/globals.hpp.orig Wed May 2 04:01:50 2007
-+++ ../../hotspot/src/share/vm/runtime/globals.hpp Tue Sep 18 21:40:44 2007
-@@ -130,6 +130,12 @@
- #define falseInProduct true
- #endif
-
-+#if defined(_ALLBSD_SOURCE)
-+#define OSUseThreadPriorities false
-+#else
-+#define OSUseThreadPriorities true
-+#endif
-+
- // develop flags are settable / visible only during development and are constant in the PRODUCT version
- // product flags are always settable / visible
-
-@@ -2546,7 +2552,7 @@
- "beginning to throw OutOfMemoryErrors in each compile") \
- \
- /* Priorities */ \
-- product(bool, UseThreadPriorities, true, \
-+ product(bool, UseThreadPriorities, OSUseThreadPriorities, \
- "Use native thread priorities") \
- \
- product(intx, ThreadPriorityPolicy, 0, \
diff --git a/java/jdk15/files/patch-vm::os_bsd.cpp b/java/jdk15/files/patch-vm::os_bsd.cpp
deleted file mode 100644
index fc7bbfd757f0..000000000000
--- a/java/jdk15/files/patch-vm::os_bsd.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig Mon Sep 17 21:03:04 2007
-+++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp Tue Sep 18 21:36:51 2007
-@@ -2271,13 +2271,7 @@
- if (thread->is_Java_thread()) {
- ThreadBlockInVM tbivm((JavaThread*) thread);
-
--// BSDXXX: Only use pthread_yield here and below if the system thread
--// scheduler gives time slices to lower priority threads when yielding.
--#ifdef __FreeBSD__
-- os_sleep(MinSleepInterval, interruptible);
--#else
- pthread_yield();
--#endif
-
- #if SOLARIS
- // XXX - This code was not exercised during the Merlin RC1
-@@ -2297,13 +2291,7 @@
- return 0;
- }
-
--// BSDXXX: Only use pthread_yield here and above if the system thread
--// scheduler gives time slices to lower priority threads when yielding.
--#ifdef __FreeBSD__
-- os_sleep(MinSleepInterval, interruptible);
--#else
- pthread_yield();
--#endif
- return 0;
- }
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 15:10:45 +0000