summaryrefslogtreecommitdiff
path: root/java/jdk15/files
diff options
context:
space:
mode:
Diffstat (limited to 'java/jdk15/files')
-rw-r--r--java/jdk15/files/patch-control::common::Defs-bsd.gmk20
-rw-r--r--java/jdk15/files/patch-deploy::common::Defs-bsd.gmk13
-rw-r--r--java/jdk15/files/patch-deploy::common::config.gmk16
-rw-r--r--java/jdk15/files/patch-deploy::jvmnative::Makefile13
-rw-r--r--java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk15
-rw-r--r--java/jdk15/files/patch-deploy::ns7-adapter::Makefile15
-rw-r--r--java/jdk15/files/patch-deploy::nscore::Makefile15
-rw-r--r--java/jdk15/files/patch-j2se::awt::fontpath.c29
-rw-r--r--java/jdk15/files/patch-j2se::awt::mawt.gmk26
-rw-r--r--java/jdk15/files/patch-j2se::common::Defs-bsd.gmk22
-rw-r--r--java/jdk15/files/patch-j2se::font::Makefile13
-rw-r--r--java/jdk15/files/patch-j2se::instrument::Makefile15
-rw-r--r--java/jdk15/files/patch-j2se::util::Calendar.java92
-rw-r--r--java/jdk15/files/patch-j2se::xawt::Makefile13
14 files changed, 0 insertions, 317 deletions
diff --git a/java/jdk15/files/patch-control::common::Defs-bsd.gmk b/java/jdk15/files/patch-control::common::Defs-bsd.gmk
deleted file mode 100644
index 9eeb7b65c3c5..000000000000
--- a/java/jdk15/files/patch-control::common::Defs-bsd.gmk
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../../control/make/common/Defs-bsd.gmk.orig 2008-03-02 03:42:25.000000000 +0900
-+++ ../../control/make/common/Defs-bsd.gmk 2008-03-02 10:35:39.000000000 +0900
-@@ -114,7 +114,7 @@
-
-
- archExpr = case "`$(UNAME) -m`" in \
-- i[3-9]86) \
-+ i[3-9]86|pc98) \
- $(ECHO) i586 \
- ;; \
- ia64) \
-@@ -204,7 +204,7 @@
- ifeq ($(TRUE_PLATFORM), NetBSD)
- DEVTOOLS_PATH = /usr/pkg/bin/
- else
--DEVTOOLS_PATH = /usr/local/bin/
-+DEVTOOLS_PATH = ${LOCALBASE}/bin/
- endif
- # Allow the user to override the default value...
- ifdef ALT_DEVTOOLS_PATH
diff --git a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
deleted file mode 100644
index c3bd401665a1..000000000000
--- a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:51 2006
-+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Sun Dec 10 21:44:53 2006
-@@ -29,7 +29,7 @@
- endif
-
- # Default NSPR_PATH and allow override.
--NSPR_PATH = /usr/local
-+NSPR_PATH = $(LOCALBASE)
- ifdef ALT_NSPR_PATH
- NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH))
- endif
diff --git a/java/jdk15/files/patch-deploy::common::config.gmk b/java/jdk15/files/patch-deploy::common::config.gmk
deleted file mode 100644
index cc8d9bca67da..000000000000
--- a/java/jdk15/files/patch-deploy::common::config.gmk
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/plugin/common/config.gmk.orig Sun Dec 10 21:40:24 2006
-+++ ../../deploy/make/plugin/common/config.gmk Sun Dec 10 21:40:59 2006
-@@ -44,9 +44,9 @@
-
- ifeq ($(LINUX_OR_BSD), true)
- PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/solaris
-- OTHER_LDFLAGS = -L/usr/X11R6/lib
-+ OTHER_LDFLAGS = -L$(LOCALBASE)/lib
- ifeq ($(TRUE_PLATFORM), NetBSD)
-- OTHER_LDFLAGS += -Wl,-R/usr/X11R6/lib
-+ OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib
- endif
- endif
-
diff --git a/java/jdk15/files/patch-deploy::jvmnative::Makefile b/java/jdk15/files/patch-deploy::jvmnative::Makefile
deleted file mode 100644
index c34cd2ef67d9..000000000000
--- a/java/jdk15/files/patch-deploy::jvmnative::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/plugin/jvmnative/Makefile.orig Sun Dec 10 21:45:33 2006
-+++ ../../deploy/make/plugin/jvmnative/Makefile Sun Dec 10 21:45:54 2006
-@@ -16,7 +16,7 @@
-
- ifeq ($(PLATFORM), bsd)
- LDLIBS = -lm -lX11
--X11HDRDIR = /usr/X11R6/include
-+X11HDRDIR = $(LOCALBASE)/include
- else
- X11HDRDIR =
- ifeq ($(PLATFORM), linux)
diff --git a/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk
deleted file mode 100644
index 329918750ea2..000000000000
--- a/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/common/Defs-bsd.gmk.orig Sun Dec 10 18:30:50 2006
-+++ ../../deploy/make/common/Defs-bsd.gmk Sun Dec 10 18:31:22 2006
-@@ -13,8 +13,8 @@
- JUMP_EXE = $(BIN_DIR)/javaws$(SUFFIX)
- JUMP_EXE_DBG = $(BIN_DIR_DBG)/javaws$(DBG_SUFFIX)
- PATH_SEP = /
--X11DIR = /usr/X11R6
--LOCALDIR = /usr/local
-+X11DIR = $(LOCALBASE)
-+LOCALDIR = $(LOCALBASE)
- ifneq ($(TRUE_PLATFORM), NetBSD)
- LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv
- else
diff --git a/java/jdk15/files/patch-deploy::ns7-adapter::Makefile b/java/jdk15/files/patch-deploy::ns7-adapter::Makefile
deleted file mode 100644
index 70dd4533e762..000000000000
--- a/java/jdk15/files/patch-deploy::ns7-adapter::Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.orig Sat Jan 20 12:52:46 2007
-+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile Sat Jan 20 12:53:22 2007
-@@ -66,8 +66,8 @@
- COMMONDIR= $(PLUGIN_TOP)/src/plugin/solaris/common
- ifeq ($(PLATFORM), bsd)
- MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7)
--X11HDRDIR = /usr/X11R6/include
--ICONVHDRDIR = /usr/local/include
-+X11HDRDIR = $(LOCALBASE)/include
-+ICONVHDRDIR = $(LOCALBASE)/include
- NSPRHDRDIR = $(NSPR_HEADERS_PATH)
- else
- MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) \
diff --git a/java/jdk15/files/patch-deploy::nscore::Makefile b/java/jdk15/files/patch-deploy::nscore::Makefile
deleted file mode 100644
index 02feb9d6b594..000000000000
--- a/java/jdk15/files/patch-deploy::nscore::Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/plugin/nscore/unix/Makefile.orig Sun Dec 10 21:46:45 2006
-+++ ../../deploy/make/plugin/nscore/unix/Makefile Sun Dec 10 21:47:26 2006
-@@ -18,8 +18,8 @@
-
- ifeq ($(PLATFORM), bsd)
- LDLIBS = -lX11
--X11HDRDIR = /usr/X11R6/include
--ICONVHDRDIR = /usr/local/include
-+X11HDRDIR = $(LOCALBASE)/include
-+ICONVHDRDIR = $(LOCALBASE)/include
- else
- X11HDRDIR =
- ICONVHDRDIR =
diff --git a/java/jdk15/files/patch-j2se::awt::fontpath.c b/java/jdk15/files/patch-j2se::awt::fontpath.c
deleted file mode 100644
index d6e977139e99..000000000000
--- a/java/jdk15/files/patch-j2se::awt::fontpath.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/sun/awt/fontpath.c.orig Sun Dec 10 21:57:02 2006
-+++ ../../j2se/src/solaris/native/sun/awt/fontpath.c Sun Dec 10 21:58:43 2006
-@@ -98,18 +98,18 @@
- * various flavors of Linux
- */
- static char *fullLinuxFontPath[] = {
-- "/usr/X11R6/lib/X11/fonts/TrueType", /* RH 7.1+ */
-- "/usr/X11R6/lib/X11/fonts/truetype", /* SuSE */
-- "/usr/X11R6/lib/X11/fonts/tt",
-- "/usr/X11R6/lib/X11/fonts/TTF",
-- "/usr/X11R6/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */
-+ "%%LOCALBASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */
-+ "%%LOCALBASE%%/lib/X11/fonts/truetype", /* SuSE */
-+ "%%LOCALBASE%%/lib/X11/fonts/tt",
-+ "%%LOCALBASE%%/lib/X11/fonts/TTF",
-+ "%%LOCALBASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */
- "/usr/share/fonts/ja/TrueType", /* RH 7.2+ */
- "/usr/share/fonts/truetype",
- "/usr/share/fonts/ko/TrueType", /* RH 9.0 */
- "/usr/share/fonts/zh_CN/TrueType", /* RH 9.0 */
- "/usr/share/fonts/zh_TW/TrueType", /* RH 9.0 */
- "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType", /* Debian */
-- "/usr/X11R6/lib/X11/fonts/Type1",
-+ "%%LOCALBASE%%/lib/X11/fonts/Type1",
- "/usr/share/fonts/default/Type1", /* RH 9.0 */
- NULL, /* terminates the list */
- };
diff --git a/java/jdk15/files/patch-j2se::awt::mawt.gmk b/java/jdk15/files/patch-j2se::awt::mawt.gmk
deleted file mode 100644
index d14b8044357b..000000000000
--- a/java/jdk15/files/patch-j2se::awt::mawt.gmk
+++ /dev/null
@@ -1,26 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/make/sun/awt/mawt.gmk.orig Sun Dec 10 21:49:45 2006
-+++ ../../j2se/make/sun/awt/mawt.gmk Sun Dec 10 21:50:27 2006
-@@ -132,9 +132,9 @@
- ifeq ($(ARCH_DATA_MODEL), 64)
- LIBXT = -lXt
- else
-- LIBXT = /usr/X11R6/lib/libXt.a
-- LIBSM = /usr/X11R6/lib/libSM.a
-- LIBICE = /usr/X11R6/lib/libICE.a
-+ LIBXT = $(LOCALBASE)/lib/libXt.a
-+ LIBSM = $(LOCALBASE)/lib/libSM.a
-+ LIBICE = $(LOCALBASE)/lib/libICE.a
- endif
- endif
- else
-@@ -229,7 +229,7 @@
- $(EVENT_MODEL)
-
- ifeq ($(LINUX_OR_BSD), true)
-- CPPFLAGS += -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-+ CPPFLAGS += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/X11/extensions
- endif
-
- ifeq ($(PLATFORM), solaris)
diff --git a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
deleted file mode 100644
index a5ab5cf29827..000000000000
--- a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Mar 4 21:27:49 2007
-+++ ../../j2se/make/common/Defs-bsd.gmk Sun Mar 4 21:29:16 2007
-@@ -180,7 +180,7 @@
- ifeq ($(TRUE_PLATFORM), NetBSD)
- DEVTOOLS_PATH = /usr/pkg/bin/
- else
--DEVTOOLS_PATH = /usr/local/bin/
-+DEVTOOLS_PATH = $(LOCALBASE)/bin/
- endif
- # Allow the user to override the default value...
- ifdef ALT_DEVTOOLS_PATH
-@@ -432,7 +432,7 @@
- override LIBTHREAD =
- override MOOT_PRIORITIES = true
- override NO_INTERRUPTIBLE_IO = false
--override OPENWIN_HOME = /usr/X11R6
-+override OPENWIN_HOME = $(LOCALBASE)
- override OPENWIN_LIB = $(OPENWIN_HOME)/lib
- override OTHER_M4FLAGS = -DGNU_ASSEMBLER
- override SUN_CMM_SUBDIR =
diff --git a/java/jdk15/files/patch-j2se::font::Makefile b/java/jdk15/files/patch-j2se::font::Makefile
deleted file mode 100644
index da8093d867fa..000000000000
--- a/java/jdk15/files/patch-j2se::font::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/make/sun/font/Makefile.orig Sun Dec 10 21:51:17 2006
-+++ ../../j2se/make/sun/font/Makefile Sun Dec 10 21:51:50 2006
-@@ -125,7 +125,7 @@
- # setup the list of libraries to link in...
- ifeq ($(PLATFORM), bsd)
- # XXXBSD: why here?
--OTHER_INCLUDES += -I/usr/X11R6/include
-+OTHER_INCLUDES += -I$(LOCALBASE)/include
- OTHER_LDLIBS += -lawt$(SUFFIX) $(LIBM) $(LIBCXX)
- else
- ifeq ($(PLATFORM), linux)
diff --git a/java/jdk15/files/patch-j2se::instrument::Makefile b/java/jdk15/files/patch-j2se::instrument::Makefile
deleted file mode 100644
index 8934bfc11fe3..000000000000
--- a/java/jdk15/files/patch-j2se::instrument::Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005
-+++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005
-@@ -72,8 +72,8 @@
- else
- ifeq ($(PLATFORM), bsd)
- ifneq ($(TRUE_PLATFORM), NetBSD)
-- OTHER_INCLUDES += -I/usr/local/include
-- OTHER_LDLIBS += -L/usr/local/lib -liconv
-+ OTHER_INCLUDES += -I${LOCALBASE}/include
-+ OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv
- endif
- else
- OTHER_LDLIBS = -lnsl -ldl
diff --git a/java/jdk15/files/patch-j2se::util::Calendar.java b/java/jdk15/files/patch-j2se::util::Calendar.java
deleted file mode 100644
index 09a94a2e2c8e..000000000000
--- a/java/jdk15/files/patch-j2se::util::Calendar.java
+++ /dev/null
@@ -1,92 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/classes/java/util/Calendar.java.orig Fri Oct 5 03:18:28 2007
-+++ ../../j2se/src/share/classes/java/util/Calendar.java Sat Feb 28 09:34:02 2009
-@@ -23,9 +23,14 @@ package java.util;
- import java.io.IOException;
- import java.io.ObjectInputStream;
- import java.io.ObjectOutputStream;
-+import java.io.OptionalDataException;
- import java.io.Serializable;
-+import java.security.AccessControlContext;
- import java.security.AccessController;
-+import java.security.PermissionCollection;
-+import java.security.PrivilegedActionException;
- import java.security.PrivilegedExceptionAction;
-+import java.security.ProtectionDomain;
- import java.text.DateFormat;
- import sun.text.resources.LocaleData;
- import sun.util.BuddhistCalendar;
-@@ -2396,6 +2401,18 @@ public abstract class Calendar implements Serializable
- }
- }
-
-+ private static class CalendarAccessControlContext {
-+ private static final AccessControlContext INSTANCE;
-+ static {
-+ RuntimePermission perm = new RuntimePermission("accessClassInPackage.sun.util.calendar");
-+ PermissionCollection perms = perm.newPermissionCollection();
-+ perms.add(perm);
-+ INSTANCE = new AccessControlContext(new ProtectionDomain[] {
-+ new ProtectionDomain(null, perms)
-+ });
-+ }
-+ }
-+
- /**
- * Reconstitutes this object from a stream (i.e., deserialize it).
- */
-@@ -2425,17 +2442,30 @@ public abstract class Calendar implements Serializable
- serialVersionOnStream = currentSerialVersion;
-
- // If there's a ZoneInfo object, use it for zone.
-+ ZoneInfo zi = null;
- try {
-- ZoneInfo zi = (ZoneInfo) AccessController.doPrivileged(
-- new PrivilegedExceptionAction() {
-- public Object run() throws Exception {
-- return input.readObject();
-- }
-- });
-- if (zi != null) {
-- zone = zi;
-- }
-- } catch (Exception e) {
-+ zi = AccessController.doPrivileged(
-+ new PrivilegedExceptionAction<ZoneInfo>() {
-+ public ZoneInfo run() throws Exception {
-+ return (ZoneInfo) input.readObject();
-+ }
-+ },
-+ CalendarAccessControlContext.INSTANCE);
-+ } catch (PrivilegedActionException pae) {
-+ Exception e = pae.getException();
-+ if (!(e instanceof OptionalDataException)) {
-+ if (e instanceof RuntimeException) {
-+ throw (RuntimeException) e;
-+ } else if (e instanceof IOException) {
-+ throw (IOException) e;
-+ } else if (e instanceof ClassNotFoundException) {
-+ throw (ClassNotFoundException) e;
-+ }
-+ throw new RuntimeException(e);
-+ }
-+ }
-+ if (zi != null) {
-+ zone = zi;
- }
-
- // If the deserialized object has a SimpleTimeZone, try to
-@@ -2444,9 +2474,9 @@ public abstract class Calendar implements Serializable
- // implementation as much as possible.
- if (zone instanceof SimpleTimeZone) {
- String id = zone.getID();
-- TimeZone zi = TimeZone.getTimeZone(id);
-- if (zi != null && zi.hasSameRules(zone) && zi.getID().equals(id)) {
-- zone = zi;
-+ TimeZone tz = TimeZone.getTimeZone(id);
-+ if (tz != null && tz.hasSameRules(zone) && tz.getID().equals(id)) {
-+ zone = tz;
- }
- }
- }
diff --git a/java/jdk15/files/patch-j2se::xawt::Makefile b/java/jdk15/files/patch-j2se::xawt::Makefile
deleted file mode 100644
index f1ca39bbdf28..000000000000
--- a/java/jdk15/files/patch-j2se::xawt::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/make/sun/xawt/Makefile.orig Sun Dec 10 21:52:27 2006
-+++ ../../j2se/make/sun/xawt/Makefile Sun Dec 10 21:52:52 2006
-@@ -117,7 +117,7 @@
- endif
-
- ifeq ($(PLATFORM), bsd)
-- CPPFLAGS += -I/usr/X11R6/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
-+ CPPFLAGS += -I$(LOCALBASE)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
- endif
-
- ifeq ($(PLATFORM), solaris)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 03:24:48 +0000