diff options
Diffstat (limited to 'java')
89 files changed, 0 insertions, 8579 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile deleted file mode 100644 index 3c818b7d0..000000000 --- a/java/eclipse/Makefile +++ /dev/null @@ -1,149 +0,0 @@ -# New ports collection makefile for: eclipse -# Date created: March 7, 2003 -# Whom: various members of freebsd-java -# -# $FreeBSD$ -# - -PORTNAME= eclipse -PORTVERSION= 3.1.2 -PORTREVISION= 0 -CATEGORIES= java devel -MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= R-${PORTVERSION}-200601181600 -DISTNAME= ${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION} -DIST_SUBDIR= eclipse - -MAINTAINER= freebsd-eclipse@FreeBSD.org -COMMENT= An open extensible IDE for anything and nothing in particular - -BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ - zip:${PORTSDIR}/archivers/zip -BUILD_DEPENDS+= ${EXTRACT_DEPENDS} - -ONLY_FOR_ARCHS= i386 amd64 -USE_GMAKE= yes -USE_ZIP= yes -USE_GCC= 3.4 - -USE_JAVA= yes -JAVA_VERSION= 1.4+ -JAVA_OS= native - -NO_WRKSUBDIR= yes - -PORTDESTDIR= ${PREFIX}/eclipse - -ECLIPSE_OS= freebsd - -.if defined(WITH_MOTIF) -ECLIPSE_WS= motif -USE_ICONV= yes -USE_MOTIF= yes -.else -ECLIPSE_WS= gtk -.if defined(WITHOUT_CAIRO) -MAKE_CAIRO= -.else -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -MAKE_CAIRO= make_cairo -.endif -.endif - -.if defined(WITHOUT_GNOMEVFS) -MAKE_GNOME= -USE_GNOME= gtk20 pkgconfig desktopfileutils -.else -MAKE_GNOME= make_gnome -USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils -.endif - -.include <bsd.port.pre.mk> - -.if (${ARCH} == "amd64") -ECLIPSE_ARCH= amd64 -ECLIPSE_SWT= gtk64 -.else -ECLIPSE_ARCH= x86 -ECLIPSE_SWT= gtk -.endif - -.if !defined(WITHOUT_MOZILLA) -MAKE_MOZILLA= make_mozilla -USE_GECKO= firefox mozilla seamonkey xulrunner -.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" -BROWSER= ${GECKO} -USE_LDCONFIG= yes -.else -BROWSER= -MAKE_MOZILLA= -.endif - -MAKE_ENV+= BROWSER=${BROWSER} \ - ECLIPSE_ARCH=${ECLIPSE_ARCH} \ - ECLIPSE_OS=${ECLIPSE_OS} \ - ECLIPSE_WS=${ECLIPSE_WS} \ - JAVA_HOME=${JAVA_HOME} \ - MAKE_GNOME=${MAKE_GNOME} \ - MAKE_MOZILLA=${MAKE_MOZILLA} \ - MAKE_CAIRO=${MAKE_CAIRO} \ - MACHINE_ARCH=${MACHINE_ARCH} \ - MOTIF_HOME=${X11_HOME} \ - GECKO_CONFIG=${GECKO_CONFIG} - -PLIST_FILES= bin/eclipse share/applications/eclipse.desktop - -SWTCAIRO=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library -SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library -SWTMOTIF=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/motif/library - -# Manually patch some files with spaces in the path -post-patch: - @${PATCH} ${PATCH_DIST_ARGS} "${SWTMOTIF}/build.sh" \ - ${FILESDIR}/manualpatch-plugins-swt-motif-build.sh - @${PATCH} ${PATCH_DIST_ARGS} "${SWTMOTIF}/make_freebsd.mak" \ - ${FILESDIR}/manualpatch-plugins-swt-motif-make_freebsd.mak - @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/make_freebsd.mak" \ - ${FILESDIR}/manualpatch-plugins-swt-gtk-make_freebsd.mak - @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" \ - ${FILESDIR}/manualpatch-plugins-swt-gtk-build.sh - @${PATCH} ${PATCH_DIST_ARGS} \ - "plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c" \ - ${FILESDIR}/manualpatch-plugins-swt-cairo-library \ - + "plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h" \ - + "plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.c" \ - + "plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c" \ - + "plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h" \ - + "plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c" \ - + "plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h" - -do-build: - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ - ./build -os ${ECLIPSE_OS} -ws ${ECLIPSE_WS} -arch ${ECLIPSE_ARCH} -compilelibs) - -do-install: - @${MKDIR} ${PORTDESTDIR} - @${TAR} -xzf ${WRKSRC}/result/*.tar.gz -C ${PREFIX} - @${SED} \ - -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ - -e "s+%%PREFIX%%+${PREFIX}+g" \ - -e "s+%%X11BASE%%+${X11BASE}+g" \ - -e "s+%%BROWSER%%+${BROWSER}+g" \ - -e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \ - -e "s+%%JAVA_OS%%+${JAVA_OS}+g" \ - ${FILESDIR}/eclipse.in > ${WRKSRC}/eclipse.tmp - ${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/eclipse - @${SED} \ - -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ - -e "s+%%PREFIX%%+${PREFIX}+g" \ - ${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp - ${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/eclipse.desktop - ${INSTALL_PROGRAM} ${WRKSRC}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse - @-update-desktop-database - @(cd ${WRKSRC}; ${FIND} -s eclipse -not -type d) >> ${TMPPLIST} - @echo '@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} - @(cd ${WRKSRC}; ${FIND} -s -d eclipse -type d) \ - | ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST} - @echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} - -.include <bsd.port.post.mk> diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo deleted file mode 100644 index 8ae795ce9..000000000 --- a/java/eclipse/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.1.2.zip) = f2c8066151de14c5ccdf420266ce9f39 -SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.1.2.zip) = 31233332f205a197a42aafdc4f15a4f38eb5e4be19ac8a7192492ab8a21324a4 -SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.1.2.zip) = 66630673 diff --git a/java/eclipse/files/eclipse.desktop b/java/eclipse/files/eclipse.desktop deleted file mode 100644 index 37a3c2b75..000000000 --- a/java/eclipse/files/eclipse.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Comment=Eclipse IDE -Name=Eclipse -Exec=%%PREFIX%%/bin/eclipse -Encoding=UTF-8 -Terminal=false -Type=Application -Icon=%%ECLIPSE_HOME%%/icon.xpm -Categories=Application;Development; - diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in deleted file mode 100755 index 91873ea14..000000000 --- a/java/eclipse/files/eclipse.in +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# FreeBSD-specific startup script for Eclipse Platform -# -# See: http://www.eclipse.org -# -# $FreeBSD$ -# - -DEFAULT_JAVA_HOME=%%PREFIX%% -ECLIPSE_HOME=%%ECLIPSE_HOME%% -DEFAULT_JAVA_CMD=java -export MOZILLA_FIVE_HOME=%%LOCALBASE%%/lib/%%BROWSER%% -export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH - - -#----------------------------------------------------------------------------- -# Determine configuration settings -#----------------------------------------------------------------------------- - -# Determine the JDK home directory -if [ -z "${JAVA_HOME}" ]; then - JAVA_HOME=${DEFAULT_JAVA_HOME} -fi - -# Determine 'java' executable -if [ -z "${JAVACMD}" ]; then - if [ -n "${JAVA_HOME}" ]; then - JAVACMD="${JAVA_HOME}/bin/java" - else - JAVACMD=${DEFAULT_JAVACMD} - fi -fi - -# Check if 'java' executable can be found -if [ ! -x "$JAVACMD" ]; then - echo "Error: JAVA_HOME is not defined correctly: ${JAVA_HOME}" - echo " Unable to find ${JAVACMD}" - exit 1 -fi - -# Check if 'eclipse' executable can be found -if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then - echo "Error: ECLIPSE_HOME is not defined correctly: ${ECLIPSE_HOME}" - echo " Unable to find eclipse launcher binary" - exit 1 -fi - -JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} exec "${ECLIPSE_HOME}/eclipse" $@ diff --git a/java/eclipse/files/manualpatch-plugins-swt-cairo-library b/java/eclipse/files/manualpatch-plugins-swt-cairo-library deleted file mode 100644 index e0c57e25e..000000000 --- a/java/eclipse/files/manualpatch-plugins-swt-cairo-library +++ /dev/null @@ -1,2432 +0,0 @@ -diff -uN plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo.c plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c ---- plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo.c Thu Aug 18 12:34:57 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c Thu Aug 18 12:35:19 2005 -@@ -25,6 +25,16 @@ - - #define Cairo_NATIVE(func) Java_org_eclipse_swt_internal_cairo_Cairo_##func - -+#ifndef NO_cairo_1append_1path -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1append_1path) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1append_1path_FUNC); -+ cairo_append_path((cairo_t *)arg0, (cairo_path_t *)arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1append_1path_FUNC); -+} -+#endif -+ - #ifndef NO_cairo_1arc - JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1arc) - (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) -@@ -55,6 +65,16 @@ - } - #endif - -+#ifndef NO_cairo_1clip_1preserve -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1clip_1preserve) -+ (JNIEnv *env, jclass that, jint arg0) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1clip_1preserve_FUNC); -+ cairo_clip_preserve((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1clip_1preserve_FUNC); -+} -+#endif -+ - #ifndef NO_cairo_1close_1path - JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1close_1path) - (JNIEnv *env, jclass that, jint arg0) -@@ -65,353 +85,403 @@ - } - #endif - --#ifndef NO_cairo_1concat_1matrix --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1concat_1matrix) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+#ifndef NO_cairo_1copy_1page -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1copy_1page) -+ (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1concat_1matrix_FUNC); -- cairo_concat_matrix((cairo_t *)arg0, (cairo_matrix_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1concat_1matrix_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1copy_1page_FUNC); -+ cairo_copy_page((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1copy_1page_FUNC); - } - #endif - --#ifndef NO_cairo_1copy --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1copy) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+#ifndef NO_cairo_1copy_1path -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1copy_1path) -+ (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1copy_FUNC); -- cairo_copy((cairo_t *)arg0, (cairo_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1copy_FUNC); -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1copy_1path_FUNC); -+ rc = (jint)cairo_copy_path((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1copy_1path_FUNC); -+ return rc; - } - #endif - --#ifndef NO_cairo_1copy_1page --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1copy_1page) -+#ifndef NO_cairo_1copy_1path_1flat -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1copy_1path_1flat) - (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1copy_1page_FUNC); -- cairo_copy_page((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1copy_1page_FUNC); -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1copy_1path_1flat_FUNC); -+ rc = (jint)cairo_copy_path_flat((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1copy_1path_1flat_FUNC); -+ return rc; - } - #endif - - #ifndef NO_cairo_1create - JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1create) -- (JNIEnv *env, jclass that) -+ (JNIEnv *env, jclass that, jint arg0) - { - jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1create_FUNC); -- rc = (jint)cairo_create(); -+ rc = (jint)cairo_create((cairo_surface_t *)arg0); - Cairo_NATIVE_EXIT(env, that, cairo_1create_FUNC); - return rc; - } - #endif - --#ifndef NO_cairo_1current_1alpha --JNIEXPORT jdouble JNICALL Cairo_NATIVE(cairo_1current_1alpha) -- (JNIEnv *env, jclass that, jint arg0) -+#ifndef NO_cairo_1curve_1to -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1curve_1to) -+ (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6) - { -- jdouble rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1alpha_FUNC); -- rc = (jdouble)cairo_current_alpha((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1alpha_FUNC); -- return rc; -+ Cairo_NATIVE_ENTER(env, that, cairo_1curve_1to_FUNC); -+ cairo_curve_to((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5, arg6); -+ Cairo_NATIVE_EXIT(env, that, cairo_1curve_1to_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1fill_1rule --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1current_1fill_1rule) -+#ifndef NO_cairo_1destroy -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1destroy) - (JNIEnv *env, jclass that, jint arg0) - { -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1fill_1rule_FUNC); -- rc = (jint)cairo_current_fill_rule((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1fill_1rule_FUNC); -- return rc; -+ Cairo_NATIVE_ENTER(env, that, cairo_1destroy_FUNC); -+ cairo_destroy((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1destroy_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1font --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1current_1font) -- (JNIEnv *env, jclass that, jint arg0) -+#ifndef NO_cairo_1device_1to_1user -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1device_1to_1user) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) - { -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1font_FUNC); -- rc = (jint)cairo_current_font((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1font_FUNC); -- return rc; -+ jdouble *lparg1=NULL; -+ jdouble *lparg2=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1device_1to_1user_FUNC); -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -+ cairo_device_to_user((cairo_t *)arg0, lparg1, lparg2); -+fail: -+ if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1device_1to_1user_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1font_1extents --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1current_1font_1extents) -- (JNIEnv *env, jclass that, jint arg0, jobject arg1) -+#ifndef NO_cairo_1device_1to_1user_1distance -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1device_1to_1user_1distance) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) - { -- cairo_font_extents_t _arg1, *lparg1=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1font_1extents_FUNC); -- if (arg1) if ((lparg1 = getcairo_font_extents_tFields(env, arg1, &_arg1)) == NULL) goto fail; -- cairo_current_font_extents((cairo_t *)arg0, (cairo_font_extents_t *)lparg1); -+ jdouble *lparg1=NULL; -+ jdouble *lparg2=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1device_1to_1user_1distance_FUNC); -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -+ cairo_device_to_user_distance((cairo_t *)arg0, lparg1, lparg2); - fail: -- if (arg1 && lparg1) setcairo_font_extents_tFields(env, arg1, lparg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1font_1extents_FUNC); -+ if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1device_1to_1user_1distance_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1line_1cap --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1current_1line_1cap) -+#ifndef NO_cairo_1fill -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1fill) - (JNIEnv *env, jclass that, jint arg0) - { -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1line_1cap_FUNC); -- rc = (jint)cairo_current_line_cap((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1line_1cap_FUNC); -- return rc; -+ Cairo_NATIVE_ENTER(env, that, cairo_1fill_FUNC); -+ cairo_fill((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1fill_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1line_1join --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1current_1line_1join) -- (JNIEnv *env, jclass that, jint arg0) -+#ifndef NO_cairo_1fill_1extents -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1fill_1extents) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4) - { -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1line_1join_FUNC); -- rc = (jint)cairo_current_line_join((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1line_1join_FUNC); -- return rc; -+ jdouble *lparg1=NULL; -+ jdouble *lparg2=NULL; -+ jdouble *lparg3=NULL; -+ jdouble *lparg4=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1fill_1extents_FUNC); -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -+ if (arg3) if ((lparg3 = (*env)->GetDoubleArrayElements(env, arg3, NULL)) == NULL) goto fail; -+ if (arg4) if ((lparg4 = (*env)->GetDoubleArrayElements(env, arg4, NULL)) == NULL) goto fail; -+ cairo_fill_extents((cairo_t *)arg0, lparg1, lparg2, lparg3, lparg4); -+fail: -+ if (arg4 && lparg4) (*env)->ReleaseDoubleArrayElements(env, arg4, lparg4, 0); -+ if (arg3 && lparg3) (*env)->ReleaseDoubleArrayElements(env, arg3, lparg3, 0); -+ if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1fill_1extents_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1line_1width --JNIEXPORT jdouble JNICALL Cairo_NATIVE(cairo_1current_1line_1width) -+#ifndef NO_cairo_1fill_1preserve -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1fill_1preserve) - (JNIEnv *env, jclass that, jint arg0) - { -- jdouble rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1line_1width_FUNC); -- rc = (jdouble)cairo_current_line_width((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1line_1width_FUNC); -- return rc; -+ Cairo_NATIVE_ENTER(env, that, cairo_1fill_1preserve_FUNC); -+ cairo_fill_preserve((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1fill_1preserve_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1matrix --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1current_1matrix) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+#ifndef NO_cairo_1font_1extents -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1extents) -+ (JNIEnv *env, jclass that, jint arg0, jobject arg1) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1matrix_FUNC); -- cairo_current_matrix((cairo_t *)arg0, (cairo_matrix_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1matrix_FUNC); -+ cairo_font_extents_t _arg1, *lparg1=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1font_1extents_FUNC); -+ if (arg1) if ((lparg1 = getcairo_font_extents_tFields(env, arg1, &_arg1)) == NULL) goto fail; -+ cairo_font_extents((cairo_t *)arg0, lparg1); -+fail: -+ if (arg1 && lparg1) setcairo_font_extents_tFields(env, arg1, lparg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1font_1extents_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1miter_1limit --JNIEXPORT jdouble JNICALL Cairo_NATIVE(cairo_1current_1miter_1limit) -- (JNIEnv *env, jclass that, jint arg0) -+#ifndef NO_cairo_1font_1extents_1t_1sizeof -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1extents_1t_1sizeof) -+ (JNIEnv *env, jclass that) - { -- jdouble rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1miter_1limit_FUNC); -- rc = (jdouble)cairo_current_miter_limit((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1miter_1limit_FUNC); -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1font_1extents_1t_1sizeof_FUNC); -+ rc = (jint)cairo_font_extents_t_sizeof(); -+ Cairo_NATIVE_EXIT(env, that, cairo_1font_1extents_1t_1sizeof_FUNC); - return rc; - } - #endif - --#ifndef NO_cairo_1current_1operator --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1current_1operator) -- (JNIEnv *env, jclass that, jint arg0) -+#ifndef NO_cairo_1font_1options_1create -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1options_1create) -+ (JNIEnv *env, jclass that) - { - jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1operator_FUNC); -- rc = (jint)cairo_current_operator((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1operator_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1create_FUNC); -+ rc = (jint)cairo_font_options_create(); -+ Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1create_FUNC); - return rc; - } - #endif - --#ifndef NO_cairo_1current_1path --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1current_1path) -- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5) -+#ifndef NO_cairo_1font_1options_1destroy -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1destroy) -+ (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1path_FUNC); -- cairo_current_path((cairo_t *)arg0, (cairo_move_to_func_t *)arg1, (cairo_line_to_func_t *)arg2, (cairo_curve_to_func_t *)arg3, (cairo_close_path_func_t *)arg4, (void *)arg5); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1path_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1destroy_FUNC); -+ cairo_font_options_destroy((cairo_font_options_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1destroy_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1path_1flat --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1current_1path_1flat) -- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4) -+#ifndef NO_cairo_1font_1options_1get_1antialias -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1options_1get_1antialias) -+ (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1path_1flat_FUNC); -- cairo_current_path_flat((cairo_t *)arg0, (cairo_move_to_func_t *)arg1, (cairo_line_to_func_t *)arg2, (cairo_close_path_func_t *)arg3, (void *)arg4); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1path_1flat_FUNC); -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1get_1antialias_FUNC); -+ rc = (jint)cairo_font_options_get_antialias((cairo_font_options_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1get_1antialias_FUNC); -+ return rc; - } - #endif - --#ifndef NO_cairo_1current_1pattern --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1current_1pattern) -+#ifndef NO_cairo_1font_1options_1set_1antialias -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1set_1antialias) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1set_1antialias_FUNC); -+ cairo_font_options_set_antialias((cairo_font_options_t *)arg0, arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1set_1antialias_FUNC); -+} -+#endif -+ -+#ifndef NO_cairo_1get_1antialias -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1antialias) - (JNIEnv *env, jclass that, jint arg0) - { - jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1pattern_FUNC); -- rc = (jint)cairo_current_pattern((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1pattern_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1antialias_FUNC); -+ rc = (jint)cairo_get_antialias((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1antialias_FUNC); - return rc; - } - #endif - --#ifndef NO_cairo_1current_1point --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1current_1point) -+#ifndef NO_cairo_1get_1current_1point -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1current_1point) - (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) - { - jdouble *lparg1=NULL; - jdouble *lparg2=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1point_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1current_1point_FUNC); - if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- cairo_current_point((cairo_t *)arg0, lparg1, lparg2); -+ cairo_get_current_point((cairo_t *)arg0, lparg1, lparg2); - fail: - if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1point_FUNC); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1current_1point_FUNC); - } - #endif - --#ifndef NO_cairo_1current_1rgb_1color --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1current_1rgb_1color) -- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3) -+#ifndef NO_cairo_1get_1fill_1rule -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1fill_1rule) -+ (JNIEnv *env, jclass that, jint arg0) - { -- jdouble *lparg1=NULL; -- jdouble *lparg2=NULL; -- jdouble *lparg3=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1rgb_1color_FUNC); -- if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -- if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- if (arg3) if ((lparg3 = (*env)->GetDoubleArrayElements(env, arg3, NULL)) == NULL) goto fail; -- cairo_current_rgb_color((cairo_t *)arg0, lparg1, lparg2, lparg3); --fail: -- if (arg3 && lparg3) (*env)->ReleaseDoubleArrayElements(env, arg3, lparg3, 0); -- if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); -- if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1rgb_1color_FUNC); -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1fill_1rule_FUNC); -+ rc = (jint)cairo_get_fill_rule((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1fill_1rule_FUNC); -+ return rc; - } - #endif - --#ifndef NO_cairo_1current_1target_1surface --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1current_1target_1surface) -+#ifndef NO_cairo_1get_1font_1face -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1font_1face) - (JNIEnv *env, jclass that, jint arg0) - { - jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1target_1surface_FUNC); -- rc = (jint)cairo_current_target_surface((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1target_1surface_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1font_1face_FUNC); -+ rc = (jint)cairo_get_font_face((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1font_1face_FUNC); - return rc; - } - #endif - --#ifndef NO_cairo_1current_1tolerance --JNIEXPORT jdouble JNICALL Cairo_NATIVE(cairo_1current_1tolerance) -- (JNIEnv *env, jclass that, jint arg0) -+#ifndef NO_cairo_1get_1font_1matrix -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1font_1matrix) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1) - { -- jdouble rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1current_1tolerance_FUNC); -- rc = (jdouble)cairo_current_tolerance((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1current_1tolerance_FUNC); -- return rc; -+ jdouble *lparg1=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1font_1matrix_FUNC); -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ cairo_get_font_matrix((cairo_t *)arg0, (cairo_matrix_t *)lparg1); -+fail: -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1font_1matrix_FUNC); - } - #endif - --#ifndef NO_cairo_1curve_1to --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1curve_1to) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6) -+#ifndef NO_cairo_1get_1font_1options -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1font_1options) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1curve_1to_FUNC); -- cairo_curve_to((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5, arg6); -- Cairo_NATIVE_EXIT(env, that, cairo_1curve_1to_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1font_1options_FUNC); -+ cairo_get_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1font_1options_FUNC); - } - #endif - --#ifndef NO_cairo_1default_1matrix --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1default_1matrix) -+#ifndef NO_cairo_1get_1line_1cap -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1line_1cap) - (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1default_1matrix_FUNC); -- cairo_default_matrix((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1default_1matrix_FUNC); -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1line_1cap_FUNC); -+ rc = (jint)cairo_get_line_cap((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1line_1cap_FUNC); -+ return rc; - } - #endif - --#ifndef NO_cairo_1destroy --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1destroy) -+#ifndef NO_cairo_1get_1line_1join -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1line_1join) - (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1destroy_FUNC); -- cairo_destroy((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1destroy_FUNC); -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1line_1join_FUNC); -+ rc = (jint)cairo_get_line_join((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1line_1join_FUNC); -+ return rc; - } - #endif - --#ifndef NO_cairo_1fill --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1fill) -+#ifndef NO_cairo_1get_1line_1width -+JNIEXPORT jdouble JNICALL Cairo_NATIVE(cairo_1get_1line_1width) - (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1fill_FUNC); -- cairo_fill((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1fill_FUNC); -+ jdouble rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1line_1width_FUNC); -+ rc = (jdouble)cairo_get_line_width((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1line_1width_FUNC); -+ return rc; - } - #endif - --#ifndef NO_cairo_1fill_1extents --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1fill_1extents) -- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4) -+#ifndef NO_cairo_1get_1matrix -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1matrix) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1) - { - jdouble *lparg1=NULL; -- jdouble *lparg2=NULL; -- jdouble *lparg3=NULL; -- jdouble *lparg4=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1fill_1extents_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1matrix_FUNC); - if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -- if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- if (arg3) if ((lparg3 = (*env)->GetDoubleArrayElements(env, arg3, NULL)) == NULL) goto fail; -- if (arg4) if ((lparg4 = (*env)->GetDoubleArrayElements(env, arg4, NULL)) == NULL) goto fail; -- cairo_fill_extents((cairo_t *)arg0, lparg1, lparg2, lparg3, lparg4); -+ cairo_get_matrix((cairo_t *)arg0, (cairo_matrix_t *)lparg1); - fail: -- if (arg4 && lparg4) (*env)->ReleaseDoubleArrayElements(env, arg4, lparg4, 0); -- if (arg3 && lparg3) (*env)->ReleaseDoubleArrayElements(env, arg3, lparg3, 0); -- if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1fill_1extents_FUNC); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1matrix_FUNC); - } - #endif - --#ifndef NO_cairo_1font_1destroy --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1destroy) -+#ifndef NO_cairo_1get_1miter_1limit -+JNIEXPORT jdouble JNICALL Cairo_NATIVE(cairo_1get_1miter_1limit) - (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1font_1destroy_FUNC); -- cairo_font_destroy((cairo_font_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1font_1destroy_FUNC); -+ jdouble rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1miter_1limit_FUNC); -+ rc = (jdouble)cairo_get_miter_limit((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1miter_1limit_FUNC); -+ return rc; - } - #endif - --#ifndef NO_cairo_1font_1extents_1t_1sizeof --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1extents_1t_1sizeof) -- (JNIEnv *env, jclass that) -+#ifndef NO_cairo_1get_1operator -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1operator) -+ (JNIEnv *env, jclass that, jint arg0) - { - jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1font_1extents_1t_1sizeof_FUNC); -- rc = (jint)cairo_font_extents_t_sizeof(); -- Cairo_NATIVE_EXIT(env, that, cairo_1font_1extents_1t_1sizeof_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1operator_FUNC); -+ rc = (jint)cairo_get_operator((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1operator_FUNC); -+ return rc; -+} -+#endif -+ -+#ifndef NO_cairo_1get_1source -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1source) -+ (JNIEnv *env, jclass that, jint arg0) -+{ -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1source_FUNC); -+ rc = (jint)cairo_get_source((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1source_FUNC); - return rc; - } - #endif - --#ifndef NO_cairo_1font_1reference --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1reference) -+#ifndef NO_cairo_1get_1target -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1target) - (JNIEnv *env, jclass that, jint arg0) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1font_1reference_FUNC); -- cairo_font_reference((cairo_font_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1font_1reference_FUNC); -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1target_FUNC); -+ rc = (jint)cairo_get_target((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1target_FUNC); -+ return rc; -+} -+#endif -+ -+#ifndef NO_cairo_1get_1tolerance -+JNIEXPORT jdouble JNICALL Cairo_NATIVE(cairo_1get_1tolerance) -+ (JNIEnv *env, jclass that, jint arg0) -+{ -+ jdouble rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1get_1tolerance_FUNC); -+ rc = (jdouble)cairo_get_tolerance((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1get_1tolerance_FUNC); -+ return rc; - } - #endif - -@@ -469,6 +539,30 @@ - } - #endif - -+#ifndef NO_cairo_1image_1surface_1get_1height -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1image_1surface_1get_1height) -+ (JNIEnv *env, jclass that, jint arg0) -+{ -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1image_1surface_1get_1height_FUNC); -+ rc = (jint)cairo_image_surface_get_height((cairo_surface_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1image_1surface_1get_1height_FUNC); -+ return rc; -+} -+#endif -+ -+#ifndef NO_cairo_1image_1surface_1get_1width -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1image_1surface_1get_1width) -+ (JNIEnv *env, jclass that, jint arg0) -+{ -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1image_1surface_1get_1width_FUNC); -+ rc = (jint)cairo_image_surface_get_width((cairo_surface_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1image_1surface_1get_1width_FUNC); -+ return rc; -+} -+#endif -+ - #ifndef NO_cairo_1in_1fill - JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1in_1fill) - (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2) -@@ -493,244 +587,221 @@ - } - #endif - --#ifndef NO_cairo_1init_1clip --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1init_1clip) -- (JNIEnv *env, jclass that, jint arg0) -+#ifndef NO_cairo_1line_1to -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1line_1to) -+ (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1init_1clip_FUNC); -- cairo_init_clip((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1init_1clip_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1line_1to_FUNC); -+ cairo_line_to((cairo_t *)arg0, arg1, arg2); -+ Cairo_NATIVE_EXIT(env, that, cairo_1line_1to_FUNC); - } - #endif - --#ifndef NO_cairo_1inverse_1transform_1distance --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1inverse_1transform_1distance) -- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) -+#ifndef NO_cairo_1mask -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1mask) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1) - { -- jdouble *lparg1=NULL; -- jdouble *lparg2=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1inverse_1transform_1distance_FUNC); -- if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -- if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- cairo_inverse_transform_distance((cairo_t *)arg0, lparg1, lparg2); --fail: -- if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); -- if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1inverse_1transform_1distance_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1mask_FUNC); -+ cairo_mask((cairo_t *)arg0, (cairo_pattern_t *)arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1mask_FUNC); - } - #endif - --#ifndef NO_cairo_1inverse_1transform_1point --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1inverse_1transform_1point) -- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) -+#ifndef NO_cairo_1mask_1surface -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1mask_1surface) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jdouble arg2, jdouble arg3) - { -- jdouble *lparg1=NULL; -- jdouble *lparg2=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1inverse_1transform_1point_FUNC); -- if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -- if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- cairo_inverse_transform_point((cairo_t *)arg0, lparg1, lparg2); --fail: -- if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); -- if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1inverse_1transform_1point_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1mask_1surface_FUNC); -+ cairo_mask_surface((cairo_t *)arg0, (cairo_surface_t *)arg1, arg2, arg3); -+ Cairo_NATIVE_EXIT(env, that, cairo_1mask_1surface_FUNC); - } - #endif - --#ifndef NO_cairo_1line_1to --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1line_1to) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2) -+#ifndef NO_cairo_1matrix_1init -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1init) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1line_1to_FUNC); -- cairo_line_to((cairo_t *)arg0, arg1, arg2); -- Cairo_NATIVE_EXIT(env, that, cairo_1line_1to_FUNC); -+ jdouble *lparg0=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1init_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ cairo_matrix_init((cairo_matrix_t *)lparg0, arg1, arg2, arg3, arg4, arg5, arg6); -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1init_FUNC); - } - #endif - --#ifndef NO_cairo_1matrix_1copy --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1copy) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+#ifndef NO_cairo_1matrix_1init_1identity -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1init_1identity) -+ (JNIEnv *env, jclass that, jdoubleArray arg0) - { -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1copy_FUNC); -- rc = (jint)cairo_matrix_copy((cairo_matrix_t *)arg0, (cairo_matrix_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1copy_FUNC); -- return rc; -+ jdouble *lparg0=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1init_1identity_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ cairo_matrix_init_identity((cairo_matrix_t *)lparg0); -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1init_1identity_FUNC); - } - #endif - --#ifndef NO_cairo_1matrix_1create --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1create) -- (JNIEnv *env, jclass that) -+#ifndef NO_cairo_1matrix_1init_1rotate -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1init_1rotate) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1) - { -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1create_FUNC); -- rc = (jint)cairo_matrix_create(); -- Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1create_FUNC); -- return rc; -+ jdouble *lparg0=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1init_1rotate_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ cairo_matrix_init_rotate((cairo_matrix_t *)lparg0, arg1); -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1init_1rotate_FUNC); - } - #endif - --#ifndef NO_cairo_1matrix_1destroy --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1destroy) -- (JNIEnv *env, jclass that, jint arg0) -+#ifndef NO_cairo_1matrix_1init_1scale -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1init_1scale) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1, jdouble arg2) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1destroy_FUNC); -- cairo_matrix_destroy((cairo_matrix_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1destroy_FUNC); -+ jdouble *lparg0=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1init_1scale_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ cairo_matrix_init_scale((cairo_matrix_t *)lparg0, arg1, arg2); -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1init_1scale_FUNC); - } - #endif - --#ifndef NO_cairo_1matrix_1get_1affine --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1get_1affine) -- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4, jdoubleArray arg5, jdoubleArray arg6) -+#ifndef NO_cairo_1matrix_1init_1translate -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1init_1translate) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1, jdouble arg2) - { -- jdouble *lparg1=NULL; -- jdouble *lparg2=NULL; -- jdouble *lparg3=NULL; -- jdouble *lparg4=NULL; -- jdouble *lparg5=NULL; -- jdouble *lparg6=NULL; -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1get_1affine_FUNC); -- if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -- if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- if (arg3) if ((lparg3 = (*env)->GetDoubleArrayElements(env, arg3, NULL)) == NULL) goto fail; -- if (arg4) if ((lparg4 = (*env)->GetDoubleArrayElements(env, arg4, NULL)) == NULL) goto fail; -- if (arg5) if ((lparg5 = (*env)->GetDoubleArrayElements(env, arg5, NULL)) == NULL) goto fail; -- if (arg6) if ((lparg6 = (*env)->GetDoubleArrayElements(env, arg6, NULL)) == NULL) goto fail; -- rc = (jint)cairo_matrix_get_affine((cairo_matrix_t *)arg0, lparg1, lparg2, lparg3, lparg4, lparg5, lparg6); -+ jdouble *lparg0=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1init_1translate_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ cairo_matrix_init_translate((cairo_matrix_t *)lparg0, arg1, arg2); - fail: -- if (arg6 && lparg6) (*env)->ReleaseDoubleArrayElements(env, arg6, lparg6, 0); -- if (arg5 && lparg5) (*env)->ReleaseDoubleArrayElements(env, arg5, lparg5, 0); -- if (arg4 && lparg4) (*env)->ReleaseDoubleArrayElements(env, arg4, lparg4, 0); -- if (arg3 && lparg3) (*env)->ReleaseDoubleArrayElements(env, arg3, lparg3, 0); -- if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); -- if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1get_1affine_FUNC); -- return rc; -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1init_1translate_FUNC); - } - #endif - - #ifndef NO_cairo_1matrix_1invert - JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1invert) -- (JNIEnv *env, jclass that, jint arg0) -+ (JNIEnv *env, jclass that, jdoubleArray arg0) - { -+ jdouble *lparg0=NULL; - jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1invert_FUNC); -- rc = (jint)cairo_matrix_invert((cairo_matrix_t *)arg0); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ rc = (jint)cairo_matrix_invert((cairo_matrix_t *)lparg0); -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1invert_FUNC); - return rc; - } - #endif - - #ifndef NO_cairo_1matrix_1multiply --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1multiply) -- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1multiply) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdoubleArray arg1, jdoubleArray arg2) - { -- jint rc = 0; -+ jdouble *lparg0=NULL; -+ jdouble *lparg1=NULL; -+ jdouble *lparg2=NULL; - Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1multiply_FUNC); -- rc = (jint)cairo_matrix_multiply((cairo_matrix_t *)arg0, (cairo_matrix_t *)arg1, (cairo_matrix_t *)arg2); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -+ cairo_matrix_multiply((cairo_matrix_t *)lparg0, (cairo_matrix_t *)lparg1, (cairo_matrix_t *)lparg2); -+fail: -+ if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1multiply_FUNC); -- return rc; - } - #endif - - #ifndef NO_cairo_1matrix_1rotate --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1rotate) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1rotate) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1) - { -- jint rc = 0; -+ jdouble *lparg0=NULL; - Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1rotate_FUNC); -- rc = (jint)cairo_matrix_rotate((cairo_matrix_t *)arg0, arg1); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ cairo_matrix_rotate((cairo_matrix_t *)lparg0, arg1); -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1rotate_FUNC); -- return rc; - } - #endif - - #ifndef NO_cairo_1matrix_1scale --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1scale) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1scale) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1, jdouble arg2) - { -- jint rc = 0; -+ jdouble *lparg0=NULL; - Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1scale_FUNC); -- rc = (jint)cairo_matrix_scale((cairo_matrix_t *)arg0, arg1, arg2); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ cairo_matrix_scale((cairo_matrix_t *)lparg0, arg1, arg2); -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1scale_FUNC); -- return rc; --} --#endif -- --#ifndef NO_cairo_1matrix_1set_1affine --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1set_1affine) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6) --{ -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1set_1affine_FUNC); -- rc = (jint)cairo_matrix_set_affine((cairo_matrix_t *)arg0, arg1, arg2, arg3, arg4, arg5, arg6); -- Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1set_1affine_FUNC); -- return rc; --} --#endif -- --#ifndef NO_cairo_1matrix_1set_1identity --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1set_1identity) -- (JNIEnv *env, jclass that, jint arg0) --{ -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1set_1identity_FUNC); -- rc = (jint)cairo_matrix_set_identity((cairo_matrix_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1set_1identity_FUNC); -- return rc; - } - #endif - - #ifndef NO_cairo_1matrix_1transform_1distance --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1transform_1distance) -- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1transform_1distance) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdoubleArray arg1, jdoubleArray arg2) - { -+ jdouble *lparg0=NULL; - jdouble *lparg1=NULL; - jdouble *lparg2=NULL; -- jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1transform_1distance_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- rc = (jint)cairo_matrix_transform_distance((cairo_matrix_t *)arg0, lparg1, lparg2); -+ cairo_matrix_transform_distance((cairo_matrix_t *)lparg0, lparg1, lparg2); - fail: - if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1transform_1distance_FUNC); -- return rc; - } - #endif - - #ifndef NO_cairo_1matrix_1transform_1point --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1transform_1point) -- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1transform_1point) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdoubleArray arg1, jdoubleArray arg2) - { -+ jdouble *lparg0=NULL; - jdouble *lparg1=NULL; - jdouble *lparg2=NULL; -- jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1transform_1point_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- rc = (jint)cairo_matrix_transform_point((cairo_matrix_t *)arg0, lparg1, lparg2); -+ cairo_matrix_transform_point((cairo_matrix_t *)lparg0, lparg1, lparg2); - fail: - if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1transform_1point_FUNC); -- return rc; - } - #endif - - #ifndef NO_cairo_1matrix_1translate --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1translate) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1translate) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1, jdouble arg2) - { -- jint rc = 0; -+ jdouble *lparg0=NULL; - Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1translate_FUNC); -- rc = (jint)cairo_matrix_translate((cairo_matrix_t *)arg0, arg1, arg2); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ cairo_matrix_translate((cairo_matrix_t *)lparg0, arg1, arg2); -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1translate_FUNC); -- return rc; - } - #endif - -@@ -754,18 +825,80 @@ - } - #endif - --#ifndef NO_cairo_1pattern_1add_1color_1stop --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1pattern_1add_1color_1stop) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) -+#ifndef NO_cairo_1paint -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1paint) -+ (JNIEnv *env, jclass that, jint arg0) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1paint_FUNC); -+ cairo_paint((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1paint_FUNC); -+} -+#endif -+ -+#ifndef NO_cairo_1paint_1with_1alpha -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1paint_1with_1alpha) -+ (JNIEnv *env, jclass that, jint arg0, jdouble arg1) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1paint_1with_1alpha_FUNC); -+ cairo_paint_with_alpha((cairo_t *)arg0, arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1paint_1with_1alpha_FUNC); -+} -+#endif -+ -+#ifndef NO_cairo_1path_1data_1t_1sizeof -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1path_1data_1t_1sizeof) -+ (JNIEnv *env, jclass that) -+{ -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1path_1data_1t_1sizeof_FUNC); -+ rc = (jint)cairo_path_data_t_sizeof(); -+ Cairo_NATIVE_EXIT(env, that, cairo_1path_1data_1t_1sizeof_FUNC); -+ return rc; -+} -+#endif -+ -+#ifndef NO_cairo_1path_1destroy -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1path_1destroy) -+ (JNIEnv *env, jclass that, jint arg0) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1path_1destroy_FUNC); -+ cairo_path_destroy((cairo_path_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1path_1destroy_FUNC); -+} -+#endif -+ -+#ifndef NO_cairo_1path_1t_1sizeof -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1path_1t_1sizeof) -+ (JNIEnv *env, jclass that) - { - jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1pattern_1add_1color_1stop_FUNC); -- rc = (jint)cairo_pattern_add_color_stop((cairo_pattern_t *)arg0, arg1, arg2, arg3, arg4, arg5); -- Cairo_NATIVE_EXIT(env, that, cairo_1pattern_1add_1color_1stop_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1path_1t_1sizeof_FUNC); -+ rc = (jint)cairo_path_t_sizeof(); -+ Cairo_NATIVE_EXIT(env, that, cairo_1path_1t_1sizeof_FUNC); - return rc; - } - #endif - -+#ifndef NO_cairo_1pattern_1add_1color_1stop_1rgb -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1pattern_1add_1color_1stop_1rgb) -+ (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1pattern_1add_1color_1stop_1rgb_FUNC); -+ cairo_pattern_add_color_stop_rgb((cairo_pattern_t *)arg0, arg1, arg2, arg3, arg4); -+ Cairo_NATIVE_EXIT(env, that, cairo_1pattern_1add_1color_1stop_1rgb_FUNC); -+} -+#endif -+ -+#ifndef NO_cairo_1pattern_1add_1color_1stop_1rgba -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1pattern_1add_1color_1stop_1rgba) -+ (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1pattern_1add_1color_1stop_1rgba_FUNC); -+ cairo_pattern_add_color_stop_rgba((cairo_pattern_t *)arg0, arg1, arg2, arg3, arg4, arg5); -+ Cairo_NATIVE_EXIT(env, that, cairo_1pattern_1add_1color_1stop_1rgba_FUNC); -+} -+#endif -+ - #ifndef NO_cairo_1pattern_1create_1for_1surface - JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1pattern_1create_1for_1surface) - (JNIEnv *env, jclass that, jint arg0) -@@ -837,14 +970,16 @@ - #endif - - #ifndef NO_cairo_1pattern_1get_1matrix --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1pattern_1get_1matrix) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1pattern_1get_1matrix) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1) - { -- jint rc = 0; -+ jdouble *lparg1=NULL; - Cairo_NATIVE_ENTER(env, that, cairo_1pattern_1get_1matrix_FUNC); -- rc = (jint)cairo_pattern_get_matrix((cairo_pattern_t *)arg0, (cairo_matrix_t *)arg1); -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ cairo_pattern_get_matrix((cairo_pattern_t *)arg0, (cairo_matrix_t *)lparg1); -+fail: -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1pattern_1get_1matrix_FUNC); -- return rc; - } - #endif - -@@ -859,38 +994,36 @@ - #endif - - #ifndef NO_cairo_1pattern_1set_1extend --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1pattern_1set_1extend) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1pattern_1set_1extend) - (JNIEnv *env, jclass that, jint arg0, jint arg1) - { -- jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1pattern_1set_1extend_FUNC); -- rc = (jint)cairo_pattern_set_extend((cairo_pattern_t *)arg0, arg1); -+ cairo_pattern_set_extend((cairo_pattern_t *)arg0, arg1); - Cairo_NATIVE_EXIT(env, that, cairo_1pattern_1set_1extend_FUNC); -- return rc; - } - #endif - - #ifndef NO_cairo_1pattern_1set_1filter --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1pattern_1set_1filter) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1pattern_1set_1filter) - (JNIEnv *env, jclass that, jint arg0, jint arg1) - { -- jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1pattern_1set_1filter_FUNC); -- rc = (jint)cairo_pattern_set_filter((cairo_pattern_t *)arg0, arg1); -+ cairo_pattern_set_filter((cairo_pattern_t *)arg0, arg1); - Cairo_NATIVE_EXIT(env, that, cairo_1pattern_1set_1filter_FUNC); -- return rc; - } - #endif - - #ifndef NO_cairo_1pattern_1set_1matrix --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1pattern_1set_1matrix) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1pattern_1set_1matrix) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1) - { -- jint rc = 0; -+ jdouble *lparg1=NULL; - Cairo_NATIVE_ENTER(env, that, cairo_1pattern_1set_1matrix_FUNC); -- rc = (jint)cairo_pattern_set_matrix((cairo_pattern_t *)arg0, (cairo_matrix_t *)arg1); -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ cairo_pattern_set_matrix((cairo_pattern_t *)arg0, (cairo_matrix_t *)lparg1); -+fail: -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1pattern_1set_1matrix_FUNC); -- return rc; - } - #endif - -@@ -905,12 +1038,14 @@ - #endif - - #ifndef NO_cairo_1reference --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1reference) -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1reference) - (JNIEnv *env, jclass that, jint arg0) - { -+ jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1reference_FUNC); -- cairo_reference((cairo_t *)arg0); -+ rc = (jint)cairo_reference((cairo_t *)arg0); - Cairo_NATIVE_EXIT(env, that, cairo_1reference_FUNC); -+ return rc; - } - #endif - -@@ -944,6 +1079,16 @@ - } - #endif - -+#ifndef NO_cairo_1reset_1clip -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1reset_1clip) -+ (JNIEnv *env, jclass that, jint arg0) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1reset_1clip_FUNC); -+ cairo_reset_clip((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1reset_1clip_FUNC); -+} -+#endif -+ - #ifndef NO_cairo_1restore - JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1restore) - (JNIEnv *env, jclass that, jint arg0) -@@ -984,37 +1129,27 @@ - } - #endif - --#ifndef NO_cairo_1scale_1font --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1scale_1font) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1) --{ -- Cairo_NATIVE_ENTER(env, that, cairo_1scale_1font_FUNC); -- cairo_scale_font((cairo_t *)arg0, arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1scale_1font_FUNC); --} --#endif -- --#ifndef NO_cairo_1select_1font --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1select_1font) -+#ifndef NO_cairo_1select_1font_1face -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1select_1font_1face) - (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3) - { - jbyte *lparg1=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1select_1font_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1select_1font_1face_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -- cairo_select_font((cairo_t *)arg0, lparg1, arg2, arg3); -+ cairo_select_font_face((cairo_t *)arg0, lparg1, arg2, arg3); - fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1select_1font_FUNC); -+ Cairo_NATIVE_EXIT(env, that, cairo_1select_1font_1face_FUNC); - } - #endif - --#ifndef NO_cairo_1set_1alpha --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1alpha) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1) -+#ifndef NO_cairo_1set_1antialias -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1antialias) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1set_1alpha_FUNC); -- cairo_set_alpha((cairo_t *)arg0, arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1set_1alpha_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1set_1antialias_FUNC); -+ cairo_set_antialias((cairo_t *)arg0, arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1set_1antialias_FUNC); - } - #endif - -@@ -1042,13 +1177,47 @@ - } - #endif - --#ifndef NO_cairo_1set_1font --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font) -+#ifndef NO_cairo_1set_1font_1face -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1face) - (JNIEnv *env, jclass that, jint arg0, jint arg1) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_FUNC); -- cairo_set_font((cairo_t *)arg0, (cairo_font_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_1face_FUNC); -+ cairo_set_font_face((cairo_t *)arg0, (cairo_font_face_t *)arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_1face_FUNC); -+} -+#endif -+ -+#ifndef NO_cairo_1set_1font_1matrix -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1matrix) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1) -+{ -+ jdouble *lparg1=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_1matrix_FUNC); -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ cairo_set_font_matrix((cairo_t *)arg0, (cairo_matrix_t *)lparg1); -+fail: -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_1matrix_FUNC); -+} -+#endif -+ -+#ifndef NO_cairo_1set_1font_1options -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1options) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_1options_FUNC); -+ cairo_set_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_1options_FUNC); -+} -+#endif -+ -+#ifndef NO_cairo_1set_1font_1size -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1size) -+ (JNIEnv *env, jclass that, jint arg0, jdouble arg1) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_1size_FUNC); -+ cairo_set_font_size((cairo_t *)arg0, arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_1size_FUNC); - } - #endif - -@@ -1084,10 +1253,14 @@ - - #ifndef NO_cairo_1set_1matrix - JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1matrix) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1) - { -+ jdouble *lparg1=NULL; - Cairo_NATIVE_ENTER(env, that, cairo_1set_1matrix_FUNC); -- cairo_set_matrix((cairo_t *)arg0, (cairo_matrix_t *)arg1); -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ cairo_set_matrix((cairo_t *)arg0, (cairo_matrix_t *)lparg1); -+fail: -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); - Cairo_NATIVE_EXIT(env, that, cairo_1set_1matrix_FUNC); - } - #endif -@@ -1112,53 +1285,43 @@ - } - #endif - --#ifndef NO_cairo_1set_1pattern --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1pattern) -+#ifndef NO_cairo_1set_1source -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1source) - (JNIEnv *env, jclass that, jint arg0, jint arg1) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1set_1pattern_FUNC); -- cairo_set_pattern((cairo_t *)arg0, (cairo_pattern_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1set_1pattern_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1set_1source_FUNC); -+ cairo_set_source((cairo_t *)arg0, (cairo_pattern_t *)arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1set_1source_FUNC); - } - #endif - --#ifndef NO_cairo_1set_1rgb_1color --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1rgb_1color) -+#ifndef NO_cairo_1set_1source_1rgb -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1source_1rgb) - (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1set_1rgb_1color_FUNC); -- cairo_set_rgb_color((cairo_t *)arg0, arg1, arg2, arg3); -- Cairo_NATIVE_EXIT(env, that, cairo_1set_1rgb_1color_FUNC); --} --#endif -- --#ifndef NO_cairo_1set_1target_1drawable --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1target_1drawable) -- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) --{ -- Cairo_NATIVE_ENTER(env, that, cairo_1set_1target_1drawable_FUNC); -- cairo_set_target_drawable((cairo_t *)arg0, (Display *)arg1, (Drawable)arg2); -- Cairo_NATIVE_EXIT(env, that, cairo_1set_1target_1drawable_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1set_1source_1rgb_FUNC); -+ cairo_set_source_rgb((cairo_t *)arg0, arg1, arg2, arg3); -+ Cairo_NATIVE_EXIT(env, that, cairo_1set_1source_1rgb_FUNC); - } - #endif - --#ifndef NO_cairo_1set_1target_1image --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1target_1image) -- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5) -+#ifndef NO_cairo_1set_1source_1rgba -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1source_1rgba) -+ (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1set_1target_1image_FUNC); -- cairo_set_target_image((cairo_t *)arg0, (char *)arg1, arg2, arg3, arg4, arg5); -- Cairo_NATIVE_EXIT(env, that, cairo_1set_1target_1image_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1set_1source_1rgba_FUNC); -+ cairo_set_source_rgba((cairo_t *)arg0, arg1, arg2, arg3, arg4); -+ Cairo_NATIVE_EXIT(env, that, cairo_1set_1source_1rgba_FUNC); - } - #endif - --#ifndef NO_cairo_1set_1target_1surface --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1target_1surface) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+#ifndef NO_cairo_1set_1source_1surface -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1source_1surface) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jdouble arg2, jdouble arg3) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1set_1target_1surface_FUNC); -- cairo_set_target_surface((cairo_t *)arg0, (cairo_surface_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1set_1target_1surface_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1set_1source_1surface_FUNC); -+ cairo_set_source_surface((cairo_t *)arg0, (cairo_surface_t *)arg1, arg2, arg3); -+ Cairo_NATIVE_EXIT(env, that, cairo_1set_1source_1surface_FUNC); - } - #endif - -@@ -1192,16 +1355,6 @@ - } - #endif - --#ifndef NO_cairo_1show_1surface --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1show_1surface) -- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3) --{ -- Cairo_NATIVE_ENTER(env, that, cairo_1show_1surface_FUNC); -- cairo_show_surface((cairo_t *)arg0, (cairo_surface_t *)arg1, arg2, arg3); -- Cairo_NATIVE_EXIT(env, that, cairo_1show_1surface_FUNC); --} --#endif -- - #ifndef NO_cairo_1show_1text - JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1show_1text) - (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1) -@@ -1228,14 +1381,14 @@ - } - #endif - --#ifndef NO_cairo_1status_1string --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1status_1string) -+#ifndef NO_cairo_1status_1to_1string -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1status_1to_1string) - (JNIEnv *env, jclass that, jint arg0) - { - jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1status_1string_FUNC); -- rc = (jint)cairo_status_string((cairo_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1status_1string_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1status_1to_1string_FUNC); -+ rc = (jint)cairo_status_to_string(arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1status_1to_1string_FUNC); - return rc; - } - #endif -@@ -1273,15 +1426,13 @@ - } - #endif - --#ifndef NO_cairo_1surface_1create_1for_1image --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1create_1for_1image) -- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4) -+#ifndef NO_cairo_1stroke_1preserve -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1stroke_1preserve) -+ (JNIEnv *env, jclass that, jint arg0) - { -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1surface_1create_1for_1image_FUNC); -- rc = (jint)cairo_surface_create_for_image((char *)arg0, arg1, arg2, arg3, arg4); -- Cairo_NATIVE_EXIT(env, that, cairo_1surface_1create_1for_1image_FUNC); -- return rc; -+ Cairo_NATIVE_ENTER(env, that, cairo_1stroke_1preserve_FUNC); -+ cairo_stroke_preserve((cairo_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1stroke_1preserve_FUNC); - } - #endif - -@@ -1307,26 +1458,24 @@ - } - #endif - --#ifndef NO_cairo_1surface_1get_1filter --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1get_1filter) -+#ifndef NO_cairo_1surface_1finish -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1surface_1finish) - (JNIEnv *env, jclass that, jint arg0) - { -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1surface_1get_1filter_FUNC); -- rc = (jint)cairo_surface_get_filter((cairo_surface_t *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1surface_1get_1filter_FUNC); -- return rc; -+ Cairo_NATIVE_ENTER(env, that, cairo_1surface_1finish_FUNC); -+ cairo_surface_finish((cairo_surface_t *)arg0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1surface_1finish_FUNC); - } - #endif - --#ifndef NO_cairo_1surface_1get_1matrix --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1get_1matrix) -+#ifndef NO_cairo_1surface_1get_1user_1data -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1get_1user_1data) - (JNIEnv *env, jclass that, jint arg0, jint arg1) - { - jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1surface_1get_1matrix_FUNC); -- rc = (jint)cairo_surface_get_matrix((cairo_surface_t *)arg0, (cairo_matrix_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1surface_1get_1matrix_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1surface_1get_1user_1data_FUNC); -+ rc = (jint)cairo_surface_get_user_data((cairo_surface_t *)arg0, (cairo_user_data_key_t *)arg1); -+ Cairo_NATIVE_EXIT(env, that, cairo_1surface_1get_1user_1data_FUNC); - return rc; - } - #endif -@@ -1341,38 +1490,24 @@ - } - #endif - --#ifndef NO_cairo_1surface_1set_1filter --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1set_1filter) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) --{ -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1surface_1set_1filter_FUNC); -- rc = (jint)cairo_surface_set_filter((cairo_surface_t *)arg0, arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1surface_1set_1filter_FUNC); -- return rc; --} --#endif -- --#ifndef NO_cairo_1surface_1set_1matrix --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1set_1matrix) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+#ifndef NO_cairo_1surface_1set_1device_1offset -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1surface_1set_1device_1offset) -+ (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2) - { -- jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1surface_1set_1matrix_FUNC); -- rc = (jint)cairo_surface_set_matrix((cairo_surface_t *)arg0, (cairo_matrix_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1surface_1set_1matrix_FUNC); -- return rc; -+ Cairo_NATIVE_ENTER(env, that, cairo_1surface_1set_1device_1offset_FUNC); -+ cairo_surface_set_device_offset((cairo_surface_t *)arg0, arg1, arg2); -+ Cairo_NATIVE_EXIT(env, that, cairo_1surface_1set_1device_1offset_FUNC); - } - #endif - --#ifndef NO_cairo_1surface_1set_1repeat --JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1set_1repeat) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+#ifndef NO_cairo_1surface_1set_1user_1data -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1set_1user_1data) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3) - { - jint rc = 0; -- Cairo_NATIVE_ENTER(env, that, cairo_1surface_1set_1repeat_FUNC); -- rc = (jint)cairo_surface_set_repeat((cairo_surface_t *)arg0, arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1surface_1set_1repeat_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1surface_1set_1user_1data_FUNC); -+ rc = (jint)cairo_surface_set_user_data((cairo_surface_t *)arg0, (cairo_user_data_key_t *)arg1, (void *)arg2, (cairo_destroy_func_t)arg3); -+ Cairo_NATIVE_EXIT(env, that, cairo_1surface_1set_1user_1data_FUNC); - return rc; - } - #endif -@@ -1405,57 +1540,61 @@ - } - #endif - --#ifndef NO_cairo_1transform_1distance --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1transform_1distance) -- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) -+#ifndef NO_cairo_1transform -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1transform) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1) - { - jdouble *lparg1=NULL; -- jdouble *lparg2=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1transform_1distance_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1transform_FUNC); - if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -- if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- cairo_transform_distance((cairo_t *)arg0, lparg1, lparg2); -+ cairo_transform((cairo_t *)arg0, (cairo_matrix_t *)lparg1); - fail: -- if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1transform_1distance_FUNC); -+ Cairo_NATIVE_EXIT(env, that, cairo_1transform_FUNC); - } - #endif - --#ifndef NO_cairo_1transform_1font --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1transform_1font) -- (JNIEnv *env, jclass that, jint arg0, jint arg1) -+#ifndef NO_cairo_1translate -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1translate) -+ (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1transform_1font_FUNC); -- cairo_transform_font((cairo_t *)arg0, (cairo_matrix_t *)arg1); -- Cairo_NATIVE_EXIT(env, that, cairo_1transform_1font_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1translate_FUNC); -+ cairo_translate((cairo_t *)arg0, arg1, arg2); -+ Cairo_NATIVE_EXIT(env, that, cairo_1translate_FUNC); - } - #endif - --#ifndef NO_cairo_1transform_1point --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1transform_1point) -+#ifndef NO_cairo_1user_1to_1device -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1user_1to_1device) - (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) - { - jdouble *lparg1=NULL; - jdouble *lparg2=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1transform_1point_FUNC); -+ Cairo_NATIVE_ENTER(env, that, cairo_1user_1to_1device_FUNC); - if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -- cairo_transform_point((cairo_t *)arg0, lparg1, lparg2); -+ cairo_user_to_device((cairo_t *)arg0, lparg1, lparg2); - fail: - if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1transform_1point_FUNC); -+ Cairo_NATIVE_EXIT(env, that, cairo_1user_1to_1device_FUNC); - } - #endif - --#ifndef NO_cairo_1translate --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1translate) -- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2) -+#ifndef NO_cairo_1user_1to_1device_1distance -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1user_1to_1device_1distance) -+ (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2) - { -- Cairo_NATIVE_ENTER(env, that, cairo_1translate_FUNC); -- cairo_translate((cairo_t *)arg0, arg1, arg2); -- Cairo_NATIVE_EXIT(env, that, cairo_1translate_FUNC); -+ jdouble *lparg1=NULL; -+ jdouble *lparg2=NULL; -+ Cairo_NATIVE_ENTER(env, that, cairo_1user_1to_1device_1distance_FUNC); -+ if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -+ cairo_user_to_device_distance((cairo_t *)arg0, lparg1, lparg2); -+fail: -+ if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); -+ if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -+ Cairo_NATIVE_EXIT(env, that, cairo_1user_1to_1device_1distance_FUNC); - } - #endif - -@@ -1465,9 +1604,73 @@ - { - jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1xlib_1surface_1create_FUNC); -- rc = (jint)cairo_xlib_surface_create((Display *)arg0, (Drawable)arg1, (Visual *)arg2, arg3, (Colormap)arg4); -+ rc = (jint)cairo_xlib_surface_create((Display *)arg0, (Drawable)arg1, (Visual *)arg2, arg3, arg4); - Cairo_NATIVE_EXIT(env, that, cairo_1xlib_1surface_1create_FUNC); - return rc; -+} -+#endif -+ -+#ifndef NO_cairo_1xlib_1surface_1create_1for_1bitmap -+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1xlib_1surface_1create_1for_1bitmap) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4) -+{ -+ jint rc = 0; -+ Cairo_NATIVE_ENTER(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC); -+ rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4); -+ Cairo_NATIVE_EXIT(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC); -+ return rc; -+} -+#endif -+ -+#ifndef NO_cairo_1xlib_1surface_1set_1size -+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1xlib_1surface_1set_1size) -+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) -+{ -+ Cairo_NATIVE_ENTER(env, that, cairo_1xlib_1surface_1set_1size_FUNC); -+ cairo_xlib_surface_set_size((cairo_surface_t *)arg0, arg1, arg2); -+ Cairo_NATIVE_EXIT(env, that, cairo_1xlib_1surface_1set_1size_FUNC); -+} -+#endif -+ -+#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II -+JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II) -+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2) -+{ -+ cairo_path_data_t _arg0, *lparg0=NULL; -+ Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC); -+ if (arg0) if ((lparg0 = getcairo_path_data_tFields(env, arg0, &_arg0)) == NULL) goto fail; -+ memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); -+fail: -+ if (arg0 && lparg0) setcairo_path_data_tFields(env, arg0, lparg0); -+ Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC); -+} -+#endif -+ -+#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II -+JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II) -+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2) -+{ -+ cairo_path_t _arg0, *lparg0=NULL; -+ Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC); -+ if (arg0) if ((lparg0 = getcairo_path_tFields(env, arg0, &_arg0)) == NULL) goto fail; -+ memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); -+fail: -+ if (arg0 && lparg0) setcairo_path_tFields(env, arg0, lparg0); -+ Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC); -+} -+#endif -+ -+#ifndef NO_memmove___3DII -+JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DII) -+ (JNIEnv *env, jclass that, jdoubleArray arg0, jint arg1, jint arg2) -+{ -+ jdouble *lparg0=NULL; -+ Cairo_NATIVE_ENTER(env, that, memmove___3DII_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; -+ memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); -+ Cairo_NATIVE_EXIT(env, that, memmove___3DII_FUNC); - } - #endif - -diff -uN plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo.h plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h ---- plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo.h Thu Aug 18 12:34:57 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h Thu Aug 18 12:35:19 2005 -@@ -24,5 +24,6 @@ - - #include <cairo.h> - #include <cairo-xlib.h> -+#include <string.h> - - #endif /* INC_cairo_H */ -diff -uN plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_custom.c plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.c ---- plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_custom.c Thu Aug 18 12:34:57 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.c Thu Jan 1 01:00:00 1970 -@@ -1,179 +0,0 @@ --/* ***** BEGIN LICENSE BLOCK ***** -- * Version: MPL 1.1 -- * -- * The contents of this file are subject to the Mozilla Public License Version -- * 1.1 (the "License"); you may not use this file except in compliance with -- * the License. You may obtain a copy of the License at -- * http://www.mozilla.org/MPL/ -- * -- * Software distributed under the License is distributed on an "AS IS" basis, -- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -- * for the specific language governing rights and limitations under the -- * License. -- * -- * Contributor(s): -- * -- * IBM -- * - Binding to permit interfacing between Cairo and SWT -- * - Copyright (C) 2005 IBM Corp. All Rights Reserved. -- * -- * ***** END LICENSE BLOCK ***** */ -- --#include "swt.h" --#include "cairo_structs.h" --#include "cairo_stats.h" -- --#define Cairo_NATIVE(func) Java_org_eclipse_swt_internal_cairo_Cairo_##func -- --#ifndef NO_cairo_1add_1path --static void moveTo(cairo_t *cairo, double x, double y) { -- cairo_move_to(cairo, x, y); --} -- --static void lineTo(cairo_t *cairo, double x, double y) { -- cairo_line_to(cairo, x, y); --} -- --static void curveTo(cairo_t *cairo, double x1, double y1, double x2, double y2, double x3, double y3) { -- cairo_curve_to(cairo, x1, y1, x2, y2, x3, y3); --} -- --static void closePath(cairo_t *cairo) { -- cairo_close_path(cairo); --} -- --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1add_1path) -- (JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR arg1) --{ -- Cairo_NATIVE_ENTER(env, that, cairo_1add_1path_FUNC); -- cairo_new_path((cairo_t *)arg0); -- cairo_current_path((cairo_t *)arg1, (cairo_move_to_func_t *)moveTo, (cairo_line_to_func_t *)lineTo, (cairo_curve_to_func_t *)curveTo, (cairo_close_path_func_t *)closePath, (void *)arg0); -- Cairo_NATIVE_EXIT(env, that, cairo_1add_1path_FUNC); --} --#endif -- --#ifndef NO_cairo_1extents --#include <float.h> --#define EXTENTS(x, y, extents) \ -- if (x < extents[0]) extents[0] = x; \ -- if (y < extents[1]) extents[1] = y; \ -- if (x > extents[2]) extents[2] = x; \ -- if (y > extents[3]) extents[3] = y; -- --static void extentsMoveTo(jdouble *extents, double x, double y) { -- EXTENTS(x, y, extents) --} -- --static void extentsLineTo(jdouble *extents, double x, double y) { -- EXTENTS(x, y, extents) --} -- --static void extentsCurveTo(jdouble *extents, double x1, double y1, double x2, double y2, double x3, double y3) { -- EXTENTS(x1, y1, extents) -- EXTENTS(x2, y2, extents) -- EXTENTS(x3, y3, extents) --} -- --static void extentsClosePath(jdouble *extents) { --} -- --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1extents) -- (JNIEnv *env, jclass that, SWT_PTR arg0, jdoubleArray arg1) --{ -- jdouble *lparg1=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1extents_FUNC); -- if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; -- lparg1[0] = lparg1[1] = DBL_MAX; -- lparg1[2] = lparg1[3] = DBL_MIN; -- cairo_current_path((cairo_t *)arg0, (cairo_move_to_func_t *)extentsMoveTo, (cairo_line_to_func_t *)extentsLineTo, (cairo_curve_to_func_t *)extentsCurveTo, (cairo_close_path_func_t *)extentsClosePath, (void *)lparg1); -- if (lparg1[0] == lparg1[1] && lparg1[0] == DBL_MAX) lparg1[0] = lparg1[1] = 0; -- if (lparg1[2] == lparg1[3] && lparg1[2] == DBL_MAX) lparg1[2] = lparg1[3] = 0; --fail: -- if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1extents_FUNC); --} --#endif -- --#ifndef NO_cairo_1points --#define PATH_MOVE_TO 1 --#define PATH_LINE_TO 2 --#define PATH_QUAD_TO 3 --#define PATH_CUBIC_TO 4 --#define PATH_CLOSE 5 --typedef struct _points_data { -- jint *n_types; -- jint *n_points; -- jbyte *types; -- jfloat *points; --} points_data; -- --static void pointsMoveTo(points_data *data, double x, double y) { -- if (data->types != NULL) data->types[data->n_types[0]] = PATH_MOVE_TO; -- if (data->points != NULL) { -- int offset = data->n_points[0] * 2; -- data->points[offset] = x; -- data->points[offset + 1] = y; -- } -- data->n_types[0]++; -- data->n_points[0]++; --} -- --static void pointsLineTo(points_data *data, double x, double y) { -- if (data->types != NULL) data->types[data->n_types[0]] = PATH_LINE_TO; -- if (data->points != NULL) { -- int offset = data->n_points[0] * 2; -- data->points[offset] = x; -- data->points[offset + 1] = y; -- } -- data->n_types[0]++; -- data->n_points[0]++; --} -- --static void pointsCurveTo(points_data *data, double x1, double y1, double x2, double y2, double x3, double y3) { -- if (data->types != NULL) data->types[data->n_types[0]] = PATH_CUBIC_TO; -- if (data->points != NULL) { -- int offset = data->n_points[0] * 2; -- data->points[offset] = x1; -- data->points[offset + 1] = y1; -- data->points[offset + 2] = x2; -- data->points[offset + 3] = y2; -- data->points[offset + 4] = x3; -- data->points[offset + 5] = y3; -- } -- data->n_types[0]++; -- data->n_points[0] += 3; --} -- --static void pointsClosePath(points_data *data) { -- if (data->types != NULL) data->types[data->n_types[0]] = PATH_CLOSE; -- data->n_types[0]++; --} -- --JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1points) -- (JNIEnv *env, jclass that, SWT_PTR arg0, jintArray arg1, jintArray arg2, jbyteArray arg3, jfloatArray arg4) --{ -- points_data data; -- jint *lparg1=NULL; -- jint *lparg2=NULL; -- jbyte *lparg3=NULL; -- jfloat *lparg4=NULL; -- Cairo_NATIVE_ENTER(env, that, cairo_1points_FUNC); -- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail; -- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; -- if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; -- if (arg4) if ((lparg4 = (*env)->GetFloatArrayElements(env, arg4, NULL)) == NULL) goto fail; -- data.n_types = lparg1; -- data.n_points = lparg2; -- data.types = lparg3; -- data.points = lparg4; -- data.n_types[0] = data.n_points[0] = 0; -- cairo_current_path((cairo_t *)arg0, (cairo_move_to_func_t *)pointsMoveTo, (cairo_line_to_func_t *)pointsLineTo, (cairo_curve_to_func_t *)pointsCurveTo, (cairo_close_path_func_t *)pointsClosePath, (void *)&data); --fail: -- if (arg4 && lparg4) (*env)->ReleaseFloatArrayElements(env, arg4, lparg4, 0); -- if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); -- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); -- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0); -- Cairo_NATIVE_EXIT(env, that, cairo_1points_FUNC); --} --#endif -- -diff -uN plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_stats.c plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c ---- plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_stats.c Thu Aug 18 12:34:57 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c Thu Aug 18 12:35:19 2005 -@@ -24,71 +24,80 @@ - - #ifdef NATIVE_STATS - --int Cairo_nativeFunctionCount = 125; --int Cairo_nativeFunctionCallCount[125]; -+int Cairo_nativeFunctionCount = 138; -+int Cairo_nativeFunctionCallCount[138]; - char * Cairo_nativeFunctionNames[] = { -- "cairo_1add_1path", -+ "cairo_1append_1path", - "cairo_1arc", - "cairo_1arc_1negative", - "cairo_1clip", -+ "cairo_1clip_1preserve", - "cairo_1close_1path", -- "cairo_1concat_1matrix", -- "cairo_1copy", - "cairo_1copy_1page", -+ "cairo_1copy_1path", -+ "cairo_1copy_1path_1flat", - "cairo_1create", -- "cairo_1current_1alpha", -- "cairo_1current_1fill_1rule", -- "cairo_1current_1font", -- "cairo_1current_1font_1extents", -- "cairo_1current_1line_1cap", -- "cairo_1current_1line_1join", -- "cairo_1current_1line_1width", -- "cairo_1current_1matrix", -- "cairo_1current_1miter_1limit", -- "cairo_1current_1operator", -- "cairo_1current_1path", -- "cairo_1current_1path_1flat", -- "cairo_1current_1pattern", -- "cairo_1current_1point", -- "cairo_1current_1rgb_1color", -- "cairo_1current_1target_1surface", -- "cairo_1current_1tolerance", - "cairo_1curve_1to", -- "cairo_1default_1matrix", - "cairo_1destroy", -- "cairo_1extents", -+ "cairo_1device_1to_1user", -+ "cairo_1device_1to_1user_1distance", - "cairo_1fill", - "cairo_1fill_1extents", -- "cairo_1font_1destroy", -+ "cairo_1fill_1preserve", -+ "cairo_1font_1extents", - "cairo_1font_1extents_1t_1sizeof", -- "cairo_1font_1reference", -+ "cairo_1font_1options_1create", -+ "cairo_1font_1options_1destroy", -+ "cairo_1font_1options_1get_1antialias", -+ "cairo_1font_1options_1set_1antialias", -+ "cairo_1get_1antialias", -+ "cairo_1get_1current_1point", -+ "cairo_1get_1fill_1rule", -+ "cairo_1get_1font_1face", -+ "cairo_1get_1font_1matrix", -+ "cairo_1get_1font_1options", -+ "cairo_1get_1line_1cap", -+ "cairo_1get_1line_1join", -+ "cairo_1get_1line_1width", -+ "cairo_1get_1matrix", -+ "cairo_1get_1miter_1limit", -+ "cairo_1get_1operator", -+ "cairo_1get_1source", -+ "cairo_1get_1target", -+ "cairo_1get_1tolerance", - "cairo_1glyph_1extents", - "cairo_1glyph_1path", - "cairo_1identity_1matrix", - "cairo_1image_1surface_1create", - "cairo_1image_1surface_1create_1for_1data", -+ "cairo_1image_1surface_1get_1height", -+ "cairo_1image_1surface_1get_1width", - "cairo_1in_1fill", - "cairo_1in_1stroke", -- "cairo_1init_1clip", -- "cairo_1inverse_1transform_1distance", -- "cairo_1inverse_1transform_1point", - "cairo_1line_1to", -- "cairo_1matrix_1copy", -- "cairo_1matrix_1create", -- "cairo_1matrix_1destroy", -- "cairo_1matrix_1get_1affine", -+ "cairo_1mask", -+ "cairo_1mask_1surface", -+ "cairo_1matrix_1init", -+ "cairo_1matrix_1init_1identity", -+ "cairo_1matrix_1init_1rotate", -+ "cairo_1matrix_1init_1scale", -+ "cairo_1matrix_1init_1translate", - "cairo_1matrix_1invert", - "cairo_1matrix_1multiply", - "cairo_1matrix_1rotate", - "cairo_1matrix_1scale", -- "cairo_1matrix_1set_1affine", -- "cairo_1matrix_1set_1identity", - "cairo_1matrix_1transform_1distance", - "cairo_1matrix_1transform_1point", - "cairo_1matrix_1translate", - "cairo_1move_1to", - "cairo_1new_1path", -- "cairo_1pattern_1add_1color_1stop", -+ "cairo_1paint", -+ "cairo_1paint_1with_1alpha", -+ "cairo_1path_1data_1t_1sizeof", -+ "cairo_1path_1destroy", -+ "cairo_1path_1t_1sizeof", -+ "cairo_1pattern_1add_1color_1stop_1rgb", -+ "cairo_1pattern_1add_1color_1stop_1rgba", - "cairo_1pattern_1create_1for_1surface", - "cairo_1pattern_1create_1linear", - "cairo_1pattern_1create_1radial", -@@ -100,58 +109,62 @@ - "cairo_1pattern_1set_1extend", - "cairo_1pattern_1set_1filter", - "cairo_1pattern_1set_1matrix", -- "cairo_1points", - "cairo_1rectangle", - "cairo_1reference", - "cairo_1rel_1curve_1to", - "cairo_1rel_1line_1to", - "cairo_1rel_1move_1to", -+ "cairo_1reset_1clip", - "cairo_1restore", - "cairo_1rotate", - "cairo_1save", - "cairo_1scale", -- "cairo_1scale_1font", -- "cairo_1select_1font", -- "cairo_1set_1alpha", -+ "cairo_1select_1font_1face", -+ "cairo_1set_1antialias", - "cairo_1set_1dash", - "cairo_1set_1fill_1rule", -- "cairo_1set_1font", -+ "cairo_1set_1font_1face", -+ "cairo_1set_1font_1matrix", -+ "cairo_1set_1font_1options", -+ "cairo_1set_1font_1size", - "cairo_1set_1line_1cap", - "cairo_1set_1line_1join", - "cairo_1set_1line_1width", - "cairo_1set_1matrix", - "cairo_1set_1miter_1limit", - "cairo_1set_1operator", -- "cairo_1set_1pattern", -- "cairo_1set_1rgb_1color", -- "cairo_1set_1target_1drawable", -- "cairo_1set_1target_1image", -- "cairo_1set_1target_1surface", -+ "cairo_1set_1source", -+ "cairo_1set_1source_1rgb", -+ "cairo_1set_1source_1rgba", -+ "cairo_1set_1source_1surface", - "cairo_1set_1tolerance", - "cairo_1show_1glyphs", - "cairo_1show_1page", -- "cairo_1show_1surface", - "cairo_1show_1text", - "cairo_1status", -- "cairo_1status_1string", -+ "cairo_1status_1to_1string", - "cairo_1stroke", - "cairo_1stroke_1extents", -- "cairo_1surface_1create_1for_1image", -+ "cairo_1stroke_1preserve", - "cairo_1surface_1create_1similar", - "cairo_1surface_1destroy", -- "cairo_1surface_1get_1filter", -- "cairo_1surface_1get_1matrix", -+ "cairo_1surface_1finish", -+ "cairo_1surface_1get_1user_1data", - "cairo_1surface_1reference", -- "cairo_1surface_1set_1filter", -- "cairo_1surface_1set_1matrix", -- "cairo_1surface_1set_1repeat", -+ "cairo_1surface_1set_1device_1offset", -+ "cairo_1surface_1set_1user_1data", - "cairo_1text_1extents", - "cairo_1text_1path", -- "cairo_1transform_1distance", -- "cairo_1transform_1font", -- "cairo_1transform_1point", -+ "cairo_1transform", - "cairo_1translate", -+ "cairo_1user_1to_1device", -+ "cairo_1user_1to_1device_1distance", - "cairo_1xlib_1surface_1create", -+ "cairo_1xlib_1surface_1create_1for_1bitmap", -+ "cairo_1xlib_1surface_1set_1size", -+ "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II", -+ "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II", -+ "memmove___3DII", - }; - - #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func -diff -uN plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_stats.h plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h ---- plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_stats.h Thu Aug 18 12:34:57 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h Thu Aug 18 12:35:19 2005 -@@ -31,68 +31,77 @@ - #endif - - typedef enum { -- cairo_1add_1path_FUNC, -+ cairo_1append_1path_FUNC, - cairo_1arc_FUNC, - cairo_1arc_1negative_FUNC, - cairo_1clip_FUNC, -+ cairo_1clip_1preserve_FUNC, - cairo_1close_1path_FUNC, -- cairo_1concat_1matrix_FUNC, -- cairo_1copy_FUNC, - cairo_1copy_1page_FUNC, -+ cairo_1copy_1path_FUNC, -+ cairo_1copy_1path_1flat_FUNC, - cairo_1create_FUNC, -- cairo_1current_1alpha_FUNC, -- cairo_1current_1fill_1rule_FUNC, -- cairo_1current_1font_FUNC, -- cairo_1current_1font_1extents_FUNC, -- cairo_1current_1line_1cap_FUNC, -- cairo_1current_1line_1join_FUNC, -- cairo_1current_1line_1width_FUNC, -- cairo_1current_1matrix_FUNC, -- cairo_1current_1miter_1limit_FUNC, -- cairo_1current_1operator_FUNC, -- cairo_1current_1path_FUNC, -- cairo_1current_1path_1flat_FUNC, -- cairo_1current_1pattern_FUNC, -- cairo_1current_1point_FUNC, -- cairo_1current_1rgb_1color_FUNC, -- cairo_1current_1target_1surface_FUNC, -- cairo_1current_1tolerance_FUNC, - cairo_1curve_1to_FUNC, -- cairo_1default_1matrix_FUNC, - cairo_1destroy_FUNC, -- cairo_1extents_FUNC, -+ cairo_1device_1to_1user_FUNC, -+ cairo_1device_1to_1user_1distance_FUNC, - cairo_1fill_FUNC, - cairo_1fill_1extents_FUNC, -- cairo_1font_1destroy_FUNC, -+ cairo_1fill_1preserve_FUNC, -+ cairo_1font_1extents_FUNC, - cairo_1font_1extents_1t_1sizeof_FUNC, -- cairo_1font_1reference_FUNC, -+ cairo_1font_1options_1create_FUNC, -+ cairo_1font_1options_1destroy_FUNC, -+ cairo_1font_1options_1get_1antialias_FUNC, -+ cairo_1font_1options_1set_1antialias_FUNC, -+ cairo_1get_1antialias_FUNC, -+ cairo_1get_1current_1point_FUNC, -+ cairo_1get_1fill_1rule_FUNC, -+ cairo_1get_1font_1face_FUNC, -+ cairo_1get_1font_1matrix_FUNC, -+ cairo_1get_1font_1options_FUNC, -+ cairo_1get_1line_1cap_FUNC, -+ cairo_1get_1line_1join_FUNC, -+ cairo_1get_1line_1width_FUNC, -+ cairo_1get_1matrix_FUNC, -+ cairo_1get_1miter_1limit_FUNC, -+ cairo_1get_1operator_FUNC, -+ cairo_1get_1source_FUNC, -+ cairo_1get_1target_FUNC, -+ cairo_1get_1tolerance_FUNC, - cairo_1glyph_1extents_FUNC, - cairo_1glyph_1path_FUNC, - cairo_1identity_1matrix_FUNC, - cairo_1image_1surface_1create_FUNC, - cairo_1image_1surface_1create_1for_1data_FUNC, -+ cairo_1image_1surface_1get_1height_FUNC, -+ cairo_1image_1surface_1get_1width_FUNC, - cairo_1in_1fill_FUNC, - cairo_1in_1stroke_FUNC, -- cairo_1init_1clip_FUNC, -- cairo_1inverse_1transform_1distance_FUNC, -- cairo_1inverse_1transform_1point_FUNC, - cairo_1line_1to_FUNC, -- cairo_1matrix_1copy_FUNC, -- cairo_1matrix_1create_FUNC, -- cairo_1matrix_1destroy_FUNC, -- cairo_1matrix_1get_1affine_FUNC, -+ cairo_1mask_FUNC, -+ cairo_1mask_1surface_FUNC, -+ cairo_1matrix_1init_FUNC, -+ cairo_1matrix_1init_1identity_FUNC, -+ cairo_1matrix_1init_1rotate_FUNC, -+ cairo_1matrix_1init_1scale_FUNC, -+ cairo_1matrix_1init_1translate_FUNC, - cairo_1matrix_1invert_FUNC, - cairo_1matrix_1multiply_FUNC, - cairo_1matrix_1rotate_FUNC, - cairo_1matrix_1scale_FUNC, -- cairo_1matrix_1set_1affine_FUNC, -- cairo_1matrix_1set_1identity_FUNC, - cairo_1matrix_1transform_1distance_FUNC, - cairo_1matrix_1transform_1point_FUNC, - cairo_1matrix_1translate_FUNC, - cairo_1move_1to_FUNC, - cairo_1new_1path_FUNC, -- cairo_1pattern_1add_1color_1stop_FUNC, -+ cairo_1paint_FUNC, -+ cairo_1paint_1with_1alpha_FUNC, -+ cairo_1path_1data_1t_1sizeof_FUNC, -+ cairo_1path_1destroy_FUNC, -+ cairo_1path_1t_1sizeof_FUNC, -+ cairo_1pattern_1add_1color_1stop_1rgb_FUNC, -+ cairo_1pattern_1add_1color_1stop_1rgba_FUNC, - cairo_1pattern_1create_1for_1surface_FUNC, - cairo_1pattern_1create_1linear_FUNC, - cairo_1pattern_1create_1radial_FUNC, -@@ -104,56 +113,60 @@ - cairo_1pattern_1set_1extend_FUNC, - cairo_1pattern_1set_1filter_FUNC, - cairo_1pattern_1set_1matrix_FUNC, -- cairo_1points_FUNC, - cairo_1rectangle_FUNC, - cairo_1reference_FUNC, - cairo_1rel_1curve_1to_FUNC, - cairo_1rel_1line_1to_FUNC, - cairo_1rel_1move_1to_FUNC, -+ cairo_1reset_1clip_FUNC, - cairo_1restore_FUNC, - cairo_1rotate_FUNC, - cairo_1save_FUNC, - cairo_1scale_FUNC, -- cairo_1scale_1font_FUNC, -- cairo_1select_1font_FUNC, -- cairo_1set_1alpha_FUNC, -+ cairo_1select_1font_1face_FUNC, -+ cairo_1set_1antialias_FUNC, - cairo_1set_1dash_FUNC, - cairo_1set_1fill_1rule_FUNC, -- cairo_1set_1font_FUNC, -+ cairo_1set_1font_1face_FUNC, -+ cairo_1set_1font_1matrix_FUNC, -+ cairo_1set_1font_1options_FUNC, -+ cairo_1set_1font_1size_FUNC, - cairo_1set_1line_1cap_FUNC, - cairo_1set_1line_1join_FUNC, - cairo_1set_1line_1width_FUNC, - cairo_1set_1matrix_FUNC, - cairo_1set_1miter_1limit_FUNC, - cairo_1set_1operator_FUNC, -- cairo_1set_1pattern_FUNC, -- cairo_1set_1rgb_1color_FUNC, -- cairo_1set_1target_1drawable_FUNC, -- cairo_1set_1target_1image_FUNC, -- cairo_1set_1target_1surface_FUNC, -+ cairo_1set_1source_FUNC, -+ cairo_1set_1source_1rgb_FUNC, -+ cairo_1set_1source_1rgba_FUNC, -+ cairo_1set_1source_1surface_FUNC, - cairo_1set_1tolerance_FUNC, - cairo_1show_1glyphs_FUNC, - cairo_1show_1page_FUNC, -- cairo_1show_1surface_FUNC, - cairo_1show_1text_FUNC, - cairo_1status_FUNC, -- cairo_1status_1string_FUNC, -+ cairo_1status_1to_1string_FUNC, - cairo_1stroke_FUNC, - cairo_1stroke_1extents_FUNC, -- cairo_1surface_1create_1for_1image_FUNC, -+ cairo_1stroke_1preserve_FUNC, - cairo_1surface_1create_1similar_FUNC, - cairo_1surface_1destroy_FUNC, -- cairo_1surface_1get_1filter_FUNC, -- cairo_1surface_1get_1matrix_FUNC, -+ cairo_1surface_1finish_FUNC, -+ cairo_1surface_1get_1user_1data_FUNC, - cairo_1surface_1reference_FUNC, -- cairo_1surface_1set_1filter_FUNC, -- cairo_1surface_1set_1matrix_FUNC, -- cairo_1surface_1set_1repeat_FUNC, -+ cairo_1surface_1set_1device_1offset_FUNC, -+ cairo_1surface_1set_1user_1data_FUNC, - cairo_1text_1extents_FUNC, - cairo_1text_1path_FUNC, -- cairo_1transform_1distance_FUNC, -- cairo_1transform_1font_FUNC, -- cairo_1transform_1point_FUNC, -+ cairo_1transform_FUNC, - cairo_1translate_FUNC, -+ cairo_1user_1to_1device_FUNC, -+ cairo_1user_1to_1device_1distance_FUNC, - cairo_1xlib_1surface_1create_FUNC, -+ cairo_1xlib_1surface_1create_1for_1bitmap_FUNC, -+ cairo_1xlib_1surface_1set_1size_FUNC, -+ memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC, -+ memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC, -+ memmove___3DII_FUNC, - } Cairo_FUNCS; -diff -uN plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_structs.c plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c ---- plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_structs.c Thu Aug 18 12:34:57 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c Thu Aug 18 12:35:19 2005 -@@ -65,3 +65,74 @@ - } - #endif - -+#ifndef NO_cairo_path_data_t -+typedef struct cairo_path_data_t_FID_CACHE { -+ int cached; -+ jclass clazz; -+ jfieldID type, length; -+} cairo_path_data_t_FID_CACHE; -+ -+cairo_path_data_t_FID_CACHE cairo_path_data_tFc; -+ -+void cachecairo_path_data_tFields(JNIEnv *env, jobject lpObject) -+{ -+ if (cairo_path_data_tFc.cached) return; -+ cairo_path_data_tFc.clazz = (*env)->GetObjectClass(env, lpObject); -+ cairo_path_data_tFc.type = (*env)->GetFieldID(env, cairo_path_data_tFc.clazz, "type", "I"); -+ cairo_path_data_tFc.length = (*env)->GetFieldID(env, cairo_path_data_tFc.clazz, "length", "I"); -+ cairo_path_data_tFc.cached = 1; -+} -+ -+cairo_path_data_t *getcairo_path_data_tFields(JNIEnv *env, jobject lpObject, cairo_path_data_t *lpStruct) -+{ -+ if (!cairo_path_data_tFc.cached) cachecairo_path_data_tFields(env, lpObject); -+ lpStruct->header.type = (*env)->GetIntField(env, lpObject, cairo_path_data_tFc.type); -+ lpStruct->header.length = (*env)->GetIntField(env, lpObject, cairo_path_data_tFc.length); -+ return lpStruct; -+} -+ -+void setcairo_path_data_tFields(JNIEnv *env, jobject lpObject, cairo_path_data_t *lpStruct) -+{ -+ if (!cairo_path_data_tFc.cached) cachecairo_path_data_tFields(env, lpObject); -+ (*env)->SetIntField(env, lpObject, cairo_path_data_tFc.type, (jint)lpStruct->header.type); -+ (*env)->SetIntField(env, lpObject, cairo_path_data_tFc.length, (jint)lpStruct->header.length); -+} -+#endif -+ -+#ifndef NO_cairo_path_t -+typedef struct cairo_path_t_FID_CACHE { -+ int cached; -+ jclass clazz; -+ jfieldID status, data, num_data; -+} cairo_path_t_FID_CACHE; -+ -+cairo_path_t_FID_CACHE cairo_path_tFc; -+ -+void cachecairo_path_tFields(JNIEnv *env, jobject lpObject) -+{ -+ if (cairo_path_tFc.cached) return; -+ cairo_path_tFc.clazz = (*env)->GetObjectClass(env, lpObject); -+ cairo_path_tFc.status = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "status", "I"); -+ cairo_path_tFc.data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "data", "I"); -+ cairo_path_tFc.num_data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "num_data", "I"); -+ cairo_path_tFc.cached = 1; -+} -+ -+cairo_path_t *getcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t *lpStruct) -+{ -+ if (!cairo_path_tFc.cached) cachecairo_path_tFields(env, lpObject); -+ lpStruct->status = (*env)->GetIntField(env, lpObject, cairo_path_tFc.status); -+ lpStruct->data = (cairo_path_data_t *)(*env)->GetIntField(env, lpObject, cairo_path_tFc.data); -+ lpStruct->num_data = (*env)->GetIntField(env, lpObject, cairo_path_tFc.num_data); -+ return lpStruct; -+} -+ -+void setcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t *lpStruct) -+{ -+ if (!cairo_path_tFc.cached) cachecairo_path_tFields(env, lpObject); -+ (*env)->SetIntField(env, lpObject, cairo_path_tFc.status, (jint)lpStruct->status); -+ (*env)->SetIntField(env, lpObject, cairo_path_tFc.data, (jint)lpStruct->data); -+ (*env)->SetIntField(env, lpObject, cairo_path_tFc.num_data, (jint)lpStruct->num_data); -+} -+#endif -+ -diff -uN plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_structs.h plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h ---- plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library.orig/cairo_structs.h Thu Aug 18 12:34:57 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h Thu Aug 18 12:35:19 2005 -@@ -33,3 +33,27 @@ - #define cairo_font_extents_t_sizeof() 0 - #endif - -+#ifndef NO_cairo_path_data_t -+void cachecairo_path_data_tFields(JNIEnv *env, jobject lpObject); -+cairo_path_data_t *getcairo_path_data_tFields(JNIEnv *env, jobject lpObject, cairo_path_data_t *lpStruct); -+void setcairo_path_data_tFields(JNIEnv *env, jobject lpObject, cairo_path_data_t *lpStruct); -+#define cairo_path_data_t_sizeof() sizeof(cairo_path_data_t) -+#else -+#define cachecairo_path_data_tFields(a,b) -+#define getcairo_path_data_tFields(a,b,c) NULL -+#define setcairo_path_data_tFields(a,b,c) -+#define cairo_path_data_t_sizeof() 0 -+#endif -+ -+#ifndef NO_cairo_path_t -+void cachecairo_path_tFields(JNIEnv *env, jobject lpObject); -+cairo_path_t *getcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t *lpStruct); -+void setcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t *lpStruct); -+#define cairo_path_t_sizeof() sizeof(cairo_path_t) -+#else -+#define cachecairo_path_tFields(a,b) -+#define getcairo_path_tFields(a,b,c) NULL -+#define setcairo_path_tFields(a,b,c) -+#define cairo_path_t_sizeof() 0 -+#endif -+ diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh deleted file mode 100644 index f1829709a..000000000 --- a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh +++ /dev/null @@ -1,42 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Fri May 13 11:37:09 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Sat May 14 21:02:00 2005 -@@ -100,6 +100,33 @@ - ;; - esac - ;; -+ "FreeBSD") -+ CC=gcc -+ LD=gcc -+ XTEST_LIB_PATH=$X11BASE/lib -+ GECKO_I=`${GECKO_CONFIG} --cflags gtkmozembed` -+ GECKO_INCLUDES="-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring" -+ GECKO_L=`${GECKO_CONFIG} --libs gtkmozembed` -+ GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib" -+ case $MODEL in -+ "amd64") -+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 -+ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 -+ OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.amd64 -+ makefile="make_freebsd.mak" -+ echo "Building FreeBSD GTK AMD64 version of SWT" -+ ;; -+ "i386") -+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386 -+ OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.x86 -+ makefile="make_freebsd.mak" -+ echo "Building FreeBSD GTK x86 version of SWT" -+ ;; -+ *) -+ echo "*** Unknown MODEL <${MODEL}>" -+ ;; -+ esac -+ ;; - "SunOS") - CC=gcc - LD=gcc -@@ -128,4 +155,4 @@ - - export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR - --make -f $makefile ${1} ${2} ${3} ${4} -+gmake -f $makefile ${1} ${2} ${3} ${4} diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak deleted file mode 100644 index e474d7a4b..000000000 --- a/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak +++ /dev/null @@ -1,41 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig Sat May 14 19:50:23 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Sat May 14 21:24:34 2005 -@@ -70,7 +70,7 @@ - SWT_OBJECTS = swt.o callback.o - AWT_OBJECTS = swt_awt.o - SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o --CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o cairo_custom.o -+CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o - ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o - GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o - MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o -@@ -78,15 +78,16 @@ - CFLAGS = -O -Wall \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ -- -DLINUX -DGTK \ -+ -DFREEBSD -DGTK \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/freebsd \ -- -fpic \ -+ -I$(X11BASE)/include \ -+ -fpic -fPIC \ - ${SWT_PTR_CFLAGS} --LIBS = -shared -fpic -s -+LIBS = -shared -fpic -fPIC -s - - --all: make_swt make_atk make_gnome make_awt -+all: make_swt make_atk $(MAKE_GNOME) make_awt $(MAKE_MOZILLA) $(MAKE_CAIRO) - - # - # SWT libs -@@ -123,8 +124,6 @@ - - cairo.o: cairo.c cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c --cairo_custom.o: cairo_custom.c cairo_structs.h cairo.h swt.h -- $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_custom.c - cairo_structs.o: cairo_structs.c cairo_structs.h cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_structs.c - cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h b/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h deleted file mode 100644 index 0e47fc2a2..000000000 --- a/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h +++ /dev/null @@ -1,59 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h.orig Mon Jun 27 21:54:10 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h Thu Jul 14 20:28:19 2005 -@@ -21,31 +21,31 @@ - #define PTR_sizeof() sizeof(void *) - - /* Libraries for dynamic loaded functions */ --#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so.0" --#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0" --#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0" --#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0" --#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0" --#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0" --#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0" --#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so.0" -+#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so" -+#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so" -+#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so" -+#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so" -+#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so" -+#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so" -+#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so" -+#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so" -+#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so" -+#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so" -+#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so" - - /* Field accessors */ - #define GTK_ACCEL_LABEL_SET_ACCEL_STRING(arg0, arg1) (arg0)->accel_string = arg1 diff --git a/java/eclipse/files/manualpatch-plugins-swt-motif-build.sh b/java/eclipse/files/manualpatch-plugins-swt-motif-build.sh deleted file mode 100644 index 67f3e36be..000000000 --- a/java/eclipse/files/manualpatch-plugins-swt-motif-build.sh +++ /dev/null @@ -1,28 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh.orig Fri May 13 11:37:09 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh Sat May 14 21:03:05 2005 -@@ -54,6 +54,18 @@ - echo "Building Linux motif x86 version of SWT" - esac - ;; -+ "FreeBSD") -+ case $MODEL in -+ i?86) -+ OUTPUT_DIR=../../../org.eclipse.swt.motif.freebsd.x86 -+ makefile="make_freebsd.mak" -+ echo "Building FreeBSD motif x86 version of SWT" -+ ;; -+ *) -+ echo "*** Unknown MODEL <${MODEL}>" -+ ;; -+ esac -+ ;; - "SunOS") - case $MODEL in - *) -@@ -113,4 +125,4 @@ - - export JAVA_HOME MOTIF_HOME CDE_HOME OUTPUT_DIR - --make -f $makefile $1 $2 $3 $4 -\ No newline at end of file -+gmake -f $makefile $1 $2 $3 $4 diff --git a/java/eclipse/files/manualpatch-plugins-swt-motif-make_freebsd.mak b/java/eclipse/files/manualpatch-plugins-swt-motif-make_freebsd.mak deleted file mode 100644 index 2470de02e..000000000 --- a/java/eclipse/files/manualpatch-plugins-swt-motif-make_freebsd.mak +++ /dev/null @@ -1,44 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak.orig Thu Jul 14 20:06:19 2005 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak Thu Jul 14 20:14:57 2005 -@@ -25,26 +25,26 @@ - WS_PREFIX = motif - SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - SWT_OBJS = swt.o callback.o os.o os_structs.o os_custom.o os_stats.o --SWT_LIBS = -L$(MOTIF_HOME)/lib -lXm -L/usr/lib -L/usr/X11R6/lib \ -- -rpath . -x -shared -lX11 -lm -lXext -lXt -lXp -ldl -lXinerama -lXtst -+SWT_LIBS = -L$(MOTIF_HOME)/lib -lXm -L$(PREFIX)/lib -L$(X11BASE)/lib \ -+ -rpath . -x -shared -lX11 -lm -lXext -lXt -lXp -lXinerama - - # Uncomment for Native Stats tool - #NATIVE_STATS = -DNATIVE_STATS - --CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DMOTIF -fpic \ -- -I$(JAVA_HOME)/include -I$(MOTIF_HOME)/include -I/usr/X11R6/include -+CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DMOTIF -fpic -fPIC \ -+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(MOTIF_HOME)/include -I$(X11BASE)/include -I$(PREFIX)/include - - # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) - GNOME_PREFIX = swt-gnome - GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o --GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DGTK -I$(JAVA_HOME)/include `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -+GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -fpic -fPIC `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` - GNOME_LIBS = -shared -fpic -fPIC `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 - - AWT_PREFIX = swt-awt - AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - AWT_OBJS = swt_awt.o --AWT_LIBS = -L$(JAVA_HOME)/jre/bin -ljawt -shared -+AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(MACHINE_ARCH) -ljawt -shared - - GTK_PREFIX = swt-gtk - GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -@@ -77,7 +77,7 @@ - ${SWT_PTR_CFLAGS} - MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic ${GECKO_LIBS} - --all: make_swt make_awt make_gnome make_gtk -+all: make_swt make_awt $(MAKE_GNOME) make_gtk - - make_swt: $(SWT_LIB) - diff --git a/java/eclipse/files/patch-assemble b/java/eclipse/files/patch-assemble deleted file mode 100644 index 69143bf43..000000000 --- a/java/eclipse/files/patch-assemble +++ /dev/null @@ -1,39 +0,0 @@ ---- assemble.org.eclipse.sdk.linux.motif.x86.xml.orig Wed Jul 13 00:36:40 2005 -+++ assemble.org.eclipse.sdk.linux.motif.x86.xml Wed Jul 13 00:38:19 2005 -@@ -610,10 +610,5 @@ - </exec> - <move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/> - <gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/> -- <exec executable="rm"> -- <arg line="-rf"/> -- <arg line="'${assemblyTempDir}'"/> -- </exec> -- <delete dir="${assemblyTempDir}"/> - </target> - </project> ---- assemble.org.eclipse.sdk.linux.gtk.x86.xml.orig Wed Jul 13 00:40:52 2005 -+++ assemble.org.eclipse.sdk.linux.gtk.x86.xml Wed Jul 13 00:40:58 2005 -@@ -610,10 +610,5 @@ - </exec> - <move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/> - <gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/> -- <exec executable="rm"> -- <arg line="-rf"/> -- <arg line="'${assemblyTempDir}'"/> -- </exec> -- <delete dir="${assemblyTempDir}"/> - </target> - </project> ---- assemble.org.eclipse.sdk.linux.gtk.x86_64.xml.orig Wed Jul 13 00:43:03 2005 -+++ assemble.org.eclipse.sdk.linux.gtk.x86_64.xml Wed Jul 13 00:43:07 2005 -@@ -610,10 +610,5 @@ - </exec> - <move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/> - <gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/> -- <exec executable="rm"> -- <arg line="-rf"/> -- <arg line="'${assemblyTempDir}'"/> -- </exec> -- <delete dir="${assemblyTempDir}"/> - </target> - </project> diff --git a/java/eclipse/files/patch-build b/java/eclipse/files/patch-build deleted file mode 100644 index 3dbdaaa59..000000000 --- a/java/eclipse/files/patch-build +++ /dev/null @@ -1,11 +0,0 @@ ---- build.orig Wed Jul 13 00:45:46 2005 -+++ build Wed Jul 13 00:46:02 2005 -@@ -52,7 +52,7 @@ - exit 1 - fi - --if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] -+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-motif-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-amd64" ] - then - ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH - ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml diff --git a/java/eclipse/files/patch-build.bat b/java/eclipse/files/patch-build.bat deleted file mode 100644 index 27006ce8b..000000000 --- a/java/eclipse/files/patch-build.bat +++ /dev/null @@ -1,12 +0,0 @@ ---- build.bat.orig Mon Jun 27 21:55:26 2005 -+++ build.bat Sun Jul 17 18:21:31 2005 -@@ -44,6 +44,9 @@ - if %os%-%ws%-%arch%==qnx-photon-x86 goto run - if %os%-%ws%-%arch%==hpux-motif-ia64_32 goto run - if %os%-%ws%-%arch%==macosx-carbon-ppc goto run -+if %os%-%ws%-%arch%==freebsd-motif-x86 goto run -+if %os%-%ws%-%arch%==freebsd-gtk-x86 goto run -+if %os%-%ws%-%arch%==freebsd-gtk-amd64 goto run - - ECHO The ws os arch combination entered is not valid. - goto end diff --git a/java/eclipse/files/patch-build.xml b/java/eclipse/files/patch-build.xml deleted file mode 100644 index d9b351762..000000000 --- a/java/eclipse/files/patch-build.xml +++ /dev/null @@ -1,30 +0,0 @@ ---- build.xml.orig Mon Jun 27 21:55:26 2005 -+++ build.xml Sun Jul 17 18:50:50 2005 -@@ -63,11 +63,11 @@ - <!--unzip launcher --> - <property name="launcherlibs" value="${buildDirectory}/launchertmp" /> - <mkdir dir="${launcherlibs}" /> -- <unzip dest="${launcherlibs}"> -- <fileset dir="${buildDirectory}/plugins/org.eclipse.platform.source/src/"> -- <include name="org.eclipse.platform_*/launchersrc.zip" /> -+ <copy todir="${launcherlibs}"> -+ <fileset dir="${buildDirectory}/features/org.eclipse.platform.launchers"> -+ <include name ="**"/> - </fileset> -- </unzip> -+ </copy> - <exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true"> - <arg line="build.sh" /> - </exec> -@@ -265,7 +265,10 @@ - - <!--used to add doc plug-ins to result after initial assembly--> - <condition property="archive.format" value="tar"> -- <equals arg1="${installOs}" arg2="linux" /> -+ <or> -+ <equals arg1="${installOs}" arg2="linux" /> -+ <equals arg1="${installOs}" arg2="freebsd" /> -+ </or> - </condition> - <property name="archive.format" value="zip" /> - </target> diff --git a/java/eclipse/files/patch-features-jdt-build.xml b/java/eclipse/files/patch-features-jdt-build.xml deleted file mode 100644 index 05d56b033..000000000 --- a/java/eclipse/files/patch-features-jdt-build.xml +++ /dev/null @@ -1,27 +0,0 @@ ---- features/org.eclipse.jdt/build.xml.orig Fri May 13 11:34:52 2005 -+++ features/org.eclipse.jdt/build.xml Sat May 14 18:42:27 2005 -@@ -164,6 +164,24 @@ - <fileset dir="${basedir}/rootfiles" includes="**" /> - </copy> - </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ </copy> -+ </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ </copy> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ </copy> -+ </target> - <target name="rootFilessolaris_motif_sparc"> - <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/> - <copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true"> diff --git a/java/eclipse/files/patch-features-jdt-source-build.xml b/java/eclipse/files/patch-features-jdt-source-build.xml deleted file mode 100644 index 28af8014b..000000000 --- a/java/eclipse/files/patch-features-jdt-source-build.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- features/org.eclipse.jdt.source/build.xml.orig Sat Feb 19 12:09:34 2005 -+++ features/org.eclipse.jdt.source/build.xml Sat Mar 26 18:31:36 2005 -@@ -96,6 +96,12 @@ - </target> - <target name="rootFileslinux_motif_x86"> - </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> - <target name="rootFilessolaris_motif_sparc"> - </target> - <target name="rootFilessolaris_gtk_sparc"> diff --git a/java/eclipse/files/patch-features-launchers-gtk-build.sh b/java/eclipse/files/patch-features-launchers-gtk-build.sh deleted file mode 100644 index a3e68b8f3..000000000 --- a/java/eclipse/files/patch-features-launchers-gtk-build.sh +++ /dev/null @@ -1,41 +0,0 @@ ---- features/org.eclipse.platform.launchers/library/gtk/build.sh.orig Fri Apr 1 13:57:19 2005 -+++ features/org.eclipse.platform.launchers/library/gtk/build.sh Sun Apr 3 11:37:51 2005 -@@ -67,6 +67,23 @@ - ;; - esac - ;; -+ "FreeBSD") -+ makefile="make_freebsd.mak" -+ defaultOS="freebsd" -+ case $MODEL in -+ "amd64") -+ defaultOSArch="amd64" -+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" -+ ;; -+ "i386") -+ defaultOSArch="x86" -+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" -+ ;; -+ *) -+ echo "*** Unknown MODEL <${MODEL}>" -+ ;; -+ esac -+ ;; - "SunOS") - makefile="make_solaris.mak" - defaultOS="solaris" -@@ -112,11 +129,11 @@ - # If the OS is supported (a makefile exists) - if [ "$makefile" != "" ]; then - if [ "$extraArgs" != "" ]; then -- make -f $makefile $extraArgs -+ gmake -f $makefile $extraArgs - else - echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" -- make -f $makefile clean -- make -f $makefile all -+ gmake -f $makefile clean -+ gmake -f $makefile all - fi - else - echo "Unknown OS ($OS) -- build aborted" diff --git a/java/eclipse/files/patch-features-launchers-gtk-make_freebsd.mak b/java/eclipse/files/patch-features-launchers-gtk-make_freebsd.mak deleted file mode 100644 index 8fef6388c..000000000 --- a/java/eclipse/files/patch-features-launchers-gtk-make_freebsd.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- features/org.eclipse.platform.launchers/library/gtk/make_freebsd.mak.orig Sun Apr 17 20:24:58 2005 -+++ features/org.eclipse.platform.launchers/library/gtk/make_freebsd.mak Sun Apr 17 20:25:45 2005 -@@ -26,7 +26,7 @@ - CC=gcc - OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseGtk.o - EXEC = $(PROGRAM_OUTPUT) --LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -+LIBS = `pkg-config --libs gtk+-2.0` - CFLAGS = -O -s \ - -fpic \ - -DMOZILLA_FIX \ diff --git a/java/eclipse/files/patch-features-launchers-library-eclipseShm.c b/java/eclipse/files/patch-features-launchers-library-eclipseShm.c deleted file mode 100644 index f351472d9..000000000 --- a/java/eclipse/files/patch-features-launchers-library-eclipseShm.c +++ /dev/null @@ -1,17 +0,0 @@ ---- features/org.eclipse.platform.launchers/library/eclipseShm.c.orig Fri Apr 1 13:55:58 2005 -+++ features/org.eclipse.platform.launchers/library/eclipseShm.c Sun Apr 3 11:34:02 2005 -@@ -182,11 +182,13 @@ - - #else /* Unix like platforms */ - -+#include <machine/param.h> -+#include <sys/types.h> -+#include <sys/ipc.h> - #include <sys/shm.h> - #include <string.h> - #include <stdlib.h> - #include <stdio.h> --#include <sys/types.h> - #include <unistd.h> - - int createSharedData(char** id, int size) { diff --git a/java/eclipse/files/patch-features-launchers-motif-build.sh b/java/eclipse/files/patch-features-launchers-motif-build.sh deleted file mode 100644 index 3dfeb9174..000000000 --- a/java/eclipse/files/patch-features-launchers-motif-build.sh +++ /dev/null @@ -1,33 +0,0 @@ ---- features/org.eclipse.platform.launchers/library/motif/build.sh~ Sat Feb 19 12:13:49 2005 -+++ features/org.eclipse.platform.launchers/library/motif/build.sh Sun Mar 20 15:27:04 2005 -@@ -55,6 +55,15 @@ - MOTIF_HOME=/bluebird/teamswt/swt-builddir/motif21 - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" - ;; -+ "FreeBSD") -+ makefile="make_freebsd.mak" -+ defaultOS="freebsd" -+ defaultOSArch="x86" -+ defaultWS="motif" -+ X11_HOME=$X11BASE -+ MOTIF_HOME=$X11BASE -+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" -+ ;; - "SunOS") - makefile="make_solaris.mak" - defaultOS="solaris" -@@ -122,11 +131,11 @@ - # If the OS is supported (a makefile exists) - if [ "$makefile" != "" ]; then - if [ "$extraArgs" != "" ]; then -- make -f $makefile $extraArgs -+ gmake -f $makefile $extraArgs - else - echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" -- make -f $makefile clean -- make -f $makefile all -+ gmake -f $makefile clean -+ gmake -f $makefile all - fi - else - echo "Unknown OS ($OS) -- build aborted" diff --git a/java/eclipse/files/patch-features-pde-build.xml b/java/eclipse/files/patch-features-pde-build.xml deleted file mode 100644 index 9e1878054..000000000 --- a/java/eclipse/files/patch-features-pde-build.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- features/org.eclipse.pde/build.xml.orig Sat Feb 19 12:09:30 2005 -+++ features/org.eclipse.pde/build.xml Sat Mar 26 18:33:49 2005 -@@ -116,6 +116,12 @@ - </target> - <target name="rootFileslinux_motif_x86"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> - <target name="rootFilessolaris_motif_sparc"> - </target> - <target name="rootFilessolaris_gtk_sparc"> diff --git a/java/eclipse/files/patch-features-pde-source-build.xml b/java/eclipse/files/patch-features-pde-source-build.xml deleted file mode 100644 index 7318f68c0..000000000 --- a/java/eclipse/files/patch-features-pde-source-build.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- features/org.eclipse.pde.source/build.xml.orig Sat Feb 19 12:09:29 2005 -+++ features/org.eclipse.pde.source/build.xml Sat Mar 26 18:34:22 2005 -@@ -86,6 +86,12 @@ - </target> - <target name="rootFileslinux_motif_x86"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> - <target name="rootFilessolaris_motif_sparc"> - </target> - <target name="rootFilessolaris_gtk_sparc"> diff --git a/java/eclipse/files/patch-features-platform-build.xml b/java/eclipse/files/patch-features-platform-build.xml deleted file mode 100644 index 538f383d8..000000000 --- a/java/eclipse/files/patch-features-platform-build.xml +++ /dev/null @@ -1,97 +0,0 @@ ---- features/org.eclipse.platform/build.xml.orig Wed Jan 18 16:09:14 2006 -+++ features/org.eclipse.platform/build.xml Sun Jan 29 19:17:52 2006 -@@ -87,6 +87,11 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -@@ -117,6 +122,11 @@ - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.freebsd" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.win32" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -@@ -346,7 +356,7 @@ - <copy todir="${feature.base}/features/org.eclipse.platform_3.1.2" failonerror="true" overwrite="false"> - <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> - </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.freebsd,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.freebsd,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> -@@ -372,6 +382,19 @@ - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/about_files/freebsd.gtk.x86" includes="**" /> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**" /> -+ <fileset dir="${basedir}/gtk" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.x86" includes="libcairo.so.1" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> -+ </target> - <target name="rootFileslinux_gtk_ppc"> - <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true"> -@@ -407,6 +430,19 @@ - <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> - </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/about_files/freebsd.gtk.amd64" includes="**" /> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**" /> -+ <fileset dir="${basedir}/gtk" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.amd64" includes="libcairo.so.1" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> -+ </target> - <target name="rootFileslinux_gtk_ia64"> - <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true"> -@@ -431,6 +467,21 @@ - </copy> - <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/about_files/freebsd.motif.x86" includes="**" /> -+ <fileset dir="${basedir}/motif" includes="**" /> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/motif/freebsd/x86" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libXm.so.2" /> -+ <fileset dir="${basedir}/motif" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libcairo.so.1" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFilessolaris_motif_sparc"> - <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/> diff --git a/java/eclipse/files/patch-features-platform-source-build.xml b/java/eclipse/files/patch-features-platform-source-build.xml deleted file mode 100644 index 999ec9f46..000000000 --- a/java/eclipse/files/patch-features-platform-source-build.xml +++ /dev/null @@ -1,46 +0,0 @@ ---- features/org.eclipse.platform.source/build.xml.orig Wed Jan 18 16:09:14 2006 -+++ features/org.eclipse.platform.source/build.xml Sun Jan 29 19:36:36 2006 -@@ -72,6 +72,21 @@ - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.motif.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.amd64" target="${target}"> -+ <property name="arch" value="amd64"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.doc.isv" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -@@ -136,7 +151,7 @@ - <copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.2" failonerror="true" overwrite="false"> - <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> - </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="org.eclipse.rcp.source,3.1.2," pluginIds="org.eclipse.platform.doc.isv,3.1.2,org.eclipse.platform.source,3.1.2,org.eclipse.platform.source.linux.gtk.ia64,3.1.2,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.2,org.eclipse.platform.source.qnx.photon.x86,3.1.2,org.eclipse.platform.source.linux.gtk.ppc,3.1.2,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.platform.source.hpux.motif.ia64,3.1.2,org.eclipse.platform.source.linux.gtk.x86_64,3.1.2,org.eclipse.platform.source.linux.gtk.ppc64,3.1.2,org.eclipse.platform.source.macosx.carbon.ppc,3.1.2,org.eclipse.platform.source.linux.gtk.x86,3.1.2,org.eclipse.platform.source.win32.win32.x86,3.1.2,org.eclipse.platform.source.linux.motif.x86,3.1.2,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="org.eclipse.rcp.source,3.1.2," pluginIds="org.eclipse.platform.doc.isv,3.1.2,org.eclipse.platform.source,3.1.2,org.eclipse.platform.source.linux.gtk.ia64,3.1.2,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.2,org.eclipse.platform.source.qnx.photon.x86,3.1.2,org.eclipse.platform.source.linux.gtk.ppc,3.1.2,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.platform.source.hpux.motif.ia64,3.1.2,org.eclipse.platform.source.linux.gtk.x86_64,3.1.2,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.2,org.eclipse.platform.source.linux.gtk.ppc64,3.1.2,org.eclipse.platform.source.macosx.carbon.ppc,3.1.2,org.eclipse.platform.source.linux.gtk.x86,3.1.2,org.eclipse.platform.source.freebsd.gtk.x86,3.1.2,org.eclipse.platform.source.win32.win32.x86,3.1.2,org.eclipse.platform.source.linux.motif.x86,3.1.2,org.eclipse.platform.source.freebsd.motif.x86,3.1.2,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> -@@ -153,6 +168,12 @@ - </target> - <target name="rootFileslinux_motif_x86"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> - <target name="rootFilessolaris_motif_sparc"> - </target> - <target name="rootFilessolaris_gtk_sparc"> diff --git a/java/eclipse/files/patch-features-platform-source-feature.xml b/java/eclipse/files/patch-features-platform-source-feature.xml deleted file mode 100644 index 0a8377fdd..000000000 --- a/java/eclipse/files/patch-features-platform-source-feature.xml +++ /dev/null @@ -1,10 +0,0 @@ ---- features/org.eclipse.platform.source/feature.xml.orig Thu Sep 29 15:51:40 2005 -+++ features/org.eclipse.platform.source/feature.xml Tue Oct 4 20:34:16 2005 -@@ -25,4 +25,7 @@ - <plugin ws="gtk" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.1.1"/> - <plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.1.1"/> - <plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.1.1"/> -+ <plugin ws="gtk" os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.amd64" version="3.1.1"/> -+ <plugin ws="gtk" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.x86" version="3.1.1"/> -+ <plugin ws="motif" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.motif.x86" version="3.1.1"/> - </feature> diff --git a/java/eclipse/files/patch-features-rcp-build.xml b/java/eclipse/files/patch-features-rcp-build.xml deleted file mode 100644 index 583292602..000000000 --- a/java/eclipse/files/patch-features-rcp-build.xml +++ /dev/null @@ -1,80 +0,0 @@ ---- features/org.eclipse.rcp/build.xml.orig Wed Jan 18 16:09:14 2006 -+++ features/org.eclipse.rcp/build.xml Sun Jan 29 20:51:40 2006 -@@ -127,6 +127,21 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.freebsd.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}"> -+ <property name="arch" value="amd64"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - </target> - <target name="all.features" depends="init"> - </target> -@@ -185,7 +200,7 @@ - <copy todir="${feature.base}/features/org.eclipse.rcp_3.1.2" failonerror="true" overwrite="false"> - <fileset dir="${basedir}" includes="feature.xml,license.html,epl-v10.html,feature.properties,eclipse_update_120.jpg" /> - </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.2,org.eclipse.osgi,3.1.2,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.1,org.eclipse.ui,3.1.2,org.eclipse.ui.workbench,3.1.2,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.2,org.eclipse.swt.gtk.linux.x86,3.1.1,org.eclipse.swt.gtk.solaris.sparc,3.1.1,org.eclipse.swt.gtk.linux.ppc,3.1.1,org.eclipse.swt.gtk.linux.x86_64,3.1.1,org.eclipse.swt.carbon.macosx.ppc,3.1.1,org.eclipse.swt.motif.aix.ppc,3.1.1,org.eclipse.swt.motif.hpux.PA_RISC,3.1.1,org.eclipse.swt.motif.linux.x86,3.1.1,org.eclipse.swt.gtk.linux.ia64,3.1.1,org.eclipse.swt.motif.solaris.sparc,3.1.1,org.eclipse.swt.photon.qnx.x86,3.1.1,org.eclipse.swt.motif.hpux.ia64_32,3.1.1,org.eclipse.rcp,3.1.0,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.2,org.eclipse.osgi,3.1.2,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.1,org.eclipse.ui,3.1.2,org.eclipse.ui.workbench,3.1.2,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.2,org.eclipse.swt.gtk.linux.x86,3.1.1,org.eclipse.swt.gtk.freebsd.x86,3.1.1,org.eclipse.swt.gtk.solaris.sparc,3.1.1,org.eclipse.swt.gtk.linux.ppc,3.1.1,org.eclipse.swt.gtk.linux.x86_64,3.1.1,org.eclipse.swt.gtk.freebsd.amd64,3.1.1,org.eclipse.swt.carbon.macosx.ppc,3.1.1,org.eclipse.swt.motif.aix.ppc,3.1.1,org.eclipse.swt.motif.hpux.PA_RISC,3.1.1,org.eclipse.swt.motif.linux.x86,3.1.1,org.eclipse.swt.motif.freebsd.x86,3.1.1,org.eclipse.swt.gtk.linux.ia64,3.1.1,org.eclipse.swt.motif.solaris.sparc,3.1.1,org.eclipse.swt.photon.qnx.x86,3.1.1,org.eclipse.swt.motif.hpux.ia64_32,3.1.1,org.eclipse.rcp,3.1.0,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> -@@ -353,6 +368,46 @@ - </copy> - <chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" /> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.x86" includes="**" /> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.x86" includes="libcairo.so.1" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64" includes="**" /> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.amd64" includes="libcairo.so.1" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.motif.x86" includes="**" /> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/motif/freebsd/x86" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libXm.so.2" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libcairo.so.1" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="*.so*" /> -+ </target> - - <target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.rcp."> - <delete dir="${feature.temp.folder}"/> diff --git a/java/eclipse/files/patch-features-rcp-source-build.xml b/java/eclipse/files/patch-features-rcp-source-build.xml deleted file mode 100644 index c5a229c98..000000000 --- a/java/eclipse/files/patch-features-rcp-source-build.xml +++ /dev/null @@ -1,46 +0,0 @@ ---- features/org.eclipse.rcp.source/build.xml.orig Wed Jan 18 16:09:14 2006 -+++ features/org.eclipse.rcp.source/build.xml Sun Jan 29 20:56:53 2006 -@@ -47,6 +47,21 @@ - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.amd64" target="${target}"> -+ <property name="arch" value="amd64"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.motif.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> -@@ -135,7 +150,7 @@ - <copy todir="${feature.base}/features/org.eclipse.rcp.source_3.1.2" failonerror="true" overwrite="false"> - <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> - </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.2,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.2,org.eclipse.rcp.source.linux.gtk.ia64,3.1.2,org.eclipse.rcp.source.qnx.photon.x86,3.1.2,org.eclipse.rcp.source.linux.gtk.ppc,3.1.2,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.2,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.2,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.2,org.eclipse.rcp.source.linux.gtk.x86,3.1.2,org.eclipse.rcp.source.aix.motif.ppc,3.1.2,org.eclipse.rcp.source.win32.win32.x86,3.1.2,org.eclipse.rcp.source.solaris.motif.sparc,3.1.2,org.eclipse.rcp.source.linux.motif.x86,3.1.2,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.2,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.2,org.eclipse.rcp.source.linux.gtk.ia64,3.1.2,org.eclipse.rcp.source.qnx.photon.x86,3.1.2,org.eclipse.rcp.source.linux.gtk.ppc,3.1.2,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.2,org.eclipse.rcp.source.freebsd.gtk.amd64,3.1.2,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.2,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.2,org.eclipse.rcp.source.linux.gtk.x86,3.1.2,org.eclipse.rcp.source.freebsd.gtk.x86,3.1.2,org.eclipse.rcp.source.aix.motif.ppc,3.1.2,org.eclipse.rcp.source.win32.win32.x86,3.1.2,org.eclipse.rcp.source.solaris.motif.sparc,3.1.2,org.eclipse.rcp.source.linux.motif.x86,3.1.2,org.eclipse.rcp.source.freebsd.motif.x86,3.1.2,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> -@@ -168,6 +183,12 @@ - </target> - <target name="rootFilesqnx_photon_x86"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> - - <target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.rcp.source."> - <delete dir="${feature.temp.folder}"/> diff --git a/java/eclipse/files/patch-features-sdk-build.xml b/java/eclipse/files/patch-features-sdk-build.xml deleted file mode 100644 index 2217569fe..000000000 --- a/java/eclipse/files/patch-features-sdk-build.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- features/org.eclipse.sdk/build.xml.orig Sat Feb 19 12:09:35 2005 -+++ features/org.eclipse.sdk/build.xml Sat Mar 26 18:40:52 2005 -@@ -90,6 +90,12 @@ - </target> - <target name="rootFileslinux_gtk_x86_64"> - </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> - <target name="rootFileslinux_motif_x86"> - </target> - <target name="rootFilessolaris_motif_sparc"> diff --git a/java/eclipse/files/patch-plugins-core-build.xml b/java/eclipse/files/patch-plugins-core-build.xml deleted file mode 100644 index 42dfac0c7..000000000 --- a/java/eclipse/files/patch-plugins-core-build.xml +++ /dev/null @@ -1,53 +0,0 @@ ---- plugins/org.eclipse.core.resources.freebsd/build.xml.orig Wed Jul 27 09:39:39 2005 -+++ plugins/org.eclipse.core.resources.freebsd/build.xml Wed Jul 27 22:09:53 2005 -@@ -19,6 +19,20 @@ - </fileset> - </path> - <property name="bootclasspath" refid="path_bootclasspath"/> -+ <!-- The properties ${eclipse-home} ${jdk-path} should be passed into this script --> -+ <!-- Set a meaningful default value for when it is not. --> -+ <property name="eclipse-home" value="${basedir}/.."/> -+ <property environment="env" /> -+ <property name="CC" value="${env.CC}"/> -+ <property name="jdk-path" value="${env.JAVA_HOME}"/> -+ <property name="destination" value="${eclipse-home}/org.eclipse.core.resources.freebsd/os/freebsd/x86/"/> -+ <property name="obj-path" value="${eclipse-home}/org.eclipse.core.resources/src/"/> -+ <property name="src-path" value="${eclipse-home}/org.eclipse.core.resources.freebsd/src/"/> -+ -+ <!-- sets the properties --> -+ <property name="library-name" value="libcore_3_1_0"/> -+ <property name="library-platform" value="so"/> -+ <property name="library-file" value="${library-name}.${library-platform}"/> - - <target name="init" depends="properties"> - <condition property="pluginTemp" value="${buildTempFolder}/plugins"> -@@ -50,6 +64,29 @@ - </target> - - <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.core.resources.freebsd."> -+ <echo message="Building ${library-file}"/> -+ -+ <property name="header-path" value="${jdk-path}/include"/> -+ <property name="header-freebsd-path" value="${header-path}/freebsd" /> -+ -+ <echo message="${CC} -o ${library-file} -shared -fPIC -I${src-path} -I${header-path} -I${header-freebsd-path} ${library-file} -static -lc"/> -+ -+ <apply executable="${CC}" dest="${eclipse-home}/" parallel="false"> -+ <arg value="-o"/> -+ <arg value="${library-file}"/> -+ <arg value="-shared"/> -+ <arg value="-fPIC"/> -+ <arg value="-I${src-path}"/> -+ <arg value="-I${header-path}"/> -+ <arg value="-I${header-freebsd-path}"/> -+ <srcfile/> -+ <arg value="-static"/> -+ <arg value="-lc"/> -+ <fileset dir="${src-path}" includes="*.c"/> -+ <mapper type="glob" from="*.c" to="*.o"/> -+ </apply> -+ -+ <move file="${library-file}" todir="${destination}"/> - </target> - - <target name="build.sources" depends="init"> diff --git a/java/eclipse/files/patch-plugins-update-src-build.xml b/java/eclipse/files/patch-plugins-update-src-build.xml deleted file mode 100644 index 1fa5cb7cc..000000000 --- a/java/eclipse/files/patch-plugins-update-src-build.xml +++ /dev/null @@ -1,31 +0,0 @@ ---- plugins/org.eclipse.update.core.freebsd/src/build.xml Sat Apr 9 14:03:21 2005 -+++ ../files/plugins-update-src-build.xml Tue Feb 15 23:41:47 2005 -@@ -6,7 +6,7 @@ - <property name="eclipse-home" value="${basedir}/../.."/> - <property name="jdk-path" value="${java.home}"/> - <property name="destination" value="${eclipse-home}/org.eclipse.update.core.freebsd/os/freebsd/x86/"/> -- <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.freebsd/src/"/> -+ <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core/src/"/> - <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.freebsd/src/"/> - - <!-- sets the properties --> -@@ -44,15 +44,16 @@ - <target name="build"> - <echo message="Building ${library-file}"/> - -- <property name="header-path" value="${jdk-path}/../include"/> -+ <property name="header-path" value="${jdk-path}/include"/> - <property name="header-freebsd-path" value="${header-path}/freebsd" /> - -- <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-freebsd-path} ${library-file} -static -lc"/> -+ <echo message="${CC} -o ${library-file} -shared -fPIC -I${src-path} -I${header-path} -I${header-freebsd-path} ${library-file} -static -lc"/> - -- <apply executable="gcc" dest="${eclipse-home}/" parallel="false"> -+ <apply executable="${CC}" dest="${eclipse-home}/" parallel="false"> - <arg value="-o"/> - <arg value="${library-file}"/> - <arg value="-shared"/> -+ <arg value="-fPIC"/> - <arg value="-I${src-path}"/> - <arg value="-I${header-path}"/> - <arg value="-I${header-freebsd-path}"/> diff --git a/java/eclipse/files/patch-plugins-update-src-update.c b/java/eclipse/files/patch-plugins-update-src-update.c deleted file mode 100644 index 6d3991ec7..000000000 --- a/java/eclipse/files/patch-plugins-update-src-update.c +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/org.eclipse.update.core.linux/src/update.c.orig Fri May 13 11:37:58 2005 -+++ plugins/org.eclipse.update.core.linux/src/update.c Sat May 14 19:01:31 2005 -@@ -12,7 +12,12 @@ - /* bug 82520 : need to include stdlib.h */
- # include <stdlib.h>
- # include <sys/types.h>
-+#ifdef __FreeBSD__ -+# include <sys/param.h> -+# include <sys/mount.h> -+#else - # include <sys/statfs.h>
-+#endif - # include <update.h>
-
- /*
diff --git a/java/eclipse/pkg-descr b/java/eclipse/pkg-descr deleted file mode 100644 index fa504efd8..000000000 --- a/java/eclipse/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -The Eclipse Platform is an open extensible IDE for anything and yet -nothing in particular. The Eclipse Platform provides building blocks -and a foundation for constructing and running integrated software- -development tools. The Eclipse Platform allows tool builders to -independently develop tools that integrate with other people's tools -so seamlessly you can't tell where one tool ends and another starts. - -WWW: http://www.eclipse.org/ diff --git a/java/eclipse/scripts/pre-patch b/java/eclipse/scripts/pre-patch deleted file mode 100644 index fdc249b6a..000000000 --- a/java/eclipse/scripts/pre-patch +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -copy_file() -{ - srcfile="$1" - dstfile="$2" - - rm -f $dstfile - cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' > "$dstfile" -} - -copy_dir() -{ - srcdir="$1" - dstdir="$2" - - rm -rf "$dstdir" - cp -r "$srcdir" "$dstdir" || exit 1 - - if [ -d "$dstdir" ] - then - find "$dstdir" -name \*.so -delete - find "$dstdir" -name \*.so.\* -delete - find "$dstdir" -type f -print0 | \ - xargs -0 sed -i '.bak' 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' - find "$dstdir" -name \*.bak -delete - fi -} - -prepare_files() -{ - mkdir ${WRKSRC}/features/org.eclipse.platform.launchers/bin/gtk/freebsd - - # Copy the files and rename/change them appropriately - for src in $COPY_LIST - do - dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'` - echo Copying $src into $dst - if [ -d ${WRKSRC}/$src ] - then - copy_dir ${WRKSRC}/$src ${WRKSRC}/$dst - else - copy_file ${WRKSRC}/$src ${WRKSRC}/$dst - fi - done - - # Files with spaces in their path... - src="${SWTGTK}/make_linux.mak" - dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'` - echo Copying $src into $dst - copy_file "${WRKSRC}/$src" "${WRKSRC}/$dst" - - src="${SWTMOTIF}/make_linux.mak" - dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'` - echo Copying $src into $dst - copy_file "${WRKSRC}/$src" "${WRKSRC}/$dst" - - find ${WRKSRC} -name \*.so -delete - find ${WRKSRC} -name \*.so.\* -delete -} - -COPY_LIST=" -assemble.org.eclipse.sdk.linux.gtk.x86.xml -assemble.org.eclipse.sdk.linux.gtk.x86_64.xml -assemble.org.eclipse.sdk.linux.motif.x86.xml -features/org.eclipse.platform/about_files/linux.gtk.x86 -features/org.eclipse.platform/about_files/linux.gtk.x86_64 -features/org.eclipse.platform/about_files/linux.motif.x86 -features/org.eclipse.platform.launchers/bin/gtk/linux/x86 -features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64 -features/org.eclipse.platform.launchers/bin/motif/linux -features/org.eclipse.platform.launchers/library/gtk/make_linux.mak -features/org.eclipse.platform.launchers/library/motif/make_linux.mak -plugins/org.eclipse.core.resources.linux -plugins/org.eclipse.core.resources.linux/os/linux -plugins/org.eclipse.core.resources.linux/os/linux/x86 -plugins/org.eclipse.core.resources.linux/os/linux/x86_64 -plugins/org.eclipse.jdt.source.linux.gtk.x86 -plugins/org.eclipse.jdt.source.linux.gtk.x86_64 -plugins/org.eclipse.jdt.source.linux.motif.x86 -plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux.properties -plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux_gtk.properties -plugins/org.eclipse.pde.source.linux.gtk.x86 -plugins/org.eclipse.pde.source.linux.gtk.x86_64 -plugins/org.eclipse.pde.source.linux.motif.x86 -plugins/org.eclipse.platform.source.linux.gtk.x86 -plugins/org.eclipse.platform.source.linux.gtk.x86_64 -plugins/org.eclipse.platform.source.linux.motif.x86 -plugins/org.eclipse.rcp.source.linux.gtk.x86 -plugins/org.eclipse.rcp.source.linux.gtk.x86_64 -plugins/org.eclipse.rcp.source.linux.motif.x86 -plugins/org.eclipse.swt.gtk.linux.x86 -plugins/org.eclipse.swt.gtk.linux.x86_64 -plugins/org.eclipse.swt.motif.linux.x86 -plugins/org.eclipse.update.core.linux -plugins/org.eclipse.update.core.linux/os/linux -" - -SWTGTK="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" -SWTMOTIF="plugins/org.eclipse.swt/Eclipse SWT PI/motif/library" - -prepare_files -exit 0 diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile deleted file mode 100644 index 46459bebf..000000000 --- a/java/jdk13/Makefile +++ /dev/null @@ -1,315 +0,0 @@ -# New ports collection makefile for: jdk13 -# Date created: 10 October 2000 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= jdk -PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 7 -CATEGORIES= java devel -MASTER_SITES= # http://www.sun.com/software/communitysource/j2se/java2/download.xml -# http://www.eyesbeyond.com/freebsddom/java/jdk13.html -SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src${EXTRACT_SUFX} -PATCHSETFILE= bsd-jdk131-patches-${JDK_PATCHSET_VERSION}.tar.gz -DISTFILES= ${SRCFILE} ${PATCHSETFILE} - -MAINTAINER= glewis@FreeBSD.org -COMMENT= Java Development Kit 1.3 - -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ - zip:${PORTSDIR}/archivers/zip \ - ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif -.if defined(WITH_PLUGIN) -FORBIDDEN= Vulnerabilities in the browser plugin -USE_GNOME+= gtk12 -LIB_DEPENDS= nspr4.1:$(PORTSDIR)/devel/nspr -.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 - -.if defined(WITH_JAPANESE_FONTS) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts -.endif -.if defined(WITH_RUSSIAN_FONTS) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts -.endif -.if defined(WITH_CHINESE_FONTS) -RUN_DEPENDS+= ${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphicttf -.endif - -WRKSRC= ${WRKDIR}/j2sdk1.3.1/make - -JDK_VERSION= 1.3.1 -JDK_PATCHSET_VERSION= 9 -LATEST_LINK= jdk13 - -ONLY_FOR_ARCHS= i386 -USE_GETTEXT= yes -USE_GMAKE= yes -RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" -NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" -MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \ - ALT_MOTIF_DIR="${X11BASE}" \ - OPENWINHOME="${X11BASE}" \ - SYS_CFLAGS="${CFLAGS}" \ - CLASSPATH="" \ - LD_LIBRARY_PATH="" \ - JAVA_COMPILER="" \ - _JAVA_BOOTSTRAP_VERSION="1.3.1" -.if defined(WITH_PLUGIN) -MAKE_ENV += LIBG_HDRS="${LOCALBASE}/include/glib12" \ - GTK_HDRS="${LOCALBASE}/include/gtk12" \ - LIBIDL_HDRS= \ - INTL_DIR="${LOCALBASE}" -.endif -.if defined(WITH_PLUGIN) -ALL_TARGET= all plugin images -.else -ALL_TARGET= all images -.endif -PLIST_SUB+= JDK_VERSION=${JDK_VERSION} - -JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i386/jdk-image-i386 -JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i386/jdk-debug-image-i386 - -.if defined(NODEBUG) -PLIST_SUB+= DEBUG:="@comment " -PKGNAMESUFFIX= -nodebug -.else -PLIST_SUB+= DEBUG:="" -.endif - -.if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) -PLIST_SUB+= NATIVE:="" -MAKE_ARGS+= HPIS="green native" -.else -PLIST_SUB+= NATIVE:="@comment " -.endif - -.if defined(WITH_PLUGIN) -PLIST_SUB+= PLUGIN:="" -.else -PLIST_SUB+= PLUGIN:="@comment " -.endif - -.if defined(WITH_HOTSPOT) -PLIST_SUB+= HOTSPOT:="" -.if defined(NODEBUG) -HOTSPOT_TARGETS=product1 product -.else -HOTSPOT_TARGETS=compiler1 compiler2 -.endif -.else -PLIST_SUB+= HOTSPOT:="@comment " -.endif - -LD_LIBRARY_PATH_FILES= ../src/solaris/javavm/runtime/javai_md.c \ - ../../hotspot1.3.1/src/os/linux/vm/os_linux.cpp - -.include <bsd.port.pre.mk> - -.if !defined(JDK13DIR) -.if defined(WITH_LINUX_BOOTSTRAP) -JDK13DIR= ${LOCALBASE}/linux-blackdown-jdk${JDK_VERSION} -BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-blackdown-jdk13 -.elif exists(${LOCALBASE}/jdk${JDK_VERSION}/bin/javac) -JDK13DIR= ${LOCALBASE}/jdk${JDK_VERSION} -.elif exists(${LOCALBASE}/diablo-jdk${JDK_VERSION}/bin/javac) -JDK13DIR= ${LOCALBASE}/diablo-jdk${JDK_VERSION} -BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/diablo-jdk${JDK_VERSION} -.else -JDK13DIR= ${LOCALBASE}/jbootstrap -BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/jbootstrap -.endif -.endif - -PTHREAD_FILES= common/Defs.gmk \ - common/Program.gmk \ - java/hpi/native/Makefile \ - sun/cmm/Makefile \ - ../ext/plugin/build/solaris/GNUmakefile \ - ../../hotspot1.3.1/build/linux/platform_i486 \ - ../../hotspot1.3.1/build/bsd/makefiles/gcc.make \ - ../../hotspot1.3.1/build/linux/makefiles/vm.make - -.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500038 ) -EXTRACT_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar -TAR= gtar # Necessary for proper extraction of sources -.endif - -# Check for JDK sources and patchset -.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SRCFILE}) || !exists(${DISTDIR}/${PATCHSETFILE}))#{ -ECHO_MSG=/usr/bin/printf -IGNORE= :\n\n\ -Due to licensing restrictions, certain files must be fetched manually.\n\n -.if !exists(${DISTDIR}/${SRCFILE})#{ -IGNORE += Please open http://www.sun.com/software/communitysource/j2se/java2/download.xml\n\ -in a web browser and follow the \"Download\" link for the\n\ -\"Java(TM) 2 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, download the SCSL Source file,\n\ -${SRCFILE}.\n -.if !exists(${DISTDIR}/${PATCHSETFILE})#{ -IGNORE += \n In addition, please -.endif#} -.elif !exists(${DISTDIR}/${PATCHSETFILE}) -IGNORE += Please -.endif#} -.if !exists(${DISTDIR}/${PATCHSETFILE})#{ -IGNORE += download the patchset, ${PATCHSETFILE}, from\n\ -http://www.eyesbeyond.com/freebsddom/java/jdk13.html.\n -.endif#} -.if !exists(${DISTDIR}/${SRCFILE}) && !exists(${DISTDIR}/${PATCHSETFILE})#{ -IGNORE += \n Then place the downloaded files in ${DISTDIR} -.else -IGNORE += \n Then place the downloaded file in ${DISTDIR} -.endif#} -IGNORE += and restart the build.\n\n -.endif#} - -# HotSpot and/or native threads require a recent version of FreeBSD -.if ( defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) ) && ( ${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ) ) -ECHO_MSG=/usr/bin/printf -IGNORE= :\n\ -You must have a version of FreeBSD later than 4.7-STABLE February 2003\n\ -or 5-CURRENT February 2003 to use either native threads or HotSpot.\n -.endif - -# Warn user about HotSpot build -.if defined(WITH_HOTSPOT) -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "You have set WITH_HOTSPOT to enable the build of the HotSpot VM." - @${ECHO_MSG} "Please note that HotSpot development is still experimental and is" - @${ECHO_MSG} "not suitable for use in a production environment." - @${ECHO_MSG} "To use the browser plugin with HotSpot you will need to set the" - @${ECHO_MSG} "THREADS_FLAG environment variable when running the browser, e.g." - @${ECHO_MSG} " setenv THREADS_FLAG native" - @${ECHO_MSG} "" -.endif - -pre-patch: - @cd ${WRKDIR} && \ - ${CHMOD} -R u+w * && \ - ${PATCH} -p0 -E < ${WRKDIR}/jdk131.patches - -post-patch: - @${FIND} -d ${WRKDIR} -name SCCS -exec ${RM} -rf {} \; - @for file in ${LD_LIBRARY_PATH_FILES}; do \ - ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ - ${WRKSRC}/$${file}; \ - done - @for file in ${PTHREAD_FILES}; do \ - ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \ - -e "s:-lc_r:${PTHREAD_LIBS}:g" \ - -e "s:-lpthread:${PTHREAD_LIBS}:g" \ - ${WRKSRC}/$${file}; \ - done - -pre-build: -.if defined(WITH_LINUX_BOOTSTRAP) - # Some checks for bootstrapping with a Linux JDK - @if [ `${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/check_wrkdir_links.sh "${WRKDIRPREFIX}" "${LINUXBASE}" 2>/dev/null` ]; \ - then \ - ${ECHO_MSG} "Please set WRKDIRPREFIX to something which doesn't"; \ - ${ECHO_MSG} "have a matching symbolic link in ${LINUXBASE}."; \ - ${ECHO_MSG} "This is known to cause problems during bootstrapping."; \ - exit 1; \ - fi - @if [ `/sbin/sysctl -n compat.linux.osname` != "Linux" ]; \ - then \ - ${ECHO_MSG} "Please set the value of the sysctl compat.linux.osname"; \ - ${ECHO_MSG} "to 'Linux' with the command:"; \ - ${ECHO_MSG} " /sbin/sysctl compat.linux.osname=Linux"; \ - ${ECHO_MSG} "Having it set to other values, such as 'FreeBSD',"; \ - ${ECHO_MSG} "is known to cause problems during bootstrapping."; \ - exit 1; \ - fi -.endif - @if [ "${CFLAGS:S/mcpu=k6//}" != "${CFLAGS:S///}" -a \ - "`${CC} -dumpversion`" \< "3" ]; \ - then \ - ${ECHO_MSG} "Please remove the -mcpu=k6 option from CFLAGS as this triggers"; \ - ${ECHO_MSG} "an internal compiler in GCC 2.95.x when compiling JDK ${JDK_VERSION}."; \ - exit 1; \ - fi - -do-build: - # Start of jdk build - (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) -.if defined(WITH_HOTSPOT) - # Start of HotSpot build - (cd ${WRKDIR}/hotspot1.3.1/build/linux ; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${HOTSPOT_TARGETS}) -.endif - -post-build: -.if defined(WITH_HOTSPOT) - # Copy HotSpot VM to image dir - ${MKDIR} ${JDKIMAGEDIR}/jre/lib/i386/client - ${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler1/product/libjvm.so ${JDKIMAGEDIR}/jre/lib/i386/client/ - ${INSTALL_DATA} ${WRKDIR}/hotspot1.3.1/src/share/vm/Xusage.txt ${JDKIMAGEDIR}/jre/lib/i386/client/ - ${MKDIR} ${JDKIMAGEDIR}/jre/lib/i386/server - ${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler2/product/libjvm.so ${JDKIMAGEDIR}/jre/lib/i386/server/ - ${INSTALL_DATA} ${WRKDIR}/hotspot1.3.1/src/share/vm/Xusage.txt ${JDKIMAGEDIR}/jre/lib/i386/server/ - @(cd ${JDKIMAGEDIR}/jre/lib/i386; ${LN} -sf client hotspot) -.if !defined(NODEBUG) - # Copy debug version of HotSpot VM to image dir - ${MKDIR} ${JDKIMAGEDIR_G}/jre/lib/i386/client - ${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler1/jvmg/libjvm_g.so ${JDKIMAGEDIR_G}/jre/lib/i386/client/ - ${MKDIR} ${JDKIMAGEDIR_G}/jre/lib/i386/server - ${INSTALL_PROGRAM} ${WRKDIR}/hotspot1.3.1/build/linux/linux_i486_compiler2/jvmg/libjvm_g.so ${JDKIMAGEDIR_G}/jre/lib/i386/server/ -.endif -.endif - # Ensure SwingSet2 resources directory doesn't exist (sometimes it - # does on FreeBSD 5.x) - ${RM} -rf ${JDKIMAGEDIR}/demo/jfc/SwingSet2/resources - # Prune empty dirs - ${FIND} ${JDKIMAGEDIR} -type d | ${SORT} -r | \ - ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} - ${FIND} ${JDKIMAGEDIR_G} -type d | ${SORT} -r | \ - ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} - -.if !defined(NODEBUG) -pre-install: - @${ECHO_MSG} - @${ECHO_MSG} "Please use \`make -DNODEBUG' if you don't want to install libraries and binaries" - @${ECHO_MSG} "with debugging support." - @${ECHO_MSG} -.endif - -do-install: - ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} - cd ${JDKIMAGEDIR} && ${FIND} . \ - | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} -.if !defined(NODEBUG) - cd ${JDKIMAGEDIR_G} && ${FIND} . \ - | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} -.endif - ${INSTALL_DATA} ${FILESDIR}/cacerts ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts - ${MKDIR} ${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext - ${MKDIR} ${PREFIX}/share/doc/java - -post-install: -.if !defined(WITH_NATIVE_THREADS) && !defined(WITH_HOTSPOT) - ${RM} -rf ${PREFIX}/jdk${JDK_VERSION}/bin/i386/native_threads - ${RM} -rf ${PREFIX}/jdk${JDK_VERSION}/jre/bin/i386/native_threads -.endif - @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" -.if defined(WITH_PLUGIN) - @${ECHO_MSG} - @${ECHO_MSG} To use the Java plugin with Mozilla you must create a - @${ECHO_MSG} symbolic link from - @${ECHO_MSG} - @${ECHO_MSG} ${PREFIX}/jdk${JDK_VERSION}/jre/plugin/i386/ns600/libjavaplugin_oji.so - @${ECHO_MSG} - @${ECHO_MSG} to your Mozilla plugins directory, which is usually found at - @${ECHO_MSG} - @${ECHO_MSG} ${LOCALBASE}/lib/mozilla/plugins - @${ECHO_MSG} -.endif - -.include <bsd.port.post.mk> diff --git a/java/jdk13/distinfo b/java/jdk13/distinfo deleted file mode 100644 index 06ecb4e2d..000000000 --- a/java/jdk13/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57 -SHA256 (j2sdk-1_3_1-src.tar.gz) = ed49cf8c0506e7d3af459f7acf5393eb1ed1711e0baf70a97d9b3a9bcd9c89e8 -SIZE (j2sdk-1_3_1-src.tar.gz) = 29876595 -MD5 (bsd-jdk131-patches-9.tar.gz) = 29c83880d3555abcf74fc7df9db1959f -SHA256 (bsd-jdk131-patches-9.tar.gz) = 8d8feb6a8583df04010258a94d5bdb7c1ddec0803f68acc4589fb4a28b8b52d4 -SIZE (bsd-jdk131-patches-9.tar.gz) = 642883 diff --git a/java/jdk13/files/cacerts b/java/jdk13/files/cacerts Binary files differdeleted file mode 100644 index bf8d91f32..000000000 --- a/java/jdk13/files/cacerts +++ /dev/null diff --git a/java/jdk13/files/patch-InetAddressImpl.c b/java/jdk13/files/patch-InetAddressImpl.c deleted file mode 100644 index 0c043a04a..000000000 --- a/java/jdk13/files/patch-InetAddressImpl.c +++ /dev/null @@ -1,97 +0,0 @@ -$FreeBSD$ - ---- ../src/solaris/native/java/net/InetAddressImpl.c.orig Wed Jul 19 01:28:19 2006 -+++ ../src/solaris/native/java/net/InetAddressImpl.c Wed Jul 19 10:59:54 2006 -@@ -26,9 +26,14 @@ - #include "java_net_InetAddressImpl.h" - - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include <sys/param.h> -+#endif -+ -+#if (defined(__FreeBSD__) && (__FreeBSD_version < 601103 || \ -+ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700016))) || \ -+ defined(__NetBSD__) || defined(__OpenBSD__) - /* reentrant BIND includes --billh */ - --#include <sys/param.h> - #include <port_before.h> - #include <port_after.h> - -@@ -100,7 +105,9 @@ Java_java_net_InetAddressImpl_getLocalHo - char buf2[HENT_BUF_SIZE]; - int h_error=0; - --#ifdef __GLIBC__ -+#if defined(__GLIBC__) || \ -+ (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \ -+ (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103))) - gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error); - #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error); -@@ -108,7 +115,9 @@ Java_java_net_InetAddressImpl_getLocalHo - hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error); - #endif - if (hp) { --#ifdef __GLIBC__ -+#if defined(__GLIBC__) || \ -+ (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \ -+ (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103))) - gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET, - &res2, buf2, sizeof(buf2), &hp, &h_error); - #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -@@ -195,7 +204,9 @@ Java_java_net_InetAddressImpl_lookupAllH - hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE); - - /* Try once, with our static buffer. */ --#ifdef __GLIBC__ -+#if defined(__GLIBC__) || \ -+ (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \ -+ (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103))) - gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error); - #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error); -@@ -210,7 +221,9 @@ Java_java_net_InetAddressImpl_lookupAllH - */ - if (hp == NULL && errno == ERANGE) { - if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) { --#ifdef __GLIBC__ -+#if defined(__GLIBC__) || \ -+ (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \ -+ (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103))) - gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE, - &hp, &h_error); - #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -@@ -293,7 +306,9 @@ Java_java_net_InetAddressImpl_getHostByA - * - */ - addr = htonl(addr); --#ifdef __GLIBC__ -+#if defined(__GLIBC__) || \ -+ (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \ -+ (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103))) - gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent, - buf, sizeof(buf), &hp, &h_error); - #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -@@ -310,7 +325,9 @@ Java_java_net_InetAddressImpl_getHostByA - */ - if (hp == NULL && errno == ERANGE) { - if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) { --#ifdef __GLIBC__ -+#if defined(__GLIBC__) || \ -+ (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \ -+ (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103))) - gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, - &hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error); - #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -@@ -338,7 +355,9 @@ Java_java_net_InetAddressImpl_getHostByA - - /* =============================== */ - --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#if (defined(__FreeBSD__) && (__FreeBSD_version < 601103 || \ -+ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700016))) || \ -+ defined(__NetBSD__) || defined(__OpenBSD__) - - #if defined(LIBC_SCCS) && !defined(lint) - static const char rcsid[] = "$Id: patch-InetAddressImpl.c,v 1.2 2006-10-10 20:22:13 mezz Exp $"; diff --git a/java/jdk13/files/patch-_pth.h b/java/jdk13/files/patch-_pth.h deleted file mode 100644 index 850957f85..000000000 --- a/java/jdk13/files/patch-_pth.h +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../ext/plugin/oji-plugin/include/solaris/navig4/nspr/md/_pth.h 11 Jul 2001 21:45:07 -0000 1.1.1.1 -+++ ../ext/plugin/oji-plugin/include/solaris/navig4/nspr/md/_pth.h 22 Nov 2004 17:19:42 -0000 -@@ -52,7 +52,7 @@ - #define PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init
- #define PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy
- #define PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a))
--#define PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
-+#define PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m)))
- #define PTHREAD_CONDATTR_INIT pthread_condattr_init
- #define PTHREAD_CONDATTR_DESTROY pthread_condattr_destroy
- #define PTHREAD_COND_INIT(m, a) pthread_cond_init(&(m), &(a))
diff --git a/java/jdk13/files/patch-adlc.make b/java/jdk13/files/patch-adlc.make deleted file mode 100644 index ad02fde2c..000000000 --- a/java/jdk13/files/patch-adlc.make +++ /dev/null @@ -1,42 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/build/linux/makefiles/adlc.make 14 Jan 2002 12:49:49 -0000 1.2 -+++ ../../hotspot1.3.1/build/linux/makefiles/adlc.make 22 Nov 2004 17:19:42 -0000 -@@ -53,8 +53,8 @@ - # /usr/dist/share/devpro/5.x-sparc/bin/CC - # man -M /usr/dist/share/devpro/5.x-sparc/man CC - --CPP = g++ --CPPFLAGS = -DASSERT -g -o $@ -+CXX ?= g++ -+CXXFLAGS += -DASSERT -g -o $@ - # -o object file-name - # +w Additional warnings: Nonportable, Likely mistakes or inefficient - # -xwe Treat all warnings as errors (skipped for now) -@@ -64,7 +64,7 @@ - # $< first component of target name - # $@ target name - --CPPFLAGS += ${SYSDEFS} ${INCLUDES} -+CXXFLAGS += ${SYSDEFS} ${INCLUDES} - - OBJECTNAMES = \ - adlparse.o \ -@@ -92,7 +92,7 @@ - - $(EXEC) : $(OBJECTS) - @echo Making adlc -- @$(CPP) $(DFLAGS) $(LFLAGS) $(OBJECTS) -o $(EXEC) -+ @$(CXX) $(DFLAGS) $(LFLAGS) $(OBJECTS) -o $(EXEC) - - # The source files refer to ostream.h, which sparcworks calls iostream.h - $(OBJECTS): ostream.h -@@ -164,7 +164,7 @@ - $(SOURCE.AD): $(SOURCES.AD) - @cat $(SOURCES.AD) > $(SOURCE.AD) - --COMPILE = ${CPP} ${CPPFLAGS} ${CFLAGS} -+COMPILE = ${CXX} ${CXXFLAGS} ${CFLAGS} - - COMPILE.o = ${COMPILE} -c - COMPILE.i = ${COMPILE} -E diff --git a/java/jdk13/files/patch-bytecodes.hpp b/java/jdk13/files/patch-bytecodes.hpp deleted file mode 100644 index 003ab81d3..000000000 --- a/java/jdk13/files/patch-bytecodes.hpp +++ /dev/null @@ -1,22 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/src/share/vm/interpreter/bytecodes.hpp 11 Jul 2001 21:33:21 -0000 1.1.1.1 -+++ ../../hotspot1.3.1/src/share/vm/interpreter/bytecodes.hpp 22 Nov 2004 17:19:42 -0000 -@@ -14,6 +14,7 @@ - - // CopyrightVersion 1.2 - -+#include <limits.h> - - // Bytecodes specifies all bytecodes used in the VM and - // provides utility functions to get bytecode attributes. -@@ -279,7 +280,8 @@ - // Platform specific JVM bytecodes - #include "incls/_bytecodes_pd.hpp.incl" - -- number_of_codes -+ number_of_codes, -+ WIDTH_HINT = INT_MAX - }; - - private: diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk deleted file mode 100644 index 67e497d01..000000000 --- a/java/jdk13/files/patch-common::Defs-bsd.gmk +++ /dev/null @@ -1,39 +0,0 @@ -$FreeBSD$ - ---- common/Defs-bsd.gmk.orig Thu Dec 18 22:33:22 2003 -+++ common/Defs-bsd.gmk Thu Dec 18 22:36:46 2003 -@@ -32,9 +32,10 @@ - AR = $(USRBIN_PATH)ar - AS = $(USRBIN_PATH)as - CAT = $(UNIXCOMMAND_PATH)cat --CC = $(COMPILER_PATH)gcc --CPP = $(COMPILER_PATH)gcc -E --CXX = $(COMPILER_PATH)g++ -+# Allow ports/pkgsrc infrastructure to override CC, CPP and CXX. -+CC ?= $(COMPILER_PATH)gcc -+CPP ?= $(COMPILER_PATH)gcc -E -+CXX ?= $(COMPILER_PATH)g++ - CD = cd # intrinsic unix command - CHMOD = $(UNIXCOMMAND_PATH)chmod - CMP = $(USRBIN_PATH)cmp -@@ -131,7 +132,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 -@@ -266,9 +267,9 @@ - CFLAGS_COMMON += -fsigned-char - CXXFLAGS_COMMON+= -fsigned-char - endif --CFLAGS_OPT = $(POPT) -+CFLAGS_OPT = $(POPT) $(SYS_CFLAGS) - CFLAGS_DBG = -g3 $(POPT) --CXXFLAGS_OPT = $(POPT) -+CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS) - CXXFLAGS_DBG = -g3 $(POPT) - - CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \ diff --git a/java/jdk13/files/patch-gcc.make b/java/jdk13/files/patch-gcc.make deleted file mode 100644 index daba5a107..000000000 --- a/java/jdk13/files/patch-gcc.make +++ /dev/null @@ -1,24 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/build/linux/makefiles/gcc.make 23 Apr 2003 18:04:37 -0000 1.6 -+++ ../../hotspot1.3.1/build/linux/makefiles/gcc.make 22 Nov 2004 17:19:42 -0000 -@@ -36,8 +36,6 @@ - - - ##### --#harmless --OPT_CFLAGS += -fmemoize-lookups - #unneeded - #OPT_CFLAGS += -fpeephole - #bad -@@ -51,8 +49,8 @@ - # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true" - # to inhibit the effect of the previous line on CFLAGS. - --CPP = g++ --CC = gcc -+CXX ?= g++ -+CC ?= gcc - - AOUT_FLAGS += -export-dynamic - DEBUG_CFLAGS += -g diff --git a/java/jdk13/files/patch-gcc30.make b/java/jdk13/files/patch-gcc30.make deleted file mode 100644 index bd0657f46..000000000 --- a/java/jdk13/files/patch-gcc30.make +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/build/linux/makefiles/gcc30.make 12 Jul 2002 08:25:58 -0000 1.3 -+++ ../../hotspot1.3.1/build/linux/makefiles/gcc30.make 22 Nov 2004 17:19:42 -0000 -@@ -37,8 +37,8 @@ - # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true" - # to inhibit the effect of the previous line on CFLAGS. - --CPP = g++30 --CC = gcc30 -+CXX ?= g++30 -+CC ?= gcc30 - - AOUT_FLAGS += -export-dynamic - DEBUG_CFLAGS += -g diff --git a/java/jdk13/files/patch-gcc31.make b/java/jdk13/files/patch-gcc31.make deleted file mode 100644 index 33d411015..000000000 --- a/java/jdk13/files/patch-gcc31.make +++ /dev/null @@ -1,24 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/build/linux/makefiles/gcc31.make 14 Jul 2002 00:07:59 -0000 1.1 -+++ ../../hotspot1.3.1/build/linux/makefiles/gcc31.make 22 Nov 2004 17:19:42 -0000 -@@ -108,8 +108,6 @@ - - - ##### --#harmless --OPT_CFLAGS += -fmemoize-lookups - #unneeded - #OPT_CFLAGS += -fpeephole - #bad -@@ -123,8 +121,8 @@ - # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true" - # to inhibit the effect of the previous line on CFLAGS. - --CPP = g++31 --CC = gcc31 -+CXX ?= g++31 -+CC ?= gcc31 - - AOUT_FLAGS += -export-dynamic - DEBUG_CFLAGS += -g diff --git a/java/jdk13/files/patch-gcc32.make b/java/jdk13/files/patch-gcc32.make deleted file mode 100644 index 408740c50..000000000 --- a/java/jdk13/files/patch-gcc32.make +++ /dev/null @@ -1,24 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/build/linux/makefiles/gcc32.make 16 Sep 2002 06:21:28 -0000 1.1 -+++ ../../hotspot1.3.1/build/linux/makefiles/gcc32.make 22 Nov 2004 17:19:42 -0000 -@@ -108,8 +108,6 @@ - - - ##### --#harmless --OPT_CFLAGS += -fmemoize-lookups - #unneeded - #OPT_CFLAGS += -fpeephole - #bad -@@ -123,8 +121,8 @@ - # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true" - # to inhibit the effect of the previous line on CFLAGS. - --CPP = g++32 --CC = gcc32 -+CXX ?= g++32 -+CC ?= gcc32 - - AOUT_FLAGS += -export-dynamic - DEBUG_CFLAGS += -g diff --git a/java/jdk13/files/patch-iomgr.c b/java/jdk13/files/patch-iomgr.c deleted file mode 100644 index a94c957ab..000000000 --- a/java/jdk13/files/patch-iomgr.c +++ /dev/null @@ -1,12 +0,0 @@ -$FreeBSD$ - ---- ../src/solaris/hpi/green_threads/src/iomgr.c Thu Mar 13 13:55:24 2003 -+++ ../src/solaris/hpi/green_threads/src/iomgr.c Thu Mar 13 13:55:53 2003 -@@ -352,7 +352,6 @@ - * Get the ttyname, so we can reopen it. - */ - name = ttyname(fd); -- sysAssert(name != NULL); - if (name == NULL) - return FALSE; - diff --git a/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java b/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java deleted file mode 100644 index d5379adf6..000000000 --- a/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java +++ /dev/null @@ -1,58 +0,0 @@ -$FreeBSD$ - ---- ../src/share/classes/sun/tools/jar/Main.java 11 Jul 2001 21:39:05 -0000 1.1.1.1 -+++ ../src/share/classes/sun/tools/jar/Main.java 27 Apr 2005 05:07:30 -0000 -@@ -35,6 +35,7 @@ - Hashtable filesTable = new Hashtable(); - Vector paths = new Vector(); - Vector v; -+ String cwd; - CRC32 crc32 = new CRC32(); - /* cflag: create - * uflag: update -@@ -671,6 +672,19 @@ - * Extracts specified entries from JAR file. - */ - void extract(InputStream in, String files[]) throws IOException { -+ // Current working directory -+ -+ cwd = System.getProperty("user.dir"); -+ if (cwd == null) { -+ fatalError(getMsg("error.no.cwd")); -+ } -+ cwd = (new File(cwd)).getCanonicalPath(); -+ if (!cwd.endsWith(File.separator)) { -+ cwd += File.separator; -+ } -+ -+ // Extract the files -+ - ZipInputStream zis = new ZipInputStream(in); - ZipEntry e; - while ((e = zis.getNextEntry()) != null) { -@@ -695,6 +709,10 @@ - void extractFile(ZipInputStream zis, ZipEntry e) throws IOException { - String name = e.getName(); - File f = new File(e.getName().replace('/', File.separatorChar)); -+ if (!f.getCanonicalPath().startsWith(cwd)) { -+ output(formatMsg("out.ignore.entry", name)); -+ return; -+ } - if (e.isDirectory()) { - if (!f.exists() && !f.mkdirs() || !f.isDirectory()) { - throw new IOException(formatMsg("error.create.dir", f.getPath())); -@@ -705,6 +723,10 @@ - } else { - if (f.getParent() != null) { - File d = new File(f.getParent()); -+ if (!d.getCanonicalPath().startsWith(cwd)) { -+ output(formatMsg("out.ignore.entry", name)); -+ return; -+ } - if (!d.exists() && !d.mkdirs() || !d.isDirectory()) { - throw new IOException(formatMsg("error.create.dir", d.getPath())); - } -Index: j2sdk1.3.1/src/share/classes/sun/tools/jar/resources/jar.properties -=================================================================== -RCS file: /var/jcvs/javasrc_1_3_scsl/j2sdk1.3.1/src/share/classes/sun/tools/jar/resources/jar.properties,v -retrieving revision 1.1.1.1 diff --git a/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties b/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties deleted file mode 100644 index c94b5c82f..000000000 --- a/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../src/share/classes/sun/tools/jar/resources/jar.properties 11 Jul 2001 21:39:05 -0000 1.1.1.1 -+++ ../src/share/classes/sun/tools/jar/resources/jar.properties 27 Apr 2005 05:07:52 -0000 -@@ -30,6 +30,8 @@ - {0} : could not create directory - error.incorrect.length=\ - incorrect length while processing: {0} -+error.no.cwd=\ -+ {0} : could not determine current working directory - out.added.manifest=\ - added manifest - out.update.manifest=\ diff --git a/java/jdk13/files/patch-javai_md.c b/java/jdk13/files/patch-javai_md.c deleted file mode 100644 index 5a70733cc..000000000 --- a/java/jdk13/files/patch-javai_md.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../src/solaris/javavm/runtime/javai_md.c 24 Jul 2003 07:06:56 -0000 1.7 -+++ ../src/solaris/javavm/runtime/javai_md.c 15 Jan 2004 07:37:23 -0000 -@@ -137,7 +137,7 @@ - #ifdef __linux__ - #define DEFAULT_LD_LIBRARY_PATH "/usr/lib:/lib" /* See ld.so(8) */ - #else --#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */ -+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */ - #endif - { - /* Get the user setting of LD_LIBRARY_PATH */ diff --git a/java/jdk13/files/patch-monitor_md.c b/java/jdk13/files/patch-monitor_md.c deleted file mode 100644 index b47390878..000000000 --- a/java/jdk13/files/patch-monitor_md.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../src/solaris/hpi/native_threads/src/monitor_md.c 11 Jul 2001 21:42:33 -0000 1.1.1.1 -+++ ../src/solaris/hpi/native_threads/src/monitor_md.c 22 Nov 2004 17:19:50 -0000 -@@ -132,7 +132,7 @@ - mid->monitor_owner = self; - mid->entry_count = 1; - return SYS_OK; -- } else if (err == EBUSY) { /* it's already locked */ -+ } else if (err == EBUSY || err == EDEADLK) { /* it's already locked */ - if (mid->monitor_owner == self) { - mid->entry_count++; - return SYS_OK; diff --git a/java/jdk13/files/patch-mutex.hpp b/java/jdk13/files/patch-mutex.hpp deleted file mode 100644 index af669fc01..000000000 --- a/java/jdk13/files/patch-mutex.hpp +++ /dev/null @@ -1,20 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/src/share/vm/runtime/mutex.hpp 17 Aug 2001 22:56:19 -0000 1.1.1.2 -+++ ../../hotspot1.3.1/src/share/vm/runtime/mutex.hpp 22 Nov 2004 17:19:42 -0000 -@@ -55,7 +55,6 @@ - debug_only(Thread* _last_owner;) // the last thread to own the lock - #endif - -- void set_owner_implementation(Thread* owner) PRODUCT_RETURN; - void trace (const char* operation) PRODUCT_RETURN; - void check_prelock_state (Thread* thread) PRODUCT_RETURN; - void check_block_state (Thread* thread) PRODUCT_RETURN; -@@ -69,6 +68,7 @@ - _allow_vm_block_flag = true - }; - -+ void set_owner_implementation(Thread* owner) PRODUCT_RETURN; - Mutex(int prio, const char *name, bool allow_vm_block = !_allow_vm_block_flag); - ~Mutex(); - diff --git a/java/jdk13/files/patch-nsCOMPtr.h b/java/jdk13/files/patch-nsCOMPtr.h deleted file mode 100644 index 8c629a684..000000000 --- a/java/jdk13/files/patch-nsCOMPtr.h +++ /dev/null @@ -1,22 +0,0 @@ -$FreeBSD$ - ---- ../ext/plugin/oji-plugin/include/solaris/navig5/nsCOMPtr.h 11 Jul 2001 21:45:15 -0000 1.1.1.1 -+++ ../ext/plugin/oji-plugin/include/solaris/navig5/nsCOMPtr.h 30 Aug 2004 06:21:43 -0000 -@@ -600,7 +600,7 @@ - Specializing |nsCOMPtr| for |nsISupports| allows us to - */ - --// template <> -+template <> - class nsCOMPtr<nsISupports> - : private nsCOMPtr_base - { -@@ -843,7 +843,7 @@ - }; - - --// template <> -+template <> - class nsGetterAddRefs<nsISupports> - { - public: diff --git a/java/jdk13/files/patch-os_bsd.hpp b/java/jdk13/files/patch-os_bsd.hpp deleted file mode 100644 index 26609b5d8..000000000 --- a/java/jdk13/files/patch-os_bsd.hpp +++ /dev/null @@ -1,22 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp 16 Jan 2002 18:46:39 -0000 1.2 -+++ ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp 22 Nov 2004 17:19:42 -0000 -@@ -186,7 +186,7 @@ - bool trylock() { - verify(); - int status = pthread_mutex_trylock(_mutex); -- if (status == EBUSY) -+ if (status == EBUSY || status = EDEADLK) - return false; - assert(status == 0, "pthread_mutex_lock"); - #ifndef PRODUCT -@@ -349,7 +349,7 @@ - bool trylock() { - verify(); - int status = pthread_mutex_trylock(_mutex); -- if (status == EBUSY) -+ if (status == EBUSY || status = EDEADLK) - return false; - assert(status == 0, "pthread_mutex_trylock"); - #ifndef PRODUCT diff --git a/java/jdk13/files/patch-os_linux.cpp b/java/jdk13/files/patch-os_linux.cpp deleted file mode 100644 index 91bce2047..000000000 --- a/java/jdk13/files/patch-os_linux.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/src/os/linux/vm/os_linux.cpp.orig Tue Jan 20 10:49:50 2004 -+++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.cpp Tue Jan 20 10:50:14 2004 -@@ -319,7 +319,7 @@ - #define SUNRSASIGN_JAR "/lib/sunrsasign.jar" - #define CLASSES_DIR "/classes" - #define EXTENSIONS_DIR "/lib/ext" --#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */ -+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */ - - char *v; /* tmp var */ - { diff --git a/java/jdk13/files/patch-os_linux.hpp b/java/jdk13/files/patch-os_linux.hpp deleted file mode 100644 index f21e6129b..000000000 --- a/java/jdk13/files/patch-os_linux.hpp +++ /dev/null @@ -1,22 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 5 Jun 2002 05:27:47 -0000 1.4 -+++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 22 Nov 2004 17:19:42 -0000 -@@ -186,7 +186,7 @@ - bool trylock() { - verify(); - int status = os::Solaris::mutex_trylock(_mutex); -- if (status == EBUSY) -+ if (status == EBUSY || status == EDEADLK) - return false; - assert(status == 0, "mutex_lock"); - return true; -@@ -348,7 +348,7 @@ - bool trylock() { - verify(); - int status = os::Solaris::mutex_trylock(_mutex); -- if (status == EBUSY) -+ if (status == EBUSY || status == EDEADLK) - return false; - assert(status == 0, "mutex_trylock"); - return true; diff --git a/java/jdk13/files/patch-scavenge.hpp b/java/jdk13/files/patch-scavenge.hpp deleted file mode 100644 index 406384ae7..000000000 --- a/java/jdk13/files/patch-scavenge.hpp +++ /dev/null @@ -1,24 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/src/share/vm/memory/scavenge.hpp 11 Jul 2001 21:33:24 -0000 1.1.1.1 -+++ ../../hotspot1.3.1/src/share/vm/memory/scavenge.hpp 22 Nov 2004 17:19:42 -0000 -@@ -91,6 +91,9 @@ - // fill the new generation large dummy objects - static void fill_newgen(); - -+ // Scavenge entry point called from VM operation -+ static void invoke_at_safepoint(int size_to_be_allocated, bool deferred, bool& notify_ref_lock); -+ - private: - // Scavenge functions and java/lang/ref handling - static void scavenge_oop(oop* p); -@@ -121,9 +124,6 @@ - - static void compute_scavenge_functions(); - -- // Scavenge entry point called from VM operation -- static void invoke_at_safepoint(int size_to_be_allocated, bool deferred, bool& notify_ref_lock); -- - // Cheney scan - static void evacuate_followers(); - diff --git a/java/jdk13/files/patch-shared.hpp b/java/jdk13/files/patch-shared.hpp deleted file mode 100644 index d7211f301..000000000 --- a/java/jdk13/files/patch-shared.hpp +++ /dev/null @@ -1,34 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/src/share/vm/interpreter/shared.hpp 11 Jul 2001 21:33:22 -0000 1.1.1.1 -+++ ../../hotspot1.3.1/src/share/vm/interpreter/shared.hpp 22 Nov 2004 17:19:42 -0000 -@@ -35,15 +35,13 @@ - // to control the C++ namespace. - class OptoReg VALUE_OBJ_CLASS_SPEC { - public: -- enum Name { -- // Chunk 0 -+ typedef int Name; - #ifdef COMPILER2 -- Physical = AdlcVMDeps::Physical, // Start of physical regs -+ static const Name Physical = AdlcVMDeps::Physical; // Start of physical regs - #endif -- // A few oddballs at the edge of the world -- Special = -2, // All special (not allocated) values -- Bad = -1 // Not a register -- }; -+ // A few oddballs at the edge of the world -+ static const Name Special = -2; // All special (not allocated) values -+ static const Name Bad = -1; // Not a register - - // Increment a register number. As in: - // "for ( OptoReg::Name i; i=Control; i = add(i,1) ) ..." -@@ -64,7 +62,7 @@ - // when we do not yet know how big the frame will be. - class VMReg VALUE_OBJ_CLASS_SPEC { - public: -- enum Name { }; -+ typedef int Name; - }; - - diff --git a/java/jdk13/files/patch-t2kScalerContext.cpp b/java/jdk13/files/patch-t2kScalerContext.cpp deleted file mode 100644 index 53034bc3b..000000000 --- a/java/jdk13/files/patch-t2kScalerContext.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp 12 Jul 2001 21:54:30 -0000 1.2 -+++ ../src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp 10 Aug 2004 14:29:24 -0000 -@@ -784,7 +784,7 @@ - CMAPMapper::CharsToGlyphs( - int count, const Unicode unicodes[], UInt32 glyphs[]) const - { -- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs); -+ ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs); - } - - ////////////////////////////////////////////////////////////////////////////// diff --git a/java/jdk13/files/patch-vm.make b/java/jdk13/files/patch-vm.make deleted file mode 100644 index 79a99183f..000000000 --- a/java/jdk13/files/patch-vm.make +++ /dev/null @@ -1,35 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot1.3.1/build/linux/makefiles/vm.make 23 Jul 2004 18:17:54 -0000 1.7 -+++ ../../hotspot1.3.1/build/linux/makefiles/vm.make 22 Nov 2004 17:19:42 -0000 -@@ -62,7 +62,7 @@ - BUILD_VERSION = -DHOTSPOT_BUILD_VERSION="\"$(HOTSPOT_BUILD_VERSION)\"" - BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = - --CPPFLAGS = ${SYSDEFS} ${INCLUDES} ${BUILD_VERSION} -+CXXFLAGS += ${SYSDEFS} ${INCLUDES} ${BUILD_VERSION} - - # Suppress warnings (for now) - CFLAGS += -w -@@ -70,9 +70,9 @@ - # do not include shared lib path in a.outs - #AOUT_FLAGS += -norunpath - --COMPILE = ${CPP} ${CPPFLAGS} ${CFLAGS} --LINK_LIB = ${CPP} -shared -mimpure-text --LINK = ${CPP} ${AOUT_FLAGS} -+COMPILE = ${CXX} ${CXXFLAGS} ${CFLAGS} -+LINK_LIB = ${CXX} -shared -mimpure-text -+LINK = ${CXX} ${AOUT_FLAGS} - - - COMPILE.s = ${COMPILE} -S -@@ -157,7 +157,7 @@ - LAUNCHER = $(GAMMADIR)/src/os/$(Platform_os_family)/launcher - LAUNCHERFLAGS = -I$(LAUNCHER) -I$(GAMMADIR)/src/share/vm/prims - launcher.o: launcher.c $(LAUNCHER)/java.c $(LAUNCHER)/java_md.c -- $(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS) -+ $(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CXXFLAGS) - - # Figure out how to turn this off: - #LAUNCHERFLAGS += -DOLDJAVA diff --git a/java/jdk13/pkg-descr b/java/jdk13/pkg-descr deleted file mode 100644 index f923cbfd2..000000000 --- a/java/jdk13/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -This is the latest patchset from the Java 2 FreeBSD porting project. This -port allows you to easily build a native JDK1.3.1 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. -Due to the same reasons you have to manually fetch the source code and patchset -for FreeBSD. - -WWW: http://www.freebsd.org/java/ - http://www.eyesbeyond.com/freebsddom/java/index.html - http://www.sun.com/software/communitysource/java2/ diff --git a/java/jdk13/pkg-message b/java/jdk13/pkg-message deleted file mode 100644 index 1078eecc4..000000000 --- a/java/jdk13/pkg-message +++ /dev/null @@ -1,966 +0,0 @@ -SUN COMMUNITY SOURCE LICENSE -Version 2.3 -(Rev. Date February 22, 1999) - -RECITALS - -Original Contributor has developed Specifications and Source Code -implementations of certain Technology; and - -Original Contributor desires to license the Technology to a large community to -facilitate research, innovation and product development while maintaining -compatibility of such products with the Technology as delivered by Original -Contributor; and - -Original Contributor desires to license certain Sun Trademarks for the purpose -of branding products that are compatible with the relevant Technology delivered -by Original Contributor; and - -You desire to license the Technology and possibly certain Sun Trademarks from -Original Contributor on the terms and conditions specified in this License. - -In consideration for the mutual covenants contained herein, You and Original -Contributor agree as follows: - -AGREEMENT - -1. Introduction. The Sun Community Source License and effective attachments -("License") may include five distinct licenses: Research Use, TCK, Internal -Deployment Use, Commercial Use and Trademark License. The Research Use license -is effective when You click and accept this License. The TCK and Internal -Deployment Use licenses are effective when You click and accept this License, -unless otherwise specified in the TCK and Internal Deployment Use attachments. -The Commercial Use and Trademark licenses must be signed by You and Original -Contributor in order to become effective. Once effective, these licenses and the -associated requirements and responsibilities are cumulative. Capitalized terms -used in this License are defined in the Glossary. - -2. License Grants. - -2.1 Original Contributor Grant. Subject to Your compliance with Sections 3, -8.10 and Attachment A of this License, Original Contributor grants to You a -worldwide, royalty-free, non- exclusive license, to the extent of Original -Contributor's Intellectual Property Rights covering the Original Code, Upgraded -Code and Specifications, to do the following: - -a) Research Use License: - (i) use, reproduce and modify the Original Code, Upgraded Code and -Specifications to create Modifications and Reformatted Specifications for -Research Use by You, - (ii) publish and display Original Code, Upgraded Code and -Specifications with, or as part of Modifications, as permitted under Section 3.1 -b) below, - (iii) reproduce and distribute copies of Original Code and Upgraded -Code to Licensees and students for Research Use by You, - (iv) compile, reproduce and distribute Original Code and Upgraded -Code in Executable form, and Reformatted Specifications to anyone for Research -Use by You. - -b) Other than the licenses expressly granted in this License, Original -Contributor retains all right, title, and interest in Original Code and Upgraded -Code and Specifications. - -2.2 Your Grants. - -a) To Other Licensees. You hereby grant to each Licensee a license to Your -Error Corrections and Shared Modifications, of the same scope and extent as -Original Contributor's licenses under Section 2.1 a) above relative to Research -Use, Attachment C relative to Internal Deployment Use, and Attachment D relative -to Commercial Use. - -b) To Original Contributor. You hereby grant to Original Contributor a -worldwide, royalty-free, non-exclusive, perpetual and irrevocable license, to -the extent of Your Intellectual Property Rights covering Your Error Corrections, -Shared Modifications and Reformatted Specifications, to use, reproduce, modify, -display and distribute Your Error Corrections, Shared Modifications and -Reformatted Specifications, in any form, including the right to sublicense such -rights through multiple tiers of distribution. - -c) Other than the licenses expressly granted in Sections 2.2 a) and b) -above, and the restriction set forth in Section 3.1 d)(iv) below, You retain all -right, title, and interest in Your Error Corrections, Shared Modifications and -Reformatted Specifications. - -2.3 Contributor Modifications. You may use, reproduce, modify, display and -distribute Contributor Error Corrections, Shared Modifications and Reformatted -Specifications, obtained by You under this License, to the same scope and extent -as with Original Code, Upgraded Code and Specifications. - -2.4 Subcontracting. You may deliver the Source Code of Covered Code to other -Licensees having at least a Research Use license, for the sole purpose of -furnishing development services to You in connection with Your rights granted in -this License. All such Licensees must execute appropriate documents with respect -to such work consistent with the terms of this License, and acknowledging their -work-made-for-hire status or assigning exclusive right to the work product and -associated Intellectual Property Rights to You. - -3. Requirements and Responsibilities. -3.1 Research Use License. As a condition of exercising the rights granted -under Section 2.1 a) above, You agree to comply with the following: - -a) Your Contribution to the Community. All Error Corrections and Shared -Modifications which You create or contribute to are automatically subject to the -licenses granted under Section 2.2 above. You are encouraged to license all of -Your other Modifications under Section 2.2 as Shared Modifications, but are not -required to do so. You agree to notify Original Contributor of any errors in the -Specification. - -b) Source Code Availability. You agree to provide all Your Error -Corrections to Original Contributor as soon as reasonably practicable and, in -any event, prior to Internal Deployment Use or Commercial Use, if applicable. -Original Contributor may, at its discretion, post Source Code for Your Error -Corrections and Shared Modifications on the Community Webserver. You may also -post Error Corrections and Shared Modifications on a web-server of Your choice; -provided, that You must take reasonable precautions to ensure that only -Licensees have access to such Error Corrections and Shared Modifications. Such -precautions shall include, without limitation, a password protection scheme -limited to Licensees and a click-on, download certification of Licensee status -required of those attempting to download from the server. An example of an -acceptable certification is attached as Attachment A-2. - -c) Notices. All Error Corrections and Shared Modifications You create or -contribute to must include a file documenting the additions and changes You made -and the date of such additions and changes. You must also include the notice set -forth in Attachment A-1 in the file header. If it is not possible to put the -notice in a particular Source Code file due to its structure, then You must -include the notice in a location (such as a relevant directory file), where a -recipient would be most likely to look for such a notice. - -d) Redistribution. - - (i) Source. Covered Code may be distributed in Source Code form only -to another Licensee (except for students as provided below). You may not offer -or impose any terms on any Covered Code that alter the rights, requirements, or -responsibilities of such Licensee. You may distribute Covered Code to students -for use in connection with their course work and research projects undertaken at -accredited educational institutions. Such students need not be Licensees, but -must be given a copy of the notice set forth in Attachment A-3 and such notice -must also be included in a file header or prominent location in the Source Code -made available to such students. - - (ii) Executable. You may distribute Executable version(s) of Covered -Code to Licensees and other third parties only for the purpose of evaluation and -comment in connection with Research Use by You and under a license of Your -choice, but which limits use of such Executable version(s) of Covered Code only -to that purpose. - - (iii) Modified Class, Interface and Package Naming. In connection -with Research Use by You only, You may use Original -Contributor’s class, interface and package names only to accurately reference or -invoke the Source Code files You modify. -Original Contributor grants to You a limited license to the extent necessary for -such purposes. - - (iv) You expressly agree that any distribution, in whole or in part, -of Modifications developed by You shall only be done pursuant to the term and -conditions of this License. - -e) Extensions. - - (i) Covered Code. You may not include any Source Code of Community -Code in any Extensions; - - (ii) Publication. No later than the date on which You first -distribute such Extension for Commercial Use, You must publish to the industry, -on a non-confidential basis and free of all copyright restrictions with respect -to reproduction and use, an accurate and current specification for any -Extension. In addition, You must make available an appropriate test suite, -pursuant to the same rights as the specification, sufficiently detailed to allow -any third party reasonably skilled in the technology to produce implementations -of the Extension compatible with the specification. Such test suites must be -made available as soon as reasonably practicable but, in no event, later than -ninety (90) days after Your first Commercial Use of the Extension. You must use -reasonable efforts to promptly clarify and correct the specification and the -test suite upon written request by Original Contributor. - - (iii) Open. You agree to refrain from enforcing any Intellectual -Property Rights You may have covering any interface(s) of Your Extension, which -would prevent the implementation of such interface(s) by Original Contributor or -any Licensee. This obligation does not prevent You from enforcing any -Intellectual Property Right You have that would otherwise be infringed by an -implementation of Your Extension. - - (iv) Class, Interface and Package Naming. You may not add any -packages, or any public or protected classes or interfaces with names that -originate or might appear to originate from Original Contributor including, -without limitation, package or class names which begin with "sun", "java", -"javax", "jini", "net.jini", "com.sun" or their equivalents in any subsequent -class, interface and/ or package naming convention adopted by Original -Contributor. It is specifically suggested that You name any new packages using -the "Unique Package Naming Convention" as described in "The Java Language -Specification" by James Gosling, Bill Joy, and Guy Steele, ISBN 0-201-63451-1, -August 1996. Section 7.7 "Unique Package Names", on page 125 of this -specification which states, in part: - -"You form a unique package name by first having (or belonging to an organization -that has) an Internet domain name, such as "sun.com". You then reverse the name, -component by component, to obtain, in this example, "Com.sun", and use this as a -prefix for Your package names, using a convention developed within Your -organization to further administer package names." - -3.2 Additional Requirements and Responsibilities. Any additional -requirements and responsibilities relating to the Technology are listed in -Attachment F (Additional Requirements and Responsibilities), if applicable, and -are hereby incorporated into this Section 3. - -4. Versions of the License. - -4.1 License Versions. Original Contributor may publish revised versions of -the License from time to time. Each version will be given a distinguishing -version number. - -4.2 Effect. Once a particular version of Covered Code has been provided -under a version of the License, You may always continue to use such Covered Code -under the terms of that version of the License. You may also choose to use such -Covered Code under the terms of any subsequent version of the License. No one -other than Original Contributor has the right to promulgate License versions. - -5. Disclaimer of Warranty. - -5.1 COVERED CODE IS PROVIDED UNDER THIS LICENSE "AS IS", WITHOUT WARRANTY OF -ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES -THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR -PURPOSE OR NON-INFRINGING. YOU AGREE TO BEAR THE ENTIRE RISK IN CONNECTION WITH -YOUR USE AND DISTRIBUTION OF COVERED CODE UNDER THIS LICENSE. THIS DISCLAIMER OF -WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED -CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER. - -5.2 You acknowledge that Original Code, Upgraded Code and Specifications are -not designed or intended for use in (i) on-line control of aircraft, air -traffic, aircraft navigation or aircraft communications; or (ii) in the design, -construction, operation or maintenance of any nuclear facility. Original -Contributor disclaims any express or implied warranty of fitness for such uses. - -6. Termination. - -6.1 By You. You may terminate this Research Use license at anytime by -providing written notice to Original Contributor. - -6.2 By Original Contributor. This License and the rights granted hereunder -will terminate: - - (i) automatically if You fail to comply with the terms of this -License and fail to cure such breach within 30 days of receipt of written notice -of the breach; - - (ii) immediately in the event of circumstances specified in Sections -7.1 and 8.4; or - - (iii) at Original Contributor's discretion upon any action initiated -in the first instance by You alleging that use or distribution by Original -Contributor or any Licensee, of Original Code, Upgraded Code, Error Corrections -or Shared Modifications contributed by You, or Specifications, infringe a patent -owned or controlled by You. - -6.3 Effective of Termination. Upon termination, You agree to discontinue use -and return or destroy all copies of Covered Code in Your possession. All -sublicenses to the Covered Code which You have properly granted shall survive -any termination of this License. Provisions which, by their nature, should -remain in effect beyond the termination of this License shall survive including, -without limitation, Sections 2.2, 3, 5, 7 and 8. - -6.4 Each party waives and releases the other from any claim to compensation -or indemnity for permitted or lawful termination of the business relationship -established by this License. - -7. Liability. - -7.1 Infringement. Should any of the Original Code, Upgraded Code, TCK or -Specifications ("Materials") become the subject of a claim of infringement, -Original Contributor may, at its sole option, (i) attempt to procure the rights -necessary for You to continue using the Materials, (ii) modify the Materials so -that they are no longer infringing, or (iii) terminate Your right to use the -Materials, immediately upon written notice, and refund to You the amount, if -any, having then actually been paid by You to Original Contributor for the -Original Code, Upgraded Code and TCK, depreciated on a straight line, five year -basis. - -7.2 LIMITATION OF LIABILITY. TO THE FULL EXTENT ALLOWED BY APPLICABLE LAW, -ORIGINAL CONTRIBUTOR's LIABILITY TO YOU FOR CLAIMS RELATING TO THIS LICENSE, -WHETHER FOR BREACH OR IN TORT, SHALL BE LIMITED TO ONE HUNDRED PERCENT (100%) OF -THE AMOUNT HAVING THEN ACTUALLY BEEN PAID BY YOU TO ORIGINAL CONTRIBUTOR FOR ALL -COPIES LICENSED HEREUNDER OF THE PARTICULAR ITEMS GIVING RISE TO SUCH CLAIM, IF -ANY. IN NO EVENT WILL YOU (RELATIVE TO YOUR SHARED MODIFICATIONS OR ERROR -CORRECTIONS) OR SUN BE LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES IN CONNECTION WITH OR ARISING OUT OF THIS LICENSE -(INCLUDING, WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR OTHER ECONOMIC -ADVANTAGE), HOWEVER IT ARISES AND ON ANY THEORY OF LIABILITY, WHETHER IN AN -ACTION FOR CONTRACT, STRICT LIABILITY OR TORT (INCLUDING NEGLIGENCE) OR -OTHERWISE, WHETHER OR NOT YOU OR ORIGINAL CONTRIBUTOR HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE -OF ANY REMEDY. - -8. Miscellaneous. - -8.1 Trademark. You agree to comply with the then current Sun Trademark & -Logo Usage Requirements accessible through the SCSL Webpage. Except as expressly -provided in the License, You are granted no right, title or license to, or -interest in, any Sun Trademarks. You agree not to (i) challenge Original -Contributor's ownership or use of Sun Trademarks; (ii) attempt to register any -Sun Trademarks, or any mark or logo substantially similar thereto; or (iii) -incorporate any Sun Trademarks into Your own trademarks, product names, service -marks, company names, or domain names. - -8.2 Integration. This License represents the complete agreement concerning -the subject matter hereof. - -8.3 Assignment. Original Contributor may assign this License, and its rights -and obligations hereunder, in its sole discretion. You may assign the Research -Use portions of this License to a third party upon prior written notice to -Original Contributor (which may be provided via the Community Web-Server). You -may not assign the Commercial Use license or TCK license, including by way of -merger (regardless of whether You are the surviving entity) or acquisition, -without Original Contributor's prior written consent. - -8.4 Severability. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent necessary to -make it enforceable. Notwithstanding the foregoing, if You are prohibited by law -from fully and specifically complying with Sections 2.2 or 3, this License will -immediately terminate and You must immediately discontinue any use of Covered -Code. - -8.5 Governing Law. This License shall be governed by the laws of the United -States and the State of California, as applied to contracts entered into and to -be performed in California between California residents. The application of the -United Nations Convention on Contracts for the International Sale of Goods is -expressly excluded. - -8.6 Dispute Resolution. - -a) Any dispute arising out of or relating to this License shall be finally -settled by arbitration as set out herein, except that either party may bring any -action, in a court of competent jurisdiction (which jurisdiction shall be -exclusive), with respect to any dispute relating to such party's Intellectual -Property Rights or with respect to Your compliance with the TCK license. -Arbitration shall be administered: (i) by the American Arbitration Association -(AAA), (ii) in accordance with the rules of the United Nations Commission on -International Trade Law (UNCITRAL) (the "Rules") in effect at the time of -arbitration as modified herein; and (iii) the arbitrator will apply the -substantive laws of California and United States. Judgement upon the award -rendered by the arbitrator may be entered in any court having jurisdiction to -enforce such award. - -b) All arbitration proceedings shall be conducted in English by a single -arbitrator selected in accordance with the Rules, who must be fluent in English -and be either a retired judge or practicing attorney having at least ten (10) -years litigation experience and be reasonably familiar with the technology -matters relative to the dispute. Unless otherwise agreed, arbitration venue -shall be in London, Tokyo, or San Francisco, whichever is closest to defendant's -principal business office. The arbitrator may award monetary damages only and -nothing shall preclude either party from seeking provisional or emergency relief -from a court of competent jurisdiction. The arbitrator shall have no authority -to award damages in excess of those permitted in this License and any such award -in excess is void. All awards will be payable in U.S. dollars and may include, -for the prevailing party (i) pre-judgment award interest, (ii) reasonable -attorneys' fees incurred in connection with the arbitration, and (iii) -reasonable costs and expenses incurred in enforcing the award. The arbitrator -will order each party to produce identified documents and respond to no more -than twenty-five single question interrogatories. - -8.7 Construction. Any law or regulation which provides that the language of -a contract shall be construed against the drafter shall not apply to this -License. - -8.8 U.S. Government End Users. The Covered Code is a "commercial item", as -that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial -computer software" and "commercial computer software documentation", as such -terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. -12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. -Government End Users acquire Covered Code with only those rights set forth -herein. You agree to pass this notice to Your licensees. - -8.9 Press Announcements. All press announcements relative to the execution -of this License must be reviewed and approved by Original Contributor and You -prior to release. - -8.10 International Use. - -a) Export/Import laws. Covered Code is subject to U.S. export control laws -and may be subject to export or import regulations in other countries. Each -party agrees to comply strictly with all such laws and regulations and -acknowledges their responsibility to obtain such licenses to export, re- export, -or import as may be required. You agree to pass these obligations to Your -licensees. - -b) Intellectual Property Protection. Due to limited intellectual property -protection and enforcement in certain countries, You agree not to redistribute -the Original Code, Upgraded Code, TCK and Specifications to any country other -than the list of restricted countries on the SCSL Webpage. - -8.11 Language. This License is in the English language only, which language -shall be controlling in all respects, and all versions of this License in any -other language shall be for accommodation only and shall not be binding on the -parties to this License. All communications and notices made or given pursuant -to this License, and all documentation and support to be provided, unless -otherwise noted, shall be in the English language. - -PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY. BY CLICKING ON THE "ACCEPT" -BUTTON BELOW YOU ARE ACCEPTING AND AGREEING TO THE TERMS AND CONDITIONS OF THIS -LICENSE WITH SUN MICROSYSTEMS, INC. IF YOU ARE AGREEING TO THIS LICENSE ON -BEHALF OF A COMPANY, YOU REPRESENT THAT YOU ARE AUTHORIZED TO BIND THE COMPANY -TO SUCH A LICENSE. WHETHER YOU ARE ACTING ON YOUR OWN BEHALF, OR REPRESENTING A -COMPANY, YOU MUST BE OF MAJORITY AGE AND BE OTHERWISE COMPETENT TO ENTER INTO -CONTRACTS. IF YOU DO NOT MEET THIS CRITERIA OR YOU DO NOT AGREE TO ANY OF THE -TERMS AND CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON TO EXIT. - -ACCEPT REJECT - -GLOSSARY - -1. "Commercial Use" means any use (excluding Internal Deployment Use) or -distribution, directly or indirectly of Compliant Covered Code by You to any -third party, alone or bundled with any other software or hardware, for direct or -indirect commercial or strategic gain or advantage, subject to execution of -Attachment D by You and Original Contributor. - -2. "Community Code" means the Original Code, Upgraded Code, Error -Corrections, Shared Modifications, or any combination thereof. - -3. "Community Webserver(s)" means the webservers designated by Original -Contributor for posting Error Corrections and Shared Modifications. - -4. "Compliant Covered Code" means Covered Code that complies with the -requirements of the TCK. - -5. "Contributor" means each Licensee that creates or contributes to the -creation of any Error Correction or Shared Modification. - -6. "Covered Code" means the Original Code, Upgraded Code, Modifications, or -any combination thereof. - -7. "Error Correction" means any change made to Community Code which -conforms to the Specification and corrects the adverse effect of a failure of -Community Code to perform any function set forth in or required by the -Specifications. - -7. "Executable" means Covered Code that has been converted to a form other -than Source Code. - -9. "Extension(s)" means any additional classes or other programming code -and/or interfaces developed by or for You which: (i) are designed for use with -the Technology; (ii) constitute an API for a library of computing functions or -services; and (iii) are disclosed to third party software developers for the -purpose of developing software which invokes such additional classes or other -programming code and/or interfaces. The foregoing shall not apply to software -development by Your subcontractors to be exclusively used by You. - -10. "Intellectual Property Rights" means worldwide statutory and common law -rights associated solely with (i) patents and patent applications; (ii) works of -authorship including copyrights, copyright applications, copyright registrations -and "moral rights"; (iii) the protection of trade and industrial secrets and -confidential information; and (iv) divisions, continuations, renewals, and re- -issuances of the foregoing now existing or acquired in the future. - -11. "Internal Deployment Use" means use of Compliant Covered Code (excluding -Research Use) within Your business or organization only by Your employees and/or -agents, subject to execution of Attachment C by You and Original Contributor, if -required. - -12. "Licensee" means any party that has entered into and has in effect a -version of this License with Original Contributor. - -13. "Modification(s)" means (i) any change to Covered Code; (ii) any new -file or other representation of computer program statements that contains any -portion of Covered Code; and/or (iii) any new Source Code implementing any -portion of the Specifications. - -14. "Original Code" means the initial Source Code for the Technology as -described on the Technology Download Site. - -15. "Original Contributor" means Sun Microsystems, Inc., its affiliates and -its successors and assigns. - -16. "Reformatted Specifications" means any revision to the Specifications -which translates or reformats the Specifications (as for example in connection -with Your documentation) but which does not alter, subset or superset the -functional or operational aspects of the Specifications. - -17. "Research Use" means use and distribution of Covered Code only for Your -research, development, educational or personal and individual use, and expressly -excludes Internal Deployment Use and Commercial Use. - -18. "SCSL Webpage" means the Sun Community Source license webpage located at -http://sun.com/software/communitysource, or such other url that Sun may -designate from time to time. - -19. "Shared Modifications" means Modifications provided by You, at Your -option, pursuant to Section 2.2, or received by You from a Contributor pursuant -to Section 2.3. - -20. "Source Code" means computer program statements written in any -high-level, readable form suitable for modification and development. - -21. "Specifications" means the specifications for the Technology and other -documentation, as designated on the Technology Download Site, as may be revised -by Original Contributor from time to time. - -22. "Sun Trademarks" means Original Contributor's SUN, JAVA, and JINI -trademarks and logos, whether now used or adopted in the future. - -23. "Technology" means the technology described in Attachment B, and -Upgrades. - -24. "Technology Compatibility Kit" or "TCK" means the test programs, -procedures and/or other requirements, designated by Original Contributor for use -in verifying compliance of Covered Code with the Specifications, in conjunction -with the Original Code and Upgraded Code. Original Contributor may, in its sole -discretion and from time to time, revise a TCK to correct errors and/or -omissions and in connection with Upgrades. - -25. "Technology Download Site" means the site(s) designated by Original -Contributor for access to the Original Code, Upgraded Code, TCK and -Specifications. - -26. "Upgrade(s)" means new versions of Technology designated exclusively by -Original Contributor as an "Upgrade" and released by Original Contributor from -time to time. - -27. "Upgraded Code" means the Source Code for Upgrades, possibly including -Modifications made by Contributors. - -28. "You(r)" means an individual, or a legal entity acting by and through an -individual or individuals, exercising rights either under this License or under -a future version of this License issued pursuant to Section 4.1. For legal -entities, "You(r)" includes any entity that by majority voting interest -controls, is controlled by, or is under common control with You. - -ATTACHMENT A - -REQUIRED NOTICES - - -ATTACHMENT A-1 - -REQUIRED IN ALL CASES - -"The contents of this file, or the files included with this file, are subject to -the current version of Sun Community Source License for [fill in name of -applicable Technology] (the "License"); You may not use this file except in -compliance with the License. You may obtain a copy of the License at -http://sun.com/software/communitysource. See the License for the rights, -obligations and limitations governing use of the contents of the file. - - -The Original and Upgraded Code is [fill in name and version of applicable -Technology]. The developer of the Original and Upgraded Code is Sun -Microsystems, Inc. Sun Microsystems, Inc. owns the copyrights in the portions it -created. All Rights Reserved. - - - Contributor(s): _______________________________________________ - -Associated Test Suite(s) Location: ________________________________" - - - -ATTACHMENT A-2 - -SAMPLE LICENSEE CERTIFICATION - -"By clicking the 'Agree' button below, You certify that You are a Licensee in -good standing under the Sun Community Source License, [fill in applicable -Technology and Version] ("License") and that Your access, use and distribution -of code and information You may obtain at this site is subject to the License."” - - - -ATTACHMENT A-3 - -REQUIRED STUDENT NOTIFICATION - -"This software and related documentation has been obtained by your educational -institution subject to the Sun Community Source License, [fill in applicable -Technology]. You have been provided access to the software and related -documentation for use only in connection with your course work and research -activities as a matriculated student of your educational institution. Any other -use is expressly prohibited. - -THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY MATERIAL OF SUN -MICROSYSTEMS, INC, WHICH ARE PROTECTED BY VARIOUS INTELLECTUAL PROPERTY RIGHTS. - -You may not use this file except in compliance with the License. You may obtain -a copy of the License on the web at http://sun.com/software/communitysource."” - - - -ATTACHMENT B - -Java(tm) 2 SDK Technology - -Description of "Technology" - -Java(tm) 2 SDK Technology v.1.3.1 as described on the Technology Download Site. - - - -ATTACHMENT C - -INTERNAL DEPLOYMENT USE - -This Attachment C is only effective for the Technology specified in Attachment -B, upon execution of Attachment D (Commercial Use License) including the -requirement to pay royalties. In the event of a conflict between the terms of -this Attachment C and Attachment D, the terms of Attachment D shall govern. - -1. Internal Deployment License Grant. Subject to Your compliance with -Section 2 below, and Section 8.10 of the Research Use license; in addition to -the Research Use license and the TCK license, Original Contributor grants to You -a worldwide, non-exclusive license, to the extent of Original Contributor's -Intellectual Property Rights covering the Original Code, Upgraded Code and -Specifications, to do the following: - -a) reproduce and distribute internally, Original Code and Upgraded Code as -part of Compliant Covered Code, and Specifications, for Internal Deployment Use, - -b) compile such Original Code and Upgraded Code, as part of Compliant -Covered Code, and reproduce and distribute internally the same in Executable -form for Internal Deployment Use, and - -c) reproduce and distribute internally, Reformatted Specifications for use -in connection with Internal Deployment Use. - - 2. Additional Requirements and Responsibilities. In addition to the -requirements and responsibilities described under Section 3.1 of the Research -Use license, and as a condition to exercising the rights granted under Section 3 -above, You agree to the following additional requirements and responsibilities: - -2.1 Compatibility. All Covered Code must be Compliant Covered Code prior to -any Internal Deployment Use or Commercial Use, whether originating with You or -acquired from a third party. Successful compatibility testing must be completed -in accordance with the TCK License. If You make any further Modifications to any -Covered Code previously determined to be Compliant Covered Code, You must ensure -that it continues to be Compliant Covered Code. - - - -ATTACHMENT D -COMMERCIAL USE LICENSE - -1. Effect. This Attachment D is effective only if signed below by You and -Original Contributor, and applies to Your Commercial Use of Original Code and -Upgraded Code. - -2. Term. Upon execution of this Attachment D by You and Original -Contributor, this Commercial Use license shall have an initial term of 3 years -and shall automatically renew for additional one year terms unless either party -provides notice to the other no less than 60 days prior to an anniversary date. - -3. Commercial Use License Grant. Subject to Your compliance with Section 4 -below, Section 8.10 of the Research Use license, and the TCK license; in -addition to the Research Use license, the TCK license, and the Internal -Deployment Use license, Original Contributor grants to You a worldwide, -non-exclusive, non-transferable license, to the extent of Original Contributor's -Intellectual Property Rights covering the Original Code, Upgraded Code and -Specifications, to do the following: - -a) reproduce and distribute Compliant Covered Code; - -b) compile Compliant Covered Code and reproduce and distribute the same in -Executable form through multiple tiers of distribution; and - -c) reproduce and distribute Reformatted Specifications in association with -Compliant Covered Code. - -4. Additional Requirements and Responsibilities. In addition to the -requirements and responsibilities specified in the Research Use license, the TCK -license and the Internal Deployment license, and as a condition to exercising -the rights granted in Section 3 above, You agree to the following additional -requirements and responsibilities: - -a) Distribution of Source Code. Source Code of Compliant Covered Code may -be distributed only to another Licensee of the same Technology. - -b) Distribution of Executable Code. You may distribute the Executable -version(s) of Compliant Covered Code under a license of Your choice, which may -contain terms different from this License, provided (i) that You are in -compliance with the terms of this License, and (ii) You must make it absolutely -clear that any terms which differ from this License are offered by You alone, -not by Original Contributor or any other Contributor. - -c) Branding. Products integrating Compliant Covered Code used for -Commercial Use must be branded with the Technology compliance logo under a -separate trademark license required to be executed by You and Original -Contributor concurrent with execution of this Attachment D. - -5. Indemnity/Limitation of Liability. The provisions of Section 7.1 of the -Research Use license are superseded by the following: - -a) Your Indemnity Obligation. You hereby agree to defend, at Your expense, -any legal proceeding brought against Original Contributor or any Licensee to the -extent it is based on a claim: (i) that the use, reproduction or distribution of -any of Your Error Corrections or Shared Modifications is an infringement of a -third party trade secret or a copyright in a country that is a signatory to the -Berne Convention; (ii) arising in connection with any representation, warranty, -support, indemnity, liability or other license terms You may offer in connection -with any Covered Code; or (iii) arising from Your Commercial Use of Covered -Code, other than a claim covered by Section 5.b) below, or a patent claim based -solely on Covered Code not provided by You. You will pay all damages costs and -fees awarded by a court of competent jurisdiction, or such settlement amount -negotiated by You, attributable to such claim. - -b) Original Contributor's Indemnity Obligation. Original Contributor will -defend, at its expense, any legal proceeding brought against You, to the extent -it is based on a claim that Your authorized Commercial Use of Original Code and -Upgraded Code is an infringement of a third party trade secret or a copyright in -a country that is a signatory to the Berne Convention, and will pay all damages -costs and fees awarded by a court of competent jurisdiction, or such settlement -amount negotiated by Original Contributor, attributable to such claim. The -foregoing shall not apply to any claims of intellectual property infringement -based upon the combination of code or documentation supplied by Original -Contributor with code, technology or documentation from other sources. - -c) Right of Intervention. Original Contributor will have the right, but not -the obligation, to defend You, at Original Contributor's expense, in connection -with a claim that Your Commercial Use of Original Code and Upgraded Code is an -infringement of a third party patent and will, if Original Contributor chooses -to defend You, pay all damages costs and fees awarded by a court of competent -jurisdiction, or such settlement amount negotiated by Original Contributor, -attributable to such claim. - -d) Prerequisites. Under Sections 5.b) and c) above, You must, and under -Section 5.a) above, Original Contributor or any Licensee must: (i) provide -notice of the claim promptly to the party providing an indemnity; (ii) give the -indemnifying party sole control of the defense and settlement of the claim; -(iii) provide the indemnifying party, at indemnifying party's expense, all -available information, assistance and authority to defend; and (iv) not have -compromised or settled such claim or proceeding without the indemnifying party's -prior written consent. - -e) Additional Remedies. Should any Original Code, Upgraded Code, TCK, -Specifications, or Modifications become, or in the indemnifying party's opinion -be likely to become, the subject of a claim of infringement for which indemnity -is provided above, the indemnifying party may, at its sole option, attempt to -procure on reasonable terms the rights necessary for the indemnified party to -exercise its license rights under this License with respect to the infringing -items, or to modify the infringing items so that they are no longer infringing -without substantially impairing their function or performance. If the -indemnifying party is unable to do the foregoing after reasonable efforts, then -the indemnifying party may send a notice of such inability to the indemnified -party together with a refund of any license fees received by the indemnifying -party from the indemnified party for the infringing items applicable to the -indemnified party's future use or distribution of such infringing items, in -which case the indemnifying party will not be liable for any damages resulting -from infringing activity with respect to the infringing items occurring after -such notice and refund. - -6. Support Programs. - -Support to You. Technical support is not provided to You by Original Contributor -under this License. You may contract for one or more support programs from -Original Contributor relating to the Technology which are described on the SCSL -Webpage. - -Customer Support. You are responsible for providing technical and maintenance -support services to Your customers for Your products and services incorporating -the Compliant Covered code. - -7. Royalties and Payments. - -Technology specified in Attachment B. - - -Field of Use:____________________ - -Royalty per Unit $_______________ - - -b) Royalty Payments. Payment of royalties shall be made quarterly, shall be -due thirty (30) days following the end of the calendar quarter to which they -relate and shall be submitted with a written statement documenting the basis for -the royalty calculation. - -c) Taxes. All payments required by this License shall be made in United -States dollars, are exclusive of taxes, and Licensee agrees to bear and be -responsible for the payment of all such taxes, including, but not limited to, -all sales, use, rental receipt, personal property or other taxes and their -equivalents which may be levied or assessed in connection with this License -(excluding only taxes based on Original Contributor's net income). To the extent -Licensee is required to withhold taxes based upon Original Contributor's income -in any country, You agree to provide Original Contributor with written evidence -of such withholding, suitable for Original Contributor to obtain a tax credit in -the United States. - -d) Records. You agree to maintain account books and records consistent with -Generally Accepted Accounting Principles appropriate to Your domicile, as may be -in effect from time to time, sufficient to allow the correctness of the -royalties required to be paid pursuant to this License to be determined. - -e) Audit Rights. Original Contributor shall have the right to audit such -accounts upon reasonable prior notice using an independent auditor of Original -Contributor's choice (the "Auditor"). The Auditor shall be bound to keep -confidential the details of Your business affairs and to limit disclosure of the -results of any audit to the sufficiency of the accounts and the amount, if any, -of a payment adjustment that should be made. Such audits shall not occur more -than once each year (unless discrepancies are discovered in excess of the five -percent (5%) threshold set forth in Section 7.f) below, in which case two -consecutive quarters per year may be audited). Except as set forth in Section -7.f) below, Original Contributor shall bear all costs and expenses associated -with the exercise of its rights to audit. - -f) Payment Errors. In the event that any errors in payments shall be -determined, such errors shall be corrected by appropriate adjustment in payment -for the quarterly period during which the error is discovered. In the event of -an underpayment of more than five percent (5%) of the proper amount owed, upon -such underpayment being properly determined by the Auditor, You agree to -reimburse Original Contributor the amount of the underpayment and all reasonable -costs and expenses associated with the exercise of its rights to audit, and -interest on the overdue amount at the maximum allowable interest rate from the -date of accrual of such obligation. - -8. Notice of Breach or Infringement. Each party shall notify the other -immediately in writing when it becomes aware of any breach or violation of the -terms of this License, or when You become aware of any potential or actual -infringement by a third party of the Technology or Sun's Intellectual Property -Rights therein. - -9. Proprietary Rights Notices. You may not remove any copyright notices, -trademark notices or other proprietary legends of Original Contributor or its -suppliers contained on or in the Original Code, Upgraded Code and -Specifications. - -10. Notices. All written notices required by this License must be delivered -in person or by means evidenced by a delivery receipt and will be effective upon -receipt by the persons at the addresses specified below. - - -Original Contributor: You: - -Sun Microsystems, Inc. _____________________________ - -901 San Antonio Road ______________________________ - -Palo Alto, California 94303 ______________________________ - -Attn.: VP, Sun Software and -Technology Sales ______________________________ - -cc: Sun Software and Technology, -General Counsel - -11. Disclaimer of Agency. The relationship created hereby is that of -licensor and licensee and the parties hereby acknowledge and agree that nothing -herein shall be deemed to constitute You as a franchisee of Original -Contributor. You hereby waive the benefit of any state or federal statutes -dealing with the establishment and regulation of franchises. - - Agreed: - -You: Original Contributor: - -_____________________________ Sun Microsystems, Inc. -(Your Name) - -By:__________________________ By:________________________ - -Name:________________________ Name:______________________ - -Title_________________________ Title:_____________________ - -Date:_________________________ Date:______________________ - - - - -ATTACHMENT E -TECHNOLOGY COMPATIBILITY KIT - -The following license is effective for the Java(tm)2 SDK Version 1.3.1 -Technology Compatibility Kit only upon execution of a separate support agreement -between You and Original Contributor (subject to an annual fee) as described on -the SCSL Webpage. The Technology Compatibility Kit for the Technology specified -in Attachment B may be accessed at the Technology Download Site only upon -execution of the support agreement. - -1. TCK License. - -a) Subject to the restrictions set forth in Section 1.b below and Section -8.10 of the Research Use license, in addition to the Research Use license, -Original Contributor grants to You a worldwide, non-exclusive, non-transferable -license, to the extent of Original Contributor's Intellectual Property Rights in -the TCK (without the right to sublicense), to use the TCK to develop and test -Covered Code. - -b) TCK Use Restrictions. You are not authorized to create derivative works -of the TCK or use the TCK to test any implementation of the Specification that -is not Covered Code. You may not publish Your test results or make claims of -comparative compatibility with respect to other implementations of the -Specification. In consideration for the license grant in Section 1.a above You -agree not to develop Your own tests which are intended to validate conformation -with the Specification. - -2. Requirements for Determining Compliance. - -2.1 Definitions. - -a) "Added Value" means code which: - - (i) has a principal purpose which is substantially different from -that of the stand-alone Technology; - - (ii) represents a significant functional and value enhancement to the -Technology; - - (iii) operates in conjunction with the Technology; and - - (iv) is not marketed as a technology which replaces or substitutes -for the Technology. - -b) “"Java Classes" means the specific class libraries associated with each -Technology defined in Attachment B. - -c) “"Java Runtime Interpreter" means the program(s) which implement the -Java virtual machine for the Technology as defined in the Specification. - -d) “"Platform Dependent Part" means those Original Code and Upgraded Code -files of the Technology which are not in a "share" directory or subdirectory -thereof. - -e) “"Shared Part" means those Original Code and Upgraded Code files of the -Technology which are identified as "shared" (or words of similar meaning) or -which are in any "share" directory or subdirectory thereof, except those files -specifically designated by Original Contributor as modifiable. - -f) "User's Guide" means the users guide for the TCK which Sun makes -available to You to provide direction in how to run the TCK and properly -interpret the results, as may be revised by Sun from time to time. - -2.2 Development Restrictions. Compliant Covered Code: - -a) must include Added Value; - -b) must fully comply with the Specifications for the Technology specified -in Attachment B; - -c) must include the Shared Part, complete and unmodified; - -d) may not modify the functional behavior of the Java Runtime Interpreter -or the Java Classes; - -e) may not modify, subset or superset the interfaces of the Java Runtime -Interpreter or the Java Classes; - -f) may not subset or superset the Java Classes; and - -g) may not modify or extend the required public class or public interface -declarations whose names begin with "java", "javax", "jini", "net.jini", -"sun.hotjava", "COM.sun" or their equivalents in any subsequent naming -convention. - -2.3 Compatibility Testing. Successful compatibility testing must be -completed by You, or at Original Contributor's option, a third party designated -by Original Contributor, to conduct such tests, in accordance with the User's -Guide, and using the most current version of the applicable TCK available from -Original Contributor one hundred twenty (120) days (two hundred forty [240] days -in the case of silicon implementations) prior to: (i) Your Internal Deployment -Use; and (ii) each release of Compliant Covered Code by You for Commercial Use. -In the event that You elect to use a version of Upgraded Code that is newer than -that which is required under this Section 2.3, then You agree to pass the -version of the TCK that corresponds to such newer version of Upgraded Code. - -2.4 Test Results. You agree to provide to Original Contributor or the third -party test facility if applicable, Your test results that demonstrate that -Covered Code is Compliant Covered Code and that Original Contributor may publish -or otherwise distribute such test results. - - - diff --git a/java/jdk13/pkg-plist b/java/jdk13/pkg-plist deleted file mode 100644 index 3896c2ae9..000000000 --- a/java/jdk13/pkg-plist +++ /dev/null @@ -1,1086 +0,0 @@ -@unexec %%LOCALBASE%%/bin/unregistervm "%D/jdk%%JDK_VERSION%%/bin/java" -jdk%%JDK_VERSION%%/COPYRIGHT -jdk%%JDK_VERSION%%/LICENSE -jdk%%JDK_VERSION%%/LICENSE.fr -jdk%%JDK_VERSION%%/README -jdk%%JDK_VERSION%%/README.html -jdk%%JDK_VERSION%%/bin/.java_wrapper -%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/ControlPanel -%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/HtmlConverter -jdk%%JDK_VERSION%%/bin/appletviewer -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g -jdk%%JDK_VERSION%%/bin/awt_robot -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/awt_robot_g -jdk%%JDK_VERSION%%/bin/extcheck -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/extcheck_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/appletviewer -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/appletviewer_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/extcheck -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/extcheck_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/idlj -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/idlj_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/jar -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jar_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/java -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_g -%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm -%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/javac -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javac_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/javadoc -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javadoc_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/javah -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javah_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/javap -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javap_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/jdb -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jdb_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/keytool -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/keytool_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/native2ascii -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/native2ascii_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjava -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjava_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjavac -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjavac_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjdb -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/oldjdb_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/policytool -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/policytool_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/rmic -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmic_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/rmid -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmid_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/rmiregistry -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/rmiregistry_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver_g -jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_g -%%NATIVE:%%%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm -%%NATIVE:%%%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver_g -%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv_g -jdk%%JDK_VERSION%%/bin/idlj -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g -jdk%%JDK_VERSION%%/bin/jar -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jar_g -jdk%%JDK_VERSION%%/bin/jarsigner -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jarsigner_g -jdk%%JDK_VERSION%%/bin/java -jdk%%JDK_VERSION%%/bin/java-rmi.cgi -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/java_g -jdk%%JDK_VERSION%%/bin/javac -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javac_g -jdk%%JDK_VERSION%%/bin/javadoc -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javadoc_g -jdk%%JDK_VERSION%%/bin/javah -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javah_g -jdk%%JDK_VERSION%%/bin/javap -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/javap_g -jdk%%JDK_VERSION%%/bin/jdb -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/jdb_g -jdk%%JDK_VERSION%%/bin/keytool -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/keytool_g -jdk%%JDK_VERSION%%/bin/native2ascii -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/native2ascii_g -jdk%%JDK_VERSION%%/bin/oldjava -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjava_g -jdk%%JDK_VERSION%%/bin/oldjavac -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjavac_g -jdk%%JDK_VERSION%%/bin/oldjdb -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/oldjdb_g -jdk%%JDK_VERSION%%/bin/policytool -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/policytool_g -jdk%%JDK_VERSION%%/bin/rmic -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmic_g -jdk%%JDK_VERSION%%/bin/rmid -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmid_g -jdk%%JDK_VERSION%%/bin/rmiregistry -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/rmiregistry_g -jdk%%JDK_VERSION%%/bin/serialver -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/serialver_g -jdk%%JDK_VERSION%%/bin/tnameserv -%%DEBUG:%%jdk%%JDK_VERSION%%/bin/tnameserv_g -jdk%%JDK_VERSION%%/demo/applets/Animator/Animation.class -jdk%%JDK_VERSION%%/demo/applets/Animator/AnimationFrame.class -jdk%%JDK_VERSION%%/demo/applets/Animator/Animator.class -jdk%%JDK_VERSION%%/demo/applets/Animator/Animator.java -jdk%%JDK_VERSION%%/demo/applets/Animator/DescriptionFrame.class -jdk%%JDK_VERSION%%/demo/applets/Animator/ParseException.class -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/0.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/1.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/2.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/3.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/4.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/5.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/6.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/7.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/8.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/9.au -jdk%%JDK_VERSION%%/demo/applets/Animator/audio/spacemusic.au -jdk%%JDK_VERSION%%/demo/applets/Animator/example1.html -jdk%%JDK_VERSION%%/demo/applets/Animator/example2.html -jdk%%JDK_VERSION%%/demo/applets/Animator/example3.html -jdk%%JDK_VERSION%%/demo/applets/Animator/example4.html -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T1.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T10.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T2.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T3.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T4.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T5.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T6.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T7.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T8.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans/T9.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/SimpleAnimation/T1.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/SimpleAnimation/T2.gif -jdk%%JDK_VERSION%%/demo/applets/Animator/images/loading-msg.gif -jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcCanvas.class -jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcControls.class -jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcTest.class -jdk%%JDK_VERSION%%/demo/applets/ArcTest/ArcTest.java -jdk%%JDK_VERSION%%/demo/applets/ArcTest/example1.html -jdk%%JDK_VERSION%%/demo/applets/BarChart/Chart.class -jdk%%JDK_VERSION%%/demo/applets/BarChart/Chart.java -jdk%%JDK_VERSION%%/demo/applets/BarChart/example1.html -jdk%%JDK_VERSION%%/demo/applets/Blink/Blink$1.class -jdk%%JDK_VERSION%%/demo/applets/Blink/Blink.class -jdk%%JDK_VERSION%%/demo/applets/Blink/Blink.java -jdk%%JDK_VERSION%%/demo/applets/Blink/example1.html -jdk%%JDK_VERSION%%/demo/applets/CardTest/CardPanel.class -jdk%%JDK_VERSION%%/demo/applets/CardTest/CardTest.class -jdk%%JDK_VERSION%%/demo/applets/CardTest/CardTest.java -jdk%%JDK_VERSION%%/demo/applets/CardTest/example1.html -jdk%%JDK_VERSION%%/demo/applets/Clock/Clock2.class -jdk%%JDK_VERSION%%/demo/applets/Clock/Clock2.java -jdk%%JDK_VERSION%%/demo/applets/Clock/example1.html -jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherCanvas.class -jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherControls.class -jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherTest.class -jdk%%JDK_VERSION%%/demo/applets/DitherTest/DitherTest.java -jdk%%JDK_VERSION%%/demo/applets/DitherTest/example1.html -jdk%%JDK_VERSION%%/demo/applets/DrawTest/DrawControls.class -jdk%%JDK_VERSION%%/demo/applets/DrawTest/DrawPanel.class -jdk%%JDK_VERSION%%/demo/applets/DrawTest/DrawTest.class -jdk%%JDK_VERSION%%/demo/applets/DrawTest/DrawTest.java -jdk%%JDK_VERSION%%/demo/applets/DrawTest/example1.html -jdk%%JDK_VERSION%%/demo/applets/Fractal/CLSFractal.class -jdk%%JDK_VERSION%%/demo/applets/Fractal/CLSFractal.java -jdk%%JDK_VERSION%%/demo/applets/Fractal/CLSRule.class -jdk%%JDK_VERSION%%/demo/applets/Fractal/CLSTurtle.class -jdk%%JDK_VERSION%%/demo/applets/Fractal/ContextLSystem.class -jdk%%JDK_VERSION%%/demo/applets/Fractal/example1.html -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/Edge.class -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/Graph.class -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/Graph.java -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/GraphPanel.class -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/Node.class -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio/computer.au -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio/drip.au -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio/gong.au -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/example1.html -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/example2.html -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/example3.html -jdk%%JDK_VERSION%%/demo/applets/GraphLayout/example4.html -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/AppletFrame.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/AppletFrame.java -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/ArcCard.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/ArcDegreePanel.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/ArcPanel.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/ColorUtils.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/GraphicsCards.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/GraphicsPanel.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/GraphicsTest.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/GraphicsTest.java -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/OvalShape.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/PolygonShape.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/RectShape.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/RoundRectShape.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/Shape.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/ShapeTest.class -jdk%%JDK_VERSION%%/demo/applets/GraphicsTest/example1.html -jdk%%JDK_VERSION%%/demo/applets/ImageMap/AniArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/AniArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/ButtonFilter.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/ButtonFilter.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/ClickArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/ClickArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/DelayedSoundArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/DelayedSoundArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/HighlightArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/HighlightArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/HighlightFilter.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/HighlightFilter.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/HrefButtonArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/HrefButtonArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/ImageMap.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/ImageMap.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/ImageMapArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/ImageMapArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/LinkArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/LinkArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/NameArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/NameArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/RoundButtonFilter.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/RoundButtonFilter.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/RoundHrefButtonArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/RoundHrefButtonArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/SoundArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/SoundArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/TickerArea.class -jdk%%JDK_VERSION%%/demo/applets/ImageMap/TickerArea.java -jdk%%JDK_VERSION%%/demo/applets/ImageMap/audio/chirp1.au -jdk%%JDK_VERSION%%/demo/applets/ImageMap/audio/hi.au -jdk%%JDK_VERSION%%/demo/applets/ImageMap/example1.html -jdk%%JDK_VERSION%%/demo/applets/ImageMap/imagemapcheat.html -jdk%%JDK_VERSION%%/demo/applets/ImageMap/images/jim.graham.gif -jdk%%JDK_VERSION%%/demo/applets/ImageMap/sources.html -jdk%%JDK_VERSION%%/demo/applets/JumpingBox/MouseTrack.class -jdk%%JDK_VERSION%%/demo/applets/JumpingBox/MouseTrack.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/ip.au -jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/that.hurts.au -jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/thin.bell.au -jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds/tiptoe.thru.the.tulips.au -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/Atom.class -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/Matrix3D.class -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/Matrix3D.java -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/XYZApp.class -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/XYZApp.java -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/XYZChemModel.class -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/example1.html -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/example2.html -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/example3.html -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models/benzene.xyz -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models/cyclohexane.xyz -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models/ethane.xyz -jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models/water.xyz -jdk%%JDK_VERSION%%/demo/applets/NervousText/NervousText.class -jdk%%JDK_VERSION%%/demo/applets/NervousText/NervousText.java -jdk%%JDK_VERSION%%/demo/applets/NervousText/example1.html -jdk%%JDK_VERSION%%/demo/applets/SimpleGraph/GraphApplet.class -jdk%%JDK_VERSION%%/demo/applets/SimpleGraph/GraphApplet.java -jdk%%JDK_VERSION%%/demo/applets/SimpleGraph/example1.html -jdk%%JDK_VERSION%%/demo/applets/SortDemo/BidirBubbleSortAlgorithm.class -jdk%%JDK_VERSION%%/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java -jdk%%JDK_VERSION%%/demo/applets/SortDemo/BubbleSortAlgorithm.class -jdk%%JDK_VERSION%%/demo/applets/SortDemo/BubbleSortAlgorithm.java -jdk%%JDK_VERSION%%/demo/applets/SortDemo/QSortAlgorithm.class -jdk%%JDK_VERSION%%/demo/applets/SortDemo/QSortAlgorithm.java -jdk%%JDK_VERSION%%/demo/applets/SortDemo/SortAlgorithm.class -jdk%%JDK_VERSION%%/demo/applets/SortDemo/SortAlgorithm.java -jdk%%JDK_VERSION%%/demo/applets/SortDemo/SortItem.class -jdk%%JDK_VERSION%%/demo/applets/SortDemo/SortItem.java -jdk%%JDK_VERSION%%/demo/applets/SortDemo/example1.html -jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/Cell.class -jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/CellUpdater.class -jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/InputField.class -jdk%%JDK_VERSION%%/demo/applets/SpreadSheet/Node.class -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 -jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio/ding.au -jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio/return.au -jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio/yahoo1.au -jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio/yahoo2.au -jdk%%JDK_VERSION%%/demo/applets/TicTacToe/example1.html -jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images/cross.gif -jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images/not.gif -jdk%%JDK_VERSION%%/demo/applets/WireFrame/FileFormatException.class -jdk%%JDK_VERSION%%/demo/applets/WireFrame/Matrix3D.class -jdk%%JDK_VERSION%%/demo/applets/WireFrame/Matrix3D.java -jdk%%JDK_VERSION%%/demo/applets/WireFrame/Model3D.class -jdk%%JDK_VERSION%%/demo/applets/WireFrame/ThreeD.class -jdk%%JDK_VERSION%%/demo/applets/WireFrame/ThreeD.java -jdk%%JDK_VERSION%%/demo/applets/WireFrame/example1.html -jdk%%JDK_VERSION%%/demo/applets/WireFrame/example2.html -jdk%%JDK_VERSION%%/demo/applets/WireFrame/example3.html -jdk%%JDK_VERSION%%/demo/applets/WireFrame/example4.html -jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/cube.obj -jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/dinasaur.obj -jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/hughes_500.obj -jdk%%JDK_VERSION%%/demo/applets/WireFrame/models/knoxS.obj -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/CreateCoffees.class -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/CreateCoffees.java -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess/runnit.bat -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/CreateCoffees.class -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/CreateCoffees.java -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase/runnit.bat -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/CreateSuppliers.class -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/CreateSuppliers.java -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess/runnit.bat -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/CreateSuppliers.class -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/CreateSuppliers.java -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase/runnit.bat -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/InsertCoffees.class -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/InsertCoffees.java -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr/runnit.bat -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/InsertCoffees.class -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/InsertCoffees.java -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase/runnit.bat -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/InsertSuppliers.class -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/InsertSuppliers.java -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess/runnit.bat -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/InsertSuppliers.class -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/InsertSuppliers.java -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase/runnit.bat -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB/CAFEJAVA.MDB -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB/CAFEJAVA.ldb -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/README.txt -jdk%%JDK_VERSION%%/demo/jfc/DBDemos/private.fls -jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/FileChooserDemo.jar -jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/README.txt -jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images/gifIcon.gif -jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images/jpgIcon.jpg -jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src/ExampleFileFilter.java -jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src/ExampleFileView.java -jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src/FileChooserDemo.java -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/Font2DTest.html -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/Font2DTest.jar -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/README.txt -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources.properties -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_de.properties -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_en.properties -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_en_GB.properties -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/TextResources_ko.properties -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources/resource.data -jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src/Font2DTest.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/Java2Demo.html -jdk%%JDK_VERSION%%/demo/jfc/Java2D/Java2Demo.jar -jdk%%JDK_VERSION%%/demo/jfc/Java2D/README.txt -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/AnimatingControlsSurface.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/AnimatingSurface.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CloningFeature.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/ControlsSurface.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CustomControls.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/CustomControlsContext.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoFonts.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoGroup.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoImages.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/DemoPanel.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/GlobalControls.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/GlobalPanel.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Intro.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Java2Demo.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Java2DemoApplet.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/MemoryMonitor.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/PerformanceMonitor.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/RunWindow.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Surface.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/TextureChooser.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/Tools.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Arcs.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/BezierAnim.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Curves.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves/Ellipses.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Areas.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/ClipAnim.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Intersection.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping/Text.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/BullsEye.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/ColorConvert.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors/Rotator3D.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/ACimages.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/ACrules.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite/FadeAnim.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/AllFonts.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/AttributedStr.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Highlighting.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Outline.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts/Tree.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/DukeAnim.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/ImageOps.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/JPEGFlip.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images/WarpImage.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Caps.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Dash.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/Joins.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines/LineAnim.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/Balls.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/BezierScroller.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix/Stars3D.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/GradAnim.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/Gradient.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/Texture.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint/TextureAnim.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/Append.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/CurveQuadTo.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/FillStroke.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths/WindingRule.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/Rotate.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/SelectTx.java -jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms/TransformAnim.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/back.gif -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/credits.html -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/duke.gif -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/javalogo.gif -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/metal.html -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/metalworks.html -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/swing.html -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles/toc.html -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/Metalworks.jar -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/MyTheme.theme -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/README.txt -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images/palette_crop.gif -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images/palette_draw.gif -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images/palette_hand.gif -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images/palette_select.gif -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images/palette_text.gif -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images/palette_zoom.gif -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/AquaMetalTheme.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/BigContrastMetalTheme.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/ContrastMetalTheme.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/DemoMetalTheme.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/GreenMetalTheme.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/KhakiMetalTheme.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/MetalThemeMenu.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/Metalworks.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/MetalworksDocumentFrame.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/MetalworksFrame.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/MetalworksHelp.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/MetalworksInBox.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/MetalworksPrefs.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/PropertiesMetalTheme.java -jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src/UISwitchListener.java -jdk%%JDK_VERSION%%/demo/jfc/Notepad/Notepad.jar -jdk%%JDK_VERSION%%/demo/jfc/Notepad/README.txt -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/Notepad.properties -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/Notepad_fr.properties -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/Notepad_sv.properties -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/Notepad_zh_CN.properties -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/copy.gif -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/cut.gif -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/new.gif -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/open.gif -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/paste.gif -jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources/save.gif -jdk%%JDK_VERSION%%/demo/jfc/Notepad/src/ElementTreePanel.java -jdk%%JDK_VERSION%%/demo/jfc/Notepad/src/Notepad.java -jdk%%JDK_VERSION%%/demo/jfc/SampleTree/README.txt -jdk%%JDK_VERSION%%/demo/jfc/SampleTree/SampleTree.jar -jdk%%JDK_VERSION%%/demo/jfc/SampleTree/images/collapsed.gif -jdk%%JDK_VERSION%%/demo/jfc/SampleTree/images/expanded.gif -jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/DynamicTreeNode.java -jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleData.java -jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTree.java -jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTreeCellRenderer.java -jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src/SampleTreeModel.java -jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/README.txt -jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/SimpleExample.jar -jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/src/SimpleExample.java -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/README.txt -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/Stylepad.jar -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad.properties -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad_fr.properties -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad_sv.properties -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Notepad_zh_CN.properties -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Stylepad.properties -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Stylepad_sv.properties -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/Stylepad_zh_CN.properties -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/alice.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/bold.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/bullets.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/caterpillar.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/center.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/copy.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/cut.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/fg.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/hatter.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/italic.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/left.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/new.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/open.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/paste.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/rabbit.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/rabbit2.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/right.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/save.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources/underline.gif -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src/ElementTreePanel.java -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src/HelloWorld.java -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src/Notepad.java -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src/Stylepad.java -jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src/Wonderland.java -jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/README.txt -jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/SwingApplet.html -jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/SwingApplet.jar -jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src/SwingApplet.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/README.txt -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.html -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.jar -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2Plugin.html -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/AquaTheme.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/BezierAnimationPanel.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ButtonDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/CharcoalTheme.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/CodeViewer.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ColorChooserDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ComboBoxDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ContrastTheme.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/DemoModule.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/DirectionPanel.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/EmeraldTheme.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ExampleFileFilter.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ExampleFileView.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/FileChooserDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/HtmlDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/InternalFrameDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/LayoutControlPanel.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ListDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/OptionPaneDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/Permuter.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ProgressBarDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/RubyTheme.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ScrollPaneDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/SliderDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/SplitPaneDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/SwingSet2.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/SwingSet2Applet.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/TabbedPaneDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/TableDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/ToolTipDemo.java -jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src/TreeDemo.java -jdk%%JDK_VERSION%%/demo/jfc/TableExample/README.txt -jdk%%JDK_VERSION%%/demo/jfc/TableExample/TableExample.jar -jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/JDBCAdapter.java -jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/OldJTable.java -jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample.java -jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample2.java -jdk%%JDK_VERSION%%/demo/jfc/TableExample/src/TableExample3.java -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/sound/JavaSound.html -jdk%%JDK_VERSION%%/demo/sound/JavaSound.jar -jdk%%JDK_VERSION%%/demo/sound/README.txt -jdk%%JDK_VERSION%%/demo/sound/media/ambient.rmf -jdk%%JDK_VERSION%%/demo/sound/media/bark.aiff -jdk%%JDK_VERSION%%/demo/sound/media/bong.wav -jdk%%JDK_VERSION%%/demo/sound/media/classical.rmf -jdk%%JDK_VERSION%%/demo/sound/media/modern-rock.rmf -jdk%%JDK_VERSION%%/demo/sound/media/sfx-medley.rmf -jdk%%JDK_VERSION%%/demo/sound/media/spacemusic.au -jdk%%JDK_VERSION%%/demo/sound/media/trance.rmf -jdk%%JDK_VERSION%%/demo/sound/media/trippygaia1.mid -jdk%%JDK_VERSION%%/demo/sound/src/CapturePlayback.java -jdk%%JDK_VERSION%%/demo/sound/src/ControlContext.java -jdk%%JDK_VERSION%%/demo/sound/src/Groove.java -jdk%%JDK_VERSION%%/demo/sound/src/JavaSound.java -jdk%%JDK_VERSION%%/demo/sound/src/JavaSoundApplet.java -jdk%%JDK_VERSION%%/demo/sound/src/Juke.java -jdk%%JDK_VERSION%%/demo/sound/src/MidiSynth.java -jdk%%JDK_VERSION%%/demo/sound/src/TempoDial.java -jdk%%JDK_VERSION%%/include-old/StubPreamble.h -jdk%%JDK_VERSION%%/include-old/alloc_cache.h -jdk%%JDK_VERSION%%/include-old/bag.h -jdk%%JDK_VERSION%%/include-old/bool.h -jdk%%JDK_VERSION%%/include-old/breakpoints.h -jdk%%JDK_VERSION%%/include-old/byteorder.h -jdk%%JDK_VERSION%%/include-old/common_exceptions.h -jdk%%JDK_VERSION%%/include-old/debug.h -jdk%%JDK_VERSION%%/include-old/dll.h -jdk%%JDK_VERSION%%/include-old/exceptions.h -jdk%%JDK_VERSION%%/include-old/freebsd/byteorder_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/gc_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/hpi_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/io_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/jawt_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/jmath_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/jvm_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/miscdefs_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/path_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/sysmacros_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/timeval_md.h -jdk%%JDK_VERSION%%/include-old/freebsd/typedefs_md.h -jdk%%JDK_VERSION%%/include-old/gc.h -jdk%%JDK_VERSION%%/include-old/hpi.h -jdk%%JDK_VERSION%%/include-old/interpreter.h -jdk%%JDK_VERSION%%/include-old/javaString.h -jdk%%JDK_VERSION%%/include-old/java_lang_ClassLoader.h -jdk%%JDK_VERSION%%/include-old/java_lang_String.h -jdk%%JDK_VERSION%%/include-old/java_lang_Thread.h -jdk%%JDK_VERSION%%/include-old/java_lang_ThreadGroup.h -jdk%%JDK_VERSION%%/include-old/jawt.h -jdk%%JDK_VERSION%%/include-old/jit.h -jdk%%JDK_VERSION%%/include-old/jmath.h -jdk%%JDK_VERSION%%/include-old/jvm.h -jdk%%JDK_VERSION%%/include-old/jvmdi.h -jdk%%JDK_VERSION%%/include-old/jvmpi.h -jdk%%JDK_VERSION%%/include-old/log.h -jdk%%JDK_VERSION%%/include-old/monitor.h -jdk%%JDK_VERSION%%/include-old/monitor_cache.h -jdk%%JDK_VERSION%%/include-old/native.h -jdk%%JDK_VERSION%%/include-old/oldnmi.h -jdk%%JDK_VERSION%%/include-old/oobj.h -jdk%%JDK_VERSION%%/include-old/opcodes.h -jdk%%JDK_VERSION%%/include-old/path.h -jdk%%JDK_VERSION%%/include-old/reflect.h -jdk%%JDK_VERSION%%/include-old/signature.h -jdk%%JDK_VERSION%%/include-old/sys_api.h -jdk%%JDK_VERSION%%/include-old/threads.h -jdk%%JDK_VERSION%%/include-old/tree.h -jdk%%JDK_VERSION%%/include-old/typecodes.h -jdk%%JDK_VERSION%%/include-old/typedefs.h -jdk%%JDK_VERSION%%/include-old/utf.h -jdk%%JDK_VERSION%%/include-old/util.h -jdk%%JDK_VERSION%%/include-old/vmprofiler.h -jdk%%JDK_VERSION%%/include-old/wrap.h -jdk%%JDK_VERSION%%/include/freebsd/jawt_md.h -jdk%%JDK_VERSION%%/include/freebsd/jni_md.h -jdk%%JDK_VERSION%%/include/jawt.h -jdk%%JDK_VERSION%%/include/jni.h -jdk%%JDK_VERSION%%/include/jvmdi.h -jdk%%JDK_VERSION%%/include/jvmpi.h -jdk%%JDK_VERSION%%/jre/CHANGES -jdk%%JDK_VERSION%%/jre/COPYRIGHT -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/ControlPanel.html -jdk%%JDK_VERSION%%/jre/LICENSE -jdk%%JDK_VERSION%%/jre/LICENSE.fr -jdk%%JDK_VERSION%%/jre/README -jdk%%JDK_VERSION%%/jre/Welcome.html -jdk%%JDK_VERSION%%/jre/bin/.java_wrapper -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/ControlPanel -jdk%%JDK_VERSION%%/jre/bin/awt_robot -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_g -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm -%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver_g -jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/appletviewer_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/extcheck_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/idlj_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jar_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jarsigner_g -%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_g -%%NATIVE:%%%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm -%%NATIVE:%%%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javac_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javadoc_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javah_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javap_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jdb_g -%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/native2ascii_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjava_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjavac_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjdb_g -%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmic_g -%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid_g -%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry_g -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/serialver_g -%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv_g -jdk%%JDK_VERSION%%/jre/bin/java -jdk%%JDK_VERSION%%/jre/bin/keytool -jdk%%JDK_VERSION%%/jre/bin/policytool -jdk%%JDK_VERSION%%/jre/bin/rmid -jdk%%JDK_VERSION%%/jre/bin/rmiregistry -jdk%%JDK_VERSION%%/jre/bin/tnameserv -jdk%%JDK_VERSION%%/jre/lib/audio/soundbank.gm -jdk%%JDK_VERSION%%/jre/lib/cmm/CIEXYZ.pf -jdk%%JDK_VERSION%%/jre/lib/cmm/GRAY.pf -jdk%%JDK_VERSION%%/jre/lib/cmm/LINEAR_RGB.pf -jdk%%JDK_VERSION%%/jre/lib/cmm/PYCC.pf -jdk%%JDK_VERSION%%/jre/lib/cmm/sRGB.pf -jdk%%JDK_VERSION%%/jre/lib/content-types.properties -jdk%%JDK_VERSION%%/jre/lib/flavormap.properties -jdk%%JDK_VERSION%%/jre/lib/font.properties -jdk%%JDK_VERSION%%/jre/lib/font.properties.ja -jdk%%JDK_VERSION%%/jre/lib/font.properties.ru -jdk%%JDK_VERSION%%/jre/lib/font.properties.uk -jdk%%JDK_VERSION%%/jre/lib/font.properties.zh -jdk%%JDK_VERSION%%/jre/lib/font.properties.zh_CN -jdk%%JDK_VERSION%%/jre/lib/font.properties.zh_TW -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiBold.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf -jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir -jdk%%JDK_VERSION%%/jre/lib/i18n.jar -jdk%%JDK_VERSION%%/jre/lib/i386/classic/Xusage.txt -jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/classic/libjvm_g.so -%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/Xusage.txt -%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm.so -%%HOTSPOT:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/client/libjvm_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/green_threads/libhpi_g.so -%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/hotspot -jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libJdbcOdbc_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libagent.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libagent_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libawt.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libawt_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libcmm.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libcmm_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libhprof.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libhprof_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libioser12.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni.so -%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libjawt.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libjcov.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjcov_g.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libjsound.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjsound_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libmlib_image_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libnet.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libnet_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libverify.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so -jdk%%JDK_VERSION%%/jre/lib/i386/libzip.so -%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so -%%NATIVE:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so -%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so -%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/Xusage.txt -%%HOTSPOT:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm.so -%%HOTSPOT:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/server/libjvm_g.so -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 -jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif -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 -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/javaplugin.jar -jdk%%JDK_VERSION%%/jre/lib/jvm.cfg -jdk%%JDK_VERSION%%/jre/lib/jvm.hprof.txt -jdk%%JDK_VERSION%%/jre/lib/jvm.jcov.txt -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo -jdk%%JDK_VERSION%%/jre/lib/psfont.properties.ja -jdk%%JDK_VERSION%%/jre/lib/psfontj2d.properties -jdk%%JDK_VERSION%%/jre/lib/rt.jar -jdk%%JDK_VERSION%%/jre/lib/security/cacerts -jdk%%JDK_VERSION%%/jre/lib/security/java.policy -jdk%%JDK_VERSION%%/jre/lib/security/java.security -jdk%%JDK_VERSION%%/jre/lib/sunrsasign.jar -jdk%%JDK_VERSION%%/jre/lib/tzmappings -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin.so -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin_g.so -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji.so -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji_g.so -jdk%%JDK_VERSION%%/lib/dt.jar -%%PLUGIN:%%jdk%%JDK_VERSION%%/lib/htmlconverter.jar -jdk%%JDK_VERSION%%/lib/i386/libdt_socket.so -jdk%%JDK_VERSION%%/lib/i386/libjdwp.so -jdk%%JDK_VERSION%%/lib/ir.idl -jdk%%JDK_VERSION%%/lib/orb.idl -jdk%%JDK_VERSION%%/lib/tools.jar -jdk%%JDK_VERSION%%/man/man1/appletviewer.1 -jdk%%JDK_VERSION%%/man/man1/extcheck.1 -jdk%%JDK_VERSION%%/man/man1/jar.1 -jdk%%JDK_VERSION%%/man/man1/jarsigner.1 -jdk%%JDK_VERSION%%/man/man1/java.1 -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/jdb.1 -jdk%%JDK_VERSION%%/man/man1/keytool.1 -jdk%%JDK_VERSION%%/man/man1/native2ascii.1 -jdk%%JDK_VERSION%%/man/man1/rmic.1 -jdk%%JDK_VERSION%%/man/man1/rmid.1 -jdk%%JDK_VERSION%%/man/man1/rmiregistry.1 -jdk%%JDK_VERSION%%/man/man1/serialver.1 -jdk%%JDK_VERSION%%/man/man1/tnameserv.1 -jdk%%JDK_VERSION%%/src.jar -@exec mkdir -p %D/jdk%%JDK_VERSION%%/jre/lib/ext/ -@dirrmtry jdk%%JDK_VERSION%%/jre/lib/ext -@exec mkdir -p %D/share/doc/java -@dirrmtry share/doc/java -@exec %%LOCALBASE%%/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%" -@dirrm jdk%%JDK_VERSION%%/man/man1 -@dirrm jdk%%JDK_VERSION%%/man -@dirrm jdk%%JDK_VERSION%%/lib/i386 -@dirrm jdk%%JDK_VERSION%%/lib -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600 -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4 -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386 -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin -@dirrm jdk%%JDK_VERSION%%/jre/lib/security -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5 -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8 -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de -%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale -@dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors -@dirrm jdk%%JDK_VERSION%%/jre/lib/images -%%HOTSPOT:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/server -%%NATIVE:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/native_threads -@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/green_threads -%%HOTSPOT:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/client -@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic -@dirrm jdk%%JDK_VERSION%%/jre/lib/i386 -@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts -@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm -@dirrm jdk%%JDK_VERSION%%/jre/lib/audio -@dirrm jdk%%JDK_VERSION%%/jre/lib -%%NATIVE:%%@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads -@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads -@dirrm jdk%%JDK_VERSION%%/jre/bin/i386 -@dirrm jdk%%JDK_VERSION%%/jre/bin -@dirrm jdk%%JDK_VERSION%%/jre -@dirrm jdk%%JDK_VERSION%%/include/freebsd -@dirrm jdk%%JDK_VERSION%%/include-old/freebsd -@dirrm jdk%%JDK_VERSION%%/include-old -@dirrm jdk%%JDK_VERSION%%/include -@dirrm jdk%%JDK_VERSION%%/demo/sound/src -@dirrm jdk%%JDK_VERSION%%/demo/sound/media -@dirrm jdk%%JDK_VERSION%%/demo/sound -@dirrm jdk%%JDK_VERSION%%/demo/jpda -@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/TableExample -@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingSet2 -@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/SwingApplet -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad/resources -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Stylepad -@dirrm jdk%%JDK_VERSION%%/demo/jfc/SimpleExample/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/SimpleExample -@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree/images -@dirrm jdk%%JDK_VERSION%%/demo/jfc/SampleTree -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad/resources -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Notepad -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/images -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks/HelpFiles -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Metalworks -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Transforms -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paths -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Paint -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Mix -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Lines -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Images -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Fonts -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Composite -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Colors -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Clipping -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos/Arcs_Curves -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src/demos -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Java2D -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest/resources -@dirrm jdk%%JDK_VERSION%%/demo/jfc/Font2DTest -@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/src -@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo/images -@dirrm jdk%%JDK_VERSION%%/demo/jfc/FileChooserDemo -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/JavaDB -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/Sybase -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers/MSAccess -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertSuppliers -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/Sybase -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees/SQLSrvr -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/InsertCoffees -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/Sybase -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers/MSAccess -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateSuppliers -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/Sybase -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees/MSAccess -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos/CreateCoffees -@dirrm jdk%%JDK_VERSION%%/demo/jfc/DBDemos -@dirrm jdk%%JDK_VERSION%%/demo/jfc -@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame/models -@dirrm jdk%%JDK_VERSION%%/demo/applets/WireFrame -@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/images -@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe/audio -@dirrm jdk%%JDK_VERSION%%/demo/applets/TicTacToe -@dirrm jdk%%JDK_VERSION%%/demo/applets/SymbolTest -@dirrm jdk%%JDK_VERSION%%/demo/applets/SpreadSheet -@dirrm jdk%%JDK_VERSION%%/demo/applets/SortDemo -@dirrm jdk%%JDK_VERSION%%/demo/applets/SimpleGraph -@dirrm jdk%%JDK_VERSION%%/demo/applets/NervousText -@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer/models -@dirrm jdk%%JDK_VERSION%%/demo/applets/MoleculeViewer -@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox/sounds -@dirrm jdk%%JDK_VERSION%%/demo/applets/JumpingBox -@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/images -@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap/audio -@dirrm jdk%%JDK_VERSION%%/demo/applets/ImageMap -@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphicsTest -@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout/audio -@dirrm jdk%%JDK_VERSION%%/demo/applets/GraphLayout -@dirrm jdk%%JDK_VERSION%%/demo/applets/Fractal -@dirrm jdk%%JDK_VERSION%%/demo/applets/DrawTest -@dirrm jdk%%JDK_VERSION%%/demo/applets/DitherTest -@dirrm jdk%%JDK_VERSION%%/demo/applets/Clock -@dirrm jdk%%JDK_VERSION%%/demo/applets/CardTest -@dirrm jdk%%JDK_VERSION%%/demo/applets/Blink -@dirrm jdk%%JDK_VERSION%%/demo/applets/BarChart -@dirrm jdk%%JDK_VERSION%%/demo/applets/ArcTest -@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/SimpleAnimation -@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images/Beans -@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/images -@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator/audio -@dirrm jdk%%JDK_VERSION%%/demo/applets/Animator -@dirrm jdk%%JDK_VERSION%%/demo/applets -@dirrm jdk%%JDK_VERSION%%/demo -%%NATIVE:%%@dirrm jdk%%JDK_VERSION%%/bin/i386/native_threads -@dirrm jdk%%JDK_VERSION%%/bin/i386/green_threads -@dirrm jdk%%JDK_VERSION%%/bin/i386 -@dirrm jdk%%JDK_VERSION%%/bin -@dirrm jdk%%JDK_VERSION%% diff --git a/java/jdk13/scripts/check_wrkdir_links.sh b/java/jdk13/scripts/check_wrkdir_links.sh deleted file mode 100755 index bc09f1939..000000000 --- a/java/jdk13/scripts/check_wrkdir_links.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -WRKDIRPREFIX=$1 -LINUXBASE=$2 - -if [ "x${WRKDIRPREFIX}" = "x" -o "x${LINUXBASE}" = "x" ]; then - exit 0 -fi - -LINUXWRKDIRPREFIX="${LINUXBASE}/${WRKDIRPREFIX}" - -while [ "x${LINUXWRKDIRPREFIX}" != "x" ]; do - if [ -L "${LINUXWRKDIRPREFIX}" -a \ - x`ls -ld "${LINUXWRKDIRPREFIX}" 2>/dev/null | \ - awk '/->/{print $NF;exit 0}END{exit 1}'` = \ - x"${WRKDIRPREFIX}" ]; then - echo "link" - exit 1 - fi - if [ -L "${LINUXWRKDIRPREFIX}" ]; then - LINUXWRKDIRPREFIX=`ls -ld "${LINUXWRKDIRPREFIX}" 2>/dev/null | \ - awk '/->/{print $NF;exit 0}END{exit 1}'` - else - break - fi -done - -exit 0 diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile deleted file mode 100644 index 948ad8bf8..000000000 --- a/java/jdk15/Makefile +++ /dev/null @@ -1,334 +0,0 @@ -# New ports collection makefile for: jdk15 -# Date created: 12 January 2005 -# Whom: Alexey Zelkin <phantom@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= jdk -PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 5 -CATEGORIES= java devel -MASTER_SITES= # http://www.sun.com/software/java2/download.html -# http://www.eyesbeyond.com/freebsddom/java/jdk15.html -# http://java.sun.com/javase/downloads/index.jsp -DISTFILES= ${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE} -EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE} - -MAINTAINER= glewis@FreeBSD.org -COMMENT= Java Development Kit 1.5.0 - -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ - zip:${PORTSDIR}/archivers/zip \ - ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper - -OPTIONS= DEBUG "Enable debugging support" off \ - IPV6 "Enable IPv6 support" off -.if ${MACHINE_ARCH} == "amd64" -WITHOUT_WEB= yes -.else -OPTIONS+= WEB "Enable the browser plugin and Java Web Start" on -.endif -OPTIONS+= POLICY "Install the Unlimited Strength Policy Files" off \ - JAIL "Port is being built within a jail" off - -WANT_GNOME= yes -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -SUB_FILES+= pkg-install \ - pkg-deinstall -SUB_LIST+= JRE_HOME=${PREFIX}/jdk${JDK_VERSION}/jre \ - ARCH=${MACHINE_ARCH} - -WRKSRC= ${WRKDIR}/control/make - -USE_ZIP= YES - -SCSL_SRCFILE= jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip -SCSL_BINFILE= jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip -PATCHSETFILE= bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2 -POLICYFILE= jce_policy-${JDK_VERSION:S/./_/g}.zip - -JDK_VERSION= 1.5.0 -JDK_PATCHSET_VERSION= 3 -LATEST_LINK= jdk15 - -SUN_LINUX_JDK_VERSION= 1.4.2 - -.if !defined(WITH_LINUX_BOOTSTRAP) -NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/diablo-jdk1.5.0 \ - ${LOCALBASE}/jdk1.5.0 \ - ${LOCALBASE}/jdk1.4.2 -.endif - -LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2 - -.include <bsd.port.pre.mk> - -.if defined(WITH_POLICY) -DISTFILES+= ${POLICYFILE} -EXTRACT_ONLY+= ${POLICYFILE} -.endif - -# do we have valid native jdk installed? -.if !defined(WITH_LINUX_BOOTSTRAP) -.for CJDK in ${NATIVE_BOOTSTRAP_JDKS} -. if !defined(JDK14DIR) && exists(${CJDK}/bin/javac) -JDK14DIR= ${CJDK} -. endif -.endfor -.endif - -# do we have valid linux jdk installed? -.if !defined(JDK14DIR) -.for CJDK in ${LINUX_BOOTSTRAP_JDKS} -. if !defined(JDK14DIR) && exists(${CJDK}/bin/javac) -JDK14DIR= ${CJDK} -WITH_LINUX_BOOTSTRAP= YES -. endif -.endfor -.endif - -# if no valid jdk found, set dependency -.if !defined(JDK14DIR) -JDK14DIR?= ${LOCALBASE}/linux-sun-jdk${SUN_LINUX_JDK_VERSION} -.endif - -BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14 - -.if defined(WITHOUT_WEB) -MAKE_ENV+= DONT_BUILD_DEPLOY="YES" -.else -USE_GECKO= mozilla # firefox and seamonkey do not work -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" -MAKE_ENV+= BROWSER=${GECKO} -USE_GNOME= desktopfileutils -MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${LOCALBASE}/include" -.endif - -ONLY_FOR_ARCHS= i386 amd64 -USE_GMAKE= YES -USE_ICONV= YES -RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" -NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" - -MAKE_ENV+= ALT_BOOTDIR="${JDK14DIR}" \ - ALT_MOTIF_DIR="${X11BASE}" \ - SYS_CFLAGS="${CFLAGS}" \ - LANG="C" \ - JAVA_HOME="" \ - CLASSPATH="" \ - LD_LIBRARY_PATH="" \ - MAKEFLAGS="" \ - SKIP_COMPARE_IMAGES="YES" -.if !defined(WITH_IPV6) -MAKE_ENV+= DONT_ENABLE_IPV6="YES" -.endif -.if defined(HOTSPOT_BUILD_JOBS) -MAKE_ENV+= HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS} -.endif - -ALL_TARGET= all - -PLIST_FILES= jdk${JDK_VERSION}/jre/.systemPrefs/.system.lock \ - jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile -.if !defined(WITHOUT_WEB) -PLIST_FILES+= share/applications/sun_java15.desktop -.endif -PLIST_DIRS= jdk${JDK_VERSION}/jre/.systemPrefs - -.if (${ARCH} == amd64) -HOTSPOTARCH=amd64 -.else -HOTSPOTARCH=i586 -.endif - -JDKIMAGEDIR= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image -JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image - -PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \ - ../../j2se/make/com/sun/java/pack/Makefile \ - ../../j2se/make/common/Defs.gmk \ - ../../j2se/make/common/Defs-bsd.gmk \ - ../../j2se/make/common/Program.gmk \ - ../../j2se/make/java/hpi/native/Makefile \ - ../../j2se/make/java/net/Makefile \ - ../../j2se/make/java/nio/Makefile \ - ../../j2se/make/jpda/transport/socket/Makefile \ - ../../j2se/make/sun/cmm/Makefile \ - ../../j2se/make/sun/xawt/Makefile - -LD_LIBRARY_PATH_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp - -# Check for JDK sources and patch file -.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{ -ECHO_MSG=/usr/bin/printf -IGNORE= :\n\ -Due to licensing restrictions, certain files must be fetched manually.\n\n -.if !exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE})#{ -IGNORE += Please open http://www.sun.com/software/java2/download.html\n\ -in a web browser and follow the \"Download\" link for the\n\ -\"JDK ${JDK_VERSION:S/1.//}\". 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, download the\n -.if !exists(${DISTDIR}/${SCSL_SRCFILE})#{ -IGNORE += SCSL Source file, ${SCSL_SRCFILE} -.endif#} -.if !exists(${DISTDIR}/${SCSL_BINFILE})#{ -.if !exists(${DISTDIR}/${SCSL_SRCFILE})#{ -IGNORE += and the\n -.endif#} -IGNORE += SCSL Binaries file, ${SCSL_BINFILE} -.endif#} -IGNORE += .\n\n -.if !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#{ -IGNORE += In addition, please -.endif#} -.elif !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#}{ -IGNORE += Please -.endif#} -.if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{ -IGNORE += open http://java.sun.com/javase/downloads/index.jsp\n\ -in a web browser and follow the \"Download\" link for\n\ -\"Other Downloads\" to obtain the JCE policy file, ${POLICYFILE}.\n\n -.if !exists(${DISTDIR}/${PATCHSETFILE})#{ -IGNORE += In addition, please -.endif#} -.endif#} -.if !exists(${DISTDIR}/${PATCHSETFILE})#{ -IGNORE += download the patchset, ${PATCHSETFILE}, from\n\ -http://www.eyesbeyond.com/freebsddom/java/jdk15.html.\n\n -.endif#} -IGNORE += Please place the downloaded file(s) in ${DISTDIR} -IGNORE += \n and restart the build.\n\n -.endif#} - -pre-fetch: - @${ECHO_MSG} - @${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have at least" - @${ECHO_MSG} "2.5Gb of free disk space in build area!" - @${ECHO_MSG} -.if defined(WITH_LINUX_BOOTSTRAP) - @${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have linux emulation" - @${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem" - @${ECHO_MSG} "mounted." - @${ECHO_MSG} -.endif - -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "WARNING: " - @${ECHO_MSG} "WARNING: This is BETA quality software!" - @${ECHO_MSG} "WARNING: Use in a production environment is at your own risk." - @${ECHO_MSG} "WARNING: " - @${ECHO_MSG} - -pre-patch: - @cd ${WRKDIR} && \ - ${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \ - ${CHMOD} -R u+w * && \ - ${PATCH} -p0 < ${WRKDIR}/jdk15.patches - -post-patch: - @for file in ${LD_LIBRARY_PATH_FILES}; do \ - ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ - ${WRKSRC}/$${file}; \ - done - @for file in ${PTHREAD_FILES}; do \ - ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \ - ${WRKSRC}/$${file}; \ - done - ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \ - -e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\ - ${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop - -.if defined(WITH_LINUX_BOOTSTRAP) -pre-build: - @if [ "$${WRKDIRPREFIX}" -a \ - -L "/compat/linux/$${WRKDIRPREFIX}" -a \ - x`${LS} -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | awk '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \ - then \ - ${ECHO_MSG} "Please set WRKDIRPREFIX to something which doesn't"; \ - ${ECHO_MSG} "have a matching symbolic link in /compat/linux."; \ - ${ECHO_MSG} "This is known to cause problems during bootstrapping."; \ - exit 1; \ - fi - @if [ `/sbin/sysctl -n compat.linux.osname` != "Linux" ]; \ - then \ - ${ECHO_MSG} "Please set the value of the sysctl compat.linux.osname"; \ - ${ECHO_MSG} "to 'Linux' with the command:"; \ - ${ECHO_MSG} " /sbin/sysctl compat.linux.osname=Linux"; \ - ${ECHO_MSG} "Having it set to other values, such as 'FreeBSD',"; \ - ${ECHO_MSG} "is known to cause problems during bootstrapping."; \ - exit 1; \ - fi -.if defined(WITH_JAIL)#{ - @if [ "`/sbin/mount | grep ^linprocfs`" = "" ]; \ - then \ - ${ECHO_MSG} "ERROR: You must have LINPROCFS mounted before" ; \ - ${ECHO_MSG} "starting to build the native JDK 1.5.0." ; \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "You may do it with the following commands:" ; \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "# kldload linprocfs" ; \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "and" ; \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "# mount -t linprocfs linprocfs /compat/linux/proc" ; \ - ${ECHO_MSG} "" ; \ - exit 1 ; \ - fi -.endif#} -.endif - -do-build: - # Start of jdk build - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) - -post-build: - @# XXX don't install japanese manpages - @${RM} -rf ${JDKIMAGEDIR}/man/ja - @${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP - -do-install: - ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} - cd ${JDKIMAGEDIR} && ${FIND} . \ - | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} -.if !defined(WITHOUT_WEB) - ${INSTALL_DATA} ${JDKIMAGEDIR}/jre/plugin/desktop/sun_java.desktop \ - ${PREFIX}/share/applications/sun_java15.desktop -.endif - @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} - @${FIND} -s ${JDKIMAGEDIR} -not -type d | \ - ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST} -.if !defined(WITHOUT_WEB) - @${ECHO_MSG} '@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} -.endif -.if defined(WITH_DEBUG) - cd ${JDKIMAGEDIR_G} && ${FIND} . \ - | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} - @${FIND} -s ${JDKIMAGEDIR_G} -not -type d | \ - ${SED} -ne 's#^${JDKIMAGEDIR_G}#jdk${JDK_VERSION}#p' >> ${TMPPLIST} -.endif - ${INSTALL_DATA} ${FILESDIR}/cacerts \ - ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts -.if defined(WITH_POLICY) - ${INSTALL_DATA} ${WRKDIR}/jce/*.jar ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security -.endif - @${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \ - ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST} - @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST} -.if !defined(WITHOUT_WEB) - @${ECHO_MSG} '@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} -.endif - -# XXX: put unregistervm into install script ? -post-install: - @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" -.if !defined(WITHOUT_WEB) - @-update-desktop-database -.endif - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -.include <bsd.port.post.mk> diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo deleted file mode 100644 index e3e1c2e7a..000000000 --- a/java/jdk15/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -MD5 (jdk-1_5_0-src-scsl.zip) = 7802831198068c9a0df727c3ea6617a9 -SHA256 (jdk-1_5_0-src-scsl.zip) = d11e35f2f0b8f6e2e71bf19e423d553179f980105d877bfefac88e5e494173bd -SIZE (jdk-1_5_0-src-scsl.zip) = 58338869 -MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0 -SHA256 (jdk-1_5_0-bin-scsl.zip) = f7be15e4478165c361d011f39c02fea558dba442aeb3556357f4c7771db763f1 -SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433 -MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79 -SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b -SIZE (jce_policy-1_5_0.zip) = 8826 -MD5 (bsd-jdk15-patches-3.tar.bz2) = 66e19561ca6d0e775dcd590fd97a6921 -SHA256 (bsd-jdk15-patches-3.tar.bz2) = 84bff46fb1f091fb8a508287cadd740cdc07691c616a72a9d84d3ee53b8cab6c -SIZE (bsd-jdk15-patches-3.tar.bz2) = 650413 diff --git a/java/jdk15/files/cacerts b/java/jdk15/files/cacerts Binary files differdeleted file mode 100644 index dbc3699a9..000000000 --- a/java/jdk15/files/cacerts +++ /dev/null diff --git a/java/jdk15/files/patch-control::common::Defs-bsd.gmk b/java/jdk15/files/patch-control::common::Defs-bsd.gmk deleted file mode 100644 index e5701664b..000000000 --- a/java/jdk15/files/patch-control::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../control/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:01:40 2005 -+++ ../../control/make/common/Defs-bsd.gmk Thu Jan 13 02:01:54 2005 -@@ -200,7 +200,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 deleted file mode 100644 index a864ac0ef..000000000 --- a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Tue Mar 28 22:20:28 2006 -+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Tue Mar 28 22:20:45 2006 -@@ -29,7 +29,7 @@ - endif - - # Default NSPR_PATH and allow override. --NSPR_PATH = /usr/local -+NSPR_PATH = ${LOCALBASE} - ifdef ALT_NSPR_PATH - NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH)) - endif diff --git a/java/jdk15/files/patch-deploy::controlpanel::sun_java.desktop b/java/jdk15/files/patch-deploy::controlpanel::sun_java.desktop deleted file mode 100644 index 898893707..000000000 --- a/java/jdk15/files/patch-deploy::controlpanel::sun_java.desktop +++ /dev/null @@ -1,13 +0,0 @@ ---- ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop.orig Sat Oct 1 20:14:45 2005 -+++ ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop Sat Oct 1 20:16:12 2005 -@@ -1,8 +1,8 @@ - [Desktop Entry] - Name=Java - Comment=Java Control Panel --Exec=INSTALL_DIR/JRE_NAME_VERSION/bin/ControlPanel --Icon=INSTALL_DIR/JRE_NAME_VERSION/plugin/desktop/sun_java.png -+Exec=%%PREFIX%%/jdk%%JDK_VERSION%%/bin/ControlPanel -+Icon=%%PREFIX%%/jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.png - Terminal=0 - Type=Application - Categories=Application;Settings;X-Sun-Supported;X-Red-Hat-Base; diff --git a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp deleted file mode 100644 index 78d8d2588..000000000 --- a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp.orig Tue Oct 19 15:04:42 2004 -+++ ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp Thu Jul 6 17:09:36 2006 -@@ -305,7 +305,11 @@ - char * jre = m_ltstate->java_dir; - - // ARCH is passed in on the compile line -+#if defined(_ALLBSD_SOURCE) && defined(__amd64__) -+ sprintf(our_ld_paths,"%s/lib/%s/server:%s/lib/%s",jre,ARCH,jre,ARCH); -+#else - sprintf(our_ld_paths,"%s/lib/%s/client:%s/lib/%s",jre,ARCH,jre,ARCH); -+#endif - - char * new_ld_lib_path; - diff --git a/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c b/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c deleted file mode 100644 index fd5b16551..000000000 --- a/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c.orig Thu Jul 6 17:10:12 2006 -+++ ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c Thu Jul 6 17:10:12 2006 -@@ -157,7 +157,7 @@ - libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL); - - if (libjvm == NULL) { -- snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/%s", java_home, libname); -+ snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/server/%s", java_home, libname); - libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL); - } - diff --git a/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp deleted file mode 100644 index 6a44c9ce8..000000000 --- a/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp.orig Thu Jun 15 18:08:03 2006 -+++ ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp Thu Jul 6 17:10:37 2006 -@@ -1289,7 +1289,11 @@ - // jre/lib/<arch>/classic/libjvm.so - // (to permit hotspot later). So this path is only needed for 1.2 - -+#if defined(_ALLBSD_SOURCE) && defined(__amd64__) -+ sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/server:%s/lib/%s", -+#else - sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/client:%s/lib/%s", -+#endif - jre, LIBARCH, // libjvm - jre, LIBARCH); // libjava, libawt & friends - diff --git a/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp b/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp deleted file mode 100644 index 866fd9ace..000000000 --- a/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp.orig Thu Jun 15 17:58:02 2006 -+++ ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp Thu Jun 15 17:59:02 2006 -@@ -12,7 +12,7 @@ - // - define_pd_global(bool, DontYieldALot, false); - //define_pd_global(intx, ThreadStackSize, 0); // 0 => use system default --define_pd_global(intx, ThreadStackSize, 256); -+define_pd_global(intx, ThreadStackSize, 1024); - define_pd_global(intx, VMThreadStackSize, 1024); - define_pd_global(intx, CompilerThreadStackSize, 0); - define_pd_global(intx, SurvivorRatio, 8); diff --git a/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp b/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp deleted file mode 100644 index 794d795d0..000000000 --- a/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp +++ /dev/null @@ -1,16 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp.orig Thu Jun 15 17:58:02 2006 -+++ ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Thu Jun 15 17:59:19 2006 -@@ -19,7 +19,10 @@ - - uintptr_t raw = pd_raw_thread_id(); - int ix = pd_cache_index(raw); --#ifdef __OpenBSD__ -+// XXXBSD: disable fast case. there is a race condition where the -+// fast case returns a different thread from the slow case and has -+// been seen on both OpenBSD and FreeBSD. -+#if 1 - return ThreadLocalStorage::get_thread_via_cache_slowly(raw, ix); - #else - Thread *Candidate = ThreadLocalStorage::_get_thread_cache[ix]; diff --git a/java/jdk15/files/patch-j2se::awt::canvas.c b/java/jdk15/files/patch-j2se::awt::canvas.c deleted file mode 100644 index cf69af4aa..000000000 --- a/java/jdk15/files/patch-j2se::awt::canvas.c +++ /dev/null @@ -1,32 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/sun/awt/canvas.c 10 Jan 2005 15:09:40 -0000 1.2 -+++ ../../j2se/src/solaris/native/sun/awt/canvas.c 19 Apr 2006 22:21:51 -0000 -@@ -258,10 +258,10 @@ - {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD}, - - /* Keypad equivalents of Triangular Navigation Block */ -- {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -- {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -- {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -- {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -+ {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -+ {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -+ {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -+ {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, - - /* Other vendor-specific Triangular Navigation Block */ - {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD}, -@@ -1349,7 +1349,7 @@ - { - KeySym originalKeysym = *keysym; - --#if !defined(__linux__) // XXXBSD: applies to FreeBSD? -+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) - /* The following code on Linux will cause the keypad keys - * not to echo on JTextField when the NumLock is on. The - * keysyms will be 0, because the last parameter 2 is not defined. -Index: j2se/src/solaris/native/sun/xawt/XWindow.c -=================================================================== -RCS file: /home/Java/CVS/JDK2/javasrc_1_5_scsl/j2se/src/solaris/native/sun/xawt/XWindow.c,v -retrieving revision 1.1.1.1 diff --git a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk deleted file mode 100644 index 5fe62075f..000000000 --- a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:03:20 2005 -+++ ../../j2se/make/common/Defs-bsd.gmk Thu Jan 13 02:03:38 2005 -@@ -180,7 +180,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-j2se::font::t1.c b/java/jdk15/files/patch-j2se::font::t1.c deleted file mode 100644 index 7cb654bf7..000000000 --- a/java/jdk15/files/patch-j2se::font::t1.c +++ /dev/null @@ -1,17 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/share/native/sun/font/t2k/t1.c.orig Tue Oct 19 15:00:39 2004 -+++ ../../j2se/src/share/native/sun/font/t2k/t1.c Tue Jul 18 21:42:18 2006 -@@ -2035,9 +2035,10 @@ - - if ( firstChar >= 'A' && firstChar <= 'Z' ) - lookupIndex = firstChar - 'A'; -- else -+ else if ( firstChar >= 'a' && firstChar <= 'z' ) - lookupIndex = firstChar - 'a' + 26; -- -+ else /* underscore is also valid but not handled */ -+ return 0; - - startIndex = PSNAME_START_INDEX[ lookupIndex ]; - endIndex = PSNAME_START_INDEX[ lookupIndex + 1 ]; diff --git a/java/jdk15/files/patch-j2se::instrument::Makefile b/java/jdk15/files/patch-j2se::instrument::Makefile deleted file mode 100644 index 8934bfc11..000000000 --- a/java/jdk15/files/patch-j2se::instrument::Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005 -+++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005 -@@ -72,8 +72,8 @@ - else - ifeq ($(PLATFORM), bsd) - ifneq ($(TRUE_PLATFORM), NetBSD) -- OTHER_INCLUDES += -I/usr/local/include -- OTHER_LDLIBS += -L/usr/local/lib -liconv -+ OTHER_INCLUDES += -I${LOCALBASE}/include -+ OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv - endif - else - OTHER_LDLIBS = -lnsl -ldl diff --git a/java/jdk15/files/patch-j2se::io::io_util.h b/java/jdk15/files/patch-j2se::io::io_util.h deleted file mode 100644 index 0230858c0..000000000 --- a/java/jdk15/files/patch-j2se::io::io_util.h +++ /dev/null @@ -1,21 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/share/native/java/io/io_util.h 8 Nov 2004 22:27:35 -0000 1.1.1.1 -+++ ../../j2se/src/share/native/java/io/io_util.h 7 Sep 2006 19:40:19 -0000 -@@ -11,7 +11,15 @@ - extern jfieldID IO_fd_fdID; - extern jfieldID IO_handle_fdID; - --#if !defined(O_DSYNC) || !defined(O_SYNC) -+#ifdef _ALLBSD_SOURCE -+#include <fcntl.h> -+#ifndef O_SYNC -+#define O_SYNC O_FSYNC -+#endif -+#ifndef O_DSYNC -+#define O_DSYNC O_FSYNC -+#endif -+#elif !defined(O_DSYNC) || !defined(O_SYNC) - #define O_SYNC (0x0800) - #define O_DSYNC (0x2000) - #endif diff --git a/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c b/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c deleted file mode 100644 index 64f8f4ebd..000000000 --- a/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c +++ /dev/null @@ -1,22 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c.orig Tue Oct 19 15:02:09 2004 -+++ ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c Thu Jun 15 17:58:34 2006 -@@ -32,7 +32,7 @@ - - for (i = 0; environ[i]; i++) { - /* Ignore corrupted environment variables */ -- if (strchr(environ[i], '=') != NULL) -+ if (strchr(environ[i], '=') != NULL && *environ[i] != '=') - count++; - } - -@@ -43,7 +43,7 @@ - jsize len = strlen(environ[i]); - const char * varEnd = strchr(environ[i], '='); - /* Ignore corrupted environment variables */ -- if (varEnd != NULL) { -+ if (varEnd != NULL && varEnd != environ[i]) { - jbyteArray var, val; - const char * valBeg = varEnd + 1; - jsize varLength = varEnd - environ[i]; diff --git a/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c b/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c deleted file mode 100644 index 8dea374d1..000000000 --- a/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c +++ /dev/null @@ -1,38 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c.orig Fri Jul 7 10:47:18 2006 -+++ ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c Fri Jul 7 14:48:06 2006 -@@ -273,14 +273,28 @@ - free(buf); - - /* -- * XXXBSD: there're potential problems with NBIO fd's. Check it. -+ * Similar to solaris if we've transferred any data return -+ * the number of bytes and ignore any error -+ */ -+ if (offset - (off_t)position > 0) -+ return (offset - (off_t)position); -+ -+ /* -+ * Deal with NBIO EAGAIN & EINTR the same as solaris. - */ - if (r == -1 || w == -1) { -- fprintf(stderr, "%d %d %d %d %d\n", srcFD, dstFD, r, w, errno); -- JNU_ThrowIOExceptionWithLastError(env, "Transfer failed"); -- return IOS_THROWN; -+ switch (errno) { -+ case EAGAIN: -+ return IOS_UNAVAILABLE; -+ case EINTR: -+ return IOS_INTERRUPTED; -+ default: -+ JNU_ThrowIOExceptionWithLastError(env, "Transfer failed"); -+ return IOS_THROWN; -+ } - } -- return (offset - (off_t)position); -+ -+ return (0); - #endif - } - diff --git a/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh b/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh deleted file mode 100644 index fd6137cab..000000000 --- a/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh +++ /dev/null @@ -1,17 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/java/nio/genCharsetProvider.sh 8 Nov 2004 22:27:03 -0000 1.1.1.1 -+++ ../../j2se/make/java/nio/genCharsetProvider.sh 24 Mar 2005 16:14:52 -0000 -@@ -94,9 +94,9 @@ - } - ' - --$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases >>$OUT --$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes >>$OUT --$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes >>$OUT -+$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases | egrep -v '^Java Hotspot' >>$OUT -+$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT -+$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT - - - # Constructor diff --git a/java/jdk15/files/patch-j2se::xawt::XWindow.c b/java/jdk15/files/patch-j2se::xawt::XWindow.c deleted file mode 100644 index 6060511e8..000000000 --- a/java/jdk15/files/patch-j2se::xawt::XWindow.c +++ /dev/null @@ -1,28 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/sun/xawt/XWindow.c 8 Nov 2004 22:27:40 -0000 1.1.1.1 -+++ ../../j2se/src/solaris/native/sun/xawt/XWindow.c 19 Apr 2006 22:21:51 -0000 -@@ -204,10 +204,10 @@ - {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD}, - - /* Keypad equivalents of Triangular Navigation Block */ -- {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -- {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -- {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -- {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -+ {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -+ {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -+ {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, -+ {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD}, - - /* Other vendor-specific Triangular Navigation Block */ - {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD}, -@@ -742,7 +742,7 @@ - { - KeySym originalKeysym = *keysym; - --#ifndef __linux__ -+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) - /* The following code on Linux will cause the keypad keys - * not to echo on JTextField when the NumLock is on. The - * keysyms will be 0, because the last parameter 2 is not defined. diff --git a/java/jdk15/files/patch-java_Makefile b/java/jdk15/files/patch-java_Makefile deleted file mode 100644 index 60585c522..000000000 --- a/java/jdk15/files/patch-java_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ../../j2se/make/java/java/Makefile.orig Mon Dec 13 12:38:14 2004 -+++ ../../j2se/make/java/java/Makefile Mon Dec 13 12:42:00 2004 -@@ -284,7 +284,7 @@ - $(RM) -r $(TMPDIR)/GenerateCurrencyData - $(MKDIR) -p $(TMPDIR)/GenerateCurrencyData - $(JAVAC_BOOT) -d $(TMPDIR)/GenerateCurrencyData $(BUILDDIR)/tools/GenerateCurrencyData/GenerateCurrencyData.java -- $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties > $@ -+ $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties | egrep -v '^Java HotSpot' > $@ - - clean:: - $(RM) $(GENSRCDIR)/java/util/CurrencyData.java diff --git a/java/jdk15/files/patch-vm::os_bsd.cpp b/java/jdk15/files/patch-vm::os_bsd.cpp deleted file mode 100644 index 25bd71db8..000000000 --- a/java/jdk15/files/patch-vm::os_bsd.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig Tue Jan 27 17:54:28 2004 -+++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp Tue Jan 27 17:55:21 2004 -@@ -333,7 +333,7 @@ - #define malloc(n) (char*)NEW_C_HEAP_ARRAY(char, (n)) - #define getenv(n) ::getenv(n) - --#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */ -+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */ - #define EXTENSIONS_DIR "/lib/ext" - #define ENDORSED_DIR "/lib/endorsed" - diff --git a/java/jdk15/files/pkg-deinstall.in b/java/jdk15/files/pkg-deinstall.in deleted file mode 100644 index 167d5bd28..000000000 --- a/java/jdk15/files/pkg-deinstall.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# Set up a standard path -PATH=/usr/bin:/bin - -# Don't do anything during post-deinstall -if [ "$2" = "POST-DEINSTALL" ]; then - exit 0 -fi - -# Remove the plugin - -# Plugin location variables -BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" -JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns7" -PLUGIN=libjavaplugin_oji.so - -# Check if the package includes the plugin -if [ ! -e "${JAVAPLUGINDIR}/${PLUGIN}" ]; then - exit 0 -fi - -# See if the browser plugin is a link to the package plugin and remove it if so. -if [ -e "${BROWSERPLUGINDIR}/${PLUGIN}" -a \ - -L "${BROWSERPLUGINDIR}/${PLUGIN}" -a \ - x`ls -l "${BROWSERPLUGINDIR}/${PLUGIN}" 2>/dev/null | awk '/->/{print $NF;exit 0}END{exit 1}'` = x"${JAVAPLUGINDIR}/${PLUGIN}" ]; then - rm -f "${BROWSERPLUGINDIR}/${PLUGIN}" -fi - -exit 0 diff --git a/java/jdk15/files/pkg-install.in b/java/jdk15/files/pkg-install.in deleted file mode 100644 index c5f4a70db..000000000 --- a/java/jdk15/files/pkg-install.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# System preference location -JRE_HOME=%%JRE_HOME%% - -# Post-install actions -if [ "$2" = "POST-INSTALL" ]; then - # Set up system preferences - if [ ! -d "${JRE_HOME}/.systemPrefs" ] ; then - mkdir -m 755 "${JRE_HOME}/.systemPrefs" - fi - if [ ! -f "${JRE_HOME}/.systemPrefs/.system.lock" ] ; then - touch "${JRE_HOME}/.systemPrefs/.system.lock" - chmod 644 "${JRE_HOME}/.systemPrefs/.system.lock" - fi - if [ ! -f "${JRE_HOME}/.systemPrefs/.systemRootModFile" ] ; then - touch "${JRE_HOME}/.systemPrefs/.systemRootModFile" - chmod 644 "${JRE_HOME}/.systemPrefs/.systemRootModFile" - fi - - # Install the plugin - BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" - JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns7" - PLUGIN=libjavaplugin_oji.so - - # Check if the browser plugin exists - if [ ! -e "${JAVAPLUGINDIR}/${PLUGIN}" ]; then - exit 0 - fi - - # Check if the plugin directory exists. - if [ ! -d "${BROWSERPLUGINDIR}" ]; then - exit 0 - fi - - # Check if the browser plugin currently exists - if [ ! -e "${BROWSERPLUGINDIR}/${PLUGIN}" ]; then - # Create symbolic link - ln -sf "${JAVAPLUGINDIR}/${PLUGIN}" \ - "${BROWSERPLUGINDIR}/${PLUGIN}" - exit 0 - fi - - # If the browser plugin exists and is a symlink, but the link - # doesn't exist, then overwrite with our plugin. - if [ -L "${BROWSERPLUGINDIR}/${PLUGIN}" ]; then - # Check if the linked to file exists. - if [ ! -e `ls -l "${BROWSERPLUGINDIR}/${PLUGIN}" 2>/dev/null | awk '/->/{print $NF;exit 0}END{exit 1}'` ]; then - ln -sf "${JAVAPLUGINDIR}/${PLUGIN}" \ - "${BROWSERPLUGINDIR}/${PLUGIN}" - exit 0 - fi - fi - - exit 0 -fi diff --git a/java/jdk15/pkg-descr b/java/jdk15/pkg-descr deleted file mode 100644 index 9f83e1336..000000000 --- a/java/jdk15/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -This is the latest JDK 1.5.0 patchset from the Java 2 FreeBSD porting -project. This port allows you to easily build a native JDK1.5.0 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. -Due to the same reasons you have to manually fetch the source code and patchset -for FreeBSD. - -WWW: http://www.freebsd.org/java/ - http://www.eyesbeyond.com/freebsddom/java/index.html - http://www.sun.com/software/communitysource/java2/ diff --git a/java/jdk15/pkg-message b/java/jdk15/pkg-message deleted file mode 100644 index 4a7be65b4..000000000 --- a/java/jdk15/pkg-message +++ /dev/null @@ -1,1139 +0,0 @@ -SUN COMMUNITY SOURCE LICENSE Version 2.3 (Rev. Date Sept. -29, 2004) - -RECITALS - -Original Contributor has developed Specifications and Source -Code implementations of certain Technology; and - -Original Contributor desires to license the Technology to a -large community to facilitate research, innovation and -product development while maintaining compatibility of such -products with the Technology as delivered by Original -Contributor; and - -Original Contributor desires to license certain Sun -Trademarks for the purpose of branding products that are -compatible with the relevant Technology delivered by -Original Contributor; and - -You desire to license the Technology and possibly certain -Sun Trademarks from Original Contributor on the terms and -conditions specified in this License. - -In consideration for the mutual covenants contained herein, -You and Original Contributor agree as follows: - -AGREEMENT -1. Introduction. The Sun Community Source License and -effective attachments ("License") may include five distinct -licenses: Research Use, TCK, Internal Deployment Use, -Commercial Use and Trademark License. The Research Use -license is effective when You click and accept this License. -The TCK and Internal Deployment Use licenses are effective -when You click and accept this License, unless otherwise -specified in the TCK and Internal Deployment Use -attachments. The Commercial Use and Trademark licenses must -be signed by You and Original Contributor in order to become -effective. Once effective, these licenses and the -associated requirements and responsibilities are cumulative. -Capitalized terms used in this License are defined in the -Glossary. - -2. License Grants. - -2.1 Original Contributor Grant. Subject to Your compliance -with Sections 3, 8.10 and Attachment A of this License, -Original Contributor grants to You a worldwide, -royalty-free, non-exclusive license, to the extent of -Original Contributor's Intellectual Property Rights covering -the Original Code, Upgraded Code and Specifications, to do -the following: - -a) Research Use License: - -(i) use, reproduce and modify the Original Code, Upgraded -Code and Specifications to create Modifications and -Reformatted Specifications for Research Use by You, - -(ii) publish and display Original Code, Upgraded Code and -Specifications with, or as part of Modifications, as -permitted under Section 3.1 b) below, - -(iii) reproduce and distribute copies of Original Code and -Upgraded Code to Licensees and students for Research Use by -You, - -(iv) compile, reproduce and distribute Original Code and -Upgraded Code in Executable form, and Reformatted -Specifications to anyone for Research Use by You. - -b) Other than the licenses expressly granted in this -License, Original Contributor retains all right, title, and -interest in Original Code and Upgraded Code and -Specifications. - -2.2 Your Grants. - -a) To Other Licensees. You hereby grant to each Licensee a -license to Your Error Corrections and Shared Modifications, -of the same scope and extent as Original Contributor's -licenses under Section 2.1 a) above relative to Research -Use, Attachment C relative to Internal Deployment Use, and -Attachment D relative to Commercial Use. - -b) To Original Contributor. You hereby grant to Original -Contributor a worldwide, royalty-free, non-exclusive, -perpetual and irrevocable license, to the extent of Your -Intellectual Property Rights covering Your Error -Corrections, Shared Modifications and Reformatted -Specifications, to use, reproduce, modify, display and -distribute Your Error Corrections, Shared Modifications and -Reformatted Specifications, in any form, including the right -to sublicense such rights through multiple tiers of -distribution. - -c) Other than the licenses expressly granted in Sections 2.2 -a) and b) above, and the restriction set forth in Section -3.1 d)(iv) below, You retain all right, title, and interest -in Your Error Corrections, Shared Modifications and -Reformatted Specifications. - -2.3 Contributor Modifications. You may use, reproduce, -modify, display and distribute Contributor Error -Corrections, Shared Modifications and Reformatted -Specifications, obtained by You under this License, to the -same scope and extent as with Original Code, Upgraded Code -and Specifications. - -2.4 Subcontracting. You may deliver the Source Code of -Covered Code to other Licensees having at least a Research -Use license, for the sole purpose of furnishing development -services to You in connection with Your rights granted in -this License. All such Licensees must execute appropriate -documents with respect to such work consistent with the -terms of this License, and acknowledging their -work-made-for-hire status or assigning exclusive right to -the work product and associated Intellectual Property Rights -to You. - -3.Requirements and Responsibilities. - -3.1 Research Use License. As a condition of exercising the rights -granted under Section 2.1 a) above, You agree to comply with the following: - -a) Your Contribution to the Community. All Error -Corrections and Shared Modifications which You create or -contribute to are automatically subject to the licenses -granted under Section 2.2 above. You are encouraged to -license all of Your other Modifications under Section 2.2 as -Shared Modifications, but are not required to do so. You -agree to notify Original Contributor of any errors in the -Specification. - -b) Source Code Availability. You agree to provide all Your -Error Corrections to Original Contributor as soon as -reasonably practicable and, in any event, prior to Internal -Deployment Use or Commercial Use, if applicable. Original -Contributor may, at its discretion, post Source Code for -Your Error Corrections and Shared Modifications on the -Community Webserver. You may also post Error Corrections -and Shared Modifications on a web-server of Your choice; -provided, that You must take reasonable precautions to -ensure that only Licensees have access to such Error -Corrections and Shared Modifications. Such precautions -shall include, without limitation, a password protection -scheme limited to Licensees and a click-on, download -certification of Licensee status required of those -attempting to download from the server. An example of an -acceptable certification is attached as Attachment A-2. - -c) Notices. All Error Corrections and Shared Modifications -You create or contribute to must include a file documenting -the additions and changes You made and the date of such -additions and changes. You must also include the notice set -forth in Attachment A-1 in the file header. If it is not -possible to put the notice in a particular Source Code file -due to its structure, then You must include the notice in a -location (such as a relevant directory file), where a -recipient would be most likely to look for such a notice. - -d) Redistribution. - -(i) Source. Covered Code may be distributed in Source Code -form only to another Licensee (except for students as -provided below). You may not offer or impose any terms on -any Covered Code that alter the rights, requirements, or -responsibilities of such Licensee. You may distribute -Covered Code to students for use in connection with their -course work and research projects undertaken at accredited -educational institutions. Such students need not be -Licensees, but must be given a copy of the notice set forth -in Attachment A-3 and such notice must also be included in a -file header or prominent location in the Source Code made -available to such students. - -(ii) Executable. You may distribute Executable version(s) -of Covered Code to Licensees and other third parties only -for the purpose of evaluation and comment in connection with -Research Use by You and under a license of Your choice, but -which limits use of such Executable version(s) of Covered -Code only to that purpose. - -(iii) Modified Class,Interface and Package Naming. In -connection with Research Use by You only, You may use -Original Contributor's class, interface and package names -only to accurately reference or invoke the Source Code files -You modify. Original Contributor grants to You a limited -license to the extent necessary for such purposes. - -(iv) You expressly agree that any distribution, in whole or -in part, of Modifications developed by You shall only be -done pursuant to the term and conditions of this License. - -e) Extensions. - -(i) Covered Code. You may not include any Source Code of -Community Code in any Extensions; - -(ii) Publication. No later than the date on which You first -distribute such Extension for Commercial Use, You must -publish to the industry, on a non-confidential basis and -free of all copyright restrictions with respect to -reproduction and use, an accurate and current specification -for any Extension. In addition, You must make available an -appropriate test suite, pursuant to the same rights as the -specification, sufficiently detailed to allow any third -party reasonably skilled in the technology to produce -implementations of the Extension compatible with the -specification. Such test suites must be made available as -soon as reasonably practicable but, in no event, later than -ninety (90) days after Your first Commercial Use of the -Extension. You must use reasonable efforts to promptly -clarify and correct the specification and the test suite -upon written request by Original Contributor. - -(iii) Open. You agree to refrain from enforcing any -Intellectual Property Rights You may have covering any -interface(s) of Your Extension, which would prevent the -implementation of such interface(s) by Original Contributor -or any Licensee. This obligation does not prevent You from -enforcing any Intellectual Property Right You have that -would otherwise be infringed by an implementation of Your -Extension. - -(iv) Class, Interface and Package Naming. You may not add -any packages, or any public or protected classes or -interfaces with names that originate or might appear to -originate from Original Contributor including, without -limitation, package or class names which begin with "sun", -"java", "javax", "jini", "net.jini", "com.sun" or their -equivalents in any subsequent class, interface and/ or -package naming convention adopted by Original Contributor. -It is specifically suggested that You name any new packages -using the "Unique Package Naming Convention" as described in -"The Java Language Specification" by James Gosling, Bill -Joy, and Guy Steele, ISBN 0-201-63451-1, August 1996. -Section 7.7 "Unique Package Names", on page 125 of this -specification which states, in part: - -"You form a unique package name by first having (or -belonging to an organization that has) an Internet domain -name, such as "sun.com". You then reverse the name, -component by component, to obtain, in this example, -"Com.sun", and use this as a prefix for Your package names, -using a convention developed within Your organization to -further administer package names." - -3.2 Additional Requirements and Responsibilities. Any -additional requirements and responsibilities relating to the -Technology are listed in Attachment F (Additional -Requirements and Responsibilities), if applicable, and are -hereby incorporated into this Section 3. - -4. Versions of the License. - -4.1 License Versions. Original Contributor may publish -revised versions of the License from time to time. Each -version will be given a distinguishing version number. - -4.2 Effect. Once a particular version of Covered Code has -been provided under a version of the License, You may always -continue to use such Covered Code under the terms of that -version of the License. You may also choose to use such -Covered Code under the terms of any subsequent version of -the License. No one other than Original Contributor has the -right to promulgate License versions. - -5. Disclaimer of Warranty. - -5.1 COVERED CODE IS PROVIDED UNDER THIS LICENSE "AS IS," -WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, -INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED -CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR -PURPOSE OR NON-INFRINGING. YOU AGREE TO BEAR THE ENTIRE -RISK IN CONNECTION WITH YOUR USE AND DISTRIBUTION OF COVERED -CODE UNDER THIS LICENSE. THIS DISCLAIMER OF WARRANTY -CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF -ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO -THIS DISCLAIMER. - -5.2 You acknowledge that Original Code, Upgraded Code and -Specifications are not designed or intended for use in (i) -on-line control of aircraft, air traffic, aircraft -navigation or aircraft communications; or (ii) in the -design, construction, operation or maintenance of any -nuclear facility. Original Contributor disclaims any -express or implied warranty of fitness for such uses. - -6. Termination. - -6.1 By You. You may terminate this Research Use license at -anytime by providing written notice to Original Contributor. - -6.2 By Original Contributor. This License and the rights -granted hereunder will terminate: - -(i) automatically if You fail to comply with the terms of -this License and fail to cure such breach within 30 days of -receipt of written notice of the breach; - -(ii) immediately in the event of circumstances specified in -Sections 7.1 and 8.4; or - -(iii) at Original Contributor's discretion upon any action -initiated in the first instance by You alleging that use or -distribution by Original Contributor or any Licensee, of -Original Code, Upgraded Code, Error Corrections or Shared -Modifications contributed by You, or Specifications, -infringe a patent owned or controlled by You. - -6.3 Effect of Termination. Upon termination, You agree -to discontinue use and return or destroy all copies of -Covered Code in your possession. All sublicenses to the -Covered Code which you have properly granted shall survive -any termination of this License. Provisions which, by their -nature, should remain in effect beyond the termination of -this License shall survive including, without limitation, -Sections 2.2, 3, 5, 7 and 8. - -6.4 Each party waives and releases the other from any claim -to compensation or indemnity for permitted or lawful -termination of the business relationship established by this -License. - -7. Liability. - -7.1 Infringement. Should any of the Original Code, Upgraded -Code, TCK or Specifications ("Materials") become the subject -of a claim of infringement, Original Contributor may, at its -sole option, (i) attempt to procure the rights necessary for -You to continue using the Materials, (ii) modify the -Materials so that they are no longer infringing, or (iii) -terminate Your right to use the Materials, immediately upon -written notice, and refund to You the amount, if any, having -then actually been paid by You to Original Contributor for -the Original Code, Upgraded Code and TCK, depreciated on a -straight line, five year basis. - -7.2 LIMITATION OF LIABILITY. TO THE FULL EXTENT ALLOWED BY -APPLICABLE LAW, ORIGINAL CONTRIBUTOR's LIABILITY TO YOU FOR -CLAIMS RELATING TO THIS LICENSE, WHETHER FOR BREACH OR IN -TORT, SHALL BE LIMITED TO ONE HUNDRED PERCENT (100%) OF THE -AMOUNT HAVING THEN ACTUALLY BEEN PAID BY YOU TO ORIGINAL -CONTRIBUTOR FOR ALL COPIES LICENSED HEREUNDER OF THE -PARTICULAR ITEMS GIVING RISE TO SUCH CLAIM, IF ANY. IN NO -EVENT WILL YOU (RELATIVE TO YOUR SHARED MODIFICATIONS OR -ERROR CORRECTIONS) OR SUN BE LIABLE FOR ANY INDIRECT, -PUNITIVE, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES IN -CONNECTION WITH OR ARISING OUT OF THIS LICENSE (INCLUDING, -WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR OTHER -ECONOMIC ADVANTAGE), HOWEVER IT ARISES AND ON ANY THEORY OF -LIABILITY, WHETHER IN AN ACTION FOR CONTRACT, STRICT -LIABILITY OR TORT (INCLUDING NEGLIGENCE) OR OTHERWISE, -WHETHER OR NOT YOU OR ORIGINAL CONTRIBUTOR HAS BEEN ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE AND NOTWITHSTANDING THE -FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY. - -8. Miscellaneous. - -8.1 Trademark. You agree to comply with the then current -Sun Trademark & Logo Usage Requirements accessible through -the SCSL Webpage. Except as expressly provided in the -License, You are granted no right, title or license to, or -interest in, any Sun Trademarks. You agree not to (i) -challenge Original Contributor's ownership or use of Sun -Trademarks; (ii) attempt to register any Sun Trademarks, or -any mark or logo substantially similar thereto; or (iii) -incorporate any Sun Trademarks into your own trademarks, -product names, service marks, company names, or domain -names. - -8.2 Integration. This License represents the complete -agreement concerning the subject matter hereof. - -8.3 Assignment. Original Contributor may assign this -License, and its rights and obligations hereunder, in its -sole discretion. You may assign the Research Use portions -of this License to a third party upon prior written notice -to Original Contributor (which may be provided via the -Community Web-Server). You may not assign the Commercial -Use license or TCK license, including by way of merger -(regardless of whether You are the surviving entity) or -acquisition, without Original Contributor's prior written -consent. - -8.4 Severability. If any provision of this License is held -to be unenforceable, such provision shall be reformed only -to the extent necessary to make it enforceable. -Notwithstanding the foregoing, if You are prohibited by law -from fully and specifically complying with Sections 2.2 or -3, this License will immediately terminate and You must -immediately discontinue any use of Covered Code. - -8.5 Governing Law. This License shall be governed by the -laws of the United States and the State of California, as -applied to contracts entered into and to be performed in -California between California residents. The application of -the United Nations Convention on Contracts for the -International Sale of Goods is expressly excluded. - -8.6 Dispute Resolution. - -a) Any dispute arising out of or relating to this License -shall be finally settled by arbitration as set out herein, -except that either party may bring any action, in a court of -competent jurisdiction (which jurisdiction shall be -exclusive), with respect to any dispute relating to such -party's Intellectual Property Rights or with respect to Your -compliance with the TCK license. Arbitration shall be -administered: (i) by the American Arbitration Association -(AAA), (ii) in accordance with the rules of the United -Nations Commission on International Trade Law (UNCITRAL) -(the "Rules") in effect at the time of arbitration as -modified herein; and (iii) the arbitrator will apply the -substantive laws of California and United States. Judgment -upon the award rendered by the arbitrator may be entered in -any court having jurisdiction to enforce such award. - -b) All arbitration proceedings shall be conducted in English - by a single arbitrator selected in accordance with the - Rules, who must be fluent in English and be either a - retired judge or practicing attorney having at least ten - (10) years litigation experience and be reasonably familiar - with the technology matters relative to the dispute. - Unless otherwise agreed, arbitration venue shall be in - London, Tokyo, or San Francisco, whichever is closest to - defendant's principal business office. The arbitrator may - award monetary damages only and nothing shall preclude - either party from seeking provisional or emergency relief - from a court of competent jurisdiction. The arbitrator - shall have no authority to award damages in excess of those - permitted in this License and any such award in excess is - void. All awards will be payable in U.S. dollars and may - include, for the prevailing party (i) pre-judgment award - interest, (ii) reasonable attorneys' fees incurred in - connection with the arbitration, and (iii) reasonable costs - and expenses incurred in enforcing the award. The - arbitrator will order each party to produce identified - documents and respond to no more than twenty-five single - question interrogatories. - -8.7 Construction. Any law or regulation which provides that -the language of a contract shall be construed against the -drafter shall not apply to this License. - -8.8 U.S. Government End Users. The Covered Code is a -"commercial item," as that term is defined in 48 C.F.R. -2.101 (Oct. 1995), consisting of "commercial computer -software" and "commercial computer software documentation," -as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). -Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 -through 227.7202-4 (June 1995), all U.S. Government End -Users acquire Covered Code with only those rights set forth -herein. You agree to pass this notice to Your licensees. - -8.9 Press Announcements. All press announcements relative -to the execution of this License must be reviewed and -approved by Original Contributor and You prior to release. - -8.10 International Use. - -a) Export/Import laws. Covered Code is subject to U.S. -export control laws and may be subject to export or import -regulations in other countries. Each party agrees to comply -strictly with all such laws and regulations and acknowledges -their responsibility to obtain such licenses to export, -re-export, or import as may be required. You agree to pass -these obligations to Your licensees. - -b) Intellectual Property Protection. Due to limited -intellectual property protection and enforcement in certain -countries, You agree not to redistribute the Original Code, -Upgraded Code, TCK and Specifications to any country other -than the list of restricted countries on the SCSL Webpage. - -8.11 Language. This License is in the English language -only, which language shall be controlling in all respects, -and all versions of this License in any other language shall -be for accommodation only and shall not be binding on the -parties to this License. All communications and notices -made or given pursuant to this License, and all -documentation and support to be provided, unless otherwise -noted, shall be in the English language. - -PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY. BY -CLICKING ON THE "ACCEPT" BUTTON BELOW YOU ARE ACCEPTING AND -AGREEING TO THE TERMS AND CONDITIONS OF THIS LICENSE WITH -SUN MICROSYSTEMS, INC. IF YOU ARE AGREEING TO THIS LICENSE -ON BEHALF OF A COMPANY, YOU REPRESENT THAT YOU ARE -AUTHORIZED TO BIND THE COMPANY TO SUCH A LICENSE. WHETHER -YOU ARE ACTING ON YOUR OWN BEHALF, OR REPRESENTING A -COMPANY, YOU MUST BE OF MAJORITY AGE AND BE OTHERWISE -COMPETENT TO ENTER INTO CONTRACTS. IF YOU DO NOT MEET THIS -CRITERIA OR YOU DO NOT AGREE TO ANY OF THE TERMS AND -CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON TO -EXIT. - -ACCEPT REJECT - -GLOSSARY - -1. "Commercial Use" means any use (excluding Internal -Deployment Use) or distribution, directly or indirectly of -Compliant Covered Code by You to any third party, alone or -bundled with any other software or hardware, for direct or -indirect commercial or strategic gain or advantage, subject -to execution of Attachment D by You and Original -Contributor. - -2. "Community Code" means the Original Code, Upgraded Code, -Error Corrections, Shared Modifications, or any combination -thereof. - -3. "Community Webserver(s)" means the webservers designated -by Original Contributor for posting Error Corrections and -Shared Modifications. - -4. "Compliant Covered Code" means Covered Code that -complies with the requirements of the TCK. - -5. "Contributor" means each Licensee that creates or -contributes to the creation of any Error Correction or -Shared Modification. - -6. "Covered Code" means the Original Code, Upgraded Code, -Modifications, or any combination thereof. - -7. "Error Correction" means any change made to Community -Code which conforms to the Specification and corrects the -adverse effect of a failure of Community Code to perform any -function set forth in or required by the Specifications. - -7. "Executable" means Covered Code that has been converted -to a form other than Source Code. - -9. "Extension(s)" means any additional classes or other -programming code and/or interfaces developed by or for You -which: (i) are designed for use with the Technology; (ii) -constitute an API for a library of computing functions or -services; and (iii) are disclosed to third party software -developers for the purpose of developing software which -invokes such additional classes or other programming code -and/or interfaces. The foregoing shall not apply to -software development by Your subcontractors to be -exclusively used by You. - -10. "Intellectual Property Rights" means worldwide -statutory and common law rights associated solely with (i) -patents and patent applications; (ii) works of authorship -including copyrights, copyright applications, copyright -registrations and "moral rights"; (iii) the protection of -trade and industrial secrets and confidential information; -and (iv) divisions, continuations, renewals, and -re-issuances of the foregoing now existing or acquired in -the future. - -11. "Internal Deployment Use" means use of Compliant -Covered Code (excluding Research Use) within Your business -or organization only by Your employees and/or agents, -subject to execution of Attachment C by You and Original -Contributor, if required. - -12. "Licensee" means any party that has entered into and -has in effect a version of this License with Original -Contributor. - -13. "Modification(s)" means (i) any change to Covered Code; -(ii) any new file or other representation of computer -program statements that contains any portion of Covered -Code; and/or (iii) any new Source Code implementing any -portion of the Specifications. - -14. "Original Code" means the initial Source Code for the -Technology as described on the Technology Download Site. - -15. "Original Contributor" means Sun Microsystems, Inc., -its affiliates and its successors and assigns. - -16. "Reformatted Specifications" means any revision to the -Specifications which translates or reformats the -Specifications (as for example in connection with Your -documentation) but which does not alter, subset or superset -the functional or operational aspects of the Specifications. - -17. "Research Use" means use and distribution of Covered -Code only for Your research, development, educational or -personal and individual use, and expressly excludes Internal -Deployment Use and Commercial Use. - -18. "SCSL Webpage" means the Sun Community Source license -webpage located at http://sun.com/software/communitysource, -or such other url that Sun may designate from time to time. - -19. "Shared Modifications" means Modifications provided by -You, at Your option, pursuant to Section 2.2, or received by -You from a Contributor pursuant to Section 2.3. - -20. "Source Code" means computer program statements written -in any high-level, readable form suitable for modification -and development. - -21. "Specifications" means the specifications for the -Technology and other documentation, as designated on the -Technology Download Site, as may be revised by Original -Contributor from time to time. - -22. "Sun Trademarks" means Original Contributor's SUN, -JAVA, and JINI trademarks and logos, whether now used or -adopted in the future. - -23. "Technology" means the -technology described in Attachment B, and Upgrades. - -24. "Technology Compatibility Kit" or "TCK" means the test -programs, procedures and/or other requirements, designated -by Original Contributor for use in verifying compliance of -Covered Code with the Specifications, in conjunction with -the Original Code and Upgraded Code. Original Contributor -may, in its sole discretion and from time to time, revise a -TCK to correct errors and/or omissions and in connection -with Upgrades. - -25. "Technology Download Site" means the site(s) designated -by Original Contributor for access to the Original Code, -Upgraded Code, TCK and Specifications. - -26. "Upgrade(s)" means new versions of Technology -designated exclusively by Original Contributor as an -"Upgrade" and released by Original Contributor from time to -time. - -27. "Upgraded Code" means the Source Code for Upgrades, -possibly including Modifications made by Contributors. - -28. "You(r)" means an individual, or a legal entity acting -by and through an individual or individuals, exercising -rights either under this License or under a future version -of this License issued pursuant to Section 4.1. For legal -entities, "You(r)" includes any entity that by majority -voting interest controls, is controlled by, or is under -common control with You. - -ATTACHMENT A - -REQUIRED NOTICES - -ATTACHMENT A-1 - -REQUIRED IN ALL CASES - -"The contents of this file, or the files included with this -file, are subject to the current version of Sun Community -Source License for [fill in name of applicable Technology] -(the "License"); You may not use this file except in -compliance with the License. You may obtain a copy of the -License at http://sun.com/software/communitysource. See the -License for the rights, obligations and limitations -governing use of the contents of the file. - -The Original and Upgraded Code is [fill in name and version -of applicable Technology]. The developer of the Original -and Upgraded Code is Sun Microsystems, Inc. Sun -Microsystems, Inc. owns the copyrights in the portions it -created. All Rights Reserved. - -Contributor(s): -_______________________________________________ - -Associated Test Suite(s) Location: -________________________________ - -ATTACHMENT A-2 - -SAMPLE LICENSEE CERTIFICATION - -"By clicking the `Agree' button below, You certify that You -are a Licensee in good standing under the Sun Community -Source License, [fill in applicable Technology and Version] -("License") and that Your access, use and distribution of -code and information You may obtain at this site is subject -to the License." - -ATTACHMENT A-3 - -REQUIRED STUDENT NOTIFICATION - -"This software and related documentation has been obtained -by your educational institution subject to the Sun Community -Source License, [fill in applicable Technology]. You have -been provided access to the software and related -documentation for use only in connection with your course -work and research activities as a matriculated student of -your educational institution. Any other use is expressly -prohibited. - -THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY -MATERIAL OF SUN MICROSYSTEMS, INC, WHICH ARE PROTECTED BY -VARIOUS INTELLECTUAL PROPERTY RIGHTS. - -You may not use this file except in compliance with the -License. You may obtain a copy of the License on the web at -http://sun.com/software/communitysource." - -ATTACHMENT B - -Java(tm) 2 SDK Technology - -Description of "Technology" - -Java(tm) 2 SDK Technology v. 5.0 as described on the -Technology Download Site. - -ATTACHMENT C - -INTERNAL DEPLOYMENT USE - -This Attachment C is only effective for the Technology -specified in Attachment B, upon execution of Attachment D -(Commercial Use License) including the requirement to pay -royalties. In the event of a conflict between the terms of -this Attachment C and Attachment D, the terms of Attachment -D shall govern. - -1. Internal Deployment License Grant. Subject to Your -compliance with Section 2 below, and Section 8.10 of the -Research Use license; in addition to the Research Use -license and the TCK license, Original Contributor grants to -You a worldwide, non-exclusive license, to the extent of -Original Contributor's Intellectual Property Rights covering -the Original Code, Upgraded Code and Specifications, to do -the following: - -a) reproduce and distribute internally, Original Code and -Upgraded Code as part of Compliant Covered Code, and -Specifications, for Internal Deployment Use, - -b) compile such Original Code and Upgraded Code, as part of -Compliant Covered Code, and reproduce and distribute -internally the same in Executable form for Internal -Deployment Use, and - -c) reproduce and distribute internally, Reformatted -Specifications for use in connection with Internal -Deployment Use. - -2. Additional Requirements and Responsibilities. In -addition to the requirements and responsibilities described -under Section 3.1 of the Research Use license, and as a -condition to exercising the rights granted under Section 3 -above, You agree to the following additional requirements -and responsibilities: - -2.1 Compatibility. All Covered Code must be Compliant -Covered Code prior to any Internal Deployment Use or -Commercial Use, whether originating with You or acquired -from a third party. Successful compatibility testing must -be completed in accordance with the TCK License. If You -make any further Modifications to any Covered Code -previously determined to be Compliant Covered Code, you must -ensure that it continues to be Compliant Covered Code. - -ATTACHMENT D COMMERCIAL USE LICENSE - -1. Effect. This Attachment D is effective only if signed -below by You and Original Contributor, and applies to Your -Commercial Use of Original Code and Upgraded Code. - -2. Term. Upon execution of this Attachment D by You and -Original Contributor, this Commercial Use license shall have -an initial term of 3 years and shall automatically renew for -additional one year terms unless either party provides -notice to the other no less than 60 days prior to an -anniversary date. - -3. Commercial Use License Grant. Subject to Your -compliance with Section 4 below, Section 8.10 of the -Research Use license, and the TCK license; in addition to -the Research Use license, the TCK license, and the Internal -Deployment Use license, Original Contributor grants to You a -worldwide, non-exclusive, non-transferable license, to the -extent of Original Contributor's Intellectual Property -Rights covering the Original Code, Upgraded Code and -Specifications, to do the following: - -a) reproduce and distribute Compliant Covered Code; - -b) compile Compliant Covered Code and reproduce and -distribute the same in Executable form through multiple -tiers of distribution; and - -c) reproduce and distribute Reformatted Specifications in -association with Compliant Covered Code. - -4. Additional Requirements and Responsibilities. In -addition to the requirements and responsibilities specified -in the Research Use license, the TCK license and the -Internal Deployment license, and as a condition to -exercising the rights granted in Section 3 above, You agree -to the following additional requirements and -responsibilities: - -a) Distribution of Source Code. Source Code of Compliant -Covered Code may be distributed only to another Licensee of -the same Technology. - -b) Distribution of Executable Code. You may distribute the -Executable version(s) of Compliant Covered Code under a -license of Your choice, which may contain terms different -from this License, provided (i) that You are in compliance -with the terms of this License, and (ii) You must make it -absolutely clear that any terms which differ from this -License are offered by You alone, not by Original -Contributor or any other Contributor. - -c) Branding. Products integrating Compliant Covered Code -used for Commercial Use must be branded with the Technology -compliance logo under a separate trademark license required -to be executed by You and Original Contributor concurrent -with execution of this Attachment D. - -5. Indemnity/Limitation of Liability. The provisions of -Section 7.1 of the Research Use license are superseded by -the following: - -a) Your Indemnity Obligation. You hereby agree to defend, -at Your expense, any legal proceeding brought against -Original Contributor or any Licensee to the extent it is -based on a claim: (i) that the use, reproduction or -distribution of any of Your Error Corrections or Shared -Modifications is an infringement of a third party trade -secret or a copyright in a country that is a signatory to -the Berne Convention; (ii) arising in connection with any -representation, warranty, support, indemnity, liability or -other license terms You may offer in connection with any -Covered Code; or (iii) arising from Your Commercial Use of -Covered Code, other than a claim covered by Section 5.b) -below, or a patent claim based solely on Covered Code not -provided by You. You will pay all damages costs and fees -awarded by a court of competent jurisdiction, or such -settlement amount negotiated by You, attributable to such -claim. - -b) Original Contributor's Indemnity Obligation. Original -Contributor will defend, at its expense, any legal -proceeding brought against You, to the extent it is based on -a claim that Your authorized Commercial Use of Original Code -and Upgraded Code is an infringement of a third party trade -secret or a copyright in a country that is a signatory to -the Berne Convention, and will pay all damages costs and -fees awarded by a court of competent jurisdiction, or such -settlement amount negotiated by Original Contributor, -attributable to such claim. The foregoing shall not apply -to any claims of intellectual property infringement based -upon the combination of code or documentation supplied by -Original Contributor with code, technology or documentation -from other sources. - -c) Right of Intervention. Original Contributor will have -the right, but not the obligation, to defend You, at -Original Contributor's expense, in connection with a claim -that Your Commercial Use of Original Code and Upgraded Code -is an infringement of a third party patent and will, if -Original Contributor chooses to defend You, pay all damages -costs and fees awarded by a court of competent jurisdiction, -or such settlement amount negotiated by Original -Contributor, attributable to such claim. - -d) Prerequisites. Under Sections 5.b) and c) above, You -must, and under Section 5.a) above, Original Contributor or -any Licensee must: (i) provide notice of the claim promptly -to the party providing an indemnity; (ii) give the -indemnifying party sole control of the defense and -settlement of the claim; (iii) provide the indemnifying -party, at indemnifying party's expense, all available -information, assistance and authority to defend; and (iv) -not have compromised or settled such claim or proceeding -without the indemnifying party's prior written consent. - -e) Additional Remedies. Should any Original Code, Upgraded -Code, TCK, Specifications, or Modifications become, or in -the indemnifying party's opinion be likely to become, the -subject of a claim of infringement for which indemnity is -provided above, the indemnifying party may, at its sole -option, attempt to procure on reasonable terms the rights -necessary for the indemnified party to exercise its license -rights under this License with respect to the infringing -items, or to modify the infringing items so that they are no -longer infringing without substantially impairing their -function or performance. If the indemnifying party is -unable to do the foregoing after reasonable efforts, then -the indemnifying party may send a notice of such inability -to the indemnified party together with a refund of any -license fees received by the indemnifying party from the -indemnified party for the infringing items applicable to the -indemnified party's future use or distribution of such -infringing items, in which case the indemnifying party will -not be liable for any damages resulting from infringing -activity with respect to the infringing items occurring -after such notice and refund. - -6. Support Programs. - -Support to You. Technical support is not provided to You by -Original Contributor under this License. You may contract -for one or more support programs from Original Contributor -relating to the Technology which are described on the SCSL -Webpage. - -Customer Support. You are responsible for providing -technical and maintenance support services to Your customers -for Your products and services incorporating the Compliant -Covered code. - -7. Royalties and Payments. - -Technology specified in Attachment B. - -Field of Use:____________________ - -Royalty per Unit $_____________ - -b) Royalty Payments. Payment of royalties shall be made -quarterly, shall be due thirty (30) days following the end -of the calendar quarter to which they relate and shall be -submitted with a written statement documenting the basis for -the royalty calculation. - -c) Taxes. All payments required by this License shall be -made in United States dollars, are exclusive of taxes, and -Licensee agrees to bear and be responsible for the payment -of all such taxes, including, but not limited to, all sales, -use, rental receipt, personal property or other taxes and -their equivalents which may be levied or assessed in -connection with this License (excluding only taxes based on -Original Contributor's net income). To the extent Licensee -is required to withhold taxes based upon Original -Contributor's income in any country, You agree to provide -Original Contributor with written evidence of such -withholding, suitable for Original Contributor to obtain a -tax credit in the United States. - -d) Records. You agree to maintain account books and records -consistent with Generally Accepted Accounting Principles -appropriate to Your domicile, as may be in effect from time -to time, sufficient to allow the correctness of the -royalties required to be paid pursuant to this License to be -determined. - -e) Audit Rights. Original Contributor shall have the right -to audit such accounts upon reasonable prior notice using an -independent auditor of Original Contributor's choice (the -"Auditor"). The Auditor shall be bound to keep confidential -the details of Your business affairs and to limit disclosure -of the results of any audit to the sufficiency of the -accounts and the amount, if any, of a payment adjustment -that should be made. Such audits shall not occur more than -once each year (unless discrepancies are discovered in -excess of the five percent (5%) threshold set forth in -Section 7.f) below, in which case two consecutive quarters -per year may be audited). Except as set forth in Section -7.f) below, Original Contributor shall bear all costs and -expenses associated with the exercise of its rights to -audit. - -f) Payment Errors. In the event that any errors in payments -shall be determined, such errors shall be corrected by -appropriate adjustment in payment for the quarterly period -during which the error is discovered. In the event of an -underpayment of more than five percent (5%) of the proper -amount owed, upon such underpayment being properly -determined by the Auditor, You agree to reimburse Original -Contributor the amount of the underpayment and all -reasonable costs and expenses associated with the exercise -of its rights to audit, and interest on the overdue amount -at the maximum allowable interest rate from the date of -accrual of such obligation. - -8. Notice of Breach or Infringement. Each party shall -notify the other immediately in writing when it becomes -aware of any breach or violation of the terms of this -License, or when You become aware of any potential or actual -infringement by a third party of the Technology or Sun's -Intellectual Property Rights therein. - -9. Proprietary Rights Notices. You may not remove any -copyright notices, trademark notices or other proprietary -legends of Original Contributor or its suppliers contained -on or in the Original Code, Upgraded Code and -Specifications. - -10. Notices. All written notices required by this License -must be delivered in person or by means evidenced by a -delivery receipt and will be effective upon receipt by the -persons at the addresses specified below. - -Original Contributor: You: - -Sun Microsystems, Inc. _____________________________ - -4150 Network Circle ______________________________ - -Santa Clara, California 95054 ______________________________ - -Attn.: VP, Sun Software and -Technology Sales ______________________________ -cc: Legal (Software Sales) - -11. Disclaimer of Agency. The relationship created hereby -is that of licensor and licensee and the parties hereby -acknowledge and agree that nothing herein shall be deemed to -constitute You as a franchisee of Original Contributor. You -hereby waive the benefit of any state or federal statutes -dealing with the establishment and regulation of franchises. - -Agreed: -You: Original Contributor: - -_____________________________ Sun Microsystems, Inc. -(Your Name) -By:_________________________ By:_____________________ - -Title:_______________________ Title:____________________ - -Date:______________________ Date:____________________ - -ATTACHMENT E TECHNOLOGY COMPATIBILITY KIT - -The following license is effective for the Java(tm)2 SDK -Technology Compatibility Kit only upon execution -of a separate support agreement between You and Original -Contributor (subject to an annual fee) as described on the -SCSL Webpage. The Technology Compatibility Kit for the -Technology specified in Attachment B may be accessed at the -Technology Download Site only upon execution of the support -agreement. - -1. TCK License. - -a) Subject to the restrictions set forth in Section 1.b -below and Section 8.10 of the Research Use license, in -addition to the Research Use license, Original Contributor -grants to You a worldwide, non-exclusive, non-transferable -license, to the extent of Original Contributor's -Intellectual Property Rights in the TCK (without the right -to sublicense), to use the TCK to develop and test Covered -Code. - -b) TCK Use Restrictions. You are not authorized to create -derivative works of the TCK or use the TCK to test any -implementation of the Specification that is not Covered -Code. You may not publish your test results or make claims -of comparative compatibility with respect to other -implementations of the Specification. In consideration for -the license grant in Section 1.a above you agree not to -develop your own tests which are intended to validate -conformation with the Specification. - -2. Requirements for Determining Compliance. - -2.1 Definitions. - -a) "Added Value" means code which: - -(i) has a principal purpose which is substantially different -from that of the stand-alone Technology; - -(ii) represents a significant functional and value -enhancement to the Technology; - -(iii) operates in conjunction with the Technology; and - -(iv) is not marketed as a technology which replaces or -substitutes for the Technology. - -b) "Java Classes" means the specific class libraries -associated with each Technology defined in Attachment B. - -c) "Java Runtime Interpreter" means the program(s) which -implement the Java virtual machine for the Technology as -defined in the Specification. - -d) "Platform Dependent Part" means those Original Code and -Upgraded Code files of the Technology which are not in a -"share" directory or subdirectory thereof. - -e) "Shared Part" means those Original Code and Upgraded Code -files of the Technology which are identified as "shared" (or -words of similar meaning) or which are in any "share" -directory or subdirectory thereof, except those files -specifically designated by Original Contributor as -modifiable. - -f) "User's Guide" means the users guide for the TCK which -Sun makes available to You to provide direction in how to -run the TCK and properly interpret the results, as may be -revised by Sun from time to time. - -2.2 Development Restrictions. Compliant Covered Code: - -a) must include Added Value; - -b) must fully comply with the Specifications for the -Technology specified in Attachment B; - -c) must include the Shared Part, complete and unmodified; - -d) may not modify the functional behavior of the Java -Runtime Interpreter or the Java Classes; - -e) may not modify, subset or superset the interfaces of the -Java Runtime Interpreter or the Java Classes; - -f) may not subset or superset the Java Classes; and - -g) may not modify or extend the required public class or -public interface declarations whose names begin with "java", -"javax", "jini", "net.jini", "sun.hotjava", "COM.sun" or -their equivalents in any subsequent naming convention. - -2.3 Compatibility Testing. Successful compatibility testing -must be completed by You, or at Original Contributor's -option, a third party designated by Original Contributor, to -conduct such tests, in accordance with the User's Guide, and -using the most current version of the applicable TCK -available from Original Contributor one hundred twenty (120) -days (two hundred forty [240] days in the case of silicon -implementations) prior to: (i) Your Internal Deployment -Use; and (ii) each release of Compliant Covered Code by You -for Commercial Use. In the event that You elect to use a -version of Upgraded Code that is newer than that which is -required under this Section 2.3, then You agree to pass the -version of the TCK that corresponds to such newer version of -Upgraded Code. - -2.4 Test Results. You agree to provide to Original -Contributor or the third party test facility if applicable, -Your test results that demonstrate that Covered Code is -Compliant Covered Code and that Original Contributor may -publish or otherwise distribute such test results. |