diff options
| author | Alexey Zelkin <phantom@FreeBSD.org> | 2003-11-11 16:16:20 +0000 |
|---|---|---|
| committer | Alexey Zelkin <phantom@FreeBSD.org> | 2003-11-11 16:16:20 +0000 |
| commit | 371e6b4b5ca3bcab33514c757c2d0ec4488ea1e5 (patch) | |
| tree | cd8f00f5d006366077a79d4ba438bdb3d89305df /java | |
| parent | Upgrade to 2.8.6 (diff) | |
Update to 1.4.2p5.
Important changes since last patchset:
. jdk14 port is now JDK 1.4.2 based!
. JavaWS distributing with jdk
. Runway problem fixed (fork() is no more problem for java apps)
. Sound support updated
. IPv6 support overhauled
. Drag'n'Drop support fixed (require open-motif mods)
As for now there's no more outstanding issues with this port!
FreeBSD port is also got a important of changes:
. optimized setup is now default (to get debuging bins/libs use WITH_DEBUG)
. bootstrap jdk autodetection. If WITH_LINUX_BOOTSTRAP is not set, then
it checks all known to work JDKs installed. If nothing found, forces
to install of linux-sun-jdk14
. Because of above change there's no NATIVE_BOOTSTRAP option anymore. If
native jdk14 is installed, it will be used by default.
Notes
Notes:
svn path=/head/; revision=93743
Diffstat (limited to 'java')
33 files changed, 855 insertions, 858 deletions
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index 3872d7d3733e..7ca61b4dd07e 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -7,45 +7,71 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html -SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip +SCSL_SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip +SCSL_BINFILE= j2sdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip PATCHSETFILE= bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz -DISTFILES= ${SRCFILE} ${PATCHSETFILE} +DISTFILES= ${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE} MAINTAINER= phantom@FreeBSD.org -COMMENT= Java Development Kit 1.4.1 +COMMENT= Java Development Kit 1.4.2 +# XXX: (native bootstrap, no plugin/javaws, x11) +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 \ ${LOCALBASE}/include/nspr/prtypes.h:${PORTSDIR}/devel/nspr -.if !defined(NATIVE_BOOTSTRAP) -BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14 -.endif RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ ${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts WRKSRC= ${WRKDIR}/control/make -JDK_VERSION= 1.4.1 -JDK_PATCHSET_VERSION= 4 +JDK_VERSION= 1.4.2 +JDK_PATCHSET_VERSION= 5 -SUN_LINUX_JDK_VERSION= 1.4.2 +.if !defined(WITH_LINUX_BOOTSTRAP) +NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/jdk1.4.2 \ + ${LOCALBASE}/jdk1.4.1 +.endif -.if defined(NATIVE_BOOTSTRAP) -JDK14DIR?= ${LOCALBASE}/jdk${JDK_VERSION} -.else -JDK14DIR?= ${LOCALBASE}/linux-sun-jdk${SUN_LINUX_JDK_VERSION} +LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2_02 \ + ${LOCALBASE}/linux-sun-jdk1.4.2_01 \ + ${LOCALBASE}/linux-sun-jdk1.4.2 \ + ${LOCALBASE}/linux-sun-jdk1.4.1 + +.include <bsd.port.pre.mk> + +.if !defined(WITH_LINUX_BOOTSTRAP) +.for CJDK in ${NATIVE_BOOTSTRAP_JDKS} +. if !defined(JDK14DIR) && exists(${CJDK}/bin/javac) +JDK14DIR= ${CJDK} +. endif +.endfor +.endif + +.if !defined(JDK14DIR) +_NEED_BOOTSRAP_JDK= YES +.for CJDK in ${LINUX_BOOTSTRAP_JDKS} +. if !defined(JDK14DIR) && exists(${CJDK}/bin/javac) +JDK14DIR= ${CJDK} +WITH_LINUX_BOOTSTRAP= YES +.undef NEED_BOOTSTRAP_JDK +. endif +.endfor +.endif + +.if defined(_NEED_BOOTSTRAP_JDK) +BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14 .endif # workaround to handle both 'zip' and 'tar.gz' distfiles USE_ZIP= YES USE_REINPLACE= YES -EXTRACT_ONLY= ${SRCFILE} +EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE} ONLY_FOR_ARCHS= i386 USE_GMAKE= YES @@ -54,8 +80,7 @@ NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \ ALT_MOTIF_DIR="${X11BASE}" \ SYS_CFLAGS="${CFLAGS}" \ - JAVAWS_OPTIONAL="YES" \ - NO_DOCS="YES" \ + DEV_ONLY="YES" \ LANG="C" \ JAVA_HOME="" \ CLASSPATH="" \ @@ -70,25 +95,15 @@ JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image SORT?= /usr/bin/sort CPIO?= /usr/bin/cpio -.if defined(NODEBUG) -PLIST_SUB+= DEBUG:="@comment " -PKGNAMESUFFIX= -nodebug -.else +.if defined(WITH_DEBUG) PLIST_SUB+= DEBUG:="" +PKGNAMESUFFIX= -debug +.else +PLIST_SUB+= DEBUG:="@comment " .endif -PTHREAD_FILES= hotspot/build/bsd/makefiles/gcc.make \ - hotspot/build/bsd/makefiles/vm.make \ - j2se/make/common/Defs.gmk \ - j2se/make/common/Defs-bsd.gmk \ - j2se/make/common/Program.gmk \ - j2se/make/java/hpi/native/Makefile \ - j2se/ext/plugin/build/solaris/GNUmakefile - -.include <bsd.port.pre.mk> - # Check for JDK sources -.if !exists(${DISTDIR}/${SRCFILE}) && !defined(PACKAGE_BUILDING) +.if !exists(${DISTDIR}/${SCSL_SRCFILE}) && !defined(PACKAGE_BUILDING) ECHO_MSG=/usr/bin/printf IGNORE= :\n\ Because of licensing restrictions, you must fetch the source distribution\n\ @@ -97,7 +112,19 @@ with a web browser and follow the \"Download\" link for the\n\ \"Java(TM) SDK ${JDK_VERSION}\". You will be required to log in and register,\n\ but you can create an account on this page. After registration and\n\ accepting the Sun Community Source License, select \"J2SESDK\" and\n\ -download the source file, ${SRCFILE}. Please place this file in\n\ +download the source file, ${SCSL_SRCFILE}. Please place this file in\n\ +${DISTDIR}.\n +.endif +.if !exists(${DISTDIR}/${SCSL_BINFILE}) && !defined(PACKAGE_BUILDING) +ECHO_MSG=/usr/bin/printf +IGNORE= :\n\ +Because of licensing restrictions, you must fetch the source distribution\n\ +manually. Please access http://www.sun.com/software/java2/download.html\n\ +with a web browser and follow the \"Download\" link for the\n\ +\"Java(TM) SDK ${JDK_VERSION}\". You will be required to log in and register,\n\ +but you can create an account on this page. After registration and\n\ +accepting the Sun Community Source License, select \"J2SESDK\" and\n\ +download the source file, ${SCSL_BINFILE}. Please place this file in\n\ ${DISTDIR}.\n .endif @@ -112,7 +139,7 @@ http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\ Please place the patchset in ${DISTDIR}.\n .endif -# JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates. +# JDK 1.4.2 require recent version of FreeBSD due to recent libc_r updates. # Make check for reqiuired primities as early as possible TESTPROG=testos @@ -134,7 +161,7 @@ check-os: /usr/bin/printf "\n\ You must have a version of FreeBSD later than 4.7-STABLE\n\ February 2003 or 5-CURRENT February 2003 to compile and\n\ -use JDK 1.4.1.\n\n" ; \ +use JDK 1.4.2.\n\n" ; \ exit 1 ; \ fi @${WRKDIR}/${TESTPROG} 2>/dev/null @@ -144,14 +171,16 @@ pre-fetch: check-os @${ECHO_MSG} @${ECHO_MSG} "NOTICES:" @${ECHO_MSG} - @${ECHO_MSG} "To build JDK 1.4.1 port, you should have at least" - @${ECHO_MSG} "2.5Gb of free disk space in build area!" + @${ECHO_MSG} "To build JDK 1.4.2 port, you should have at least" + @${ECHO_MSG} "1.7Gb of free disk space in build area!" @${ECHO_MSG} - @${ECHO_MSG} "To build JDK 1.4.1 port, you should have linux emulation" +.if defined(WITH_LINUX_BOOTSTRAP) + @${ECHO_MSG} "To build JDK 1.4.2 port, you should have linux emulation" @${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem" @${ECHO_MSG} "mounted." @${ECHO_MSG} - @${ECHO_MSG} "NOTE: Please use \`make -DNODEBUG' if you don't want to" +.endif + @${ECHO_MSG} "NOTE: Please use \`make -DWITH_DEBUG' if you want to" @${ECHO_MSG} "install libraries and binaries with debugging support." @${ECHO_MSG} @@ -161,12 +190,7 @@ pre-patch: ${CHMOD} -R u+w * && \ ${PATCH} -p0 < ${WRKDIR}/jdk14.patches -post-patch: - @for file in ${PTHREAD_FILES}; do \ - ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g; s:-lc_r:${PTHREAD_LIBS}:g" ${WRKDIR}/$${file}; \ - done - -.if !defined(NATIVE_BOOTSTRAP) +.if defined(WITH_LINUX_BOOTSTRAP) pre-build: @if [ "$${WRKDIRPREFIX}" -a \ -L "/compat/linux/$${WRKDIRPREFIX}" -a \ @@ -189,7 +213,7 @@ pre-build: @if [ "`/sbin/mount | grep ^linprocfs`" = "" ]; \ then \ ${ECHO_MSG} "ERROR: You have to have LINPROCFS mounted before" ; \ - ${ECHO_MSG} "starting to build of native JDK 1.4.1." ; \ + ${ECHO_MSG} "starting to build of native JDK 1.4.2." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "You may do it by following set of commands:" ; \ ${ECHO_MSG} "" ; \ @@ -208,14 +232,17 @@ do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) post-build: - @# XXX make sure that SwingSet2/resources does not exists + @# make sure that SwingSet2/resources does not exists @${RM} -rf ${JDKIMAGEDIR}/demo/jfc/SwingSet2/resources @${RM} -rf ${JDKIMAGEDIR}/demo/plugin/jfc/SwingSet2/resources + @# XXX don't install japanese manpages + @${RM} -rf ${JDKIMAGEDIR}/man/ja + @${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP -.if !defined(NODEBUG) +.if !defined(WITH_DEBUG) pre-install: @${ECHO_MSG} - @${ECHO_MSG} "Please use \`make -DNODEBUG' if you don't want to install libraries and binaries" + @${ECHO_MSG} "Please use \`make -DWITH_DEBUG' if you want to install libraries and binaries" @${ECHO_MSG} "with debugging support." @${ECHO_MSG} .endif @@ -224,7 +251,7 @@ do-install: ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} -.if !defined(NODEBUG) +.if defined(WITH_DEBUG) cd ${JDKIMAGEDIR_G} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} .endif diff --git a/java/jdk14/distinfo b/java/jdk14/distinfo index 52ecda3803d8..1ebe6b524aa1 100644 --- a/java/jdk14/distinfo +++ b/java/jdk14/distinfo @@ -1,2 +1,3 @@ -MD5 (j2sdk-1_4_1-src-scsl.zip) = e6f35d1183660682f4f03965d35b67c5 -MD5 (bsd-jdk14-patches-4.tar.gz) = 2ebb1b01829a898931611495c1669097 +MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65 +MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc +MD5 (bsd-jdk14-patches-5.tar.gz) = 2e1aac5a64910c8c476eca7061a237f3 diff --git a/java/jdk14/files/patch-UNIXProcess_md.c.bsd b/java/jdk14/files/patch-UNIXProcess_md.c.bsd deleted file mode 100644 index d9ec95eefa7c..000000000000 --- a/java/jdk14/files/patch-UNIXProcess_md.c.bsd +++ /dev/null @@ -1,93 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/java/lang/UNIXProcess_md.c.bsd.orig Wed Oct 29 12:22:58 2003 -+++ ../../j2se/src/solaris/native/java/lang/UNIXProcess_md.c.bsd Wed Oct 29 12:23:33 2003 -@@ -22,6 +22,12 @@ - #include <errno.h> - #include <unistd.h> - -+#if defined(__FreeBSD__) -+#include <dlfcn.h> -+#include <pthread.h> -+#include <pthread_np.h> -+#endif -+ - /* path in the environment */ - static char **PATH = 0; - /* effective uid */ -@@ -228,6 +234,61 @@ - } - } - -+#if defined(__FreeBSD__) -+ -+extern pid_t __sys_fork(void); -+ -+static pid_t -+jdk_fork_wrapper() -+{ -+ pid_t resultPid; -+#if (__FreeBSD_version < 5) -+ static int is_libc_r = -1; -+ void *funcref; -+ -+ if (is_libc_r == -1) { -+ is_libc_r = 1; -+ -+ /* -+ * BSDNOTE: Check for loaded symbols. -+ * -+ * If "_thr_critical_enter" is found assume we are using 'libthr'. -+ * If _kse_critical_enter is found assume we are using 'libkse'. -+ * Otherwise we are using libc_r. -+ * -+ * If libc_r is loaded, use fork system call drectly to avoid -+ * problems with using protected pages. -+ * -+ * --phantom -+ */ -+ funcref = dlsym(RTLD_DEFAULT, "_kse_critical_enter"); -+ if (funcref != NULL) -+ is_libc_r = 0; -+ else { -+ funcref = dlsym(RTLD_DEFAULT, "_thr_critical_enter"); -+ if (funcref != NULL) -+ is_libc_r = 0; -+ } -+ } -+ -+ if (is_libc_r == 0) { -+ /* Not a libc_r */ -+ resultPid = fork(); -+ } else { -+#endif /* __FreeBSD_version < 5 */ -+ pthread_suspend_all_np(); -+ resultPid = __sys_fork(); -+ if (resultPid != 0) -+ /* leave child in single threading mode */ -+ pthread_resume_all_np(); -+#if (__FreeBSD_version < 5) -+ } -+#endif /* __FreeBSD_version < 5 */ -+ -+ return resultPid; -+} -+#endif /* __FreeBSD__ */ -+ - JNIEXPORT jint JNICALL - Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env, - jobject process, -@@ -335,8 +396,12 @@ - if (path != NULL) { - cwd = (char *)JNU_GetStringPlatformChars(env, path, NULL); - } -- -+ -+#if defined(__FreeBSD__) -+ resultPid = jdk_fork_wrapper(); -+#else - resultPid = fork(); -+#endif - - if (resultPid < 0) { - char errmsg[128]; diff --git a/java/jdk14/files/patch-control::common::Defs-bsd.gmk b/java/jdk14/files/patch-control::common::Defs-bsd.gmk new file mode 100644 index 000000000000..f9e45f642fa1 --- /dev/null +++ b/java/jdk14/files/patch-control::common::Defs-bsd.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../control/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:22 2003 ++++ ../../control/make/common/Defs-bsd.gmk Wed Nov 12 16:51:41 2003 +@@ -212,7 +212,7 @@ + ifeq ($(TRUE_PLATFORM), NetBSD) + DEVTOOLS_PATH = /usr/pkg/bin/ + else +-DEVTOOLS_PATH = /usr/local/bin/ ++DEVTOOLS_PATH = ${LOCALBASE}/bin/ + endif + # Allow the user to override the default value... + ifdef ALT_DEVTOOLS_PATH diff --git a/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk new file mode 100644 index 000000000000..03d079961bde --- /dev/null +++ b/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:55 2003 ++++ ../../deploy/make/common/Defs-bsd.gmk Wed Nov 12 16:53:08 2003 +@@ -10,7 +10,7 @@ + # XXXBSD: this issue need to be rehashed (/usr/local/ should be defined + # in other place + ifeq ($(TRUE_PLATFORM), FreeBSD) +-USR_LOCAL_PATH = /usr/local/ ++USR_LOCAL_PATH = ${LOCALBASE}/ + endif + + BUNDLE_SUFFIX = .zip diff --git a/java/jdk14/files/patch-nio::Makefile b/java/jdk14/files/patch-nio::Makefile deleted file mode 100644 index 5835666f8f43..000000000000 --- a/java/jdk14/files/patch-nio::Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/java/nio/Makefile 15 Feb 2003 14:45:49 -0000 1.4 -+++ ../../j2se/make/java/nio/Makefile 24 Aug 2003 05:37:04 -0000 -@@ -131,7 +131,7 @@ - - # XXXBSD: really need it for BSD ? - ifeq ($(PLATFORM), bsd) --OTHER_CFLAGS += -Werror -+#OTHER_CFLAGS += -Werror - OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH)$(SUFFIX) -ljava$(SUFFIX) -lnet$(SUFFIX) - endif - diff --git a/java/jdk14/files/patch-plugin::common::config.gmk b/java/jdk14/files/patch-plugin::common::config.gmk new file mode 100644 index 000000000000..fd995e3c063b --- /dev/null +++ b/java/jdk14/files/patch-plugin::common::config.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/make/plugin/common/config.gmk.orig Wed Nov 12 16:53:30 2003 ++++ ../../deploy/make/plugin/common/config.gmk Wed Nov 12 16:53:43 2003 +@@ -57,7 +57,7 @@ + + # include search paths + # XXXBSD: these should be defined in other place +- CPPFLAGS1 += -I/usr/X11R6/include -I/usr/local/include ++ CPPFLAGS1 += -I/usr/X11R6/include -I${LOCALBASE}/include + + ifeq ($(TRUE_PLATFORM), FreeSBD) + ifeq ($(FREEBSD_4STABLE), true) diff --git a/java/jdk14/files/patch-plugin::ns6::Makefile b/java/jdk14/files/patch-plugin::ns6::Makefile new file mode 100644 index 000000000000..f3ce7053dd48 --- /dev/null +++ b/java/jdk14/files/patch-plugin::ns6::Makefile @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/make/plugin/ns6/Makefile.orig Wed Nov 12 16:54:05 2003 ++++ ../../deploy/make/plugin/ns6/Makefile Wed Nov 12 16:54:22 2003 +@@ -37,7 +37,7 @@ + # XXXBSD: direct /usr/local/include/nspr path is used!!! + #EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610/nspr -DRAPTOR_API -DNEW_STREAMING_API + +-EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I/usr/local/include/nspr -DRAPTOR_API -DNEW_STREAMING_API ++EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I${LOCALBASE}/include/nspr -DRAPTOR_API -DNEW_STREAMING_API + + vpath %.c $(SRCDIR):$(SRCDIR)/../common: + vpath %.cpp $(SRCDIR):$(SRCDIR)/../common:$(SHARED_DIR2)/jcomponent diff --git a/java/jdk14/files/testos.c b/java/jdk14/files/testos.c index e5c24160901d..d1e77573e86b 100644 --- a/java/jdk14/files/testos.c +++ b/java/jdk14/files/testos.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * Test pthreads primitives for required functionality in order to run - * native FreeBSD JDK1.4.1 port. + * native FreeBSD JDK1.4.2 port. * * Returns: * 0 - test passed diff --git a/java/jdk14/pkg-descr b/java/jdk14/pkg-descr index e3405a6f9a1a..b80bb46b3141 100644 --- a/java/jdk14/pkg-descr +++ b/java/jdk14/pkg-descr @@ -1,5 +1,5 @@ This is the latest patchset from the Java 2 FreeBSD porting project. This -port allows you to easily build a native JDK1.4.1 for FreeBSD. +port allows you to easily build a native JDK1.4.2 for FreeBSD. Please note that due to the current Sun licensing policy the resulting binaries can't be distributed and you are only permitted to use/hack it personally. diff --git a/java/jdk14/pkg-plist b/java/jdk14/pkg-plist index b10e800df614..3dca22efb941 100644 --- a/java/jdk14/pkg-plist +++ b/java/jdk14/pkg-plist @@ -2,8 +2,6 @@ jdk%%JDK_VERSION%%/COPYRIGHT jdk%%JDK_VERSION%%/LICENSE jdk%%JDK_VERSION%%/README jdk%%JDK_VERSION%%/README.html -jdk%%JDK_VERSION%%/src.zip -jdk%%JDK_VERSION%%/bin/ControlPanel jdk%%JDK_VERSION%%/bin/HtmlConverter jdk%%JDK_VERSION%%/bin/appletviewer jdk%%JDK_VERSION%%/bin/extcheck @@ -169,6 +167,7 @@ jdk%%JDK_VERSION%%/demo/applets/JumpingBox/JumpingBox.java jdk%%JDK_VERSION%%/demo/applets/JumpingBox/example1.html jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/adapt-or-die.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/cannot.be.completed.au +jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/danger.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/ip.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/that.hurts.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/thin.bell.au @@ -213,11 +212,6 @@ jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/SpreadSheet.class jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/SpreadSheet.java jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/SpreadSheetInput.class jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/example1.html -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolCanvas.class -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolTest$MyAdapter.class -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolTest.class -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolTest.java -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/example1.html jdk%%JDK_VERSION%%/demo/applets/TicTacToe/TicTacToe.class jdk%%JDK_VERSION%%/demo/applets/TicTacToe/TicTacToe.java jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio/beep.au @@ -458,6 +452,7 @@ jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample4.java jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableMap.java jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableSorter.java jdk%%JDK_VERSION%%/demo/jpda/examples.jar +jdk%%JDK_VERSION%%/demo/plugin/applets.html jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/Animation.class jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/AnimationFrame.class jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/Animator.class @@ -597,6 +592,7 @@ jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/JumpingBox.java jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/example1.html jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/adapt-or-die.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/cannot.be.completed.au +jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/danger.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/ip.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/that.hurts.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/thin.bell.au @@ -641,11 +637,6 @@ jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/SpreadSheet.class jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/SpreadSheet.java jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/SpreadSheetInput.class jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/example1.html -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolCanvas.class -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolTest$MyAdapter.class -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolTest.class -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolTest.java -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/example1.html jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/TicTacToe.class jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/TicTacToe.java jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/audio/beep.au @@ -912,6 +903,37 @@ jdk%%JDK_VERSION%%/jre/bin/rmid jdk%%JDK_VERSION%%/jre/bin/rmiregistry jdk%%JDK_VERSION%%/jre/bin/servertool jdk%%JDK_VERSION%%/jre/bin/tnameserv +jdk%%JDK_VERSION%%/jre/javaws/cacerts +jdk%%JDK_VERSION%%/jre/javaws/javalogo52x88.gif +jdk%%JDK_VERSION%%/jre/javaws/javaws +jdk%%JDK_VERSION%%/jre/javaws/javaws-l10n.jar +jdk%%JDK_VERSION%%/jre/javaws/javaws.jar +jdk%%JDK_VERSION%%/jre/javaws/javaws.policy +jdk%%JDK_VERSION%%/jre/javaws/javawsbin +jdk%%JDK_VERSION%%/jre/javaws/readme.html +jdk%%JDK_VERSION%%/jre/javaws/readme_de.html +jdk%%JDK_VERSION%%/jre/javaws/readme_es.html +jdk%%JDK_VERSION%%/jre/javaws/readme_fr.html +jdk%%JDK_VERSION%%/jre/javaws/readme_it.html +jdk%%JDK_VERSION%%/jre/javaws/readme_ja.html +jdk%%JDK_VERSION%%/jre/javaws/readme_ko.html +jdk%%JDK_VERSION%%/jre/javaws/readme_sv.html +jdk%%JDK_VERSION%%/jre/javaws/readme_zh_CN.html +jdk%%JDK_VERSION%%/jre/javaws/readme_zh_TW.html +jdk%%JDK_VERSION%%/jre/javaws/resources/copyright.jpg +jdk%%JDK_VERSION%%/jre/javaws/resources/messages.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_de.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_es.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_fr.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_it.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_ja.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_ko.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_sv.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_zh_CN.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_zh_TW.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/miniSplash.jpg +jdk%%JDK_VERSION%%/jre/javaws/resources/splash.jpg +jdk%%JDK_VERSION%%/jre/javaws/sunlogo64x30.gif jdk%%JDK_VERSION%%/jre/lib/audio/soundbank.gm jdk%%JDK_VERSION%%/jre/lib/charsets.jar jdk%%JDK_VERSION%%/jre/lib/cmm/CIEXYZ.pf @@ -940,8 +962,8 @@ jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt -jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig.so jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so +jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig.so jdk%%JDK_VERSION%%/jre/lib/i386/jvm.cfg jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc.so jdk%%JDK_VERSION%%/jre/lib/i386/libawt.so @@ -968,9 +990,10 @@ jdk%%JDK_VERSION%%/jre/lib/i386/libverify.so jdk%%JDK_VERSION%%/jre/lib/i386/libzip.so jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt -jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig.so jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so +jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig.so jdk%%JDK_VERSION%%/jre/lib/im/indicim.jar +jdk%%JDK_VERSION%%/jre/lib/im/thaiim.jar jdk%%JDK_VERSION%%/jre/lib/images/cursors/cursors.properties jdk%%JDK_VERSION%%/jre/lib/images/cursors/invalid32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_CopyDrop32x32.gif @@ -979,7 +1002,6 @@ jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkDrop32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveDrop32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif -jdk%%JDK_VERSION%%/jre/lib/javaplugin.jar jdk%%JDK_VERSION%%/jre/lib/jce.jar jdk%%JDK_VERSION%%/jre/lib/jsse.jar jdk%%JDK_VERSION%%/jre/lib/jvm.hprof.txt @@ -997,6 +1019,7 @@ jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo jdk%%JDK_VERSION%%/jre/lib/logging.properties +jdk%%JDK_VERSION%%/jre/lib/plugin.jar jdk%%JDK_VERSION%%/jre/lib/psfont.properties.ja jdk%%JDK_VERSION%%/jre/lib/psfontj2d.properties jdk%%JDK_VERSION%%/jre/lib/rt.jar @@ -1179,6 +1202,7 @@ jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/DumontDUrville jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Mawson jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/McMurdo jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Palmer +jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Rothera jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Syowa jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Vostok jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aden @@ -1407,8 +1431,9 @@ jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Yap jdk%%JDK_VERSION%%/jre/lib/zi/WET jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings -jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin.so -jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji.so +jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.desktop +jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.png +jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/libjavaplugin.so jdk%%JDK_VERSION%%/jre/plugin/i386/ns610/libjavaplugin_oji.so jdk%%JDK_VERSION%%/lib/dt.jar jdk%%JDK_VERSION%%/lib/htmlconverter.jar @@ -1425,8 +1450,12 @@ jdk%%JDK_VERSION%%/man/man1/javac.1 jdk%%JDK_VERSION%%/man/man1/javadoc.1 jdk%%JDK_VERSION%%/man/man1/javah.1 jdk%%JDK_VERSION%%/man/man1/javap.1 +jdk%%JDK_VERSION%%/man/man1/javaws.1 jdk%%JDK_VERSION%%/man/man1/jdb.1 jdk%%JDK_VERSION%%/man/man1/keytool.1 +jdk%%JDK_VERSION%%/man/man1/kinit.1 +jdk%%JDK_VERSION%%/man/man1/klist.1 +jdk%%JDK_VERSION%%/man/man1/ktab.1 jdk%%JDK_VERSION%%/man/man1/native2ascii.1 jdk%%JDK_VERSION%%/man/man1/orbd.1 jdk%%JDK_VERSION%%/man/man1/policytool.1 @@ -1436,6 +1465,7 @@ jdk%%JDK_VERSION%%/man/man1/rmiregistry.1 jdk%%JDK_VERSION%%/man/man1/serialver.1 jdk%%JDK_VERSION%%/man/man1/servertool.1 jdk%%JDK_VERSION%%/man/man1/tnameserv.1 +jdk%%JDK_VERSION%%/src.zip %%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g %%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g %%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g @@ -1461,7 +1491,6 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/servertool_g %%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/java_g -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/java_vm_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/keytool_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/kinit_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/klist_g @@ -1472,8 +1501,9 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/rmiregistry_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/servertool_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/tnameserv_g -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so @@ -1484,7 +1514,6 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjaas_unix_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so @@ -1498,20 +1527,16 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/javaplugin_g.jar -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4_g/javaplugin_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600_g/libjavaplugin_oji_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns610_g/libjavaplugin_oji_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/plugin_g.jar +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/libjavaplugin_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns610/libjavaplugin_oji_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/lib/htmlconverter_g.jar -@exec mkdir -p %D/share/doc/java -@unexec rmdir %D/share/doc/java 2>/dev/null || true -@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%" -@unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%% -%%DEBUG:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns610_g -%%DEBUG:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600_g -%%DEBUG:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4_g +@exec mkdir -p %D/share/doc/java +@unexec rmdir %D/share/doc/java 2>/dev/null || true +@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%%/bin @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans @@ -1540,7 +1565,6 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph @dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo @dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet -@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest @dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio @dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images @dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe @@ -1588,87 +1612,89 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample @dirrm jdk%%JDK_VERSION%%/demo/jfc @dirrm jdk%%JDK_VERSION%%/demo/jpda -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2 -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/resources -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/resources -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/HelpFiles -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paths -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paint -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Mix -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Lines -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Composite -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Colors -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/Beans +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/SimpleAnimation +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ArcTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/BarChart +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Blink +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/CardTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Clock +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DitherTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DrawTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Fractal +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphicsTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer/models +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/NervousText +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SimpleGraph +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SortDemo +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame/models +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Arcs_Curves +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Colors +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Composite +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Lines +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Mix +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paint +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paths +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/HelpFiles +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/resources +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/resources +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2 +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame/models -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SortDemo -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SimpleGraph -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/NervousText -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer/models -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphicsTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Fractal -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DrawTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DitherTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Clock -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/CardTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Blink -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/BarChart -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ArcTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/SimpleAnimation -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/Beans -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets @dirrm jdk%%JDK_VERSION%%/demo/plugin @dirrm jdk%%JDK_VERSION%%/demo @dirrm jdk%%JDK_VERSION%%/include/freebsd @dirrm jdk%%JDK_VERSION%%/include +@dirrm jdk%%JDK_VERSION%%/jre/.systemPrefs @dirrm jdk%%JDK_VERSION%%/jre/bin -@dirrm jdk%%JDK_VERSION%%/jre/lib/audio +@dirrm jdk%%JDK_VERSION%%/jre/javaws/resources +@dirrm jdk%%JDK_VERSION%%/jre/javaws @dirrm jdk%%JDK_VERSION%%/jre/lib/applet +@dirrm jdk%%JDK_VERSION%%/jre/lib/audio @dirrm jdk%%JDK_VERSION%%/jre/lib/cmm @dirrm jdk%%JDK_VERSION%%/jre/lib/ext @dirrm jdk%%JDK_VERSION%%/jre/lib/fonts @@ -1679,30 +1705,30 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/jre/lib/im @dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors @dirrm jdk%%JDK_VERSION%%/jre/lib/images -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5 -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja @dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES @dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8 +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES @dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5 +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW @dirrm jdk%%JDK_VERSION%%/jre/lib/locale @dirrm jdk%%JDK_VERSION%%/jre/lib/security @dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Africa @@ -1720,12 +1746,11 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Pacific @dirrm jdk%%JDK_VERSION%%/jre/lib/zi @dirrm jdk%%JDK_VERSION%%/jre/lib -@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns610 -@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600 +@dirrm jdk%%JDK_VERSION%%/jre/plugin/desktop @dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4 +@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns610 @dirrm jdk%%JDK_VERSION%%/jre/plugin/i386 @dirrm jdk%%JDK_VERSION%%/jre/plugin -@dirrm jdk%%JDK_VERSION%%/jre/.systemPrefs @dirrm jdk%%JDK_VERSION%%/jre @dirrm jdk%%JDK_VERSION%%/lib @dirrm jdk%%JDK_VERSION%%/man/man1 diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 3872d7d3733e..7ca61b4dd07e 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -7,45 +7,71 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html -SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip +SCSL_SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip +SCSL_BINFILE= j2sdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip PATCHSETFILE= bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz -DISTFILES= ${SRCFILE} ${PATCHSETFILE} +DISTFILES= ${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE} MAINTAINER= phantom@FreeBSD.org -COMMENT= Java Development Kit 1.4.1 +COMMENT= Java Development Kit 1.4.2 +# XXX: (native bootstrap, no plugin/javaws, x11) +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 \ ${LOCALBASE}/include/nspr/prtypes.h:${PORTSDIR}/devel/nspr -.if !defined(NATIVE_BOOTSTRAP) -BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14 -.endif RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ ${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts WRKSRC= ${WRKDIR}/control/make -JDK_VERSION= 1.4.1 -JDK_PATCHSET_VERSION= 4 +JDK_VERSION= 1.4.2 +JDK_PATCHSET_VERSION= 5 -SUN_LINUX_JDK_VERSION= 1.4.2 +.if !defined(WITH_LINUX_BOOTSTRAP) +NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/jdk1.4.2 \ + ${LOCALBASE}/jdk1.4.1 +.endif -.if defined(NATIVE_BOOTSTRAP) -JDK14DIR?= ${LOCALBASE}/jdk${JDK_VERSION} -.else -JDK14DIR?= ${LOCALBASE}/linux-sun-jdk${SUN_LINUX_JDK_VERSION} +LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2_02 \ + ${LOCALBASE}/linux-sun-jdk1.4.2_01 \ + ${LOCALBASE}/linux-sun-jdk1.4.2 \ + ${LOCALBASE}/linux-sun-jdk1.4.1 + +.include <bsd.port.pre.mk> + +.if !defined(WITH_LINUX_BOOTSTRAP) +.for CJDK in ${NATIVE_BOOTSTRAP_JDKS} +. if !defined(JDK14DIR) && exists(${CJDK}/bin/javac) +JDK14DIR= ${CJDK} +. endif +.endfor +.endif + +.if !defined(JDK14DIR) +_NEED_BOOTSRAP_JDK= YES +.for CJDK in ${LINUX_BOOTSTRAP_JDKS} +. if !defined(JDK14DIR) && exists(${CJDK}/bin/javac) +JDK14DIR= ${CJDK} +WITH_LINUX_BOOTSTRAP= YES +.undef NEED_BOOTSTRAP_JDK +. endif +.endfor +.endif + +.if defined(_NEED_BOOTSTRAP_JDK) +BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14 .endif # workaround to handle both 'zip' and 'tar.gz' distfiles USE_ZIP= YES USE_REINPLACE= YES -EXTRACT_ONLY= ${SRCFILE} +EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE} ONLY_FOR_ARCHS= i386 USE_GMAKE= YES @@ -54,8 +80,7 @@ NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \ ALT_MOTIF_DIR="${X11BASE}" \ SYS_CFLAGS="${CFLAGS}" \ - JAVAWS_OPTIONAL="YES" \ - NO_DOCS="YES" \ + DEV_ONLY="YES" \ LANG="C" \ JAVA_HOME="" \ CLASSPATH="" \ @@ -70,25 +95,15 @@ JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image SORT?= /usr/bin/sort CPIO?= /usr/bin/cpio -.if defined(NODEBUG) -PLIST_SUB+= DEBUG:="@comment " -PKGNAMESUFFIX= -nodebug -.else +.if defined(WITH_DEBUG) PLIST_SUB+= DEBUG:="" +PKGNAMESUFFIX= -debug +.else +PLIST_SUB+= DEBUG:="@comment " .endif -PTHREAD_FILES= hotspot/build/bsd/makefiles/gcc.make \ - hotspot/build/bsd/makefiles/vm.make \ - j2se/make/common/Defs.gmk \ - j2se/make/common/Defs-bsd.gmk \ - j2se/make/common/Program.gmk \ - j2se/make/java/hpi/native/Makefile \ - j2se/ext/plugin/build/solaris/GNUmakefile - -.include <bsd.port.pre.mk> - # Check for JDK sources -.if !exists(${DISTDIR}/${SRCFILE}) && !defined(PACKAGE_BUILDING) +.if !exists(${DISTDIR}/${SCSL_SRCFILE}) && !defined(PACKAGE_BUILDING) ECHO_MSG=/usr/bin/printf IGNORE= :\n\ Because of licensing restrictions, you must fetch the source distribution\n\ @@ -97,7 +112,19 @@ with a web browser and follow the \"Download\" link for the\n\ \"Java(TM) SDK ${JDK_VERSION}\". You will be required to log in and register,\n\ but you can create an account on this page. After registration and\n\ accepting the Sun Community Source License, select \"J2SESDK\" and\n\ -download the source file, ${SRCFILE}. Please place this file in\n\ +download the source file, ${SCSL_SRCFILE}. Please place this file in\n\ +${DISTDIR}.\n +.endif +.if !exists(${DISTDIR}/${SCSL_BINFILE}) && !defined(PACKAGE_BUILDING) +ECHO_MSG=/usr/bin/printf +IGNORE= :\n\ +Because of licensing restrictions, you must fetch the source distribution\n\ +manually. Please access http://www.sun.com/software/java2/download.html\n\ +with a web browser and follow the \"Download\" link for the\n\ +\"Java(TM) SDK ${JDK_VERSION}\". You will be required to log in and register,\n\ +but you can create an account on this page. After registration and\n\ +accepting the Sun Community Source License, select \"J2SESDK\" and\n\ +download the source file, ${SCSL_BINFILE}. Please place this file in\n\ ${DISTDIR}.\n .endif @@ -112,7 +139,7 @@ http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\ Please place the patchset in ${DISTDIR}.\n .endif -# JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates. +# JDK 1.4.2 require recent version of FreeBSD due to recent libc_r updates. # Make check for reqiuired primities as early as possible TESTPROG=testos @@ -134,7 +161,7 @@ check-os: /usr/bin/printf "\n\ You must have a version of FreeBSD later than 4.7-STABLE\n\ February 2003 or 5-CURRENT February 2003 to compile and\n\ -use JDK 1.4.1.\n\n" ; \ +use JDK 1.4.2.\n\n" ; \ exit 1 ; \ fi @${WRKDIR}/${TESTPROG} 2>/dev/null @@ -144,14 +171,16 @@ pre-fetch: check-os @${ECHO_MSG} @${ECHO_MSG} "NOTICES:" @${ECHO_MSG} - @${ECHO_MSG} "To build JDK 1.4.1 port, you should have at least" - @${ECHO_MSG} "2.5Gb of free disk space in build area!" + @${ECHO_MSG} "To build JDK 1.4.2 port, you should have at least" + @${ECHO_MSG} "1.7Gb of free disk space in build area!" @${ECHO_MSG} - @${ECHO_MSG} "To build JDK 1.4.1 port, you should have linux emulation" +.if defined(WITH_LINUX_BOOTSTRAP) + @${ECHO_MSG} "To build JDK 1.4.2 port, you should have linux emulation" @${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem" @${ECHO_MSG} "mounted." @${ECHO_MSG} - @${ECHO_MSG} "NOTE: Please use \`make -DNODEBUG' if you don't want to" +.endif + @${ECHO_MSG} "NOTE: Please use \`make -DWITH_DEBUG' if you want to" @${ECHO_MSG} "install libraries and binaries with debugging support." @${ECHO_MSG} @@ -161,12 +190,7 @@ pre-patch: ${CHMOD} -R u+w * && \ ${PATCH} -p0 < ${WRKDIR}/jdk14.patches -post-patch: - @for file in ${PTHREAD_FILES}; do \ - ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g; s:-lc_r:${PTHREAD_LIBS}:g" ${WRKDIR}/$${file}; \ - done - -.if !defined(NATIVE_BOOTSTRAP) +.if defined(WITH_LINUX_BOOTSTRAP) pre-build: @if [ "$${WRKDIRPREFIX}" -a \ -L "/compat/linux/$${WRKDIRPREFIX}" -a \ @@ -189,7 +213,7 @@ pre-build: @if [ "`/sbin/mount | grep ^linprocfs`" = "" ]; \ then \ ${ECHO_MSG} "ERROR: You have to have LINPROCFS mounted before" ; \ - ${ECHO_MSG} "starting to build of native JDK 1.4.1." ; \ + ${ECHO_MSG} "starting to build of native JDK 1.4.2." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "You may do it by following set of commands:" ; \ ${ECHO_MSG} "" ; \ @@ -208,14 +232,17 @@ do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) post-build: - @# XXX make sure that SwingSet2/resources does not exists + @# make sure that SwingSet2/resources does not exists @${RM} -rf ${JDKIMAGEDIR}/demo/jfc/SwingSet2/resources @${RM} -rf ${JDKIMAGEDIR}/demo/plugin/jfc/SwingSet2/resources + @# XXX don't install japanese manpages + @${RM} -rf ${JDKIMAGEDIR}/man/ja + @${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP -.if !defined(NODEBUG) +.if !defined(WITH_DEBUG) pre-install: @${ECHO_MSG} - @${ECHO_MSG} "Please use \`make -DNODEBUG' if you don't want to install libraries and binaries" + @${ECHO_MSG} "Please use \`make -DWITH_DEBUG' if you want to install libraries and binaries" @${ECHO_MSG} "with debugging support." @${ECHO_MSG} .endif @@ -224,7 +251,7 @@ do-install: ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} -.if !defined(NODEBUG) +.if defined(WITH_DEBUG) cd ${JDKIMAGEDIR_G} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} .endif diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo index 52ecda3803d8..1ebe6b524aa1 100644 --- a/java/jdk15/distinfo +++ b/java/jdk15/distinfo @@ -1,2 +1,3 @@ -MD5 (j2sdk-1_4_1-src-scsl.zip) = e6f35d1183660682f4f03965d35b67c5 -MD5 (bsd-jdk14-patches-4.tar.gz) = 2ebb1b01829a898931611495c1669097 +MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65 +MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc +MD5 (bsd-jdk14-patches-5.tar.gz) = 2e1aac5a64910c8c476eca7061a237f3 diff --git a/java/jdk15/files/patch-UNIXProcess_md.c.bsd b/java/jdk15/files/patch-UNIXProcess_md.c.bsd deleted file mode 100644 index d9ec95eefa7c..000000000000 --- a/java/jdk15/files/patch-UNIXProcess_md.c.bsd +++ /dev/null @@ -1,93 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/java/lang/UNIXProcess_md.c.bsd.orig Wed Oct 29 12:22:58 2003 -+++ ../../j2se/src/solaris/native/java/lang/UNIXProcess_md.c.bsd Wed Oct 29 12:23:33 2003 -@@ -22,6 +22,12 @@ - #include <errno.h> - #include <unistd.h> - -+#if defined(__FreeBSD__) -+#include <dlfcn.h> -+#include <pthread.h> -+#include <pthread_np.h> -+#endif -+ - /* path in the environment */ - static char **PATH = 0; - /* effective uid */ -@@ -228,6 +234,61 @@ - } - } - -+#if defined(__FreeBSD__) -+ -+extern pid_t __sys_fork(void); -+ -+static pid_t -+jdk_fork_wrapper() -+{ -+ pid_t resultPid; -+#if (__FreeBSD_version < 5) -+ static int is_libc_r = -1; -+ void *funcref; -+ -+ if (is_libc_r == -1) { -+ is_libc_r = 1; -+ -+ /* -+ * BSDNOTE: Check for loaded symbols. -+ * -+ * If "_thr_critical_enter" is found assume we are using 'libthr'. -+ * If _kse_critical_enter is found assume we are using 'libkse'. -+ * Otherwise we are using libc_r. -+ * -+ * If libc_r is loaded, use fork system call drectly to avoid -+ * problems with using protected pages. -+ * -+ * --phantom -+ */ -+ funcref = dlsym(RTLD_DEFAULT, "_kse_critical_enter"); -+ if (funcref != NULL) -+ is_libc_r = 0; -+ else { -+ funcref = dlsym(RTLD_DEFAULT, "_thr_critical_enter"); -+ if (funcref != NULL) -+ is_libc_r = 0; -+ } -+ } -+ -+ if (is_libc_r == 0) { -+ /* Not a libc_r */ -+ resultPid = fork(); -+ } else { -+#endif /* __FreeBSD_version < 5 */ -+ pthread_suspend_all_np(); -+ resultPid = __sys_fork(); -+ if (resultPid != 0) -+ /* leave child in single threading mode */ -+ pthread_resume_all_np(); -+#if (__FreeBSD_version < 5) -+ } -+#endif /* __FreeBSD_version < 5 */ -+ -+ return resultPid; -+} -+#endif /* __FreeBSD__ */ -+ - JNIEXPORT jint JNICALL - Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env, - jobject process, -@@ -335,8 +396,12 @@ - if (path != NULL) { - cwd = (char *)JNU_GetStringPlatformChars(env, path, NULL); - } -- -+ -+#if defined(__FreeBSD__) -+ resultPid = jdk_fork_wrapper(); -+#else - resultPid = fork(); -+#endif - - if (resultPid < 0) { - char errmsg[128]; diff --git a/java/jdk15/files/patch-control::common::Defs-bsd.gmk b/java/jdk15/files/patch-control::common::Defs-bsd.gmk new file mode 100644 index 000000000000..f9e45f642fa1 --- /dev/null +++ b/java/jdk15/files/patch-control::common::Defs-bsd.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../control/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:22 2003 ++++ ../../control/make/common/Defs-bsd.gmk Wed Nov 12 16:51:41 2003 +@@ -212,7 +212,7 @@ + ifeq ($(TRUE_PLATFORM), NetBSD) + DEVTOOLS_PATH = /usr/pkg/bin/ + else +-DEVTOOLS_PATH = /usr/local/bin/ ++DEVTOOLS_PATH = ${LOCALBASE}/bin/ + endif + # Allow the user to override the default value... + ifdef ALT_DEVTOOLS_PATH diff --git a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk new file mode 100644 index 000000000000..03d079961bde --- /dev/null +++ b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:55 2003 ++++ ../../deploy/make/common/Defs-bsd.gmk Wed Nov 12 16:53:08 2003 +@@ -10,7 +10,7 @@ + # XXXBSD: this issue need to be rehashed (/usr/local/ should be defined + # in other place + ifeq ($(TRUE_PLATFORM), FreeBSD) +-USR_LOCAL_PATH = /usr/local/ ++USR_LOCAL_PATH = ${LOCALBASE}/ + endif + + BUNDLE_SUFFIX = .zip diff --git a/java/jdk15/files/patch-nio::Makefile b/java/jdk15/files/patch-nio::Makefile deleted file mode 100644 index 5835666f8f43..000000000000 --- a/java/jdk15/files/patch-nio::Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/java/nio/Makefile 15 Feb 2003 14:45:49 -0000 1.4 -+++ ../../j2se/make/java/nio/Makefile 24 Aug 2003 05:37:04 -0000 -@@ -131,7 +131,7 @@ - - # XXXBSD: really need it for BSD ? - ifeq ($(PLATFORM), bsd) --OTHER_CFLAGS += -Werror -+#OTHER_CFLAGS += -Werror - OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH)$(SUFFIX) -ljava$(SUFFIX) -lnet$(SUFFIX) - endif - diff --git a/java/jdk15/files/patch-plugin::common::config.gmk b/java/jdk15/files/patch-plugin::common::config.gmk new file mode 100644 index 000000000000..fd995e3c063b --- /dev/null +++ b/java/jdk15/files/patch-plugin::common::config.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/make/plugin/common/config.gmk.orig Wed Nov 12 16:53:30 2003 ++++ ../../deploy/make/plugin/common/config.gmk Wed Nov 12 16:53:43 2003 +@@ -57,7 +57,7 @@ + + # include search paths + # XXXBSD: these should be defined in other place +- CPPFLAGS1 += -I/usr/X11R6/include -I/usr/local/include ++ CPPFLAGS1 += -I/usr/X11R6/include -I${LOCALBASE}/include + + ifeq ($(TRUE_PLATFORM), FreeSBD) + ifeq ($(FREEBSD_4STABLE), true) diff --git a/java/jdk15/files/patch-plugin::ns6::Makefile b/java/jdk15/files/patch-plugin::ns6::Makefile new file mode 100644 index 000000000000..f3ce7053dd48 --- /dev/null +++ b/java/jdk15/files/patch-plugin::ns6::Makefile @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/make/plugin/ns6/Makefile.orig Wed Nov 12 16:54:05 2003 ++++ ../../deploy/make/plugin/ns6/Makefile Wed Nov 12 16:54:22 2003 +@@ -37,7 +37,7 @@ + # XXXBSD: direct /usr/local/include/nspr path is used!!! + #EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610/nspr -DRAPTOR_API -DNEW_STREAMING_API + +-EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I/usr/local/include/nspr -DRAPTOR_API -DNEW_STREAMING_API ++EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I${LOCALBASE}/include/nspr -DRAPTOR_API -DNEW_STREAMING_API + + vpath %.c $(SRCDIR):$(SRCDIR)/../common: + vpath %.cpp $(SRCDIR):$(SRCDIR)/../common:$(SHARED_DIR2)/jcomponent diff --git a/java/jdk15/files/testos.c b/java/jdk15/files/testos.c index e5c24160901d..d1e77573e86b 100644 --- a/java/jdk15/files/testos.c +++ b/java/jdk15/files/testos.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * Test pthreads primitives for required functionality in order to run - * native FreeBSD JDK1.4.1 port. + * native FreeBSD JDK1.4.2 port. * * Returns: * 0 - test passed diff --git a/java/jdk15/pkg-descr b/java/jdk15/pkg-descr index e3405a6f9a1a..b80bb46b3141 100644 --- a/java/jdk15/pkg-descr +++ b/java/jdk15/pkg-descr @@ -1,5 +1,5 @@ This is the latest patchset from the Java 2 FreeBSD porting project. This -port allows you to easily build a native JDK1.4.1 for FreeBSD. +port allows you to easily build a native JDK1.4.2 for FreeBSD. Please note that due to the current Sun licensing policy the resulting binaries can't be distributed and you are only permitted to use/hack it personally. diff --git a/java/jdk15/pkg-plist b/java/jdk15/pkg-plist index b10e800df614..3dca22efb941 100644 --- a/java/jdk15/pkg-plist +++ b/java/jdk15/pkg-plist @@ -2,8 +2,6 @@ jdk%%JDK_VERSION%%/COPYRIGHT jdk%%JDK_VERSION%%/LICENSE jdk%%JDK_VERSION%%/README jdk%%JDK_VERSION%%/README.html -jdk%%JDK_VERSION%%/src.zip -jdk%%JDK_VERSION%%/bin/ControlPanel jdk%%JDK_VERSION%%/bin/HtmlConverter jdk%%JDK_VERSION%%/bin/appletviewer jdk%%JDK_VERSION%%/bin/extcheck @@ -169,6 +167,7 @@ jdk%%JDK_VERSION%%/demo/applets/JumpingBox/JumpingBox.java jdk%%JDK_VERSION%%/demo/applets/JumpingBox/example1.html jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/adapt-or-die.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/cannot.be.completed.au +jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/danger.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/ip.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/that.hurts.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/thin.bell.au @@ -213,11 +212,6 @@ jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/SpreadSheet.class jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/SpreadSheet.java jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/SpreadSheetInput.class jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/example1.html -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolCanvas.class -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolTest$MyAdapter.class -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolTest.class -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolTest.java -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/example1.html jdk%%JDK_VERSION%%/demo/applets/TicTacToe/TicTacToe.class jdk%%JDK_VERSION%%/demo/applets/TicTacToe/TicTacToe.java jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio/beep.au @@ -458,6 +452,7 @@ jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample4.java jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableMap.java jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableSorter.java jdk%%JDK_VERSION%%/demo/jpda/examples.jar +jdk%%JDK_VERSION%%/demo/plugin/applets.html jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/Animation.class jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/AnimationFrame.class jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/Animator.class @@ -597,6 +592,7 @@ jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/JumpingBox.java jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/example1.html jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/adapt-or-die.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/cannot.be.completed.au +jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/danger.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/ip.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/that.hurts.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/thin.bell.au @@ -641,11 +637,6 @@ jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/SpreadSheet.class jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/SpreadSheet.java jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/SpreadSheetInput.class jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/example1.html -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolCanvas.class -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolTest$MyAdapter.class -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolTest.class -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolTest.java -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/example1.html jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/TicTacToe.class jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/TicTacToe.java jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/audio/beep.au @@ -912,6 +903,37 @@ jdk%%JDK_VERSION%%/jre/bin/rmid jdk%%JDK_VERSION%%/jre/bin/rmiregistry jdk%%JDK_VERSION%%/jre/bin/servertool jdk%%JDK_VERSION%%/jre/bin/tnameserv +jdk%%JDK_VERSION%%/jre/javaws/cacerts +jdk%%JDK_VERSION%%/jre/javaws/javalogo52x88.gif +jdk%%JDK_VERSION%%/jre/javaws/javaws +jdk%%JDK_VERSION%%/jre/javaws/javaws-l10n.jar +jdk%%JDK_VERSION%%/jre/javaws/javaws.jar +jdk%%JDK_VERSION%%/jre/javaws/javaws.policy +jdk%%JDK_VERSION%%/jre/javaws/javawsbin +jdk%%JDK_VERSION%%/jre/javaws/readme.html +jdk%%JDK_VERSION%%/jre/javaws/readme_de.html +jdk%%JDK_VERSION%%/jre/javaws/readme_es.html +jdk%%JDK_VERSION%%/jre/javaws/readme_fr.html +jdk%%JDK_VERSION%%/jre/javaws/readme_it.html +jdk%%JDK_VERSION%%/jre/javaws/readme_ja.html +jdk%%JDK_VERSION%%/jre/javaws/readme_ko.html +jdk%%JDK_VERSION%%/jre/javaws/readme_sv.html +jdk%%JDK_VERSION%%/jre/javaws/readme_zh_CN.html +jdk%%JDK_VERSION%%/jre/javaws/readme_zh_TW.html +jdk%%JDK_VERSION%%/jre/javaws/resources/copyright.jpg +jdk%%JDK_VERSION%%/jre/javaws/resources/messages.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_de.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_es.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_fr.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_it.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_ja.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_ko.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_sv.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_zh_CN.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_zh_TW.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/miniSplash.jpg +jdk%%JDK_VERSION%%/jre/javaws/resources/splash.jpg +jdk%%JDK_VERSION%%/jre/javaws/sunlogo64x30.gif jdk%%JDK_VERSION%%/jre/lib/audio/soundbank.gm jdk%%JDK_VERSION%%/jre/lib/charsets.jar jdk%%JDK_VERSION%%/jre/lib/cmm/CIEXYZ.pf @@ -940,8 +962,8 @@ jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt -jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig.so jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so +jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig.so jdk%%JDK_VERSION%%/jre/lib/i386/jvm.cfg jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc.so jdk%%JDK_VERSION%%/jre/lib/i386/libawt.so @@ -968,9 +990,10 @@ jdk%%JDK_VERSION%%/jre/lib/i386/libverify.so jdk%%JDK_VERSION%%/jre/lib/i386/libzip.so jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt -jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig.so jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so +jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig.so jdk%%JDK_VERSION%%/jre/lib/im/indicim.jar +jdk%%JDK_VERSION%%/jre/lib/im/thaiim.jar jdk%%JDK_VERSION%%/jre/lib/images/cursors/cursors.properties jdk%%JDK_VERSION%%/jre/lib/images/cursors/invalid32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_CopyDrop32x32.gif @@ -979,7 +1002,6 @@ jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkDrop32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveDrop32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif -jdk%%JDK_VERSION%%/jre/lib/javaplugin.jar jdk%%JDK_VERSION%%/jre/lib/jce.jar jdk%%JDK_VERSION%%/jre/lib/jsse.jar jdk%%JDK_VERSION%%/jre/lib/jvm.hprof.txt @@ -997,6 +1019,7 @@ jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo jdk%%JDK_VERSION%%/jre/lib/logging.properties +jdk%%JDK_VERSION%%/jre/lib/plugin.jar jdk%%JDK_VERSION%%/jre/lib/psfont.properties.ja jdk%%JDK_VERSION%%/jre/lib/psfontj2d.properties jdk%%JDK_VERSION%%/jre/lib/rt.jar @@ -1179,6 +1202,7 @@ jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/DumontDUrville jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Mawson jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/McMurdo jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Palmer +jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Rothera jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Syowa jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Vostok jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aden @@ -1407,8 +1431,9 @@ jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Yap jdk%%JDK_VERSION%%/jre/lib/zi/WET jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings -jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin.so -jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji.so +jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.desktop +jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.png +jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/libjavaplugin.so jdk%%JDK_VERSION%%/jre/plugin/i386/ns610/libjavaplugin_oji.so jdk%%JDK_VERSION%%/lib/dt.jar jdk%%JDK_VERSION%%/lib/htmlconverter.jar @@ -1425,8 +1450,12 @@ jdk%%JDK_VERSION%%/man/man1/javac.1 jdk%%JDK_VERSION%%/man/man1/javadoc.1 jdk%%JDK_VERSION%%/man/man1/javah.1 jdk%%JDK_VERSION%%/man/man1/javap.1 +jdk%%JDK_VERSION%%/man/man1/javaws.1 jdk%%JDK_VERSION%%/man/man1/jdb.1 jdk%%JDK_VERSION%%/man/man1/keytool.1 +jdk%%JDK_VERSION%%/man/man1/kinit.1 +jdk%%JDK_VERSION%%/man/man1/klist.1 +jdk%%JDK_VERSION%%/man/man1/ktab.1 jdk%%JDK_VERSION%%/man/man1/native2ascii.1 jdk%%JDK_VERSION%%/man/man1/orbd.1 jdk%%JDK_VERSION%%/man/man1/policytool.1 @@ -1436,6 +1465,7 @@ jdk%%JDK_VERSION%%/man/man1/rmiregistry.1 jdk%%JDK_VERSION%%/man/man1/serialver.1 jdk%%JDK_VERSION%%/man/man1/servertool.1 jdk%%JDK_VERSION%%/man/man1/tnameserv.1 +jdk%%JDK_VERSION%%/src.zip %%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g %%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g %%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g @@ -1461,7 +1491,6 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/servertool_g %%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/java_g -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/java_vm_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/keytool_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/kinit_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/klist_g @@ -1472,8 +1501,9 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/rmiregistry_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/servertool_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/tnameserv_g -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so @@ -1484,7 +1514,6 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjaas_unix_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so @@ -1498,20 +1527,16 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/javaplugin_g.jar -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4_g/javaplugin_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600_g/libjavaplugin_oji_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns610_g/libjavaplugin_oji_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/plugin_g.jar +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/libjavaplugin_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns610/libjavaplugin_oji_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/lib/htmlconverter_g.jar -@exec mkdir -p %D/share/doc/java -@unexec rmdir %D/share/doc/java 2>/dev/null || true -@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%" -@unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%% -%%DEBUG:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns610_g -%%DEBUG:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600_g -%%DEBUG:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4_g +@exec mkdir -p %D/share/doc/java +@unexec rmdir %D/share/doc/java 2>/dev/null || true +@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%%/bin @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans @@ -1540,7 +1565,6 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph @dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo @dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet -@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest @dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio @dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images @dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe @@ -1588,87 +1612,89 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample @dirrm jdk%%JDK_VERSION%%/demo/jfc @dirrm jdk%%JDK_VERSION%%/demo/jpda -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2 -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/resources -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/resources -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/HelpFiles -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paths -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paint -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Mix -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Lines -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Composite -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Colors -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/Beans +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/SimpleAnimation +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ArcTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/BarChart +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Blink +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/CardTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Clock +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DitherTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DrawTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Fractal +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphicsTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer/models +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/NervousText +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SimpleGraph +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SortDemo +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame/models +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Arcs_Curves +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Colors +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Composite +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Lines +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Mix +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paint +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paths +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/HelpFiles +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/resources +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/resources +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2 +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame/models -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SortDemo -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SimpleGraph -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/NervousText -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer/models -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphicsTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Fractal -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DrawTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DitherTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Clock -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/CardTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Blink -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/BarChart -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ArcTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/SimpleAnimation -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/Beans -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets @dirrm jdk%%JDK_VERSION%%/demo/plugin @dirrm jdk%%JDK_VERSION%%/demo @dirrm jdk%%JDK_VERSION%%/include/freebsd @dirrm jdk%%JDK_VERSION%%/include +@dirrm jdk%%JDK_VERSION%%/jre/.systemPrefs @dirrm jdk%%JDK_VERSION%%/jre/bin -@dirrm jdk%%JDK_VERSION%%/jre/lib/audio +@dirrm jdk%%JDK_VERSION%%/jre/javaws/resources +@dirrm jdk%%JDK_VERSION%%/jre/javaws @dirrm jdk%%JDK_VERSION%%/jre/lib/applet +@dirrm jdk%%JDK_VERSION%%/jre/lib/audio @dirrm jdk%%JDK_VERSION%%/jre/lib/cmm @dirrm jdk%%JDK_VERSION%%/jre/lib/ext @dirrm jdk%%JDK_VERSION%%/jre/lib/fonts @@ -1679,30 +1705,30 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/jre/lib/im @dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors @dirrm jdk%%JDK_VERSION%%/jre/lib/images -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5 -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja @dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES @dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8 +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES @dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5 +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW @dirrm jdk%%JDK_VERSION%%/jre/lib/locale @dirrm jdk%%JDK_VERSION%%/jre/lib/security @dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Africa @@ -1720,12 +1746,11 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Pacific @dirrm jdk%%JDK_VERSION%%/jre/lib/zi @dirrm jdk%%JDK_VERSION%%/jre/lib -@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns610 -@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600 +@dirrm jdk%%JDK_VERSION%%/jre/plugin/desktop @dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4 +@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns610 @dirrm jdk%%JDK_VERSION%%/jre/plugin/i386 @dirrm jdk%%JDK_VERSION%%/jre/plugin -@dirrm jdk%%JDK_VERSION%%/jre/.systemPrefs @dirrm jdk%%JDK_VERSION%%/jre @dirrm jdk%%JDK_VERSION%%/lib @dirrm jdk%%JDK_VERSION%%/man/man1 diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 3872d7d3733e..7ca61b4dd07e 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -7,45 +7,71 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html -SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip +SCSL_SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip +SCSL_BINFILE= j2sdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip PATCHSETFILE= bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz -DISTFILES= ${SRCFILE} ${PATCHSETFILE} +DISTFILES= ${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE} MAINTAINER= phantom@FreeBSD.org -COMMENT= Java Development Kit 1.4.1 +COMMENT= Java Development Kit 1.4.2 +# XXX: (native bootstrap, no plugin/javaws, x11) +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 \ ${LOCALBASE}/include/nspr/prtypes.h:${PORTSDIR}/devel/nspr -.if !defined(NATIVE_BOOTSTRAP) -BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14 -.endif RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ ${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts WRKSRC= ${WRKDIR}/control/make -JDK_VERSION= 1.4.1 -JDK_PATCHSET_VERSION= 4 +JDK_VERSION= 1.4.2 +JDK_PATCHSET_VERSION= 5 -SUN_LINUX_JDK_VERSION= 1.4.2 +.if !defined(WITH_LINUX_BOOTSTRAP) +NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/jdk1.4.2 \ + ${LOCALBASE}/jdk1.4.1 +.endif -.if defined(NATIVE_BOOTSTRAP) -JDK14DIR?= ${LOCALBASE}/jdk${JDK_VERSION} -.else -JDK14DIR?= ${LOCALBASE}/linux-sun-jdk${SUN_LINUX_JDK_VERSION} +LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2_02 \ + ${LOCALBASE}/linux-sun-jdk1.4.2_01 \ + ${LOCALBASE}/linux-sun-jdk1.4.2 \ + ${LOCALBASE}/linux-sun-jdk1.4.1 + +.include <bsd.port.pre.mk> + +.if !defined(WITH_LINUX_BOOTSTRAP) +.for CJDK in ${NATIVE_BOOTSTRAP_JDKS} +. if !defined(JDK14DIR) && exists(${CJDK}/bin/javac) +JDK14DIR= ${CJDK} +. endif +.endfor +.endif + +.if !defined(JDK14DIR) +_NEED_BOOTSRAP_JDK= YES +.for CJDK in ${LINUX_BOOTSTRAP_JDKS} +. if !defined(JDK14DIR) && exists(${CJDK}/bin/javac) +JDK14DIR= ${CJDK} +WITH_LINUX_BOOTSTRAP= YES +.undef NEED_BOOTSTRAP_JDK +. endif +.endfor +.endif + +.if defined(_NEED_BOOTSTRAP_JDK) +BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14 .endif # workaround to handle both 'zip' and 'tar.gz' distfiles USE_ZIP= YES USE_REINPLACE= YES -EXTRACT_ONLY= ${SRCFILE} +EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE} ONLY_FOR_ARCHS= i386 USE_GMAKE= YES @@ -54,8 +80,7 @@ NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \ ALT_MOTIF_DIR="${X11BASE}" \ SYS_CFLAGS="${CFLAGS}" \ - JAVAWS_OPTIONAL="YES" \ - NO_DOCS="YES" \ + DEV_ONLY="YES" \ LANG="C" \ JAVA_HOME="" \ CLASSPATH="" \ @@ -70,25 +95,15 @@ JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image SORT?= /usr/bin/sort CPIO?= /usr/bin/cpio -.if defined(NODEBUG) -PLIST_SUB+= DEBUG:="@comment " -PKGNAMESUFFIX= -nodebug -.else +.if defined(WITH_DEBUG) PLIST_SUB+= DEBUG:="" +PKGNAMESUFFIX= -debug +.else +PLIST_SUB+= DEBUG:="@comment " .endif -PTHREAD_FILES= hotspot/build/bsd/makefiles/gcc.make \ - hotspot/build/bsd/makefiles/vm.make \ - j2se/make/common/Defs.gmk \ - j2se/make/common/Defs-bsd.gmk \ - j2se/make/common/Program.gmk \ - j2se/make/java/hpi/native/Makefile \ - j2se/ext/plugin/build/solaris/GNUmakefile - -.include <bsd.port.pre.mk> - # Check for JDK sources -.if !exists(${DISTDIR}/${SRCFILE}) && !defined(PACKAGE_BUILDING) +.if !exists(${DISTDIR}/${SCSL_SRCFILE}) && !defined(PACKAGE_BUILDING) ECHO_MSG=/usr/bin/printf IGNORE= :\n\ Because of licensing restrictions, you must fetch the source distribution\n\ @@ -97,7 +112,19 @@ with a web browser and follow the \"Download\" link for the\n\ \"Java(TM) SDK ${JDK_VERSION}\". You will be required to log in and register,\n\ but you can create an account on this page. After registration and\n\ accepting the Sun Community Source License, select \"J2SESDK\" and\n\ -download the source file, ${SRCFILE}. Please place this file in\n\ +download the source file, ${SCSL_SRCFILE}. Please place this file in\n\ +${DISTDIR}.\n +.endif +.if !exists(${DISTDIR}/${SCSL_BINFILE}) && !defined(PACKAGE_BUILDING) +ECHO_MSG=/usr/bin/printf +IGNORE= :\n\ +Because of licensing restrictions, you must fetch the source distribution\n\ +manually. Please access http://www.sun.com/software/java2/download.html\n\ +with a web browser and follow the \"Download\" link for the\n\ +\"Java(TM) SDK ${JDK_VERSION}\". You will be required to log in and register,\n\ +but you can create an account on this page. After registration and\n\ +accepting the Sun Community Source License, select \"J2SESDK\" and\n\ +download the source file, ${SCSL_BINFILE}. Please place this file in\n\ ${DISTDIR}.\n .endif @@ -112,7 +139,7 @@ http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\ Please place the patchset in ${DISTDIR}.\n .endif -# JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates. +# JDK 1.4.2 require recent version of FreeBSD due to recent libc_r updates. # Make check for reqiuired primities as early as possible TESTPROG=testos @@ -134,7 +161,7 @@ check-os: /usr/bin/printf "\n\ You must have a version of FreeBSD later than 4.7-STABLE\n\ February 2003 or 5-CURRENT February 2003 to compile and\n\ -use JDK 1.4.1.\n\n" ; \ +use JDK 1.4.2.\n\n" ; \ exit 1 ; \ fi @${WRKDIR}/${TESTPROG} 2>/dev/null @@ -144,14 +171,16 @@ pre-fetch: check-os @${ECHO_MSG} @${ECHO_MSG} "NOTICES:" @${ECHO_MSG} - @${ECHO_MSG} "To build JDK 1.4.1 port, you should have at least" - @${ECHO_MSG} "2.5Gb of free disk space in build area!" + @${ECHO_MSG} "To build JDK 1.4.2 port, you should have at least" + @${ECHO_MSG} "1.7Gb of free disk space in build area!" @${ECHO_MSG} - @${ECHO_MSG} "To build JDK 1.4.1 port, you should have linux emulation" +.if defined(WITH_LINUX_BOOTSTRAP) + @${ECHO_MSG} "To build JDK 1.4.2 port, you should have linux emulation" @${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem" @${ECHO_MSG} "mounted." @${ECHO_MSG} - @${ECHO_MSG} "NOTE: Please use \`make -DNODEBUG' if you don't want to" +.endif + @${ECHO_MSG} "NOTE: Please use \`make -DWITH_DEBUG' if you want to" @${ECHO_MSG} "install libraries and binaries with debugging support." @${ECHO_MSG} @@ -161,12 +190,7 @@ pre-patch: ${CHMOD} -R u+w * && \ ${PATCH} -p0 < ${WRKDIR}/jdk14.patches -post-patch: - @for file in ${PTHREAD_FILES}; do \ - ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g; s:-lc_r:${PTHREAD_LIBS}:g" ${WRKDIR}/$${file}; \ - done - -.if !defined(NATIVE_BOOTSTRAP) +.if defined(WITH_LINUX_BOOTSTRAP) pre-build: @if [ "$${WRKDIRPREFIX}" -a \ -L "/compat/linux/$${WRKDIRPREFIX}" -a \ @@ -189,7 +213,7 @@ pre-build: @if [ "`/sbin/mount | grep ^linprocfs`" = "" ]; \ then \ ${ECHO_MSG} "ERROR: You have to have LINPROCFS mounted before" ; \ - ${ECHO_MSG} "starting to build of native JDK 1.4.1." ; \ + ${ECHO_MSG} "starting to build of native JDK 1.4.2." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "You may do it by following set of commands:" ; \ ${ECHO_MSG} "" ; \ @@ -208,14 +232,17 @@ do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) post-build: - @# XXX make sure that SwingSet2/resources does not exists + @# make sure that SwingSet2/resources does not exists @${RM} -rf ${JDKIMAGEDIR}/demo/jfc/SwingSet2/resources @${RM} -rf ${JDKIMAGEDIR}/demo/plugin/jfc/SwingSet2/resources + @# XXX don't install japanese manpages + @${RM} -rf ${JDKIMAGEDIR}/man/ja + @${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP -.if !defined(NODEBUG) +.if !defined(WITH_DEBUG) pre-install: @${ECHO_MSG} - @${ECHO_MSG} "Please use \`make -DNODEBUG' if you don't want to install libraries and binaries" + @${ECHO_MSG} "Please use \`make -DWITH_DEBUG' if you want to install libraries and binaries" @${ECHO_MSG} "with debugging support." @${ECHO_MSG} .endif @@ -224,7 +251,7 @@ do-install: ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} -.if !defined(NODEBUG) +.if defined(WITH_DEBUG) cd ${JDKIMAGEDIR_G} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} .endif diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo index 52ecda3803d8..1ebe6b524aa1 100644 --- a/java/jdk16/distinfo +++ b/java/jdk16/distinfo @@ -1,2 +1,3 @@ -MD5 (j2sdk-1_4_1-src-scsl.zip) = e6f35d1183660682f4f03965d35b67c5 -MD5 (bsd-jdk14-patches-4.tar.gz) = 2ebb1b01829a898931611495c1669097 +MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65 +MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc +MD5 (bsd-jdk14-patches-5.tar.gz) = 2e1aac5a64910c8c476eca7061a237f3 diff --git a/java/jdk16/files/patch-UNIXProcess_md.c.bsd b/java/jdk16/files/patch-UNIXProcess_md.c.bsd deleted file mode 100644 index d9ec95eefa7c..000000000000 --- a/java/jdk16/files/patch-UNIXProcess_md.c.bsd +++ /dev/null @@ -1,93 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/java/lang/UNIXProcess_md.c.bsd.orig Wed Oct 29 12:22:58 2003 -+++ ../../j2se/src/solaris/native/java/lang/UNIXProcess_md.c.bsd Wed Oct 29 12:23:33 2003 -@@ -22,6 +22,12 @@ - #include <errno.h> - #include <unistd.h> - -+#if defined(__FreeBSD__) -+#include <dlfcn.h> -+#include <pthread.h> -+#include <pthread_np.h> -+#endif -+ - /* path in the environment */ - static char **PATH = 0; - /* effective uid */ -@@ -228,6 +234,61 @@ - } - } - -+#if defined(__FreeBSD__) -+ -+extern pid_t __sys_fork(void); -+ -+static pid_t -+jdk_fork_wrapper() -+{ -+ pid_t resultPid; -+#if (__FreeBSD_version < 5) -+ static int is_libc_r = -1; -+ void *funcref; -+ -+ if (is_libc_r == -1) { -+ is_libc_r = 1; -+ -+ /* -+ * BSDNOTE: Check for loaded symbols. -+ * -+ * If "_thr_critical_enter" is found assume we are using 'libthr'. -+ * If _kse_critical_enter is found assume we are using 'libkse'. -+ * Otherwise we are using libc_r. -+ * -+ * If libc_r is loaded, use fork system call drectly to avoid -+ * problems with using protected pages. -+ * -+ * --phantom -+ */ -+ funcref = dlsym(RTLD_DEFAULT, "_kse_critical_enter"); -+ if (funcref != NULL) -+ is_libc_r = 0; -+ else { -+ funcref = dlsym(RTLD_DEFAULT, "_thr_critical_enter"); -+ if (funcref != NULL) -+ is_libc_r = 0; -+ } -+ } -+ -+ if (is_libc_r == 0) { -+ /* Not a libc_r */ -+ resultPid = fork(); -+ } else { -+#endif /* __FreeBSD_version < 5 */ -+ pthread_suspend_all_np(); -+ resultPid = __sys_fork(); -+ if (resultPid != 0) -+ /* leave child in single threading mode */ -+ pthread_resume_all_np(); -+#if (__FreeBSD_version < 5) -+ } -+#endif /* __FreeBSD_version < 5 */ -+ -+ return resultPid; -+} -+#endif /* __FreeBSD__ */ -+ - JNIEXPORT jint JNICALL - Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env, - jobject process, -@@ -335,8 +396,12 @@ - if (path != NULL) { - cwd = (char *)JNU_GetStringPlatformChars(env, path, NULL); - } -- -+ -+#if defined(__FreeBSD__) -+ resultPid = jdk_fork_wrapper(); -+#else - resultPid = fork(); -+#endif - - if (resultPid < 0) { - char errmsg[128]; diff --git a/java/jdk16/files/patch-control::common::Defs-bsd.gmk b/java/jdk16/files/patch-control::common::Defs-bsd.gmk new file mode 100644 index 000000000000..f9e45f642fa1 --- /dev/null +++ b/java/jdk16/files/patch-control::common::Defs-bsd.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../control/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:22 2003 ++++ ../../control/make/common/Defs-bsd.gmk Wed Nov 12 16:51:41 2003 +@@ -212,7 +212,7 @@ + ifeq ($(TRUE_PLATFORM), NetBSD) + DEVTOOLS_PATH = /usr/pkg/bin/ + else +-DEVTOOLS_PATH = /usr/local/bin/ ++DEVTOOLS_PATH = ${LOCALBASE}/bin/ + endif + # Allow the user to override the default value... + ifdef ALT_DEVTOOLS_PATH diff --git a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk new file mode 100644 index 000000000000..03d079961bde --- /dev/null +++ b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:55 2003 ++++ ../../deploy/make/common/Defs-bsd.gmk Wed Nov 12 16:53:08 2003 +@@ -10,7 +10,7 @@ + # XXXBSD: this issue need to be rehashed (/usr/local/ should be defined + # in other place + ifeq ($(TRUE_PLATFORM), FreeBSD) +-USR_LOCAL_PATH = /usr/local/ ++USR_LOCAL_PATH = ${LOCALBASE}/ + endif + + BUNDLE_SUFFIX = .zip diff --git a/java/jdk16/files/patch-nio::Makefile b/java/jdk16/files/patch-nio::Makefile deleted file mode 100644 index 5835666f8f43..000000000000 --- a/java/jdk16/files/patch-nio::Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/java/nio/Makefile 15 Feb 2003 14:45:49 -0000 1.4 -+++ ../../j2se/make/java/nio/Makefile 24 Aug 2003 05:37:04 -0000 -@@ -131,7 +131,7 @@ - - # XXXBSD: really need it for BSD ? - ifeq ($(PLATFORM), bsd) --OTHER_CFLAGS += -Werror -+#OTHER_CFLAGS += -Werror - OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH)$(SUFFIX) -ljava$(SUFFIX) -lnet$(SUFFIX) - endif - diff --git a/java/jdk16/files/patch-plugin::common::config.gmk b/java/jdk16/files/patch-plugin::common::config.gmk new file mode 100644 index 000000000000..fd995e3c063b --- /dev/null +++ b/java/jdk16/files/patch-plugin::common::config.gmk @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/make/plugin/common/config.gmk.orig Wed Nov 12 16:53:30 2003 ++++ ../../deploy/make/plugin/common/config.gmk Wed Nov 12 16:53:43 2003 +@@ -57,7 +57,7 @@ + + # include search paths + # XXXBSD: these should be defined in other place +- CPPFLAGS1 += -I/usr/X11R6/include -I/usr/local/include ++ CPPFLAGS1 += -I/usr/X11R6/include -I${LOCALBASE}/include + + ifeq ($(TRUE_PLATFORM), FreeSBD) + ifeq ($(FREEBSD_4STABLE), true) diff --git a/java/jdk16/files/patch-plugin::ns6::Makefile b/java/jdk16/files/patch-plugin::ns6::Makefile new file mode 100644 index 000000000000..f3ce7053dd48 --- /dev/null +++ b/java/jdk16/files/patch-plugin::ns6::Makefile @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/make/plugin/ns6/Makefile.orig Wed Nov 12 16:54:05 2003 ++++ ../../deploy/make/plugin/ns6/Makefile Wed Nov 12 16:54:22 2003 +@@ -37,7 +37,7 @@ + # XXXBSD: direct /usr/local/include/nspr path is used!!! + #EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610/nspr -DRAPTOR_API -DNEW_STREAMING_API + +-EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I/usr/local/include/nspr -DRAPTOR_API -DNEW_STREAMING_API ++EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I${LOCALBASE}/include/nspr -DRAPTOR_API -DNEW_STREAMING_API + + vpath %.c $(SRCDIR):$(SRCDIR)/../common: + vpath %.cpp $(SRCDIR):$(SRCDIR)/../common:$(SHARED_DIR2)/jcomponent diff --git a/java/jdk16/files/testos.c b/java/jdk16/files/testos.c index e5c24160901d..d1e77573e86b 100644 --- a/java/jdk16/files/testos.c +++ b/java/jdk16/files/testos.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * Test pthreads primitives for required functionality in order to run - * native FreeBSD JDK1.4.1 port. + * native FreeBSD JDK1.4.2 port. * * Returns: * 0 - test passed diff --git a/java/jdk16/pkg-descr b/java/jdk16/pkg-descr index e3405a6f9a1a..b80bb46b3141 100644 --- a/java/jdk16/pkg-descr +++ b/java/jdk16/pkg-descr @@ -1,5 +1,5 @@ This is the latest patchset from the Java 2 FreeBSD porting project. This -port allows you to easily build a native JDK1.4.1 for FreeBSD. +port allows you to easily build a native JDK1.4.2 for FreeBSD. Please note that due to the current Sun licensing policy the resulting binaries can't be distributed and you are only permitted to use/hack it personally. diff --git a/java/jdk16/pkg-plist b/java/jdk16/pkg-plist index b10e800df614..3dca22efb941 100644 --- a/java/jdk16/pkg-plist +++ b/java/jdk16/pkg-plist @@ -2,8 +2,6 @@ jdk%%JDK_VERSION%%/COPYRIGHT jdk%%JDK_VERSION%%/LICENSE jdk%%JDK_VERSION%%/README jdk%%JDK_VERSION%%/README.html -jdk%%JDK_VERSION%%/src.zip -jdk%%JDK_VERSION%%/bin/ControlPanel jdk%%JDK_VERSION%%/bin/HtmlConverter jdk%%JDK_VERSION%%/bin/appletviewer jdk%%JDK_VERSION%%/bin/extcheck @@ -169,6 +167,7 @@ jdk%%JDK_VERSION%%/demo/applets/JumpingBox/JumpingBox.java jdk%%JDK_VERSION%%/demo/applets/JumpingBox/example1.html jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/adapt-or-die.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/cannot.be.completed.au +jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/danger.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/ip.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/that.hurts.au jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/thin.bell.au @@ -213,11 +212,6 @@ jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/SpreadSheet.class jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/SpreadSheet.java jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/SpreadSheetInput.class jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/example1.html -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolCanvas.class -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolTest$MyAdapter.class -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolTest.class -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/SymbolTest.java -jdk%%JDK_VERSION%%/demo/applets/SymbolTest/example1.html jdk%%JDK_VERSION%%/demo/applets/TicTacToe/TicTacToe.class jdk%%JDK_VERSION%%/demo/applets/TicTacToe/TicTacToe.java jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio/beep.au @@ -458,6 +452,7 @@ jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample4.java jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableMap.java jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableSorter.java jdk%%JDK_VERSION%%/demo/jpda/examples.jar +jdk%%JDK_VERSION%%/demo/plugin/applets.html jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/Animation.class jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/AnimationFrame.class jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/Animator.class @@ -597,6 +592,7 @@ jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/JumpingBox.java jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/example1.html jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/adapt-or-die.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/cannot.be.completed.au +jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/danger.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/ip.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/that.hurts.au jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds/thin.bell.au @@ -641,11 +637,6 @@ jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/SpreadSheet.class jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/SpreadSheet.java jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/SpreadSheetInput.class jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet/example1.html -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolCanvas.class -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolTest$MyAdapter.class -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolTest.class -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/SymbolTest.java -jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest/example1.html jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/TicTacToe.class jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/TicTacToe.java jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/audio/beep.au @@ -912,6 +903,37 @@ jdk%%JDK_VERSION%%/jre/bin/rmid jdk%%JDK_VERSION%%/jre/bin/rmiregistry jdk%%JDK_VERSION%%/jre/bin/servertool jdk%%JDK_VERSION%%/jre/bin/tnameserv +jdk%%JDK_VERSION%%/jre/javaws/cacerts +jdk%%JDK_VERSION%%/jre/javaws/javalogo52x88.gif +jdk%%JDK_VERSION%%/jre/javaws/javaws +jdk%%JDK_VERSION%%/jre/javaws/javaws-l10n.jar +jdk%%JDK_VERSION%%/jre/javaws/javaws.jar +jdk%%JDK_VERSION%%/jre/javaws/javaws.policy +jdk%%JDK_VERSION%%/jre/javaws/javawsbin +jdk%%JDK_VERSION%%/jre/javaws/readme.html +jdk%%JDK_VERSION%%/jre/javaws/readme_de.html +jdk%%JDK_VERSION%%/jre/javaws/readme_es.html +jdk%%JDK_VERSION%%/jre/javaws/readme_fr.html +jdk%%JDK_VERSION%%/jre/javaws/readme_it.html +jdk%%JDK_VERSION%%/jre/javaws/readme_ja.html +jdk%%JDK_VERSION%%/jre/javaws/readme_ko.html +jdk%%JDK_VERSION%%/jre/javaws/readme_sv.html +jdk%%JDK_VERSION%%/jre/javaws/readme_zh_CN.html +jdk%%JDK_VERSION%%/jre/javaws/readme_zh_TW.html +jdk%%JDK_VERSION%%/jre/javaws/resources/copyright.jpg +jdk%%JDK_VERSION%%/jre/javaws/resources/messages.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_de.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_es.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_fr.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_it.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_ja.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_ko.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_sv.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_zh_CN.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/messages_zh_TW.properties +jdk%%JDK_VERSION%%/jre/javaws/resources/miniSplash.jpg +jdk%%JDK_VERSION%%/jre/javaws/resources/splash.jpg +jdk%%JDK_VERSION%%/jre/javaws/sunlogo64x30.gif jdk%%JDK_VERSION%%/jre/lib/audio/soundbank.gm jdk%%JDK_VERSION%%/jre/lib/charsets.jar jdk%%JDK_VERSION%%/jre/lib/cmm/CIEXYZ.pf @@ -940,8 +962,8 @@ jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt -jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig.so jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so +jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig.so jdk%%JDK_VERSION%%/jre/lib/i386/jvm.cfg jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc.so jdk%%JDK_VERSION%%/jre/lib/i386/libawt.so @@ -968,9 +990,10 @@ jdk%%JDK_VERSION%%/jre/lib/i386/libverify.so jdk%%JDK_VERSION%%/jre/lib/i386/libzip.so jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt -jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig.so jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so +jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig.so jdk%%JDK_VERSION%%/jre/lib/im/indicim.jar +jdk%%JDK_VERSION%%/jre/lib/im/thaiim.jar jdk%%JDK_VERSION%%/jre/lib/images/cursors/cursors.properties jdk%%JDK_VERSION%%/jre/lib/images/cursors/invalid32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_CopyDrop32x32.gif @@ -979,7 +1002,6 @@ jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkDrop32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveDrop32x32.gif jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif -jdk%%JDK_VERSION%%/jre/lib/javaplugin.jar jdk%%JDK_VERSION%%/jre/lib/jce.jar jdk%%JDK_VERSION%%/jre/lib/jsse.jar jdk%%JDK_VERSION%%/jre/lib/jvm.hprof.txt @@ -997,6 +1019,7 @@ jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo jdk%%JDK_VERSION%%/jre/lib/logging.properties +jdk%%JDK_VERSION%%/jre/lib/plugin.jar jdk%%JDK_VERSION%%/jre/lib/psfont.properties.ja jdk%%JDK_VERSION%%/jre/lib/psfontj2d.properties jdk%%JDK_VERSION%%/jre/lib/rt.jar @@ -1179,6 +1202,7 @@ jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/DumontDUrville jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Mawson jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/McMurdo jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Palmer +jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Rothera jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Syowa jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Vostok jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aden @@ -1407,8 +1431,9 @@ jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Yap jdk%%JDK_VERSION%%/jre/lib/zi/WET jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings -jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin.so -jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji.so +jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.desktop +jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.png +jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/libjavaplugin.so jdk%%JDK_VERSION%%/jre/plugin/i386/ns610/libjavaplugin_oji.so jdk%%JDK_VERSION%%/lib/dt.jar jdk%%JDK_VERSION%%/lib/htmlconverter.jar @@ -1425,8 +1450,12 @@ jdk%%JDK_VERSION%%/man/man1/javac.1 jdk%%JDK_VERSION%%/man/man1/javadoc.1 jdk%%JDK_VERSION%%/man/man1/javah.1 jdk%%JDK_VERSION%%/man/man1/javap.1 +jdk%%JDK_VERSION%%/man/man1/javaws.1 jdk%%JDK_VERSION%%/man/man1/jdb.1 jdk%%JDK_VERSION%%/man/man1/keytool.1 +jdk%%JDK_VERSION%%/man/man1/kinit.1 +jdk%%JDK_VERSION%%/man/man1/klist.1 +jdk%%JDK_VERSION%%/man/man1/ktab.1 jdk%%JDK_VERSION%%/man/man1/native2ascii.1 jdk%%JDK_VERSION%%/man/man1/orbd.1 jdk%%JDK_VERSION%%/man/man1/policytool.1 @@ -1436,6 +1465,7 @@ jdk%%JDK_VERSION%%/man/man1/rmiregistry.1 jdk%%JDK_VERSION%%/man/man1/serialver.1 jdk%%JDK_VERSION%%/man/man1/servertool.1 jdk%%JDK_VERSION%%/man/man1/tnameserv.1 +jdk%%JDK_VERSION%%/src.zip %%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g %%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g %%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g @@ -1461,7 +1491,6 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/servertool_g %%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/java_g -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/java_vm_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/keytool_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/kinit_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/klist_g @@ -1472,8 +1501,9 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/rmiregistry_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/servertool_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/tnameserv_g -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot_g %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjsig_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so @@ -1484,7 +1514,6 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjaas_unix_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so @@ -1498,20 +1527,16 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/javaplugin_g.jar -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4_g/javaplugin_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600_g/libjavaplugin_oji_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns610_g/libjavaplugin_oji_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjsig_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/plugin_g.jar +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/libjavaplugin_g.so +%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns610/libjavaplugin_oji_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/lib/htmlconverter_g.jar -@exec mkdir -p %D/share/doc/java -@unexec rmdir %D/share/doc/java 2>/dev/null || true -@exec %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%" -@unexec %D/bin/unregistervm FREEBSD-JDK%%JDK_VERSION%% -%%DEBUG:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns610_g -%%DEBUG:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600_g -%%DEBUG:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4_g +@exec mkdir -p %D/share/doc/java +@unexec rmdir %D/share/doc/java 2>/dev/null || true +@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%%/bin @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans @@ -1540,7 +1565,6 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph @dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo @dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet -@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest @dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio @dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images @dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe @@ -1588,87 +1612,89 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample @dirrm jdk%%JDK_VERSION%%/demo/jfc @dirrm jdk%%JDK_VERSION%%/demo/jpda -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2 -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/resources -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/resources -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/HelpFiles -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paths -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paint -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Mix -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Lines -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Composite -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Colors -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/Beans +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/SimpleAnimation +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ArcTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/BarChart +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Blink +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/CardTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Clock +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DitherTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DrawTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Fractal +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphicsTest +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer/models +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/NervousText +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SimpleGraph +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SortDemo +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/audio +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame/models +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame +@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Arcs_Curves +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Colors +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Composite +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Lines +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Mix +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paint +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Paths +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d/demos @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src/java2d @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D/src @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Java2D -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Font2DTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/src -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/FileChooserDemo +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/HelpFiles +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Metalworks +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/resources +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Notepad +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/images +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SampleTree +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/resources +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/Stylepad +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingApplet +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/SwingSet2 +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample/src +@dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc/TableExample @dirrm jdk%%JDK_VERSION%%/demo/plugin/jfc -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame/models -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/WireFrame -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/TicTacToe -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SymbolTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SpreadSheet -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SortDemo -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/SimpleGraph -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/NervousText -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer/models -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/MoleculeViewer -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox/sounds -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/JumpingBox -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ImageMap -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphicsTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/GraphLayout -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Fractal -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DrawTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/DitherTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Clock -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/CardTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Blink -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/BarChart -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/ArcTest -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/SimpleAnimation -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images/Beans -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/images -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator/audio -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets/Animator -@dirrm jdk%%JDK_VERSION%%/demo/plugin/applets @dirrm jdk%%JDK_VERSION%%/demo/plugin @dirrm jdk%%JDK_VERSION%%/demo @dirrm jdk%%JDK_VERSION%%/include/freebsd @dirrm jdk%%JDK_VERSION%%/include +@dirrm jdk%%JDK_VERSION%%/jre/.systemPrefs @dirrm jdk%%JDK_VERSION%%/jre/bin -@dirrm jdk%%JDK_VERSION%%/jre/lib/audio +@dirrm jdk%%JDK_VERSION%%/jre/javaws/resources +@dirrm jdk%%JDK_VERSION%%/jre/javaws @dirrm jdk%%JDK_VERSION%%/jre/lib/applet +@dirrm jdk%%JDK_VERSION%%/jre/lib/audio @dirrm jdk%%JDK_VERSION%%/jre/lib/cmm @dirrm jdk%%JDK_VERSION%%/jre/lib/ext @dirrm jdk%%JDK_VERSION%%/jre/lib/fonts @@ -1679,30 +1705,30 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/jre/lib/im @dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors @dirrm jdk%%JDK_VERSION%%/jre/lib/images -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5 -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja @dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES @dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8 +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES @dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES -@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5 +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES +@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW @dirrm jdk%%JDK_VERSION%%/jre/lib/locale @dirrm jdk%%JDK_VERSION%%/jre/lib/security @dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Africa @@ -1720,12 +1746,11 @@ jdk%%JDK_VERSION%%/man/man1/tnameserv.1 @dirrm jdk%%JDK_VERSION%%/jre/lib/zi/Pacific @dirrm jdk%%JDK_VERSION%%/jre/lib/zi @dirrm jdk%%JDK_VERSION%%/jre/lib -@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns610 -@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600 +@dirrm jdk%%JDK_VERSION%%/jre/plugin/desktop @dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4 +@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns610 @dirrm jdk%%JDK_VERSION%%/jre/plugin/i386 @dirrm jdk%%JDK_VERSION%%/jre/plugin -@dirrm jdk%%JDK_VERSION%%/jre/.systemPrefs @dirrm jdk%%JDK_VERSION%%/jre @dirrm jdk%%JDK_VERSION%%/lib @dirrm jdk%%JDK_VERSION%%/man/man1 |