aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2004-01-15 05:21:53 +0800
committerglewis <glewis@FreeBSD.org>2004-01-15 05:21:53 +0800
commitbe864a0f1925266f8efde8640f0303371ed589c4 (patch)
treef951cbb79c13af8194bf7615d227bfc959b96ba0 /java
parent5ed15a8e73704e41ad7b412e6b81c0db33c475a9 (diff)
downloadfreebsd-ports-graphics-be864a0f1925266f8efde8640f0303371ed589c4.tar.gz
freebsd-ports-graphics-be864a0f1925266f8efde8640f0303371ed589c4.tar.zst
freebsd-ports-graphics-be864a0f1925266f8efde8640f0303371ed589c4.zip
. 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
Diffstat (limited to 'java')
-rw-r--r--java/jdk14/Makefile6
-rw-r--r--java/jdk14/distinfo2
-rw-r--r--java/jdk14/files/cacertsbin0 -> 21653 bytes
-rw-r--r--java/jdk14/files/patch-deploy::common::Defs-bsd.gmk13
-rw-r--r--java/jdk14/files/patch-plugin::ns6::Makefile20
-rw-r--r--java/jdk14/files/patch-unpack::Makefile13
-rw-r--r--java/jdk14/pkg-plist4
-rw-r--r--java/jdk15/Makefile6
-rw-r--r--java/jdk15/distinfo2
-rw-r--r--java/jdk15/files/cacertsbin0 -> 21653 bytes
-rw-r--r--java/jdk15/files/patch-deploy::common::Defs-bsd.gmk13
-rw-r--r--java/jdk15/files/patch-plugin::ns6::Makefile20
-rw-r--r--java/jdk15/files/patch-unpack::Makefile13
-rw-r--r--java/jdk15/pkg-plist4
-rw-r--r--java/jdk16/Makefile6
-rw-r--r--java/jdk16/distinfo2
-rw-r--r--java/jdk16/files/cacertsbin0 -> 21653 bytes
-rw-r--r--java/jdk16/files/patch-deploy::common::Defs-bsd.gmk13
-rw-r--r--java/jdk16/files/patch-plugin::ns6::Makefile20
-rw-r--r--java/jdk16/files/patch-unpack::Makefile13
-rw-r--r--java/jdk16/pkg-plist4
21 files changed, 60 insertions, 114 deletions
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index cd832f39780..a89138f56b2 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
WRKSRC= ${WRKDIR}/control/make
JDK_VERSION= 1.4.2
-JDK_PATCHSET_VERSION= 5
+JDK_PATCHSET_VERSION= 6
SUN_LINUX_JDK_VERSION= 1.4.2
@@ -262,6 +262,10 @@ do-install:
cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
.endif
+ ${INSTALL_DATA} ${FILESDIR}/cacerts \
+ ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts
+ ${INSTALL_DATA} ${FILESDIR}/cacerts \
+ ${PREFIX}/jdk${JDK_VERSION}/jre/javaws/cacerts
post-install:
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
diff --git a/java/jdk14/distinfo b/java/jdk14/distinfo
index 1ebe6b524aa..35151efef55 100644
--- a/java/jdk14/distinfo
+++ b/java/jdk14/distinfo
@@ -1,3 +1,3 @@
MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65
MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc
-MD5 (bsd-jdk14-patches-5.tar.gz) = 2e1aac5a64910c8c476eca7061a237f3
+MD5 (bsd-jdk14-patches-6.tar.gz) = fe01a66ce4e8425f169c1b4a88d08f87
diff --git a/java/jdk14/files/cacerts b/java/jdk14/files/cacerts
new file mode 100644
index 00000000000..23c0c87b285
--- /dev/null
+++ b/java/jdk14/files/cacerts
Binary files differ
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 03d079961bd..00000000000
--- a/java/jdk14/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/jdk14/files/patch-plugin::ns6::Makefile b/java/jdk14/files/patch-plugin::ns6::Makefile
index f3ce7053dd4..ad15676d1b7 100644
--- a/java/jdk14/files/patch-plugin::ns6::Makefile
+++ b/java/jdk14/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/jdk14/files/patch-unpack::Makefile b/java/jdk14/files/patch-unpack::Makefile
deleted file mode 100644
index b4271b69d84..00000000000
--- a/java/jdk14/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)
diff --git a/java/jdk14/pkg-plist b/java/jdk14/pkg-plist
index 3dca22efb94..824f1bc4b29 100644
--- a/java/jdk14/pkg-plist
+++ b/java/jdk14/pkg-plist
@@ -956,8 +956,12 @@ jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir
jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index cd832f39780..a89138f56b2 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
WRKSRC= ${WRKDIR}/control/make
JDK_VERSION= 1.4.2
-JDK_PATCHSET_VERSION= 5
+JDK_PATCHSET_VERSION= 6
SUN_LINUX_JDK_VERSION= 1.4.2
@@ -262,6 +262,10 @@ do-install:
cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
.endif
+ ${INSTALL_DATA} ${FILESDIR}/cacerts \
+ ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts
+ ${INSTALL_DATA} ${FILESDIR}/cacerts \
+ ${PREFIX}/jdk${JDK_VERSION}/jre/javaws/cacerts
post-install:
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo
index 1ebe6b524aa..35151efef55 100644
--- a/java/jdk15/distinfo
+++ b/java/jdk15/distinfo
@@ -1,3 +1,3 @@
MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65
MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc
-MD5 (bsd-jdk14-patches-5.tar.gz) = 2e1aac5a64910c8c476eca7061a237f3
+MD5 (bsd-jdk14-patches-6.tar.gz) = fe01a66ce4e8425f169c1b4a88d08f87
diff --git a/java/jdk15/files/cacerts b/java/jdk15/files/cacerts
new file mode 100644
index 00000000000..23c0c87b285
--- /dev/null
+++ b/java/jdk15/files/cacerts
Binary files differ
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 03d079961bd..00000000000
--- 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 f3ce7053dd4..ad15676d1b7 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 b4271b69d84..00000000000
--- 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)
diff --git a/java/jdk15/pkg-plist b/java/jdk15/pkg-plist
index 3dca22efb94..824f1bc4b29 100644
--- a/java/jdk15/pkg-plist
+++ b/java/jdk15/pkg-plist
@@ -956,8 +956,12 @@ jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir
jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index cd832f39780..a89138f56b2 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
WRKSRC= ${WRKDIR}/control/make
JDK_VERSION= 1.4.2
-JDK_PATCHSET_VERSION= 5
+JDK_PATCHSET_VERSION= 6
SUN_LINUX_JDK_VERSION= 1.4.2
@@ -262,6 +262,10 @@ do-install:
cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
.endif
+ ${INSTALL_DATA} ${FILESDIR}/cacerts \
+ ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts
+ ${INSTALL_DATA} ${FILESDIR}/cacerts \
+ ${PREFIX}/jdk${JDK_VERSION}/jre/javaws/cacerts
post-install:
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index 1ebe6b524aa..35151efef55 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -1,3 +1,3 @@
MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65
MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc
-MD5 (bsd-jdk14-patches-5.tar.gz) = 2e1aac5a64910c8c476eca7061a237f3
+MD5 (bsd-jdk14-patches-6.tar.gz) = fe01a66ce4e8425f169c1b4a88d08f87
diff --git a/java/jdk16/files/cacerts b/java/jdk16/files/cacerts
new file mode 100644
index 00000000000..23c0c87b285
--- /dev/null
+++ b/java/jdk16/files/cacerts
Binary files differ
diff --git a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk
deleted file mode 100644
index 03d079961bd..00000000000
--- a/java/jdk16/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/jdk16/files/patch-plugin::ns6::Makefile b/java/jdk16/files/patch-plugin::ns6::Makefile
index f3ce7053dd4..ad15676d1b7 100644
--- a/java/jdk16/files/patch-plugin::ns6::Makefile
+++ b/java/jdk16/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/jdk16/files/patch-unpack::Makefile b/java/jdk16/files/patch-unpack::Makefile
deleted file mode 100644
index b4271b69d84..00000000000
--- a/java/jdk16/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)
diff --git a/java/jdk16/pkg-plist b/java/jdk16/pkg-plist
index 3dca22efb94..824f1bc4b29 100644
--- a/java/jdk16/pkg-plist
+++ b/java/jdk16/pkg-plist
@@ -956,8 +956,12 @@ jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf
+jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir
jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot