diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-01-14 21:21:53 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-01-14 21:21:53 +0000 |
| commit | df0cd23644421a7cdfe364c043334cd4a7aefd68 (patch) | |
| tree | e0ffad95e76b610315161c135f1f2ded4c684f25 /java/jdk15/files | |
| parent | - Update to 0.15.13.2, to fix Alpha SIGFPE (we use -mieee now) (diff) | |
. Update to 1.4.2 patchset 6.
. Install the cacerts file from Sun's 1.4.2_03 release to avoid some
problems associated with expired root certificates described in:
http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsalert%2F57436
Hopefully not objected to by: phantom
Notes
Notes:
svn path=/head/; revision=98174
Diffstat (limited to 'java/jdk15/files')
| -rw-r--r-- | java/jdk15/files/cacerts | bin | 0 -> 21653 bytes | |||
| -rw-r--r-- | java/jdk15/files/patch-deploy::common::Defs-bsd.gmk | 13 | ||||
| -rw-r--r-- | java/jdk15/files/patch-plugin::ns6::Makefile | 20 | ||||
| -rw-r--r-- | java/jdk15/files/patch-unpack::Makefile | 13 |
4 files changed, 10 insertions, 36 deletions
diff --git a/java/jdk15/files/cacerts b/java/jdk15/files/cacerts Binary files differnew file mode 100644 index 000000000000..23c0c87b2859 --- /dev/null +++ b/java/jdk15/files/cacerts 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 03d079961bde..000000000000 --- a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:55 2003 -+++ ../../deploy/make/common/Defs-bsd.gmk Wed Nov 12 16:53:08 2003 -@@ -10,7 +10,7 @@ - # XXXBSD: this issue need to be rehashed (/usr/local/ should be defined - # in other place - ifeq ($(TRUE_PLATFORM), FreeBSD) --USR_LOCAL_PATH = /usr/local/ -+USR_LOCAL_PATH = ${LOCALBASE}/ - endif - - BUNDLE_SUFFIX = .zip diff --git a/java/jdk15/files/patch-plugin::ns6::Makefile b/java/jdk15/files/patch-plugin::ns6::Makefile index f3ce7053dd48..ad15676d1b7d 100644 --- a/java/jdk15/files/patch-plugin::ns6::Makefile +++ b/java/jdk15/files/patch-plugin::ns6::Makefile @@ -1,13 +1,13 @@ $FreeBSD$ ---- ../../deploy/make/plugin/ns6/Makefile.orig Wed Nov 12 16:54:05 2003 -+++ ../../deploy/make/plugin/ns6/Makefile Wed Nov 12 16:54:22 2003 -@@ -37,7 +37,7 @@ +--- ../../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$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610/nspr -DRAPTOR_API -DNEW_STREAMING_API - --EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I/usr/local/include/nspr -DRAPTOR_API -DNEW_STREAMING_API -+EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I${LOCALBASE}/include/nspr -DRAPTOR_API -DNEW_STREAMING_API - - vpath %.c $(SRCDIR):$(SRCDIR)/../common: - vpath %.cpp $(SRCDIR):$(SRCDIR)/../common:$(SHARED_DIR2)/jcomponent +-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/jdk15/files/patch-unpack::Makefile b/java/jdk15/files/patch-unpack::Makefile deleted file mode 100644 index b4271b69d843..000000000000 --- a/java/jdk15/files/patch-unpack::Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/tools/pack-unpack/unpack/Makefile.orig Thu Nov 13 13:07:59 2003 -+++ ../../j2se/make/tools/pack-unpack/unpack/Makefile Thu Nov 13 13:07:43 2003 -@@ -50,7 +50,7 @@ - ifeq ($(PLATFORM), bsd) - OBJOUTPUT = -o #Caution:the space after the -o is significant!. - LNKOUTPUT = $(OBJOUTPUT) --LINK = $(CXX) -+LINK = g++ - else - OBJOUTPUT = -o #Caution:the space after the -o is significant!. - LNKOUTPUT = $(OBJOUTPUT) |