diff options
24 files changed, 220 insertions, 1200 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index 4a79c0e..54dc1d4 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/j2sdk1.3.1/make JDK_VERSION= 1.3.1 -JDK_PATCHSET_VERSION= 3 +JDK_PATCHSET_VERSION= 4 JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} @@ -40,7 +40,7 @@ MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \ LD_LIBRARY_PATH="" \ JAVA_COMPILER="" ALL_TARGET= all images -TAR= gtar +TAR= gtar # Necessary for proper extraction of sources BSD_TAR= /usr/bin/tar PLIST_SUB+= JDK_VERSION=${JDK_VERSION} @@ -87,6 +87,6 @@ do-install: .endif post-install: - ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # JDK${JDK_VERSION}" + ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" .include <bsd.port.post.mk> diff --git a/java/jdk13/distinfo b/java/jdk13/distinfo index 1cb48e4..faa546d 100644 --- a/java/jdk13/distinfo +++ b/java/jdk13/distinfo @@ -1,2 +1,2 @@ MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57 -MD5 (bsd-jdk131-patches-3.tar.gz) = c3798cbb4f2a69cbb87e699511144f27 +MD5 (bsd-jdk131-patches-4.tar.gz) = ec4725aad2b59f6237372f2e97889183 diff --git a/java/jdk13/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh b/java/jdk13/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh new file mode 100644 index 0000000..d3371e1 --- /dev/null +++ b/java/jdk13/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh @@ -0,0 +1,28 @@ + +$FreeBSD$ + +--- ../src/solaris/bin/java_wrapper_bsd.sh.orig Mon Sep 10 12:20:57 2001 ++++ ../src/solaris/bin/java_wrapper_bsd.sh Mon Sep 10 14:23:56 2001 +@@ -121,13 +121,17 @@ + export _JVM_THREADS_TYPE + fi + +-# Set LD_LIBRARY_PATH for hotspot VM. +-#j=`$jre/bin/realpath $jre` +-ld="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}" ++# If jre is in a jre subdir, include parent dir libraries in lib path. This ++# needs to be cleaned up because -Xrun libraries are the ones that need it. ++if [ "${jre}" = "${JREHOME}" ]; then ++ JAVA_LIBRARY_PATH=":${jre}/../lib/${proc}" ++fi ++# Set LD_LIBRARY_PATH for thread type, VM type and standard native libraries. ++JAVA_LIBRARY_PATH="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}${JAVA_LIBRARY_PATH}" + if [ -z "$LD_LIBRARY_PATH" ]; then +- LD_LIBRARY_PATH="$ld" ++ LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}" + else +- LD_LIBRARY_PATH="$ld:$LD_LIBRARY_PATH" ++ LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}:$LD_LIBRARY_PATH" + fi + export LD_LIBRARY_PATH + diff --git a/java/jdk13/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd b/java/jdk13/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd deleted file mode 100644 index 3b41788..0000000 --- a/java/jdk13/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd +++ /dev/null @@ -1,270 +0,0 @@ - -$FreeBSD$ - ---- ../src/solaris/classes/sun/awt/motif/font.properties.bsd.orig Mon Aug 27 21:05:08 2001 -+++ ../src/solaris/classes/sun/awt/motif/font.properties.bsd Mon Aug 27 21:06:33 2001 -@@ -1,7 +1,7 @@ - # --# @(#)font.properties.linux 1.3 00/03/23 -+# @(#)font.properties.linux 1.7 01/04/21 - # --# Copyright 1997 by Sun Microsystems, Inc., -+# Copyright 1997-2001 by Sun Microsystems, Inc., - # 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. - # All rights reserved. - # -@@ -13,139 +13,80 @@ - # - - # --# Linux version derived from the version for SunOS 5.5.1 Notice that -+# FreeBSD version derived from the Linux version derived from the -+# version for SunOS 5.5.1 Notice that - # we use the .ttf files shipped in the JDK distribution. - # - - # Serif font definition - # - serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.italic.1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.bold.1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.bolditalic.1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # SansSerif font definition - # - sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Monospaced font definition - # - monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+monospaced.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Dialog font definition - # - dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # DialogInput font definition - # - dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+dialoginput.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Default font definition - # -@@ -175,34 +116,19 @@ - # has can be judged with the isCovered() method of instance of SpecialSymbols. - # - fontcharset.serif.0=sun.io.CharToByteISO8859_1 --fontcharset.serif.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.serif.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.serif.2=sun.awt.CharToByteSymbol -+fontcharset.serif.1=sun.awt.CharToByteSymbol - - fontcharset.sansserif.0=sun.io.CharToByteISO8859_1 --fontcharset.sansserif.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.sansserif.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.sansserif.2=sun.awt.CharToByteSymbol -+fontcharset.sansserif.1=sun.awt.CharToByteSymbol - - fontcharset.monospaced.0=sun.io.CharToByteISO8859_1 --fontcharset.monospaced.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.monospaced.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.monospaced.2=sun.awt.CharToByteSymbol -+fontcharset.monospaced.1=sun.awt.CharToByteSymbol - - fontcharset.dialog.0=sun.io.CharToByteISO8859_1 --fontcharset.dialog.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.dialog.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.dialog.2=sun.awt.CharToByteSymbol -+fontcharset.dialog.1=sun.awt.CharToByteSymbol - - fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1 --fontcharset.dialoginput.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.dialoginput.2=sun.awt.CharToByteSymbol -+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol - - #replace font line if you have zapf fonts - #fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1 -@@ -232,16 +158,16 @@ - -b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.italic=\ ---b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.bold=\ ---b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.bolditalic=\ ---b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.plain=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.monospaced.italic=\ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -@@ -256,16 +182,16 @@ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 - - fontset.dialog.italic=\ ---b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.bold=\ ---b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.bolditalic=\ ---b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.plain=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialoginput.italic=\ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -@@ -285,5 +211,5 @@ - - # - fontset.default=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - # diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk index 9c15fd2..407ca64 100644 --- a/java/jdk13/files/patch-common::Defs-bsd.gmk +++ b/java/jdk13/files/patch-common::Defs-bsd.gmk @@ -1,21 +1,18 @@ $FreeBSD$ ---- common/Defs-bsd.gmk.orig Mon Aug 27 13:56:54 2001 -+++ common/Defs-bsd.gmk Mon Aug 27 14:01:42 2001 -@@ -220,11 +220,11 @@ +--- common/Defs-bsd.gmk.orig Mon Sep 10 17:02:16 2001 ++++ common/Defs-bsd.gmk Mon Sep 10 17:02:42 2001 +@@ -221,10 +221,10 @@ else # ARCH CFLAGS_COMMON = $(GCC_WARNINGS) endif # ARCH -CFLAGS_OPT = $(POPT) --CFLAGS_DBG = -g +CFLAGS_OPT = $(POPT) $(SYS_CFLAGS) -+CFLAGS_DBG = -g3 + CFLAGS_DBG = -g3 CXXFLAGS_COMMON = $(GCC_WARNINGS) -CXXFLAGS_OPT = $(POPT) --CXXFLAGS_DBG = -g +CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS) -+CXXFLAGS_DBG = -g3 + CXXFLAGS_DBG = -g3 CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \ - -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -D_LITTLE_ENDIAN -DLOGGING diff --git a/java/jdk13/pkg-plist b/java/jdk13/pkg-plist index 8154da9..fdd0eaf 100644 --- a/java/jdk13/pkg-plist +++ b/java/jdk13/pkg-plist @@ -583,23 +583,23 @@ jdk%%JDK_VERSION%%/include-old/alloc_cache.h jdk%%JDK_VERSION%%/include-old/bag.h jdk%%JDK_VERSION%%/include-old/bool.h jdk%%JDK_VERSION%%/include-old/breakpoints.h -jdk%%JDK_VERSION%%/include-old/bsd/byteorder_md.h -jdk%%JDK_VERSION%%/include-old/bsd/gc_md.h -jdk%%JDK_VERSION%%/include-old/bsd/hpi_md.h -jdk%%JDK_VERSION%%/include-old/bsd/io_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jawt_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jmath_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jvm_md.h -jdk%%JDK_VERSION%%/include-old/bsd/miscdefs_md.h -jdk%%JDK_VERSION%%/include-old/bsd/path_md.h -jdk%%JDK_VERSION%%/include-old/bsd/sysmacros_md.h -jdk%%JDK_VERSION%%/include-old/bsd/timeval_md.h -jdk%%JDK_VERSION%%/include-old/bsd/typedefs_md.h jdk%%JDK_VERSION%%/include-old/byteorder.h jdk%%JDK_VERSION%%/include-old/common_exceptions.h jdk%%JDK_VERSION%%/include-old/debug.h jdk%%JDK_VERSION%%/include-old/dll.h jdk%%JDK_VERSION%%/include-old/exceptions.h +jdk%%JDK_VERSION%%/include-old/freebsd/byteorder_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/gc_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/hpi_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/io_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jawt_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jmath_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jvm_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/miscdefs_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/path_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/sysmacros_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/timeval_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/typedefs_md.h jdk%%JDK_VERSION%%/include-old/gc.h jdk%%JDK_VERSION%%/include-old/hpi.h jdk%%JDK_VERSION%%/include-old/interpreter.h @@ -633,8 +633,8 @@ jdk%%JDK_VERSION%%/include-old/utf.h jdk%%JDK_VERSION%%/include-old/util.h jdk%%JDK_VERSION%%/include-old/vmprofiler.h jdk%%JDK_VERSION%%/include-old/wrap.h -jdk%%JDK_VERSION%%/include/bsd/jawt_md.h -jdk%%JDK_VERSION%%/include/bsd/jni_md.h +jdk%%JDK_VERSION%%/include/freebsd/jawt_md.h +jdk%%JDK_VERSION%%/include/freebsd/jni_md.h jdk%%JDK_VERSION%%/include/jawt.h jdk%%JDK_VERSION%%/include/jni.h jdk%%JDK_VERSION%%/include/jvmdi.h @@ -789,8 +789,8 @@ jdk%%JDK_VERSION%%/src.jar @unexec rmdir %D/share/java/classes 2>/dev/null || true @unexec rmdir %D/share/java 2>/dev/null || true @unexec rmdir %D/share/doc/java 2>/dev/null || true -@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%" -@unexec %D/bin/unregistervm JDK%%JDK_VERSION%% +@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%" +@unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%% @dirrm jdk%%JDK_VERSION%%/man/man1 @dirrm jdk%%JDK_VERSION%%/man @dirrm jdk%%JDK_VERSION%%/lib/i386 @@ -812,8 +812,8 @@ jdk%%JDK_VERSION%%/src.jar @dirrm jdk%%JDK_VERSION%%/jre/bin/i386 @dirrm jdk%%JDK_VERSION%%/jre/bin @dirrm jdk%%JDK_VERSION%%/jre -@dirrm jdk%%JDK_VERSION%%/include/bsd -@dirrm jdk%%JDK_VERSION%%/include-old/bsd +@dirrm jdk%%JDK_VERSION%%/include/freebsd +@dirrm jdk%%JDK_VERSION%%/include-old/freebsd @dirrm jdk%%JDK_VERSION%%/include-old @dirrm jdk%%JDK_VERSION%%/include @dirrm jdk%%JDK_VERSION%%/demo/sound/src diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index 4a79c0e..54dc1d4 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/j2sdk1.3.1/make JDK_VERSION= 1.3.1 -JDK_PATCHSET_VERSION= 3 +JDK_PATCHSET_VERSION= 4 JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} @@ -40,7 +40,7 @@ MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \ LD_LIBRARY_PATH="" \ JAVA_COMPILER="" ALL_TARGET= all images -TAR= gtar +TAR= gtar # Necessary for proper extraction of sources BSD_TAR= /usr/bin/tar PLIST_SUB+= JDK_VERSION=${JDK_VERSION} @@ -87,6 +87,6 @@ do-install: .endif post-install: - ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # JDK${JDK_VERSION}" + ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" .include <bsd.port.post.mk> diff --git a/java/jdk14/distinfo b/java/jdk14/distinfo index 1cb48e4..faa546d 100644 --- a/java/jdk14/distinfo +++ b/java/jdk14/distinfo @@ -1,2 +1,2 @@ MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57 -MD5 (bsd-jdk131-patches-3.tar.gz) = c3798cbb4f2a69cbb87e699511144f27 +MD5 (bsd-jdk131-patches-4.tar.gz) = ec4725aad2b59f6237372f2e97889183 diff --git a/java/jdk14/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh b/java/jdk14/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh new file mode 100644 index 0000000..d3371e1 --- /dev/null +++ b/java/jdk14/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh @@ -0,0 +1,28 @@ + +$FreeBSD$ + +--- ../src/solaris/bin/java_wrapper_bsd.sh.orig Mon Sep 10 12:20:57 2001 ++++ ../src/solaris/bin/java_wrapper_bsd.sh Mon Sep 10 14:23:56 2001 +@@ -121,13 +121,17 @@ + export _JVM_THREADS_TYPE + fi + +-# Set LD_LIBRARY_PATH for hotspot VM. +-#j=`$jre/bin/realpath $jre` +-ld="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}" ++# If jre is in a jre subdir, include parent dir libraries in lib path. This ++# needs to be cleaned up because -Xrun libraries are the ones that need it. ++if [ "${jre}" = "${JREHOME}" ]; then ++ JAVA_LIBRARY_PATH=":${jre}/../lib/${proc}" ++fi ++# Set LD_LIBRARY_PATH for thread type, VM type and standard native libraries. ++JAVA_LIBRARY_PATH="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}${JAVA_LIBRARY_PATH}" + if [ -z "$LD_LIBRARY_PATH" ]; then +- LD_LIBRARY_PATH="$ld" ++ LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}" + else +- LD_LIBRARY_PATH="$ld:$LD_LIBRARY_PATH" ++ LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}:$LD_LIBRARY_PATH" + fi + export LD_LIBRARY_PATH + diff --git a/java/jdk14/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd b/java/jdk14/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd deleted file mode 100644 index 3b41788..0000000 --- a/java/jdk14/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd +++ /dev/null @@ -1,270 +0,0 @@ - -$FreeBSD$ - ---- ../src/solaris/classes/sun/awt/motif/font.properties.bsd.orig Mon Aug 27 21:05:08 2001 -+++ ../src/solaris/classes/sun/awt/motif/font.properties.bsd Mon Aug 27 21:06:33 2001 -@@ -1,7 +1,7 @@ - # --# @(#)font.properties.linux 1.3 00/03/23 -+# @(#)font.properties.linux 1.7 01/04/21 - # --# Copyright 1997 by Sun Microsystems, Inc., -+# Copyright 1997-2001 by Sun Microsystems, Inc., - # 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. - # All rights reserved. - # -@@ -13,139 +13,80 @@ - # - - # --# Linux version derived from the version for SunOS 5.5.1 Notice that -+# FreeBSD version derived from the Linux version derived from the -+# version for SunOS 5.5.1 Notice that - # we use the .ttf files shipped in the JDK distribution. - # - - # Serif font definition - # - serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.italic.1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.bold.1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.bolditalic.1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # SansSerif font definition - # - sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Monospaced font definition - # - monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+monospaced.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Dialog font definition - # - dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # DialogInput font definition - # - dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+dialoginput.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Default font definition - # -@@ -175,34 +116,19 @@ - # has can be judged with the isCovered() method of instance of SpecialSymbols. - # - fontcharset.serif.0=sun.io.CharToByteISO8859_1 --fontcharset.serif.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.serif.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.serif.2=sun.awt.CharToByteSymbol -+fontcharset.serif.1=sun.awt.CharToByteSymbol - - fontcharset.sansserif.0=sun.io.CharToByteISO8859_1 --fontcharset.sansserif.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.sansserif.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.sansserif.2=sun.awt.CharToByteSymbol -+fontcharset.sansserif.1=sun.awt.CharToByteSymbol - - fontcharset.monospaced.0=sun.io.CharToByteISO8859_1 --fontcharset.monospaced.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.monospaced.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.monospaced.2=sun.awt.CharToByteSymbol -+fontcharset.monospaced.1=sun.awt.CharToByteSymbol - - fontcharset.dialog.0=sun.io.CharToByteISO8859_1 --fontcharset.dialog.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.dialog.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.dialog.2=sun.awt.CharToByteSymbol -+fontcharset.dialog.1=sun.awt.CharToByteSymbol - - fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1 --fontcharset.dialoginput.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.dialoginput.2=sun.awt.CharToByteSymbol -+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol - - #replace font line if you have zapf fonts - #fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1 -@@ -232,16 +158,16 @@ - -b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.italic=\ ---b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.bold=\ ---b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.bolditalic=\ ---b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.plain=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.monospaced.italic=\ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -@@ -256,16 +182,16 @@ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 - - fontset.dialog.italic=\ ---b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.bold=\ ---b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.bolditalic=\ ---b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.plain=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialoginput.italic=\ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -@@ -285,5 +211,5 @@ - - # - fontset.default=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - # diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk index 9c15fd2..407ca64 100644 --- a/java/jdk14/files/patch-common::Defs-bsd.gmk +++ b/java/jdk14/files/patch-common::Defs-bsd.gmk @@ -1,21 +1,18 @@ $FreeBSD$ ---- common/Defs-bsd.gmk.orig Mon Aug 27 13:56:54 2001 -+++ common/Defs-bsd.gmk Mon Aug 27 14:01:42 2001 -@@ -220,11 +220,11 @@ +--- common/Defs-bsd.gmk.orig Mon Sep 10 17:02:16 2001 ++++ common/Defs-bsd.gmk Mon Sep 10 17:02:42 2001 +@@ -221,10 +221,10 @@ else # ARCH CFLAGS_COMMON = $(GCC_WARNINGS) endif # ARCH -CFLAGS_OPT = $(POPT) --CFLAGS_DBG = -g +CFLAGS_OPT = $(POPT) $(SYS_CFLAGS) -+CFLAGS_DBG = -g3 + CFLAGS_DBG = -g3 CXXFLAGS_COMMON = $(GCC_WARNINGS) -CXXFLAGS_OPT = $(POPT) --CXXFLAGS_DBG = -g +CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS) -+CXXFLAGS_DBG = -g3 + CXXFLAGS_DBG = -g3 CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \ - -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -D_LITTLE_ENDIAN -DLOGGING diff --git a/java/jdk14/pkg-plist b/java/jdk14/pkg-plist index 8154da9..fdd0eaf 100644 --- a/java/jdk14/pkg-plist +++ b/java/jdk14/pkg-plist @@ -583,23 +583,23 @@ jdk%%JDK_VERSION%%/include-old/alloc_cache.h jdk%%JDK_VERSION%%/include-old/bag.h jdk%%JDK_VERSION%%/include-old/bool.h jdk%%JDK_VERSION%%/include-old/breakpoints.h -jdk%%JDK_VERSION%%/include-old/bsd/byteorder_md.h -jdk%%JDK_VERSION%%/include-old/bsd/gc_md.h -jdk%%JDK_VERSION%%/include-old/bsd/hpi_md.h -jdk%%JDK_VERSION%%/include-old/bsd/io_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jawt_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jmath_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jvm_md.h -jdk%%JDK_VERSION%%/include-old/bsd/miscdefs_md.h -jdk%%JDK_VERSION%%/include-old/bsd/path_md.h -jdk%%JDK_VERSION%%/include-old/bsd/sysmacros_md.h -jdk%%JDK_VERSION%%/include-old/bsd/timeval_md.h -jdk%%JDK_VERSION%%/include-old/bsd/typedefs_md.h jdk%%JDK_VERSION%%/include-old/byteorder.h jdk%%JDK_VERSION%%/include-old/common_exceptions.h jdk%%JDK_VERSION%%/include-old/debug.h jdk%%JDK_VERSION%%/include-old/dll.h jdk%%JDK_VERSION%%/include-old/exceptions.h +jdk%%JDK_VERSION%%/include-old/freebsd/byteorder_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/gc_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/hpi_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/io_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jawt_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jmath_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jvm_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/miscdefs_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/path_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/sysmacros_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/timeval_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/typedefs_md.h jdk%%JDK_VERSION%%/include-old/gc.h jdk%%JDK_VERSION%%/include-old/hpi.h jdk%%JDK_VERSION%%/include-old/interpreter.h @@ -633,8 +633,8 @@ jdk%%JDK_VERSION%%/include-old/utf.h jdk%%JDK_VERSION%%/include-old/util.h jdk%%JDK_VERSION%%/include-old/vmprofiler.h jdk%%JDK_VERSION%%/include-old/wrap.h -jdk%%JDK_VERSION%%/include/bsd/jawt_md.h -jdk%%JDK_VERSION%%/include/bsd/jni_md.h +jdk%%JDK_VERSION%%/include/freebsd/jawt_md.h +jdk%%JDK_VERSION%%/include/freebsd/jni_md.h jdk%%JDK_VERSION%%/include/jawt.h jdk%%JDK_VERSION%%/include/jni.h jdk%%JDK_VERSION%%/include/jvmdi.h @@ -789,8 +789,8 @@ jdk%%JDK_VERSION%%/src.jar @unexec rmdir %D/share/java/classes 2>/dev/null || true @unexec rmdir %D/share/java 2>/dev/null || true @unexec rmdir %D/share/doc/java 2>/dev/null || true -@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%" -@unexec %D/bin/unregistervm JDK%%JDK_VERSION%% +@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%" +@unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%% @dirrm jdk%%JDK_VERSION%%/man/man1 @dirrm jdk%%JDK_VERSION%%/man @dirrm jdk%%JDK_VERSION%%/lib/i386 @@ -812,8 +812,8 @@ jdk%%JDK_VERSION%%/src.jar @dirrm jdk%%JDK_VERSION%%/jre/bin/i386 @dirrm jdk%%JDK_VERSION%%/jre/bin @dirrm jdk%%JDK_VERSION%%/jre -@dirrm jdk%%JDK_VERSION%%/include/bsd -@dirrm jdk%%JDK_VERSION%%/include-old/bsd +@dirrm jdk%%JDK_VERSION%%/include/freebsd +@dirrm jdk%%JDK_VERSION%%/include-old/freebsd @dirrm jdk%%JDK_VERSION%%/include-old @dirrm jdk%%JDK_VERSION%%/include @dirrm jdk%%JDK_VERSION%%/demo/sound/src diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 4a79c0e..54dc1d4 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/j2sdk1.3.1/make JDK_VERSION= 1.3.1 -JDK_PATCHSET_VERSION= 3 +JDK_PATCHSET_VERSION= 4 JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} @@ -40,7 +40,7 @@ MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \ LD_LIBRARY_PATH="" \ JAVA_COMPILER="" ALL_TARGET= all images -TAR= gtar +TAR= gtar # Necessary for proper extraction of sources BSD_TAR= /usr/bin/tar PLIST_SUB+= JDK_VERSION=${JDK_VERSION} @@ -87,6 +87,6 @@ do-install: .endif post-install: - ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # JDK${JDK_VERSION}" + ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" .include <bsd.port.post.mk> diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo index 1cb48e4..faa546d 100644 --- a/java/jdk15/distinfo +++ b/java/jdk15/distinfo @@ -1,2 +1,2 @@ MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57 -MD5 (bsd-jdk131-patches-3.tar.gz) = c3798cbb4f2a69cbb87e699511144f27 +MD5 (bsd-jdk131-patches-4.tar.gz) = ec4725aad2b59f6237372f2e97889183 diff --git a/java/jdk15/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh b/java/jdk15/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh new file mode 100644 index 0000000..d3371e1 --- /dev/null +++ b/java/jdk15/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh @@ -0,0 +1,28 @@ + +$FreeBSD$ + +--- ../src/solaris/bin/java_wrapper_bsd.sh.orig Mon Sep 10 12:20:57 2001 ++++ ../src/solaris/bin/java_wrapper_bsd.sh Mon Sep 10 14:23:56 2001 +@@ -121,13 +121,17 @@ + export _JVM_THREADS_TYPE + fi + +-# Set LD_LIBRARY_PATH for hotspot VM. +-#j=`$jre/bin/realpath $jre` +-ld="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}" ++# If jre is in a jre subdir, include parent dir libraries in lib path. This ++# needs to be cleaned up because -Xrun libraries are the ones that need it. ++if [ "${jre}" = "${JREHOME}" ]; then ++ JAVA_LIBRARY_PATH=":${jre}/../lib/${proc}" ++fi ++# Set LD_LIBRARY_PATH for thread type, VM type and standard native libraries. ++JAVA_LIBRARY_PATH="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}${JAVA_LIBRARY_PATH}" + if [ -z "$LD_LIBRARY_PATH" ]; then +- LD_LIBRARY_PATH="$ld" ++ LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}" + else +- LD_LIBRARY_PATH="$ld:$LD_LIBRARY_PATH" ++ LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}:$LD_LIBRARY_PATH" + fi + export LD_LIBRARY_PATH + diff --git a/java/jdk15/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd b/java/jdk15/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd deleted file mode 100644 index 3b41788..0000000 --- a/java/jdk15/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd +++ /dev/null @@ -1,270 +0,0 @@ - -$FreeBSD$ - ---- ../src/solaris/classes/sun/awt/motif/font.properties.bsd.orig Mon Aug 27 21:05:08 2001 -+++ ../src/solaris/classes/sun/awt/motif/font.properties.bsd Mon Aug 27 21:06:33 2001 -@@ -1,7 +1,7 @@ - # --# @(#)font.properties.linux 1.3 00/03/23 -+# @(#)font.properties.linux 1.7 01/04/21 - # --# Copyright 1997 by Sun Microsystems, Inc., -+# Copyright 1997-2001 by Sun Microsystems, Inc., - # 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. - # All rights reserved. - # -@@ -13,139 +13,80 @@ - # - - # --# Linux version derived from the version for SunOS 5.5.1 Notice that -+# FreeBSD version derived from the Linux version derived from the -+# version for SunOS 5.5.1 Notice that - # we use the .ttf files shipped in the JDK distribution. - # - - # Serif font definition - # - serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.italic.1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.bold.1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.bolditalic.1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # SansSerif font definition - # - sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Monospaced font definition - # - monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+monospaced.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Dialog font definition - # - dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # DialogInput font definition - # - dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+dialoginput.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Default font definition - # -@@ -175,34 +116,19 @@ - # has can be judged with the isCovered() method of instance of SpecialSymbols. - # - fontcharset.serif.0=sun.io.CharToByteISO8859_1 --fontcharset.serif.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.serif.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.serif.2=sun.awt.CharToByteSymbol -+fontcharset.serif.1=sun.awt.CharToByteSymbol - - fontcharset.sansserif.0=sun.io.CharToByteISO8859_1 --fontcharset.sansserif.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.sansserif.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.sansserif.2=sun.awt.CharToByteSymbol -+fontcharset.sansserif.1=sun.awt.CharToByteSymbol - - fontcharset.monospaced.0=sun.io.CharToByteISO8859_1 --fontcharset.monospaced.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.monospaced.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.monospaced.2=sun.awt.CharToByteSymbol -+fontcharset.monospaced.1=sun.awt.CharToByteSymbol - - fontcharset.dialog.0=sun.io.CharToByteISO8859_1 --fontcharset.dialog.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.dialog.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.dialog.2=sun.awt.CharToByteSymbol -+fontcharset.dialog.1=sun.awt.CharToByteSymbol - - fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1 --fontcharset.dialoginput.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.dialoginput.2=sun.awt.CharToByteSymbol -+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol - - #replace font line if you have zapf fonts - #fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1 -@@ -232,16 +158,16 @@ - -b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.italic=\ ---b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.bold=\ ---b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.bolditalic=\ ---b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.plain=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.monospaced.italic=\ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -@@ -256,16 +182,16 @@ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 - - fontset.dialog.italic=\ ---b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.bold=\ ---b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.bolditalic=\ ---b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.plain=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialoginput.italic=\ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -@@ -285,5 +211,5 @@ - - # - fontset.default=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - # diff --git a/java/jdk15/files/patch-common::Defs-bsd.gmk b/java/jdk15/files/patch-common::Defs-bsd.gmk index 9c15fd2..407ca64 100644 --- a/java/jdk15/files/patch-common::Defs-bsd.gmk +++ b/java/jdk15/files/patch-common::Defs-bsd.gmk @@ -1,21 +1,18 @@ $FreeBSD$ ---- common/Defs-bsd.gmk.orig Mon Aug 27 13:56:54 2001 -+++ common/Defs-bsd.gmk Mon Aug 27 14:01:42 2001 -@@ -220,11 +220,11 @@ +--- common/Defs-bsd.gmk.orig Mon Sep 10 17:02:16 2001 ++++ common/Defs-bsd.gmk Mon Sep 10 17:02:42 2001 +@@ -221,10 +221,10 @@ else # ARCH CFLAGS_COMMON = $(GCC_WARNINGS) endif # ARCH -CFLAGS_OPT = $(POPT) --CFLAGS_DBG = -g +CFLAGS_OPT = $(POPT) $(SYS_CFLAGS) -+CFLAGS_DBG = -g3 + CFLAGS_DBG = -g3 CXXFLAGS_COMMON = $(GCC_WARNINGS) -CXXFLAGS_OPT = $(POPT) --CXXFLAGS_DBG = -g +CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS) -+CXXFLAGS_DBG = -g3 + CXXFLAGS_DBG = -g3 CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \ - -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -D_LITTLE_ENDIAN -DLOGGING diff --git a/java/jdk15/pkg-plist b/java/jdk15/pkg-plist index 8154da9..fdd0eaf 100644 --- a/java/jdk15/pkg-plist +++ b/java/jdk15/pkg-plist @@ -583,23 +583,23 @@ jdk%%JDK_VERSION%%/include-old/alloc_cache.h jdk%%JDK_VERSION%%/include-old/bag.h jdk%%JDK_VERSION%%/include-old/bool.h jdk%%JDK_VERSION%%/include-old/breakpoints.h -jdk%%JDK_VERSION%%/include-old/bsd/byteorder_md.h -jdk%%JDK_VERSION%%/include-old/bsd/gc_md.h -jdk%%JDK_VERSION%%/include-old/bsd/hpi_md.h -jdk%%JDK_VERSION%%/include-old/bsd/io_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jawt_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jmath_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jvm_md.h -jdk%%JDK_VERSION%%/include-old/bsd/miscdefs_md.h -jdk%%JDK_VERSION%%/include-old/bsd/path_md.h -jdk%%JDK_VERSION%%/include-old/bsd/sysmacros_md.h -jdk%%JDK_VERSION%%/include-old/bsd/timeval_md.h -jdk%%JDK_VERSION%%/include-old/bsd/typedefs_md.h jdk%%JDK_VERSION%%/include-old/byteorder.h jdk%%JDK_VERSION%%/include-old/common_exceptions.h jdk%%JDK_VERSION%%/include-old/debug.h jdk%%JDK_VERSION%%/include-old/dll.h jdk%%JDK_VERSION%%/include-old/exceptions.h +jdk%%JDK_VERSION%%/include-old/freebsd/byteorder_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/gc_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/hpi_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/io_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jawt_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jmath_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jvm_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/miscdefs_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/path_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/sysmacros_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/timeval_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/typedefs_md.h jdk%%JDK_VERSION%%/include-old/gc.h jdk%%JDK_VERSION%%/include-old/hpi.h jdk%%JDK_VERSION%%/include-old/interpreter.h @@ -633,8 +633,8 @@ jdk%%JDK_VERSION%%/include-old/utf.h jdk%%JDK_VERSION%%/include-old/util.h jdk%%JDK_VERSION%%/include-old/vmprofiler.h jdk%%JDK_VERSION%%/include-old/wrap.h -jdk%%JDK_VERSION%%/include/bsd/jawt_md.h -jdk%%JDK_VERSION%%/include/bsd/jni_md.h +jdk%%JDK_VERSION%%/include/freebsd/jawt_md.h +jdk%%JDK_VERSION%%/include/freebsd/jni_md.h jdk%%JDK_VERSION%%/include/jawt.h jdk%%JDK_VERSION%%/include/jni.h jdk%%JDK_VERSION%%/include/jvmdi.h @@ -789,8 +789,8 @@ jdk%%JDK_VERSION%%/src.jar @unexec rmdir %D/share/java/classes 2>/dev/null || true @unexec rmdir %D/share/java 2>/dev/null || true @unexec rmdir %D/share/doc/java 2>/dev/null || true -@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%" -@unexec %D/bin/unregistervm JDK%%JDK_VERSION%% +@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%" +@unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%% @dirrm jdk%%JDK_VERSION%%/man/man1 @dirrm jdk%%JDK_VERSION%%/man @dirrm jdk%%JDK_VERSION%%/lib/i386 @@ -812,8 +812,8 @@ jdk%%JDK_VERSION%%/src.jar @dirrm jdk%%JDK_VERSION%%/jre/bin/i386 @dirrm jdk%%JDK_VERSION%%/jre/bin @dirrm jdk%%JDK_VERSION%%/jre -@dirrm jdk%%JDK_VERSION%%/include/bsd -@dirrm jdk%%JDK_VERSION%%/include-old/bsd +@dirrm jdk%%JDK_VERSION%%/include/freebsd +@dirrm jdk%%JDK_VERSION%%/include-old/freebsd @dirrm jdk%%JDK_VERSION%%/include-old @dirrm jdk%%JDK_VERSION%%/include @dirrm jdk%%JDK_VERSION%%/demo/sound/src diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 4a79c0e..54dc1d4 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/j2sdk1.3.1/make JDK_VERSION= 1.3.1 -JDK_PATCHSET_VERSION= 3 +JDK_PATCHSET_VERSION= 4 JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} @@ -40,7 +40,7 @@ MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \ LD_LIBRARY_PATH="" \ JAVA_COMPILER="" ALL_TARGET= all images -TAR= gtar +TAR= gtar # Necessary for proper extraction of sources BSD_TAR= /usr/bin/tar PLIST_SUB+= JDK_VERSION=${JDK_VERSION} @@ -87,6 +87,6 @@ do-install: .endif post-install: - ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # JDK${JDK_VERSION}" + ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" .include <bsd.port.post.mk> diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo index 1cb48e4..faa546d 100644 --- a/java/jdk16/distinfo +++ b/java/jdk16/distinfo @@ -1,2 +1,2 @@ MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57 -MD5 (bsd-jdk131-patches-3.tar.gz) = c3798cbb4f2a69cbb87e699511144f27 +MD5 (bsd-jdk131-patches-4.tar.gz) = ec4725aad2b59f6237372f2e97889183 diff --git a/java/jdk16/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh b/java/jdk16/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh new file mode 100644 index 0000000..d3371e1 --- /dev/null +++ b/java/jdk16/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh @@ -0,0 +1,28 @@ + +$FreeBSD$ + +--- ../src/solaris/bin/java_wrapper_bsd.sh.orig Mon Sep 10 12:20:57 2001 ++++ ../src/solaris/bin/java_wrapper_bsd.sh Mon Sep 10 14:23:56 2001 +@@ -121,13 +121,17 @@ + export _JVM_THREADS_TYPE + fi + +-# Set LD_LIBRARY_PATH for hotspot VM. +-#j=`$jre/bin/realpath $jre` +-ld="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}" ++# If jre is in a jre subdir, include parent dir libraries in lib path. This ++# needs to be cleaned up because -Xrun libraries are the ones that need it. ++if [ "${jre}" = "${JREHOME}" ]; then ++ JAVA_LIBRARY_PATH=":${jre}/../lib/${proc}" ++fi ++# Set LD_LIBRARY_PATH for thread type, VM type and standard native libraries. ++JAVA_LIBRARY_PATH="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}${JAVA_LIBRARY_PATH}" + if [ -z "$LD_LIBRARY_PATH" ]; then +- LD_LIBRARY_PATH="$ld" ++ LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}" + else +- LD_LIBRARY_PATH="$ld:$LD_LIBRARY_PATH" ++ LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}:$LD_LIBRARY_PATH" + fi + export LD_LIBRARY_PATH + diff --git a/java/jdk16/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd b/java/jdk16/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd deleted file mode 100644 index 3b41788..0000000 --- a/java/jdk16/files/patch-..::src::solaris::classes::sun::awt::motif::font.properties.bsd +++ /dev/null @@ -1,270 +0,0 @@ - -$FreeBSD$ - ---- ../src/solaris/classes/sun/awt/motif/font.properties.bsd.orig Mon Aug 27 21:05:08 2001 -+++ ../src/solaris/classes/sun/awt/motif/font.properties.bsd Mon Aug 27 21:06:33 2001 -@@ -1,7 +1,7 @@ - # --# @(#)font.properties.linux 1.3 00/03/23 -+# @(#)font.properties.linux 1.7 01/04/21 - # --# Copyright 1997 by Sun Microsystems, Inc., -+# Copyright 1997-2001 by Sun Microsystems, Inc., - # 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. - # All rights reserved. - # -@@ -13,139 +13,80 @@ - # - - # --# Linux version derived from the version for SunOS 5.5.1 Notice that -+# FreeBSD version derived from the Linux version derived from the -+# version for SunOS 5.5.1 Notice that - # we use the .ttf files shipped in the JDK distribution. - # - - # Serif font definition - # - serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.italic.1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 --serif.bold.1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 --serif.bolditalic.1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#serif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --serif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # SansSerif font definition - # - sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --sansserif.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#sansserif.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --sansserif.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Monospaced font definition - # - monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+monospaced.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --monospaced.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#monospaced.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --monospaced.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Dialog font definition - # - dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.italic.1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bold.1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --dialog.bolditalic.1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialog.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialog.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # DialogInput font definition - # - dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.italic.1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.italic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.italic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+dialoginput.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bold.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.bold.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.bold.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+#dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - --dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --dialoginput.bolditalic.1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 --#replace .1 font line if you have zapf fonts --#dialoginput.bolditalic.1=--zapf dingbats-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific --dialoginput.bolditalic.2=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific -+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -+#dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific - - # Default font definition - # -@@ -175,34 +116,19 @@ - # has can be judged with the isCovered() method of instance of SpecialSymbols. - # - fontcharset.serif.0=sun.io.CharToByteISO8859_1 --fontcharset.serif.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.serif.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.serif.2=sun.awt.CharToByteSymbol -+fontcharset.serif.1=sun.awt.CharToByteSymbol - - fontcharset.sansserif.0=sun.io.CharToByteISO8859_1 --fontcharset.sansserif.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.sansserif.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.sansserif.2=sun.awt.CharToByteSymbol -+fontcharset.sansserif.1=sun.awt.CharToByteSymbol - - fontcharset.monospaced.0=sun.io.CharToByteISO8859_1 --fontcharset.monospaced.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.monospaced.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.monospaced.2=sun.awt.CharToByteSymbol -+fontcharset.monospaced.1=sun.awt.CharToByteSymbol - - fontcharset.dialog.0=sun.io.CharToByteISO8859_1 --fontcharset.dialog.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.dialog.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.dialog.2=sun.awt.CharToByteSymbol -+fontcharset.dialog.1=sun.awt.CharToByteSymbol - - fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1 --fontcharset.dialoginput.1=sun.io.CharToByteISO8859_1 --#replace .1 font line if you have zapf fonts --#fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11Dingbats --fontcharset.dialoginput.2=sun.awt.CharToByteSymbol -+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol - - #replace font line if you have zapf fonts - #fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1 -@@ -232,16 +158,16 @@ - -b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.italic=\ ---b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.bold=\ ---b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.bolditalic=\ ---b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.sansserif.plain=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.monospaced.italic=\ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -@@ -256,16 +182,16 @@ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 - - fontset.dialog.italic=\ ---b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.bold=\ ---b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.bolditalic=\ ---b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialog.plain=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - - fontset.dialoginput.italic=\ - -b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -@@ -285,5 +211,5 @@ - - # - fontset.default=\ ---b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 - # diff --git a/java/jdk16/files/patch-common::Defs-bsd.gmk b/java/jdk16/files/patch-common::Defs-bsd.gmk index 9c15fd2..407ca64 100644 --- a/java/jdk16/files/patch-common::Defs-bsd.gmk +++ b/java/jdk16/files/patch-common::Defs-bsd.gmk @@ -1,21 +1,18 @@ $FreeBSD$ ---- common/Defs-bsd.gmk.orig Mon Aug 27 13:56:54 2001 -+++ common/Defs-bsd.gmk Mon Aug 27 14:01:42 2001 -@@ -220,11 +220,11 @@ +--- common/Defs-bsd.gmk.orig Mon Sep 10 17:02:16 2001 ++++ common/Defs-bsd.gmk Mon Sep 10 17:02:42 2001 +@@ -221,10 +221,10 @@ else # ARCH CFLAGS_COMMON = $(GCC_WARNINGS) endif # ARCH -CFLAGS_OPT = $(POPT) --CFLAGS_DBG = -g +CFLAGS_OPT = $(POPT) $(SYS_CFLAGS) -+CFLAGS_DBG = -g3 + CFLAGS_DBG = -g3 CXXFLAGS_COMMON = $(GCC_WARNINGS) -CXXFLAGS_OPT = $(POPT) --CXXFLAGS_DBG = -g +CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS) -+CXXFLAGS_DBG = -g3 + CXXFLAGS_DBG = -g3 CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \ - -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -D_LITTLE_ENDIAN -DLOGGING diff --git a/java/jdk16/pkg-plist b/java/jdk16/pkg-plist index 8154da9..fdd0eaf 100644 --- a/java/jdk16/pkg-plist +++ b/java/jdk16/pkg-plist @@ -583,23 +583,23 @@ jdk%%JDK_VERSION%%/include-old/alloc_cache.h jdk%%JDK_VERSION%%/include-old/bag.h jdk%%JDK_VERSION%%/include-old/bool.h jdk%%JDK_VERSION%%/include-old/breakpoints.h -jdk%%JDK_VERSION%%/include-old/bsd/byteorder_md.h -jdk%%JDK_VERSION%%/include-old/bsd/gc_md.h -jdk%%JDK_VERSION%%/include-old/bsd/hpi_md.h -jdk%%JDK_VERSION%%/include-old/bsd/io_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jawt_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jmath_md.h -jdk%%JDK_VERSION%%/include-old/bsd/jvm_md.h -jdk%%JDK_VERSION%%/include-old/bsd/miscdefs_md.h -jdk%%JDK_VERSION%%/include-old/bsd/path_md.h -jdk%%JDK_VERSION%%/include-old/bsd/sysmacros_md.h -jdk%%JDK_VERSION%%/include-old/bsd/timeval_md.h -jdk%%JDK_VERSION%%/include-old/bsd/typedefs_md.h jdk%%JDK_VERSION%%/include-old/byteorder.h jdk%%JDK_VERSION%%/include-old/common_exceptions.h jdk%%JDK_VERSION%%/include-old/debug.h jdk%%JDK_VERSION%%/include-old/dll.h jdk%%JDK_VERSION%%/include-old/exceptions.h +jdk%%JDK_VERSION%%/include-old/freebsd/byteorder_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/gc_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/hpi_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/io_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jawt_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jmath_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/jvm_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/miscdefs_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/path_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/sysmacros_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/timeval_md.h +jdk%%JDK_VERSION%%/include-old/freebsd/typedefs_md.h jdk%%JDK_VERSION%%/include-old/gc.h jdk%%JDK_VERSION%%/include-old/hpi.h jdk%%JDK_VERSION%%/include-old/interpreter.h @@ -633,8 +633,8 @@ jdk%%JDK_VERSION%%/include-old/utf.h jdk%%JDK_VERSION%%/include-old/util.h jdk%%JDK_VERSION%%/include-old/vmprofiler.h jdk%%JDK_VERSION%%/include-old/wrap.h -jdk%%JDK_VERSION%%/include/bsd/jawt_md.h -jdk%%JDK_VERSION%%/include/bsd/jni_md.h +jdk%%JDK_VERSION%%/include/freebsd/jawt_md.h +jdk%%JDK_VERSION%%/include/freebsd/jni_md.h jdk%%JDK_VERSION%%/include/jawt.h jdk%%JDK_VERSION%%/include/jni.h jdk%%JDK_VERSION%%/include/jvmdi.h @@ -789,8 +789,8 @@ jdk%%JDK_VERSION%%/src.jar @unexec rmdir %D/share/java/classes 2>/dev/null || true @unexec rmdir %D/share/java 2>/dev/null || true @unexec rmdir %D/share/doc/java 2>/dev/null || true -@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%" -@unexec %D/bin/unregistervm JDK%%JDK_VERSION%% +@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%" +@unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%% @dirrm jdk%%JDK_VERSION%%/man/man1 @dirrm jdk%%JDK_VERSION%%/man @dirrm jdk%%JDK_VERSION%%/lib/i386 @@ -812,8 +812,8 @@ jdk%%JDK_VERSION%%/src.jar @dirrm jdk%%JDK_VERSION%%/jre/bin/i386 @dirrm jdk%%JDK_VERSION%%/jre/bin @dirrm jdk%%JDK_VERSION%%/jre -@dirrm jdk%%JDK_VERSION%%/include/bsd -@dirrm jdk%%JDK_VERSION%%/include-old/bsd +@dirrm jdk%%JDK_VERSION%%/include/freebsd +@dirrm jdk%%JDK_VERSION%%/include-old/freebsd @dirrm jdk%%JDK_VERSION%%/include-old @dirrm jdk%%JDK_VERSION%%/include @dirrm jdk%%JDK_VERSION%%/demo/sound/src |
