From owner-freebsd-java@FreeBSD.ORG  Fri Sep  9 16:58:36 2005
Return-Path: <owner-freebsd-java@FreeBSD.ORG>
X-Original-To: freebsd-java@FreeBSD.org
Delivered-To: freebsd-java@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7441D16A41F
	for <freebsd-java@FreeBSD.org>; Fri,  9 Sep 2005 16:58:36 +0000 (GMT)
	(envelope-from glewis@eyesbeyond.com)
Received: from misty.eyesbeyond.com (glewis.dsl.xmission.com [166.70.56.15])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8836743D58
	for <freebsd-java@FreeBSD.org>; Fri,  9 Sep 2005 16:58:34 +0000 (GMT)
	(envelope-from glewis@eyesbeyond.com)
Received: from misty.eyesbeyond.com (localhost.eyesbeyond.com [127.0.0.1])
	by misty.eyesbeyond.com (8.13.3/8.13.3) with ESMTP id j89GwW6X016151
	for <freebsd-java@FreeBSD.org>; Fri, 9 Sep 2005 10:58:33 -0600 (MDT)
	(envelope-from glewis@eyesbeyond.com)
Received: (from glewis@localhost)
	by misty.eyesbeyond.com (8.13.3/8.13.3/Submit) id j89GwWhN016150
	for freebsd-java@FreeBSD.org; Fri, 9 Sep 2005 10:58:32 -0600 (MDT)
	(envelope-from glewis@eyesbeyond.com)
X-Authentication-Warning: misty.eyesbeyond.com: glewis set sender to
	glewis@eyesbeyond.com using -f
Date: Fri, 9 Sep 2005 10:58:32 -0600
From: Greg Lewis <glewis@eyesbeyond.com>
To: freebsd-java@FreeBSD.org
Message-ID: <20050909165832.GA16137@misty.eyesbeyond.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="sdtB3X0nJg68CQEu"
Content-Disposition: inline
User-Agent: Mutt/1.4.2.1i
Cc: 
Subject: Patches to update jdk15 to patchset 2
X-BeenThere: freebsd-java@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting Java to FreeBSD <freebsd-java.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-java>,
	<mailto:freebsd-java-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-java>
List-Post: <mailto:freebsd-java@freebsd.org>
List-Help: <mailto:freebsd-java-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-java>,
	<mailto:freebsd-java-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Sep 2005 16:58:36 -0000


--sdtB3X0nJg68CQEu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

All,

Here is the current patch I am testing.  Please give it a try and provide
some feedback.  Unfortunately it disables the shared class data archive
since that is causing problems for me on 4.x and isn't support on 5.4/amd64
(my other testing machine).  If you have a 5.x or 6.x i386 machine then
please try to test that and let me know if it should be put back in under
those restrictions.  I was sure it was working before, but it isn't now.
This also fixes a bug with the packing list when the debug stuff is
included.

-- 
Greg Lewis                          Email   : glewis@eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis@FreeBSD.org

--sdtB3X0nJg68CQEu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ps2.diff"

Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/java/jdk15/Makefile,v
retrieving revision 1.92
diff -u -r1.92 Makefile
--- Makefile	4 Sep 2005 14:31:31 -0000	1.92
+++ Makefile	9 Sep 2005 04:23:41 -0000
@@ -7,40 +7,52 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	3
 CATEGORIES=	java devel
-MASTER_SITES=	http://www.kde.org.ua/data/java/:koi8u
-#		http://www.sun.com/software/java2/download.html
+MASTER_SITES=	# http://www.sun.com/software/communitysource/j2se/java2/download.xml
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
 SCSL_SRCFILE=	jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
 SCSL_BINFILE=	jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
 PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
-ENCODINGS=	java_koi8u.tgz:koi8u
-DISTFILES=	${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE} ${ENCODINGS}
+DISTFILES=	${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE}
 
 MAINTAINER=	phantom@FreeBSD.org
 COMMENT=	Java Development Kit 1.5.0
 
-# XXX: iconv dependency?
 EXTRACT_DEPENDS=zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
+.if defined(WITHOUT_WEB)
+MAKE_ENV+=	DONT_BUILD_DEPLOY="YES"
+.else
+.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} == "firefox"
+BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
+RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
+MAKE_ENV+=	BROWSER=firefox
+.else
+BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/mozilla
+RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/mozilla
+MAKE_ENV+=	BROWSER=mozilla
+.endif
+USE_ICONV=	yes
+MAKE_ENV+=	ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include"
+.endif
+
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 WRKSRC=		${WRKDIR}/control/make
 
 JDK_VERSION=	1.5.0
-JDK_PATCHSET_VERSION=	1
+JDK_PATCHSET_VERSION=	2
 LATEST_LINK=	jdk15
 
 SUN_LINUX_JDK_VERSION=  1.4.2
 
 .if !defined(WITH_LINUX_BOOTSTRAP)
-NATIVE_BOOTSTRAP_JDKS=	${LOCALBASE}/jdk1.4.2 \
-			${LOCALBASE}/jdk1.5.0
+NATIVE_BOOTSTRAP_JDKS=	${LOCALBASE}/jdk1.5.0 \
+			${LOCALBASE}/jdk1.4.2
 .endif
 
 LINUX_BOOTSTRAP_JDKS=	${LOCALBASE}/linux-sun-jdk1.4.2
@@ -83,7 +95,7 @@
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 
-MAKE_ENV=	ALT_BOOTDIR="${JDK14DIR}" \
+MAKE_ENV+=	ALT_BOOTDIR="${JDK14DIR}" \
 		ALT_MOTIF_DIR="${X11BASE}" \
 		SYS_CFLAGS="${CFLAGS}" \
 		LANG="C" \
@@ -91,10 +103,7 @@
 		CLASSPATH="" \
 		LD_LIBRARY_PATH="" \
 		MAKEFLAGS="" \
-		SKIP_COMPARE_IMAGES="YES" \
-		DONT_BUILD_DOCS="YES" \
-		DONT_BUILD_DEPLOY="YES" \
-		DONT_BUILD_INSTALL="YES"
+		SKIP_COMPARE_IMAGES="YES"
 .if !defined(WITH_IPV6)
 MAKE_ENV+=	DONT_ENABLE_IPV6="YES"
 .endif
@@ -102,8 +111,7 @@
 ALL_TARGET=	all
 
 PLIST_FILES=	jdk${JDK_VERSION}/jre/.systemPrefs/.system.lock \
-		jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile \
-		jdk${JDK_VERSION}/jre/lib/${ARCH}/client/classes.jsa
+		jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile
 PLIST_DIRS=	jdk${JDK_VERSION}/jre/.systemPrefs
 
 .if (${ARCH} == amd64)
@@ -169,7 +177,7 @@
 pre-fetch:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have at least"
