diff options
author | rene <rene@FreeBSD.org> | 2011-06-29 02:57:18 +0800 |
---|---|---|
committer | rene <rene@FreeBSD.org> | 2011-06-29 02:57:18 +0800 |
commit | 25a5c1f96c1187ec02cc2a067d9b332a888928f3 (patch) | |
tree | d0948469afc244690b9a4a2ea58da680bda57801 /java/jdk14/files | |
parent | 44b73f6603c1968195730290fc1b0019d21753ef (diff) | |
download | freebsd-ports-gnome-25a5c1f96c1187ec02cc2a067d9b332a888928f3.tar.gz freebsd-ports-gnome-25a5c1f96c1187ec02cc2a067d9b332a888928f3.tar.zst freebsd-ports-gnome-25a5c1f96c1187ec02cc2a067d9b332a888928f3.zip |
Remove expired port:
2011-04-17 java/jdk14: does not build on FreeBSD 7.x or newer
Diffstat (limited to 'java/jdk14/files')
-rw-r--r-- | java/jdk14/files/cacerts | bin | 21653 -> 0 bytes | |||
-rw-r--r-- | java/jdk14/files/disable-ipv6.patch | 15 | ||||
-rw-r--r-- | java/jdk14/files/patch-common::Defs-bsd.gmk | 41 | ||||
-rw-r--r-- | java/jdk14/files/patch-control::common::Defs-bsd.gmk | 13 | ||||
-rw-r--r-- | java/jdk14/files/patch-deploy::common::Defs-bsd.gmk | 13 | ||||
-rw-r--r-- | java/jdk14/files/patch-ipv6only | 131 | ||||
-rw-r--r-- | java/jdk14/files/patch-j2se::awt::awt_motif21.c | 13 | ||||
-rw-r--r-- | java/jdk14/files/patch-j2se::awt::fontpath.c | 19 | ||||
-rw-r--r-- | java/jdk14/files/patch-j2se::net::Inet4AddressImpl.c | 110 | ||||
-rw-r--r-- | java/jdk14/files/patch-j2se::zip::FILES_c.gmk | 18 | ||||
-rw-r--r-- | java/jdk14/files/patch-j2se::zip::Makefile | 31 | ||||
-rw-r--r-- | java/jdk14/files/patch-java_Makefile | 11 | ||||
-rw-r--r-- | java/jdk14/files/patch-plugin::common::config.gmk | 21 | ||||
-rw-r--r-- | java/jdk14/files/patch-plugin::ns6::Makefile | 13 | ||||
-rw-r--r-- | java/jdk14/files/patch-vm::os_bsd.cpp | 13 | ||||
-rw-r--r-- | java/jdk14/files/pkg-deinstall.in | 31 | ||||
-rw-r--r-- | java/jdk14/files/pkg-install.in | 57 | ||||
-rw-r--r-- | java/jdk14/files/testos.c | 81 |
18 files changed, 0 insertions, 631 deletions
diff --git a/java/jdk14/files/cacerts b/java/jdk14/files/cacerts Binary files differdeleted file mode 100644 index 23c0c87b2859..000000000000 --- a/java/jdk14/files/cacerts +++ /dev/null diff --git a/java/jdk14/files/disable-ipv6.patch b/java/jdk14/files/disable-ipv6.patch deleted file mode 100644 index 00ecbef516f5..000000000000 --- a/java/jdk14/files/disable-ipv6.patch +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/java/net/net_util_md.c.orig Tue Jan 27 17:31:03 2004 -+++ ../../j2se/src/solaris/native/java/net/net_util_md.c Tue Jan 27 17:31:38 2004 -@@ -166,6 +166,10 @@ - int fd; - void *ipv6_fn; - -+#ifdef __FreeBSD__ -+ return JNI_FALSE; -+#endif -+ - fd = JVM_Socket(AF_INET6, SOCK_STREAM, 0) ; - if (fd < 0) { - /* diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk deleted file mode 100644 index 9961a41e5476..000000000000 --- a/java/jdk14/files/patch-common::Defs-bsd.gmk +++ /dev/null @@ -1,41 +0,0 @@ -$FreeBSD$ ---- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Jun 3 10:46:29 2007 -+++ ../../j2se/make/common/Defs-bsd.gmk Sun Jun 3 11:04:08 2007 -@@ -40,15 +40,15 @@ - BASENAME = $(USRBIN_PATH)basename - CAT = $(UNIXCOMMAND_PATH)cat - ifneq ($(TRUE_PLATFORM), OpenBSD) --CC = $(COMPILER_PATH)gcc --CPP = $(COMPILER_PATH)gcc -E -+CC ?= $(COMPILER_PATH)gcc -+CPP ?= $(COMPILER_PATH)gcc -E - ifeq ($(STATIC_CXX),true) - # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++" - # We need to use gcc to statically link the C++ runtime. gcc and g++ use - # the same subprocess to compile C++ files, so it is OK to build using gcc. --CXX = $(COMPILER_PATH)gcc -+CXX ?= $(COMPILER_PATH)gcc - else --CXX = $(COMPILER_PATH)g++ -+CXX ?= $(COMPILER_PATH)g++ - endif - else - # Allow ports/pkgsrc infrastructure to override CC, CPP and CXX. -@@ -192,7 +192,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 -@@ -443,7 +443,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/jdk14/files/patch-control::common::Defs-bsd.gmk b/java/jdk14/files/patch-control::common::Defs-bsd.gmk deleted file mode 100644 index f9e45f642fa1..000000000000 --- a/java/jdk14/files/patch-control::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../control/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:22 2003 -+++ ../../control/make/common/Defs-bsd.gmk Wed Nov 12 16:51:41 2003 -@@ -212,7 +212,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/jdk14/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk deleted file mode 100644 index 6d002d730646..000000000000 --- a/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/common/Defs-bsd.gmk.orig Fri Dec 8 11:55:05 2006 -+++ ../../deploy/make/common/Defs-bsd.gmk Fri Dec 8 11:55:28 2006 -@@ -14,7 +14,7 @@ - JUMP_EXE = $(PROTO_DIR)/javawsbin$(SUFFIX) - CLASSPATH_SEP = $(CLASSPATH_SEPARATOR) - PATH_SEP = / --X11DIR = /usr/X11R6 -+X11DIR = $(LOCALBASE) - ifneq (,$(filter-out NetBSD DragonFly,$(TRUE_PLATFORM))) - LIBS = -L$(X11DIR)/lib -lX11 - else diff --git a/java/jdk14/files/patch-ipv6only b/java/jdk14/files/patch-ipv6only deleted file mode 100644 index 2be94884d76e..000000000000 --- a/java/jdk14/files/patch-ipv6only +++ /dev/null @@ -1,131 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig Mon Oct 31 21:54:39 2005 -+++ ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Nov 1 13:13:05 2005 -@@ -226,8 +226,15 @@ Java_java_net_PlainDatagramSocketImpl_bi - - NET_InetAddressToSockaddr(env, iaObj, localport, (struct sockaddr *)&him, &len); - #if defined(_ALLBSD_SOURCE) -- if (cannotMap4to6(env, iaObj)) -- return; -+#if defined(IPV6_V6ONLY) -+ if (((struct sockaddr *)&him)->sa_family == AF_INET6) { -+ int t = 0; -+ JVM_SetSockOpt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&t, sizeof(t)); -+ } -+#else -+ if (cannotMap4to6(env, iaObj)) -+ return; -+#endif /* IPV6_V6ONLY */ - #endif /* _ALLBSD_SOURCE */ - - -@@ -292,8 +299,15 @@ Java_java_net_PlainDatagramSocketImpl_co - - NET_InetAddressToSockaddr(env, address, port, (struct sockaddr *)&rmtaddr, &len); - #if defined(_ALLBSD_SOURCE) -- if (cannotMap4to6(env, address)) -- return; -+#if defined(IPV6_V6ONLY) -+ if (((struct sockaddr *)&rmtaddr)->sa_family == AF_INET6) { -+ int t = 0; -+ JVM_SetSockOpt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&t, sizeof(t)); -+ } -+#else -+ if (cannotMap4to6(env, address)) -+ return; -+#endif /* IPV6_V6ONLY */ - #endif /* _ALLBSD_SOURCE */ - - -@@ -2191,11 +2205,18 @@ static void mcast_join_leave(JNIEnv *env - jbyte caddr[16]; - jint family; - jint address; -+#if defined(_ALLBSD_SOURCE) && defined(IPV6_V6ONLY) -+ int t = 0; -+#endif - family = (*env)->GetIntField(env, iaObj, ia_familyID) == IPv4? AF_INET : AF_INET6; - - #if defined(_ALLBSD_SOURCE) -- if (cannotMap4to6(env, iaObj)) -- return; -+#if defined(IPV6_V6ONLY) -+ JVM_SetSockOpt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&t, sizeof(t)); -+#else -+ if (cannotMap4to6(env, iaObj)) -+ return; -+#endif /* IPV6_V6ONLY */ - #endif /* _ALLBSD_SOURCE */ - - if (family == AF_INET) { /* will convert to IPv4-mapped address */ ---- ../../j2se/src/solaris/native/java/net/PlainSocketImpl.c.orig Mon Oct 31 21:54:39 2005 -+++ ../../j2se/src/solaris/native/java/net/PlainSocketImpl.c Tue Nov 1 13:11:57 2005 -@@ -323,8 +323,15 @@ Java_java_net_PlainSocketImpl_socketConn - /* connect */ - NET_InetAddressToSockaddr(env, iaObj, port, (struct sockaddr *)&him, &len); - #if defined(_ALLBSD_SOURCE) -- if (cannotMap4to6(env, iaObj)) -- return; -+#if defined(IPV6_V6ONLY) -+ if (((struct sockaddr *)&him)->sa_family == AF_INET6) { -+ int t = 0; -+ JVM_SetSockOpt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&t, sizeof(t)); -+ } -+#else -+ if (cannotMap4to6(env, iaObj)) -+ return; -+#endif /* IPV6_V6ONLY */ - #endif /* _ALLBSD_SOURCE */ - - #ifdef AF_INET6 -@@ -579,8 +586,15 @@ Java_java_net_PlainSocketImpl_socketBind - /* bind */ - NET_InetAddressToSockaddr(env, iaObj, localport, (struct sockaddr *)&him, &len); - #if defined(_ALLBSD_SOURCE) -- if (cannotMap4to6(env, iaObj)) -- return; -+#if defined(IPV6_V6ONLY) -+ if (((struct sockaddr *)&him)->sa_family == AF_INET6) { -+ int t = 0; -+ JVM_SetSockOpt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&t, sizeof(t)); -+ } -+#else -+ if (cannotMap4to6(env, iaObj)) -+ return; -+#endif /* IPV6_V6ONLY */ - #endif /* _ALLBSD_SOURCE */ - - if (NET_Bind(fd, (struct sockaddr *)&him, len) < 0) { ---- ../../j2se/src/solaris/native/java/net/net_util_md.c.orig Mon Oct 31 21:54:39 2005 -+++ ../../j2se/src/solaris/native/java/net/net_util_md.c Tue Nov 1 13:14:35 2005 -@@ -1129,7 +1129,7 @@ NET_Bind(int fd, struct sockaddr *him, i - return rv; - } - --#if defined(_ALLBSD_SOURCE) -+#if defined(_ALLBSD_SOURCE) && !defined(IPV6_V6ONLY) - - /* - * If net.inet6.ip6.v6only is set to 1, then IPv4 mapped addresses usage ---- ../../j2se/src/solaris/native/java/net/net_util_md.h.orig Mon Oct 31 21:54:39 2005 -+++ ../../j2se/src/solaris/native/java/net/net_util_md.h Tue Nov 1 13:15:39 2005 -@@ -24,6 +24,9 @@ - #endif - #endif /* !_ALLBSD_SOURCE */ - -+#if defined(IPV6_V6ONLY) && defined(__OpenBSD__) -+#undef IPV6_V6ONLY -+#endif - /* - * Linux header files define sockaddr_in6 incorrectly (missing the - * sin6_scope_id field) so we use our own definition. -@@ -144,7 +147,7 @@ - /* - * Check for disabled IPv4 mapped addresses. - */ --#if defined(_ALLBSD_SOURCE) -+#if defined(_ALLBSD_SOURCE) && !defined(IPV6_V6ONLY) - int cannotMap4to6(JNIEnv *env, jobject iaObj); - #endif - diff --git a/java/jdk14/files/patch-j2se::awt::awt_motif21.c b/java/jdk14/files/patch-j2se::awt::awt_motif21.c deleted file mode 100644 index 9dfe145b32d4..000000000000 --- a/java/jdk14/files/patch-j2se::awt::awt_motif21.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/sun/awt/awt_motif21.c 14 Jan 2005 10:35:32 -0000 1.6 -+++ ../../j2se/src/solaris/native/sun/awt/awt_motif21.c 8 May 2007 22:05:37 -0000 -@@ -15,7 +15,7 @@ - #include "awt_p.h" - #include "awt_Component.h" - --#if (XmVersion == 2001) -+#if (XmVersion >= 2001) - #include <Xm/XmIm.h> - #else - #define XmPER_SHELL 0 diff --git a/java/jdk14/files/patch-j2se::awt::fontpath.c b/java/jdk14/files/patch-j2se::awt::fontpath.c deleted file mode 100644 index 502c7a751375..000000000000 --- a/java/jdk14/files/patch-j2se::awt::fontpath.c +++ /dev/null @@ -1,19 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/sun/awt/fontpath.c.orig Fri Dec 8 11:59:25 2006 -+++ ../../j2se/src/solaris/native/sun/awt/fontpath.c Fri Dec 8 12:00:06 2006 -@@ -495,10 +495,10 @@ - char *ptr; - - #if defined(__linux__) || defined(_ALLBSD_SOURCE) -- ptr = "/usr/X11R6/lib/X11/fonts/Type1:" -- "/usr/X11R6/lib/X11/fonts/TrueType:" -- "/usr/X11R6/lib/X11/fonts/tt:" -- "/usr/share/fonts/ja/TrueType"; -+ ptr = "%%LOCALBASE%%/lib/X11/fonts/Type1:" -+ "%%LOCALBASE%%/lib/X11/fonts/TrueType:" -+ "%%LOCALBASE%%/lib/X11/fonts/tt:" -+ "%%LOCALBASE%%/fonts/ja/TrueType"; - #elif defined( HEADLESS ) - ptr = getSolarisFontLocations(env, (int) (noType1==JNI_TRUE)); - #elif SCAN_FONT_DIRS diff --git a/java/jdk14/files/patch-j2se::net::Inet4AddressImpl.c b/java/jdk14/files/patch-j2se::net::Inet4AddressImpl.c deleted file mode 100644 index e51ce9259bb9..000000000000 --- a/java/jdk14/files/patch-j2se::net::Inet4AddressImpl.c +++ /dev/null @@ -1,110 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c.old Tue Jun 27 02:55:32 2006 -+++ ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c Tue Jun 27 02:55:35 2006 -@@ -13,6 +13,7 @@ - #include <string.h> - #include <stdlib.h> - #include <ctype.h> -+#include <pthread.h> - #if defined(_ALLBSD_SOURCE) - #include <unistd.h> - #if defined(__FreeBSD__) && __FreeBSD__ > 4 -@@ -312,6 +313,34 @@ - struct hostent *hptr, - HOST_R_ARGS); - -+/* -+ * BSDNOTE: Since we are emulating thread-safe functions, we need to -+ * ensure they're not running in parallel. So, setup mutexes -+ * -+ * XXXBSD: make sure it works as expected -+ * XXXBSD: move initialization to somethere earlier -+ */ -+ -+pthread_mutex_t _net_mutex = PTHREAD_MUTEX_INITIALIZER; -+static int _net_mutex_inited = 0; -+ -+static int -+_acquire_net_mutex() -+{ -+ if (_net_mutex_inited == 0) { -+ if (pthread_mutex_init(&_net_mutex, NULL)) -+ return (EINVAL); -+ _net_mutex_inited = 1; -+ } -+ return (pthread_mutex_lock(&_net_mutex)); -+} -+ -+static int -+_release_net_mutex() -+{ -+ return (pthread_mutex_unlock(&_net_mutex)); -+} -+ - #endif - - /************************************************************************ -@@ -355,15 +384,19 @@ - #ifdef __GLIBC__ - gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error); - #else -+ _acquire_net_mutex(); - hp = JDK_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error); -+ _release_net_mutex(); - #endif - if (hp) { - #ifdef __GLIBC__ - gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET, - &res2, buf2, sizeof(buf2), &hp, &h_error); - #else -+ _acquire_net_mutex(); - hp = JDK_gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET, - &res2, buf2, sizeof(buf2), &h_error); -+ _release_net_mutex(); - #endif - if (hp) { - /* -@@ -428,7 +461,9 @@ - #ifdef __GLIBC__ - gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error); - #else -+ _acquire_net_mutex(); - hp = JDK_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error); -+ _release_net_mutex(); - #endif - - /* With the re-entrant system calls, it's possible that the buffer -@@ -442,8 +477,10 @@ - gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE, - &hp, &h_error); - #else -+ _acquire_net_mutex(); - hp = JDK_gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE, - &h_error); -+ _release_net_mutex(); - #endif - } - } -@@ -531,8 +568,10 @@ - gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent, - buf, sizeof(buf), &hp, &h_error); - #else -+ _acquire_net_mutex(); - hp = JDK_gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent, - buf, sizeof(buf), &h_error); -+ _release_net_mutex(); - #endif - /* With the re-entrant system calls, it's possible that the buffer - * we pass to it is not large enough to hold an exceptionally -@@ -545,8 +584,10 @@ - gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, - &hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error); - #else -+ _acquire_net_mutex(); - hp = JDK_gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, - &hent, tmp, BIG_HENT_BUF_SIZE, &h_error); -+ _release_net_mutex(); - #endif - } else { - JNU_ThrowOutOfMemoryError(env, "getHostByAddr"); diff --git a/java/jdk14/files/patch-j2se::zip::FILES_c.gmk b/java/jdk14/files/patch-j2se::zip::FILES_c.gmk deleted file mode 100644 index dfe676c5b80a..000000000000 --- a/java/jdk14/files/patch-j2se::zip::FILES_c.gmk +++ /dev/null @@ -1,18 +0,0 @@ ---- ../../j2se/make/java/zip/FILES_c.gmk.orig Wed Sep 10 19:43:01 2003 -+++ ../../j2se/make/java/zip/FILES_c.gmk Sat Feb 11 00:55:54 2006 -@@ -8,15 +8,4 @@ - $(CTARGDIR)Inflater.c \ - $(CTARGDIR)ZipFile.c \ - $(CTARGDIR)ZipEntry.c \ -- $(CTARGDIR)zadler32.c \ -- $(CTARGDIR)zcrc32.c \ -- $(CTARGDIR)deflate.c \ -- $(CTARGDIR)trees.c \ -- $(CTARGDIR)zutil.c \ -- $(CTARGDIR)inflate.c \ -- $(CTARGDIR)infblock.c \ -- $(CTARGDIR)inftrees.c \ -- $(CTARGDIR)infcodes.c \ -- $(CTARGDIR)infutil.c \ -- $(CTARGDIR)inffast.c \ - $(CTARGDIR)zip_util.c diff --git a/java/jdk14/files/patch-j2se::zip::Makefile b/java/jdk14/files/patch-j2se::zip::Makefile deleted file mode 100644 index ed15182c29cc..000000000000 --- a/java/jdk14/files/patch-j2se::zip::Makefile +++ /dev/null @@ -1,31 +0,0 @@ ---- ../../j2se/make/java/zip/Makefile.orig Wed Sep 10 19:43:01 2003 -+++ ../../j2se/make/java/zip/Makefile Sat Feb 11 00:55:54 2006 -@@ -12,8 +12,6 @@ - PRODUCT = sun - include $(BUILDDIR)/common/Defs.gmk - --ZLIB_VERSION = 1.1.3 -- - # - # Files to compile. - # -@@ -58,13 +56,6 @@ - CPPFLAGS += -UDEBUG - endif - --CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) -- --# --# Add to ambient vpath so we pick up the library files --# --vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION) -- - # - # Has been converted to the JNI: generate JNI-style header files - # -@@ -73,4 +64,4 @@ - # - # Link to JVM library for JVM_Zip* functions - # --OTHER_LDLIBS = $(JVMLIB) -+OTHER_LDLIBS = -lz diff --git a/java/jdk14/files/patch-java_Makefile b/java/jdk14/files/patch-java_Makefile deleted file mode 100644 index 60585c522db4..000000000000 --- a/java/jdk14/files/patch-java_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ../../j2se/make/java/java/Makefile.orig Mon Dec 13 12:38:14 2004 -+++ ../../j2se/make/java/java/Makefile Mon Dec 13 12:42:00 2004 -@@ -284,7 +284,7 @@ - $(RM) -r $(TMPDIR)/GenerateCurrencyData - $(MKDIR) -p $(TMPDIR)/GenerateCurrencyData - $(JAVAC_BOOT) -d $(TMPDIR)/GenerateCurrencyData $(BUILDDIR)/tools/GenerateCurrencyData/GenerateCurrencyData.java -- $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties > $@ -+ $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties | egrep -v '^Java HotSpot' > $@ - - clean:: - $(RM) $(GENSRCDIR)/java/util/CurrencyData.java diff --git a/java/jdk14/files/patch-plugin::common::config.gmk b/java/jdk14/files/patch-plugin::common::config.gmk deleted file mode 100644 index 853ddbcd8ba1..000000000000 --- a/java/jdk14/files/patch-plugin::common::config.gmk +++ /dev/null @@ -1,21 +0,0 @@ ---- ../../deploy/make/plugin/common/config.gmk.orig 2008-04-26 01:00:47.000000000 +0200 -+++ ../../deploy/make/plugin/common/config.gmk 2008-04-26 01:11:03.000000000 +0200 -@@ -52,16 +52,15 @@ - - ifeq ($(PLATFORM), bsd) - PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris -- X11BASE = /usr/X11R6 - OTHER_LDFLAGS = -L$(X11BASE)/lib - ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM))) -- OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib -+ OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib - endif - DEF_SVR4 = - - # include search paths - # XXXBSD: these should be defined in other place -- CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include -+ CPPFLAGS1 += -I${LOCALBASE}/include - - ifeq ($(TRUE_PLATFORM), FreeBSD) - LDFLAGS_COMMON += -pthread diff --git a/java/jdk14/files/patch-plugin::ns6::Makefile b/java/jdk14/files/patch-plugin::ns6::Makefile deleted file mode 100644 index ad15676d1b7d..000000000000 --- a/java/jdk14/files/patch-plugin::ns6::Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/plugin/ns6/Makefile.orig Wed Jan 14 11:10:30 2004 -+++ ../../deploy/make/plugin/ns6/Makefile Wed Jan 14 11:12:11 2004 -@@ -46,7 +46,7 @@ - ifeq ($(TRUE_PLATFORM), FreeBSD) - # XXXBSD: is there any differences between nspr for ns610 and ns4 - # XXXBSD: direct /usr/local/include/nspr path is used!!! --EXTRA_CPPFLAGS += -I/usr/local/include/nspr -+EXTRA_CPPFLAGS += -I${LOCALBASE}/include/nspr - endif - ifeq ($(TRUE_PLATFORM), NetBSD) - EXTRA_CPPFLAGS += -I/usr/pkg/include/mozilla/nspr diff --git a/java/jdk14/files/patch-vm::os_bsd.cpp b/java/jdk14/files/patch-vm::os_bsd.cpp deleted file mode 100644 index 25bd71db866c..000000000000 --- a/java/jdk14/files/patch-vm::os_bsd.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig Tue Jan 27 17:54:28 2004 -+++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp Tue Jan 27 17:55:21 2004 -@@ -333,7 +333,7 @@ - #define malloc(n) (char*)NEW_C_HEAP_ARRAY(char, (n)) - #define getenv(n) ::getenv(n) - --#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */ -+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */ - #define EXTENSIONS_DIR "/lib/ext" - #define ENDORSED_DIR "/lib/endorsed" - diff --git a/java/jdk14/files/pkg-deinstall.in b/java/jdk14/files/pkg-deinstall.in deleted file mode 100644 index 94214557e4d9..000000000000 --- a/java/jdk14/files/pkg-deinstall.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# Set up a standard path -PATH=/usr/bin:/bin - -# Don't do anything during post-deinstall -if [ "$2" = "POST-DEINSTALL" ]; then - exit 0 -fi - -# Remove the plugin - -# Plugin location variables -BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" -JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns610" -PLUGIN=libjavaplugin_oji.so - -# Check if the package includes the plugin -if [ ! -e "${JAVAPLUGINDIR}/${PLUGIN}" ]; then - exit 0 -fi - -# See if the browser plugin is a link to the package plugin and remove it if so. -if [ -e "${BROWSERPLUGINDIR}/${PLUGIN}" -a \ - -L "${BROWSERPLUGINDIR}/${PLUGIN}" -a \ - x`ls -l "${BROWSERPLUGINDIR}/${PLUGIN}" 2>/dev/null | awk '/->/{print $NF;exit 0}END{exit 1}'` = x"${JAVAPLUGINDIR}/${PLUGIN}" ]; then - rm -f "${BROWSERPLUGINDIR}/${PLUGIN}" -fi - -exit 0 diff --git a/java/jdk14/files/pkg-install.in b/java/jdk14/files/pkg-install.in deleted file mode 100644 index a57551b91504..000000000000 --- a/java/jdk14/files/pkg-install.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# System preference location -JRE_HOME=%%JRE_HOME%% - -# Post-install actions -if [ "$2" = "POST-INSTALL" ]; then - # Set up system preferences - if [ ! -d "${JRE_HOME}/.systemPrefs" ] ; then - mkdir -m 755 "${JRE_HOME}/.systemPrefs" - fi - if [ ! -f "${JRE_HOME}/.systemPrefs/.system.lock" ] ; then - touch "${JRE_HOME}/.systemPrefs/.system.lock" - chmod 644 "${JRE_HOME}/.systemPrefs/.system.lock" - fi - if [ ! -f "${JRE_HOME}/.systemPrefs/.systemRootModFile" ] ; then - touch "${JRE_HOME}/.systemPrefs/.systemRootModFile" - chmod 644 "${JRE_HOME}/.systemPrefs/.systemRootModFile" - fi - - # Install the plugin - BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" - JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns610" - PLUGIN=libjavaplugin_oji.so - - # Check if the browser plugin exists - if [ ! -e "${JAVAPLUGINDIR}/${PLUGIN}" ]; then - exit 0 - fi - - # Check if the plugin directory exists. - if [ ! -d "${BROWSERPLUGINDIR}" ]; then - exit 0 - fi - - # Check if the browser plugin currently exists - if [ ! -e "${BROWSERPLUGINDIR}/${PLUGIN}" ]; then - # Create symbolic link - ln -sf "${JAVAPLUGINDIR}/${PLUGIN}" \ - "${BROWSERPLUGINDIR}/${PLUGIN}" - exit 0 - fi - - # If the browser plugin exists and is a symlink, but the link - # doesn't exist, then overwrite with our plugin. - if [ -L "${BROWSERPLUGINDIR}/${PLUGIN}" ]; then - # Check if the linked to file exists. - if [ ! -e `ls -l "${BROWSERPLUGINDIR}/${PLUGIN}" 2>/dev/null | awk '/->/{print $NF;exit 0}END{exit 1}'` ]; then - ln -sf "${JAVAPLUGINDIR}/${PLUGIN}" \ - "${BROWSERPLUGINDIR}/${PLUGIN}" - exit 0 - fi - fi - - exit 0 -fi diff --git a/java/jdk14/files/testos.c b/java/jdk14/files/testos.c deleted file mode 100644 index d1e77573e86b..000000000000 --- a/java/jdk14/files/testos.c +++ /dev/null @@ -1,81 +0,0 @@ -/*- - * Copyright (c) 2003 Alexey Zelkin <phantom@FreeBSD.org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * Test pthreads primitives for required functionality in order to run - * native FreeBSD JDK1.4.2 port. - * - * Returns: - * 0 - test passed - * 1 - general failure - * 200 - tests failed - * - * $FreeBSD$ - */ - -#include <stdio.h> -#include <pthread.h> -#include <pthread_np.h> - -#define TRY(call) { \ - if ((call) != 0) { \ - printf("LIBC_R TEST: Unexpected error. Report to MAINTAINER\n"); \ - exit(200); \ - } \ -} - -void * -doit(void *data) -{ - pthread_attr_t attr; - void *mystack = NULL; - - TRY(pthread_attr_init(&attr)); - TRY(pthread_attr_get_np(pthread_self(), &attr)); - TRY(pthread_attr_getstackaddr(&attr, &mystack)); - - if (mystack == NULL) { - printf("LIBC_R TEST FAILED: libc_r update required\n"); - exit(1); - } - - printf("LIBC_R TEST PASSED: All Ok\n"); - return(NULL); -} - -int -main() -{ - pthread_t tid; - pthread_attr_t attr; - - int sz = 128*1024; - - TRY(pthread_attr_init(&attr)); - TRY(pthread_attr_setstacksize(&attr, sz)); - TRY(pthread_create(&tid, &attr, doit, NULL)); - TRY(pthread_join(tid, NULL)); - - exit(0); -} |