-	@${ECHO_MSG} "1.7Gb of free disk space in build area!"
+	@${ECHO_MSG} "2.5Gb of free disk space in build area!"
 	@${ECHO_MSG}
 .if defined(WITH_LINUX_BOOTSTRAP)
 	@${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have linux emulation"
@@ -184,18 +192,18 @@
 	@${ECHO_MSG}
 	@${ECHO_MSG} "    WITH_IPV6   - enable JDK IPv6 support"
 	@${ECHO_MSG}
+	@${ECHO_MSG} "    WITHOUT_WEB - don't build the browser plugin"
+	@${ECHO_MSG} "                  or Java Web Start"
+	@${ECHO_MSG}
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "WARNING: "
-	@${ECHO_MSG} "WARNING: This is ALPHA quality software, and suitable for testing ONLY!"
+	@${ECHO_MSG} "WARNING: This is BETA quality software!"
+	@${ECHO_MSG} "WARNING: Use in a production environment is at your own risk."
 	@${ECHO_MSG} "WARNING: "
 	@${ECHO_MSG}
 
-post-extract:
-	${TAR} -C ${WRKSRC:H:H}/j2se/src/share/classes/sun/io/ -xzvpf ${DISTDIR}/java_koi8u.tgz '*.java'
-	${LN} -s ${FILESDIR}/KOI8_U.java ${WRKSRC:H:H}/j2se/src/share/classes/sun/nio/cs/
-
 pre-patch:
 	@cd ${WRKDIR} &&  \
 		${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
@@ -277,7 +285,7 @@
 	cd ${JDKIMAGEDIR_G} && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 	@${FIND} -s ${JDKIMAGEDIR_G} -not -type d | \
-	  ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST}
+	  ${SED} -ne 's#^${JDKIMAGEDIR_G}#jdk${JDK_VERSION}#p' >> ${TMPPLIST}
 .endif
 	@${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \
 	  ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST}
Index: distinfo
===================================================================
RCS file: /var/fcvs/ports/java/jdk15/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo	28 Jul 2005 13:36:16 -0000	1.15
+++ distinfo	8 Sep 2005 17:51:40 -0000
@@ -2,7 +2,5 @@
 SIZE (jdk-1_5_0-src-scsl.zip) = 58338869
 MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0
 SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433
-MD5 (bsd-jdk15-patches-1.tar.bz2) = 13f8027f86106f2cee68aa702afd63f5
-SIZE (bsd-jdk15-patches-1.tar.bz2) = 618044
-MD5 (java_koi8u.tgz) = a483f4ceaad6dff3614ff37135bd35cf
-SIZE (java_koi8u.tgz) = 7296
+MD5 (bsd-jdk15-patches-2.tar.bz2) = fb002d290db6fababba3e81e121d8dbd
+SIZE (bsd-jdk15-patches-2.tar.bz2) = 639356
Index: files/KOI8_U.java
===================================================================
RCS file: files/KOI8_U.java
diff -N files/KOI8_U.java
--- files/KOI8_U.java	1 Aug 2005 16:44:07 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,330 +0,0 @@
-/*
- * @(#)KOI8_U.java	1.0	05/07/19
- *
- * Created by Mikhail Teterin using Volodymir Lysivka's work for
- * earlier Java releases (patching charsets.jar or i18n.jar) and
- * the KOI8_R.java bearing the below copyright:
- *
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
- */
-
-package sun.nio.cs;
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.MalformedInputException;
-import java.nio.charset.UnmappableCharacterException;
-import sun.nio.cs.StandardCharsets;
-import sun.nio.cs.SingleByteDecoder;
-import sun.nio.cs.SingleByteEncoder;
-
-
-public class KOI8_U
-    extends Charset
-    implements HistoricallyNamedCharset
-{
-
-    public KOI8_U() {
-	super("KOI8-U", StandardCharsets.aliases_KOI8_U);
-    }
-
-    public String historicalName() {
-	return "KOI8_U";
-    }
-
-    public boolean contains(Charset cs) {
-	return ((cs.name().equals("US-ASCII"))
-		|| (cs instanceof KOI8_U));
-    }
-
-    public CharsetDecoder newDecoder() {
-	return new Decoder(this);
-    }
-
-    public CharsetEncoder newEncoder() {
-	return new Encoder(this);
-    }
-
-
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-
-    public String getDecoderSingleByteMappings() {
-	return Decoder.byteToCharTable;
-
-    }
-
-    public short[] getEncoderIndex1() {
-	return Encoder.index1;
-
-    }
-    public String getEncoderIndex2() {
-	return Encoder.index2;
-
-    }
-
-    private static class Decoder extends SingleByteDecoder {
-
-	public Decoder(Charset cs) {
-	    super(cs, byteToCharTable);
-	}
-
-	private final static String byteToCharTable =
-
-	    "\u2500\u2502\u250C\u2510\u2514\u2518\u251C\u2524" +     // 0x80 - 0x87
-	    "\u252C\u2534\u253C\u2580\u2584\u2588\u258C\u2590" +     // 0x88 - 0x8F
-	    "\u2591\u2592\u2593\u2320\u25A0\u2219\u221A\u2248" +     // 0x90 - 0x97
-	    "\u2264\u2265\u00A0\u2321\u00B0\u00B2\u00B7\u00F7" +     // 0x98 - 0x9F
-	    "\u2550\u2551\u2552\u0451\u0454\u2554\u0456\u0457" +     // 0xA0 - 0xA7
-	    "\u2557\u2558\u2559\u255A\u255B\u0491\u045E\u255E" +     // 0xA8 - 0xAF
-	    "\u255F\u2560\u2561\u0401\u0404\u2563\u0406\u0407" +     // 0xB0 - 0xB7
-	    "\u2566\u2567\u2568\u2569\u256A\u0490\u040E\u00A9" +     // 0xB8 - 0xBF
-	    "\u044E\u0430\u0431\u0446\u0434\u0435\u0444\u0433" +     // 0xC0 - 0xC7
-	    "\u0445\u0438\u0439\u043A\u043B\u043C\u043D\u043E" +     // 0xC8 - 0xCF
-	    "\u043F\u044F\u0440\u0441\u0442\u0443\u0436\u0432" +     // 0xD0 - 0xD7
-	    "\u044C\u044B\u0437\u0448\u044D\u0449\u0447\u044A" +     // 0xD8 - 0xDF
-	    "\u042E\u0410\u0411\u0426\u0414\u0415\u0424\u0413" +     // 0xE0 - 0xE7
-	    "\u0425\u0418\u0419\u041A\u041B\u041C\u041D\u041E" +     // 0xE8 - 0xEF
-	    "\u041F\u042F\u0420\u0421\u0422\u0423\u0416\u0412" +     // 0xF0 - 0xF7
-	    "\u042C\u042B\u0417\u0428\u042D\u0429\u0427\u042A" +     // 0xF8 - 0xFF
-	    "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" +     // 0x00 - 0x07
-	    "\b\t\n\u000B\f\r\u000E\u000F" +     // 0x08 - 0x0F
-	    "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" +     // 0x10 - 0x17
-	    "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" +     // 0x18 - 0x1F
-	    "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" +     // 0x20 - 0x27
-	    "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" +     // 0x28 - 0x2F
-	    "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" +     // 0x30 - 0x37
-	    "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" +     // 0x38 - 0x3F
-	    "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" +     // 0x40 - 0x47
-	    "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" +     // 0x48 - 0x4F
-	    "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" +     // 0x50 - 0x57
-	    "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" +     // 0x58 - 0x5F
-	    "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" +     // 0x60 - 0x67
-	    "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" +     // 0x68 - 0x6F
-	    "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" +     // 0x70 - 0x77
-	    "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F";     // 0x78 - 0x7F
-    }
-
-    private static class Encoder extends SingleByteEncoder {
-
-	public Encoder(Charset cs) {
-	    super(cs, index1, index2, 0xFF00, 0x00FF, 8);
-	}
-
-	private final static String index2 =
-
-	    "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" +
-	    "\b\t\n\u000B\f\r\u000E\u000F" +
-	    "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" +
-	    "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" +
-	    "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" +
-	    "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" +
-	    "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" +
-	    "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" +
-	    "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" +
-	    "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" +
-	    "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" +
-	    "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" +
-	    "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" +
-	    "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" +
-	    "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" +
-	    "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u009A\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u00BF\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u009C\u0000\u009D\u0000\u0000\u0000\u0000\u009E" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u009F" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u00B3\u0000\u0000\u00B4\u0000\u00B6\u00B7\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u00BE\u0000\u00E1" +
-	    "\u00E2\u00F7\u00E7\u00E4\u00E5\u00F6\u00FA\u00E9" +
-	    "\u00EA\u00EB\u00EC\u00ED\u00EE\u00EF\u00F0\u00F2" +
-	    "\u00F3\u00F4\u00F5\u00E6\u00E8\u00E3\u00FE\u00FB" +
-	    "\u00FD\u00FF\u00F9\u00F8\u00FC\u00E0\u00F1\u00C1" +
-	    "\u00C2\u00D7\u00C7\u00C4\u00C5\u00D6\u00DA\u00C9" +
-	    "\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D0\u00D2" +
-	    "\u00D3\u00D4\u00D5\u00C6\u00C8\u00C3\u00DE\u00DB" +
-	    "\u00DD\u00DF\u00D9\u00D8\u00DC\u00C0\u00D1\u0000" +
-	    "\u00A3\u0000\u0000\u00A4\u0000\u00A6\u00A7\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u00AE\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00BD" +
-	    "\u00AD\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0095" +
-	    "\u0096\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0097\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0098\u0099\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0093\u009B" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0080\u0000" +
-	    "\u0081\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0082\u0000\u0000\u0000\u0083\u0000" +
-	    "\u0000\u0000\u0084\u0000\u0000\u0000\u0085\u0000" +
-	    "\u0000\u0000\u0086\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0087\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0088\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0089\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u008A\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u00A0\u00A1" +
-	    "\u00A2\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA" +
-	    "\u00AB\u00AC\u00AD\u00AE\u00AF\u00B0\u00B1\u00B2" +
-	    "\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB" +
-	    "\u00BC\u00BD\u00BE\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u008B\u0000" +
-	    "\u0000\u0000\u008C\u0000\u0000\u0000\u008D\u0000" +
-	    "\u0000\u0000\u008E\u0000\u0000\u0000\u008F\u0090" +
-	    "\u0091\u0092\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0094\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-	    "\u0000\u0000\u0000\u0000\u0000\u0000";
-
-	private final static short index1[] = {
-	    0, 248, 248, 248, 503, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 734, 958, 248, 1214, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	    248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-	};
-    }
-}
Index: files/patch-hotspot-vm-os_bsd.inline.hpp
===================================================================
RCS file: files/patch-hotspot-vm-os_bsd.inline.hpp
diff -N files/patch-hotspot-vm-os_bsd.inline.hpp
--- files/patch-hotspot-vm-os_bsd.inline.hpp	22 Jun 2005 15:52:02 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$FreeBSD: ports/java/jdk15/files/patch-hotspot-vm-os_bsd.inline.hpp,v 1.1 2005/06/22 15:52:02 glewis Exp $
-
---- ../../hotspot/src/os/bsd/vm/os_bsd.inline.hpp	20 Dec 2004 10:06:24 -0000	1.2
-+++ ../../hotspot/src/os/bsd/vm/os_bsd.inline.hpp	14 May 2005 14:58:18 -0000	1.3
-@@ -29,10 +29,9 @@
- 
- inline bool os::allocate_stack_guard_pages() {
-   assert(uses_stack_guard_pages(), "sanity check");
--// XXXBSD: ??
--//  return thr_main();
--//  return pthread_main_np();
--  return true;
-+  // Since FreeBSD 4 uses malloc() for allocating the thread stack             
-+  // there is no need to do anything extra to allocate the guard pages
-+  return false;
- }
- 
- 
Index: files/patch-j2se-bin-java_md.c
===================================================================
RCS file: files/patch-j2se-bin-java_md.c
diff -N files/patch-j2se-bin-java_md.c
--- files/patch-j2se-bin-java_md.c	12 May 2005 04:12:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se-bin-java_md.c,v 1.1 2005/05/12 04:12:33 glewis Exp $
-
---- ../../j2se/src/solaris/bin/java_md.c	15 Feb 2005 02:06:26 -0000	1.6
-+++ ../../j2se/src/solaris/bin/java_md.c	20 Apr 2005 12:08:02 -0000
-@@ -906,8 +904,7 @@
-     if (execname != NULL)	/* Already determined */
- 	return (execname);
- 
--/* XXXBSD:  is it right for us ?*/
--#if defined(__sun) || defined(__FreeBSD__)
-+#if defined(__sun)
-     {
-         Dl_info dlinfo;
-         if (dladdr((void*)&SetExecname, &dlinfo)) {
-@@ -928,12 +925,47 @@
- 	    exec_path = strdup(buf);
- 	}
-     }
-+#elif defined(__FreeBSD__)
-+    /* Try /proc/curproc/file if exec_path hasn't been found */
-+
-+    if (exec_path == NULL) {
-+	const char* self = "/proc/curproc/file";
-+        char buf[PATH_MAX+1];
-+        int len = readlink(self, buf, PATH_MAX);
-+        if (len >= 0) {
-+	    buf[len] = '\0';		/* readlink doesn't nul terminate */
-+	    exec_path = strdup(buf);
-+	}
-+    }
-+
-+    /*
-+     * Try the dladdr(3) method FreeBSD if exec_path hasn't been found.
-+     * Requires a recent version of FreeBSD.
-+     */
-+
-+    /*
-+    if (exec_path == NULL) {
-+        Dl_info dlinfo;
-+        if (dladdr((void*)&SetExecname, &dlinfo)) {
-+	    char *resolved = (char*)MemAlloc(PATH_MAX+1);
-+	    if (resolved != NULL) {
-+		exec_path = realpath(dlinfo.dli_fname, resolved);
-+		if (exec_path == NULL) {
-+		    free(resolved);
-+		}
-+	    }
-+        }
-+    }
-+    */
-+
- #else /* !__sun && !__linux */
-     {
-         /* Not implemented */
-     }
- #endif 
- 
-+    /* Fall back to examining argv[0] and our path */
-+
-     if (exec_path == NULL) {
-         exec_path = FindExecName(argv[0]);
-     }
Index: files/patch-j2se-jar-Main.java
===================================================================
RCS file: files/patch-j2se-jar-Main.java
diff -N files/patch-j2se-jar-Main.java
--- files/patch-j2se-jar-Main.java	12 May 2005 04:14:52 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se-jar-Main.java,v 1.1 2005/05/12 04:14:52 glewis Exp $
-
---- ../../j2se/src/share/classes/sun/tools/jar/Main.java	8 Nov 2004 22:27:32 -0000	1.1.1.1
-+++ ../../j2se/src/share/classes/sun/tools/jar/Main.java	20 Apr 2005 16:50:17 -0000
-@@ -31,6 +31,7 @@
-     Hashtable filesTable = new Hashtable();
-     Vector paths = new Vector();
-     Vector v;
-+    String cwd;
-     CRC32 crc32 = new CRC32();
-     /* cflag: create
-      * uflag: update       
-@@ -670,6 +671,19 @@
-      * Extracts specified entries from JAR file.
-      */
-     void extract(InputStream in, String files[]) throws IOException {
-+    	// Current working directory
-+
-+	cwd = System.getProperty("user.dir");
-+	if (cwd == null) {
-+            fatalError(getMsg("error.no.cwd"));
-+	}
-+	cwd = (new File(cwd)).getCanonicalPath();
-+	if (!cwd.endsWith(File.separator)) {
-+	    cwd += File.separator;
-+	}
-+
-+	// Extract the files
-+
- 	ZipInputStream zis = new ZipInputStream(in);
- 	ZipEntry e;
- 	while ((e = zis.getNextEntry()) != null) {
-@@ -694,6 +708,10 @@
-     void extractFile(ZipInputStream zis, ZipEntry e) throws IOException {
-         String name = e.getName();
- 	File f = new File(e.getName().replace('/', File.separatorChar));
-+	if (!f.getCanonicalPath().startsWith(cwd)) {
-+ 	    output(formatMsg("out.ignore.entry", name));
-+	    return;
-+	}
- 	if (e.isDirectory()) {
- 	    if (!f.exists() && !f.mkdirs() || !f.isDirectory()) {
- 		throw new IOException(formatMsg("error.create.dir", f.getPath()));
-@@ -704,6 +722,10 @@
- 	} else {
- 	    if (f.getParent() != null) {
- 		File d = new File(f.getParent());
-+		if (!d.getCanonicalPath().startsWith(cwd)) {
-+	 	    output(formatMsg("out.ignore.entry", name));
-+		    return;
-+		}
- 		if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
- 		    throw new IOException(formatMsg("error.create.dir", d.getPath()));
- 		}
-Index: j2se/src/share/classes/sun/tools/jar/resources/jar.properties
-===================================================================
-RCS file: /var/jcvs/javasrc_1_5_scsl/j2se/src/share/classes/sun/tools/jar/resources/jar.properties,v
-retrieving revision 1.1.1.1
Index: files/patch-j2se-resources-jar.properties
===================================================================
RCS file: files/patch-j2se-resources-jar.properties
diff -N files/patch-j2se-resources-jar.properties
--- files/patch-j2se-resources-jar.properties	12 May 2005 04:14:52 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se-resources-jar.properties,v 1.1 2005/05/12 04:14:52 glewis Exp $
-
---- ../../j2se/src/share/classes/sun/tools/jar/resources/jar.properties	8 Nov 2004 22:27:32 -0000	1.1.1.1
-+++ ../../j2se/src/share/classes/sun/tools/jar/resources/jar.properties	20 Apr 2005 15:50:41 -0000
-@@ -30,6 +30,8 @@
-         {0} : could not create directory
- error.incorrect.length=\
-         incorrect length while processing: {0}
-+error.no.cwd=\
-+	{0} : could not determine current working directory
- out.added.manifest=\
-         added manifest
- out.update.manifest=\
Index: files/patch-j2se-util-TimeZone_md.c
===================================================================
RCS file: files/patch-j2se-util-TimeZone_md.c
diff -N files/patch-j2se-util-TimeZone_md.c
--- files/patch-j2se-util-TimeZone_md.c	12 May 2005 04:13:55 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se-util-TimeZone_md.c,v 1.1 2005/05/12 04:13:55 glewis Exp $
-
---- ../../j2se/src/solaris/native/java/util/TimeZone_md.c	3 Jan 2005 18:32:01 -0000	1.3
-+++ ../../j2se/src/solaris/native/java/util/TimeZone_md.c	19 Apr 2005 19:32:06 -0000
-@@ -38,7 +38,7 @@
- #endif
- 
- static const char *zoneinfo_dir = "/usr/share/zoneinfo";
--static const char *defailt_zoneinfo_file = "/etc/localtime";
-+static const char *default_zoneinfo_file = "/etc/localtime";
- 
- /*
-  * Returns a point to the zone ID portion of the given zoneinfo file
-@@ -181,6 +181,7 @@
-     int fd;
-     char *buf;
-     size_t size;
-+    char zoneinfo_file[PATH_MAX+1];
- 
- #ifdef __linux__
-     /*
-@@ -242,11 +243,13 @@
-     /*
-      * Next, try /etc/localtime to find the zone ID.
-      */
--    if (lstat(defailt_zoneinfo_file, &statbuf) == -1) {
-+    if (lstat(default_zoneinfo_file, &statbuf) == -1) {
- 	return NULL;
-     }
- 
--#ifdef __linux__
-+    strlcpy(zoneinfo_file, default_zoneinfo_file, PATH_MAX+1);
-+
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
-     /*
-      * If it's a symlink, get the link name and its zone ID part. (The
-      * older versions of timeconfig created a symlink as described in
-@@ -255,22 +258,25 @@
-      * from /etc/localtime.)
-      */
-     if (S_ISLNK(statbuf.st_mode)) {
--	char linkbuf[PATH_MAX+1];
- 	int len;
- 
--	if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) {
-+	if ((len = readlink(default_zoneinfo_file, zoneinfo_file, sizeof(zoneinfo_file)-1)) == -1) {
- 	    jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n",
--			defailt_zoneinfo_file);
-+			default_zoneinfo_file);
- 	    return NULL;
- 	}
--	linkbuf[len] = '\0';
--	tz = getZoneName(linkbuf);
-+	zoneinfo_file[len] = '\0';
-+	tz = getZoneName(zoneinfo_file);
- 	if (tz != NULL) {
- 	    tz = strdup(tz);
-+	    return tz;
-+	} else {
-+	    if (lstat(zoneinfo_file, &statbuf) == -1) {
-+		return NULL;
-+	    }
- 	}
--	return tz;
-     }
--#endif /* __linux__ */
-+#endif /* __linux__ || _ALLBSD_SOURCE */
- 
-     /*
-      * If it's a regular file, we need to find out the same zoneinfo file
-@@ -281,7 +287,7 @@
-     if (buf == NULL) {
- 	return NULL;
-     }
--    if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) {
-+    if ((fd = open(zoneinfo_file, O_RDONLY)) == -1) {
- 	free((void *) buf);
- 	return NULL;
-     }
-@@ -558,17 +564,16 @@
- 	return strdup("GMT");
-     }
- 
--    /* Note that the time offset direction is opposite. */
- #if defined(_ALLBSD_SOURCE)
-     clock = time(NULL);
-     tzset();
-     local_tm = localtime(&clock);
--    if (local_tm->tm_gmtoff > 0) {
-+    if (local_tm->tm_gmtoff >= 0) {
- 	offset = (time_t) local_tm->tm_gmtoff;
--	sign = "-";
-+	sign = "+";
-     } else {
- 	offset = (time_t) -local_tm->tm_gmtoff;
--	sign = "+";
-+	sign = "-";
-     }
- #else
-     if (timezone > 0) {
Index: files/patch-j2se::common::Defs-bsd.gmk
===================================================================
RCS file: /var/fcvs/ports/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk,v
retrieving revision 1.1
diff -u -r1.1 patch-j2se::common::Defs-bsd.gmk
--- files/patch-j2se::common::Defs-bsd.gmk	20 Jan 2005 08:41:13 -0000	1.1
+++ files/patch-j2se::common::Defs-bsd.gmk	9 Sep 2005 04:26:47 -0000
@@ -2,7 +2,7 @@
 
 --- ../../j2se/make/common/Defs-bsd.gmk.orig	Thu Jan 13 02:03:20 2005
 +++ ../../j2se/make/common/Defs-bsd.gmk	Thu Jan 13 02:03:38 2005
-@@ -172,7 +172,7 @@
+@@ -180,7 +180,7 @@
  ifeq ($(TRUE_PLATFORM), NetBSD)
  DEVTOOLS_PATH = /usr/pkg/bin/
  else
Index: files/patch-j2se::common::gdefs_md.h
===================================================================
RCS file: files/patch-j2se::common::gdefs_md.h
diff -N files/patch-j2se::common::gdefs_md.h
--- files/patch-j2se::common::gdefs_md.h	7 Apr 2005 20:47:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::common::gdefs_md.h,v 1.1 2005/04/07 20:47:03 glewis Exp $
-
---- ../../j2se/src/solaris/native/common/gdefs_md.h.orig	Sun Mar 20 22:14:34 2005
-+++ ../../j2se/src/solaris/native/common/gdefs_md.h	Sun Mar 20 22:15:13 2005
-@@ -19,5 +19,9 @@
- #include <malloc.h>
- #endif /* __linux__ */
- #ifdef _ALLBSD_SOURCE
-+#if defined(__FreeBSD__) && __FreeBSD__ < 5
-+#include <inttypes.h>
-+#else
- #include <stdint.h>
-+#endif
- #endif /* _ALLBSD_SOURCE */
Index: files/patch-j2se::java2d::j2d_md.h
===================================================================
RCS file: files/patch-j2se::java2d::j2d_md.h
diff -N files/patch-j2se::java2d::j2d_md.h
--- files/patch-j2se::java2d::j2d_md.h	7 Apr 2005 20:47:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::java2d::j2d_md.h,v 1.1 2005/04/07 20:47:03 glewis Exp $
-
---- ../../j2se/src/solaris/native/sun/java2d/j2d_md.h.orig	Sun Mar 20 22:20:43 2005
-+++ ../../j2se/src/solaris/native/sun/java2d/j2d_md.h	Sun Mar 20 22:24:40 2005
-@@ -14,7 +14,11 @@
-  * NetBSD's doesn't either, so let's do it for everyone.
-  */
- #if defined(__linux__) || defined(_ALLBSD_SOURCE)
-+#if defined(__FreeBSD__) && __FreeBSD__ < 5
-+#include <inttypes.h>
-+#else
- #include <stdint.h>
-+#endif
- #endif /* __linux__ || _ALLBSD_SOURCE */
- 
- typedef unsigned char	jubyte;
Index: files/patch-j2se::management::UnixOperatingSystem_md.c
===================================================================
RCS file: files/patch-j2se::management::UnixOperatingSystem_md.c
diff -N files/patch-j2se::management::UnixOperatingSystem_md.c
--- files/patch-j2se::management::UnixOperatingSystem_md.c	21 Mar 2005 05:49:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::management::UnixOperatingSystem_md.c,v 1.1 2005/03/21 05:49:33 glewis Exp $
-
---- ../../j2se/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c.orig Sat Feb 19 12:50:03 2005
-+++ ../../j2se/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c    Fri Feb 18 20:26:04 2005
-@@ -283,7 +283,7 @@
- 
-     mib[0] = CTL_HW;
-     mib[1] = HW_PHYSMEM;
--    rlen = sizof(result);
-+    rlen = sizeof(result);
-     if (sysctl(mib, 2, &result, &rlen, NULL, 0) == -1)
-        result = 256 * MB;
-
Index: files/patch-j2se::medialib::mlib_types.h
===================================================================
RCS file: files/patch-j2se::medialib::mlib_types.h
diff -N files/patch-j2se::medialib::mlib_types.h
--- files/patch-j2se::medialib::mlib_types.h	7 Apr 2005 20:47:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::medialib::mlib_types.h,v 1.1 2005/04/07 20:47:03 glewis Exp $
-
---- ../../j2se/src/share/native/sun/awt/medialib/mlib_types.h.orig	Sun Mar 20 22:08:20 2005
-+++ ../../j2se/src/share/native/sun/awt/medialib/mlib_types.h	Sun Mar 20 22:08:33 2005
-@@ -47,7 +47,11 @@
- 
- #if defined(_ALLBSD_SOURCE)
- #include <stddef.h>                     /* for ptrdiff_t */
-+#if defined(__FreeBSD__) && __FreeBSD__ < 5
-+#include <inttypes.h>
-+#else
- #include <stdint.h>                     /* for uintptr_t */
-+#endif
- #elif defined(__linux__)
- #include <stdint.h>                     /* for uintptr_t */
- #include <malloc.h>                     /* for ptrdiff_t */
Index: files/patch-koi8u
===================================================================
RCS file: files/patch-koi8u
diff -N files/patch-koi8u
--- files/patch-koi8u	3 Aug 2005 19:43:45 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
---- ../../j2se/src/share/classes/sun/nio/cs/standard-charsets	Tue Oct 19 14:57:57 2004
-+++ ../../j2se/src/share/classes/sun/nio/cs/standard-charsets	Wed Jul 20 00:02:11 2005
-@@ -172,6 +172,11 @@
- charset KOI8-R KOI8_R
-     alias koi8_r			# JDK historical
--    alias koi8
-     alias cskoi8r
-+
-+charset KOI8-U KOI8_U		# Superset of KOI8-R covering other
-+    alias koi8_u		# Cyrillics-using alphabets
-+    alias koi8
-+    alias cskoi8u
-+    alias koi8u
- 
- charset windows-1250 MS1250
---- ../../j2se/src/share/classes/sun/io/CharacterEncoding.java	Tue Oct 19 14:57:28 2004
-+++ ../../j2se/src/share/classes/sun/io/CharacterEncoding.java	Wed Jul 20 01:10:16 2005
-@@ -75,4 +75,5 @@
-         aliasTable.put("gbk",                   "GBK");
-         aliasTable.put("koi8-r",                "KOI8_R");
-+        aliasTable.put("koi8-u",                "KOI8_U");
-         aliasTable.put("tis620.2533",           "TIS620");
-         
-@@ -763,6 +764,11 @@
-             // Russian KOI8-R
-             aliasTable.put("koi8-r",                "KOI8_R");
--            aliasTable.put("koi8",                  "KOI8_R");
-             aliasTable.put("cskoi8r",               "KOI8_R");
-+
-+            // Ukrainian and Bielorussian KOI8-U (includes KOI8-R)
-+            aliasTable.put("koi8-u",                "KOI8_U");
-+            aliasTable.put("koi8",                  "KOI8_U");
-+            aliasTable.put("koi8u",                 "KOI8_U");
-+            aliasTable.put("cskoi8u",               "KOI8_U");
- 
-             // Simplified Chinese
---- ../../j2se/make/java/sun_io/FILES_java.gmk	Tue Oct 19 14:44:54 2004
-+++ ../../j2se/make/java/sun_io/FILES_java.gmk	Wed Jul 20 01:20:35 2005
-@@ -65,4 +65,6 @@
-     $(TARGDIR)sun/io/ByteToCharKOI8_R.java \
-     $(TARGDIR)sun/io/CharToByteKOI8_R.java \
-+    $(TARGDIR)sun/io/ByteToCharKOI8_U.java \
-+    $(TARGDIR)sun/io/CharToByteKOI8_U.java \
-     $(TARGDIR)sun/io/ByteToCharSingleByte.java \
-     $(TARGDIR)sun/io/CharToByteSingleByte.java \
---- ../../j2se/src/solaris/classes/sun/awt/motif/MFontConfiguration.java	Tue Oct 19 15:01:53 2004
-+++ ../../j2se/src/solaris/classes/sun/awt/motif/MFontConfiguration.java	Tue Aug  2 12:20:17 2005
-@@ -101,4 +101,5 @@
- 	reorderMap.put("windows-1251", "cyrillic-cp1251");
- 	reorderMap.put("KOI8-R", "cyrillic-koi8-r");
-+	reorderMap.put("KOI8-U", "cyrillic-koi8-u");
- 	reorderMap.put("ISO-8859-6", "arabic");
- 	reorderMap.put("ISO-8859-7", "greek");
---- ../../j2se/src/solaris/classes/sun/font/XMap.java	Tue Oct 19 15:01:55 2004
-+++ ../../j2se/src/solaris/classes/sun/font/XMap.java	Tue Aug  2 12:21:16 2005
-@@ -84,4 +84,6 @@
- 	} else if (encoding.equals("koi8-r")) {
- 	    jclass = "io.CharToByteKOI8_R";
-+	} else if (encoding.equals("koi8-u")) {
-+	    jclass = "io.CharToByteKOI8_U";
- 	} else if (encoding.equals("ansi-1251")) {
- 	    jclass = "io.CharToByteCp1251";
Index: files/patch-vm::os_bsd.cpp
===================================================================
RCS file: /var/fcvs/ports/java/jdk15/files/patch-vm::os_bsd.cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-vm::os_bsd.cpp
--- files/patch-vm::os_bsd.cpp	21 Mar 2005 05:48:04 -0000	1.2
+++ files/patch-vm::os_bsd.cpp	7 Sep 2005 16:50:11 -0000
@@ -11,12 +11,3 @@
  #define EXTENSIONS_DIR "/lib/ext"
  #define ENDORSED_DIR "/lib/endorsed"
  
-@@ -1898,7 +1898,7 @@
-     } while ((res == OS_ERR) && (errno == EINTR));
-   } else {
-     assert(Thread::current()->is_Java_thread(), "must be java thread");
--    INTERRUPTIBLE_NORESTART(nanosleep(&t, &t), res, os::Bsd::clear_interrupted);
-+    INTERRUPTIBLE_NORESTART_VM(nanosleep(&t, &t), res, os::Bsd::clear_interrupted);
-   }
-   // INTERRUPTIBLE_NORESTART_VM returns res == OS_INTRPT for thread.Interrupt
- 
Index: files/pkg-install.in
===================================================================
RCS file: /var/fcvs/ports/java/jdk15/files/pkg-install.in,v
retrieving revision 1.3
diff -u -r1.3 pkg-install.in
--- files/pkg-install.in	6 Sep 2005 02:41:30 -0000	1.3
+++ files/pkg-install.in	9 Sep 2005 16:53:38 -0000
@@ -17,9 +17,4 @@
 		touch "${JRE_HOME}/.systemPrefs/.systemRootModFile"
 		chmod 644 "${JRE_HOME}/.systemPrefs/.systemRootModFile"
 	fi
-
-	# Set up class data sharing
-	if [ -x "${JRE_HOME}/bin/java" ]; then
-		"${JRE_HOME}/bin/java" -client -Xshare:dump
-	fi
 fi

--sdtB3X0nJg68CQEu--