From 324a878467d44a319675c0a896590a8480cd70b6 Mon Sep 17 00:00:00 2001 From: kurt Date: Thu, 6 Sep 2007 15:46:18 +0000 Subject: [PATCH] Remove BROKEN and update port to b19. The port is fully 1.7 now (both hotspot and j2se). The j2se patches are from the bsd java repositories 1.5 -> 1.6 (performed by Greg Lewis) -> 1.7 by myself. j2se patches are in sync with 1.6 patchset 1 plus the Runtime.exec fix from Michiel Boland via FreeBSD PR http://www.freebsd.org/cgi/query-pr.cgi?pr=115557. Also from FreeBSD: interactive JRL license verification. By default the port is IS_INTERACTIVE=Yes. Add ACCEPT_JRL_LICENSE=Yes to /etc/mk.conf to permanently accept the JRL license. At some point in the future I will work on switching this back to OpenJDK/GPLv2 src. That largely depends on Sun's progress at removing more of the binary plug bits so that stubbing out the remainder is less cumbersome and time consuming. Testing, comments and okay ian@ --- devel/jdk/1.7/Makefile | 115 +- devel/jdk/1.7/distinfo | 25 +- devel/jdk/1.7/files/license.sh | 195 ++ .../patch-control_make_sanity-rules_gmk | 12 + .../patches/patch-hotspot_build_bsd_Makefile | 8 +- ...atch-hotspot_build_bsd_makefiles_defs_make | 8 +- ...patch-hotspot_build_bsd_makefiles_gcc_make | 26 +- .../patch-hotspot_build_bsd_makefiles_sa_make | 8 +- .../patch-hotspot_build_bsd_makefiles_vm_make | 14 +- .../1.7/patches/patch-hotspot_make_defs_make | 8 +- ...tspot_src_cpu_amd64_vm_assembler_amd64_cpp | 10 +- .../patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp | 49 - ...tch-hotspot_src_os_bsd_vm_osThread_bsd_cpp | 10 +- ...tch-hotspot_src_os_bsd_vm_osThread_bsd_hpp | 11 +- .../patch-hotspot_src_os_bsd_vm_os_bsd_cpp | 123 +- .../patch-hotspot_src_os_bsd_vm_os_bsd_hpp | 53 +- ...atch-hotspot_src_os_bsd_vm_vmError_bsd_cpp | 13 - .../patch-hotspot_src_share_vm_includeDB_core | 18 +- ...otspot_src_share_vm_runtime_vm_version_cpp | 8 +- ...-hotspot_src_share_vm_utilities_macros_hpp | 8 +- ...patch-j2se_make_com_sun_java_pack_Makefile | 34 + ...make_com_sun_security_auth_module_Makefile | 12 + ...j2se_make_com_sun_tools_attach_FILES_c_gmk | 12 + ...e_make_com_sun_tools_attach_FILES_java_gmk | 15 + .../patch-j2se_make_common_Defs-bsd_gmk | 103 + .../patches/patch-j2se_make_common_Defs_gmk | 40 + .../patch-j2se_make_common_Program_gmk | 43 + .../patch-j2se_make_common_Release_gmk | 76 + ...h-j2se_make_common_shared_Compiler-gcc_gmk | 33 + ...patch-j2se_make_common_shared_Compiler_gmk | 14 + ...patch-j2se_make_common_shared_Defs-bsd_gmk | 44 + ...patch-j2se_make_common_shared_Platform_gmk | 100 + .../patch-j2se_make_common_shared_Sanity_gmk | 15 + .../1.7/patches/patch-j2se_make_docs_Makefile | 21 + .../1.7/patches/patch-j2se_make_java_Makefile | 12 + .../patch-j2se_make_java_hpi_hpi_common_gmk | 14 + .../patch-j2se_make_java_hpi_native_Makefile | 22 + .../patch-j2se_make_java_instrument_Makefile | 27 + .../patch-j2se_make_java_java_Makefile | 29 + ...ch-j2se_make_java_java_hprof_demo_Makefile | 17 + .../patch-j2se_make_java_java_localegen_sh | 15 + .../patches/patch-j2se_make_java_jli_Makefile | 37 + .../patch-j2se_make_java_management_Makefile | 15 + .../patch-j2se_make_java_net_FILES_c_gmk | 14 + .../patches/patch-j2se_make_java_net_Makefile | 24 + .../patches/patch-j2se_make_java_nio_Makefile | 44 + .../patches/patch-j2se_make_java_npt_Makefile | 17 + .../patch-j2se_make_java_redist_FILES_gmk | 18 + .../patch-j2se_make_java_redist_Makefile | 33 + ...atch-j2se_make_java_sun_nio_FILES_java_gmk | 12 + .../patch-j2se_make_java_zip_FILES_c_gmk | 22 + .../patches/patch-j2se_make_java_zip_Makefile | 32 + .../patch-j2se_make_javax_sound_FILES_c_gmk | 14 + .../patch-j2se_make_javax_sound_Makefile | 23 + .../patch-j2se_make_javax_sound_SoundDefs_gmk | 14 + .../patch-j2se_make_jpda_back_Makefile | 13 + ...h-j2se_make_jpda_transport_socket_Makefile | 15 + .../patch-j2se_make_mkdemo_jvmti_Demo_gmk | 28 + .../patches/patch-j2se_make_sun_awt_Makefile | 73 + .../patches/patch-j2se_make_sun_awt_mawt_gmk | 94 + .../patch-j2se_make_sun_font_FILES_c_gmk | 12 + .../patches/patch-j2se_make_sun_font_Makefile | 40 + ...patch-j2se_make_sun_image_generic_Makefile | 16 + .../patches/patch-j2se_make_sun_jawt_Makefile | 32 + ...se_make_sun_security_jgss_wrapper_Makefile | 15 + ...tch-j2se_make_sun_security_pkcs11_Makefile | 12 + ...2se_make_sun_security_smartcardio_Makefile | 15 + .../patch-j2se_make_sun_splashscreen_Makefile | 38 + .../patches/patch-j2se_make_sun_xawt_Makefile | 59 + ...sed_share_classes_sun_jdbc_odbc_JdbcOdbc_c | 13 + ...ve_com_sun_media_sound_DirectAudioDevice_c | 15 + ...hare_native_com_sun_media_sound_Platform_c | 21 + ..._native_com_sun_media_sound_engine_HAE_cpp | 11 + ..._native_com_sun_media_sound_engine_X_API_c | 180 ++ ..._native_com_sun_media_sound_engine_X_API_h | 55 + ...hare_native_sun_java2d_cmm_kcms_kcms_sys_h | 30 + ..._share_native_sun_java2d_cmm_kcms_kcmsos_h | 68 + ..._share_native_sun_java2d_cmm_kcms_kpfile_c | 48 + ...hare_native_sun_java2d_cmm_kcms_sithread_h | 30 + ...hare_native_sun_java2d_cmm_kcms_sptagmgr_c | 25 + ...ed_share_native_sun_java2d_cmm_kcms_sync_c | 48 + ...ed_share_native_sun_java2d_cmm_kcms_sync_h | 32 + ..._share_native_sun_java2d_cmm_kcms_thread_c | 34 + ...share_native_sun_java2d_cmm_kcms_ukcpmgr_c | 24 + ...media_sound_engine_HAE_API_BsdOS_Capture_c | 114 + ...com_sun_media_sound_engine_HAE_API_BsdOS_c | 203 ++ .../patch-j2se_src_share_back_commonRef_c | 14 + ..._com_sun_java_swing_plaf_gtk_Metacity_java | 14 + ...hare_classes_com_sun_tools_javah_Util_java | 16 + ..._classes_java_awt_GraphicsEnvironment_java | 12 + ...c_share_classes_java_lang_ClassLoader_java | 67 + ..._src_share_classes_java_util_TimeZone_java | 20 + ...are_classes_sun_awt_FontConfiguration_java | 21 + ...rc_share_classes_sun_font_FontManager_java | 12 + ...share_classes_sun_io_ByteToCharKOI8_U_java | 65 + ...share_classes_sun_io_CharToByteKOI8_U_java | 240 ++ ...hare_classes_sun_io_CharacterEncoding_java | 26 + ...ses_sun_java2d_SunGraphicsEnvironment_java | 38 + ..._share_classes_sun_print_PSPrinterJob_java | 14 + ...sses_sun_security_provider_SunEntries_java | 12 + ..._src_share_classes_sun_tools_jar_Main_java | 53 + ...ses_sun_tools_jar_resources_jar_properties | 12 + ...atch-j2se_src_share_hpi_include_hpi_impl_h | 25 + ...ative_com_sun_java_util_jar_pack_defines_h | 29 + ...native_com_sun_java_util_jar_pack_main_cpp | 33 + ...-j2se_src_share_native_common_check_code_c | 64 + ...ch-j2se_src_share_native_java_io_io_util_h | 20 + ...e_native_java_lang_fdlibm_include_fdlibm_h | 39 + ..._native_java_lang_fdlibm_include_jfdlibm_h | 12 + ..._src_share_native_java_util_zip_Inflater_c | 25 + ...re_native_java_util_zip_zlib-1_1_3_zconf_h | 85 + ...rc_share_native_sun_awt_debug_debug_util_h | 13 + ...e_native_sun_awt_image_BufImgSurfaceData_c | 15 + ...re_native_sun_awt_image_DataBufferNative_c | 15 + ...ive_sun_awt_medialib_mlib_ImageConv2x2_f_c | 42 + ...ve_sun_awt_medialib_mlib_ImageConv_16ext_c | 42 + ...ive_sun_awt_medialib_mlib_ImageConv_16nw_c | 42 + ...ive_sun_awt_medialib_mlib_ImageConv_8ext_c | 42 + ...tive_sun_awt_medialib_mlib_ImageConv_8nw_c | 42 + ...e_sun_awt_medialib_mlib_ImageConv_u16ext_c | 42 + ...ve_sun_awt_medialib_mlib_ImageConv_u16nw_c | 42 + ...tive_sun_awt_medialib_mlib_ImageCopy_Bit_c | 222 ++ ...ive_sun_awt_medialib_mlib_ImageLookUp_64_c | 283 ++ ...ve_sun_awt_medialib_mlib_ImageLookUp_Bit_c | 154 + ..._native_sun_awt_medialib_mlib_ImageUtils_c | 12 + ...native_sun_awt_medialib_mlib_c_ImageCopy_c | 101 + ...ve_sun_awt_medialib_mlib_c_ImageLookUp_f_c | 1235 ++++++++ ...share_native_sun_awt_medialib_mlib_image_h | 15 + ...c_share_native_sun_awt_medialib_mlib_sys_c | 33 + ...share_native_sun_awt_medialib_mlib_types_h | 19 + ...rc_share_native_sun_font_AccelGlyphCache_c | 15 + ..._src_share_native_sun_java2d_SurfaceData_c | 15 + ..._share_native_sun_java2d_opengl_OGLFuncs_h | 13 + ..._native_sun_java2d_opengl_OGLRenderQueue_c | 15 + ...native_sun_java2d_opengl_OGLTextRenderer_c | 15 + ...c_share_transport_socket_socketTransport_c | 90 + .../patch-j2se_src_solaris_back_exec_md_c | 12 + .../patch-j2se_src_solaris_back_util_md_h | 20 + .../patch-j2se_src_solaris_bin_java_md_c | 309 ++ .../patch-j2se_src_solaris_bin_java_md_h | 19 + ...lasses_sun_awt_X11GraphicsEnvironment_java | 21 + ...sses_sun_awt_motif_MFontConfiguration_java | 11 + ...2se_src_solaris_classes_sun_font_XMap_java | 12 + ...sses_sun_print_UnixPrintServiceLookup_java | 42 + ...sses_sun_security_provider_NativePRNG_java | 12 + ...es_sun_tools_attach_BsdAttachProvider_java | 37 + ...se_src_solaris_demo_jvmti_hprof_hprof_md_c | 48 + ...h-j2se_src_solaris_hpi_include_interrupt_h | 23 + ...se_src_solaris_hpi_include_largefile_bsd_h | 39 + ...h-j2se_src_solaris_hpi_include_largefile_h | 14 + ...is_hpi_native_threads_include_threads_md_h | 48 + ...olaris_hpi_native_threads_src_condvar_md_c | 12 + ...olaris_hpi_native_threads_src_monitor_md_c | 12 + ...olaris_hpi_native_threads_src_sys_api_td_c | 25 + ...laris_hpi_native_threads_src_threads_bsd_c | 758 +++++ ...olaris_hpi_native_threads_src_threads_md_c | 86 + ...patch-j2se_src_solaris_hpi_src_linker_md_c | 54 + ...patch-j2se_src_solaris_hpi_src_memory_md_c | 93 + ...patch-j2se_src_solaris_hpi_src_system_md_c | 56 + ...rc_solaris_instrument_EncodingSupport_md_c | 31 + ...ch-j2se_src_solaris_javavm_export_jvm_md_h | 12 + ...e_src_solaris_javavm_include_typedefs_md_h | 22 + ...om_sun_management_UnixOperatingSystem_md_c | 168 ++ ...native_com_sun_security_auth_module_Unix_c | 16 + ...-j2se_src_solaris_native_common_gdefs_md_h | 13 + ...solaris_native_java_io_UnixFileSystem_md_c | 156 + ...c_solaris_native_java_io_canonicalize_md_c | 13 + ...se_src_solaris_native_java_io_io_util_md_c | 12 + ...s_native_java_lang_ProcessEnvironment_md_c | 21 + ..._solaris_native_java_lang_UNIXProcess_md_c | 204 ++ ...c_solaris_native_java_lang_java_props_md_c | 198 ++ ...solaris_native_java_net_Inet4AddressImpl_c | 359 +++ ...solaris_native_java_net_Inet6AddressImpl_c | 52 + ...solaris_native_java_net_NetworkInterface_c | 281 ++ ..._native_java_net_PlainDatagramSocketImpl_c | 109 + ..._solaris_native_java_net_PlainSocketImpl_c | 15 + ..._src_solaris_native_java_net_net_util_md_c | 169 ++ ..._src_solaris_native_java_net_net_util_md_h | 12 + ...solaris_native_java_nio_MappedByteBuffer_c | 27 + ...s_native_java_util_FileSystemPreferences_c | 40 + ...src_solaris_native_java_util_TimeZone_md_c | 147 + ..._src_solaris_native_sun_awt_VDrawingArea_c | 15 + ...j2se_src_solaris_native_sun_awt_X11Color_c | 13 + ..._src_solaris_native_sun_awt_XDrawingArea_c | 15 + ...j2se_src_solaris_native_sun_awt_Xinerama_c | 29 + ...j2se_src_solaris_native_sun_awt_Xinerama_h | 19 + ...j2se_src_solaris_native_sun_awt_awt_Font_c | 12 + ...c_solaris_native_sun_awt_awt_GraphicsEnv_c | 57 + ...c_solaris_native_sun_awt_awt_InputMethod_c | 189 ++ ...c_solaris_native_sun_awt_awt_LoadLibrary_c | 40 + ..._src_solaris_native_sun_awt_awt_MToolkit_c | 23 + ...2se_src_solaris_native_sun_awt_awt_Robot_c | 12 + ..._src_solaris_native_sun_awt_awt_TopLevel_c | 137 + ...e_src_solaris_native_sun_awt_awt_motif21_c | 30 + ...j2se_src_solaris_native_sun_awt_awt_util_h | 25 + ...h-j2se_src_solaris_native_sun_awt_awt_wm_c | 102 + ...h-j2se_src_solaris_native_sun_awt_awt_wm_h | 15 + ...h-j2se_src_solaris_native_sun_awt_canvas_c | 27 + ...-j2se_src_solaris_native_sun_awt_extutil_h | 18 + ...j2se_src_solaris_native_sun_awt_fontpath_c | 58 + ...tch-j2se_src_solaris_native_sun_awt_list_c | 15 + ..._src_solaris_native_sun_awt_panoramiXext_h | 18 + ...rc_solaris_native_sun_awt_panoramiXproto_h | 18 + ..._src_solaris_native_sun_awt_robot_common_c | 13 + ...rc_solaris_native_sun_font_X11FontScaler_c | 15 + ..._solaris_native_sun_font_X11TextRenderer_c | 15 + ...2se_src_solaris_native_sun_java2d_j2d_md_h | 19 + ...ative_sun_java2d_loops_mlib_ImageZoom_NN_c | 108 + ...is_native_sun_java2d_loops_vis_FuncArray_c | 12 + ...ris_native_sun_management_FileSystemImpl_c | 14 + ...ve_sun_net_dns_ResolverConfigurationImpl_c | 12 + ..._native_sun_net_spi_DefaultProxySelector_c | 12 + ...is_native_sun_nio_ch_DatagramChannelImpl_c | 53 + ...olaris_native_sun_nio_ch_FileChannelImpl_c | 115 + ...solaris_native_sun_nio_ch_FileDispatcher_c | 16 + ...se_src_solaris_native_sun_nio_ch_FileKey_c | 14 + ...h-j2se_src_solaris_native_sun_nio_ch_Net_c | 77 + ...s_native_sun_security_pkcs11_j2secmod_md_c | 37 + ...ative_sun_tools_attach_BsdVirtualMachine_c | 7 + ...j2se_src_solaris_native_sun_xawt_XWindow_c | 27 + ...e_src_solaris_transport_socket_socket_md_c | 21 + devel/jdk/1.7/pkg/DESCR | 6 - devel/jdk/1.7/pkg/DESCR-jre | 19 + devel/jdk/1.7/pkg/DESCR-main | 16 + devel/jdk/1.7/pkg/PFRAG.client_vm-jre | 5 + .../{PFRAG.client_vm => PFRAG.client_vm-main} | 2 +- devel/jdk/1.7/pkg/PLIST | 2615 ----------------- devel/jdk/1.7/pkg/PLIST-jre | 609 ++++ devel/jdk/1.7/pkg/PLIST-main | 2097 +++++++++++++ 229 files changed, 14492 insertions(+), 2885 deletions(-) create mode 100644 devel/jdk/1.7/files/license.sh create mode 100644 devel/jdk/1.7/patches/patch-control_make_sanity-rules_gmk delete mode 100644 devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp delete mode 100644 devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_vmError_bsd_cpp create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_com_sun_java_pack_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_com_sun_security_auth_module_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_c_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_java_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_common_Defs-bsd_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_common_Defs_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_common_Program_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_common_Release_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler-gcc_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_common_shared_Defs-bsd_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_common_shared_Platform_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_common_shared_Sanity_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_docs_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_hpi_hpi_common_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_hpi_native_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_instrument_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_java_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_java_hprof_demo_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_java_localegen_sh create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_jli_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_management_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_net_FILES_c_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_net_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_nio_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_npt_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_redist_FILES_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_redist_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_sun_nio_FILES_java_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_zip_FILES_c_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_java_zip_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_javax_sound_FILES_c_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_javax_sound_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_javax_sound_SoundDefs_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_jpda_back_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_jpda_transport_socket_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_mkdemo_jvmti_Demo_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_awt_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_awt_mawt_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_font_FILES_c_gmk create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_font_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_image_generic_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_jawt_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_security_jgss_wrapper_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_security_pkcs11_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_security_smartcardio_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_splashscreen_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_make_sun_xawt_Makefile create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_classes_sun_jdbc_odbc_JdbcOdbc_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_DirectAudioDevice_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_Platform_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_HAE_cpp create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcms_sys_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcmsos_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kpfile_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sithread_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sptagmgr_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_thread_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_ukcpmgr_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_Capture_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_back_commonRef_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_tools_javah_Util_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_awt_GraphicsEnvironment_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_lang_ClassLoader_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_util_TimeZone_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_awt_FontConfiguration_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_font_FontManager_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_ByteToCharKOI8_U_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharToByteKOI8_U_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharacterEncoding_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_java2d_SunGraphicsEnvironment_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_print_PSPrinterJob_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_security_provider_SunEntries_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_tools_jar_Main_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_tools_jar_resources_jar_properties create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_hpi_include_hpi_impl_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_com_sun_java_util_jar_pack_defines_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_com_sun_java_util_jar_pack_main_cpp create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_common_check_code_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_java_io_io_util_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_java_lang_fdlibm_include_fdlibm_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_java_lang_fdlibm_include_jfdlibm_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_java_util_zip_Inflater_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_java_util_zip_zlib-1_1_3_zconf_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_debug_debug_util_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_image_BufImgSurfaceData_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_image_DataBufferNative_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv2x2_f_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16ext_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16nw_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8ext_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8nw_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16ext_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16nw_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageCopy_Bit_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_64_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_Bit_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageUtils_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageCopy_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageLookUp_f_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_image_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_sys_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_types_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_font_AccelGlyphCache_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_SurfaceData_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLFuncs_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLRenderQueue_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLTextRenderer_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_share_transport_socket_socketTransport_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_back_exec_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_back_util_md_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_bin_java_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_bin_java_md_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_awt_motif_MFontConfiguration_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_font_XMap_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_print_UnixPrintServiceLookup_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_security_provider_NativePRNG_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_tools_attach_BsdAttachProvider_java create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_demo_jvmti_hprof_hprof_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_interrupt_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_largefile_bsd_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_largefile_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_include_threads_md_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_condvar_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_monitor_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_sys_api_td_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_threads_bsd_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_threads_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_linker_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_memory_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_system_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_instrument_EncodingSupport_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_javavm_export_jvm_md_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_javavm_include_typedefs_md_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_com_sun_management_UnixOperatingSystem_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_com_sun_security_auth_module_Unix_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_common_gdefs_md_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_UnixFileSystem_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_canonicalize_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_io_util_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_ProcessEnvironment_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_java_props_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_Inet4AddressImpl_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_Inet6AddressImpl_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_NetworkInterface_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_PlainDatagramSocketImpl_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_PlainSocketImpl_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_net_util_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_net_util_md_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_nio_MappedByteBuffer_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_util_FileSystemPreferences_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_util_TimeZone_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_VDrawingArea_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_X11Color_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_XDrawingArea_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_Xinerama_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_Xinerama_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_Font_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_GraphicsEnv_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_InputMethod_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_LoadLibrary_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_MToolkit_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_Robot_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_TopLevel_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_motif21_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_util_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_wm_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_wm_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_canvas_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_extutil_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_fontpath_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_list_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_panoramiXext_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_panoramiXproto_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_robot_common_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_font_X11FontScaler_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_font_X11TextRenderer_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_j2d_md_h create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_loops_mlib_ImageZoom_NN_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_loops_vis_FuncArray_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_management_FileSystemImpl_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_net_dns_ResolverConfigurationImpl_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_net_spi_DefaultProxySelector_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_DatagramChannelImpl_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileChannelImpl_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileDispatcher_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileKey_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_Net_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_security_pkcs11_j2secmod_md_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_tools_attach_BsdVirtualMachine_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_xawt_XWindow_c create mode 100644 devel/jdk/1.7/patches/patch-j2se_src_solaris_transport_socket_socket_md_c delete mode 100644 devel/jdk/1.7/pkg/DESCR create mode 100644 devel/jdk/1.7/pkg/DESCR-jre create mode 100644 devel/jdk/1.7/pkg/DESCR-main create mode 100644 devel/jdk/1.7/pkg/PFRAG.client_vm-jre rename devel/jdk/1.7/pkg/{PFRAG.client_vm => PFRAG.client_vm-main} (74%) delete mode 100644 devel/jdk/1.7/pkg/PLIST create mode 100644 devel/jdk/1.7/pkg/PLIST-jre create mode 100644 devel/jdk/1.7/pkg/PLIST-main diff --git a/devel/jdk/1.7/Makefile b/devel/jdk/1.7/Makefile index c9162d4c677..44e8c6bbf08 100644 --- a/devel/jdk/1.7/Makefile +++ b/devel/jdk/1.7/Makefile @@ -1,23 +1,29 @@ -# $OpenBSD: Makefile,v 1.4 2007/08/07 16:07:22 kurt Exp $ - -BROKEN= "Incomplete port, 1.7 JVM + 1.5 classes" +# $OpenBSD: Makefile,v 1.5 2007/09/06 15:46:18 kurt Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= i386 amd64 -COMMENT= "Java2(TM) Standard Edition Dev Kit v${V}" +COMMENT-main= "Java2(TM) Standard Edition Dev Kit v${V}" +COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}" V= 1.7.0 -B= b15 -D= 05_jul_2007 +B= b19 +D= 30_aug_2007 DISTFILES= jdk-7-ea-src-${B}-jrl-${D}.jar \ - jdk-7-ea-bin-${B}-jrl-${D}.jar \ - jdk-7-ea-mozilla_headers-${B}-unix-${D}.jar + jdk-7-ea-bin-${B}-jrl-${D}.jar PKGNAME= jdk-${V}.${B} +PKGNAME-main= jdk-${V}.${B} +PKGNAME-jre= jre-${V}.${B} CATEGORIES= devel/jdk java +MULTI_PACKAGES= -main -jre + +FLAVORS= with_ipv6 +FLAVOR?= + HOMEPAGE= https://jdk7.dev.java.net/ -MASTER_SITES= http://www.java.net/download/jdk7/ +MASTER_SITES= http://www.java.net/download/jdk7/ \ + http://www.intricatesoftware.com/distfiles/ MAINTAINER= Kurt Miller @@ -30,38 +36,51 @@ PERMIT_DISTFILES_FTP= "JRL" NO_REGRESS= Yes -BUILD_DEPENDS= :jdk->=1.5.0.11:devel/jdk/1.5 \ +BUILD_DEPENDS= :jdk-1.5.0*:devel/jdk/1.5 \ ::archivers/zip \ - ::archivers/unzip + ::archivers/unzip \ + ::print/cups USE_MOTIF= openmotif MODULES= converters/libiconv -WANTLIB= X11 Xext Xi Xp Xt Xtst c m ossaudio pthread \ - stdc++ z +WANTLIB= X11 Xext Xi Xp Xt Xtst c freetype m ossaudio \ + pthread stdc++ USE_GMAKE= Yes ALT_BOOTDIR= ${LOCALBASE}/jdk-1.5.0 MAKE_ENV= ALT_BOOTDIR=${ALT_BOOTDIR} \ - ALT_JDK_IMPORT_PATH=${ALT_BOOTDIR} \ + ALT_MOTIF_DIR=${LOCALBASE} \ + ALT_FREETYPE_HEADERS_PATH=${X11BASE}/include \ + ALT_FREETYPE_LIB_PATH=${X11BASE}/lib \ + SKIP_COMPARE_IMAGES=true \ + BUILD_INSTALL=false \ + NO_DOCS=true \ + CC="${CC}" \ + CXX="${CXX}" \ DEFAULT_LIBPATH="/usr/lib:${X11BASE}/lib:${LOCALBASE}/lib" \ USERNAME=${USER} \ - HOTSPOT_BUILD_JOBS=`sysctl -n hw.ncpu` + HOTSPOT_BUILD_JOBS=`sysctl -n hw.ncpu` \ + SKIP_FASTDEBUG_BUILD=true \ + BUILD_DEPLOY=false \ + USE_FREETYPE=true -JDKHOME= jdk-${V} +.if !${FLAVOR:L:Mwith_ipv6} +MAKE_ENV+= DONT_ENABLE_IPV6="YES" +.endif -SUBST_VARS= JDKHOME +JDKHOME= jdk-1.7.0 +JREHOME= jre-1.7.0 + +SUBST_VARS= JDKHOME JREHOME WRKDIST= ${WRKDIR} -WRKBUILD= ${WRKDIST}/hotspot/make -JVMARCH= ${MACHINE_ARCH:S/i386/i486/} -OUTPUTDIR1= ${WRKDIST}/hotspot/build/bsd/bsd_${JVMARCH}_compiler1 -OUTPUTDIR2= ${WRKDIST}/hotspot/build/bsd/bsd_${JVMARCH}_compiler2 -JNIMDH= ${WRKDIST}/hotspot/src/cpu/${JVMARCH}/vm/jni_${JVMARCH}.h +WRKBUILD= ${WRKDIST}/control/make +JVMARCH= ${MACHINE_ARCH:S/i386/i586/} +JDKIMAGEDIR= ${WRKDIST}/control/build/bsd-${JVMARCH}/j2sdk-image +JREIMAGEDIR= ${WRKDIST}/control/build/bsd-${JVMARCH}/j2re-image -ALL_TARGET= product .if ${MACHINE_ARCH} == "i386" -ALL_TARGET+= product1 PKG_ARGS+= -Dclient_vm=1 .else PKG_ARGS+= -Dclient_vm=0 @@ -74,14 +93,10 @@ COPYDIRS= hotspot/src/os/linux/launcher \ hotspot/build/linux \ hotspot/build/linux/makefiles \ install/make/installer/binaries/linux \ - j2se/src/linux + j2se/src/linux/doc/man COPYFILES= control/make/common/Defs-linux.gmk \ - deploy/make/common/Defs-linux.gmk \ - deploy/make/common/Rules-linux.gmk \ - deploy/make/plugin/common/Defs-linux.gmk \ install/make/common/Defs-linux.gmk \ - j2se/make/com/sun/tools/attach/mapfile-linux \ j2se/make/common/Defs-linux.gmk \ j2se/make/common/shared/Defs-linux.gmk \ j2se/make/java/nio/mapfile-linux \ @@ -94,11 +109,21 @@ COPYFILES= control/make/common/Defs-linux.gmk \ j2se/src/solaris/classes/java/lang/UNIXProcess.java.linux \ j2se/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties \ j2se/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \ - j2se/src/solaris/hpi/include/largefile_linux.h \ - j2se/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c + j2se/src/solaris/hpi/include/largefile_linux.h + +.include + +ACCEPT_JRL_LICENSE ?= No + +.if ${ACCEPT_JRL_LICENSE:L} != "yes" +IS_INTERACTIVE= Yes +pre-extract: + @${SH} ${FILESDIR}/license.sh + @echo continuing.... +.endif do-extract: - @mkdir ${WRKDIR}/tmp && \ + @rm -rf ${WRKDIR}/tmp && mkdir ${WRKDIR}/tmp && \ ${CC} ${CFLAGS} -o ${WRKDIR}/tmp/x_x2zip ${FILESDIR}/x_x2zip.c .for jar in ${DISTFILES} @cd ${WRKDIR}/tmp && \ @@ -111,7 +136,6 @@ do-extract: # create initial bsd src from linux src (except for threads_solaris.c) pre-patch: - @chmod -R +w ${WRKDIST}/hotspot @for d in ${COPYDIRS}; do \ mkdir -p `echo ${WRKDIST}/$$d | sed 's/linux/bsd/g;'`; \ cd ${WRKDIST}/$$d; \ @@ -130,22 +154,17 @@ pre-patch: < ${WRKDIST}/j2se/src/solaris/hpi/native_threads/src/threads_solaris.c \ > ${WRKDIST}/j2se/src/solaris/hpi/native_threads/src/threads_bsd.c +post-build: + @rm -rf ${JDKIMAGEDIR}/man/ja \ + ${JDKIMAGEDIR}/man/ja_JP.eucJP \ + ${JREIMAGEDIR}/man/ja \ + ${JREIMAGEDIR}/man/ja_JP.eucJP + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${JDKHOME} - cd ${ALT_BOOTDIR} && tar -cf - * | tar -C ${PREFIX}/${JDKHOME} -xf - - @find ${PREFIX}/${JDKHOME} -name \*_g -or -name \*_g.so -or -name \*_g.jar | \ - xargs rm - ${INSTALL_DATA} ${WRKDIST}/hotspot/src/share/vm/services/jmm.h \ - ${PREFIX}/${JDKHOME}/include - ${INSTALL_DATA} ${OUTPUTDIR2}/generated/jvmtifiles/jvmti.h \ - ${PREFIX}/${JDKHOME}/include - ${INSTALL_DATA_DIR} ${PREFIX}/${JDKHOME}/include/bsd - ${INSTALL_DATA} ${JNIMDH} ${PREFIX}/${JDKHOME}/include/bsd/jni_md.h - ${INSTALL_DATA} ${OUTPUTDIR2}/product/lib{jvm,jsig}.so \ - ${PREFIX}/${JDKHOME}/jre/lib/${MACHINE_ARCH}/server -.if ${MACHINE_ARCH} == "i386" - ${INSTALL_DATA} ${OUTPUTDIR1}/product/lib{jvm,jsig}.so \ - ${PREFIX}/${JDKHOME}/jre/lib/${MACHINE_ARCH}/client -.endif + cd ${JDKIMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${JDKHOME} -xf - + ${INSTALL_DATA_DIR} ${PREFIX}/${JREHOME} + cd ${JREIMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${JREHOME} -xf - + .include diff --git a/devel/jdk/1.7/distinfo b/devel/jdk/1.7/distinfo index d8f32ebafad..9c253616f7e 100644 --- a/devel/jdk/1.7/distinfo +++ b/devel/jdk/1.7/distinfo @@ -1,15 +1,10 @@ -MD5 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = 2z1HN/o7TQYmEmii6KuVrg== -MD5 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = 9fsvaJhKATFbEuYqX2tMgg== -MD5 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = J6aBuW5tWRIwkwkaAc3P3Q== -RMD160 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = PXd7WPhNiYBAMmUQ7/rQthtVRVA= -RMD160 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = tQ2ENIetrdrZwc2rWsPPR4QeaU0= -RMD160 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = cELHS3YwGGitLK0oSRd+VIkypD4= -SHA1 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = o6eEa6tvU0wZ/f+I4TiDa9atSGY= -SHA1 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = HzQ7uPYKJX1l23FGWhIVPel1g7A= -SHA1 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = qbPg9c6rvNennLRHWf+ytl4r7lA= -SHA256 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = ObwO+meXKjZ78j6P3ViWoZyDJ381+aq6voCpAAQLRKQ= -SHA256 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = VUlOcj0hjEf2+rheL4Lm/aaA7zTDLoY51EfINX6s/k4= -SHA256 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = KtlZp09CBFU21JLXfAs7ZuZX/KvxpnjC8+awj36ReZw= -SIZE (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = 389618 -SIZE (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = 8608406 -SIZE (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = 73163504 +MD5 (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = bSeR/6QG706EJxoD8Uz7/g== +MD5 (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = d52e07DLuwZ8D4vkkzKcbQ== +RMD160 (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = RipdorYmkRzyg8ytGK7iDAyZ0tM= +RMD160 (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = C6QQtE6cKffpafglPsP5Args8F0= +SHA1 (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = 28vjF2zXp3KJq+0c2CclZwrg8t4= +SHA1 (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = Gt2XvYAbfmKWT5eE2Uec2WGADZU= +SHA256 (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = VvrLpZAfVNayYLq0yD+mmENCxz7yR/pDCPPYloZF1bk= +SHA256 (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = M+1kaqGSwkukWQn63bVWmeuvUSVxcEzdgeiCdgVJbss= +SIZE (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = 389561 +SIZE (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = 73616969 diff --git a/devel/jdk/1.7/files/license.sh b/devel/jdk/1.7/files/license.sh new file mode 100644 index 00000000000..a1e0ea38b54 --- /dev/null +++ b/devel/jdk/1.7/files/license.sh @@ -0,0 +1,195 @@ +#!/bin/sh +# $OpenBSD: license.sh,v 1.1 2007/09/06 15:46:18 kurt Exp $ +# $FreeBSD: ports/java/jdk15/files/license.sh,v 1.1 2007/08/13 04:57:47 glewis Exp $ + +# License agreement +more << EOF_LICENSE +JAVA RESEARCH LICENSE +Version 1.6 + + +I. DEFINITIONS. + +"Licensee" means You and any other party that has entered into and has +in effect a version of this License. + +"Modifications" means any change or addition to the Technology. + +"Sun" means Sun Microsystems, Inc. and its successors and assignees. + +"Research Use" means research, evaluation, or development for the +purpose of advancing knowledge, teaching, learning, or customizing the +Technology or Modifications for personal use. Research Use expressly +excludes use or distribution for direct or indirect commercial +(including strategic) gain or advantage. + +"Technology" means the source code and object code of the technology +made available by Sun pursuant to this License. + +"Technology Site" means the website designated by Sun for accessing +the Technology. + +"You" means the individual executing this License or the legal entity +or entities represented by the individual executing this License. + +II. PURPOSE. + +Sun is licensing the Technology under this Java Research License (the +"License") to promote research, education, innovation, and development +using the Technology. This License is not intended to permit or +enable access to the Technology for active consultation as part of +creating an independent implementation of the Technology. + +COMMERCIAL USE AND DISTRIBUTION OF TECHNOLOGY AND MODIFICATIONS IS +PERMITTED ONLY UNDER A SUN COMMERCIAL LICENSE. + +III. RESEARCH USE RIGHTS. + +A. License Grant. Subject to the conditions contained herein, Sun +grants to You a non-exclusive, non-transferable, worldwide, and +royalty-free license to do the following for Your Research Use only: + +1. Reproduce, create Modifications of, and use the Technology +alone, or with Modifications; + +2. Share source code of the Technology alone, or with +Modifications, with other Licensees; and + +3. Distribute object code of the Technology, alone, or with +Modifications, to any third parties for Research Use only, under a +license of Your choice that is consistent with this License; and +publish papers and books discussing the Technology which may include +relevant excerpts that do not in the aggregate constitute a +significant portion of the Technology. + +B. Residual Rights. If You examine the Technology after accepting +this License and remember anything about it later, You are not +"tainted" in a way that would prevent You from creating or +contributing to an independent implementation, but this License grants +You no rights to Sun's copyrights or patents for use in such an +implementation. + +C. No Implied Licenses. Other than the rights granted herein, Sun +retains all rights, title, and interest in Technology, and You retain +all rights, title, and interest in Your Modifications and associated +specifications, subject to the terms of this License. + +D. Third Party Software. Portions of the Technology may be +provided with licenses or other notices from third parties that govern +the use of those portions. Any licenses granted hereunder do not alter +any rights and obligations You may have under such licenses, however, +the disclaimer of warranty and limitation of liability provisions in +this License will apply to all Technology in this distribution. + +IV. INTELLECTUAL PROPERTY REQUIREMENTS + +As a condition to Your License, You agree to comply with the following +restrictions and responsibilities: + +A. License and Copyright Notices. You must include a copy of this +Java Research License in a Readme file for any Technology or +Modifications you distribute. You must also include the following +statement, "Use and distribution of this technology is subject to the +Java Research License included herein", (a) once prominently in the +source code tree and/or specifications for Your source code +distributions, and (b) once in the same file as Your copyright or +proprietary notices for Your binary code distributions. You must cause +any files containing Your Modification to carry prominent notice +stating that You changed the files. You must not remove or alter any +copyright or other proprietary notices in the Technology. + +B. Licensee Exchanges. Any Technology and Modifications You +receive from any Licensee are governed by this License. + +V. GENERAL TERMS. + +A. Disclaimer Of Warranties. + +THE TECHNOLOGY IS PROVIDED "AS IS", WITHOUT WARRANTIES OF ANY KIND, +EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, WARRANTIES +THAT THE TECHNOLOGY IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A +PARTICULAR PURPOSE, OR NON-INFRINGING OF THIRD PARTY RIGHTS. YOU +AGREE THAT YOU BEAR THE ENTIRE RISK IN CONNECTION WITH YOUR USE AND +DISTRIBUTION OF ANY AND ALL TECHNOLOGY UNDER THIS LICENSE. + +B. Infringement; Limitation Of Liability. + +1. If any portion of, or functionality implemented by, the +Technology becomes the subject of a claim or threatened claim of +infringement ("Affected Materials"), Sun may, in its unrestricted +discretion, suspend Your rights to use and distribute the Affected +Materials under this License. Such suspension of rights will be +effective immediately upon Sun's posting of notice of suspension on +the Technology Site. + +2. IN NO EVENT WILL SUN BE LIABLE FOR ANY DIRECT, 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 ECONOMIC ADVANTAGE OF ANY SORT), +HOWEVER IT ARISES AND ON ANY THEORY OF LIABILITY (including +negligence), WHETHER OR NOT SUN HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. LIABILITY UNDER THIS SECTION V.B.2 SHALL BE SO LIMITED +AND EXCLUDED, NOTWITHSTANDING FAILURE OF THE ESSENTIAL PURPOSE OF ANY +REMEDY. + +C. Termination. + +1. You may terminate this License at any time by notifying Sun in a +writing addressed to Sun Microsystems, Inc., 4150 Network Circle, +Santa Clara, California 95054, Attn.: Legal Department/Products and +Technology Law. + +2. All Your rights will terminate under this License if You fail to +comply with any of its material terms or conditions and do not cure +such failure within thirty (30) days after becoming aware of such +noncompliance. + +3. Upon termination, You must discontinue all uses and distribution +under this agreement, and all provisions of this Section V ("General +Terms") shall survive termination. + +D. Miscellaneous. + + +1. Trademark. You agree to comply with Sun's Trademark & Logo +Usage Requirements, as modified from time to time, available at +http://www.sun.com/policies/trademarks/. Except as expressly provided +in this License, You are granted no rights in or to any Sun trademarks +now or hereafter used or licensed by Sun. + +2. Integration. This License represents the complete agreement of +the parties concerning the subject matter hereof. + +3. Severability. If any provision of this License is held +unenforceable, such provision shall be reformed to the extent +necessary to make it enforceable unless to do so would defeat the +intent of the parties, in which case, this License shall terminate. + +4. Governing Law. This License is governed by the laws of the +United States and the State of California, as applied to contracts +entered into and performed in California between California residents. +In no event shall this License be construed against the drafter. + +5. Export Control. As further described at +http://www.sun.com/its, you agree to comply with the U.S. export +controls and trade laws of other countries that apply to Technology +and Modifications. + +EOF_LICENSE + +agreed= +while [ x$agreed = x ]; do + echo + echo "Do you agree to the above license terms? [yes or no] " + read reply leftover + case $reply in + y* | Y*) + agreed=1 + ;; + n* | N*) + echo + echo "If you don't agree to the license you can't build this software" + exit 1 + ;; + esac +done diff --git a/devel/jdk/1.7/patches/patch-control_make_sanity-rules_gmk b/devel/jdk/1.7/patches/patch-control_make_sanity-rules_gmk new file mode 100644 index 00000000000..5f1c4953cd3 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-control_make_sanity-rules_gmk @@ -0,0 +1,12 @@ +$OpenBSD: patch-control_make_sanity-rules_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- control/make/sanity-rules.gmk.orig Thu Aug 2 03:44:47 2007 ++++ control/make/sanity-rules.gmk Fri Aug 3 18:02:51 2007 +@@ -241,7 +241,7 @@ ifneq ($(SKIP_COMPARE_IMAGES), true) + @if [ ! -f $(PREVIOUS_JDK_BUNDLE) ]; then \ + $(ECHO) "ERROR: You do not have access to the previous java release sdk bundles. \n" \ + " Please check your access to \n" \ +- " $(PREVIOUS_sdk_BUNDLE) \n" \ ++ " $(PREVIOUS_JDK_BUNDLE) \n" \ + " and/or check your value of ALT_PREVIOUS_RELEASE_PATH or ALT_PREVIOUS_JDK_FILE. \n" \ + " This will affect you if you build the images target. \n" \ + "" >> $(ERROR_FILE) ; \ diff --git a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_Makefile b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_Makefile index fc73de065cb..88a2748fd5d 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_Makefile +++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_Makefile @@ -1,7 +1,7 @@ -$OpenBSD: patch-hotspot_build_bsd_Makefile,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $ ---- hotspot/build/bsd/Makefile.orig Mon Apr 16 08:42:36 2007 -+++ hotspot/build/bsd/Makefile Mon Apr 16 08:42:38 2007 -@@ -189,7 +189,7 @@ all: +$OpenBSD: patch-hotspot_build_bsd_Makefile,v 1.2 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/build/bsd/Makefile.orig Sun Sep 2 14:06:00 2007 ++++ hotspot/build/bsd/Makefile Sun Sep 2 14:06:01 2007 +@@ -191,7 +191,7 @@ all: @echo " $(TARGETS_C1)" @echo " $(TARGETS_CORE)" diff --git a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_defs_make b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_defs_make index 3f97f5c1d8e..90955dfdb69 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_defs_make +++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_defs_make @@ -1,6 +1,6 @@ -$OpenBSD: patch-hotspot_build_bsd_makefiles_defs_make,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $ ---- hotspot/build/bsd/makefiles/defs.make.orig Mon Apr 16 08:42:36 2007 -+++ hotspot/build/bsd/makefiles/defs.make Mon Apr 16 08:42:38 2007 +$OpenBSD: patch-hotspot_build_bsd_makefiles_defs_make,v 1.2 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/build/bsd/makefiles/defs.make.orig Sun Sep 2 14:06:00 2007 ++++ hotspot/build/bsd/makefiles/defs.make Sun Sep 2 14:06:01 2007 @@ -61,32 +61,31 @@ ifeq ($(ARCH), sparc64) HS_ARCH = sparc endif @@ -44,7 +44,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_defs_make,v 1.1.1.1 2007/05/08 17:06 +endif + JDK_INCLUDE_SUBDIR=bsd - MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(FULL_VERSION) + # FIXUP: The subdirectory for a debug build is NOT the same on all platforms @@ -102,12 +101,4 @@ ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt diff --git a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_gcc_make b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_gcc_make index 3b30914550c..942c359c537 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_gcc_make +++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_gcc_make @@ -1,7 +1,21 @@ -$OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $ ---- hotspot/build/bsd/makefiles/gcc.make.orig Mon Apr 30 19:56:06 2007 -+++ hotspot/build/bsd/makefiles/gcc.make Mon Apr 30 21:42:08 2007 -@@ -50,19 +50,12 @@ PICFLAG = -fPIC +$OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.2 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/build/bsd/makefiles/gcc.make.orig Thu Aug 2 09:35:19 2007 ++++ hotspot/build/bsd/makefiles/gcc.make Thu Aug 2 09:37:28 2007 +@@ -25,9 +25,10 @@ + #------------------------------------------------------------------------ + # CC, CPP & AS + +-CPP = g++ +-CC = gcc +-AS = $(CC) -c ++CXX ?= g++ ++CPP = $(CXX) ++CC ?= gcc ++AS = $(CC) -c + + # -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only + # prints the numbers (e.g. "2.95", "3.2.1") +@@ -50,19 +51,12 @@ PICFLAG = -fPIC VM_PICFLAG/LIBJVM = $(PICFLAG) VM_PICFLAG/AOUT = @@ -22,7 +36,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.1.1.1 2007/05/08 17:06: CFLAGS += -fcheck-new ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) -@@ -129,6 +122,11 @@ endif +@@ -129,6 +123,11 @@ endif # Enable linker optimization LFLAGS += -Xlinker -O1 @@ -34,7 +48,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.1.1.1 2007/05/08 17:06: # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. MAPFLAG = -Xlinker --version-script=FILENAME -@@ -136,7 +134,7 @@ MAPFLAG = -Xlinker --version-script=FILENAME +@@ -136,7 +135,7 @@ MAPFLAG = -Xlinker --version-script=FILENAME SONAMEFLAG = -Xlinker -soname=SONAME # Build shared library diff --git a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_sa_make b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_sa_make index d3036bd8246..e72278bf105 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_sa_make +++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_sa_make @@ -1,6 +1,6 @@ -$OpenBSD: patch-hotspot_build_bsd_makefiles_sa_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $ ---- hotspot/build/bsd/makefiles/sa.make.orig Mon Apr 16 08:42:36 2007 -+++ hotspot/build/bsd/makefiles/sa.make Mon Apr 16 08:42:38 2007 +$OpenBSD: patch-hotspot_build_bsd_makefiles_sa_make,v 1.2 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/build/bsd/makefiles/sa.make.orig Sun Sep 2 14:06:00 2007 ++++ hotspot/build/bsd/makefiles/sa.make Sun Sep 2 14:06:01 2007 @@ -31,6 +31,7 @@ include $(GAMMADIR)/build/bsd/makefiles/rules.make @@ -18,7 +18,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_sa_make,v 1.1.1.1 2007/05/08 17:06:1 SA_CLASSDIR = $(GENERATED)/saclasses -@@ -54,11 +55,11 @@ SA_VERSION = $(HS_MAJOR_VER).$(HS_MINOR_VER).$(HS_MICR +@@ -54,11 +55,11 @@ SA_VERSION = $(HS_MAJOR_VER) SA_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.supportedVersion=$(SA_VERSION)" SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties diff --git a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_vm_make b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_vm_make index 9c00f8f7dd1..382de1c8191 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_vm_make +++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_vm_make @@ -1,8 +1,8 @@ -$OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.2 2007/07/13 22:52:35 kurt Exp $ ---- hotspot/build/bsd/makefiles/vm.make.orig Fri Jul 6 08:51:57 2007 -+++ hotspot/build/bsd/makefiles/vm.make Fri Jul 6 08:59:35 2007 -@@ -100,6 +100,10 @@ CPPFLAGS = \ - ${RELEASE_VERSION} \ +$OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.3 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/build/bsd/makefiles/vm.make.orig Sun Sep 2 14:06:00 2007 ++++ hotspot/build/bsd/makefiles/vm.make Sun Sep 2 14:06:01 2007 +@@ -111,6 +111,10 @@ CPPFLAGS = \ + ${JRE_VERSION} \ ${VM_DISTRO} +ifdef DEFAULT_LIBPATH @@ -12,7 +12,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.2 2007/07/13 22:52:35 ku # CFLAGS_WARN holds compiler options to suppress/enable warnings. CFLAGS += $(CFLAGS_WARN/BYFILE) -@@ -109,7 +113,7 @@ CFLAGS += $(CFLAGS/NOEX) +@@ -120,7 +124,7 @@ CFLAGS += $(CFLAGS/NOEX) # Extra flags from gnumake's invocation or environment CFLAGS += $(EXTRA_CFLAGS) @@ -21,7 +21,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.2 2007/07/13 22:52:35 ku # By default, link the *.o into the library, not the executable. LINK_INTO$(LINK_INTO) = LIBJVM -@@ -138,7 +142,7 @@ mapfile_reorder : mapfile $(REORDERFILE) +@@ -149,7 +153,7 @@ mapfile_reorder : mapfile $(REORDERFILE) rm -f $@ cat $^ > $@ diff --git a/devel/jdk/1.7/patches/patch-hotspot_make_defs_make b/devel/jdk/1.7/patches/patch-hotspot_make_defs_make index e267b0cd11f..db7dadcefcb 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_make_defs_make +++ b/devel/jdk/1.7/patches/patch-hotspot_make_defs_make @@ -1,7 +1,7 @@ -$OpenBSD: patch-hotspot_make_defs_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $ ---- hotspot/make/defs.make.orig Tue Apr 10 04:00:13 2007 -+++ hotspot/make/defs.make Mon Apr 16 08:42:38 2007 -@@ -93,13 +93,20 @@ endif +$OpenBSD: patch-hotspot_make_defs_make,v 1.2 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/make/defs.make.orig Thu Aug 30 04:57:10 2007 ++++ hotspot/make/defs.make Sun Sep 2 14:06:01 2007 +@@ -118,13 +118,20 @@ endif # Windows should have OS predefined ifeq ($(OS),) OS := $(shell uname -s) diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp index 482833224eb..cc130dffea6 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp +++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp,v 1.2 2007/07/13 22:52:35 kurt Exp $ ---- hotspot/src/cpu/amd64/vm/assembler_amd64.cpp.orig Fri Jul 6 10:49:14 2007 -+++ hotspot/src/cpu/amd64/vm/assembler_amd64.cpp Fri Jul 6 10:48:32 2007 -@@ -1282,7 +1282,7 @@ void Assembler::movl(Address dst, Register src) { +$OpenBSD: patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp,v 1.3 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/src/cpu/amd64/vm/assembler_amd64.cpp.orig Thu Aug 16 03:49:42 2007 ++++ hotspot/src/cpu/amd64/vm/assembler_amd64.cpp Thu Aug 23 11:12:54 2007 +@@ -1307,7 +1307,7 @@ void Assembler::movl(Address dst, Register src) { emit_operand(src, dst); } @@ -10,7 +10,7 @@ $OpenBSD: patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp,v 1.2 2007/07/13 22 InstructionMark im(this); int encode = prefixq_and_encode(dst->encoding()); emit_byte(0xB8 | encode); -@@ -1309,7 +1309,7 @@ void Assembler::movq(Register dst, Address src) { +@@ -1334,7 +1334,7 @@ void Assembler::movq(Register dst, Address src) { emit_operand(dst, src); } diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp deleted file mode 100644 index b67114893a5..00000000000 --- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp +++ /dev/null @@ -1,49 +0,0 @@ -$OpenBSD: patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp,v 1.2 2007/07/13 22:52:35 kurt Exp $ ---- hotspot/src/os/bsd/vm/mutex_bsd.cpp.orig Thu Jul 5 09:51:29 2007 -+++ hotspot/src/os/bsd/vm/mutex_bsd.cpp Thu Jul 5 09:51:31 2007 -@@ -252,7 +252,7 @@ bool Monitor::wait(bool no_safepoint_check, long timeo - } - - // If wait was interrupted by a signal or timeout, do not use up a ticket -- if (wait_status == EINTR || wait_status == ETIME || wait_status == ETIMEDOUT) { -+ if (wait_status == EINTR || wait_status == ETIMEDOUT) { - ++_tickets; // will be decremented again below - break; - } -@@ -267,7 +267,7 @@ bool Monitor::wait(bool no_safepoint_check, long timeo - #endif - - // return true if timed out -- return (wait_status == ETIME || wait_status == ETIMEDOUT); -+ return (wait_status == ETIMEDOUT); - } - - -@@ -344,7 +344,7 @@ bool Monitor::notify_all() { - * of "now + 100,000,000". This places a limit on the timeout of about 3.17 - * years from "now". - */ --static void unpackTime(timespec* absTime, bool isAbsolute, jlong time) { -+static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) { - assert (time > 0, "convertTime"); - - struct timeval now; -@@ -403,7 +403,7 @@ void Parker::park(bool isAbsolute, jlong time) { - } - - // Next, demultiplex/decode time arguments -- timespec absTime; -+ struct timespec absTime; - if (time < 0) { // don't wait at all - return; - } -@@ -456,8 +456,7 @@ void Parker::park(bool isAbsolute, jlong time) { - } - } - assert_status(status == 0 || status == EINTR || -- status == ETIME || status == ETIMEDOUT, -- status, "cond_timedwait"); -+ status == ETIMEDOUT, status, "cond_timedwait"); - - #ifdef ASSERT - pthread_sigmask(SIG_SETMASK, &oldsigs, NULL); diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp index c8a717f302c..19783b1245b 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp +++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp @@ -1,8 +1,8 @@ -$OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $ ---- hotspot/src/os/bsd/vm/osThread_bsd.cpp.orig Mon Apr 16 08:42:36 2007 -+++ hotspot/src/os/bsd/vm/osThread_bsd.cpp Mon Apr 16 08:42:39 2007 -@@ -42,8 +42,8 @@ static pthread_mutex_t EventFreeLock = PTHREAD_MUTEX_I - +$OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp,v 1.2 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/src/os/bsd/vm/osThread_bsd.cpp.orig Fri Aug 3 18:02:38 2007 ++++ hotspot/src/os/bsd/vm/osThread_bsd.cpp Fri Aug 3 18:02:52 2007 +@@ -31,8 +31,8 @@ + void OSThread::pd_initialize() { assert(this != NULL, "check"); - _thread_id = 0; diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp index 68026cf19b2..084f7664ba0 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp +++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $ ---- hotspot/src/os/bsd/vm/osThread_bsd.hpp.orig Mon Apr 16 08:42:36 2007 -+++ hotspot/src/os/bsd/vm/osThread_bsd.hpp Mon Apr 16 08:42:39 2007 +$OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp,v 1.2 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/src/os/bsd/vm/osThread_bsd.hpp.orig Fri Aug 3 18:02:38 2007 ++++ hotspot/src/os/bsd/vm/osThread_bsd.hpp Fri Aug 3 18:02:52 2007 @@ -39,6 +39,12 @@ private: @@ -58,9 +58,9 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp,v 1.1.1.1 2007/05/08 17:0 pthread_t pthread_id() const { return _pthread_id; } -@@ -130,6 +149,9 @@ +@@ -123,12 +142,20 @@ - os::Bsd::Event* _interrupt_event; + private: Monitor* _startThread_lock; // sync parent and child in thread creation +#ifdef _ALLBSD_SOURCE + JavaThreadState _saved_interrupt_thread_state; // the thread state before a system call -- restored afterward @@ -68,7 +68,6 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp,v 1.1.1.1 2007/05/08 17:0 public: -@@ -143,6 +165,11 @@ Monitor* startThread_lock() const { return _startThread_lock; } diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp index 3a98462e3da..54e6bb88d04 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp +++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt Exp $ ---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Wed Jun 13 16:37:27 2007 -+++ hotspot/src/os/bsd/vm/os_bsd.cpp Wed Jun 13 16:37:30 2007 +$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.4 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Fri Aug 3 18:02:38 2007 ++++ hotspot/src/os/bsd/vm/os_bsd.cpp Fri Aug 3 18:35:06 2007 @@ -50,13 +50,26 @@ # include # include @@ -637,7 +637,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt // TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation. // Solaris uses poll(), bsd uses park(). // Poll() is likely a better choice, assuming that Thread.interrupt() -@@ -2676,9 +2947,28 @@ void os::loop_breaker(int attempts) { +@@ -2691,9 +2962,28 @@ void os::loop_breaker(int attempts) { // this reason, the code should not be used as default (ThreadPriorityPolicy=0). // It is only used when ThreadPriorityPolicy=1 and requires root privilege. @@ -666,7 +666,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt 4, // 1 MinPriority 3, // 2 2, // 3 -@@ -2693,6 +2983,7 @@ int os::java_to_os_priority[MaxPriority + 1] = { +@@ -2708,6 +2998,7 @@ int os::java_to_os_priority[MaxPriority + 1] = { -5 // 10 MaxPriority }; @@ -674,7 +674,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt static int prio_init() { if (ThreadPriorityPolicy == 1) { -@@ -2712,8 +3003,17 @@ static int prio_init() { +@@ -2727,8 +3018,17 @@ static int prio_init() { OSReturn os::set_native_priority(Thread* thread, int newpri) { if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK; @@ -692,7 +692,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt } OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) { -@@ -2723,7 +3023,11 @@ OSReturn os::get_native_priority(const Thread* const t +@@ -2738,7 +3038,11 @@ OSReturn os::get_native_priority(const Thread* const t } errno = 0; @@ -704,7 +704,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR); } -@@ -2833,7 +3137,7 @@ static int SR_initialize() { +@@ -2848,7 +3152,7 @@ static int SR_initialize() { /* Get signal number to use for suspend/resume */ if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) { int sig = ::strtol(s, 0, 10); @@ -713,7 +713,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt SR_signum = sig; } } -@@ -3197,6 +3501,7 @@ void os::Bsd::install_signal_handlers() { +@@ -3211,6 +3515,7 @@ void os::Bsd::install_signal_handlers() { } } @@ -721,7 +721,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt // This is the fastest way to get thread cpu time on Bsd. // Returns cpu time (user+sys) for any thread, not only for current. // POSIX compliant clocks are implemented in the kernels 2.6.16+. -@@ -3211,6 +3516,7 @@ jlong os::Bsd::fast_thread_cpu_time(clockid_t clockid) +@@ -3225,6 +3530,7 @@ jlong os::Bsd::fast_thread_cpu_time(clockid_t clockid) return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec; } @@ -729,7 +729,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt ///// // glibc on Bsd platform uses non-documented flag -@@ -3432,16 +3738,16 @@ void os::init(void) { +@@ -3446,16 +3752,16 @@ void os::init(void) { _initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid(); @@ -749,7 +749,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt } Bsd::initialize_system_info(); -@@ -3463,7 +3769,9 @@ extern "C" { +@@ -3477,7 +3783,9 @@ extern "C" { // this is called _after_ the global arguments have been parsed jint os::init_2(void) { @@ -759,7 +759,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt // Allocate a single page and mark it as readable for safepoint polling address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); -@@ -3512,6 +3820,7 @@ jint os::init_2(void) +@@ -3526,6 +3834,7 @@ jint os::init_2(void) JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes, vm_page_size())); @@ -767,7 +767,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt Bsd::capture_initial_stack(JavaThread::stack_size_at_create()); Bsd::libpthread_init(); -@@ -3520,6 +3829,7 @@ jint os::init_2(void) +@@ -3534,6 +3843,7 @@ jint os::init_2(void) Bsd::glibc_version(), Bsd::libpthread_version(), Bsd::is_floating_stack() ? "floating stack" : "fixed stack"); } @@ -775,7 +775,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt if (MaxFDLimit) { // set the number of file descriptors to max. print out error -@@ -3539,8 +3849,10 @@ jint os::init_2(void) +@@ -3553,8 +3863,10 @@ jint os::init_2(void) } } @@ -786,7 +786,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt // Initialize HPI. jint hpi_result = hpi::initialize(); -@@ -3587,11 +3899,15 @@ void os::make_polling_page_readable(void) { +@@ -3601,11 +3913,15 @@ void os::make_polling_page_readable(void) { }; int os::active_processor_count() { @@ -802,7 +802,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt } bool os::distribute_processes(uint length, uint* distribution) { -@@ -3633,6 +3949,9 @@ ExtendedPC os::get_thread_pc(Thread* thread) { +@@ -3647,6 +3963,9 @@ ExtendedPC os::get_thread_pc(Thread* thread) { int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime) { @@ -812,7 +812,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt if (is_NPTL()) { return pthread_cond_timedwait(_cond, _mutex, _abstime); } else { -@@ -3648,6 +3967,7 @@ int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond +@@ -3662,6 +3981,7 @@ int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond #endif // IA64 return status; } @@ -820,7 +820,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt } //////////////////////////////////////////////////////////////////////////////// -@@ -3783,17 +4103,17 @@ int os::create_binary_file(const char* path, bool rewr +@@ -3797,17 +4117,17 @@ int os::create_binary_file(const char* path, bool rewr if (!rewrite_existing) { oflags |= O_EXCL; } @@ -841,7 +841,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt } // Map a block of memory. -@@ -3843,6 +4163,7 @@ bool os::unmap_memory(char* addr, size_t bytes) { +@@ -3857,6 +4177,7 @@ bool os::unmap_memory(char* addr, size_t bytes) { return munmap(addr, bytes) == 0; } @@ -849,7 +849,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time); static clockid_t thread_cpu_clockid(Thread* thread) { -@@ -3854,6 +4175,7 @@ static clockid_t thread_cpu_clockid(Thread* thread) { +@@ -3868,6 +4189,7 @@ static clockid_t thread_cpu_clockid(Thread* thread) { assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code"); return clockid; } @@ -857,7 +857,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt // current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool) // are used by JVM M&M and JVMTI to get user+sys or user CPU time -@@ -3863,39 +4185,48 @@ static clockid_t thread_cpu_clockid(Thread* thread) { +@@ -3877,39 +4199,48 @@ static clockid_t thread_cpu_clockid(Thread* thread) { // the fast estimate available on the platform. jlong os::current_thread_cpu_time() { @@ -906,7 +906,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt // // -1 on error. // -@@ -3984,6 +4315,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool +@@ -3998,6 +4329,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool return (jlong)user_time * (1000000000 / clock_tics_per_sec); } } @@ -914,7 +914,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) { info_ptr->max_value = ALL_64_BITS; // will not wrap in less than 64 bits -@@ -4000,7 +4332,11 @@ void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr +@@ -4014,7 +4346,11 @@ void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr } bool os::is_thread_cpu_time_supported() { @@ -926,7 +926,16 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt } // System loadavg support. Returns -1 if load average cannot be obtained. -@@ -4169,7 +4505,7 @@ void os::PlatformEvent::park() { // AKA "down()" +@@ -4147,7 +4483,7 @@ jdk_pthread_sigmask(int how , const sigset_t* newmask, + // abstime will be the absolute timeout time + // TODO: replace compute_abstime() with unpackTime() + +-static struct timespec* compute_abstime(timespec* abstime, jlong millis) { ++static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) { + if (millis < 0) millis = 0; + struct timeval now; + int status = gettimeofday(&now, NULL); +@@ -4199,7 +4535,7 @@ void os::PlatformEvent::park() { // AKA "down()" status = pthread_cond_wait(_cond, _mutex); // for some reason, under 2.7 lwp_cond_wait() may return ETIME ... // Treat this the same as if the wait was interrupted @@ -935,7 +944,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt assert_status(status == 0 || status == EINTR, status, "cond_wait"); } -- _nParked ; -@@ -4227,10 +4563,10 @@ int os::PlatformEvent::park(jlong millis) { +@@ -4257,10 +4593,10 @@ int os::PlatformEvent::park(jlong millis) { pthread_cond_init (_cond, NULL) ; } assert_status(status == 0 || status == EINTR || @@ -948,3 +957,65 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt // We consume and ignore EINTR and spurious wakeups. } --_nParked ; +@@ -4352,7 +4688,7 @@ void os::PlatformEvent::unpark() { + * years from "now". + */ + +-static void unpackTime(timespec* absTime, bool isAbsolute, jlong time) { ++static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) { + assert (time > 0, "convertTime"); + + struct timeval now; +@@ -4411,7 +4747,7 @@ void Parker::park(bool isAbsolute, jlong time) { + } + + // Next, demultiplex/decode time arguments +- timespec absTime; ++ struct timespec absTime; + if (time < 0) { // don't wait at all + return; + } +@@ -4464,7 +4800,7 @@ void Parker::park(bool isAbsolute, jlong time) { + } + } + assert_status(status == 0 || status == EINTR || +- status == ETIME || status == ETIMEDOUT, ++ status == ETIMEDOUT, + status, "cond_timedwait"); + + #ifdef ASSERT +@@ -4508,14 +4844,6 @@ void Parker::unpark() { + + extern char** environ; + +-#ifndef __NR_fork +-#define __NR_fork IA32_ONLY(2) IA64_ONLY(not defined) AMD64_ONLY(57) +-#endif +- +-#ifndef __NR_execve +-#define __NR_execve IA32_ONLY(11) IA64_ONLY(1033) AMD64_ONLY(59) +-#endif +- + // Run the specified command in a separate process. Return its exit value, + // or -1 on failure (e.g. can't fork a new process). + // Unlike system(), this function can be called from signal handler. It +@@ -4532,8 +4860,7 @@ int os::fork_and_exec(char* cmd) { + // separate process to execve. Make a direct syscall to fork process. + // On IA64 there's no fork syscall, we have to use fork() and hope for + // the best... +- pid_t pid = NOT_IA64(syscall(__NR_fork);) +- IA64_ONLY(fork();) ++ pid_t pid = fork(); + + if (pid < 0) { + // fork failed +@@ -4549,8 +4876,7 @@ int os::fork_and_exec(char* cmd) { + // in the new process, so make a system call directly. + // IA64 should use normal execve() from glibc to match the glibc fork() + // above. +- NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);) +- IA64_ONLY(execve("/bin/sh", argv, environ);) ++ execve("/bin/sh", argv, environ); + + // execve failed + _exit(-1); diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_hpp b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_hpp index eec09cde6b3..aae1f59ed89 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_hpp +++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_hpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $ ---- hotspot/src/os/bsd/vm/os_bsd.hpp.orig Mon Apr 16 08:42:36 2007 -+++ hotspot/src/os/bsd/vm/os_bsd.hpp Mon Apr 16 08:42:39 2007 +$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.2 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/src/os/bsd/vm/os_bsd.hpp.orig Fri Aug 3 18:02:38 2007 ++++ hotspot/src/os/bsd/vm/os_bsd.hpp Fri Aug 3 18:02:52 2007 @@ -50,6 +50,7 @@ class Bsd { static int sigflags[MAXSIGNUM]; @@ -142,50 +142,3 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.1.1.1 2007/05/08 17:06:18 k // Stack repair handling -@@ -250,7 +295,7 @@ class Bsd { - int status = pthread_mutex_unlock(_mutex); - assert_status(status == 0, status, "mutex_unlock"); - } -- int timedwait(timespec* abstime) { -+ int timedwait(struct timespec* abstime) { - verify(); - ++_nParked ; - int status = safe_cond_timedwait(_cond, _mutex, abstime); -@@ -264,12 +309,11 @@ class Bsd { - pthread_cond_init (_cond, NULL) ; - } - assert_status(status == 0 || status == EINTR || -- status == ETIME || status == ETIMEDOUT, -- status, "cond_timedwait"); -+ status == ETIMEDOUT, status, "cond_timedwait"); - return status; - } - int timedwait(jlong millis) { -- timespec abst; -+ struct timespec abst; - Event::compute_abstime(&abst, millis); - return timedwait(&abst); - } -@@ -278,11 +322,6 @@ class Bsd { - ++_nParked ; - int status = pthread_cond_wait(_cond, _mutex); - --_nParked ; -- // for some reason, under 2.7 lwp_cond_wait() may return ETIME ... -- // Treat this the same as if the wait was interrupted -- if(status == ETIME) { -- status = EINTR; -- } - assert_status(status == 0 || status == EINTR, status, "cond_wait"); - return status; - } -@@ -352,8 +391,9 @@ class Bsd { - _count = 0; - } - -+// XXXBSD TODO: sync with 1.5 version - // utility to compute the abstime argument to timedwait: -- static struct timespec* compute_abstime(timespec* abstime, jlong millis) { -+ static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) { - // millis is the relative timeout time - // abstime will be the absolute timeout time - if (millis < 0) millis = 0; diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_vmError_bsd_cpp b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_vmError_bsd_cpp deleted file mode 100644 index cf432b1c590..00000000000 --- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_vmError_bsd_cpp +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-hotspot_src_os_bsd_vm_vmError_bsd_cpp,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $ ---- hotspot/src/os/bsd/vm/vmError_bsd.cpp.orig Mon Apr 16 08:42:36 2007 -+++ hotspot/src/os/bsd/vm/vmError_bsd.cpp Mon Apr 16 08:42:39 2007 -@@ -60,8 +60,7 @@ int VMError::fork_and_exec(char* cmd) { - // separate process to execve. Make a direct syscall to fork process. - // On IA64 there's no fork syscall, we have to use fork() and hope for - // the best... -- pid_t pid = NOT_IA64(syscall(__NR_fork);) -- IA64_ONLY(fork();) -+ pid_t pid = fork(); - - if (pid < 0) { - // fork failed diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_core b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_core index 97da30cff48..e66968b19d6 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_core +++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_core @@ -1,7 +1,7 @@ -$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 kurt Exp $ ---- hotspot/src/share/vm/includeDB_core.orig Thu Jun 21 04:18:24 2007 -+++ hotspot/src/share/vm/includeDB_core Thu Jul 5 12:14:20 2007 -@@ -466,7 +466,7 @@ cardTableModRefBS.cpp cardTableRS.hp +$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.4 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/src/share/vm/includeDB_core.orig Thu Aug 16 03:49:58 2007 ++++ hotspot/src/share/vm/includeDB_core Thu Aug 23 11:12:54 2007 +@@ -450,7 +450,7 @@ cardTableModRefBS.cpp cardTableRS.hp cardTableModRefBS.cpp java.hpp cardTableModRefBS.cpp mutexLocker.hpp cardTableModRefBS.cpp sharedHeap.hpp @@ -10,7 +10,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku cardTableModRefBS.cpp universe.hpp cardTableModRefBS.cpp virtualspace.hpp -@@ -1029,15 +1029,14 @@ compactPermGen.hpp permGen.hpp +@@ -1013,15 +1013,14 @@ compactPermGen.hpp permGen.hpp compactingPermGenGen.cpp compactingPermGenGen.hpp compactingPermGenGen.cpp filemap.hpp compactingPermGenGen.cpp genOopClosures.inline.hpp @@ -27,7 +27,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku compilationPolicy.cpp compilationPolicy.hpp compilationPolicy.cpp compiledIC.hpp -@@ -1785,7 +1784,7 @@ generation.hpp watermark.hpp +@@ -1726,7 +1725,7 @@ generation.hpp watermark.hpp generation.inline.hpp genCollectedHeap.hpp generation.inline.hpp generation.hpp @@ -36,7 +36,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku generationSpec.cpp compactPermGen.hpp generationSpec.cpp defNewGeneration.hpp -@@ -2811,6 +2810,7 @@ klass.hpp specialized_oo +@@ -2435,6 +2434,7 @@ klass.hpp specialized_oo klass.inline.hpp klass.hpp klass.inline.hpp markOop.hpp @@ -44,7 +44,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku klassKlass.cpp collectedHeap.hpp klassKlass.cpp collectedHeap.inline.hpp -@@ -4024,6 +4024,7 @@ space.hpp blockOffsetTab +@@ -3636,6 +3636,7 @@ space.hpp blockOffsetTab space.hpp cardTableModRefBS.hpp space.hpp iterator.hpp space.hpp markOop.hpp @@ -52,7 +52,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku space.hpp memRegion.hpp space.hpp mutexLocker.hpp space.hpp os_.inline.hpp -@@ -4222,6 +4223,7 @@ synchronizer.cpp vmSymbols.hpp +@@ -3837,6 +3838,7 @@ synchronizer.cpp vmSymbols.hpp synchronizer.hpp handles.hpp synchronizer.hpp markOop.hpp diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_vm_version_cpp b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_vm_version_cpp index cbc45b62254..be0247ea256 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_vm_version_cpp +++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_vm_version_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-hotspot_src_share_vm_runtime_vm_version_cpp,v 1.2 2007/05/09 15:48:31 kurt Exp $ ---- hotspot/src/share/vm/runtime/vm_version.cpp.orig Sun May 6 05:01:20 2007 -+++ hotspot/src/share/vm/runtime/vm_version.cpp Tue May 8 15:33:14 2007 -@@ -190,7 +190,8 @@ const char* Abstract_VM_Version::vm_release() { +$OpenBSD: patch-hotspot_src_share_vm_runtime_vm_version_cpp,v 1.3 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/src/share/vm/runtime/vm_version.cpp.orig Thu Aug 30 04:57:42 2007 ++++ hotspot/src/share/vm/runtime/vm_version.cpp Sun Sep 2 14:06:03 2007 +@@ -141,7 +141,8 @@ const char* Abstract_VM_Version::vm_release() { #define OS LINUX_ONLY("linux") \ WINDOWS_ONLY("windows") \ diff --git a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_macros_hpp b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_macros_hpp index 8a60b529b7d..5f4b2c4d2a9 100644 --- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_macros_hpp +++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_macros_hpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.3 2007/07/13 22:52:35 kurt Exp $ ---- hotspot/src/share/vm/utilities/macros.hpp.orig Thu Jun 21 03:31:11 2007 -+++ hotspot/src/share/vm/utilities/macros.hpp Thu Jul 5 09:51:32 2007 -@@ -124,6 +124,14 @@ +$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.4 2007/09/06 15:46:18 kurt Exp $ +--- hotspot/src/share/vm/utilities/macros.hpp.orig Thu Aug 2 03:45:19 2007 ++++ hotspot/src/share/vm/utilities/macros.hpp Fri Aug 3 18:02:53 2007 +@@ -139,6 +139,14 @@ #define NOT_WINDOWS(code) code #endif diff --git a/devel/jdk/1.7/patches/patch-j2se_make_com_sun_java_pack_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_java_pack_Makefile new file mode 100644 index 00000000000..486152f18a6 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_java_pack_Makefile @@ -0,0 +1,34 @@ +$OpenBSD: patch-j2se_make_com_sun_java_pack_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/com/sun/java/pack/Makefile.orig Fri Jul 13 20:49:47 2007 ++++ j2se/make/com/sun/java/pack/Makefile Fri Jul 13 20:53:08 2007 +@@ -61,6 +61,7 @@ vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR) + + + ifeq ($(STANDALONE),true) ++ ifneq ($(SYSTEM_ZLIB),true) + ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME) + + ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \ +@@ -78,6 +79,10 @@ ifeq ($(STANDALONE),true) + ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 + OTHER_CXXFLAGS += $(ZINCLUDE) + LDDFLAGS += $(ZIPOBJS) ++ else ++ LDDFLAGS += -lz ++ OTHER_CXXFLAGS += -DSYSTEM_ZLIB ++ endif + else + OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI + OTHER_LDLIBS += $(JVMLIB) +@@ -101,7 +106,11 @@ ifeq ($(PLATFORM), windows) + COMPILER_WARNINGS_FATAL=false + else + LDOUTPUT = -o #Have a space ++ifeq ($(PLATFORM), bsd) ++ LDDFLAGS += -pthread ++else + LDDFLAGS += -lc ++endif + OTHER_LDLIBS += $(LIBCXX) + # setup the list of libraries to link in... + ifeq ($(PLATFORM), linux) diff --git a/devel/jdk/1.7/patches/patch-j2se_make_com_sun_security_auth_module_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_security_auth_module_Makefile new file mode 100644 index 00000000000..82f7579796d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_security_auth_module_Makefile @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_make_com_sun_security_auth_module_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/com/sun/security/auth/module/Makefile.orig Fri Jul 13 20:53:14 2007 ++++ j2se/make/com/sun/security/auth/module/Makefile Fri Jul 13 22:26:15 2007 +@@ -70,7 +70,7 @@ ifeq ($(PLATFORM), solaris) + include FILES_c_solaris.gmk + endif # solaris + +-ifeq ($(PLATFORM), linux) ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + LIBRARY = jaas_unix + include FILES_export_unix.gmk + include FILES_c_unix.gmk diff --git a/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_c_gmk b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_c_gmk new file mode 100644 index 00000000000..3dd24a4de10 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_c_gmk @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_make_com_sun_tools_attach_FILES_c_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/com/sun/tools/attach/FILES_c.gmk.orig Wed Aug 1 12:49:57 2007 ++++ j2se/make/com/sun/tools/attach/FILES_c.gmk Wed Aug 1 13:17:17 2007 +@@ -39,4 +39,7 @@ FILES_c = \ + LinuxVirtualMachine.c + endif + +- ++ifeq ($(PLATFORM),bsd) ++FILES_c = \ ++ BsdVirtualMachine.c ++endif diff --git a/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_java_gmk b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_java_gmk new file mode 100644 index 00000000000..ed183fc70fc --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_java_gmk @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_make_com_sun_tools_attach_FILES_java_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/com/sun/tools/attach/FILES_java.gmk.orig Thu Aug 2 03:45:43 2007 ++++ j2se/make/com/sun/tools/attach/FILES_java.gmk Fri Aug 3 18:02:54 2007 +@@ -43,6 +43,11 @@ FILES_java += \ + sun/tools/attach/LinuxAttachProvider.java + endif + ++ifeq ($(PLATFORM), bsd) ++FILES_java += \ ++ $(TARGDIR)/sun/tools/attach/BsdAttachProvider.java ++endif ++ + # + # Files that need to be copied + # diff --git a/devel/jdk/1.7/patches/patch-j2se_make_common_Defs-bsd_gmk b/devel/jdk/1.7/patches/patch-j2se_make_common_Defs-bsd_gmk new file mode 100644 index 00000000000..daad78bae6c --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_common_Defs-bsd_gmk @@ -0,0 +1,103 @@ +$OpenBSD: patch-j2se_make_common_Defs-bsd_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/common/Defs-bsd.gmk.orig Thu Aug 23 11:22:35 2007 ++++ j2se/make/common/Defs-bsd.gmk Thu Aug 23 12:07:31 2007 +@@ -48,12 +48,6 @@ ifndef COMPILE_APPROACH + COMPILE_APPROACH = parallel + endif + +-# Part of INCREMENTAL_BUILD mechanism. +-# Compiler emits things like: path/file.o: file.h +-# We want something like: relative_path/file.o relative_path/file.d: file.h +-CC_DEPEND = -MM +-CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g' +- + ifndef PLATFORM_SRC + PLATFORM_SRC = $(J2SE_TOPDIR)/src/solaris + endif # PLATFORM_SRC +@@ -66,7 +60,7 @@ ifndef OPENJDK + endif + + # platform specific include files +-PLATFORM_INCLUDE_NAME = $(PLATFORM) ++PLATFORM_INCLUDE_NAME = $(OS_NAME) + PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME) + + # suffix used for make dependencies files. +@@ -187,7 +181,7 @@ ifeq ($(FASTDEBUG), true) + CXXFLAGS_DBG += $(CC_LOWER_OPT) + endif + +-CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \ ++CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -D_ALLBSD_SOURCE $(VERSION_DEFINES) \ + -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT + + ifeq ($(ARCH_DATA_MODEL), 64) +@@ -197,27 +191,6 @@ endif + CPPFLAGS_OPT = + CPPFLAGS_DBG = -DDEBUG + +-ifdef LIBRARY +- # Libraries need to locate other libraries at runtime, and you can tell +- # a library where to look by way of the dynamic runpaths (RPATH or RUNPATH) +- # buried inside the .so. The $ORIGIN says to look relative to where +- # the library itself is and it can be followed with relative paths from +- # that. By default we always look in $ORIGIN, optionally we add relative +- # paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths. +- # On Bsd we add a flag -z origin, not sure if this is necessary, but +- # doesn't seem to hurt. +- # The environment variable LD_LIBRARY_PATH will over-ride these runpaths. +- # Try: 'readelf -d lib*.so' to see these settings in a library. +- # +- LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN +- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%) +-endif +- +-EXTRA_LIBS += -lc +- +-LDFLAGS_DEFS_OPTION = -z defs +-LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) +- + # + # -L paths for finding and -ljava + # +@@ -255,15 +228,6 @@ endif + LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker + + # +-# Support for Quantify. +-# +-ifdef QUANTIFY +-QUANTIFY_CMD = quantify +-QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes +-LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS) +-endif +- +-# + # Path and option to link against the VM, if you have to. Note that + # there are libraries that link against only -ljava, but they do get + # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas +@@ -289,7 +253,9 @@ override HAVE_ALTZONE = false + override HAVE_FILIOH = false + override HAVE_GETHRTIME = false + override HAVE_GETHRVTIME = false ++ifeq ($(OS_VENDOR),NetBSD) + override HAVE_SIGIGNORE = true ++endif + override LEX_LIBRARY = -lfl + ifeq ($(STATIC_CXX),true) + override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic +@@ -300,13 +266,9 @@ override LIBPOSIX4 = + override LIBSOCKET = + override LIBTHREAD = + override MOOT_PRIORITIES = true +-override NO_INTERRUPTIBLE_IO = true ++override NO_INTERRUPTIBLE_IO = false + override OPENWIN_HOME = /usr/X11R6 +-ifeq ($(ARCH), amd64) +-override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 +-else + override OPENWIN_LIB = $(OPENWIN_HOME)/lib +-endif + override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER + override SUN_CMM_SUBDIR = + override THREADS_FLAG = native diff --git a/devel/jdk/1.7/patches/patch-j2se_make_common_Defs_gmk b/devel/jdk/1.7/patches/patch-j2se_make_common_Defs_gmk new file mode 100644 index 00000000000..4d2b7edd6b2 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_common_Defs_gmk @@ -0,0 +1,40 @@ +$OpenBSD: patch-j2se_make_common_Defs_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/common/Defs.gmk.orig Thu Aug 30 04:58:10 2007 ++++ j2se/make/common/Defs.gmk Sun Sep 2 14:06:03 2007 +@@ -208,7 +208,7 @@ include $(J2SE_TOPDIR)/make/common/Defs-$(PLATFORM).gm + # + # Freetype logic is applicable to OpenJDK only + # +-ifdef OPENJDK ++ifdef USE_FREETYPE + + #if we use system lib we do not need to copy it to build tree + USING_SYSTEM_FT_LIB=false +@@ -230,6 +230,7 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \ + + ifdef ALT_FREETYPE_LIB_PATH + FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH) ++ USING_SYSTEM_FT_LIB=true + else + ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true) + FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib +@@ -294,6 +295,10 @@ ifdef PROGRAM + LDLIBS_COMMON = -ldl + endif + ++ ifeq ($(PLATFORM), bsd) ++ LDLIBS_COMMON = -pthread ++ endif ++ + endif # PROGRAM + + LDLIBS_COMMON += $(EXTRA_LIBS) +@@ -493,7 +498,7 @@ ifeq ($(ARCH), ia64) + # Suspect this may not be needed anymore. + JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline + else +- JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m ++ JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=96m + endif + JAVA_MEM_JFLAGS = $(JAVA_MEM_FLAGS:%=-J%) + diff --git a/devel/jdk/1.7/patches/patch-j2se_make_common_Program_gmk b/devel/jdk/1.7/patches/patch-j2se_make_common_Program_gmk new file mode 100644 index 00000000000..dd8226a965d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_common_Program_gmk @@ -0,0 +1,43 @@ +$OpenBSD: patch-j2se_make_common_Program_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/common/Program.gmk.orig Fri Jul 13 22:32:48 2007 ++++ j2se/make/common/Program.gmk Fri Jul 13 22:37:02 2007 +@@ -67,11 +67,17 @@ endif + # Create a dependency on libjli (Java Launcher Infrastructure) + # + # On UNIX, this is a relative dependency using $ORIGIN. Unfortunately, to +-# do this reliably on Linux takes a different syntax than Solaris. ++# do this reliably on Linux takes a different syntax than Solaris. BSD's ++# don't support $ORIGIN so build an archive instead. + # + # On Windows, this is done by using the same directory as the executable + # itself, as with all the Windows libraries. + # ++ifeq ($(PLATFORM), bsd) ++ LDFLAGS += -Wl,--whole-archive ++ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a ++ LDFLAGS += -Wl,--no-whole-archive ++endif + ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems + LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli + OTHER_LDLIBS += -ljli +@@ -174,6 +180,10 @@ else # USE_PTHREADS + THREADLIBS = $(LIBTHREAD) + endif # USE_PTHREADS + ++ifeq ($(PLATFORM), bsd) ++THREADLIBS = -pthread ++endif ++ + # + # This rule only applies on unix. It supports quantify and its ilk. + # +@@ -242,7 +252,9 @@ endif + + + ifneq ($(PLATFORM), windows) ++ifneq ($(PLATFORM), bsd) + HAVE_GETHRTIME=true ++endif + endif + + ifeq ($(HAVE_GETHRTIME),true) diff --git a/devel/jdk/1.7/patches/patch-j2se_make_common_Release_gmk b/devel/jdk/1.7/patches/patch-j2se_make_common_Release_gmk new file mode 100644 index 00000000000..be478a348b3 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_common_Release_gmk @@ -0,0 +1,76 @@ +$OpenBSD: patch-j2se_make_common_Release_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/common/Release.gmk.orig Thu Aug 2 03:45:44 2007 ++++ j2se/make/common/Release.gmk Fri Aug 10 21:36:11 2007 +@@ -148,7 +148,7 @@ JRE_MAN_PAGES = \ + pack200.1 \ + unpack200.1 + +-ifeq ($(ARCH_DATA_MODEL),32) ++ifeq ($(BUILD_DEPLOY), true) + JRE_MAN_PAGES += javaws.1 + endif + +@@ -158,7 +158,6 @@ endif + JDK_MAN_PAGES = \ + $(JRE_MAN_PAGES) \ + appletviewer.1 \ +- apt.1 \ + extcheck.1 \ + idlj.1 \ + jar.1 \ +@@ -199,7 +198,19 @@ ifeq ($(PLATFORM), linux) + DEST_MAN_PATH = man/man1 + endif + ++ifeq ($(PLATFORM), bsd) ++ MANDIR=$(TOPDIR)/src/bsd/doc/man ++ JA_MANDIR=$(TOPDIR)/src/bsd/doc/man ++ DEST_MAN_PATH = man/man1 ++endif + ++ifeq ($(OS_VENDOR), OpenBSD) ++ FILES_FROM_ARG=-I ++else ++ FILES_FROM_ARG=-T ++endif ++ ++ + # + # Targets. + # +@@ -789,7 +800,7 @@ else # Not windows + @# + @# Add Japanese manpages + @# +- ifeq ($(PLATFORM), linux) ++ ifneq (,$(findstring $(PLATFORM), linux bsd)) + for manpage in $(JRE_MAN_PAGES); do \ + for encoding in $(JA_TARGET_ENCODINGS); do \ + MAN_DEST_PATH=$(JRE_IMAGE_DIR)/man/ja; \ +@@ -1013,7 +1024,7 @@ initial-image-jdk:: initial-image-jdk-setup \ + @# generated by the more efficient solaris/windows method of copying files. + @# So for Linux, make use of the -T option (like Solaris' -I option) of + @# obtaining the list of files from a file. MKS tar has no such option. +- ifeq ($(PLATFORM), linux) ++ ifneq (,$(findstring $(PLATFORM), linux bsd)) + for d in $(SOURCE_DIRS); do \ + $(RM) $(ABS_TEMPDIR)/src-files.list; \ + ($(CD) $$d; \ +@@ -1026,7 +1037,7 @@ initial-image-jdk:: initial-image-jdk-setup \ + done ; \ + ) ; \ + if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ +- ($(CD) $$d; $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \ ++ ($(CD) $$d; $(TAR) cf - $(FILES_FROM_ARG) $(ABS_TEMPDIR)/src-files.list ) \ + | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xf -); \ + fi; \ + done +@@ -1100,7 +1111,7 @@ initial-image-jdk:: initial-image-jdk-setup \ + @# + @# Add Japanese manpages for Solaris + @# +- ifeq ($(PLATFORM), linux) ++ ifneq (,$(findstring $(PLATFORM), linux bsd)) + for manpage in $(JDK_MAN_PAGES); do \ + for encoding in $(JA_TARGET_ENCODINGS); do \ + MAN_DEST_PATH=$(JDK_IMAGE_DIR)/man/ja; \ diff --git a/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler-gcc_gmk b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler-gcc_gmk new file mode 100644 index 00000000000..9bbfab9a384 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler-gcc_gmk @@ -0,0 +1,33 @@ +$OpenBSD: patch-j2se_make_common_shared_Compiler-gcc_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/common/shared/Compiler-gcc.gmk.orig Thu Jul 5 04:56:08 2007 ++++ j2se/make/common/shared/Compiler-gcc.gmk Thu Aug 2 09:52:58 2007 +@@ -55,20 +55,24 @@ ifeq ($(PLATFORM), windows) + + endif + +-ifeq ($(PLATFORM), linux) ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + ++ifeq ($(PLATFORM), linux) + # Settings specific to Linux +- CC = $(COMPILER_PATH)gcc +- CPP = $(COMPILER_PATH)gcc -E ++ CC ?= $(COMPILER_PATH)gcc ++ CPP = $(CC) -E + # statically link libstdc++ before C++ ABI is stablized on Linux + STATIC_CXX = true ++else ++ STATIC_CXX = false ++endif + ifeq ($(STATIC_CXX),true) + # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++" + # We need to use gcc to statically link the C++ runtime. gcc and g++ use + # the same subprocess to compile C++ files, so it is OK to build using gcc. +- CXX = $(COMPILER_PATH)gcc ++ CXX = $(CC) + else +- CXX = $(COMPILER_PATH)g++ ++ CXX ?= $(COMPILER_PATH)g++ + endif + ifneq ("$(findstring sparc,$(ARCH))", "") + # sparc or sparcv9 diff --git a/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler_gmk b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler_gmk new file mode 100644 index 00000000000..dd1aa1ecb4e --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler_gmk @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_make_common_shared_Compiler_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/common/shared/Compiler.gmk.orig Fri Jul 13 22:47:15 2007 ++++ j2se/make/common/shared/Compiler.gmk Fri Jul 13 22:49:18 2007 +@@ -37,8 +37,8 @@ ifeq ($(PLATFORM), solaris) + override CC_VERSION = sun + endif + +-# Linux uses GNU compilers by default +-ifeq ($(PLATFORM), linux) ++# Linux & BSD uses GNU compilers by default ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + override CC_VERSION = gcc + endif + diff --git a/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Defs-bsd_gmk b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Defs-bsd_gmk new file mode 100644 index 00000000000..b2c257c9c9a --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Defs-bsd_gmk @@ -0,0 +1,44 @@ +$OpenBSD: patch-j2se_make_common_shared_Defs-bsd_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/common/shared/Defs-bsd.gmk.orig Sun Sep 2 14:06:00 2007 ++++ j2se/make/common/shared/Defs-bsd.gmk Sun Sep 2 14:47:53 2007 +@@ -38,7 +38,7 @@ $(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && p + endef + + # Location on system where jdk installs might be +-USRJDKINSTANCES_PATH =/opt/java ++USRJDKINSTANCES_PATH =/usr/local + + # UNIXCOMMAND_PATH: path to where the most common Unix commands are. + # NOTE: Must end with / so that it could be empty, allowing PATH usage. +@@ -117,28 +117,16 @@ else + endif + + # Motif settings, always build headless on Bsd +-STATIC_MOTIF=true ++STATIC_MOTIF=false + LIBM=-lm + ifdef MOTIF_REQUIRED + BUILD_MOTIF21 = true + endif + BUILD_HEADLESS = true +-ifeq ($(ARCH_DATA_MODEL), 32) +- MOTIF_LIB = $(MOTIF_DIR)/lib +-else +- MOTIF_LIB = $(MOTIF_DIR)/lib64 +-endif ++MOTIF_LIB = $(MOTIF_DIR)/lib + MOTIF_INCLUDE = $(MOTIF_DIR)/include + +-# GCC29_COMPILER_PATH: is the path to where the gcc 2.9 compiler is installed +-# NOTE: Must end with / so that it could be empty, allowing PATH usage. +-ifneq "$(origin ALT_GCC29_COMPILER_PATH)" "undefined" +- GCC29_COMPILER_PATH :=$(call PrefixPath,$(ALT_GCC29_COMPILER_PATH)) +-else +- GCC29_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(PLATFORM)/gcc29/usr/ +-endif +- +-_CUPS_HEADERS_PATH=/usr/include ++_CUPS_HEADERS_PATH=/usr/local/include + + # BUILD_JDK_IMPORT_PATH: location of all previously built JDKs (this version). + ifdef ALT_BUILD_JDK_IMPORT_PATH diff --git a/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Platform_gmk b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Platform_gmk new file mode 100644 index 00000000000..73176c7e86b --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Platform_gmk @@ -0,0 +1,100 @@ +$OpenBSD: patch-j2se_make_common_shared_Platform_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/common/shared/Platform.gmk.orig Thu Aug 16 03:50:40 2007 ++++ j2se/make/common/shared/Platform.gmk Thu Aug 23 11:12:55 2007 +@@ -277,6 +277,73 @@ ifeq ($(SYSTEM_UNAME), Linux) + MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) + endif + ++ifeq ($(SYSTEM_UNAME), FreeBSD) ++ PLATFORM = bsd ++ OS_NAME = freebsd ++ OS_VENDOR = FreeBSD ++ REQUIRED_OS_VERSION = 6.0 ++endif ++ ++ifeq ($(SYSTEM_UNAME), NetBSD) ++ PLATFORM = bsd ++ OS_NAME = netbsd ++ OS_VENDOR = NetBSD ++ REQUIRED_OS_VERSION = 3.0 ++endif ++ ++ifeq ($(SYSTEM_UNAME), OpenBSD) ++ PLATFORM = bsd ++ OS_NAME = openbsd ++ OS_VENDOR = OpenBSD ++ REQUIRED_OS_VERSION = 4.0 ++endif ++ ++# Platform settings specific to BSD ++ifeq ($(PLATFORM), bsd) ++ OS_VERSION := $(shell uname -r) ++ # Arch and OS name/version ++ mach := $(shell uname -m) ++ archExpr = case "$(mach)" in \ ++ i[3-9]86) \ ++ echo i586 \ ++ ;; \ ++ *) \ ++ echo $(mach) \ ++ ;; \ ++ esac ++ ARCH := $(shell $(archExpr) ) ++ ARCH_FAMILY := $(ARCH) ++ ++ # i586 and sparc are 32 bit, amd64 and sparc64 are 64 ++ ifneq (,$(findstring $(ARCH), i586 sparc)) ++ ARCH_DATA_MODEL=32 ++ else ++ ARCH_DATA_MODEL=64 ++ endif ++ ++ # Need to maintain the jre/lib/i386 location for 32-bit Intel ++ ifeq ($(ARCH), i586) ++ LIBARCH = i386 ++ else ++ LIBARCH = $(ARCH) ++ endif ++ ++ # Value of Java os.arch property ++ ARCHPROP = $(LIBARCH) ++ ++ # Suffix for file bundles used in previous release ++ BUNDLE_FILE_SUFFIX=.tar.gz ++ # Minimum disk space needed as determined by running 'du -sk' on ++ # a fully built workspace. ++ REQUIRED_FREE_SPACE=1500000 ++ # How much RAM does this machine have: ++ ifeq ($(OS_VENDOR), OpenBSD) ++ MB_OF_MEMORY=$(shell perl -e 'printf "%d", `sysctl hw.physmem | cut -d'=' -f2` / 1048576' ) ++ else ++ MB_OF_MEMORY := $(shell `sysctl hw.physmem | cut -d' ' -f2` / 1048576 ) ++ endif ++endif ++ + # Windows with and without CYGWIN will be slightly different + ifeq ($(SYSTEM_UNAME), Windows_NT) + PLATFORM = windows +@@ -401,8 +468,8 @@ endif + # Machines with 512Mb or less of real memory are considered low memory + # build machines and adjustments will be made to prevent excessing + # system swapping during the build. +-# If we don't know, assume 512. Subtract 128 from MB for VM MAX. +-# Don't set VM max over 1024-128=896. ++# If we don't know, assume 512. Subtract 288 from MB for VM MAX. ++# Don't set VM max over 1024-288=736. + ifneq ($(MB_OF_MEMORY),) + LOW_MEMORY_MACHINE := $(shell \ + if [ $(MB_OF_MEMORY) -le 512 ] ; then \ +@@ -412,9 +479,9 @@ ifneq ($(MB_OF_MEMORY),) + fi) + MAX_VM_MEMORY := $(shell \ + if [ $(MB_OF_MEMORY) -le 1024 ] ; then \ +- expr $(MB_OF_MEMORY) '-' 128 ; \ ++ expr $(MB_OF_MEMORY) '-' 288 ; \ + else \ +- echo "896"; \ ++ echo "736"; \ + fi) + MIN_VM_MEMORY := $(shell \ + if [ $(MAX_VM_MEMORY) -le 128 ] ; then \ diff --git a/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Sanity_gmk b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Sanity_gmk new file mode 100644 index 00000000000..211e30cb0d9 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Sanity_gmk @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_make_common_shared_Sanity_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/common/shared/Sanity.gmk.orig Fri Jul 13 23:09:20 2007 ++++ j2se/make/common/shared/Sanity.gmk Fri Jul 13 23:10:00 2007 +@@ -94,6 +94,11 @@ ifeq ($(PLATFORM), windows) + $(EGREP) "\#define" | $(NAWK) '{print $$3}') + endif + ++ifeq ($(PLATFORM), bsd) ++ FREE_SPACE := $(shell BLOCKSIZE=512 $(DF) $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$2;}') ++ TEMP_FREE_SPACE := $(shell BLOCKSIZE=512 $(DF) $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$2;}') ++endif ++ + # Get the version numbers of what we are using + _MAKE_VER :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1) + _ZIP_VER :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip') diff --git a/devel/jdk/1.7/patches/patch-j2se_make_docs_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_docs_Makefile new file mode 100644 index 00000000000..418701d2c06 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_docs_Makefile @@ -0,0 +1,21 @@ +$OpenBSD: patch-j2se_make_docs_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/docs/Makefile.orig Thu Jul 5 04:56:08 2007 ++++ j2se/make/docs/Makefile Wed Aug 1 15:41:46 2007 +@@ -47,7 +47,7 @@ ifeq ($(ARCH_DATA_MODEL), 32) + JAVADOC_VM_MEMORY_FLAGS = -J-Xms32M -J-Xmx384M + endif + else +- JAVADOC_VM_MEMORY_FLAGS = -J-Xms128M -J-Xmx1024M ++ JAVADOC_VM_MEMORY_FLAGS = -J-Xms128M -J-Xmx736M + endif + + COMMON_JAVADOCFLAGS = \ +@@ -216,7 +216,7 @@ JDI_HEADER = "Java Debug Interface" + # you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR) + # being interpreted as an end of command (newline) + +-JAAS_SOURCEPATH = "$(TOPDIR)/src/share/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/solaris/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/windows/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/linux/classes" ++JAAS_SOURCEPATH = "$(TOPDIR)/src/share/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/solaris/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/windows/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/linux/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/bsd/classes" + JAAS_DOCDIR = $(DOCSDIR)/jre/api/security/jaas/spec + JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \ + -encoding ascii \ diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_Makefile new file mode 100644 index 00000000000..1f7482910b4 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_Makefile @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_make_java_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/Makefile.orig Fri Jul 13 23:11:03 2007 ++++ j2se/make/java/Makefile Fri Jul 13 23:11:52 2007 +@@ -61,7 +61,7 @@ ifeq ($(PLATFORM), solaris) + endif + endif # PLATFORM + +-ifeq ($(PLATFORM), linux) ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + SUBDIRS += jexec + endif # PLATFORM + diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_hpi_common_gmk b/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_hpi_common_gmk new file mode 100644 index 00000000000..911dfdcb56d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_hpi_common_gmk @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_make_java_hpi_hpi_common_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/hpi/hpi_common.gmk.orig Fri Jul 13 23:12:15 2007 ++++ j2se/make/java/hpi/hpi_common.gmk Fri Jul 13 23:13:01 2007 +@@ -86,6 +86,10 @@ endif + # Things that must be linked in. + # + ifneq ($(PLATFORM), windows) ++ifeq ($(PLATFORM), bsd) ++OTHER_LDLIBS += $(LIBM) ++else + LIBSOCKET = -lsocket + OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl ++endif + endif diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_native_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_native_Makefile new file mode 100644 index 00000000000..a1b6c996a64 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_native_Makefile @@ -0,0 +1,22 @@ +$OpenBSD: patch-j2se_make_java_hpi_native_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/hpi/native/Makefile.orig Fri Jul 13 23:13:05 2007 ++++ j2se/make/java/hpi/native/Makefile Fri Jul 13 23:14:45 2007 +@@ -72,11 +72,18 @@ OTHER_CPPFLAGS += -DUSE_PTHREADS + ifeq ($(MOOT_PRIORITIES),true) + OTHER_CPPFLAGS += -DMOOT_PRIORITIES + endif ++ifeq ($(PLATFORM), bsd) ++LIBPOSIX4 = ++OTHER_LDLIBS += -pthread ++else + LIBPOSIX4 = -lposix4 + OTHER_LDLIBS += -lpthread $(LIBPOSIX4) + endif ++endif + ++ifneq ($(PLATFORM), bsd) + HAVE_GETHRVTIME=true ++endif + ifeq ($(HAVE_GETHRVTIME),true) + OTHER_CPPFLAGS += -DHAVE_GETHRVTIME + endif diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_instrument_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_instrument_Makefile new file mode 100644 index 00000000000..e5335349308 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_instrument_Makefile @@ -0,0 +1,27 @@ +$OpenBSD: patch-j2se_make_java_instrument_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/instrument/Makefile.orig Thu Aug 2 03:45:45 2007 ++++ j2se/make/java/instrument/Makefile Fri Aug 10 17:03:38 2007 +@@ -102,6 +102,15 @@ ifeq ($(PLATFORM), windows) + # equivalent of strcasecmp is stricmp on Windows + CPPFLAGS_COMMON += -Dstrcasecmp=stricmp + else ++ifeq ($(PLATFORM), bsd) ++ LDFLAGS += -Wl,--whole-archive ++ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a ++ LDFLAGS += -Wl,--no-whole-archive ++ ICONV_DIR = /usr/local ++# Use CPPFLAGS instead of OTHER_INCLUDES to force this last ++ CPPFLAGS += -I$(ICONV_DIR)/include ++ OTHER_LDLIBS += -L$(ICONV_DIR)/lib -liconv ++else + LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli + OTHER_LDLIBS += -ljli + OTHER_LDLIBS += -ldl +@@ -113,6 +122,7 @@ else + LDFLAGS += -Wl,--allow-shlib-undefined + LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli + endif ++endif + endif + + # diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_java_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_java_Makefile new file mode 100644 index 00000000000..7c8525afc7e --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_java_Makefile @@ -0,0 +1,29 @@ +$OpenBSD: patch-j2se_make_java_java_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/java/Makefile.orig Fri Jul 13 23:18:23 2007 ++++ j2se/make/java/java/Makefile Fri Jul 13 23:19:52 2007 +@@ -167,8 +167,10 @@ OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/util + # Is the altzone extern documented in ctime(3C) available? + # + ifneq ($(PLATFORM), windows) ++ifneq ($(PLATFORM), bsd) + HAVE_ALTZONE=true + endif ++endif + + ifeq ($(HAVE_ALTZONE),true) + OTHER_CPPFLAGS += -DHAVE_ALTZONE +@@ -205,9 +207,14 @@ ifeq ($(PLATFORM),windows) + OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \ + -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib + else ++ifeq ($(PLATFORM), bsd) ++OTHER_LDLIBS += $(JVMLIB) -lverify -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) \ ++ -lfdlibm.$(ARCH) ++else + LIBSOCKET = -lsocket + OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \ + -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH) ++endif + endif + + # diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_java_hprof_demo_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_java_hprof_demo_Makefile new file mode 100644 index 00000000000..6cfb5d63099 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_java_hprof_demo_Makefile @@ -0,0 +1,17 @@ +$OpenBSD: patch-j2se_make_java_java_hprof_demo_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/java_hprof_demo/Makefile.orig Fri Jul 13 23:20:36 2007 ++++ j2se/make/java/java_hprof_demo/Makefile Fri Jul 13 23:20:56 2007 +@@ -80,11 +80,13 @@ OTHER_INCLUDES = -I$(SRCDIR) \ + -I$(PLATFORM_SRC)/npt \ + -I$(SHARE_SRC)/demo/jvmti/java_crw_demo + ++ifneq ($(PLATFORM), bsd) + ifeq ($(PLATFORM), windows) + OTHER_LDLIBS += wsock32.lib winmm.lib + else + LIBSOCKET = -lsocket + OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl ++endif + endif + + # diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_java_localegen_sh b/devel/jdk/1.7/patches/patch-j2se_make_java_java_localegen_sh new file mode 100644 index 00000000000..6ed833a0316 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_java_localegen_sh @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_make_java_java_localegen_sh,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/java/localegen.sh.orig Thu Jul 5 04:56:09 2007 ++++ j2se/make/java/java/localegen.sh Mon Jul 30 18:15:44 2007 +@@ -55,9 +55,9 @@ sed_script="$SED -e \"s@^#warn .*@// -- This file was + for FILE in $RESOURCE_NAMES + do + getlocalelist $FILE $EURO_FILES_LIST +- sed_script=$sed_script"-e \"s/#"$FILE"_EuroLocales#/$localelist/g\" " ++ sed_script=$sed_script"-e \"s@#"$FILE"_EuroLocales#@$localelist@g\" " + getlocalelist $FILE $NONEURO_FILES_LIST +- sed_script=$sed_script"-e \"s/#"$FILE"_NonEuroLocales#/$localelist/g\" " ++ sed_script=$sed_script"-e \"s@#"$FILE"_NonEuroLocales#@$localelist@g\" " + done + + sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE" diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_jli_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_jli_Makefile new file mode 100644 index 00000000000..7ed74a28d44 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_jli_Makefile @@ -0,0 +1,37 @@ +$OpenBSD: patch-j2se_make_java_jli_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/jli/Makefile.orig Thu Jul 5 04:56:09 2007 ++++ j2se/make/java/jli/Makefile Mon Jul 30 19:27:41 2007 +@@ -68,7 +68,7 @@ FILES_c = \ + + OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS + +-ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems ++ifneq (,$(findstring $(PLATFORM), linux solaris bsd)) # UNIX systems + LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli + # Guarantee very limited dependencies + LDLIBS = -lc +@@ -135,6 +135,24 @@ $(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR) + library:: $(STATIC_LIBRARY) + + endif # PLATFORM ++ ++ifeq ($(PLATFORM), bsd) ++ ++STATIC_LIBRARY_DIR = $(OBJDIR)/static ++STATIC_LIBRARY_NAME = lib$(LIBRARY).a ++STATIC_LIBRARY = $(STATIC_LIBRARY_DIR)/$(STATIC_LIBRARY_NAME) ++ ++$(STATIC_LIBRARY_DIR): $(OBJDIR) ++ @$(prep-target) ++ @$(MKDIR) $(STATIC_LIBRARY_DIR) ++ ++$(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR) ++ @$(prep-target) ++ $(AR) -r $@ $(FILES_o) ++ ++library:: $(STATIC_LIBRARY) ++ ++endif # PLATFORM + + # + # Add to ambient vpath so we pick up the library files diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_management_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_management_Makefile new file mode 100644 index 00000000000..6fe414cc7de --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_management_Makefile @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_make_java_management_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/management/Makefile.orig Sun Jul 15 22:14:48 2007 ++++ j2se/make/java/management/Makefile Sun Jul 15 22:16:48 2007 +@@ -88,6 +88,11 @@ JAVAHFLAGS += -jni # Generate JNI-style header fi + OTHER_INCLUDES += \ + -I$(SHARE_SRC)/native/sun/management + ++ifeq ($(PLATFORM),bsd) ++OTHER_INCLUDES += \ ++ -I$(PLATFORM_SRC)/hpi/include ++endif ++ + ifeq ($(PLATFORM),windows) + OTHER_LDLIBS += $(JVMLIB) + endif diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_net_FILES_c_gmk b/devel/jdk/1.7/patches/patch-j2se_make_java_net_FILES_c_gmk new file mode 100644 index 00000000000..df377abd571 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_net_FILES_c_gmk @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_make_java_net_FILES_c_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/net/FILES_c.gmk.orig Thu Aug 2 03:45:45 2007 ++++ j2se/make/java/net/FILES_c.gmk Fri Aug 3 18:02:55 2007 +@@ -43,6 +43,10 @@ ifeq ($(PLATFORM), linux) + FILES_c += linux_close.c + endif + ++ifeq ($(OS_VENDOR), FreeBSD) ++ FILES_c += $(CTARGDIR)bsd_close.c ++endif ++ + ifeq ($(PLATFORM), windows) + FILES_c += TwoStacksPlainSocketImpl.c + FILES_c += DualStackPlainSocketImpl.c diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_net_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_net_Makefile new file mode 100644 index 00000000000..2149d3bf500 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_net_Makefile @@ -0,0 +1,24 @@ +$OpenBSD: patch-j2se_make_java_net_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/net/Makefile.orig Thu Aug 2 03:45:45 2007 ++++ j2se/make/java/net/Makefile Fri Aug 3 18:02:55 2007 +@@ -97,6 +97,12 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk + + include $(BUILDDIR)/common/Library.gmk + ++ifeq ($(PLATFORM), bsd) ++ifdef DONT_ENABLE_IPV6 ++ OTHER_CFLAGS += -DDONT_ENABLE_IPV6 ++endif ++ OTHER_LDLIBS = $(JVMLIB) -pthread ++else + ifeq ($(PLATFORM), windows) + OTHER_LDLIBS = ws2_32.lib $(JVMLIB) + # Will not compile at warning level 3 if warnings are fatal +@@ -108,6 +114,7 @@ endif + ifeq ($(PLATFORM), linux) + OTHER_LDLIBS += -lpthread + endif ++endif # PLATFORM == bsd + + CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl + diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_nio_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_nio_Makefile new file mode 100644 index 00000000000..c5eaa6779cf --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_nio_Makefile @@ -0,0 +1,44 @@ +$OpenBSD: patch-j2se_make_java_nio_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/nio/Makefile.orig Sun Jul 15 22:20:55 2007 ++++ j2se/make/java/nio/Makefile Sun Jul 15 22:22:36 2007 +@@ -81,7 +81,7 @@ FILES_export += \ + sun/nio/ch/WindowsSelectorImpl.java + endif # PLATFORM = windows + +-ifeq ($(PLATFORM), linux) ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + FILES_java += \ + sun/nio/ch/AbstractPollSelectorImpl.java \ + sun/nio/ch/EPollArrayWrapper.java \ +@@ -126,6 +126,11 @@ OTHER_INCLUDES += \ + -I$(PLATFORM_SRC)/native/java/net \ + -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders + ++ifeq ($(PLATFORM), bsd) ++OTHER_INCLUDES += \ ++ -I$(PLATFORM_SRC)/hpi/include ++endif ++ + ifeq ($(PLATFORM),windows) + OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \ + -libpath:$(LIBDIR) java.lib \ +@@ -137,6 +142,9 @@ ifeq ($(PLATFORM), linux) + COMPILER_WARNINGS_FATAL=true + OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl + endif ++ifeq ($(PLATFORM), bsd) ++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -pthread ++endif + ifeq ($(PLATFORM), solaris) + OTHER_LDLIBS += $(JVMLIB) -lsocket -lposix4 -ldl \ + -L$(LIBDIR)/$(LIBARCH) -ljava -lnet +@@ -158,6 +166,9 @@ FILES_m = mapfile-solaris + endif + ifeq ($(PLATFORM), linux) + FILES_m = mapfile-linux ++endif ++ifeq ($(PLATFORM), bsd) ++FILES_m = mapfile-bsd + endif + include $(BUILDDIR)/common/Mapfile-vers.gmk + include $(BUILDDIR)/common/Library.gmk diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_npt_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_npt_Makefile new file mode 100644 index 00000000000..46b8f6f1804 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_npt_Makefile @@ -0,0 +1,17 @@ +$OpenBSD: patch-j2se_make_java_npt_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/npt/Makefile.orig Thu Aug 2 03:45:46 2007 ++++ j2se/make/java/npt/Makefile Fri Aug 10 17:04:49 2007 +@@ -70,6 +70,13 @@ ifeq ($(PLATFORM), windows) + OTHER_LCF += -export:nptInitialize -export:nptTerminate + endif + ++# Add location of iconv headers ++ifeq ($(PLATFORM), bsd) ++ ICONV_DIR = /usr/local ++ CPPFLAGS += -I$(ICONV_DIR)/include ++ OTHER_LDLIBS += -L$(ICONV_DIR)/lib -liconv ++endif ++ + # + # Add to ambient vpath so we pick up the library files + # diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_redist_FILES_gmk b/devel/jdk/1.7/patches/patch-j2se_make_java_redist_FILES_gmk new file mode 100644 index 00000000000..da4db91c0c9 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_redist_FILES_gmk @@ -0,0 +1,18 @@ +$OpenBSD: patch-j2se_make_java_redist_FILES_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/redist/FILES.gmk.orig Sun Jul 15 22:24:17 2007 ++++ j2se/make/java/redist/FILES.gmk Sun Jul 15 22:25:03 2007 +@@ -38,6 +38,14 @@ SHARED_FONTFILES = \ + $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \ + + ifeq ($(PLATFORM), linux) ++NEED_OBLIQUE_FONTS = true ++endif ++ ++ifeq ($(PLATFORM), bsd) ++NEED_OBLIQUE_FONTS = true ++endif ++ ++ifeq ($(NEED_OBLIQUE_FONTS), true) + + # The oblique versions of the font are derived from the base versions + # and since 2D can do this derivation on the fly at run time there is no diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_redist_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_redist_Makefile new file mode 100644 index 00000000000..14a63c4d291 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_redist_Makefile @@ -0,0 +1,33 @@ +$OpenBSD: patch-j2se_make_java_redist_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/redist/Makefile.orig Thu Aug 2 03:45:46 2007 ++++ j2se/make/java/redist/Makefile Fri Aug 3 18:09:11 2007 +@@ -95,6 +95,11 @@ ifeq ($(SA_EXISTS), false) + INCLUDE_SA := false + endif + ++# FIXME: Remove when the build of libsaproc is fixed. ++ifeq ($(PLATFORM), bsd) ++ INCLUDE_SA := false ++endif ++ + ifeq ($(INCLUDE_SA), true) + IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \ + $(LIB_LOCATION)/$(SALIB_NAME) +@@ -319,7 +324,7 @@ $(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/% + $(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir + $(install-file) + +-ifeq ($(PLATFORM), linux) ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + + # The oblique fonts are only needed/wanted on Linux. + +@@ -333,7 +338,7 @@ $(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_SRC)/share/lib + $(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir + $(install-file) + +-endif # linux ++endif # linux || bsd + endif # !OPENJDK + + PARTIAL_SECURITY_CLASSFILE_LIST = \ diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_sun_nio_FILES_java_gmk b/devel/jdk/1.7/patches/patch-j2se_make_java_sun_nio_FILES_java_gmk new file mode 100644 index 00000000000..50d90a67902 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_sun_nio_FILES_java_gmk @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_make_java_sun_nio_FILES_java_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/sun_nio/FILES_java.gmk.orig Thu Aug 2 03:45:46 2007 ++++ j2se/make/java/sun_nio/FILES_java.gmk Fri Aug 3 18:10:26 2007 +@@ -130,6 +130,8 @@ FILES_java += \ + sun/io/CharToByteCp1257.java \ + sun/io/ByteToCharKOI8_R.java \ + sun/io/CharToByteKOI8_R.java \ ++ sun/io/ByteToCharKOI8_U.java \ ++ sun/io/CharToByteKOI8_U.java \ + sun/io/ByteToCharSingleByte.java \ + sun/io/CharToByteSingleByte.java + diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_zip_FILES_c_gmk b/devel/jdk/1.7/patches/patch-j2se_make_java_zip_FILES_c_gmk new file mode 100644 index 00000000000..01bf3d65cf9 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_zip_FILES_c_gmk @@ -0,0 +1,22 @@ +$OpenBSD: patch-j2se_make_java_zip_FILES_c_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/zip/FILES_c.gmk.orig Thu Aug 2 03:45:46 2007 ++++ j2se/make/java/zip/FILES_c.gmk Fri Aug 3 18:14:39 2007 +@@ -30,6 +30,10 @@ FILES_c = \ + Inflater.c \ + ZipFile.c \ + ZipEntry.c \ ++ zip_util.c ++ ++ifneq ($(SYSTEM_ZLIB),true) ++FILES_c += \ + zadler32.c \ + zcrc32.c \ + deflate.c \ +@@ -40,5 +44,5 @@ FILES_c = \ + inftrees.c \ + infcodes.c \ + infutil.c \ +- inffast.c \ +- zip_util.c ++ inffast.c ++endif diff --git a/devel/jdk/1.7/patches/patch-j2se_make_java_zip_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_java_zip_Makefile new file mode 100644 index 00000000000..6378ada9398 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_java_zip_Makefile @@ -0,0 +1,32 @@ +$OpenBSD: patch-j2se_make_java_zip_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/java/zip/Makefile.orig Sun Jul 15 22:34:44 2007 ++++ j2se/make/java/zip/Makefile Sun Jul 15 22:36:10 2007 +@@ -78,14 +78,17 @@ else + CPPFLAGS += -UDEBUG + endif + +-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) + CPPFLAGS += -I$(SHARE_SRC)/native/java/io + CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io + ++ifneq ($(SYSTEM_ZLIB),true) ++CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) ++ + # + # Add to ambient vpath so we pick up the library files + # + vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION) ++endif + + # + # Has been converted to the JNI: generate JNI-style header files +@@ -95,4 +98,9 @@ JAVAHFLAGS += -jni + # + # Link to JVM library for JVM_Zip* functions + # ++ifeq ($(SYSTEM_ZLIB),true) ++OTHER_LDLIBS = -lz ++else + OTHER_LDLIBS = $(JVMLIB) ++endif ++ diff --git a/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_FILES_c_gmk b/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_FILES_c_gmk new file mode 100644 index 00000000000..e043a18adc6 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_FILES_c_gmk @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_make_javax_sound_FILES_c_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/javax/sound/FILES_c.gmk.orig Thu Aug 2 03:45:46 2007 ++++ j2se/make/javax/sound/FILES_c.gmk Fri Aug 3 18:02:55 2007 +@@ -75,6 +75,10 @@ FILES_linux = \ + HAE_API_LinuxOS.c \ + HAE_API_LinuxOS_Capture.c + ++FILES_bsd = \ ++ $(CTARGDIR)HAE_API_BsdOS.c \ ++ $(CTARGDIR)HAE_API_BsdOS_Capture.c ++ + FILES_windows = \ + HAE_API_WinOS.c \ + HAE_API_WinOS_Capture.c \ diff --git a/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_Makefile new file mode 100644 index 00000000000..d520b4cda8a --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_Makefile @@ -0,0 +1,23 @@ +$OpenBSD: patch-j2se_make_javax_sound_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/javax/sound/Makefile.orig Thu Aug 2 03:45:46 2007 ++++ j2se/make/javax/sound/Makefile Fri Aug 3 18:02:55 2007 +@@ -114,6 +114,19 @@ ifeq ($(PLATFORM), linux) + endif + endif # PLATFORM linux + ++# XXXBSD: ??? ++ifeq ($(PLATFORM), bsd) ++ # build with empty MIDI i/o ++ INCLUDE_MIDI = TRUE ++ # build with empty ports ++ INCLUDE_PORTS = TRUE ++ # build with empty direct audio ++ INCLUDE_DAUDIO = TRUE ++ ifeq ($(OS_VENDOR), OpenBSD) ++ LDFLAGS += -lossaudio ++ endif ++endif # PLATFORM bsd ++ + ifeq ($(PLATFORM), solaris) + ifneq ($(ARCH), amd64) + # build with ports and direct audio diff --git a/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_SoundDefs_gmk b/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_SoundDefs_gmk new file mode 100644 index 00000000000..3d5bd596786 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_SoundDefs_gmk @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_make_javax_sound_SoundDefs_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/javax/sound/SoundDefs.gmk.orig Sun Jul 15 22:39:32 2007 ++++ j2se/make/javax/sound/SoundDefs.gmk Sun Jul 15 22:39:57 2007 +@@ -59,6 +59,10 @@ ifeq ($(PLATFORM), linux) + CPPFLAGS += -DX_PLATFORM=X_LINUX + endif # PLATFORM linux + ++ifeq ($(PLATFORM), bsd) ++ CPPFLAGS += -DX_PLATFORM=X_BSD ++endif # PLATFORM bsd ++ + ifeq ($(PLATFORM), solaris) + CPPFLAGS += -DX_PLATFORM=X_SOLARIS + diff --git a/devel/jdk/1.7/patches/patch-j2se_make_jpda_back_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_jpda_back_Makefile new file mode 100644 index 00000000000..017b625b44a --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_jpda_back_Makefile @@ -0,0 +1,13 @@ +$OpenBSD: patch-j2se_make_jpda_back_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/jpda/back/Makefile.orig Wed Aug 1 15:25:46 2007 ++++ j2se/make/jpda/back/Makefile Wed Aug 1 15:26:10 2007 +@@ -49,7 +49,9 @@ OTHER_INCLUDES = -I$(SHARE_SRC)/transport/export \ + -I$(TEMPDIR)/../com.sun.tools.jdwpgen/jdwp + + ifneq ($(PLATFORM), windows) ++ifneq ($(PLATFORM), bsd) + OTHER_LDLIBS += -ldl ++endif # PLATFORM + endif # PLATFORM + + # diff --git a/devel/jdk/1.7/patches/patch-j2se_make_jpda_transport_socket_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_jpda_transport_socket_Makefile new file mode 100644 index 00000000000..acbf6c977e7 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_jpda_transport_socket_Makefile @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_make_jpda_transport_socket_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $ +--- j2se/make/jpda/transport/socket/Makefile.orig Sun Jul 15 22:40:00 2007 ++++ j2se/make/jpda/transport/socket/Makefile Sun Jul 15 22:40:21 2007 +@@ -46,6 +46,11 @@ ifeq ($(PLATFORM), linux) + OTHER_LDLIBS += -lnsl -lpthread + endif + ++ifeq ($(PLATFORM), bsd) ++ LIBSOCKET = ++ OTHER_LDLIBS += -pthread ++endif ++ + ifeq ($(PLATFORM), solaris) + LIBSOCKET = -lsocket + OTHER_LDLIBS += -lnsl -lsocket diff --git a/devel/jdk/1.7/patches/patch-j2se_make_mkdemo_jvmti_Demo_gmk b/devel/jdk/1.7/patches/patch-j2se_make_mkdemo_jvmti_Demo_gmk new file mode 100644 index 00000000000..f17f558a6fc --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_mkdemo_jvmti_Demo_gmk @@ -0,0 +1,28 @@ +$OpenBSD: patch-j2se_make_mkdemo_jvmti_Demo_gmk,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/mkdemo/jvmti/Demo.gmk.orig Thu Jul 5 04:56:12 2007 ++++ j2se/make/mkdemo/jvmti/Demo.gmk Thu Aug 2 21:45:58 2007 +@@ -145,10 +145,12 @@ ifdef USES_CRW + OTHER_LDLIBS += -R\$$ORIGIN/$(REL_TO_SDK_LIBARCH_DIR) + OTHER_LDLIBS += -R\$$ORIGIN/$(REL_TO_JRE_LIBARCH_DIR) + else +- # Add runpath options so that this library can find java_crw_demo +- OTHER_LDLIBS += -Xlinker -z -Xlinker origin +- OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_SDK_LIBARCH_DIR) +- OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_JRE_LIBARCH_DIR) ++ ifneq ($(PLATFORM), bsd) ++ # Add runpath options so that this library can find java_crw_demo ++ OTHER_LDLIBS += -Xlinker -z -Xlinker origin ++ OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_SDK_LIBARCH_DIR) ++ OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_JRE_LIBARCH_DIR) ++ endif + endif + # Add dependence on java_crw_demo + OTHER_LDLIBS += -ljava_crw_demo +@@ -244,6 +246,7 @@ demo_src_dir_layout: + $(RM) -r $(ABS_DEMODESTDIR)/src/$(PLATFORM); \ + $(MKDIR) -p $(ABS_DEMODESTDIR)/src/$(PLATFORM); \ + $(CP) $(PSRCDIR)/*.* $(ABS_DEMODESTDIR)/src/$(PLATFORM); \ ++ $(RM) $(ABS_DEMODESTDIR)/src/$(PLATFORM)/*.orig; \ + fi + @if [ "$(DEMO_NAME)" = hprof ] ; then \ + $(CP) $(SHARE_SRC)/classes/com/sun/demo/jvmti/hprof/*.java \ diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_Makefile new file mode 100644 index 00000000000..444528909e9 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_Makefile @@ -0,0 +1,73 @@ +$OpenBSD: patch-j2se_make_sun_awt_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/awt/Makefile.orig Thu Aug 30 04:58:15 2007 ++++ j2se/make/sun/awt/Makefile Sun Sep 2 14:06:04 2007 +@@ -128,6 +128,14 @@ OTHER_CFLAGS += -DMOTIF_VERSION=2 + OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl + endif + ++ifeq ($(PLATFORM), bsd) ++FILES_c = $(FILES_2D_c) ++FILES_c += awt_LoadLibrary.c ++OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH ++OTHER_CFLAGS += -DMOTIF_VERSION=2 ++OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) ++endif ++ + FILES_c += initIDs.c + + # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX +@@ -240,7 +248,7 @@ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font + # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS + endif # PLATFORM + +-ifeq ($(PLATFORM), linux) ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX + vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl + vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl +@@ -420,6 +428,19 @@ FONTCONFIGS_SRC_PREFIX = $(PLATFORM). + # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS + endif # PLATFORM + ++ifeq ($(PLATFORM), bsd) ++# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv BSD ++ ++FONTCONFIGS_SRC = $(PLATFORM_SRC)/classes/sun/awt/fontconfigs ++_FONTCONFIGS = \ ++ fontconfig.properties ++ ++FONTCONFIGS_SRC_PREFIX = $(PLATFORM). ++ ++# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ BSD ++endif # PLATFORM ++ ++ + FONTCONFIGS = $(_FONTCONFIGS:%=$(LIBDIR)/%.src) + BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc) + +@@ -514,6 +535,9 @@ CPPFLAGS += -I$(MOTIF_DIR)/include \ + -I$(OPENWIN_HOME)/include/X11/extensions \ + -I$(PLATFORM_SRC)/native/$(PKGDIR)/font + endif ++ifeq ($(PLATFORM), bsd) ++CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font ++endif + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ + -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \ +@@ -535,7 +559,14 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(PLATFORM_SRC)/native/$(PKGDIR) \ + $(EVENT_MODEL) + +-ifeq ($(PLATFORM), linux) ++# include these last so we don't pick up unintentional includes ++ifeq ($(PLATFORM), bsd) ++CPPFLAGS += -I$(MOTIF_DIR)/include \ ++ -I$(OPENWIN_HOME)/include \ ++ -I$(OPENWIN_HOME)/include/X11/extensions ++endif ++ ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) + endif + diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_mawt_gmk b/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_mawt_gmk new file mode 100644 index 00000000000..2fd3783be26 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_mawt_gmk @@ -0,0 +1,94 @@ +$OpenBSD: patch-j2se_make_sun_awt_mawt_gmk,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/awt/mawt.gmk.orig Thu Aug 30 04:58:15 2007 ++++ j2se/make/sun/awt/mawt.gmk Sun Sep 2 14:06:04 2007 +@@ -57,7 +57,7 @@ else + ifeq ($(MOTIF_VERSION), 2) + FILES_c += awt_motif21.c + FILES_c += awt_Choice21.c +- ifeq ($(PLATFORM), linux) ++ ifneq (,$(findstring $(PLATFORM), linux bsd)) + FILES_c += Xinerama.c + endif + endif +@@ -142,7 +142,7 @@ CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION) + + ifeq ($(STATIC_MOTIF),true) + LIBXM = $(MOTIF_LIB)/libXm.a -lXp -lXmu +- ifeq ($(PLATFORM), linux) ++ ifneq (,$(findstring $(PLATFORM), linux bsd)) + ifeq ($(ARCH_DATA_MODEL), 64) + LIBXT = -lXt + else +@@ -157,7 +157,7 @@ ifeq ($(STATIC_MOTIF),true) + endif + else + LIBXM = -L$(MOTIF_LIB) -lXm -lXp +- ifeq ($(PLATFORM), linux) ++ ifneq (,$(findstring $(PLATFORM), linux bsd)) + LIBXT = -lXt + LIBSM = + LIBICE = +@@ -175,7 +175,7 @@ ifeq ($(PLATFORM), solaris) + OTHER_LDLIBS = $(LIBXM) -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi + endif + +-ifeq ($(PLATFORM), linux) ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH + OTHER_CFLAGS += -DMOTIF_VERSION=2 + OTHER_CFLAGS += -DXMSTRINGDEFINES=1 +@@ -186,8 +186,12 @@ endif + # !HEADLESS + + OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \ +- -lawt $(LIBM) -ldl ++ -lawt $(LIBM) + ++ifneq ($(PLATFORM), bsd) ++OTHER_LDLIBS += -ldl ++endif ++ + # + # Sun CC with -Xa misdefines __STDC__ to 0 (zero). + # The following will force checking of X11 prototypes. +@@ -199,15 +203,6 @@ endif + # + # Other extra flags needed for compiling. + # +-CPPFLAGS += -I$(CUPS_HEADERS_PATH) +- +-ifndef HEADLESS +-CPPFLAGS += -I$(MOTIF_DIR)/include \ +- -I$(OPENWIN_HOME)/include +-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) +- +-endif # !HEADLESS +- + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ + -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \ +@@ -230,10 +225,24 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(PLATFORM_SRC)/native/$(PKGDIR) \ + $(EVENT_MODEL) + ++CPPFLAGS += -I$(CUPS_HEADERS_PATH) ++ ++ifndef HEADLESS ++CPPFLAGS += -I$(MOTIF_DIR)/include \ ++ -I$(OPENWIN_HOME)/include ++LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) ++ ++endif # !HEADLESS ++ + ifeq ($(PLATFORM), linux) + # Checking for the X11/extensions headers at the additional location + CPPFLAGS += -I/X11R6/include/X11/extensions \ + -I/usr/include/X11/extensions ++endif ++ ++ifeq ($(PLATFORM), bsd) ++ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ ++ -I$(OPENWIN_HOME)/include + endif + + ifeq ($(PLATFORM), solaris) diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_font_FILES_c_gmk b/devel/jdk/1.7/patches/patch-j2se_make_sun_font_FILES_c_gmk new file mode 100644 index 00000000000..53812eec89d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_font_FILES_c_gmk @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_make_sun_font_FILES_c_gmk,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/font/FILES_c.gmk.orig Fri Aug 10 16:10:45 2007 ++++ j2se/make/sun/font/FILES_c.gmk Fri Aug 10 16:11:04 2007 +@@ -31,7 +31,7 @@ FILES_c_shared = \ + DrawGlyphList.c \ + sunFont.c + +-ifdef OPENJDK ++ifdef USE_FREETYPE + FILES_c_shared += $(TARGDIR)freetypeScaler.c + endif + diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_font_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_sun_font_Makefile new file mode 100644 index 00000000000..3d725a87dbd --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_font_Makefile @@ -0,0 +1,40 @@ +$OpenBSD: patch-j2se_make_sun_font_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/font/Makefile.orig Thu Aug 2 03:45:49 2007 ++++ j2se/make/sun/font/Makefile Fri Aug 10 15:09:37 2007 +@@ -97,7 +97,7 @@ else # PLATFORM unix + endif # PLATFORM + + #In the non-OpenJDK mode we need to build T2K +-ifndef OPENJDK ++ifndef USE_FREETYPE + t2k: + $(ECHO) "lib=" $(ACTUAL_LIBRARY) + $(MAKE) -C t2k +@@ -161,7 +161,7 @@ vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR) + CFLAGS += -DHEADLESS + CXXFLAGS += -DHEADLESS + +-ifndef OPENJDK ++ifndef USE_FREETYPE + CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k + else + CPPFLAGS += -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2 +@@ -177,6 +177,10 @@ else # PLATFORM + # Libraries to link, and other C flags. + # + ++ifeq ($(PLATFORM), bsd) ++OTHER_INCLUDES += -I/usr/X11R6/include ++OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX) ++else + ifeq ($(PLATFORM), solaris) + # Note that on Solaris, fontmanager is built against the headless library. + LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless +@@ -186,6 +190,7 @@ else # PLATFORM is linux + ifeq ("$(CC_VER_MAJOR)", "3") + OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic + endif ++endif + endif + + endif # PLATFORM diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_image_generic_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_sun_image_generic_Makefile new file mode 100644 index 00000000000..c4a4feb3bf0 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_image_generic_Makefile @@ -0,0 +1,16 @@ +$OpenBSD: patch-j2se_make_sun_image_generic_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/image/generic/Makefile.orig Sun Jul 15 22:57:34 2007 ++++ j2se/make/sun/image/generic/Makefile Sun Jul 15 22:57:58 2007 +@@ -69,7 +69,11 @@ CPPFLAGS += \ + -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib + + OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES +-OTHER_LDLIBS = $(LIBM) -ldl ++OTHER_LDLIBS = $(LIBM) ++ifneq ($(PLATFORM), bsd) ++OTHER_LDLIBS += -ldl ++endif ++ + + # + # Has been converted to the JNI: generate JNI-style header files diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_jawt_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_sun_jawt_Makefile new file mode 100644 index 00000000000..9bd3b1a03d1 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_jawt_Makefile @@ -0,0 +1,32 @@ +$OpenBSD: patch-j2se_make_sun_jawt_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/jawt/Makefile.orig Thu Aug 2 03:45:50 2007 ++++ j2se/make/sun/jawt/Makefile Fri Aug 10 17:18:13 2007 +@@ -98,9 +98,7 @@ else # PLATFORM + # + # Other extra flags needed for compiling. + # +-CPPFLAGS += -I$(OPENWIN_HOME)/include \ +- -I$(MOTIF_DIR)/include \ +- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ ++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(SHARE_SRC)/native/$(PKGDIR)/image \ + -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ + -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \ +@@ -114,6 +112,8 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \ + -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \ + -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \ + -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \ ++ -I$(OPENWIN_HOME)/include \ ++ -I$(MOTIF_DIR)/include \ + $(EVENT_MODEL) + # + # Libraries to link in. +@@ -122,7 +122,7 @@ ifeq ($(PLATFORM), solaris) + OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt + endif # PLATFORM + +-ifeq ($(PLATFORM), linux) ++ifneq (,$(findstring $(PLATFORM), linux bsd)) + OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt + endif # PLATFORM + diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_security_jgss_wrapper_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_sun_security_jgss_wrapper_Makefile new file mode 100644 index 00000000000..f7bbd9e35b3 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_security_jgss_wrapper_Makefile @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_make_sun_security_jgss_wrapper_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/security/jgss/wrapper/Makefile.orig Sun Jul 15 23:01:16 2007 ++++ j2se/make/sun/security/jgss/wrapper/Makefile Sun Jul 15 23:03:23 2007 +@@ -73,6 +73,10 @@ include $(BUILDDIR)/common/Library.gmk + # + # Libraries to link + # +-ifneq ($(PLATFORM), windows) ++ifneq (,$(findstring $(PLATFORM), linux solaris)) + OTHER_LDLIBS = -ldl $(JVMLIB) ++endif ++ ++ifeq ($(PLATFORM), bsd) ++ OTHER_LDLIBS = $(JVMLIB) + endif diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_security_pkcs11_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_sun_security_pkcs11_Makefile new file mode 100644 index 00000000000..37d216a9e67 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_security_pkcs11_Makefile @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_make_sun_security_pkcs11_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/security/pkcs11/Makefile.orig Sun Jul 15 23:03:34 2007 ++++ j2se/make/sun/security/pkcs11/Makefile Sun Jul 15 23:03:54 2007 +@@ -80,7 +80,7 @@ include $(BUILDDIR)/common/Library.gmk + # + # Libraries to link + # +-ifeq ($(PLATFORM), windows) ++ifneq (,$(findstring $(PLATFORM), windows bsd)) + OTHER_LDLIBS = $(JVMLIB) + else + OTHER_LDLIBS = -ldl $(JVMLIB) diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_security_smartcardio_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_sun_security_smartcardio_Makefile new file mode 100644 index 00000000000..548da877411 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_security_smartcardio_Makefile @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_make_sun_security_smartcardio_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/security/smartcardio/Makefile.orig Sun Jul 15 23:04:02 2007 ++++ j2se/make/sun/security/smartcardio/Makefile Sun Jul 15 23:04:45 2007 +@@ -75,6 +75,10 @@ include $(BUILDDIR)/common/Library.gmk + ifeq ($(PLATFORM), windows) + OTHER_LDLIBS = $(JVMLIB) winscard.lib + else +- OTHER_LDLIBS = -ldl $(JVMLIB) ++ ifeq ($(PLATFORM), bsd) ++ OTHER_LDLIBS = $(JVMLIB) ++ else ++ OTHER_LDLIBS = -ldl $(JVMLIB) ++ endif + OTHER_CFLAGS = -D__sun_jdk + endif diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_splashscreen_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_sun_splashscreen_Makefile new file mode 100644 index 00000000000..b101d78ec76 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_splashscreen_Makefile @@ -0,0 +1,38 @@ +$OpenBSD: patch-j2se_make_sun_splashscreen_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/splashscreen/Makefile.orig Thu Aug 2 03:45:52 2007 ++++ j2se/make/sun/splashscreen/Makefile Fri Aug 10 20:23:10 2007 +@@ -61,10 +61,22 @@ JAVALIB= + + CFLAGS += -DSPLASHSCREEN + ++CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen ++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 ++ + ifneq ($(PLATFORM), windows) + CFLAGS += -DWITH_X11 +- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions +- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread ++ ifeq ($(PLATFORM), bsd) ++ CFLAGS += -DPNG_NO_MMX_CODE ++ ICONV_DIR=/usr/local ++ CPPFLAGS += -I$(OPENWIN_HOME)/include \ ++ -I$(OPENWIN_HOME)/include/X11/extensions \ ++ -I$(ICONV_DIR)/include ++ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext -L$(ICONV_DIR)/lib -liconv $(LIBM) -pthread ++ else ++ CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions ++ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread ++ endif + else # PLATFORM + CFLAGS += -DWITH_WIN32 + OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib +@@ -81,9 +93,6 @@ vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-1.1 + vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/libpng + vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg + vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen +- +-CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen +-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 + + # + # Has been converted to the JNI: generate JNI-style header files diff --git a/devel/jdk/1.7/patches/patch-j2se_make_sun_xawt_Makefile b/devel/jdk/1.7/patches/patch-j2se_make_sun_xawt_Makefile new file mode 100644 index 00000000000..029992b4798 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_xawt_Makefile @@ -0,0 +1,59 @@ +$OpenBSD: patch-j2se_make_sun_xawt_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/make/sun/xawt/Makefile.orig Thu Aug 30 04:58:19 2007 ++++ j2se/make/sun/xawt/Makefile Sun Sep 2 14:06:04 2007 +@@ -54,6 +54,12 @@ LDFLAGS += -lpthread + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) + endif + ++ifeq ($(PLATFORM), bsd) ++FILES_c += Xinerama.c ++LDFLAGS += -pthread ++dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) ++endif ++ + # Since this library will be living in a subdirectory below the other libraries + # we need to add an extra runpath so that libraries in the upper directory + # are found at runtime. +@@ -87,7 +93,12 @@ vpath %.c $(SHARE_SRC)/native/sun/java2d/opengl + vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl + vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 + +-OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ ++ifeq ($(PLATFORM), bsd) ++LIBDL= ++else ++LIBDL=-ldl ++endif ++OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 $(LIBDL) \ + $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi + + ifeq ($(PLATFORM), solaris) +@@ -95,8 +106,6 @@ CPPFLAGS += -DFUNCPROTO=15 + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) + endif + +-CPPFLAGS += -I$(CUPS_HEADERS_PATH) +- + CPPFLAGS += -DXAWT -DXAWT_HACK \ + -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ + -I$(PLATFORM_SRC)/native/sun/awt \ +@@ -123,6 +132,8 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \ + -I$(SHARE_SRC)/native/sun/awt \ + -I$(PLATFORM_SRC)/native/sun/awt + ++CPPFLAGS += -I$(CUPS_HEADERS_PATH) ++ + ifeq ($(PLATFORM), linux) + # Allows for builds on Debian GNU Linux, X11 is in a different place + CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ +@@ -133,6 +144,10 @@ endif + + ifeq ($(PLATFORM), solaris) + CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(MOTIF_DIR)/include ++endif ++ ++ifeq ($(PLATFORM), bsd) ++ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include + endif + + ifeq ($(MILESTONE), internal) diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_classes_sun_jdbc_odbc_JdbcOdbc_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_classes_sun_jdbc_odbc_JdbcOdbc_c new file mode 100644 index 00000000000..cff9ef5afa7 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_classes_sun_jdbc_odbc_JdbcOdbc_c @@ -0,0 +1,13 @@ +$OpenBSD: patch-j2se_src_closed_share_classes_sun_jdbc_odbc_JdbcOdbc_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/classes/sun/jdbc/odbc/JdbcOdbc.c.orig Sun Jul 29 22:35:46 2007 ++++ j2se/src/closed/share/classes/sun/jdbc/odbc/JdbcOdbc.c Sun Jul 29 22:36:41 2007 +@@ -86,6 +86,9 @@ + #include "stdio.h" + #include "sun_jdbc_odbc_JdbcOdbc.h" + ++#ifdef _ALLBSD_SOURCE ++#include ++#endif + + static double buf = 0; + //SDWORD lenValue = SQL_NULL_DATA; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_DirectAudioDevice_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_DirectAudioDevice_c new file mode 100644 index 00000000000..643e6ffe926 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_DirectAudioDevice_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_DirectAudioDevice_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/com/sun/media/sound/DirectAudioDevice.c.orig Thu Jul 5 03:44:22 2007 ++++ j2se/src/closed/share/native/com/sun/media/sound/DirectAudioDevice.c Wed Aug 1 11:23:46 2007 +@@ -18,7 +18,11 @@ + #include + + // for malloc ++#ifdef _ALLBSD_SOURCE ++#include ++#else + #include ++#endif + + // for type definitions + #include "engine/X_API.h" diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_Platform_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_Platform_c new file mode 100644 index 00000000000..b965dbbd9d5 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_Platform_c @@ -0,0 +1,21 @@ +$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_Platform_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/com/sun/media/sound/Platform.c.orig Sun Jul 29 22:39:30 2007 ++++ j2se/src/closed/share/native/com/sun/media/sound/Platform.c Sun Jul 29 22:40:26 2007 +@@ -81,5 +81,17 @@ JNIEXPORT jint JNICALL Java_com_sun_media_sound_Platfo + return com_sun_media_sound_Platform_LIB_ALSA; + } + #endif ++#if (X_PLATFORM == X_BSD) ++ switch (feature) { ++ case com_sun_media_sound_Platform_FEATURE_MIDIIO: ++ return com_sun_media_sound_Platform_LIB_MAIN; ++ case com_sun_media_sound_Platform_FEATURE_PORTS: ++ return com_sun_media_sound_Platform_LIB_MAIN; ++ case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO: ++ // XXXBSD: When native Direct Audio support is ported change ++ // this back to returning com_sun_media_sound_Platform_LIB_MAIN ++ return 0; ++ } ++#endif + return 0; + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_HAE_cpp b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_HAE_cpp new file mode 100644 index 00000000000..5275b69b398 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_HAE_cpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_engine_HAE_cpp,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/com/sun/media/sound/engine/HAE.cpp.orig Sun Jul 29 22:40:44 2007 ++++ j2se/src/closed/share/native/com/sun/media/sound/engine/HAE.cpp Sun Jul 29 22:41:09 2007 +@@ -3216,6 +3216,7 @@ HAEErr HAEMidiFile::GetInfo(HAEInfoTypes infoType, cha + #if ( (X_PLATFORM == X_WINDOWS) || \ + (X_PLATFORM == X_WIN_HARDWARE) || \ + (X_PLATFORM == X_SOLARIS) || \ ++ (X_PLATFORM == X_BSD) || \ + (X_PLATFORM == X_LINUX) ) + while (*cInfo) + { diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_c new file mode 100644 index 00000000000..0adb26e9bf0 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_c @@ -0,0 +1,180 @@ +$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/com/sun/media/sound/engine/X_API.c.orig Thu Jul 5 03:44:25 2007 ++++ j2se/src/closed/share/native/com/sun/media/sound/engine/X_API.c Sun Jul 29 22:42:45 2007 +@@ -300,7 +300,7 @@ + #include + #endif + +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + #include + #include + #include +@@ -587,7 +587,7 @@ XPTR XNewPtr(INT32 size) + XSetMemory(data, size, 0); + } + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + // $$kk: 10.14.97 + // changed this line as per Liang He's performance recommendations + // data = (char *)malloc((size_t)size); +@@ -661,7 +661,7 @@ void XDisposePtr(XPTR data) + #if X_PLATFORM == X_BE + free(osAllocatedData); + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + free(osAllocatedData); + #endif + #if X_PLATFORM == X_NAVIO +@@ -711,7 +711,7 @@ INT32 XGetPtrSize(XPTR data) + #if X_PLATFORM == X_BE + size = 0; + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + size = 0; + #endif + #if X_PLATFORM == X_NAVIO +@@ -744,7 +744,7 @@ void XBlockMove(XPTR source, XPTR dest, INT32 size) + #if X_PLATFORM == X_BE + memcpy(dest, source, size); + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + memcpy(dest, source, (size_t)size); + #endif + #if X_PLATFORM == X_NAVIO +@@ -872,6 +872,7 @@ XBOOL XIsStereoSupported(void) + (X_PLATFORM == X_BE) || \ + (X_PLATFORM == X_SOLARIS) || \ + (X_PLATFORM == X_LINUX) || \ ++ (X_PLATFORM == X_BSD) || \ + (X_PLATFORM == X_NAVIO) ) + return TRUE; + #endif +@@ -988,7 +989,7 @@ UINT32 XMicroseconds(void) + } + return (hardwareTicks - starttick); + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + static hrtime_t solaristick = 0; + + if (solaristick == 0) +@@ -1030,6 +1031,7 @@ XBOOL XIs16BitSupported(void) + (X_PLATFORM == X_BE) || \ + (X_PLATFORM == X_SOLARIS) || \ + (X_PLATFORM == X_LINUX) || \ ++ (X_PLATFORM == X_BSD) || \ + (X_PLATFORM == X_WEBTV) || \ + (X_PLATFORM == X_NAVIO) ) + return TRUE; +@@ -1271,6 +1273,7 @@ void XConvertNativeFileToXFILENAME(void *file, XFILENA + (X_PLATFORM == X_BE) || \ + (X_PLATFORM == X_SOLARIS) || \ + (X_PLATFORM == X_LINUX) || \ ++ (X_PLATFORM == X_BSD) || \ + (X_PLATFORM == X_NAVIO) ) + XStrCpy((char *)xfile->theFile, (char *)file); + #endif +@@ -1600,7 +1603,7 @@ XFILE XFileOpenResource(XFILENAME *file, XBOOL readOnl + } + #endif + +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM ==X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + if (readOnly) + { + pReference->fileReference = open(pReference->theFile, O_RDONLY); // O_BINARY +@@ -1781,7 +1784,7 @@ XFILE XFileOpenForRead(XFILENAME *file) + pReference = NULL; + } + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + pReference->fileReference = open(pReference->theFile, O_RDONLY); // O_BINARY + if (pReference->fileReference == -1) + { +@@ -1871,7 +1874,7 @@ XFILE XFileOpenForWrite(XFILENAME *file, XBOOL create) + pReference = NULL; + } + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + if (create) + { + pReference->fileReference = open(pReference->theFile, O_WRONLY | O_CREAT | O_TRUNC); +@@ -1918,7 +1921,7 @@ XERR XFileDelete(XFILENAME *file) + #if X_PLATFORM == X_BE + return unlink(file->theFile); + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + return unlink(file->theFile); + #endif + #if X_PLATFORM == X_NAVIO +@@ -1958,7 +1961,7 @@ void XFileClose(XFILE fileRef) + #if X_PLATFORM == X_BE + close(pReference->fileReference); + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + close(pReference->fileReference); + #endif + #if X_PLATFORM == X_NAVIO +@@ -2008,7 +2011,7 @@ XERR XFileRead(XFILE fileRef, void * buffer, INT32 buf + #if X_PLATFORM == X_BE + return (read(pReference->fileReference, buffer, bufferLength) == bufferLength) ? 0 : -1; + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + return (read(pReference->fileReference, buffer, (size_t)bufferLength) == bufferLength) ? 0 : -1; + #endif + #if X_PLATFORM == X_NAVIO +@@ -2045,7 +2048,7 @@ XERR XFileWrite(XFILE fileRef, void *buffer, INT32 buf + #if X_PLATFORM == X_BE + return (write(pReference->fileReference, buffer, bufferLength) == bufferLength) ? 0 : -1; + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + return (write(pReference->fileReference, buffer, (size_t)bufferLength) == bufferLength) ? 0 : -1; + #endif + #if X_PLATFORM == X_NAVIO +@@ -2088,7 +2091,7 @@ XERR XFileSetPosition(XFILE fileRef, INT32 filePositio + #if X_PLATFORM == X_BE + err = (lseek(pReference->fileReference, filePosition, SEEK_SET) == -1) ? -1 : 0; + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + err = (lseek(pReference->fileReference, (off_t)filePosition, SEEK_SET) == -1) ? -1 : 0; + #endif + #if X_PLATFORM == X_NAVIO +@@ -2156,7 +2159,7 @@ INT32 XFileGetPosition(XFILE fileRef) + #if X_PLATFORM == X_BE + pos = lseek(pReference->fileReference, 0, SEEK_CUR); + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + pos = lseek(pReference->fileReference, 0, SEEK_CUR); + #endif + #if X_PLATFORM == X_NAVIO +@@ -2194,7 +2197,7 @@ INT32 XFileSetLength(XFILE fileRef, INT32 newSize) + // deleting of resources will fail until this function is fixed + // chsize(pReference->fileReference, newSize); + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + error = -1; + // deleting of resources will fail until this function is fixed + // chsize(pReference->fileReference, newSize); +@@ -2238,7 +2241,7 @@ INT32 XFileGetLength(XFILE fileRef) + pos = lseek(pReference->fileReference, 0, SEEK_END); + lseek(pReference->fileReference, 0, SEEK_SET); + #endif +-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) ++#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD) + pos = lseek(pReference->fileReference, 0, SEEK_END); + lseek(pReference->fileReference, 0, SEEK_SET); + #endif diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_h b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_h new file mode 100644 index 00000000000..26e50bbc13f --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_h @@ -0,0 +1,55 @@ +$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/com/sun/media/sound/engine/X_API.h.orig Thu Jul 5 03:44:25 2007 ++++ j2se/src/closed/share/native/com/sun/media/sound/engine/X_API.h Sun Jul 29 22:42:45 2007 +@@ -205,6 +205,7 @@ + #define X_NAVIO 7 // NaviOS + #define X_WIN_HARDWARE 8 // Windows 95 only direct to Sound Blaster hardware + #define X_LINUX 9 // Linux ++#define X_BSD 10 // BSD + + // ********************************** + // Make sure you set the X_PLATFORM define correctly. Everything depends upon this +@@ -245,7 +246,7 @@ + //#define HAE_EDITOR 1 + + // following is needed for _LP64 +-#if ((X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)) ++#if ((X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)) + #include + #endif + +@@ -291,7 +292,7 @@ + + + /* ************** ENDIANNESS selection ************** */ +-#if ( (CPU_TYPE == k80X86) || (CPU_TYPE == kIA64) || (CPU_TYPE == kAMD64) || defined(_LITTLE_ENDIAN) ) ++#if ( (CPU_TYPE == k80X86) || (CPU_TYPE == kIA64) || (CPU_TYPE == kAMD64) ) + /* little endian */ + #define X_WORD_ORDER TRUE + #else +@@ -889,7 +890,7 @@ extern "C" { + /* $$fb 2002-03-11: added X_LINUX type */ + // ********************************** + // Linux via dev/dsp thread +-#if X_PLATFORM == X_LINUX ++#if ((X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)) + #ifndef DEBUG_STR + #ifdef USE_DEBUG + #include +@@ -1099,7 +1100,7 @@ extern "C" { + #define FILE_NAME_LENGTH 63 + #endif + +-#if ((X_PLATFORM == X_SOLARIS || X_PLATFORM == X_LINUX)) ++#if ((X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM==X_BSD)) + // $$kk: 08.12.98: what is the real value? is 1024 correct?? + #define FILE_NAME_LENGTH 1024 + #endif +@@ -1130,6 +1131,7 @@ extern "C" { + (X_PLATFORM == X_BE) || \ + (X_PLATFORM == X_SOLARIS) || \ + (X_PLATFORM == X_LINUX) || \ ++ (X_PLATFORM == X_BSD) || \ + (X_PLATFORM == X_NAVIO) ) + /* $$fb 2002-02-14: itanium port */ + XFILE_HANDLE fileReference; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcms_sys_h b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcms_sys_h new file mode 100644 index 00000000000..e1ff1df56be --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcms_sys_h @@ -0,0 +1,30 @@ +$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcms_sys_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/kcms_sys.h.orig Thu Jul 5 03:44:30 2007 ++++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/kcms_sys.h Sun Jul 29 22:48:36 2007 +@@ -47,7 +47,7 @@ + #define KCMS_SYS_H + + #include "kcmsos.h" +-#if defined (KPLINUX) ++#if defined (KPLINUX) || defined (KPBSD) + #include + #endif + +@@ -221,7 +221,7 @@ KpInt32_t KpInterlockedExchange (KpInt32_t FAR *addres + a semaphore by when releasing + the semaphore */ + +-#if defined (KPSOLARIS) || defined (KPLINUX) ++#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD) + #define KCMS_SYS_SEM_SET "Kp_kcms_sys.sem" + #define KCMS_SYS_NUM_SEMS 1 + #define KCMS_SYS_SEMAPHORE 1 +@@ -260,7 +260,7 @@ KpUInt32_t FAR KpSemaphoreRelease ( + KpUInt32_t FAR *SemList, + KpUInt32_t Increment); + +-#if defined (KPSOLARIS) || defined (KPLINUX) ++#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD) + KpUInt32_t getKeyFromName (char *name, key_t *key); + KpSemSet_t acquireKcmsSysLock (void); + KpUInt32_t releaseKcmsSysLock (KpSemSet_t *SemSet); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcmsos_h b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcmsos_h new file mode 100644 index 00000000000..54d8e29f81d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcmsos_h @@ -0,0 +1,68 @@ +$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcmsos_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/kcmsos.h.orig Thu Jul 5 03:44:30 2007 ++++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/kcmsos.h Sun Jul 29 22:48:36 2007 +@@ -249,6 +249,27 @@ extern "C" { + #define KP_USE_VERSIONSTRING + #endif + ++#if defined (_ALLBSD_SOURCE) ++ #define KPGCC 1 ++ #define KPBSD 1 ++ #define KPUNIX 1 ++ #define KPUNIX_BSD 1 ++ #define KP_POSIX_THREADS 1 ++ ++ #define KPINT32 1 ++ ++#ifdef __OpenBSD__ ++#include ++#endif ++#include ++#if (BYTE_ORDER == LITTLE_ENDIAN) ++ #define KPLSBFIRST 1 ++#else ++ #define KPMSBFIRST 1 ++#endif ++ #define KP_USE_VERSIONSTRING ++#endif ++ + #if defined(__sgi) && defined (__mips) /* SGI C Compiler */ + #if defined(SGIALL) + #define KPSGIALL 1 +@@ -399,6 +420,9 @@ extern "C" { + #elif defined(KPDU) + #define KP_ALIGN 0x3 + #define KcpFileDirSep "/" ++#elif defined(KPBSD) ++ #define KP_ALIGN 0x3 ++ #define KcpFileDirSep "/" + #endif + + #if defined(KPMAC) || defined (KPMSMAC) +@@ -618,7 +642,7 @@ typedef struct tagOFSTRUCT KpFileProps_t; + + + +-#elif defined(KPSUN) || defined(KPDU) ++#elif defined(KPSUN) || defined(KPDU) || defined(KPBSD) + /* + * *** Sun Microsystems Section *** + */ +@@ -1045,7 +1069,7 @@ typedef struct { + struct KpThreadMemHdl_tag { char dontuse; }; + typedef struct KpThreadMemHdl_tag FAR* KpThreadMemHdl_t; + +-#if defined (KPSOLARIS) || defined (KPLINUX) ++#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD) + #if defined (KP_POSIX_THREADS) + #include "pthread.h" + #else +@@ -1058,7 +1082,7 @@ typedef struct { + KpInt32_t SyncFlag; + #if defined (KPWIN32) + CRITICAL_SECTION CriticalFlag; +-#elif defined (KPSOLARIS) || defined (KPLINUX) ++#elif defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD) + KpInt32_t ThreadId; + KpUInt32_t Count; + #if defined (KP_POSIX_THREADS) diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kpfile_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kpfile_c new file mode 100644 index 00000000000..e8ed7b98993 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kpfile_c @@ -0,0 +1,48 @@ +$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kpfile_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/kpfile.c.orig Thu Jul 5 03:44:30 2007 ++++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/kpfile.c Sun Jul 29 22:48:36 2007 +@@ -104,7 +104,7 @@ + #include + #include + +-#if !defined (KPLINUX) ++#if !defined (KPLINUX) && !defined(KPBSD) + #include + #endif + +@@ -597,7 +597,7 @@ void KpFileStripPath (KpChar_p filePlusPath, KpChar_p + theFile[0] = '\0'; + + /* find the last occurrence of the slash */ +-#if defined (KPLINUX) ++#if defined (KPLINUX) || defined (KPBSD) + fPtr = strrchr (filePlusPath, '/'); + #else + fPtr = strrchr (filePlusPath, '//'); +@@ -654,7 +654,7 @@ void KpFileStripPath (KpChar_p filePlusPath, KpChar_p + char PathName[256]; + KpInt32_t Result; + KpBool_t fileFound = KPFALSE; +-#if defined (KPLINUX) ++#if defined (KPLINUX) || defined (KPBSD) + struct dirent *dpb; + #else + dirent_t *dpb; +@@ -689,7 +689,7 @@ void KpFileStripPath (KpChar_p filePlusPath, KpChar_p + + while ( fileFound == KPTRUE) + { +-#if defined (KPLINUX) ++#if defined (KPLINUX) || defined (KPBSD) + if ((dpb = readdir(FD)) == (struct direct *)NULL) + #else + if ((dpb = readdir(FD)) == (dirent_t *)NULL) +@@ -770,7 +770,7 @@ dirStatus FAR KpFileDirCount ( + KpInt32_t FAR *numFiles) + { + DIR *FD; +-#if defined (KPLINUX) ++#if defined (KPLINUX) || defined (KPBSD) + struct dirent *dpb; + #else + dirent_t *dpb; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sithread_h b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sithread_h new file mode 100644 index 00000000000..c6bfe8e470e --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sithread_h @@ -0,0 +1,30 @@ +$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sithread_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/sithread.h.orig Thu Jul 5 03:44:31 2007 ++++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/sithread.h Sun Jul 29 22:48:36 2007 +@@ -25,7 +25,7 @@ + #include + #endif /* KPSOLARIS */ + +-#if defined (KPLINUX) ++#if defined (KPLINUX) || defined (KPBSD) + #include + #endif + +@@ -75,7 +75,7 @@ typedef struct KpThreadFlags_s { + /****************************** + * Linux definitons + ******************************/ +-#if defined (KPLINUX) ++#if defined (KPLINUX) || defined (KPBSD) + + typedef pthread_t KpThread_t, *KpThread_p; + +@@ -83,7 +83,7 @@ typedef struct KpThreadFlags_s { + KpInt32_t CreationFlags; + } KpThreadFlags_t, FAR * KpThreadFlags_p, FAR * FAR * KpThreadFlags_h; + +-#endif /* KPLINUX */ ++#endif /* KPLINUX || KPBSD */ + + /*********************** + * Function Prototypes diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sptagmgr_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sptagmgr_c new file mode 100644 index 00000000000..b6f6112cf40 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sptagmgr_c @@ -0,0 +1,25 @@ +$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sptagmgr_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/sptagmgr.c.orig Thu Jul 5 03:44:31 2007 ++++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/sptagmgr.c Sun Jul 29 22:48:36 2007 +@@ -22,9 +22,9 @@ + Windows Revision Level: + $Workfile: sptagmgr.c $ + $Logfile: /DLL/KodakCMS/sprof_lib/sptagmgr.c $ +- $Revision: 1.1 $ +- $Date: 2007/09/06 15:46:19 $ +- $Author: kurt $ ++ $Revision: 1.1 $ ++ $Date: 2007/09/06 15:46:19 $ ++ $Author: kurt $ + + SCCS Revision: + @(#)sptagmgr.c 1.41 1/8/99 +@@ -902,7 +902,7 @@ SpStatus_t KSPAPI SpProfileCreateEx ( + ProfileData->Header.Platform = SpSigMake ('A', 'P', 'P', 'L'); + #elif defined (KPSGI) || defined(KPSGIALL) + ProfileData->Header.Platform = SpSigMake ('S', 'G', 'I', ' '); +-#elif defined (KPSUN) ++#elif defined (KPSUN) || defined(KPBSD) + ProfileData->Header.Platform = SpSigMake ('S', 'U', 'N', 'W'); + #else + ProfileData->Header.Platform = SpSigMake ('M', 'S', 'F', 'T'); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_c new file mode 100644 index 00000000000..c3917dc5640 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_c @@ -0,0 +1,48 @@ +$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/sync.c.orig Thu Jul 5 03:44:31 2007 ++++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/sync.c Sun Jul 29 22:48:37 2007 +@@ -341,7 +341,7 @@ KpInt32_t KpGetCurrentThreadId (void) + KpInt32_t KpGetCurrentThreadId (void) + { + +-#if defined (KPSOLARIS) || defined (KPLINUX) ++#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD) + #if defined (KP_POSIX_THREADS) + return ((KpInt32_t) pthread_self()); + #else +@@ -517,7 +517,7 @@ void KpDeleteCriticalSection (KpCriticalFlag_t FAR *Cr + /* Process/Thread Synchronization functions (Solaris) */ + /******************************************************/ + +-#elif defined (KPSOLARIS) || defined (KPLINUX) ++#elif defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD) + + /*-------------------------------------------------------------------- + * DESCRIPTION (Solaris Version) +@@ -796,7 +796,7 @@ KpInt32_t KpInterlockedExchange (KpInt32_p address, Kp + /* Atomic Read Modify Write functions (Solaris Version) */ + /***************************************************************/ + +-#elif defined (KPSOLARIS) || defined (KPLINUX) ++#elif defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD) + + /* This mutex is used to ensure that + the exchange in the Solaris +@@ -814,7 +814,7 @@ KpInt32_t KpInterlockedExchange (KpInt32_p address, Kp + is only initialized once per process. */ + + #if defined (KP_POSIX_THREADS) +-static pthread_mutex_t exchangeMutex; ++static pthread_mutex_t exchangeMutex = PTHREAD_MUTEX_INITIALIZER; + #else + static mutex_t exchangeMutex; + #endif +@@ -885,7 +885,7 @@ KpInt32_t data; + /* Semaphore functions (Solaris Versions) */ + /*******************************************************/ + +-#if defined (KPSOLARIS) || defined (KPLINUX) ++#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD) + + /*-------------------------------------------------------------------- + * FUNCTION diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_h b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_h new file mode 100644 index 00000000000..21d689ab7c9 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_h @@ -0,0 +1,32 @@ +$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/sync.h.orig Thu Jul 5 03:44:31 2007 ++++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/sync.h Sun Jul 29 22:48:37 2007 +@@ -57,7 +57,7 @@ + /* Solaris Includes */ + /********************/ + +- #if defined (KPSOLARIS) || defined (KPLINUX) ++ #if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD) + #if defined (KP_POSIX_THREADS) + #include + #else +@@ -121,7 +121,7 @@ + * files although the documentation says it should be. + */ + +- #if defined (KPSOLARIS) || defined (KPLINUX) ++ #if defined (KPSOLARIS) || defined (KPLINUX) || defined(__NetBSD__) + + typedef union semun_u { + int val; +@@ -129,6 +129,10 @@ + ushort *array; + } semun_t; + ++ #endif ++ ++ #if defined(KPBSD) && !defined(__NetBSD__) ++ typedef union semun semun_t; + #endif + + #endif diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_thread_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_thread_c new file mode 100644 index 00000000000..6a76a21839d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_thread_c @@ -0,0 +1,34 @@ +$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_thread_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/thread.c.orig Thu Jul 5 03:44:32 2007 ++++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/thread.c Sun Jul 29 22:48:37 2007 +@@ -30,6 +30,11 @@ + #include + #include + #endif ++#if defined (KPBSD) ++#include ++#include ++#include ++#endif + + /*************************************************************************** + * Windows (32 bit) Thread Creation, Termination and Manipulation functions +@@ -652,7 +657,7 @@ KpGetCurrentThread (void) + /******************************************************************* + * LINUX Thread Creation, Termination and Manipulation functions + *******************************************************************/ +-#if defined (KPLINUX) ++#if defined (KPLINUX) || defined (KPBSD) + + /****************************************************************** + * KpThreadCreate (LINUX Version) +@@ -690,8 +695,7 @@ int retVal; + + if (NULL == flags) { } + +- pthread_attr_init(&attr); +- retVal = pthread_create (&thread, &attr, ++ retVal = pthread_create (&thread, NULL, + startFunc, arg); + if (0 != retVal) { + return (0); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_ukcpmgr_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_ukcpmgr_c new file mode 100644 index 00000000000..5f14cc863fa --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_ukcpmgr_c @@ -0,0 +1,24 @@ +$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_ukcpmgr_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/ukcpmgr.c.orig Thu Jul 5 03:44:32 2007 ++++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/ukcpmgr.c Sun Jul 29 22:48:37 2007 +@@ -77,7 +77,9 @@ KpInt32_t nProcessors; + if (theIGPtr) {} + + /* setup directory for CPxx files */ +-#if defined (KPSGI) || defined(KPSGIALL) ++#if defined (KPBSD) ++ strcpy (iGP->KCPDataDir, "/tmp/"); ++#elif defined (KPSGI) || defined(KPSGIALL) + strcpy (iGP->KCPDataDir, "/var/cms/cmscp/"); + #elif defined (KPSUN) && defined (SOLARIS_CMM) + strcpy (iGP->KCPDataDir, "/tmp/"); +@@ -116,6 +118,9 @@ KpInt32_t nProcessors; + if (thr_main() == -1) { + nProcessors = 1; /* no Java threading, can't use extra processors */ + } ++#endif ++#if defined(KPBSD) ++ nProcessors = 1; /* XXXBSD: sysctl(hw.ncpu)? */ + #endif + iGP->numProcessorsAvailable = iGP->numProcessors = nProcessors; + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_Capture_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_Capture_c new file mode 100644 index 00000000000..e474a117538 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_Capture_c @@ -0,0 +1,114 @@ +$OpenBSD: patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_Capture_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_BsdOS_Capture.c.orig Sun Jul 29 23:11:09 2007 ++++ j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_BsdOS_Capture.c Sun Jul 29 23:19:53 2007 +@@ -37,11 +37,13 @@ + #include + #include + #include +-#include +-#include + +-// for I_FLUSH +-#include ++#ifdef __FreeBSD__ ++#include ++#endif ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++#include ++#endif + + #include + +@@ -55,15 +57,15 @@ + #endif + + +-#define HAE_LINUX_NUM_CAPTURE_BUFFERS 1 // number of capture buffers ++#define HAE_BSD_NUM_CAPTURE_BUFFERS 1 // number of capture buffers + +-#define HAE_LINUX_FRAMES_PER_BUFFER 4096 // how many frames do we read (capture) at a time? ++#define HAE_BSD_FRAMES_PER_BUFFER 4096 // how many frames do we read (capture) at a time? + +-#define HAE_LINUX_SOUND_CAPTURE_PERIOD 10 // sleep time in milliseconds, between position checks ++#define HAE_BSD_SOUND_CAPTURE_PERIOD 10 // sleep time in milliseconds, between position checks + // $$kk: 10.13.98: need to implement position checks! + +-#define HAE_LINUX_DEFAULT_BUFFERSIZE_IN_MS 150 // default size of buffer in ms +-#define HAE_LINUX_MIN_BUFFERSIZE_IN_MS 50 // minimum size of buffer in ms (can't go beneath ++#define HAE_BSD_DEFAULT_BUFFERSIZE_IN_MS 150 // default size of buffer in ms ++#define HAE_BSD_MIN_BUFFERSIZE_IN_MS 50 // minimum size of buffer in ms (can't go beneath + // hardware buffersize, however) + + +@@ -83,9 +85,9 @@ static short int g_soundDeviceIndex = 0; // if non zer + + static UINT32 g_encoding; // audio encoding + +-// number of frames to read; right now this is fixed as HAE_LINUX_FRAMES_PER_BUFFER ++// number of frames to read; right now this is fixed as HAE_BSD_FRAMES_PER_BUFFER + // $$kk: 10.13.98: need to figure out how to configure this +-static INT32 g_audioFramesToRead = HAE_LINUX_FRAMES_PER_BUFFER; ++static INT32 g_audioFramesToRead = HAE_BSD_FRAMES_PER_BUFFER; + + static HAE_CaptureDone g_captureDoneProc; // capture callback + +@@ -202,11 +204,11 @@ void PV_AudioWaveInFrameThread(void* context) { + if (g_flushMode == FLUSHMODE_FLUSHED) { + break; + } +- HAE_SleepFrameThread(context, HAE_LINUX_SOUND_CAPTURE_PERIOD); ++ HAE_SleepFrameThread(context, HAE_BSD_SOUND_CAPTURE_PERIOD); + } + } else if (!g_captureShutdown) { + /* what to do here ? */ +- HAE_SleepFrameThread(context, HAE_LINUX_SOUND_CAPTURE_PERIOD); ++ HAE_SleepFrameThread(context, HAE_BSD_SOUND_CAPTURE_PERIOD); + } + } + if (g_flushMode == FLUSHMODE_FLUSHED) { +@@ -269,9 +271,9 @@ int HAE_AquireAudioCapture(void *context, UINT32 encod + + // $$jb: 05.19.99: Setting the buffer size + // $$kk: 08.06.99: i got rid of the fixed minimum value for buffersize +- // minFramesPerBuffer = sampleRate * HAE_LINUX_MIN_BUFFERSIZE_IN_MS / 1000; ++ // minFramesPerBuffer = sampleRate * HAE_BSD_MIN_BUFFERSIZE_IN_MS / 1000; + if ( audioFramesPerBuffer == 0 ) { +- audioFramesPerBuffer = sampleRate * HAE_LINUX_DEFAULT_BUFFERSIZE_IN_MS / 1000; ++ audioFramesPerBuffer = sampleRate * HAE_BSD_DEFAULT_BUFFERSIZE_IN_MS / 1000; + } + + +@@ -383,7 +385,7 @@ int HAE_StartAudioCapture(HAE_CaptureDone done, void * + + // allocate the capture buffer + // $$jb: 05.19.99: This is set in HAE_AquireAudioCapture +- //g_audioFramesToRead = HAE_LINUX_FRAMES_PER_BUFFER; // our read buffer will hold this many frames of sampled audio data ++ //g_audioFramesToRead = HAE_BSD_FRAMES_PER_BUFFER; // our read buffer will hold this many frames of sampled audio data + + // we're going to build this many buffers at a time + if (g_bitSize == 8) { +@@ -555,7 +557,14 @@ void HAE_GetCaptureDeviceName(INT32 deviceID, char *cN + { + char *data; + static char *names[] = +- { "Bsd,dev/dsp,multi threaded", ++ { ++#ifdef __FreeBSD__ ++ "FreeBSD,dev/dsp,multi threaded", ++#elif __NetBSD__ ++ "NetBSD,dev/dsp,multi threaded", ++#elif __OpenBSD__ ++ "OpenBSD,dev/dsp,multi threaded", ++#endif + }; + if (cName && cNameLength) + { +@@ -587,7 +596,7 @@ UINT32 HAE_GetCaptureBufferSizeInFrames() + // return the number of buffers used. + int HAE_GetCaptureBufferCount() + { +- return HAE_LINUX_NUM_CAPTURE_BUFFERS; ++ return HAE_BSD_NUM_CAPTURE_BUFFERS; + } + + // return the number of samples captured at the device diff --git a/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_c b/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_c new file mode 100644 index 00000000000..89748eb2d11 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_c @@ -0,0 +1,203 @@ +$OpenBSD: patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_BsdOS.c.orig Sun Jul 29 23:03:54 2007 ++++ j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_BsdOS.c Sun Jul 29 23:09:59 2007 +@@ -37,9 +37,15 @@ + #include + #include + #include +-#include +-#include + ++#ifdef __FreeBSD__ ++#include ++#include ++#endif ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++#include ++#endif ++ + // $$kk: 08.12.98 merge + // $$kk: 04.28.98: we *need* to use string.h, NOT strings.h; + // the latter is not available on earlier versions of solaris +@@ -59,9 +65,20 @@ + #define FALSE 0 + #endif + ++#if defined(__FreeBSD__) && (__FreeBSD_version >= 700013) ++static inline void * ++memalign(size_t alignment, size_t size) ++{ ++ void *ret; ++ return posix_memalign(&ret, alignment, size) ? NULL : ret; ++} ++#else ++#define memalign(a, b) valloc(b) ++#endif ++ + // How many audio frames to generate at one time +-#define HAE_LINUX_FRAMES_PER_BLOCK 8 +-#define HAE_LINUX_SOUND_PERIOD 10 // sleep time in milliseconds, between position checks ++#define HAE_BSD_FRAMES_PER_BLOCK 8 ++#define HAE_BSD_SOUND_PERIOD 10 // sleep time in milliseconds, between position checks + + static void *g_audioBufferBlock; + static long g_audioByteBufferSize; // size of audio buffers in bytes +@@ -76,9 +93,9 @@ static long g_audioByteBufferSize; // size of au + + /* $$fb 2002-03-13: facilitate porting by defining the 16-bit format here */ + #if X_WORD_ORDER == TRUE +-#define LINUX_FORMAT16 AFMT_S16_LE ++#define BSD_FORMAT16 AFMT_S16_LE + #else +-#define LINUX_FORMAT16 AFMT_S16_BE ++#define BSD_FORMAT16 AFMT_S16_BE + #endif + + +@@ -151,7 +168,7 @@ int HAE_Setup(void) + AFMT_MU_LAW, + AFMT_A_LAW, + AFMT_S8, +- LINUX_FORMAT16, ++ BSD_FORMAT16, + }; + // In the same order of Formats[] array. + int JSEncodings[] = { ULAW, ALAW, PCM, PCM }; +@@ -177,7 +194,7 @@ int HAE_Setup(void) + + //$$fb we do not support unsigned 16 bit + //g_supports16 = (formats & (AFMT_U16_LE | AFMT_S16_LE)) != 0; +- g_supports16 = (formats & LINUX_FORMAT16) != 0; ++ g_supports16 = (formats & BSD_FORMAT16) != 0; + g_convertUnsigned = (formats & AFMT_S8) != 0; + + /* Read channels. */ +@@ -570,7 +587,7 @@ void PV_AudioWaveOutFrameThread(void* context) + } + + // $$ay - sample count is in bytes for bsd and not in samples +- lastPos = audio_info.bytes - ((g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK * 2)); ++ lastPos = audio_info.bytes - ((g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK * 2)); + + if (g_audioBufferBlock) { + while ((g_activeDoubleBuffer) && (g_shutDownDoubleBuffer == FALSE)) { +@@ -580,9 +597,9 @@ void PV_AudioWaveOutFrameThread(void* context) + g_checkpointMicros = XMicroseconds(); + g_checkpointSyncCount = GM_GetSyncTimeStamp(); + +- // Generate HAE_LINUX_FRAMES_PER_BLOCK frames of audio ++ // Generate HAE_BSD_FRAMES_PER_BLOCK frames of audio + pFillBuffer = (char *)g_audioBufferBlock; +- for (count = 0; count < HAE_LINUX_FRAMES_PER_BLOCK; count++) { ++ for (count = 0; count < HAE_BSD_FRAMES_PER_BLOCK; count++) { + // Generate one frame audio + HAE_BuildMixerSlice(context, pFillBuffer, + g_audioByteBufferSize, +@@ -597,7 +614,7 @@ void PV_AudioWaveOutFrameThread(void* context) + // for some solaris drivers, we must supply unsigned data when rendering 8 bit data + if (g_convertUnsigned && (g_bitSize == 8)) { + pFillBuffer = (char *)g_audioBufferBlock; +- for (i = 0; i < (g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK); i++) { ++ for (i = 0; i < (g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK); i++) { + *pFillBuffer = (*pFillBuffer >= 0) ? (0x80 | *pFillBuffer) : (0x7F & *pFillBuffer); + pFillBuffer++; + } +@@ -606,7 +623,7 @@ void PV_AudioWaveOutFrameThread(void* context) + // $$jb: Changing the write() loop to handle cases when the + // device is unavailable, or we can't write our entire buffer + bytesWritten = 0; +- bytesToWrite = (g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK); ++ bytesToWrite = (g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK); + + while ( bytesToWrite > 0 ) { + #ifdef TODO +@@ -641,7 +658,7 @@ void PV_AudioWaveOutFrameThread(void* context) + // be written to. Make sure we're not shutting down and + // sleep a bit so that we don't completely hog the CPU + if( g_shutDownDoubleBuffer == FALSE ) { +- HAE_SleepFrameThread(context, HAE_LINUX_SOUND_PERIOD); ++ HAE_SleepFrameThread(context, HAE_BSD_SOUND_PERIOD); + } else { + break; + } +@@ -667,7 +684,7 @@ void PV_AudioWaveOutFrameThread(void* context) + #endif + + while ((currentPos < lastPos) && (g_shutDownDoubleBuffer == FALSE)) { +- HAE_SleepFrameThread(context, HAE_LINUX_SOUND_PERIOD); // in ms ++ HAE_SleepFrameThread(context, HAE_BSD_SOUND_PERIOD); // in ms + + ioctl(g_waveDevice, SNDCTL_DSP_GETOPTR, &audio_info); + currentPos = audio_info.bytes; +@@ -676,7 +693,7 @@ void PV_AudioWaveOutFrameThread(void* context) + // of this timing loop on sunAudioHeader.play.error != 0. + } + +- lastPos += (g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK); ++ lastPos += (g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK); + // ... and reschedule ourselves. + } + TRACE0("g_activeDoubleBuffer = FALSE;\n"); +@@ -791,8 +808,8 @@ int HAE_AquireAudioCard(void *context, UINT32 sampleRa + #endif + + /* we're going to build this many buffers at a time */ +- g_synthFramesPerBlock = HAE_LINUX_FRAMES_PER_BLOCK; +- g_audioPeriodSleepTime = HAE_LINUX_SOUND_PERIOD; ++ g_synthFramesPerBlock = HAE_BSD_FRAMES_PER_BLOCK; ++ g_audioPeriodSleepTime = HAE_BSD_SOUND_PERIOD; + g_bitSize = bits; + g_channels = channels; + if (bits == 8) { +@@ -804,7 +821,7 @@ int HAE_AquireAudioCard(void *context, UINT32 sampleRa + + flag = 1; + /* allocate buffer blocks */ +- g_audioBufferBlock = HAE_Allocate(g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK); ++ g_audioBufferBlock = HAE_Allocate(g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK); + + if (g_audioBufferBlock) { + +@@ -827,7 +844,7 @@ int HAE_AquireAudioCard(void *context, UINT32 sampleRa + break; + + case 16: +- format = LINUX_FORMAT16; ++ format = BSD_FORMAT16; + break; + + //default: +@@ -882,7 +899,7 @@ int HAE_AquireAudioCard(void *context, UINT32 sampleRa + + /* [sbb] I don't think this should be any value other than zero, + * since we just opened the device... */ +- /* lastPos = sunAudioHeader.play.samples - ((g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK * 2) / sampleFrameSize); */ ++ /* lastPos = sunAudioHeader.play.samples - ((g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK * 2) / sampleFrameSize); */ + lastPos = 0; + #endif + } +@@ -924,7 +941,7 @@ int HAE_ReleaseAudioCard(void *context) + TRACE1("Waiting %d...\r", ctr); + // the following call MUST allow the FrameThread to continue + // (i.e. to exit the PV_AudioWaveOutFrameThread function) +- HAE_SleepFrameThread(context, HAE_LINUX_SOUND_PERIOD); ++ HAE_SleepFrameThread(context, HAE_BSD_SOUND_PERIOD); + } + if (!ctr) { + ERROR0("Timed out waiting for frame thread to die!\n"); +@@ -1009,7 +1026,14 @@ void HAE_GetDeviceName(INT32 deviceID, char *cName, UI + { + char *data; + static char *names[] = +- { "Bsd,/dev/dsp", ++ { ++#ifdef __FreeBSD__ ++ "FreeBSD,dev/dsp,multi threaded", ++#elif __NetBSD__ ++ "NetBSD,dev/dsp,multi threaded", ++#elif __OpenBSD__ ++ "OpenBSD,dev/dsp,multi threaded", ++#endif + }; + if (cName && cNameLength) + { diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_back_commonRef_c b/devel/jdk/1.7/patches/patch-j2se_src_share_back_commonRef_c new file mode 100644 index 00000000000..df619178bfb --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_back_commonRef_c @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_src_share_back_commonRef_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/back/commonRef.c.orig Wed Aug 1 13:32:05 2007 ++++ j2se/src/share/back/commonRef.c Wed Aug 1 13:36:00 2007 +@@ -23,6 +23,10 @@ + * + */ + ++#if defined(_ALLBSD_SOURCE) ++#include /* for uintptr_t */ ++#endif ++ + #include "util.h" + #include "commonRef.h" + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity_java new file mode 100644 index 00000000000..0336dd9d5c1 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity_java @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.orig Thu Jul 5 04:56:37 2007 ++++ j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Fri Jul 27 18:24:17 2007 +@@ -478,6 +478,10 @@ class Metacity implements SynthConstants { + String[] dirs = new String[] { + userHome + sep + ".themes", + System.getProperty("swing.metacitythemedir"), ++ "/usr/X11R6/share/themes", ++ "/usr/X11R6/share/gnome/themes", ++ "/usr/local/share/themes", ++ "/usr/local/share/gnome/themes", + "/usr/share/themes", + "/usr/gnome/share/themes", // Debian/Redhat/Solaris + "/opt/gnome2/share/themes" // SuSE diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_tools_javah_Util_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_tools_javah_Util_java new file mode 100644 index 00000000000..6ea381649ff --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_tools_javah_Util_java @@ -0,0 +1,16 @@ +$OpenBSD: patch-j2se_src_share_classes_com_sun_tools_javah_Util_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/com/sun/tools/javah/Util.java.orig Thu Jul 5 04:59:48 2007 ++++ j2se/src/share/classes/com/sun/tools/javah/Util.java Fri Jul 27 18:24:17 2007 +@@ -180,6 +180,12 @@ public class Util { + os = "win32"; + } else if (os.indexOf("Linux") >= 0) { + os = "Linux"; ++ } else if (os.indexOf("FreeBSD") >= 0) { ++ os = "FreeBSD"; ++ } else if (os.indexOf("NetBSD") >= 0) { ++ os = "NetBSD"; ++ } else if (os.indexOf("OpenBSD") >= 0) { ++ os = "OpenBSD"; + } + String arch = System.getProperty("os.arch"); + String resname = "com.sun.tools.javah.resources." + os + "_" + arch; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_awt_GraphicsEnvironment_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_awt_GraphicsEnvironment_java new file mode 100644 index 00000000000..89650aee907 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_awt_GraphicsEnvironment_java @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_share_classes_java_awt_GraphicsEnvironment_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/java/awt/GraphicsEnvironment.java.orig Thu Jul 5 05:00:30 2007 ++++ j2se/src/share/classes/java/awt/GraphicsEnvironment.java Fri Jul 27 18:24:24 2007 +@@ -149,7 +149,7 @@ public abstract class GraphicsEnvironment { + } else { + String osName = System.getProperty("os.name"); + headless = defaultHeadless = +- Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName)) && ++ Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName) || "FreeBSD".equals(osName) || "NetBSD".equals(osName) || "OpenBSD".equals(osName)) && + (System.getenv("DISPLAY") == null)); + } + } else if (nm.equals("true")) { diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_lang_ClassLoader_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_lang_ClassLoader_java new file mode 100644 index 00000000000..17a9349a768 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_lang_ClassLoader_java @@ -0,0 +1,67 @@ +$OpenBSD: patch-j2se_src_share_classes_java_lang_ClassLoader_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/java/lang/ClassLoader.java.orig Thu Jul 5 05:00:40 2007 ++++ j2se/src/share/classes/java/lang/ClassLoader.java Thu Aug 2 09:39:29 2007 +@@ -27,6 +27,7 @@ package java.lang; + import java.io.InputStream; + import java.io.IOException; + import java.io.File; ++import java.io.FilenameFilter; + import java.lang.reflect.Constructor; + import java.lang.reflect.InvocationTargetException; + import java.net.MalformedURLException; +@@ -47,6 +48,7 @@ import java.util.Set; + import java.util.Stack; + import java.util.Map; + import java.util.Vector; ++import java.util.Arrays; + import sun.misc.ClassFileTransformer; + import sun.misc.CompoundEnumeration; + import sun.misc.Resource; +@@ -1701,18 +1703,43 @@ public abstract class ClassLoader { + } + + private static boolean loadLibrary0(Class fromClass, final File file) { +- Boolean exists = (Boolean) ++ File libfile = (File) + AccessController.doPrivileged(new PrivilegedAction() { ++ class LibraryFileFilter implements FilenameFilter { ++ String lib_name; ++ LibraryFileFilter(String lib_name) { this.lib_name = lib_name; } ++ public boolean accept(File dir, String name) { ++ if (name.startsWith(lib_name)) { ++ return name.substring(lib_name.length()).matches("\056[0-9]+\056[0-9]+$"); ++ } ++ return false; ++ } ++ } ++ + public Object run() { +- return new Boolean(file.exists()); ++ if (file.exists()) ++ return file; ++ // if file is unversioned, check for a versioned one in same dir ++ if (file.getName().endsWith(".so")) { ++ File dir = file.getParentFile(); ++ if (dir != null) { ++ String liblist[] = dir.list(new LibraryFileFilter(file.getName())); ++ if (liblist != null && liblist.length > 0) { ++ // return the highest versioned lib ++ Arrays.sort(liblist); ++ return new File(dir, liblist[liblist.length - 1]); ++ } ++ } ++ } ++ return null; + } + }); +- if (!exists.booleanValue()) { ++ if (libfile == null) { + return false; + } + String name; + try { +- name = file.getCanonicalPath(); ++ name = libfile.getCanonicalPath(); + } catch (IOException e) { + return false; + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_util_TimeZone_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_util_TimeZone_java new file mode 100644 index 00000000000..5fada3739f6 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_util_TimeZone_java @@ -0,0 +1,20 @@ +$OpenBSD: patch-j2se_src_share_classes_java_util_TimeZone_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/java/util/TimeZone.java.orig Thu Jul 5 05:00:58 2007 ++++ j2se/src/share/classes/java/util/TimeZone.java Fri Jul 27 18:24:24 2007 +@@ -780,15 +780,13 @@ abstract public class TimeZone implements Serializable + } + int gmtOffset = (hours * 60 + num) * 60 * 1000; + ++ zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset); + if (gmtOffset == 0) { +- zi = ZoneInfoFile.getZoneInfo(GMT_ID); + if (negative) { + zi.setID("GMT-00:00"); + } else { + zi.setID("GMT+00:00"); + } +- } else { +- zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset); + } + return zi; + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_awt_FontConfiguration_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_awt_FontConfiguration_java new file mode 100644 index 00000000000..5fc6c70ce83 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_awt_FontConfiguration_java @@ -0,0 +1,21 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_awt_FontConfiguration_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/awt/FontConfiguration.java.orig Thu Jul 5 05:01:54 2007 ++++ j2se/src/share/classes/sun/awt/FontConfiguration.java Fri Jul 27 18:24:24 2007 +@@ -1073,7 +1073,7 @@ public abstract class FontConfiguration { + */ + HashMap existsMap; + public boolean needToSearchForFile(String fileName) { +- if (!environment.isLinux) { ++ if (!environment.isLinuxOrBSD) { + return false; + } else if (existsMap == null) { + existsMap = new HashMap(); +@@ -1309,7 +1309,7 @@ public abstract class FontConfiguration { + + " entry is missing!!!"); +- if (!osName.contains("Linux")) { ++ if (!osName.contains("Linux") && !osName.contains("BSD")) { + errors++; + } + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_font_FontManager_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_font_FontManager_java new file mode 100644 index 00000000000..6d5c366a5d8 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_font_FontManager_java @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_font_FontManager_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/font/FontManager.java.orig Fri Aug 10 18:41:20 2007 ++++ j2se/src/share/classes/sun/font/FontManager.java Fri Aug 10 18:41:58 2007 +@@ -3696,7 +3696,7 @@ public final class FontManager { + boolean.class, int.class}; + + try { +- if (SunGraphicsEnvironment.isOpenJDK()) { ++ if (true || SunGraphicsEnvironment.isOpenJDK()) { + scalerClass = Class.forName("sun.font.FreetypeFontScaler"); + } else { + scalerClass = Class.forName("sun.font.T2KFontScaler"); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_ByteToCharKOI8_U_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_ByteToCharKOI8_U_java new file mode 100644 index 00000000000..94c3d13b51f --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_ByteToCharKOI8_U_java @@ -0,0 +1,65 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_io_ByteToCharKOI8_U_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/io/ByteToCharKOI8_U.java.orig Mon Jul 30 19:21:00 2007 ++++ j2se/src/share/classes/sun/io/ByteToCharKOI8_U.java Mon Jul 30 19:20:06 2007 +@@ -0,0 +1,61 @@ ++/* ++ * @(#)ByteToCharKOI8_U.java 1.0 01/05/01 ++ * ++ * ++ */ ++ ++package sun.io; ++ ++/** ++ * A table to convert KOI8_U to Unicode ++ * ++ * @author Andriy Rysin ++ * @version >= JDK1.1.6 ++ */ ++ ++public class ByteToCharKOI8_U extends ByteToCharSingleByte { ++ ++ public String getCharacterEncoding() { ++ return "KOI8_U"; ++ } ++ ++ public ByteToCharKOI8_U() { ++ super.byteToCharTable = byteToCharTable; ++ } ++ ++ private final static String byteToCharTable = ++ ++ "\u2500\u2502\u250C\u2510\u2514\u2518\u251C\u2524" + // 0x80 - 0x87 ++ "\u252C\u2534\u253C\u2580\u2584\u2588\u258C\u2590" + // 0x88 - 0x8F ++ "\u2591\u2592\u2593\u2320\u25A0\u2219\u221A\u2248" + // 0x90 - 0x97 ++ "\u2264\u2265\u00A0\u2321\u00B0\u00B2\u00B7\u00F7" + // 0x98 - 0x9F ++ "\u2550\u2551\u2552\u0451\u0454\u2554\u0456\u0457" + // 0xA0 - 0xA7 ++ "\u2557\u2558\u2559\u255A\u255B\u0491\u045E\u255E" + // 0xA8 - 0xAF ++ "\u255F\u2560\u2561\u0401\u0404\u2563\u0406\u0407" + // 0xB0 - 0xB7 ++ "\u2566\u2567\u2568\u2569\u256A\u0490\u040E\u00A9" + // 0xB8 - 0xBF ++ "\u044E\u0430\u0431\u0446\u0434\u0435\u0444\u0433" + // 0xC0 - 0xC7 ++ "\u0445\u0438\u0439\u043A\u043B\u043C\u043D\u043E" + // 0xC8 - 0xCF ++ "\u043F\u044F\u0440\u0441\u0442\u0443\u0436\u0432" + // 0xD0 - 0xD7 ++ "\u044C\u044B\u0437\u0448\u044D\u0449\u0447\u044A" + // 0xD8 - 0xDF ++ "\u042E\u0410\u0411\u0426\u0414\u0415\u0424\u0413" + // 0xE0 - 0xE7 ++ "\u0425\u0418\u0419\u041A\u041B\u041C\u041D\u041E" + // 0xE8 - 0xEF ++ "\u041F\u042F\u0420\u0421\u0422\u0423\u0416\u0412" + // 0xF0 - 0xF7 ++ "\u042C\u042B\u0417\u0428\u042D\u0429\u0427\u042A" + // 0xF8 - 0xFF ++ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" + // 0x00 - 0x07 ++ "\b\t\n\u000B\f\r\u000E\u000F" + // 0x08 - 0x0F ++ "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" + // 0x10 - 0x17 ++ "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" + // 0x18 - 0x1F ++ "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" + // 0x20 - 0x27 ++ "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" + // 0x28 - 0x2F ++ "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" + // 0x30 - 0x37 ++ "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" + // 0x38 - 0x3F ++ "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" + // 0x40 - 0x47 ++ "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" + // 0x48 - 0x4F ++ "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" + // 0x50 - 0x57 ++ "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" + // 0x58 - 0x5F ++ "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" + // 0x60 - 0x67 ++ "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" + // 0x68 - 0x6F ++ "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" + // 0x70 - 0x77 ++ "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F"; // 0x78 - 0x7F ++ ++} diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharToByteKOI8_U_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharToByteKOI8_U_java new file mode 100644 index 00000000000..4e0690188a9 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharToByteKOI8_U_java @@ -0,0 +1,240 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_io_CharToByteKOI8_U_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/io/CharToByteKOI8_U.java.orig Mon Jul 30 19:24:16 2007 ++++ j2se/src/share/classes/sun/io/CharToByteKOI8_U.java Mon Jul 30 19:23:56 2007 +@@ -0,0 +1,236 @@ ++/* ++ * @(#)CharToByteKOI8_U.java 1.0 01/05/01 ++ * ++ * ++ */ ++ ++package sun.io; ++ ++/** ++ * Tables and data to convert Unicode to KOI8_U ++ * ++ * @author Andriy Rysin ++ * @version >= JDK1.1.6 ++ */ ++ ++public class CharToByteKOI8_U extends CharToByteSingleByte { ++ ++ public String getCharacterEncoding() { ++ return "KOI8_U"; ++ } ++ ++ public CharToByteKOI8_U() { ++ super.mask1 = 0xFF00; ++ super.mask2 = 0x00FF; ++ super.shift = 8; ++ super.index1 = index1; ++ super.index2 = index2; ++ } ++ ++ private final static String index2 = ++ ++ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" + ++ "\b\t\n\u000B\f\r\u000E\u000F" + ++ "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" + ++ "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" + ++ "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" + ++ "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" + ++ "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" + ++ "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" + ++ "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" + ++ "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" + ++ "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" + ++ "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" + ++ "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" + ++ "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" + ++ "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" + ++ "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u009A\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u00BF\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u009C\u0000\u009D\u0000\u0000\u0000\u0000\u009E" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u009F" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u00B3\u0000\u0000\u00B4\u0000\u00B6\u00B7\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u00BE\u0000\u00E1" + ++ "\u00E2\u00F7\u00E7\u00E4\u00E5\u00F6\u00FA\u00E9" + ++ "\u00EA\u00EB\u00EC\u00ED\u00EE\u00EF\u00F0\u00F2" + ++ "\u00F3\u00F4\u00F5\u00E6\u00E8\u00E3\u00FE\u00FB" + ++ "\u00FD\u00FF\u00F9\u00F8\u00FC\u00E0\u00F1\u00C1" + ++ "\u00C2\u00D7\u00C7\u00C4\u00C5\u00D6\u00DA\u00C9" + ++ "\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D0\u00D2" + ++ "\u00D3\u00D4\u00D5\u00C6\u00C8\u00C3\u00DE\u00DB" + ++ "\u00DD\u00DF\u00D9\u00D8\u00DC\u00C0\u00D1\u0000" + ++ "\u00A3\u0000\u0000\u00A4\u0000\u00A6\u00A7\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u00AE\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00BD" + ++ "\u00AD\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0095" + ++ "\u0096\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0097\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0098\u0099\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0093\u009B" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0080\u0000" + ++ "\u0081\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0082\u0000\u0000\u0000\u0083\u0000" + ++ "\u0000\u0000\u0084\u0000\u0000\u0000\u0085\u0000" + ++ "\u0000\u0000\u0086\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0087\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0088\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0089\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u008A\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u00A0\u00A1" + ++ "\u00A2\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA" + ++ "\u00AB\u00AC\u00AD\u00AE\u00AF\u00B0\u00B1\u00B2" + ++ "\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB" + ++ "\u00BC\u00BD\u00BE\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u008B\u0000" + ++ "\u0000\u0000\u008C\u0000\u0000\u0000\u008D\u0000" + ++ "\u0000\u0000\u008E\u0000\u0000\u0000\u008F\u0090" + ++ "\u0091\u0092\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0094\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + ++ "\u0000\u0000\u0000\u0000\u0000\u0000"; ++ ++ private final static short index1[] = { ++ 0, 248, 248, 248, 503, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 734, 958, 248, 1214, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, ++ }; ++ ++} diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharacterEncoding_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharacterEncoding_java new file mode 100644 index 00000000000..6526535ca7d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharacterEncoding_java @@ -0,0 +1,26 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_io_CharacterEncoding_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/io/CharacterEncoding.java.orig Thu Jul 5 05:02:04 2007 ++++ j2se/src/share/classes/sun/io/CharacterEncoding.java Fri Jul 27 18:24:24 2007 +@@ -92,6 +92,7 @@ public class CharacterEncoding { + aliasTable.put("gb18030", "GB18030"); + aliasTable.put("gbk", "GBK"); + aliasTable.put("koi8-r", "KOI8_R"); ++ aliasTable.put("koi8-u", "KOI8_U"); + aliasTable.put("tis620.2533", "TIS620"); + + // Windows encodings +@@ -785,8 +786,13 @@ public class CharacterEncoding { + + // Russian KOI8-R + aliasTable.put("koi8-r", "KOI8_R"); +- aliasTable.put("koi8", "KOI8_R"); + aliasTable.put("cskoi8r", "KOI8_R"); ++ ++ // Ukrainian and Bielorussian KOI8-U (includes KOI8-R) ++ aliasTable.put("koi8-u", "KOI8_U"); ++ aliasTable.put("koi8", "KOI8_U"); ++ aliasTable.put("koi8u", "KOI8_U"); ++ aliasTable.put("cskoi8u", "KOI8_U"); + + // Simplified Chinese + aliasTable.put("gb2312", "EUC_CN"); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_java2d_SunGraphicsEnvironment_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_java2d_SunGraphicsEnvironment_java new file mode 100644 index 00000000000..f859d152c29 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_java2d_SunGraphicsEnvironment_java @@ -0,0 +1,38 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_java2d_SunGraphicsEnvironment_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/java2d/SunGraphicsEnvironment.java.orig Thu Jul 5 05:02:05 2007 ++++ j2se/src/share/classes/sun/java2d/SunGraphicsEnvironment.java Fri Jul 27 18:31:36 2007 +@@ -77,7 +77,7 @@ import sun.font.NativeFont; + public abstract class SunGraphicsEnvironment extends GraphicsEnvironment + implements FontSupport, DisplayChangedListener { + +- public static boolean isLinux; ++ public static boolean isLinuxOrBSD; + public static boolean isSolaris; + public static boolean isWindows; + public static boolean noType1Font; +@@ -165,7 +165,13 @@ public abstract class SunGraphicsEnvironment extends G + public Object run() { + String osName = System.getProperty("os.name"); + if ("Linux".equals(osName)) { +- isLinux = true; ++ isLinuxOrBSD = true; ++ } else if ("FreeBSD".equals(osName)) { ++ isLinuxOrBSD = true; ++ } else if ("NetBSD".equals(osName)) { ++ isLinuxOrBSD = true; ++ } else if ("OpenBSD".equals(osName)) { ++ isLinuxOrBSD = true; + } else if ("SunOS".equals(osName)) { + isSolaris = true; + } else if ("Windows".equals(osName)) { +@@ -228,8 +234,8 @@ public abstract class SunGraphicsEnvironment extends G + * Pass "true" to registerFonts method as on-screen these + * JRE fonts always go through the T2K rasteriser. + */ +- if (isLinux) { +- /* Linux font configuration uses these fonts */ ++ if (isLinuxOrBSD) { ++ /* Linux/BSD font configuration uses these fonts */ + registerFontDir(jreFontDirName); + } + registerFontsInDir(jreFontDirName, true, Font2D.JRE_RANK, diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_print_PSPrinterJob_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_print_PSPrinterJob_java new file mode 100644 index 00000000000..e03c19a74fc --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_print_PSPrinterJob_java @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_print_PSPrinterJob_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/print/PSPrinterJob.java.orig Thu Jul 5 05:02:24 2007 ++++ j2se/src/share/classes/sun/print/PSPrinterJob.java Fri Jul 27 18:24:34 2007 +@@ -1530,7 +1530,9 @@ public class PSPrinterJob extends RasterPrinterJob { + pFlags |= NOSHEET; + ncomps+=1; + } +- if (System.getProperty("os.name").equals("Linux")) { ++ ++ String osname = System.getProperty("os.name"); ++ if (osname.equals("Linux") || osname.equals("FreeBSD") || osname.equals("NetBSD") || osname.equals("OpenBSD")) { + execCmd = new String[ncomps]; + execCmd[n++] = "/usr/bin/lpr"; + if ((pFlags & PRINTER) != 0) { diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_security_provider_SunEntries_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_security_provider_SunEntries_java new file mode 100644 index 00000000000..5eed966454e --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_security_provider_SunEntries_java @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_security_provider_SunEntries_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/security/provider/SunEntries.java.orig Fri Aug 3 18:37:38 2007 ++++ j2se/src/share/classes/sun/security/provider/SunEntries.java Fri Aug 3 18:37:51 2007 +@@ -252,7 +252,7 @@ final class SunEntries { + // name of the *Security* property + private final static String PROP_RNDSOURCE = "securerandom.source"; + +- final static String URL_DEV_RANDOM = "file:/dev/random"; ++ final static String URL_DEV_RANDOM = "file:/dev/srandom"; + final static String URL_DEV_URANDOM = "file:/dev/urandom"; + + private static final String seedSource; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_tools_jar_Main_java b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_tools_jar_Main_java new file mode 100644 index 00000000000..620503e370f --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_tools_jar_Main_java @@ -0,0 +1,53 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_tools_jar_Main_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/tools/jar/Main.java.orig Thu Jul 5 05:02:47 2007 ++++ j2se/src/share/classes/sun/tools/jar/Main.java Fri Jul 27 18:24:34 2007 +@@ -49,6 +49,7 @@ class Main { + Hashtable filesTable = new Hashtable(); + Vector paths = new Vector(); + Vector v; ++ String cwd; + CRC32 crc32 = new CRC32(); + /* + * cflag: create +@@ -770,6 +771,19 @@ class Main { + * 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; + // Set of all directory entries specified in archive. Dissallows +@@ -817,6 +831,10 @@ class Main { + ZipEntry rc = null; + 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 null; ++ } + if (e.isDirectory()) { + if (f.exists()) { + if (!f.isDirectory()) { +@@ -838,6 +856,10 @@ class Main { + } else { + if (f.getParent() != null) { + File d = new File(f.getParent()); ++ if (!d.getCanonicalPath().startsWith(cwd)) { ++ output(formatMsg("out.ignore.entry", name)); ++ return null; ++ } + if (!d.exists() && !d.mkdirs() || !d.isDirectory()) { + throw new IOException(formatMsg( + "error.create.dir", d.getPath())); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_tools_jar_resources_jar_properties b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_tools_jar_resources_jar_properties new file mode 100644 index 00000000000..875ed4b0af7 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_tools_jar_resources_jar_properties @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_share_classes_sun_tools_jar_resources_jar_properties,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/classes/sun/tools/jar/resources/jar.properties.orig Thu Jul 5 05:02:46 2007 ++++ j2se/src/share/classes/sun/tools/jar/resources/jar.properties Fri Jul 27 18:24:34 2007 +@@ -44,6 +44,8 @@ error.create.dir=\ + {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/devel/jdk/1.7/patches/patch-j2se_src_share_hpi_include_hpi_impl_h b/devel/jdk/1.7/patches/patch-j2se_src_share_hpi_include_hpi_impl_h new file mode 100644 index 00000000000..f8459659674 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_hpi_include_hpi_impl_h @@ -0,0 +1,25 @@ +$OpenBSD: patch-j2se_src_share_hpi_include_hpi_impl_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/hpi/include/hpi_impl.h.orig Thu Jul 5 05:02:58 2007 ++++ j2se/src/share/hpi/include/hpi_impl.h Fri Jul 27 18:24:34 2007 +@@ -138,21 +138,12 @@ int sysConnect(int fd, struct sockaddr *him, int len); + int sysBind(int fd, struct sockaddr *him, int len); + int sysAccept(int fd, struct sockaddr *him, int *len); + int sysGetSockName(int fd, struct sockaddr *him, int *len); +-#ifdef _LP64 + ssize_t sysSendTo(int fd, char *buf, int len, int flags, struct sockaddr *to, + int tolen); + ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags, + struct sockaddr *from, int *fromlen); + ssize_t sysRecv(int fd, char *buf, int nBytes, int flags); + ssize_t sysSend(int fd, char *buf, int nBytes, int flags); +-#else +-int sysSendTo(int fd, char *buf, int len, int flags, struct sockaddr *to, +- int tolen); +-int sysRecvFrom(int fd, char *buf, int nbytes, int flags, +- struct sockaddr *from, int *fromlen); +-int sysRecv(int fd, char *buf, int nBytes, int flags); +-int sysSend(int fd, char *buf, int nBytes, int flags); +-#endif + int sysListen(int fd, int count); + int sysTimeout(int fd, long timeout); + int sysGetHostName(char* name, int namelen); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_com_sun_java_util_jar_pack_defines_h b/devel/jdk/1.7/patches/patch-j2se_src_share_native_com_sun_java_util_jar_pack_defines_h new file mode 100644 index 00000000000..17e2a3d9468 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_com_sun_java_util_jar_pack_defines_h @@ -0,0 +1,29 @@ +$OpenBSD: patch-j2se_src_share_native_com_sun_java_util_jar_pack_defines_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/com/sun/java/util/jar/pack/defines.h.orig Thu Jul 5 05:02:59 2007 ++++ j2se/src/share/native/com/sun/java/util/jar/pack/defines.h Fri Jul 27 18:24:34 2007 +@@ -32,6 +32,10 @@ + #include + #endif + ++#ifndef NO_ZLIB ++# include ++#endif ++ + #ifndef FULL + #define FULL 1 /* Adds <500 bytes to the zipped final product. */ + #endif +@@ -87,11 +91,14 @@ extern void assert_failed(const char*); + // bytes and byte arrays + + typedef unsigned int uint; ++#ifdef NO_ZLIB + #ifdef _LP64 + typedef unsigned int uLong; // Historical zlib, should be 32-bit. + #else + typedef unsigned long uLong; + #endif ++#endif ++ + #ifdef _MSC_VER + typedef LONGLONG jlong; + typedef DWORDLONG julong; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_com_sun_java_util_jar_pack_main_cpp b/devel/jdk/1.7/patches/patch-j2se_src_share_native_com_sun_java_util_jar_pack_main_cpp new file mode 100644 index 00000000000..d458c805bc3 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_com_sun_java_util_jar_pack_main_cpp @@ -0,0 +1,33 @@ +$OpenBSD: patch-j2se_src_share_native_com_sun_java_util_jar_pack_main_cpp,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/com/sun/java/util/jar/pack/main.cpp.orig Thu Jul 5 05:02:59 2007 ++++ j2se/src/share/native/com/sun/java/util/jar/pack/main.cpp Fri Jul 27 18:24:34 2007 +@@ -35,7 +35,7 @@ + + #if defined(unix) && !defined(PRODUCT) + #include "pthread.h" +-#define THREAD_SELF ((int)pthread_self()) ++#define THREAD_SELF ((intptr_t) pthread_self()) + #endif + + #include "defines.h" +@@ -58,9 +58,9 @@ int main(int argc, char **argv) { + // Single-threaded, implementation, not reentrant. + // Includes a weak error check against MT access. + #ifndef THREAD_SELF +-#define THREAD_SELF (0) ++#define THREAD_SELF ((intptr_t) 0) + #endif +-NOT_PRODUCT(static int uThread = -1;) ++NOT_PRODUCT(static intptr_t uThread = -1;) + + unpacker* unpacker::non_mt_current = null; + unpacker* unpacker::current() { +@@ -69,7 +69,7 @@ unpacker* unpacker::current() { + } + static void set_current_unpacker(unpacker* u) { + unpacker::non_mt_current = u; +- assert(((uThread = (u == null) ? -1 : THREAD_SELF), ++ assert(((uThread = (u == null) ? ((intptr_t) -1) : THREAD_SELF), + true)); + } + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_common_check_code_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_common_check_code_c new file mode 100644 index 00000000000..78587dc70ec --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_common_check_code_c @@ -0,0 +1,64 @@ +$OpenBSD: patch-j2se_src_share_native_common_check_code_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/common/check_code.c.orig Thu Jul 5 05:02:59 2007 ++++ j2se/src/share/native/common/check_code.c Fri Jul 27 18:24:52 2007 +@@ -1069,7 +1069,7 @@ verify_method(context_type *context, jclass cb, int me + * Make sure that branches don't go into the middle of nowhere. + */ + +-static jint ntohl(jint n) ++static jint _ck_ntohl(jint n) + { + unsigned char *p = (unsigned char *)&n; + return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; +@@ -1148,26 +1148,26 @@ verify_opcode_operands(context_type *context, unsigned + } + } + if (opcode == opc_tableswitch) { +- keys = ntohl(lpc[2]) - ntohl(lpc[1]) + 1; ++ keys = _ck_ntohl(lpc[2]) - _ck_ntohl(lpc[1]) + 1; + delta = 1; + } else { +- keys = ntohl(lpc[1]); /* number of pairs */ ++ keys = _ck_ntohl(lpc[1]); /* number of pairs */ + delta = 2; + /* Make sure that the tableswitch items are sorted */ + for (k = keys - 1, lptr = &lpc[2]; --k >= 0; lptr += 2) { +- int this_key = ntohl(lptr[0]); /* NB: ntohl may be unsigned */ +- int next_key = ntohl(lptr[2]); ++ int this_key = _ck_ntohl(lptr[0]); /* NB: _ck_ntohl may be unsigned */ ++ int next_key = _ck_ntohl(lptr[2]); + if (this_key >= next_key) { + CCerror(context, "Unsorted lookup switch"); + } + } + } + saved_operand = NEW(int, keys + 2); +- if (!isLegalTarget(context, offset + ntohl(lpc[0]))) ++ if (!isLegalTarget(context, offset + _ck_ntohl(lpc[0]))) + CCerror(context, "Illegal default target in switch"); +- saved_operand[keys + 1] = code_data[offset + ntohl(lpc[0])]; ++ saved_operand[keys + 1] = code_data[offset + _ck_ntohl(lpc[0])]; + for (k = keys, lptr = &lpc[3]; --k >= 0; lptr += delta) { +- int target = offset + ntohl(lptr[0]); ++ int target = offset + _ck_ntohl(lptr[0]); + if (!isLegalTarget(context, target)) + CCerror(context, "Illegal branch in opc_tableswitch"); + saved_operand[k + 1] = code_data[target]; +@@ -1615,7 +1615,7 @@ static int instruction_length(unsigned char *iptr, uns + if (lpc + 2 >= (int *)end) { + return -1; /* do not read pass the end */ + } +- index = ntohl(lpc[2]) - ntohl(lpc[1]); ++ index = _ck_ntohl(lpc[2]) - _ck_ntohl(lpc[1]); + if ((index < 0) || (index > 65535)) { + return -1; /* illegal */ + } else { +@@ -1628,7 +1628,7 @@ static int instruction_length(unsigned char *iptr, uns + int npairs; + if (lpc + 1 >= (int *)end) + return -1; /* do not read pass the end */ +- npairs = ntohl(lpc[1]); ++ npairs = _ck_ntohl(lpc[1]); + /* There can't be more than 64K labels because of the limit + * on per-method byte code length. + */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_io_io_util_h b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_io_io_util_h new file mode 100644 index 00000000000..fde9562948f --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_io_io_util_h @@ -0,0 +1,20 @@ +$OpenBSD: patch-j2se_src_share_native_java_io_io_util_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/java/io/io_util.h.orig Thu Jul 5 05:03:00 2007 ++++ j2se/src/share/native/java/io/io_util.h Fri Jul 27 18:24:52 2007 +@@ -29,7 +29,15 @@ + extern jfieldID IO_fd_fdID; + extern jfieldID IO_handle_fdID; + +-#if !defined(O_DSYNC) || !defined(O_SYNC) ++#ifdef _ALLBSD_SOURCE ++#include ++#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/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_lang_fdlibm_include_fdlibm_h b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_lang_fdlibm_include_fdlibm_h new file mode 100644 index 00000000000..e7f0bba3a6e --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_lang_fdlibm_include_fdlibm_h @@ -0,0 +1,39 @@ +$OpenBSD: patch-j2se_src_share_native_java_lang_fdlibm_include_fdlibm_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/java/lang/fdlibm/include/fdlibm.h.orig Thu Jul 5 05:03:00 2007 ++++ j2se/src/share/native/java/lang/fdlibm/include/fdlibm.h Fri Jul 27 18:24:52 2007 +@@ -25,17 +25,13 @@ + * + */ + ++#ifdef __OpenBSD__ ++#include ++#endif ++#include + #include "jfdlibm.h" + +-#ifdef __NEWVALID /* special setup for Sun test regime */ +-#if defined(i386) || defined(i486) || \ +- defined(intel) || defined(x86) || \ +- defined(i86pc) || defined(_M_IA64) +-#define _LITTLE_ENDIAN +-#endif +-#endif +- +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + #define __HI(x) *(1+(int*)&x) + #define __LO(x) *(int*)&x + #define __HIp(x) *(1+(int*)x) +@@ -47,10 +43,12 @@ + #define __LOp(x) *(1+(int*)x) + #endif + ++#ifndef __P + #ifdef __STDC__ + #define __P(p) p + #else + #define __P(p) () ++#endif + #endif + + /* diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_lang_fdlibm_include_jfdlibm_h b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_lang_fdlibm_include_jfdlibm_h new file mode 100644 index 00000000000..a475d93e393 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_lang_fdlibm_include_jfdlibm_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_share_native_java_lang_fdlibm_include_jfdlibm_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/java/lang/fdlibm/include/jfdlibm.h.orig Thu Jul 5 05:03:00 2007 ++++ j2se/src/share/native/java/lang/fdlibm/include/jfdlibm.h Fri Jul 27 18:24:52 2007 +@@ -61,7 +61,7 @@ + #define log1p jlog1p + #define expm1 jexpm1 + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #define __ieee754_sqrt __j__ieee754_sqrt + #define __ieee754_acos __j__ieee754_acos + #define __ieee754_acosh __j__ieee754_acosh diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_util_zip_Inflater_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_util_zip_Inflater_c new file mode 100644 index 00000000000..3645e1bac3c --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_util_zip_Inflater_c @@ -0,0 +1,25 @@ +$OpenBSD: patch-j2se_src_share_native_java_util_zip_Inflater_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/java/util/zip/Inflater.c.orig Thu Jul 5 05:03:03 2007 ++++ j2se/src/share/native/java/util/zip/Inflater.c Fri Jul 27 18:24:52 2007 +@@ -67,6 +67,10 @@ Java_java_util_zip_Inflater_init(JNIEnv *env, jclass c + return jlong_zero; + } else { + char *msg; ++// BSDXXX needed for FreeBSD 5.4 and below with system zlib ++#if defined(__FreeBSD__) && __FreeBSD__ < 6 ++ strm->adler = 1; ++#endif + switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) { + case Z_OK: + return ptr_to_jlong(strm); +@@ -202,6 +206,10 @@ Java_java_util_zip_Inflater_reset(JNIEnv *env, jclass + if (inflateReset(jlong_to_ptr(strm)) != Z_OK) { + JNU_ThrowInternalError(env, 0); + } ++// BSDXXX needed for FreeBSD 5.4 and below with system zlib ++#if defined(__FreeBSD__) && __FreeBSD__ < 6 ++ ((z_stream *)jlong_to_ptr(strm))->adler = 1; ++#endif + } + + JNIEXPORT void JNICALL diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_util_zip_zlib-1_1_3_zconf_h b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_util_zip_zlib-1_1_3_zconf_h new file mode 100644 index 00000000000..a1701d69c64 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_java_util_zip_zlib-1_1_3_zconf_h @@ -0,0 +1,85 @@ +$OpenBSD: patch-j2se_src_share_native_java_util_zip_zlib-1_1_3_zconf_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/java/util/zip/zlib-1.1.3/zconf.h.orig Thu Jul 5 05:03:03 2007 ++++ j2se/src/share/native/java/util/zip/zlib-1.1.3/zconf.h Fri Jul 27 18:24:52 2007 +@@ -43,44 +43,49 @@ + /* for _LP64 */ + #include + ++/** ++ * Privatise the symbols to the JDK. ++ */ ++#define Z_PREFIX ++ + /* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + */ + #ifdef Z_PREFIX +-# define deflateInit_ z_deflateInit_ +-# define deflate z_deflate +-# define deflateEnd z_deflateEnd +-# define inflateInit_ z_inflateInit_ +-# define inflate z_inflate +-# define inflateEnd z_inflateEnd +-# define deflateInit2_ z_deflateInit2_ +-# define deflateSetDictionary z_deflateSetDictionary +-# define deflateCopy z_deflateCopy +-# define deflateReset z_deflateReset +-# define deflateParams z_deflateParams +-# define inflateInit2_ z_inflateInit2_ +-# define inflateSetDictionary z_inflateSetDictionary +-# define inflateSync z_inflateSync +-# define inflateSyncPoint z_inflateSyncPoint +-# define inflateReset z_inflateReset +-# define compress z_compress +-# define compress2 z_compress2 +-# define uncompress z_uncompress +-# define adler32 z_adler32 +-# define crc32 z_crc32 +-# define get_crc_table z_get_crc_table ++# define deflateInit_ _java_libz_deflateInit_ ++# define deflate _java_libz_deflate ++# define deflateEnd _java_libz_deflateEnd ++# define inflateInit_ _java_libz_inflateInit_ ++# define inflate _java_libz_inflate ++# define inflateEnd _java_libz_inflateEnd ++# define deflateInit2_ _java_libz_deflateInit2_ ++# define deflateSetDictionary _java_libz_deflateSetDictionary ++# define deflateCopy _java_libz_deflateCopy ++# define deflateReset _java_libz_deflateReset ++# define deflateParams _java_libz_deflateParams ++# define inflateInit2_ _java_libz_inflateInit2_ ++# define inflateSetDictionary _java_libz_inflateSetDictionary ++# define inflateSync _java_libz_inflateSync ++# define inflateSyncPoint _java_libz_inflateSyncPoint ++# define inflateReset _java_libz_inflateReset ++# define compress _java_libz_compress ++# define compress2 _java_libz_compress2 ++# define uncompress _java_libz_uncompress ++# define adler32 _java_libz_adler32 ++# define crc32 _java_libz_crc32 ++# define get_crc_table _java_libz_get_crc_table + +-# define Byte z_Byte +-# define uInt z_uInt +-# define uLong z_uLong +-# define Bytef z_Bytef +-# define charf z_charf +-# define intf z_intf +-# define uIntf z_uIntf +-# define uLongf z_uLongf +-# define voidpf z_voidpf +-# define voidp z_voidp ++# define Byte _java_libz_Byte ++# define uInt _java_libz_uInt ++# define uLong _java_libz_uLong ++# define Bytef _java_libz_Bytef ++# define charf _java_libz_charf ++# define intf _java_libz_intf ++# define uIntf _java_libz_uIntf ++# define uLongf _java_libz_uLongf ++# define voidpf _java_libz_voidpf ++# define voidp _java_libz_voidp + #endif + + #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_debug_debug_util_h b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_debug_debug_util_h new file mode 100644 index 00000000000..d448dafd0f1 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_debug_debug_util_h @@ -0,0 +1,13 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_debug_debug_util_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/debug/debug_util.h.orig Thu Jul 5 05:03:04 2007 ++++ j2se/src/share/native/sun/awt/debug/debug_util.h Fri Jul 27 18:25:10 2007 +@@ -50,7 +50,9 @@ typedef void * dmutex_t; + #include + #include + #include ++#if !defined(_ALLBSD_SOURCE) + #include ++#endif + #include + + /* keep these after the other headers */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_image_BufImgSurfaceData_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_image_BufImgSurfaceData_c new file mode 100644 index 00000000000..ee1614b5555 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_image_BufImgSurfaceData_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_image_BufImgSurfaceData_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/image/BufImgSurfaceData.c.orig Thu Jul 5 05:03:04 2007 ++++ j2se/src/share/native/sun/awt/image/BufImgSurfaceData.c Fri Jul 27 18:25:10 2007 +@@ -24,7 +24,11 @@ + */ + + #include "BufImgSurfaceData.h" ++#ifdef _ALLBSD_SOURCE ++#include ++#else + #include "malloc.h" ++#endif + + #include "sun_awt_image_BufImgSurfaceData.h" + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_image_DataBufferNative_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_image_DataBufferNative_c new file mode 100644 index 00000000000..d03eead89b1 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_image_DataBufferNative_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_image_DataBufferNative_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/image/DataBufferNative.c.orig Thu Jul 5 05:03:04 2007 ++++ j2se/src/share/native/sun/awt/image/DataBufferNative.c Fri Jul 27 18:25:10 2007 +@@ -23,7 +23,11 @@ + * + */ + ++#ifdef _ALLBSD_SOURCE ++#include ++#else + #include "malloc.h" ++#endif + + #include "SurfaceData.h" + #include "sun_awt_image_DataBufferNative.h" diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv2x2_f_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv2x2_f_c new file mode 100644 index 00000000000..b4576a29ef7 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv2x2_f_c @@ -0,0 +1,42 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv2x2_f_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c.orig Thu Jul 5 05:03:10 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Fri Jul 27 18:25:10 2007 +@@ -90,7 +90,7 @@ typedef struct { + #endif /* MLIB_USE_FTOI_CLAMPING */ + + /***************************************************************/ +-#if defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG) ++#if (BYTE_ORDER == LITTLE_ENDIAN) && !defined(_NO_LONGLONG) + + /* NB: Explicit cast to DTYPE is necessary to avoid warning from Microsoft VC compiler. + And we need to explicitly define cast behavior if source exceeds destination range. +@@ -107,7 +107,7 @@ typedef struct { + dp[0 ] = (DTYPE) ((res0) & DTYPE_MASK); \ + dp[chan1] = (DTYPE) ((res1) & DTYPE_MASK) + +-#endif /* defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG) */ ++#endif /* (BYTE_ORDER == LITTLE_ENDIAN) && !defined(_NO_LONGLONG) */ + + /***************************************************************/ + #ifdef _NO_LONGLONG +@@ -118,17 +118,17 @@ typedef struct { + + #else /* _NO_LONGLONG */ + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | ((mlib_s64)sp[0] & 0xffffffff) + +-#else /* _LITTLE_ENDIAN */ ++#else + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | ((mlib_s64)sp[chan1] & 0xffffffff) + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + #endif /* _NO_LONGLONG */ + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16ext_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16ext_c new file mode 100644 index 00000000000..7fe9fe58415 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16ext_c @@ -0,0 +1,42 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16ext_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c.orig Thu Jul 5 05:03:10 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Fri Jul 27 18:25:10 2007 +@@ -130,7 +130,7 @@ + #define D2I(x) CLAMP_S32((x) SAT_OFF) + + /***************************************************************/ +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define STORE2(res0, res1) \ + dp[0 ] = res1; \ +@@ -142,7 +142,7 @@ + dp[0 ] = res0; \ + dp[chan1] = res1 + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /***************************************************************/ + #ifdef _NO_LONGLONG +@@ -153,17 +153,17 @@ + + #else /* _NO_LONGLONG */ + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0]) + +-#else /* _LITTLE_ENDIAN */ ++#else + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1]) + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + #endif /* _NO_LONGLONG */ + + /***************************************************************/ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16nw_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16nw_c new file mode 100644 index 00000000000..cc354e1c440 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16nw_c @@ -0,0 +1,42 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_16nw_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c.orig Thu Jul 5 05:03:10 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Fri Jul 27 18:25:10 2007 +@@ -98,7 +98,7 @@ + #define D2I(x) CLAMP_S32((x) SAT_OFF) + + /***************************************************************/ +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define STORE2(res0, res1) \ + dp[0 ] = res1; \ +@@ -110,7 +110,7 @@ + dp[0 ] = res0; \ + dp[chan1] = res1 + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /***************************************************************/ + #ifdef _NO_LONGLONG +@@ -121,17 +121,17 @@ + + #else /* _NO_LONGLONG */ + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0]) + +-#else /* _LITTLE_ENDIAN */ ++#else + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1]) + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + #endif /* _NO_LONGLONG */ + + /***************************************************************/ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8ext_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8ext_c new file mode 100644 index 00000000000..8c609896331 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8ext_c @@ -0,0 +1,42 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8ext_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c.orig Thu Jul 5 05:03:10 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Fri Jul 27 18:25:10 2007 +@@ -130,7 +130,7 @@ + #define D2I(x) CLAMP_S32((x) SAT_OFF) + + /***************************************************************/ +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define STORE2(res0, res1) \ + dp[0 ] = res1; \ +@@ -142,7 +142,7 @@ + dp[0 ] = res0; \ + dp[chan1] = res1 + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /***************************************************************/ + #ifdef _NO_LONGLONG +@@ -153,17 +153,17 @@ + + #else /* _NO_LONGLONG */ + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0]) + +-#else /* _LITTLE_ENDIAN */ ++#else + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1]) + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + #endif /* _NO_LONGLONG */ + + /***************************************************************/ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8nw_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8nw_c new file mode 100644 index 00000000000..b95e6ae91a8 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8nw_c @@ -0,0 +1,42 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_8nw_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c.orig Thu Jul 5 05:03:10 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Fri Jul 27 18:25:10 2007 +@@ -99,7 +99,7 @@ + #define D2I(x) CLAMP_S32((x) SAT_OFF) + + /***************************************************************/ +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define STORE2(res0, res1) \ + dp[0 ] = res1; \ +@@ -111,7 +111,7 @@ + dp[0 ] = res0; \ + dp[chan1] = res1 + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /***************************************************************/ + #ifdef _NO_LONGLONG +@@ -122,17 +122,17 @@ + + #else /* _NO_LONGLONG */ + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0]) + +-#else /* _LITTLE_ENDIAN */ ++#else + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1]) + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + #endif /* _NO_LONGLONG */ + + /***************************************************************/ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16ext_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16ext_c new file mode 100644 index 00000000000..f6ad925656b --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16ext_c @@ -0,0 +1,42 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16ext_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c.orig Thu Jul 5 05:03:10 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Fri Jul 27 18:25:10 2007 +@@ -130,7 +130,7 @@ + #define D2I(x) CLAMP_S32((x) SAT_OFF) + + /***************************************************************/ +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define STORE2(res0, res1) \ + dp[0 ] = res1; \ +@@ -142,7 +142,7 @@ + dp[0 ] = res0; \ + dp[chan1] = res1 + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /***************************************************************/ + #ifdef _NO_LONGLONG +@@ -153,17 +153,17 @@ + + #else /* _NO_LONGLONG */ + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0]) + +-#else /* _LITTLE_ENDIAN */ ++#else + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1]) + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + #endif /* _NO_LONGLONG */ + + /***************************************************************/ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16nw_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16nw_c new file mode 100644 index 00000000000..19f034a1bea --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16nw_c @@ -0,0 +1,42 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageConv_u16nw_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c.orig Thu Jul 5 05:03:10 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Fri Jul 27 18:25:10 2007 +@@ -98,7 +98,7 @@ + #define D2I(x) CLAMP_S32((x) SAT_OFF) + + /***************************************************************/ +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define STORE2(res0, res1) \ + dp[0 ] = res1; \ +@@ -110,7 +110,7 @@ + dp[0 ] = res0; \ + dp[chan1] = res1 + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /***************************************************************/ + #ifdef _NO_LONGLONG +@@ -121,17 +121,17 @@ + + #else /* _NO_LONGLONG */ + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0]) + +-#else /* _LITTLE_ENDIAN */ ++#else + + #define LOAD_BUFF(buff) \ + *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1]) + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + #endif /* _NO_LONGLONG */ + + /***************************************************************/ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageCopy_Bit_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageCopy_Bit_c new file mode 100644 index 00000000000..19905dccac9 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageCopy_Bit_c @@ -0,0 +1,222 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageCopy_Bit_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c.orig Thu Jul 5 05:03:10 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Fri Jul 27 18:25:10 2007 +@@ -99,7 +99,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8 *sa, + dst = dp[0]; + if (ld_offset + size < 32) { + dmask = (mask0 << (32 - size)) >> ld_offset; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24); + src = (src0 >> (ld_offset - ls_offset)); + dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24); +@@ -108,12 +108,12 @@ void mlib_ImageCopy_bit_na(const mlib_u8 *sa, + #else + src = (src0 >> (ld_offset - ls_offset)); + dp[0] = (dst & (~dmask)) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + return; + } + + dmask = mask0 >> ld_offset; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24); + src = (src0 >> (ld_offset - ls_offset)); + dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24); +@@ -122,7 +122,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8 *sa, + #else + src = (src0 >> (ld_offset - ls_offset)); + dp[0] = (dst & ~dmask) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + j = 32 - ld_offset; + dp++; + ls_offset += j; +@@ -135,7 +135,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8 *sa, + + if (ld_offset + size < 32) { + dmask = (mask0 << (32 - size)) >> ld_offset; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24); + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); + src = (src0 << shift) | (src1 >> (32 - shift)); +@@ -145,12 +145,12 @@ void mlib_ImageCopy_bit_na(const mlib_u8 *sa, + #else + src = (src0 << shift) | (src1 >> (32 - shift)); + dp[0] = (dst & ~dmask) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + return; + } + + dmask = mask0 >> ld_offset; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24); + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); + src = (src0 << shift) | (src1 >> (32 - shift)); +@@ -160,7 +160,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8 *sa, + #else + src = (src0 << shift) | (src1 >> (32 - shift)); + dp[0] = (dst & ~dmask) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + j = 32 - ld_offset; + dp++; + sp++; +@@ -168,19 +168,19 @@ void mlib_ImageCopy_bit_na(const mlib_u8 *sa, + } + + if (j < size) src1 = sp[0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + for (; j <= size - 32; j += 32) { + src0 = src1; + src1 = sp[1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); + src = (src0 << ls_offset) | (src1 >> (32 - ls_offset)); + dp[0] = (src << 24) | ((src & 0xFF00) << 8) | ((src >> 8) & 0xFF00) | (src >> 24); + #else + dp[0] = (src0 << ls_offset) | (src1 >> (32 - ls_offset)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + sp++; + dp++; + } +@@ -191,7 +191,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8 *sa, + if (ls_offset + j > 32) src1 = sp[1]; + dst = dp[0]; + dmask = mask0 << (32 - j); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); + src = (src0 << ls_offset) | (src1 >> (32 - ls_offset)); + dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24); +@@ -200,7 +200,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8 *sa, + #else + src = (src0 << ls_offset) | (src1 >> (32 - ls_offset)); + dp[0] = (dst & ~dmask) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + } + + #else /* _LONGLONG */ +@@ -319,7 +319,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_u8 *sa, + dst = dp[0]; + if (ld_offset >= size) { + dmask = (lmask0 << (32 - size)) >> (ld_offset - size); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24); + src = (src0 << (ls_offset - ld_offset)); + dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24); +@@ -328,12 +328,12 @@ void mlib_ImageCopy_bit_na_r(const mlib_u8 *sa, + #else + src = (src0 << (ls_offset - ld_offset)); + dp[0] = (dst & (~dmask)) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + return; + } + + dmask = lmask0 << (32 - ld_offset); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24); + src = (src0 << (ls_offset - ld_offset)); + dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24); +@@ -342,7 +342,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_u8 *sa, + #else + src = (src0 << (ls_offset - ld_offset)); + dp[0] = (dst & ~dmask) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + j = ld_offset; + dp--; + ls_offset -= j; +@@ -355,7 +355,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_u8 *sa, + + if (ld_offset >= size) { + dmask = (lmask0 << (32 - size)) >> (ld_offset - size); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24); + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); + src = (src0 >> shift) | (src1 << (32 - shift)); +@@ -365,12 +365,12 @@ void mlib_ImageCopy_bit_na_r(const mlib_u8 *sa, + #else + src = (src0 >> shift) | (src1 << (32 - shift)); + dp[0] = (dst & ~dmask) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + return; + } + + dmask = lmask0 << (32 - ld_offset); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24); + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); + src = (src0 >> shift) | (src1 << (32 - shift)); +@@ -380,7 +380,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_u8 *sa, + #else + src = (src0 >> shift) | (src1 << (32 - shift)); + dp[0] = (dst & ~dmask) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + j = ld_offset; + dp--; + sp--; +@@ -388,22 +388,22 @@ void mlib_ImageCopy_bit_na_r(const mlib_u8 *sa, + } + + if (j < size) src1 = sp[0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + #ifdef __SUNPRO_C + #pragma pipeloop(0) + #endif /* __SUNPRO_C */ + for (; j <= size - 32; j += 32) { + src0 = src1; + src1 = sp[-1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); + src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset); + dp[0] = (src << 24) | ((src & 0xFF00) << 8) | ((src >> 8) & 0xFF00) | (src >> 24); + #else + dp[0] = (src0 >> (32 - ls_offset)) | (src1 << ls_offset); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + sp--; + dp--; + } +@@ -414,7 +414,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_u8 *sa, + if (ls_offset < j) src1 = sp[-1]; + dst = dp[0]; + dmask = lmask0 >> (32 - j); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24); + src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset); + dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24); +@@ -423,7 +423,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_u8 *sa, + #else + src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset); + dp[0] = (dst & ~dmask) | (src & dmask); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + } + + #else /* _LONGLONG */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_64_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_64_c new file mode 100644 index 00000000000..3fd8948b8ce --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_64_c @@ -0,0 +1,283 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_64_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c.orig Thu Jul 5 05:03:11 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Fri Jul 27 18:25:10 2007 +@@ -172,7 +172,7 @@ + } + + /***************************************************************/ +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define READ_U8_D64(table0, table1, table2, table3) \ + t0 = *(mlib_d64*)((mlib_u8*)table0 + ((s0 << 3) & 0x7F8)); \ +@@ -188,7 +188,7 @@ + t2 = *(mlib_d64*)((mlib_u8*)table2 + ((s0 >> 5) & 0x7F8)); \ + t3 = *(mlib_d64*)((mlib_u8*)table3 + ((s0 << 3) & 0x7F8)) + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /***************************************************************/ + void mlib_ImageLookUp_U8_D64(const mlib_u8 *src, +@@ -616,7 +616,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + #pragma pipeloop(0) + #endif /* __SUNPRO_C */ + for (i = 0; i < size - 7; i += 4, dp += 8, sa++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8)); +@@ -626,12 +626,12 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8)); +@@ -641,7 +641,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + dp[4] = t0; + dp[5] = t1; +@@ -649,7 +649,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + dp[7] = t3; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8)); +@@ -659,12 +659,12 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8)); +@@ -674,7 +674,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[4] = t0; + dp[5] = t1; + dp[6] = t2; +@@ -722,7 +722,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + #pragma pipeloop(0) + #endif /* __SUNPRO_C */ + for (i = 0; i < size - 7; i += 4, dp += 12, sa++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); +@@ -736,14 +736,14 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; + dp[4] = t4; + dp[5] = t5; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); +@@ -757,7 +757,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + dp[6] = t0; + dp[7] = t1; +@@ -767,7 +767,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + dp[11] = t5; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); +@@ -781,14 +781,14 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; + dp[4] = t4; + dp[5] = t5; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); +@@ -802,7 +802,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[6] = t0; + dp[7] = t1; + dp[8] = t2; +@@ -855,7 +855,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + #pragma pipeloop(0) + #endif /* __SUNPRO_C */ + for (i = 0; i < size - 7; i += 4, dp += 16, sa++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); +@@ -865,12 +865,12 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8)); +@@ -880,12 +880,12 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[4] = t0; + dp[5] = t1; + dp[6] = t2; + dp[7] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); +@@ -895,12 +895,12 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[8] = t0; + dp[9] = t1; + dp[10] = t2; + dp[11] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8)); +@@ -910,7 +910,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + dp[12] = t0; + dp[13] = t1; +@@ -918,7 +918,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + dp[15] = t3; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); +@@ -928,12 +928,12 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8)); +@@ -943,12 +943,12 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[4] = t0; + dp[5] = t1; + dp[6] = t2; + dp[7] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); +@@ -958,12 +958,12 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[8] = t0; + dp[9] = t1; + dp[10] = t2; + dp[11] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8)); + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8)); +@@ -973,7 +973,7 @@ void mlib_ImageLookUpSI_U8_D64(const mlib_u8 *src, + t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); + t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); + t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[12] = t0; + dp[13] = t1; + dp[14] = t2; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_Bit_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_Bit_c new file mode 100644 index 00000000000..b4bb25a2b79 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_Bit_c @@ -0,0 +1,154 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageLookUp_Bit_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c.orig Thu Jul 5 05:03:10 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Fri Jul 27 18:25:10 2007 +@@ -92,7 +92,7 @@ typedef union { + } d64_2_f32; + + /***************************************************************/ +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + static const mlib_u32 mlib_bit_mask[16] = { + 0x00000000u, 0xFF000000u, 0x00FF0000u, 0xFFFF0000u, +@@ -130,7 +130,7 @@ static const mlib_u32 mlib_bit_mask_3[3*4] = { + 0x00000000u, 0x00FFFFFFu, 0xFF000000u, 0xFFFFFFFFu + }; + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /***************************************************************/ + mlib_status mlib_ImageLookUp_Bit_U8_1(const mlib_u8 *src, +@@ -232,13 +232,13 @@ mlib_status mlib_ImageLookUp_Bit_U8_1(const mlib_u8 *s + #endif /* __SUNPRO_C */ + for (; i <= (size - 16); i += 16) { + s0 = *(mlib_u16*)sa; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *da++ = dd_array[s0 & 0xFF]; + *da++ = dd_array[s0 >> 8]; + #else + *da++ = dd_array[s0 >> 8]; + *da++ = dd_array[s0 & 0xFF]; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + sa += 2; + } + +@@ -262,20 +262,20 @@ mlib_status mlib_ImageLookUp_Bit_U8_1(const mlib_u8 *s + val1 = p_dd[2*val0+1]; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8); + #else + emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + ((mlib_u32*)da)[0] = (val1 & emask) | (((mlib_u32*)da)[0] &~ emask); + + #else /* _NO_LONGLONG */ + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + mlib_u64 emask = (mlib_u64)((mlib_s64)(-1)) >> ((8 - (size - i)) * 8); + #else + mlib_u64 emask = (mlib_s64)(-1) << ((8 - (size - i)) * 8); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + ((mlib_u64*)da)[0] = (((mlib_u64*)dd_array)[sa[0]] & emask) | (((mlib_u64*)da)[0] &~ emask); + +@@ -327,13 +327,13 @@ mlib_status mlib_ImageLookUp_Bit_U8_2(const mlib_u8 *s + + val0 = table[0][0]; + val1 = table[0][1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + val0 = val0 | (table[1][0] << 8); + val1 = val1 | (table[1][1] << 8); + #else + val0 = (val0 << 8) | table[1][0]; + val1 = (val1 << 8) | table[1][1]; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + val0 |= (val0 << 16); + val1 |= (val1 << 16); + +@@ -398,11 +398,11 @@ mlib_status mlib_ImageLookUp_Bit_U8_2(const mlib_u8 *s + dd1 = dd2; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8); + #else + emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + ((mlib_u32*)da)[0] = (dd1 & emask) | (((mlib_u32*)da)[0] &~ emask); + + #else /* _NO_LONGLONG */ +@@ -416,11 +416,11 @@ mlib_status mlib_ImageLookUp_Bit_U8_2(const mlib_u8 *s + dd = ((mlib_u64*)dd_array)[s0 & 0xf]; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + emask = (mlib_u64)((mlib_s64)(-1)) >> ((8 - (size - i)) * 8); + #else + emask = (mlib_s64)(-1) << ((8 - (size - i)) * 8); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + ((mlib_u64*)da)[0] = (dd & emask) | (((mlib_u64*)da)[0] &~ emask); + + #endif /* _NO_LONGLONG */ +@@ -466,7 +466,7 @@ mlib_status mlib_ImageLookUp_Bit_U8_3(const mlib_u8 *s + + buffs = buff + size; + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + l0 = (table[0][0] << 24) | (table[2][0] << 16) | (table[1][0] << 8) | (table[0][0]); + h0 = (table[0][1] << 24) | (table[2][1] << 16) | (table[1][1] << 8) | (table[0][1]); + l1 = (l0 >> 8); l1 |= (l1 << 24); +@@ -480,7 +480,7 @@ mlib_status mlib_ImageLookUp_Bit_U8_3(const mlib_u8 *s + h1 = (h0 << 8); h1 |= (h1 >> 24); + l2 = (l1 << 8); l2 |= (l2 >> 24); + h2 = (h1 << 8); h2 |= (h2 >> 24); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /* calculate lookup table */ + #ifdef __SUNPRO_C +@@ -568,11 +568,11 @@ mlib_status mlib_ImageLookUp_Bit_U8_3(const mlib_u8 *s + dd = ((mlib_u32*)(d_array12 + (s0 & 0xF)))[1]; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8); + #else + emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = (dd & emask) | (da[0] &~ emask); + } + +@@ -615,13 +615,13 @@ mlib_status mlib_ImageLookUp_Bit_U8_4(const mlib_u8 *s + + buffs = buff + size; + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + l = (table[3][0] << 24) | (table[2][0] << 16) | (table[1][0] << 8) | (table[0][0]); + h = (table[3][1] << 24) | (table[2][1] << 16) | (table[1][1] << 8) | (table[0][1]); + #else + l = (table[0][0] << 24) | (table[1][0] << 16) | (table[2][0] << 8) | (table[3][0]); + h = (table[0][1] << 24) | (table[1][1] << 16) | (table[2][1] << 8) | (table[3][1]); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + ((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l; + ((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageUtils_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageUtils_c new file mode 100644 index 00000000000..d2b05353604 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageUtils_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_ImageUtils_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_ImageUtils.c.orig Thu Jul 5 05:03:11 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Fri Jul 27 18:25:10 2007 +@@ -34,7 +34,7 @@ + typedef union { + mlib_d64 db; + struct { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + mlib_s32 int1, int0; + #else + mlib_s32 int0, int1; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageCopy_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageCopy_c new file mode 100644 index 00000000000..16bf22dcb50 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageCopy_c @@ -0,0 +1,101 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageCopy_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c.orig Thu Jul 5 05:03:11 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Fri Jul 27 18:25:10 2007 +@@ -279,11 +279,11 @@ void mlib_ImageCopy_bit_al(const mlib_u8 *sa, + for (i = 0; j <= (b_size - 4); j += 4, i++) { + src0 = src1; + src1 = pws[i + 1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + pwd[i] = (src0 >> lshift) | (src1 << rshift); + #else + pwd[i] = (src0 << lshift) | (src1 >> rshift); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + } + + sa += i << 2; +@@ -385,11 +385,11 @@ void mlib_c_ImageCopy_u8(const mlib_image *src, + for (; j <= (src_width - 4); j += 4) { + src0 = src1; + src1 = ps[1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *((mlib_s32 *) (pdst_row + j)) = (src0 >> shl) | (src1 << shr); + #else + *((mlib_s32 *) (pdst_row + j)) = (src0 << shl) | (src1 >> shr); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + ps++; + } + } +@@ -418,11 +418,11 @@ void mlib_c_ImageCopy_u8(const mlib_image *src, + for (; j <= (src_width - 8); j += 8) { + src0 = src1; + src1 = ps[1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *((mlib_s64 *) (pdst_row + j)) = (src0 >> shl) | (src1 << shr); + #else + *((mlib_s64 *) (pdst_row + j)) = (src0 << shl) | (src1 >> shr); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + ps++; + } + } +@@ -488,11 +488,11 @@ void mlib_c_ImageCopy_s16(const mlib_image *src, + for (; j <= (src_width - 2); j += 2) { + src0 = src1; + src1 = ps[1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *((mlib_s32 *) (pdst_row + j)) = (src0 >> 16) | (src1 << 16); + #else + *((mlib_s32 *) (pdst_row + j)) = (src0 << 16) | (src1 >> 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + ps++; + } + } +@@ -520,11 +520,11 @@ void mlib_c_ImageCopy_s16(const mlib_image *src, + for (; j <= (src_width - 4); j += 4) { + src0 = src1; + src1 = ps[1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *((mlib_s64 *) (pdst_row + j)) = (src0 >> shl) | (src1 << shr); + #else + *((mlib_s64 *) (pdst_row + j)) = (src0 << shl) | (src1 >> shr); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + ps++; + } + } +@@ -589,11 +589,11 @@ void mlib_c_ImageCopy_s32(const mlib_image *src, + for (; j <= (src_width - 2); j += 2) { + src0 = src1; + src1 = ps[1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *((mlib_s64 *) (pdst_row + j)) = (src0 >> 32) | (src1 << 32); + #else + *((mlib_s64 *) (pdst_row + j)) = (src0 << 32) | (src1 >> 32); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + ps++; + } + } +@@ -691,11 +691,11 @@ void mlib_ImageCopy_na(const mlib_u8 *sp, + #endif /* __SUNPRO_C */ + for (; n > SIZE; n -= SIZE) { + s1 = *tmp++; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *(TYPE *) dp = (s0 >> shl) | (s1 << shr); + #else + *(TYPE *) dp = (s0 << shl) | (s1 >> shr); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = s1; + dp += SIZE; + sp += SIZE; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageLookUp_f_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageLookUp_f_c new file mode 100644 index 00000000000..d200eb6a9de --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageLookUp_f_c @@ -0,0 +1,1235 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_c_ImageLookUp_f_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c.orig Thu Jul 5 05:03:11 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Fri Jul 27 18:25:10 2007 +@@ -124,7 +124,7 @@ + } \ + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + /***************************************************************/ + #define READ_U8_U8_ALIGN(table0, table1, table2, table3) \ +@@ -167,7 +167,7 @@ + t2 = *(mlib_u32*)((mlib_u8*)table2 + ((s0 >> 14) & 0x3FC)); \ + t3 = *(mlib_u32*)((mlib_u8*)table3 + ((s0 >> 22) & 0x3FC)) + +-#else /* _LITTLE_ENDIAN */ ++#else /* BYTE_ORDER == ... */ + + /***********/ + #define READ_U8_U8_ALIGN(table0, table1, table2, table3) \ +@@ -210,7 +210,7 @@ + t2 = *(mlib_u32*)((mlib_u8*)table2 + ((s0 >> 6) & 0x3FC)); \ + t3 = *(mlib_u32*)((mlib_u8*)table3 + ((s0 << 2) & 0x3FC)) + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + /***************************************************************/ + void mlib_c_ImageLookUp_U8_U8(const mlib_u8 *src, +@@ -301,11 +301,11 @@ void mlib_c_ImageLookUp_U8_U8(const mlib_u8 *src, + da[0] = t; + da++; + dp = (mlib_u8 *) da; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *dp++ = tab[s2 >> 8]; + #else + *dp++ = tab[s2 & 0xFF]; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + sp = (mlib_u8 *) sa; + i += 5; + for (; i < size; i++, dp++, sp++) +@@ -407,11 +407,11 @@ void mlib_c_ImageLookUp_U8_U8(const mlib_u8 *src, + da[0] = t; + da++; + dp = (mlib_u8 *) da; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *dp++ = tab0[s2 >> 8]; + #else + *dp++ = tab0[s2 & 0xFF]; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + sp = (mlib_u8 *) sa; + i += 5; + +@@ -548,11 +548,11 @@ void mlib_c_ImageLookUp_U8_U8(const mlib_u8 *src, + da[0] = t; + da++; + dp = (mlib_u8 *) da; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *dp++ = tab1[s2 >> 8]; + #else + *dp++ = tab1[s2 & 0xFF]; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + sp = (mlib_u8 *) sa; + i += 5; + +@@ -698,11 +698,11 @@ void mlib_c_ImageLookUp_U8_U8(const mlib_u8 *src, + da[0] = t; + da++; + dp = (mlib_u8 *) da; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *dp++ = tab0[s2 >> 8]; + #else + *dp++ = tab0[s2 & 0xFF]; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + sp = (mlib_u8 *) sa; + i += 5; + +@@ -1856,21 +1856,21 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + s0 = tab0[0]; + s1 = tab1[0]; + for (i = 1; i < 256; i++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s2 = (s1 << 8) + s0; + #else + s2 = (s0 << 8) + s1; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = tab0[i]; + s1 = tab1[i]; + tab[i - 1] = (mlib_u16) s2; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s2 = (s1 << 8) + s0; + #else + s2 = (s0 << 8) + s1; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + tab[255] = (mlib_u16) s2; + + for (j = 0; j < ysize; j++, dst += dlb, src += slb) { +@@ -1901,11 +1901,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + for (i = 0; i < size - 3; i += 2, da++, sa += 2) { + t0 = tab[s0]; + t1 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t = (t1 << 16) + t0; + #else + t = (t0 << 16) + t1; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + s1 = sa[1]; + da[0] = t; +@@ -1913,11 +1913,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + + t0 = tab[s0]; + t1 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t = (t1 << 16) + t0; + #else + t = (t0 << 16) + t1; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = t; + da++; + +@@ -1931,13 +1931,13 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + + if (off > 1) { + t0 = tab[sa[0]]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + dp[1] = (t0 >> 8); + dp[0] = t0; + #else + dp[0] = (t0 >> 8); + dp[1] = t0; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + sa++; + size--; + dp += 2; +@@ -1945,11 +1945,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + + t0 = tab[sa[0]]; + sa++; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *dp++ = t0; + #else + *dp++ = (t0 >> 8); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + da = (mlib_s32 *) dp; + +@@ -1963,11 +1963,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + for (i = 0; i < size - 4; i += 2, da++, sa += 2) { + t1 = tab[s0]; + t2 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t = (t0 >> 8) + (t1 << 8) + (t2 << 24); + #else + t = (t0 << 24) + (t1 << 8) + (t2 >> 8); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + t0 = t2; + s0 = sa[0]; + s1 = sa[1]; +@@ -1976,29 +1976,29 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + + t1 = tab[s0]; + t2 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t = (t0 >> 8) + (t1 << 8) + (t2 << 24); + #else + t = (t0 << 24) + (t1 << 8) + (t2 >> 8); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = t; + da++; + dp = (mlib_u8 *) da; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + dp[0] = (t2 >> 8); + #else + dp[0] = t2; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + if ((size & 1) == 0) { + t0 = tab[sa[0]]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + dp[2] = (t0 >> 8); + dp[1] = t0; + #else + dp[1] = (t0 >> 8); + dp[2] = t0; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + } + } + } +@@ -2016,22 +2016,22 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + s1 = tab1[0]; + s2 = tab2[0]; + for (i = 1; i < 256; i++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s3 = (s2 << 24) + (s1 << 16) + (s0 << 8); + #else + s3 = (s0 << 16) + (s1 << 8) + s2; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = tab0[i]; + s1 = tab1[i]; + s2 = tab2[i]; + tab[i - 1] = s3; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s3 = (s2 << 24) + (s1 << 16) + (s0 << 8); + #else + s3 = (s0 << 16) + (s1 << 8) + s2; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + tab[255] = s3; + + for (j = 0; j < ysize; j++, dst += dlb, src += slb) { +@@ -2068,24 +2068,24 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + for (i = 0; i < size - 7; i += 4, da += 3, sa += 4) { + t0 = tab[s0]; + t1 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + da[0] = (t0 >> 8) + (t1 << 16); + res2 = (t1 >> 16); + #else + da[0] = (t0 << 8) + (t1 >> 16); + res2 = (t1 << 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + s1 = sa[1]; + t0 = tab[s0]; + t1 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 += (t0 << 8); + res1 = (t0 >> 24) + t1; + #else + res2 += (t0 >> 8); + res1 = (t0 << 24) + t1; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[2]; + s1 = sa[3]; + da[1] = res2; +@@ -2094,24 +2094,24 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + + t0 = tab[s0]; + t1 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + da[0] = (t0 >> 8) + (t1 << 16); + res2 = (t1 >> 16); + #else + da[0] = (t0 << 8) + (t1 >> 16); + res2 = (t1 << 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + s1 = sa[1]; + t0 = tab[s0]; + t1 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 += (t0 << 8); + res1 = (t0 >> 24) + t1; + #else + res2 += (t0 >> 8); + res1 = (t0 << 24) + t1; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[1] = res2; + da[2] = res1; + da += 3; +@@ -2147,11 +2147,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + s2 = tab2[0]; + s3 = tab3[0]; + for (i = 1; i < 256; i++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s4 = (s3 << 24) + (s2 << 16) + (s1 << 8) + s0; + #else + s4 = (s0 << 24) + (s1 << 16) + (s2 << 8) + s3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = tab0[i]; + s1 = tab1[i]; + s2 = tab2[i]; +@@ -2159,11 +2159,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + tab[i - 1] = s4; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s4 = (s3 << 24) + (s2 << 16) + (s1 << 8) + s0; + #else + s4 = (s0 << 24) + (s1 << 16) + (s2 << 8) + s3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + tab[255] = s4; + + for (j = 0; j < ysize; j++, dst += dlb, src += slb) { +@@ -2229,13 +2229,13 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + for (i = 0; i < size - 4; i += 2, da += 2, sa += 2) { + t1 = tab[s0]; + t2 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t0 >> shift) + (t1 << shift1); + res2 = (t1 >> shift) + (t2 << shift1); + #else + res1 = (t0 << shift) + (t1 >> shift1); + res2 = (t1 << shift) + (t2 >> shift1); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + t0 = t2; + s0 = sa[0]; + s1 = sa[1]; +@@ -2245,28 +2245,28 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + + t1 = tab[s0]; + t2 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t0 >> shift) + (t1 << shift1); + res2 = (t1 >> shift) + (t2 << shift1); + #else + res1 = (t0 << shift) + (t1 >> shift1); + res2 = (t1 << shift) + (t2 >> shift1); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = res1; + da[1] = res2; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = (da[2] >> shift1); + da[2] = (t2 >> shift) + (t0 << shift1); + #else + t0 = (da[2] << shift1); + da[2] = (t2 << shift) + (t0 >> shift1); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da += 2; + dp = (mlib_u8 *) da + (4 - off); + + if ((size & 1) == 0) { + t0 = tab[sa[0]]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + dp[3] = (mlib_u8) (t0 >> 24); + dp[2] = (mlib_u8) (t0 >> 16); + dp[1] = (mlib_u8) (t0 >> 8); +@@ -2276,7 +2276,7 @@ void mlib_c_ImageLookUpSI_U8_U8(const mlib_u8 *src, + dp[1] = (mlib_u8) (t0 >> 16); + dp[2] = (mlib_u8) (t0 >> 8); + dp[3] = (mlib_u8) t0; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + } + } + } +@@ -2352,13 +2352,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const mlib_s16 *src, + t3 = tab0[s1]; + t4 = tab1[s1]; + t5 = tab2[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + res2 = (t5 << 8) + t4; + #else + da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; + res2 = (t4 << 24) + (t5 << 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + s1 = sa[1]; + t0 = tab0[s0]; +@@ -2367,13 +2367,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const mlib_s16 *src, + t3 = tab0[s1]; + t4 = tab1[s1]; + t5 = tab2[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 += ((t1 << 24) + (t0 << 16)); + res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2; + #else + res2 += ((t0 << 8) + t1); + res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[2]; + s1 = sa[3]; + da[1] = res2; +@@ -2386,13 +2386,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const mlib_s16 *src, + t3 = tab0[s1]; + t4 = tab1[s1]; + t5 = tab2[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + res2 = (t5 << 8) + t4; + #else + da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; + res2 = (t4 << 24) + (t5 << 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + s1 = sa[1]; + t0 = tab0[s0]; +@@ -2401,13 +2401,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const mlib_s16 *src, + t3 = tab0[s1]; + t4 = tab1[s1]; + t5 = tab2[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 += ((t1 << 24) + (t0 << 16)); + res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2; + #else + res2 += ((t0 << 8) + t1); + res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[1] = res2; + da[2] = res1; + da += 3; +@@ -2459,11 +2459,11 @@ void mlib_c_ImageLookUpSI_S16_U8(const mlib_s16 *src, + t1 = tab1[s0]; + t2 = tab2[s0]; + t3 = tab3[s0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + #else + res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + da[0] = res; + } +@@ -2472,11 +2472,11 @@ void mlib_c_ImageLookUpSI_S16_U8(const mlib_s16 *src, + t1 = tab1[s0]; + t2 = tab2[s0]; + t3 = tab3[s0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + #else + res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = res; + + } +@@ -2500,11 +2500,11 @@ void mlib_c_ImageLookUpSI_S16_U8(const mlib_s16 *src, + t2 = tab2[s0]; + t3 = tab3[s0]; + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + #else + res1 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + s0 = sa[0]; + sa++; +@@ -2517,13 +2517,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const mlib_s16 *src, + t1 = tab1[s0]; + t2 = tab2[s0]; + t3 = tab3[s0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + res = (res1 >> shift) + (res2 << shift1); + #else + res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; + res = (res1 << shift) + (res2 >> shift1); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + res1 = res2; + s0 = sa[0]; + da[0] = res; +@@ -2533,21 +2533,21 @@ void mlib_c_ImageLookUpSI_S16_U8(const mlib_s16 *src, + t1 = tab1[s0]; + t2 = tab2[s0]; + t3 = tab3[s0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + res = (res1 >> shift) + (res2 << shift1); + #else + res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; + res = (res1 << shift) + (res2 >> shift1); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = res; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (da[1] >> shift1); + da[1] = (res2 >> shift) + (res1 << shift1); + #else + res1 = (da[1] << shift1); + da[1] = (res2 << shift) + (res1 >> shift1); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + } + } + } +@@ -2621,13 +2621,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const mlib_u16 *src, + t3 = tab0[s1]; + t4 = tab1[s1]; + t5 = tab2[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + res2 = (t5 << 8) + t4; + #else + da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; + res2 = (t4 << 24) + (t5 << 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + s1 = sa[1]; + t0 = tab0[s0]; +@@ -2636,13 +2636,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const mlib_u16 *src, + t3 = tab0[s1]; + t4 = tab1[s1]; + t5 = tab2[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 += ((t1 << 24) + (t0 << 16)); + res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2; + #else + res2 += ((t0 << 8) + t1); + res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[2]; + s1 = sa[3]; + da[1] = res2; +@@ -2655,13 +2655,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const mlib_u16 *src, + t3 = tab0[s1]; + t4 = tab1[s1]; + t5 = tab2[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + res2 = (t5 << 8) + t4; + #else + da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; + res2 = (t4 << 24) + (t5 << 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + s1 = sa[1]; + t0 = tab0[s0]; +@@ -2670,13 +2670,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const mlib_u16 *src, + t3 = tab0[s1]; + t4 = tab1[s1]; + t5 = tab2[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 += ((t1 << 24) + (t0 << 16)); + res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2; + #else + res2 += ((t0 << 8) + t1); + res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[1] = res2; + da[2] = res1; + da += 3; +@@ -2728,11 +2728,11 @@ void mlib_c_ImageLookUpSI_U16_U8(const mlib_u16 *src, + t1 = tab1[s0]; + t2 = tab2[s0]; + t3 = tab3[s0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + #else + res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + da[0] = res; + } +@@ -2741,11 +2741,11 @@ void mlib_c_ImageLookUpSI_U16_U8(const mlib_u16 *src, + t1 = tab1[s0]; + t2 = tab2[s0]; + t3 = tab3[s0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + #else + res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = res; + + } +@@ -2769,11 +2769,11 @@ void mlib_c_ImageLookUpSI_U16_U8(const mlib_u16 *src, + t2 = tab2[s0]; + t3 = tab3[s0]; + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + #else + res1 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + s0 = sa[0]; + sa++; +@@ -2786,13 +2786,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const mlib_u16 *src, + t1 = tab1[s0]; + t2 = tab2[s0]; + t3 = tab3[s0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + res = (res1 >> shift) + (res2 << shift1); + #else + res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; + res = (res1 << shift) + (res2 >> shift1); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + res1 = res2; + s0 = sa[0]; + da[0] = res; +@@ -2802,21 +2802,21 @@ void mlib_c_ImageLookUpSI_U16_U8(const mlib_u16 *src, + t1 = tab1[s0]; + t2 = tab2[s0]; + t3 = tab3[s0]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0; + res = (res1 >> shift) + (res2 << shift1); + #else + res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3; + res = (res1 << shift) + (res2 >> shift1); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = res; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (da[1] >> shift1); + da[1] = (res2 >> shift) + (res1 << shift1); + #else + res1 = (da[1] << shift1); + da[1] = (res2 << shift) + (res1 >> shift1); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + } + } + } +@@ -2867,21 +2867,21 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + s0 = tab0[0]; + s1 = tab1[0]; + for (i = 1; i < 256; i++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s2 = (s1 << 16) + s0; + #else + s2 = (s0 << 16) + s1; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = tab0[i]; + s1 = tab1[i]; + tab[i - 1] = s2; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s2 = (s1 << 16) + s0; + #else + s2 = (s0 << 16) + s1; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + tab[255] = s2; + + for (j = 0; j < ysize; j++, dst += dlb, src += slb) { +@@ -2923,11 +2923,11 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + else { + + t0 = tab[*sa++]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *dp++ = (mlib_u16) (t0); + #else + *dp++ = (mlib_u16) (t0 >> 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da = (mlib_u32 *) dp; + s0 = sa[0]; + s1 = sa[1]; +@@ -2939,13 +2939,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + for (i = 0; i < size - 4; i += 2, da += 2, sa += 2) { + t1 = tab[s0]; + t2 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t0 >> 16) + (t1 << 16); + res2 = (t1 >> 16) + (t2 << 16); + #else + res1 = (t0 << 16) + (t1 >> 16); + res2 = (t1 << 16) + (t2 >> 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + t0 = t2; + s0 = sa[0]; + s1 = sa[1]; +@@ -2955,32 +2955,32 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + + t1 = tab[s0]; + t2 = tab[s1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t0 >> 16) + (t1 << 16); + res2 = (t1 >> 16) + (t2 << 16); + #else + res1 = (t0 << 16) + (t1 >> 16); + res2 = (t1 << 16) + (t2 >> 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = res1; + da[1] = res2; + da += 2; + dp = (mlib_u16 *) da; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + dp[0] = (mlib_u16) (t2 >> 16); + #else + dp[0] = (mlib_u16) t2; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + if ((size & 1) == 0) { + t0 = tab[sa[0]]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + dp[2] = (mlib_u16) (t0 >> 16); + dp[1] = (mlib_u16) t0; + #else + dp[1] = (mlib_u16) (t0 >> 16); + dp[2] = (mlib_u16) t0; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + } + } + } +@@ -2998,13 +2998,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + s1 = tab1[0]; + s2 = tab2[0]; + for (i = 1; i < 256; i++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s3 = (s0 << 16); + s4 = (s2 << 16) + s1; + #else + s3 = s0; + s4 = (s1 << 16) + s2; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = tab0[i]; + s1 = tab1[i]; + s2 = tab2[i]; +@@ -3012,13 +3012,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + tab[2 * i - 1] = s4; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s4 = (s2 << 16) + s1; + tab[510] = s0 << 16; + #else + s4 = (s1 << 16) + s2; + tab[510] = s0; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + tab[511] = s4; + + for (j = 0; j < ysize; j++, dst += dlb, src += slb) { +@@ -3054,13 +3054,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t0 >> 16) + (t1 << 16); + res2 = (t1 >> 16) + t2; + #else + res1 = (t0 << 16) + (t1 >> 16); + res2 = (t1 << 16) + t2; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0] << 3; + s1 = sa[1] << 3; + da[0] = res1; +@@ -3072,13 +3072,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t0 >> 16) + (t1 << 16); + res2 = (t1 >> 16) + t2; + #else + res1 = (t0 << 16) + (t1 >> 16); + res2 = (t1 << 16) + t2; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = res1; + da[1] = res2; + da[2] = t3; +@@ -3109,13 +3109,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + s2 = tab2[0]; + s3 = tab3[0]; + for (i = 1; i < 256; i++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s4 = (s1 << 16) + s0; + s5 = (s3 << 16) + s2; + #else + s4 = (s0 << 16) + s1; + s5 = (s2 << 16) + s3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = tab0[i]; + s1 = tab1[i]; + s2 = tab2[i]; +@@ -3124,13 +3124,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + tab[2 * i - 1] = s5; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + s4 = (s1 << 16) + s0; + s5 = (s3 << 16) + s2; + #else + s4 = (s0 << 16) + s1; + s5 = (s2 << 16) + s3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + tab[510] = s4; + tab[511] = s5; + +@@ -3185,18 +3185,18 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + + t4 = tab[2 * sa[0]]; + t5 = tab[2 * sa[0] + 1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *dp++ = (mlib_u16) (t4); + #else + *dp++ = (mlib_u16) (t4 >> 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + sa++; + da = (mlib_u32 *) dp; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + *da++ = (t4 >> 16) + (t5 << 16); + #else + *da++ = (t4 << 16) + (t5 >> 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0] << 3; + s1 = sa[1] << 3; + sa += 2; +@@ -3209,7 +3209,7 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t5 >> 16) + (t0 << 16); + res2 = (t0 >> 16) + (t1 << 16); + res3 = (t1 >> 16) + (t2 << 16); +@@ -3219,7 +3219,7 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + res2 = (t0 << 16) + (t1 >> 16); + res3 = (t1 << 16) + (t2 >> 16); + res4 = (t2 << 16) + (t3 >> 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0] << 3; + s1 = sa[1] << 3; + da[0] = res1; +@@ -3233,7 +3233,7 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4); +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + res1 = (t5 >> 16) + (t0 << 16); + res2 = (t0 >> 16) + (t1 << 16); + res3 = (t1 >> 16) + (t2 << 16); +@@ -3243,36 +3243,36 @@ void mlib_c_ImageLookUpSI_U8_S16(const mlib_u8 *src, + res2 = (t0 << 16) + (t1 >> 16); + res3 = (t1 << 16) + (t2 >> 16); + res4 = (t2 << 16) + (t3 >> 16); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + da[0] = res1; + da[1] = res2; + da[2] = res3; + da[3] = res4; + da += 4; + dp = (mlib_u16 *) da; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + dp[0] = (mlib_u16) (t3 >> 16); + #else + dp[0] = (mlib_u16) t3; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + + if ((size & 1) == 0) { + t0 = tab[2 * sa[0]]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + dp[2] = (mlib_u16) (t0 >> 16); + dp[1] = (mlib_u16) t0; + #else + dp[1] = (mlib_u16) (t0 >> 16); + dp[2] = (mlib_u16) t0; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + t0 = tab[2 * sa[0] + 1]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + dp[4] = (mlib_u16) (t0 >> 16); + dp[3] = (mlib_u16) t0; + #else + dp[3] = (mlib_u16) (t0 >> 16); + dp[4] = (mlib_u16) t0; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + } + } + } +@@ -3443,7 +3443,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + #pragma pipeloop(0) + #endif /* __SUNPRO_C */ + for (i = 0; i < size - 7; i += 4, dp += 8, sa++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC)); +@@ -3453,12 +3453,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC)); +@@ -3468,7 +3468,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + dp[4] = t0; + dp[5] = t1; +@@ -3476,7 +3476,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + dp[7] = t3; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC)); +@@ -3486,12 +3486,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC)); +@@ -3501,7 +3501,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[4] = t0; + dp[5] = t1; + dp[6] = t2; +@@ -3549,7 +3549,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + #pragma pipeloop(0) + #endif /* __SUNPRO_C */ + for (i = 0; i < size - 7; i += 4, dp += 12, sa++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC)); +@@ -3563,14 +3563,14 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; + dp[4] = t4; + dp[5] = t5; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC)); +@@ -3584,7 +3584,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + dp[6] = t0; + dp[7] = t1; +@@ -3594,7 +3594,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + dp[11] = t5; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC)); +@@ -3608,14 +3608,14 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; + dp[4] = t4; + dp[5] = t5; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC)); +@@ -3629,7 +3629,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[6] = t0; + dp[7] = t1; + dp[8] = t2; +@@ -3682,7 +3682,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + #pragma pipeloop(0) + #endif /* __SUNPRO_C */ + for (i = 0; i < size - 7; i += 4, dp += 16, sa++) { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC)); +@@ -3692,12 +3692,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 22) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC)); +@@ -3707,12 +3707,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 14) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[4] = t0; + dp[5] = t1; + dp[6] = t2; + dp[7] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC)); +@@ -3722,12 +3722,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 6) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[8] = t0; + dp[9] = t1; + dp[10] = t2; + dp[11] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC)); +@@ -3737,7 +3737,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 << 2) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + s0 = sa[0]; + dp[12] = t0; + dp[13] = t1; +@@ -3745,7 +3745,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + dp[15] = t3; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC)); +@@ -3755,12 +3755,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 22) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[0] = t0; + dp[1] = t1; + dp[2] = t2; + dp[3] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC)); +@@ -3770,12 +3770,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 14) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[4] = t0; + dp[5] = t1; + dp[6] = t2; + dp[7] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC)); +@@ -3785,12 +3785,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 6) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[8] = t0; + dp[9] = t1; + dp[10] = t2; + dp[11] = t3; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC)); + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC)); +@@ -3800,7 +3800,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const mlib_u8 *src, + t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC)); + t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC)); + t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 << 2) & 0x3FC)); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + dp[12] = t0; + dp[13] = t1; + dp[14] = t2; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_image_h b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_image_h new file mode 100644 index 00000000000..e42a98b0af6 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_image_h @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_image_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_image.h.orig Thu Jul 5 05:03:11 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_image.h Fri Jul 27 18:25:10 2007 +@@ -31,6 +31,11 @@ + #pragma ident "@(#)mlib_image.h 1.16 98/10/21 SMI" + #endif /* __SUNPRO_C */ + ++#ifdef __OpenBSD__ ++#include ++#endif ++#include ++ + #include + #include + #include diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_sys_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_sys_c new file mode 100644 index 00000000000..8b6ca5f6847 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_sys_c @@ -0,0 +1,33 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_sys_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_sys.c.orig Thu Jul 5 05:03:11 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_sys.c Fri Jul 27 18:25:10 2007 +@@ -30,9 +30,15 @@ + + #include + #include ++#ifdef _ALLBSD_SOURCE ++#include ++#endif + #include + #include + #include "mlib_SysMath.h" ++#if defined(_ALLBSD_SOURCE) ++#include ++#endif + + /***************************************************************/ + +@@ -90,7 +96,12 @@ void *__mlib_malloc(mlib_u32 size) + * alignment. -- from stdlib.h of MS VC++5.0. + */ + return (void *) malloc(size); +-#else /* _MSC_VER */ ++#elif defined(__FreeBSD__) && (__FreeBSD_version >= 700013) ++ void *ret; ++ return posix_memalign(&ret, 8, size) ? NULL : ret; ++#elif defined(_ALLBSD_SOURCE) ++ return valloc(size); ++#else + return (void *) memalign(8, size); + #endif /* _MSC_VER */ + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_types_h b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_types_h new file mode 100644 index 00000000000..c13a6891ada --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_awt_medialib_mlib_types_h @@ -0,0 +1,19 @@ +$OpenBSD: patch-j2se_src_share_native_sun_awt_medialib_mlib_types_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/awt/medialib/mlib_types.h.orig Thu Jul 5 05:03:11 2007 ++++ j2se/src/share/native/sun/awt/medialib/mlib_types.h Fri Jul 27 18:25:10 2007 +@@ -63,7 +63,14 @@ typedef double mlib_d64; + + #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__) + +-#if defined(__linux__) ++#if defined(_ALLBSD_SOURCE) ++#include /* for ptrdiff_t */ ++#if defined(__OpenBSD__) ++#include /* for uintptr_t */ ++#else ++#include /* for uintptr_t */ ++#endif ++#elif defined(__linux__) + #include /* for uintptr_t */ + #include /* for ptrdiff_t */ + #else diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_font_AccelGlyphCache_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_font_AccelGlyphCache_c new file mode 100644 index 00000000000..e4c7d8a7c84 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_font_AccelGlyphCache_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_share_native_sun_font_AccelGlyphCache_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/font/AccelGlyphCache.c.orig Thu Jul 5 05:03:15 2007 ++++ j2se/src/share/native/sun/font/AccelGlyphCache.c Fri Jul 27 18:25:10 2007 +@@ -23,7 +23,11 @@ + * + */ + ++#ifdef _ALLBSD_SOURCE ++#include ++#else + #include ++#endif + #include "jni.h" + #include "AccelGlyphCache.h" + #include "Trace.h" diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_SurfaceData_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_SurfaceData_c new file mode 100644 index 00000000000..cee06f2fc72 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_SurfaceData_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_share_native_sun_java2d_SurfaceData_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/java2d/SurfaceData.c.orig Thu Jul 5 05:03:17 2007 ++++ j2se/src/share/native/sun/java2d/SurfaceData.c Fri Jul 27 18:25:14 2007 +@@ -28,7 +28,11 @@ + #include "jni_util.h" + #include "Disposer.h" + ++#ifdef _ALLBSD_SOURCE ++#include ++#else + #include "malloc.h" ++#endif + #include "string.h" + + /** diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLFuncs_h b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLFuncs_h new file mode 100644 index 00000000000..9b1673045e0 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLFuncs_h @@ -0,0 +1,13 @@ +$OpenBSD: patch-j2se_src_share_native_sun_java2d_opengl_OGLFuncs_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/java2d/opengl/OGLFuncs.h.orig Thu Jul 5 05:03:18 2007 ++++ j2se/src/share/native/sun/java2d/opengl/OGLFuncs.h Fri Jul 27 18:25:14 2007 +@@ -26,6 +26,9 @@ + #ifndef OGLFuncs_h_Included + #define OGLFuncs_h_Included + ++#ifdef _ALLBSD_SOURCE ++#include ++#endif + #include "jni.h" + #include "J2D_GL/gl.h" + #include "J2D_GL/glext.h" diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLRenderQueue_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLRenderQueue_c new file mode 100644 index 00000000000..91fc3ece469 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLRenderQueue_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_share_native_sun_java2d_opengl_OGLRenderQueue_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/java2d/opengl/OGLRenderQueue.c.orig Thu Jul 5 05:03:18 2007 ++++ j2se/src/share/native/sun/java2d/opengl/OGLRenderQueue.c Fri Jul 27 18:25:14 2007 +@@ -25,7 +25,11 @@ + + #ifndef HEADLESS + ++#ifdef _ALLBSD_SOURCE ++#include ++#else + #include ++#endif + + #include "sun_java2d_pipe_BufferedOpCodes.h" + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLTextRenderer_c b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLTextRenderer_c new file mode 100644 index 00000000000..16106918743 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_native_sun_java2d_opengl_OGLTextRenderer_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_share_native_sun_java2d_opengl_OGLTextRenderer_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/native/sun/java2d/opengl/OGLTextRenderer.c.orig Thu Jul 5 05:03:18 2007 ++++ j2se/src/share/native/sun/java2d/opengl/OGLTextRenderer.c Fri Jul 27 18:25:14 2007 +@@ -25,7 +25,11 @@ + + #ifndef HEADLESS + ++#ifdef _ALLBSD_SOURCE ++#include ++#else + #include ++#endif + #include + #include + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_share_transport_socket_socketTransport_c b/devel/jdk/1.7/patches/patch-j2se_src_share_transport_socket_socketTransport_c new file mode 100644 index 00000000000..64b5a45ad56 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_share_transport_socket_socketTransport_c @@ -0,0 +1,90 @@ +$OpenBSD: patch-j2se_src_share_transport_socket_socketTransport_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/share/transport/socket/socketTransport.c.orig Thu Jul 5 05:03:20 2007 ++++ j2se/src/share/transport/socket/socketTransport.c Fri Jul 27 18:25:14 2007 +@@ -65,6 +65,9 @@ static jdwpTransportEnv single_env = (jdwpTransportEnv + #define HEADER_SIZE 11 + #define MAX_DATA_SIZE 1000 + ++static jint recv_fully(int, char *, int); ++static jint send_fully(int, char *, int); ++ + /* + * Record the last error for this thread. + */ +@@ -153,7 +156,7 @@ handshake(int fd, jlong timeout) { + } + buf = b; + buf += received; +- n = dbgsysRecv(fd, buf, strlen(hello)-received, 0); ++ n = recv_fully(fd, buf, strlen(hello)-received); + if (n == 0) { + setLastError(0, "handshake failed - connection prematurally closed"); + return JDWPTRANSPORT_ERROR_IO_ERROR; +@@ -179,7 +182,7 @@ handshake(int fd, jlong timeout) { + } + } + +- if (dbgsysSend(fd, hello, strlen(hello), 0) != (int)strlen(hello)) { ++ if (send_fully(fd, hello, strlen(hello)) != (int)strlen(hello)) { + RETURN_IO_ERROR("send failed during handshake"); + } + return JDWPTRANSPORT_ERROR_NONE; +@@ -554,19 +557,19 @@ socketTransport_writePacket(jdwpTransportEnv* env, con + /* Do one send for short packets, two for longer ones */ + if (data_len <= MAX_DATA_SIZE) { + memcpy(header + HEADER_SIZE, data, data_len); +- if (dbgsysSend(socketFD, (char *)&header, HEADER_SIZE + data_len, 0) != ++ if (send_fully(socketFD, (char *)&header, HEADER_SIZE + data_len) != + HEADER_SIZE + data_len) { + RETURN_IO_ERROR("send failed"); + } + } else { + memcpy(header + HEADER_SIZE, data, MAX_DATA_SIZE); +- if (dbgsysSend(socketFD, (char *)&header, HEADER_SIZE + MAX_DATA_SIZE, 0) != ++ if (send_fully(socketFD, (char *)&header, HEADER_SIZE + MAX_DATA_SIZE) != + HEADER_SIZE + MAX_DATA_SIZE) { + RETURN_IO_ERROR("send failed"); + } + /* Send the remaining data bytes right out of the data area. */ +- if (dbgsysSend(socketFD, (char *)data + MAX_DATA_SIZE, +- data_len - MAX_DATA_SIZE, 0) != data_len - MAX_DATA_SIZE) { ++ if (send_fully(socketFD, (char *)data + MAX_DATA_SIZE, ++ data_len - MAX_DATA_SIZE) != data_len - MAX_DATA_SIZE) { + RETURN_IO_ERROR("send failed"); + } + } +@@ -574,13 +577,33 @@ socketTransport_writePacket(jdwpTransportEnv* env, con + return JDWPTRANSPORT_ERROR_NONE; + } + +-static jint ++jint + recv_fully(int f, char *buf, int len) + { + int nbytes = 0; + while (nbytes < len) { + int res = dbgsysRecv(f, buf + nbytes, len - nbytes, 0); + if (res < 0) { ++ if (errno == EINTR) ++ continue; ++ return res; ++ } else if (res == 0) { ++ break; /* eof, return nbytes which is less than len */ ++ } ++ nbytes += res; ++ } ++ return nbytes; ++} ++ ++jint ++send_fully(int f, char *buf, int len) ++{ ++ int nbytes = 0; ++ while (nbytes < len) { ++ int res = dbgsysSend(f, buf + nbytes, len - nbytes, 0); ++ if (res < 0) { ++ if (errno == EINTR) ++ continue; + return res; + } else if (res == 0) { + break; /* eof, return nbytes which is less than len */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_back_exec_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_back_exec_md_c new file mode 100644 index 00000000000..6f641bf3d7f --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_back_exec_md_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_back_exec_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/back/exec_md.c.orig Thu Jul 5 05:03:20 2007 ++++ j2se/src/solaris/back/exec_md.c Wed Aug 1 14:07:43 2007 +@@ -30,7 +30,7 @@ + #include "sys.h" + #include "util.h" + +-#ifdef LINUX ++#if defined(LINUX) || defined(_ALLBSD_SOURCE) + /* Linux */ + #define FORK() fork() + #else diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_back_util_md_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_back_util_md_h new file mode 100644 index 00000000000..a679e75b79d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_back_util_md_h @@ -0,0 +1,20 @@ +$OpenBSD: patch-j2se_src_solaris_back_util_md_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/back/util_md.h.orig Thu Jul 5 05:03:20 2007 ++++ j2se/src/solaris/back/util_md.h Fri Jul 27 18:25:14 2007 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + #ifdef _LP64 + typedef unsigned long UNSIGNED_JLONG; +@@ -43,7 +44,7 @@ typedef unsigned long UNSIGNED_JINT; + + /* On little endian machines, convert java big endian numbers. */ + +-#if defined(_LITTLE_ENDIAN) ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) + #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_bin_java_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_bin_java_md_c new file mode 100644 index 00000000000..bea2f6ae275 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_bin_java_md_c @@ -0,0 +1,309 @@ +$OpenBSD: patch-j2se_src_solaris_bin_java_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/bin/java_md.c.orig Thu Jul 5 05:03:20 2007 ++++ j2se/src/solaris/bin/java_md.c Fri Jul 27 18:25:14 2007 +@@ -34,10 +34,15 @@ + #include + #include + #include ++#if defined(_ALLBSD_SOURCE) ++#include ++#include ++#endif ++ + #include "manifest_info.h" + #include "version_comp.h" + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #else + #include +@@ -81,7 +86,13 @@ extern char **environ; + * A collection of useful strings. One should think of these as #define + * entries, but actual strings can be more efficient (with many compilers). + */ +-#ifdef __linux__ ++#if defined(__FreeBSD__) ++static const char *system_dir = "/usr/local/jdk1.6.0"; ++static const char *user_dir = "/java"; ++#elif defined(__OpenBSD__) ++static const char *system_dir = "/usr/local/jdk-1.6.0"; ++static const char *user_dir = "/java"; ++#elif defined(__linux__) + static const char *system_dir = "/usr/java"; + static const char *user_dir = "/java"; + #else /* Solaris */ +@@ -407,7 +418,7 @@ CreateExecutionEnvironment(int *_argcp, + runpath = getenv("LD_LIBRARY_PATH"); + #endif /* __sun */ + +-#ifdef __linux ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + /* + * On linux, if a binary is running as sgid or suid, glibc sets + * LD_LIBRARY_PATH to the empty string for security purposes. (In +@@ -460,7 +471,6 @@ CreateExecutionEnvironment(int *_argcp, + #endif + ); + +- + /* + * Check to make sure that the prefix of the current path is the + * desired environment variable setting. +@@ -721,7 +731,8 @@ error: + jboolean + GetApplicationHome(char *buf, jint bufsize) + { +-#ifdef __linux__ ++/* XXXBSD: maybe use Solaris's way? */ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + char *execname = GetExecname(); + if (execname) { + strncpy(buf, execname, bufsize-1); +@@ -864,7 +875,7 @@ SetExecname(char **argv) + + if (execname != NULL) /* Already determined */ + return (execname); +- ++ + #if defined(__sun) + { + Dl_info dlinfo; +@@ -888,12 +899,47 @@ SetExecname(char **argv) + exec_path = JLI_StringDup(buf); + } + } ++#elif defined(__FreeBSD__) ++ /* Try /proc/curproc/file if exec_path hasn't been found */ ++ ++ if (exec_path == NULL) { ++ const char* self = "/proc/curproc/file"; ++ char buf[PATH_MAX+1]; ++ int len = readlink(self, buf, PATH_MAX); ++ if (len >= 0) { ++ buf[len] = '\0'; /* readlink doesn't nul terminate */ ++ exec_path = strdup(buf); ++ } ++ } ++ ++ /* ++ * Try the dladdr(3) method FreeBSD if exec_path hasn't been found. ++ * Requires a recent version of FreeBSD. ++ */ ++ ++ /* ++ if (exec_path == NULL) { ++ Dl_info dlinfo; ++ if (dladdr((void*)&SetExecname, &dlinfo)) { ++ char *resolved = (char*)MemAlloc(PATH_MAX+1); ++ if (resolved != NULL) { ++ exec_path = realpath(dlinfo.dli_fname, resolved); ++ if (exec_path == NULL) { ++ free(resolved); ++ } ++ } ++ } ++ } ++ */ ++ + #else /* !__sun && !__linux */ + { + /* Not implemented */ + } + #endif + ++ /* Fall back to examining argv[0] and our path */ ++ + if (exec_path == NULL) { + exec_path = FindExecName(argv[0]); + } +@@ -977,6 +1023,27 @@ jboolean RemovableMachineDependentOption(char * option + /* Compute physical memory by asking the OS */ + uint64_t + physical_memory(void) { ++ ++#if defined(_ALLBSD_SOURCE) ++ ++ unsigned long result; ++ int mib[2]; ++ size_t rlen; ++ ++ /* fetch sysctl(hw.physmem) value */ ++ mib[0] = CTL_HW; ++ mib[1] = HW_PHYSMEM; ++ rlen = sizeof(result); ++ if (sysctl(mib, 2, &result, &rlen, NULL, 0) == -1) ++ result = 256 * MB; ++ ++ if (_launcher_debug) { ++ printf( " physical memory: %ju (%.3fGB)\n", ++ (uintmax_t) result, result / (double) GB); ++ } ++ ++#else /* !_ALLBSD_SOURCE */ ++ + const uint64_t pages = (uint64_t) sysconf(_SC_PHYS_PAGES); + const uint64_t page_size = (uint64_t) sysconf(_SC_PAGESIZE); + const uint64_t result = pages * page_size; +@@ -988,6 +1055,8 @@ physical_memory(void) { + " physical memory: " UINT64_FORMAT " (%.3fGB)\n", + pages, page_size, result, result / (double) GB); + } ++#endif /* _ALLBSD_SOURCE */ ++ + return result; + } + +@@ -1083,7 +1152,7 @@ get_cpuid(uint32_t arg, + + #endif /* __sun && i586 */ + +-#if defined(__linux__) && defined(i586) ++#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(i586) + + /* + * A utility method for asking the CPU about itself. +@@ -1148,7 +1217,7 @@ get_cpuid(uint32_t arg, + #endif + } + +-#endif /* __linux__ && i586 */ ++#endif /* (__linux__ || _ALLBSD_SOURCE) && i586 */ + + #ifdef i586 + /* +@@ -1274,12 +1343,38 @@ logical_processors_per_package(void) { + /* Compute the number of physical processors, not logical processors */ + unsigned long + physical_processors(void) { ++ ++#if defined(_ALLBSD_SOURCE) ++ ++ unsigned long sys_processors; ++ int mib[2], result; ++ size_t rlen; ++ ++ /* fetch sysctl(hw.ncpu) value */ ++ mib[0] = CTL_HW; ++ mib[1] = HW_NCPU; ++ rlen = sizeof(result); ++ ++ if (sysctl(mib, 2, &result, &rlen, NULL, 0) == -1) ++ result = 1; ++ ++ if (_launcher_debug) { ++ printf("sysctl(hw.ncpu): %d\n", result); ++ } ++ ++ sys_processors = result; ++ ++#else /* !_ALLBSD_SOURCE */ ++ + const long sys_processors = sysconf(_SC_NPROCESSORS_CONF); + unsigned long result = sys_processors; + + if (_launcher_debug) { + printf("sysconf(_SC_NPROCESSORS_CONF): %lu\n", sys_processors); + } ++ ++#endif /* _ALLBSD_SOURCE */ ++ + if (sys_processors > 1) { + unsigned int logical_processors = logical_processors_per_package(); + if (logical_processors > 1) { +@@ -1289,6 +1384,7 @@ physical_processors(void) { + if (_launcher_debug) { + printf("physical processors: %lu\n", result); + } ++ + return result; + } + +@@ -1360,6 +1456,39 @@ linux_i586_ServerClassMachine(void) { + + #endif /* __linux__ && i586 */ + ++#if defined(_ALLBSD_SOURCE) && defined(i586) ++ ++/* The definition of a server-class machine for [free]bsd-i586 */ ++jboolean ++bsd_i586_ServerClassMachine(void) { ++ jboolean result = JNI_FALSE; ++ /* How big is a server class machine? */ ++ const unsigned long server_processors = 2UL; ++ const uint64_t server_memory = 2UL * GB; ++ /* ++ * We seem not to get our full complement of memory. ++ * We allow some part (1/8?) of the memory to be "missing", ++ * based on the sizes of DIMMs, and maybe graphics cards. ++ */ ++ const uint64_t missing_memory = 256UL * MB; ++ const uint64_t actual_memory = physical_memory(); ++ ++ /* Is this a server class machine? */ ++ if (actual_memory >= (server_memory - missing_memory)) { ++ const unsigned long actual_processors = physical_processors(); ++ if (actual_processors >= server_processors) { ++ result = JNI_TRUE; ++ } ++ } ++ if (_launcher_debug) { ++ printf("bsd_i586_ServerClassMachine: %s\n", ++ (result == JNI_TRUE ? "true" : "false")); ++ } ++ return result; ++} ++ ++#endif /* _ALLBSD_SOURCE && i586 */ ++ + /* Dispatch to the platform-specific definition of "server-class" */ + jboolean + ServerClassMachine(void) { +@@ -1374,6 +1503,8 @@ ServerClassMachine(void) { + result = solaris_i586_ServerClassMachine(); + #elif defined(__linux__) && defined(i586) + result = linux_i586_ServerClassMachine(); ++#elif defined(_ALLBSD_SOURCE) && defined(i586) ++ result = bsd_i586_ServerClassMachine(); + #else + if (_launcher_debug) { + printf("ServerClassMachine: returns default value of %s\n", +@@ -1514,7 +1645,7 @@ LocateJRE(manifest_info* info) + while (dp != NULL) { + cp = strchr(dp, (int)':'); + if (cp != NULL) +- *cp = (char)NULL; ++ *cp = '\0'; + if ((target = ProcessDir(info, dp)) != NULL) + break; + dp = cp; +@@ -1692,6 +1823,20 @@ UnsetEnv(char *name) + return(borrowed_unsetenv(name)); + } + ++#if defined(_ALLBSD_SOURCE) ++/* ++ * BSD's implementation of CounterGet() ++ */ ++int64_t ++CounterGet() ++{ ++ struct timeval tv; ++ gettimeofday(&tv, NULL); ++ return (tv.tv_sec * 1000) + tv.tv_usec; ++} ++#endif ++ ++ + /* --- Splash Screen shared library support --- */ + + static const char* SPLASHSCREEN_SO = "libsplashscreen.so"; +@@ -1728,7 +1873,7 @@ jlong_format_specifier() { + int + ContinueInNewThread(int (JNICALL *continuation)(void *), jlong stack_size, void * args, int ret) { + int rslt; +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + pthread_t tid; + pthread_attr_t attr; + pthread_attr_init(&attr); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_bin_java_md_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_bin_java_md_h new file mode 100644 index 00000000000..a5acaaffdf9 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_bin_java_md_h @@ -0,0 +1,19 @@ +$OpenBSD: patch-j2se_src_solaris_bin_java_md_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/bin/java_md.h.orig Thu Jul 5 05:03:20 2007 ++++ j2se/src/solaris/bin/java_md.h Fri Jul 27 18:25:14 2007 +@@ -58,10 +58,14 @@ + #include + #define CounterGet() (gethrtime()/1000) + #define Counter2Micros(counts) (counts) ++#elif defined(_ALLBSD_SOURCE) ++/* CounterGet() is implemented in java_md.c */ ++int64_t CounterGet(void); ++#define Counter2Micros(counts) (counts) + #else + #define CounterGet() (0) + #define Counter2Micros(counts) (1) +-#endif /* HAVE_GETHRTIME */ ++#endif /* HAVE_GETHRTIME || _ALLBSD_SOURCE */ + + /* + * Function prototypes. diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java new file mode 100644 index 00000000000..f492ea932c6 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java @@ -0,0 +1,21 @@ +$OpenBSD: patch-j2se_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java.orig Thu Aug 30 05:05:45 2007 ++++ j2se/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java Sun Sep 2 14:06:06 2007 +@@ -404,7 +404,7 @@ public class X11GraphicsEnvironment + if (fontID != null) { + fileName = (String)fontNameMap.get(fontID); + /* On Linux check for the Lucida Oblique fonts */ +- if (fileName == null && isLinux && !isOpenJDK()) { ++ if (fileName == null && isLinuxOrBSD && !isOpenJDK()) { + if (oblmap == null) { + initObliqueLucidaFontMap(); + } +@@ -640,7 +640,7 @@ public class X11GraphicsEnvironment + if (fontConfigDirs == null) { + return; + } +- if (isLinux) { ++ if (isLinuxOrBSD) { + fontConfigDirs.add(jreLibDirName+File.separator+"oblique-fonts"); + } + fontdirs = (String[])fontConfigDirs.toArray(new String[0]); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_awt_motif_MFontConfiguration_java b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_awt_motif_MFontConfiguration_java new file mode 100644 index 00000000000..32ee1c87e08 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_awt_motif_MFontConfiguration_java @@ -0,0 +1,11 @@ +$OpenBSD: patch-j2se_src_solaris_classes_sun_awt_motif_MFontConfiguration_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/classes/sun/awt/motif/MFontConfiguration.java.orig Thu Jul 5 05:03:25 2007 ++++ j2se/src/solaris/classes/sun/awt/motif/MFontConfiguration.java Fri Jul 27 18:25:14 2007 +@@ -122,6 +122,7 @@ public class MFontConfiguration extends FontConfigurat + reorderMap.put("ISO-8859-5", "cyrillic-iso8859-5"); + reorderMap.put("windows-1251", "cyrillic-cp1251"); + reorderMap.put("KOI8-R", "cyrillic-koi8-r"); ++ reorderMap.put("KOI8-U", "cyrillic-koi8-u"); + reorderMap.put("ISO-8859-6", "arabic"); + reorderMap.put("ISO-8859-7", "greek"); + reorderMap.put("ISO-8859-8", "hebrew"); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_font_XMap_java b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_font_XMap_java new file mode 100644 index 00000000000..44c932ac9ea --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_font_XMap_java @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_classes_sun_font_XMap_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/classes/sun/font/XMap.java.orig Thu Jul 5 05:03:26 2007 ++++ j2se/src/solaris/classes/sun/font/XMap.java Fri Jul 27 18:25:14 2007 +@@ -102,6 +102,8 @@ class XMap { + jclass = "ISO8859_5"; + } else if (encoding.equals("koi8-r")) { + jclass = "KOI8_R"; ++ } else if (encoding.equals("koi8-u")) { ++ jclass = "KOI8_U"; + } else if (encoding.equals("ansi-1251")) { + jclass = "windows-1251"; + } else if (encoding.equals("iso8859-6")) { diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_print_UnixPrintServiceLookup_java b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_print_UnixPrintServiceLookup_java new file mode 100644 index 00000000000..de5595390a4 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_print_UnixPrintServiceLookup_java @@ -0,0 +1,42 @@ +$OpenBSD: patch-j2se_src_solaris_classes_sun_print_UnixPrintServiceLookup_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/classes/sun/print/UnixPrintServiceLookup.java.orig Thu Jul 5 05:03:28 2007 ++++ j2se/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Fri Jul 27 18:36:54 2007 +@@ -120,7 +120,10 @@ public class UnixPrintServiceLookup extends PrintServi + } + + static boolean isBSD() { +- return osname.equals("Linux"); ++ return (osname.equals("Linux") || ++ osname.equals("FreeBSD") || ++ osname.equals("NetBSD") || ++ osname.equals("OpenBSD")); + } + + static final int UNINITIALIZED = -1; +@@ -130,13 +133,13 @@ public class UnixPrintServiceLookup extends PrintServi + static int cmdIndex = UNINITIALIZED; + + String[] lpcFirstCom = { +- "/usr/sbin/lpc status | grep : | sed -ne '1,1 s/://p'", +- "/usr/sbin/lpc status | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}'" ++ "/usr/sbin/lpc status all | grep : | sed -ne '1,1 s/://p'", ++ "/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}'" + }; + + String[] lpcAllCom = { +- "/usr/sbin/lpc status | grep : | sed -e 's/://'", +- "/usr/sbin/lpc -a status | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort" ++ "/usr/sbin/lpc status all | grep : | sed -e 's/://'", ++ "/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort" + }; + + String[] lpcNameCom = { +@@ -146,7 +149,7 @@ public class UnixPrintServiceLookup extends PrintServi + + + static int getBSDCommandIndex() { +- String command = "/usr/sbin/lpc status"; ++ String command = "/usr/sbin/lpc status all"; + String[] names = execCmd(command); + + if ((names == null) || (names.length == 0)) { diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_security_provider_NativePRNG_java b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_security_provider_NativePRNG_java new file mode 100644 index 00000000000..7ec87cbbde2 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_security_provider_NativePRNG_java @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_classes_sun_security_provider_NativePRNG_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/classes/sun/security/provider/NativePRNG.java.orig Thu Aug 2 09:42:43 2007 ++++ j2se/src/solaris/classes/sun/security/provider/NativePRNG.java Thu Aug 2 09:42:58 2007 +@@ -64,7 +64,7 @@ public final class NativePRNG extends SecureRandomSpi + private static final long serialVersionUID = -6599091113397072932L; + + // name of the pure random file (also used for setSeed()) +- private static final String NAME_RANDOM = "/dev/random"; ++ private static final String NAME_RANDOM = "/dev/srandom"; + // name of the pseudo random file + private static final String NAME_URANDOM = "/dev/urandom"; + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_tools_attach_BsdAttachProvider_java b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_tools_attach_BsdAttachProvider_java new file mode 100644 index 00000000000..2c15c13596d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_classes_sun_tools_attach_BsdAttachProvider_java @@ -0,0 +1,37 @@ +$OpenBSD: patch-j2se_src_solaris_classes_sun_tools_attach_BsdAttachProvider_java,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/classes/sun/tools/attach/BsdAttachProvider.java.orig Fri Aug 3 18:02:50 2007 ++++ j2se/src/solaris/classes/sun/tools/attach/BsdAttachProvider.java Fri Aug 3 18:24:19 2007 +@@ -54,31 +54,13 @@ public class BsdAttachProvider extends HotSpotAttachPr + public VirtualMachine attachVirtualMachine(String vmid) + throws AttachNotSupportedException, IOException + { +- checkAttachPermission(); +- +- // AttachNotSupportedException will be thrown if the target VM can be determined +- // to be not attachable. +- testAttachable(vmid); +- +- return new BsdVirtualMachine(this, vmid); ++ throw new AttachNotSupportedException("Attach not yet supported on BSD"); + } + + public VirtualMachine attachVirtualMachine(VirtualMachineDescriptor vmd) + throws AttachNotSupportedException, IOException + { +- if (vmd.provider() != this) { +- throw new AttachNotSupportedException("provider mismatch"); +- } +- // To avoid re-checking if the VM if attachable, we check if the descriptor +- // is for a hotspot VM - these descriptors are created by the listVirtualMachines +- // implementation which only returns a list of attachable VMs. +- if (vmd instanceof HotSpotVirtualMachineDescriptor) { +- assert ((HotSpotVirtualMachineDescriptor)vmd).isAttachable(); +- checkAttachPermission(); +- return new BsdVirtualMachine(this, vmd.id()); +- } else { +- return attachVirtualMachine(vmd.id()); +- } ++ throw new AttachNotSupportedException("Attach not yet supported on BSD"); + } + + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_demo_jvmti_hprof_hprof_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_demo_jvmti_hprof_hprof_md_c new file mode 100644 index 00000000000..3b0491de2ee --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_demo_jvmti_hprof_hprof_md_c @@ -0,0 +1,48 @@ +$OpenBSD: patch-j2se_src_solaris_demo_jvmti_hprof_hprof_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/demo/jvmti/hprof/hprof_md.c.orig Thu Jul 5 03:53:14 2007 ++++ j2se/src/solaris/demo/jvmti/hprof/hprof_md.c Fri Jul 27 18:25:14 2007 +@@ -33,7 +33,7 @@ + #include + #include + +-#ifndef LINUX ++#if !defined(LINUX) && !defined(_ALLBSD_SOURCE) + #include + #endif + +@@ -76,7 +76,7 @@ md_sleep(unsigned seconds) + void + md_init(void) + { +-#ifdef LINUX ++#if defined(LINUX) || defined(_ALLBSD_SOURCE) + /* No Hi-Res timer option? */ + #else + if ( gdata->micro_state_accounting ) { +@@ -238,7 +238,7 @@ md_timeofday(void) + jlong + md_get_microsecs(void) + { +-#ifdef LINUX ++#if defined(LINUX) || defined(_ALLBSD_SOURCE) + return (jlong)(md_timeofday() * (jlong)1000); /* Milli to micro */ + #else + return (jlong)(gethrtime()/(hrtime_t)1000); /* Nano seconds to micro seconds */ +@@ -256,7 +256,7 @@ md_get_timemillis(void) + jlong + md_get_thread_cpu_timemillis(void) + { +-#ifdef LINUX ++#if defined(LINUX) || defined(_ALLBSD_SOURCE) + return md_timeofday(); + #else + return (jlong)(gethrvtime()/1000); /* Nano seconds to milli seconds */ +@@ -271,7 +271,7 @@ md_get_prelude_path(char *path, int path_len, char *fi + Dl_info dlinfo; + + libdir[0] = 0; +-#ifdef LINUX ++#if defined(LINUX) || defined(_ALLBSD_SOURCE) + addr = (void*)&Agent_OnLoad; + #else + /* Just using &Agent_OnLoad will get the first external symbol with diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_interrupt_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_interrupt_h new file mode 100644 index 00000000000..b71f7cbb66d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_interrupt_h @@ -0,0 +1,23 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_include_interrupt_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/include/interrupt.h.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/hpi/include/interrupt.h Fri Jul 27 18:25:14 2007 +@@ -75,7 +75,7 @@ void intrDispatch(int interrupt, void *siginfo, void * + * N_INTERRUPTS - The number of interrupt channels. These + * are numbered from 0 to (N_INTERRUPTS - 1). + */ +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD__) + #define N_INTERRUPTS NSIG /* 0 to NSIG - 1*/ + #else + #define N_INTERRUPTS 32 /* 0 to 31 */ +@@ -108,6 +108,10 @@ void intrUnlock(void); + void intrInitMD(void); + + #if defined(__solaris__) && !defined(SA_SIGINFO) ++#error signal.h has not been included? ++#endif ++ ++#if defined(__FreeBSD__) && !defined(SA_SIGINFO) + #error signal.h has not been included? + #endif + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_largefile_bsd_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_largefile_bsd_h new file mode 100644 index 00000000000..bcb60293cbf --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_largefile_bsd_h @@ -0,0 +1,39 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_include_largefile_bsd_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/include/largefile_bsd.h.orig Mon Jul 30 08:41:19 2007 ++++ j2se/src/solaris/hpi/include/largefile_bsd.h Mon Jul 30 08:42:05 2007 +@@ -23,14 +23,28 @@ + * + */ + +-#ifndef _JAVASOFT_LINUX_LARGEFILE_SUPPORT_H_ +-#define _JAVASOFT_LINUX_LARGEFILE_SUPPORT_H_ ++#ifndef _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ ++#define _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ + +-/* +- * For building on glibc-2.0 we need to define stat64 here. +- */ +- + #include + #include + +-#endif /* _JAVASOFT_LINUX_LARGEFILE_SUPPORT_H_ */ ++/* define compatibility macros */ ++#define off64_t off_t ++#define stat64 stat ++ ++#define F_SETLK64 F_SETLK ++#define F_SETLKW64 F_SETLKW ++ ++#define lseek64 lseek ++#define ftruncate64 ftruncate ++#define open64 open ++#define fstat64 fstat ++#define flock64 flock ++#define mmap64 mmap ++#define fdatasync fsync ++ ++#define pread64 pread ++#define pwrite64 pwrite ++ ++#endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_largefile_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_largefile_h new file mode 100644 index 00000000000..85eac31eefa --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_include_largefile_h @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_include_largefile_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/include/largefile.h.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/hpi/include/largefile.h Fri Jul 27 18:25:14 2007 +@@ -34,6 +34,10 @@ + #include "largefile_linux.h" + #endif + ++#ifdef _ALLBSD_SOURCE ++#include "largefile_bsd.h" ++#endif ++ + /* + * Prototypes for wrappers that we define. These wrapper functions + * are low-level I/O routines that will use 64 bit versions if diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_include_threads_md_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_include_threads_md_h new file mode 100644 index 00000000000..f4bf481a65d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_include_threads_md_h @@ -0,0 +1,48 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_native_threads_include_threads_md_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/native_threads/include/threads_md.h.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/hpi/native_threads/include/threads_md.h Fri Jul 27 18:25:14 2007 +@@ -36,6 +36,8 @@ + #define N_TRACED_REGS 12 + #elif i386 + #define N_TRACED_REGS 7 ++#elif i586 /* BSDNOTE: just in case */ ++#define N_TRACED_REGS 7 + #elif amd64 + #define N_TRACED_REGS 15 + #elif ppc +@@ -51,10 +53,12 @@ + #define N_TRACED_REGS 32 + #endif + ++#if !defined(_ALLBSD_SOURCE) + /* Turn on if we want all java threads to be bound tolwps */ + /* #define BOUND_THREADS */ + /* Use /proc soln to stop lwps in place of siglwp soln */ + #define PROCLWP ++#endif + + /* + * Thread C stack overflow check +@@ -132,7 +136,7 @@ struct sys_thread { + lwpid_t lwpid; + #endif + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + void *sp; + #else + unsigned long sp; /* sp at time of last (native) thread switch */ +@@ -186,11 +190,13 @@ struct sys_thread { + + #define SYS_THREAD_NULL ((sys_thread_t *) 0) + ++#if !defined(_ALLBSD_SOURCE) + /* + * following macro copied from sys/signal.h since inside #ifdef _KERNEL there. + */ + #ifndef sigmask + #define sigmask(n) ((unsigned int)1 << (((n) - 1) & (32 - 1))) ++#endif + #endif + + #ifdef __linux__ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_condvar_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_condvar_md_c new file mode 100644 index 00000000000..594c00ae760 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_condvar_md_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_native_threads_src_condvar_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/native_threads/src/condvar_md.c.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/hpi/native_threads/src/condvar_md.c Fri Jul 27 18:25:14 2007 +@@ -58,7 +58,7 @@ condvarDestroy(condvar_t *condvar) + { + int err; + +-#ifdef __linux__ ++#ifdef USE_PTHREADS + err = pthread_cond_destroy((cond_t *) &condvar->cond); + #else + err = cond_destroy((cond_t *) condvar); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_monitor_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_monitor_md_c new file mode 100644 index 00000000000..48114db7dce --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_monitor_md_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_native_threads_src_monitor_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/native_threads/src/monitor_md.c.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/hpi/native_threads/src/monitor_md.c Fri Jul 27 18:25:14 2007 +@@ -147,7 +147,7 @@ sysMonitorEnter(sys_thread_t *self, sys_mon_t *mid) + 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/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_sys_api_td_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_sys_api_td_c new file mode 100644 index 00000000000..d0e768fe6c6 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_sys_api_td_c @@ -0,0 +1,25 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_native_threads_src_sys_api_td_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/native_threads/src/sys_api_td.c.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/hpi/native_threads/src/sys_api_td.c Fri Jul 27 18:25:14 2007 +@@ -39,6 +39,10 @@ + #include + #endif + ++#ifdef __OpenBSD__ ++#include ++#endif ++ + #include + #include + #include +@@ -54,6 +58,10 @@ + #include "mutex_md.h" + + #if defined(__solaris__) && defined(NO_INTERRUPTIBLE_IO) ++#error If there was no policy change, this could be a makefile error. ++#endif ++ ++#if defined(_ALLBSD_SOURCE) && defined(NO_INTERRUPTIBLE_IO) + #error If there was no policy change, this could be a makefile error. + #endif + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_threads_bsd_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_threads_bsd_c new file mode 100644 index 00000000000..495b15249ae --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_native_threads_src_threads_bsd_c @@ -0,0 +1,758 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_native_threads_src_threads_bsd_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/native_threads/src/threads_bsd.c.orig Sun Jul 29 22:30:33 2007 ++++ j2se/src/solaris/hpi/native_threads/src/threads_bsd.c Mon Jul 30 09:15:23 2007 +@@ -25,85 +25,45 @@ + + /* + * Implementation of HPI that can not be expressed with POSIX threads. +- * Note that even if you are building with USE_PTHREADS, we have to +- * explicitly undef it here because pthread.h and thread.h can not be +- * included in the same file, and this file needs only thread.h. + */ +-#undef USE_PTHREADS + + #include "hpi_impl.h" + #include "monitor_md.h" + #include "threads_md.h" + #include "np.h" + +-#include +-#include ++#include ++#include ++ ++#include ++#if defined(__FreeBSD__) || defined(__OpenBSD__) ++#include ++#endif ++#ifdef __NetBSD__ ++#include ++#define pthread_attr_get_np(a, b) 0 ++#define pthread_suspend_all_np() 0 ++#define pthread_resume_all_np() 0 ++#endif ++ ++ ++#include ++#include + #include + #include + #include +-#include + #include + #include +-#include + #include + +-#include +-extern int syscall(int, ...); +- +- + /* +- * Forward declarations. +- */ +-static int procfd; +-static void stop_lwps(); +-static void clear_onproc_flags(); +-static void restart_lwps(); +-static void MakeProcName(register char *procname, register pid_t pid); +-static void GC_msec_sleep(int n); +- +- +-/* +- * Make sure that we link against a verion of libthread that has at least +- * the bug fixes and the interface for getting the stack from threads that +- * aren't on LWPs. Otherwise we should exit with some informative message. +- */ +-extern ulong_t __gettsp(thread_t); +- +-static const char * gettspMessage = +-"You must install a Bsd patch to run the native threads version of the\n" +-"Java runtime. The green threads version will work without this patch.\n" +-"Please check the native threads release notes for more information.\n" +-"\n" +-"If you are embedding the VM in a native application, please make sure that\n" +-"the native application is linked with libthread.so (-lthread).\n" +-"\n" +-"Exiting.\n"; +- +-static void +-checkForCorrectLibthread() +-{ +- if (&__gettsp == 0) { +- fprintf(stderr, gettspMessage); +- exit(1); +- } +-} +-#ifdef __GNUC__ +-static void checkForCorrectLibthread() __attribute__((constructor)); +-#else +-#pragma init(checkForCorrectLibthread) +-#endif +- +-#pragma weak __gettsp +- +- +-/* + * Suspend said thread. Used to implement java.lang.Thread.suspend(), + * which is deprecated. + */ + int + np_suspend(sys_thread_t *tid) + { +- return thr_suspend(tid->sys_thread); ++ return pthread_suspend_np(tid->sys_thread); + } + + +@@ -114,7 +74,7 @@ np_suspend(sys_thread_t *tid) + int + np_continue(sys_thread_t *tid) + { +- return thr_continue(tid->sys_thread); ++ return pthread_resume_np(tid->sys_thread); + } + + /* +@@ -127,26 +87,65 @@ void np_initialize_thread(sys_thread_t *tid) + + + /* ++ * Internal helper function to get stack information about specified thread. ++ */ ++#ifdef __OpenBSD__ ++static int ++get_stackinfo(pthread_t tid, void **addr, long *sizep) ++{ ++ stack_t ss; ++ ++ if (pthread_stackseg_np(tid, &ss) == 0) { ++ *addr = (void *)(ss.ss_sp) - ss.ss_size; ++ *sizep = (long)(ss.ss_size); ++ return SYS_OK; ++ } else { ++ return SYS_ERR; /* pthreads_stackseg_np failed. */ ++ } ++} ++#else ++static int ++get_stackinfo(pthread_t tid, pthread_attr_t attr, void **addr, long *sizep) ++{ ++ size_t s; ++ void *p; ++ int ret = SYS_ERR; ++ ++ if (pthread_attr_get_np(tid, &attr) != 0) ++ goto err; ++ if (pthread_attr_getstackaddr(&attr, &p) != 0) ++ goto err; ++ if (pthread_attr_getstacksize(&attr, &s) != 0) ++ goto err; ++ *addr = p; ++ *sizep = s; ++ ret = SYS_OK; ++err: ++ ++ return (ret); ++} ++#endif ++ ++ ++/* + * Get the stack start address, and max stack size for the current thread. + */ + int + np_stackinfo(void **addr, long *size) + { +- stack_t stkseg; +- +- if (thr_stksegment(&stkseg) == 0) { +- *addr = (void *)(stkseg.ss_sp); +- if (thr_main()) { +- struct rlimit r; +- getrlimit(RLIMIT_STACK, &r); +- *size = (long)r.rlim_cur; +- } else { +- *size = (long)(stkseg.ss_size); +- } +- return SYS_OK; +- } else { +- return SYS_ERR; /* thr_stksegment failed. */ +- } ++#ifdef __OpenBSD__ ++ return(get_stackinfo(pthread_self(), addr, size)); ++#else ++ pthread_attr_t attr; ++ int ret = SYS_ERR; ++ ++ if (pthread_attr_init(&attr) == 0) { ++ ret = get_stackinfo(pthread_self(), attr, addr, size); ++ pthread_attr_destroy(&attr); ++ } ++ ++ return (ret); ++#endif + } + + /* +@@ -155,150 +154,45 @@ np_stackinfo(void **addr, long *size) + void + np_profiler_init(sys_thread_t *tid) + { +- tid->lwp_id = _lwp_self(); + } + + int + np_profiler_suspend(sys_thread_t *tid) + { +- return _lwp_suspend(tid->lwp_id); ++ if (errno = pthread_suspend_np(tid->sys_thread)) ++ return SYS_ERR; ++ return SYS_OK; + } + + int + np_profiler_continue(sys_thread_t *tid) + { +- return _lwp_continue(tid->lwp_id); ++ if (errno = pthread_resume_np(tid->sys_thread)) ++ return SYS_ERR; ++ return SYS_OK; + } + ++/* ++ * Instead of picking over saved registers, we sum a chunk of the stack. ++ */ + bool_t + np_profiler_thread_is_running(sys_thread_t *tid) + { +- unsigned long sum = 0; +- int i; +- prstatus_t lwpstatus; +- int lwpfd; +- int res; +- +- lwpfd = syscall(SYS_ioctl, procfd, PIOCOPENLWP, &(tid->lwp_id)); +- sysAssert(lwpfd >= 0); +- +- retry: +- res = syscall(SYS_ioctl, lwpfd, PIOCSTATUS, &lwpstatus); +- sysAssert(res >= 0); +- +- if (!(lwpstatus.pr_flags & PR_STOPPED)) { +- GC_msec_sleep(1); +- goto retry; +- } +- +- close(lwpfd); +- +-#if defined(sparc) +- sum += lwpstatus.pr_reg[R_SP]; +- sum += lwpstatus.pr_reg[R_PC]; +- +- sum += lwpstatus.pr_reg[R_G1]; +- sum += lwpstatus.pr_reg[R_G2]; +- sum += lwpstatus.pr_reg[R_G3]; +- sum += lwpstatus.pr_reg[R_G4]; +- +- sum += lwpstatus.pr_reg[R_O0]; +- sum += lwpstatus.pr_reg[R_O1]; +- sum += lwpstatus.pr_reg[R_O2]; +- sum += lwpstatus.pr_reg[R_O3]; +- sum += lwpstatus.pr_reg[R_O4]; +- sum += lwpstatus.pr_reg[R_O5]; +- +- sum += lwpstatus.pr_reg[R_I0]; +- sum += lwpstatus.pr_reg[R_I1]; +- sum += lwpstatus.pr_reg[R_I2]; +- sum += lwpstatus.pr_reg[R_I3]; +- sum += lwpstatus.pr_reg[R_I4]; +- sum += lwpstatus.pr_reg[R_I5]; +- sum += lwpstatus.pr_reg[R_I6]; +- sum += lwpstatus.pr_reg[R_I7]; +- +- sum += lwpstatus.pr_reg[R_L0]; +- sum += lwpstatus.pr_reg[R_L1]; +- sum += lwpstatus.pr_reg[R_L2]; +- sum += lwpstatus.pr_reg[R_L3]; +- sum += lwpstatus.pr_reg[R_L4]; +- sum += lwpstatus.pr_reg[R_L5]; +- sum += lwpstatus.pr_reg[R_L6]; +- sum += lwpstatus.pr_reg[R_L7]; +-#elif defined(amd64) +- sum += lwpstatus.pr_reg[REG_RIP]; +- sum += lwpstatus.pr_reg[REG_RSP]; +- +- sum += lwpstatus.pr_reg[REG_RAX]; +- sum += lwpstatus.pr_reg[REG_RCX]; +- sum += lwpstatus.pr_reg[REG_RDX]; +- sum += lwpstatus.pr_reg[REG_RBX]; +- sum += lwpstatus.pr_reg[REG_RBP]; +- sum += lwpstatus.pr_reg[REG_RSI]; +- sum += lwpstatus.pr_reg[REG_RDI]; +- +- sum += lwpstatus.pr_reg[REG_R8]; +- sum += lwpstatus.pr_reg[REG_R9]; +- sum += lwpstatus.pr_reg[REG_R10]; +- sum += lwpstatus.pr_reg[REG_R11]; +- sum += lwpstatus.pr_reg[REG_R12]; +- sum += lwpstatus.pr_reg[REG_R13]; +- sum += lwpstatus.pr_reg[REG_R14]; +- sum += lwpstatus.pr_reg[REG_R15]; +-#elif defined(i386) +- sum += lwpstatus.pr_reg[EIP]; +- sum += lwpstatus.pr_reg[UESP]; +- +- sum += lwpstatus.pr_reg[EAX]; +- sum += lwpstatus.pr_reg[ECX]; +- sum += lwpstatus.pr_reg[EDX]; +- sum += lwpstatus.pr_reg[EBX]; +- sum += lwpstatus.pr_reg[EBP]; +- sum += lwpstatus.pr_reg[ESI]; +- sum += lwpstatus.pr_reg[EDI]; +-#endif +- +- if (tid->last_sum == sum) { +- return FALSE; +- } +- tid->last_sum = sum; +- + return TRUE; + } + + +-/* +- * If building for Bsd native threads, open up the /proc file +- * descriptor to be used when doing GC. The open is done at JVM start-up so +- * as to reserve this fd, to prevent GC stall due to exhausted fds. This fd +- * will never be closed, and will alwyas be present. +- */ + int + np_initialize() + { +- char procname[32]; +- MakeProcName(procname, getpid()); +- if ((procfd = open(procname, O_RDONLY, 0)) < 0) { +- VM_CALL(jio_fprintf)(stderr, "Cannot open %s for GC", procname); +- return SYS_ERR; +- } + return SYS_OK; + } + +-static void +-MakeProcName(register char *procname, register pid_t pid) +-{ +- register char * s; +- +- (void) strcpy(procname, "/proc/00000"); +- s = procname + strlen(procname); +- while (pid) { +- *--s = pid%10 + '0'; +- pid /= 10; +- } +-} + ++/* prototypes */ ++ ++static void record_thread_regs(); ++ + /* + * Suspend all other threads, and record their contexts (register + * set or stack pointer) into the sys_thread structure, so that a +@@ -307,13 +201,11 @@ MakeProcName(register char *procname, register pid_t p + int + np_single(void) + { +- int ret; +- + sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf())); + +- stop_lwps(); +- ret = SYS_OK; +- return ret; ++ pthread_suspend_all_np(); ++ record_thread_regs(); ++ return SYS_OK; + } + + /* +@@ -324,343 +216,60 @@ void + np_multi(void) + { + sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf())); +- clear_onproc_flags(); +- restart_lwps(); ++ pthread_resume_all_np(); + } + +-/* /proc solution to stop and restrt lwps */ +-/* make sure gc is run as a bound thread */ +-/* make sure signals are turned off for gc thread */ +-/* what about new lwps getting created in the meantime? */ +- +-#define MAX_LWPS 1024 +- +-static prstatus_t Mystatus; +-static id_t lwpid_list_buf[MAX_LWPS]; +-static id_t oldlwpid_list_buf[MAX_LWPS]; +-static sys_thread_t *onproct_list_buf[MAX_LWPS]; +-static id_t *lwpid_list = lwpid_list_buf; +-static id_t *oldlwpid_list = oldlwpid_list_buf; +-static sys_thread_t **onproct_list = onproct_list_buf; +-static int lwpid_list_len; +-static int oldlwpid_list_len; +-static int onproct_ix = 0; +-static int gcprio; +-static sigset_t gcmask; +- +-static void +-clear_onproc_flags() +-{ +- int i; +- +- for (i = 0; i < onproct_ix; i++) { +- ((sys_thread_t *)(onproct_list[i]))->onproc = FALSE; +- } +- onproct_ix = 0; +-} +- +- +-/* Sleep for n milliseconds, n < 1000 */ +-static void +-GC_msec_sleep(int n) +-{ +- struct timespec ts; +- +- ts.tv_sec = 0; +- ts.tv_nsec = 1000000*n; +- if (syscall(SYS_nanosleep, &ts, 0) < 0) { +- VM_CALL(jio_fprintf)(stderr, "%d\n", errno); +- } +-} +- + /* +- * Assumes stacks grow down from high to low memory. True on sparc and Intel. ++ * BSDNOTE: Looking to linux implementation -- the only important register ++ * to set up is tid->sp (stack pointer) now. But it may change when ++ * FreeBSD and JVM will switch to KSEs. In this case we'll also need to ++ * care about ucontext I think. ++ * ++ * --phantom + */ +-#define VALID_SP(sp, bottom, top) \ +- (((uintptr_t)(sp)) < ((uintptr_t)(bottom)) && ((uintptr_t)(sp)) > ((uintptr_t)(top))) +- + static void +-record_lwp_regs(prstatus_t lwpstatus) ++record_thread_regs() + { ++ void *addr; ++ long sz; ++ + sys_thread_t *tid; + int i; +-#if defined(sparc) +- register uintptr_t sp = lwpstatus.pr_reg[R_SP]; +-#elif defined(amd64) +- register uintptr_t sp = lwpstatus.pr_reg[REG_RSP]; +-#elif defined(i386) +- register uintptr_t sp = lwpstatus.pr_reg[UESP]; +-#endif ++ int sp; + +- tid = ThreadQueue; +- for (i = 0; i < ActiveThreadCount && tid != 0; i++) { +- if (VALID_SP(sp, tid->stack_bottom, tid->stack_top)) { +- long *regs = tid->regs; +- tid->sp = sp; +- /* +- * The code below relies on N_TRACED_REGS being set +- * correctly for each platform. If you change the +- * number of registers being watched, you should update +- * the define for N_TRACED_REGS +- */ +-#if defined(sparc) +- regs[0] = lwpstatus.pr_reg[R_G1]; +- regs[1] = lwpstatus.pr_reg[R_G2]; +- regs[2] = lwpstatus.pr_reg[R_G3]; +- regs[3] = lwpstatus.pr_reg[R_G4]; +- +- regs[4] = lwpstatus.pr_reg[R_O0]; +- regs[5] = lwpstatus.pr_reg[R_O1]; +- regs[6] = lwpstatus.pr_reg[R_O2]; +- regs[7] = lwpstatus.pr_reg[R_O3]; +- regs[8] = lwpstatus.pr_reg[R_O4]; +- regs[9] = lwpstatus.pr_reg[R_O5]; +- regs[10] = lwpstatus.pr_reg[R_O6]; +- regs[11] = lwpstatus.pr_reg[R_O7]; +-#elif defined(amd64) +- regs[0] = lwpstatus.pr_reg[REG_RAX]; +- regs[1] = lwpstatus.pr_reg[REG_RCX]; +- regs[2] = lwpstatus.pr_reg[REG_RDX]; +- regs[3] = lwpstatus.pr_reg[REG_RBX]; +- regs[4] = lwpstatus.pr_reg[REG_RBP]; +- regs[5] = lwpstatus.pr_reg[REG_RSI]; +- regs[6] = lwpstatus.pr_reg[REG_RDI]; +- regs[7] = lwpstatus.pr_reg[REG_R8]; +- regs[8] = lwpstatus.pr_reg[REG_R9]; +- regs[9] = lwpstatus.pr_reg[REG_R10]; +- regs[10]= lwpstatus.pr_reg[REG_R11]; +- regs[11]= lwpstatus.pr_reg[REG_R12]; +- regs[12]= lwpstatus.pr_reg[REG_R13]; +- regs[13]= lwpstatus.pr_reg[REG_R14]; +- regs[14]= lwpstatus.pr_reg[REG_R15]; +-#elif defined(i386) +- regs[0] = lwpstatus.pr_reg[EAX]; +- regs[1] = lwpstatus.pr_reg[ECX]; +- regs[2] = lwpstatus.pr_reg[EDX]; +- regs[3] = lwpstatus.pr_reg[EBX]; +- regs[4] = lwpstatus.pr_reg[EBP]; +- regs[5] = lwpstatus.pr_reg[ESI]; +- regs[6] = lwpstatus.pr_reg[EDI]; ++#ifndef __OpenBSD__ ++ pthread_attr_t attr; ++ int attr_inited; ++ attr_inited = pthread_attr_init(&attr) == 0; + #endif +- +- if (tid->onproc != TRUE) { +- tid->onproc = TRUE; +- onproct_list[onproct_ix++] = tid; +- } +- break; +- } +- tid = tid->next; +- } +-} + +-static void +-record_thread_regs() +-{ +- sys_thread_t *tid; +- int i; +- + tid = ThreadQueue; + for (i = 0; i < ActiveThreadCount && tid != 0; i++) { +- if (tid->onproc != TRUE) { +- int i; ++ int i; + +- if (tid->sys_thread != 0) { +- /* if thread has already been initialized */ +- tid->sp = __gettsp(tid->sys_thread); +- } else { +- /* +- * thread is still in the process of being initalized. +- * So GC should not care about this thread. Just +- * set its sp to 0, and this will force GC to ignore it. +- */ ++ if (tid->sys_thread != 0) { ++#ifdef __OpenBSD__ ++ if (get_stackinfo(tid->sys_thread, &addr, &sz) == SYS_OK) ++#else ++ if (get_stackinfo(tid->sys_thread, attr, &addr, &sz) == SYS_OK) ++#endif ++ tid->sp = addr; ++ else + tid->sp = 0; +- } +- +- /* +- * Clear out the registers since they are no longer live +- * and we don't want to garbage collector to think they are. +- */ +- +- for (i = 0; i < N_TRACED_REGS; i++) +- tid->regs[i] = 0; ++ } else { ++ /* ++ * thread is still in the process of being initalized. ++ * So GC should not care about this thread. Just ++ * set its sp to 0, and this will force GC to ignore it. ++ */ ++ tid->sp = 0; + } ++ + tid = tid->next; + } +-} +- +-static void +-wait_stopped_lwps(void) +-{ +- int i, lwpfd; +- prstatus_t lwpstatus; +- +- for (i = 0; i < (int) Mystatus.pr_nlwp; i++) { +- /* if its not me */ +- if (lwpid_list[i] != _lwp_self()) { +- +- /* open the lwp and check the status */ +- if ((lwpfd = syscall(SYS_ioctl, procfd, PIOCOPENLWP, +- &lwpid_list[i])) < 0) { +-#ifdef MY_DEBUG +- VM_CALL(jio_fprintf)(stderr, "lwpid %d was not found in process\n", +- lwpid_list[i]); ++#ifndef __OpenBSD__ ++ if (attr_inited) ++ pthread_attr_destroy(&attr); + #endif +- continue; +- } +- memset(&lwpstatus, 0, sizeof(lwpstatus)); +- while (1) { +- if (syscall(SYS_ioctl,lwpfd, PIOCSTATUS, &lwpstatus)<0) { +- sysAssert(0); +-#ifdef MY_DEBUG +- VM_CALL(jio_fprintf)(stderr, "PIOCSTATUS failed for lwp %d", +- lwpid_list[i]); +-#endif +- break; +- } +- if (lwpstatus.pr_flags & PR_STOPPED) { +- record_lwp_regs(lwpstatus); +- break; +- } +- GC_msec_sleep(1); +- } +- +- close (lwpfd); +- } /* end of if-me */ +- } /* end of for */ + } + +-static void +-suspend_lwps() +-{ +- int i; +- /* pioopen all the lwps and stop them - except the one I am running on */ +- for (i = 0; i < (int) Mystatus.pr_nlwp; i++) { +- +- /* open and stop the lwp if its not me */ +- if (lwpid_list[i] != _lwp_self()) { +- +- /* PIOCSTOP doesn't work without a writable */ +- /* descriptor. And that makes the process */ +- /* undebuggable. */ +- if (_lwp_suspend(lwpid_list[i]) < 0) { +- /* Could happen if the lwp exited */ +- lwpid_list[i] = _lwp_self(); +- continue; +- } +- } +- } +-} +- +-static void +-print_lwps() +-{ +-#ifdef MY_DEBUG +- /* print all the lwps in the process */ +- VM_CALL(jio_fprintf)(stdout, "lwpids "); +- for (i = 0; i < (int) Mystatus.pr_nlwp; i++) { +- if (i == 0) { +- VM_CALL(jio_fprintf)(stdout, "%d", lwpid_list[0]); +- } else if (i != Mystatus.pr_nlwp - 1) { +- VM_CALL(jio_fprintf)(stdout, ", %d", lwpid_list[i]); +- } else { +- VM_CALL(jio_fprintf)(stdout, " and %d", lwpid_list[i]); +- } +- } +-#endif +-} +- +-/* routine to iteratively stop all lwps */ +-static void +-stop_lwps() +-{ +- int i; +- sigset_t set; +- boolean_t changed; +- +- /* mask all signals */ +- (void) sigfillset(&set); +- syscall(SYS_sigprocmask, SIG_SETMASK, &set, &gcmask); +- +- /* run at highest prio so I cannot be preempted */ +- thr_getprio(thr_self(), &gcprio); +- thr_setprio(thr_self(), 2147483647); /* #define INT_MAX 2147483647 */ +- +- oldlwpid_list_len = 0; +- +- while(1) { +- changed = B_FALSE; +- +- /* Get the # of lwps in the process */ +- memset(&Mystatus, 0, sizeof(Mystatus)); +- syscall(SYS_ioctl, procfd, PIOCSTATUS, &Mystatus); +- +-#ifdef MY_DEBUG +- VM_CALL(jio_fprintf)(stdout, "Number of lwps in the process is %d\n", +- Mystatus.pr_nlwp); +- VM_CALL(jio_fprintf)(stdout, "My lwp id is %d\n", _lwp_self()); +-#endif +- lwpid_list_len = Mystatus.pr_nlwp; +- if (syscall(SYS_ioctl, procfd, PIOCLWPIDS, lwpid_list) == -1) { +-#ifdef MY_DEBUG +- VM_CALL(jio_fprintf)(stderr, "Can't read proc's lwpid list"); +-#endif +- return; +- } +- +- print_lwps(); +- +- /* suspend all the lwps */ +- suspend_lwps(); +- +- /* make sure all the lwps have actually stopped */ +- wait_stopped_lwps(); +- +- /* make sure the list has not changed while you were not looking +- else start all over again */ +- if (lwpid_list_len != oldlwpid_list_len) changed = B_TRUE; +- else { +- for (i=0; isys_thread, &attr, _start, (void *)tid); ++ pthread_attr_destroy(&attr); + sysAssert(err == 0); + if (err == 0) { + err = sem_wait(&tid->sem_suspended); +@@ -1049,7 +1056,20 @@ sysGetSysInfo() + * we want the number of processors configured not the number online + * since processors may be turned on and off dynamically. + */ ++#if defined(_SC_NPROCESSORS_CONF) + int cpus = (int) sysconf(_SC_NPROCESSORS_CONF); ++#elif defined(CTL_HW) && defined(HW_NCPU) ++ int cpus = 1; ++ int mib[2]; ++ size_t len; ++ ++ mib[0] = CTL_HW; ++ mib[1] = HW_NCPU; ++ len = sizeof(cpus); ++ (void)sysctl(mib, 2, &cpus, &len, NULL, 0); ++#else ++ int cpus = 1; ++#endif + + info.isMP = (cpus < 0) ? 1 : (cpus > 1); + info.name = "native threads"; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_linker_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_linker_md_c new file mode 100644 index 00000000000..b81c5ae03ec --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_linker_md_c @@ -0,0 +1,54 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_src_linker_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/src/linker_md.c.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/hpi/src/linker_md.c Fri Jul 27 18:25:14 2007 +@@ -45,12 +45,6 @@ + #endif + + /* +- * This lock protects the dl wrappers, assuring that two threads aren't +- * in libdl at the same time. +- */ +-sys_mon_t _dl_lock; +- +-/* + * glibc-2.0 libdl is not MT safe. If you are building with any glibc, + * chances are you might want to run the generated bits against glibc-2.0 + * libdl.so, so always use locking for any version of glibc. +@@ -66,7 +60,15 @@ sys_mon_t _dl_lock; + #define NEED_DL_LOCK + #endif + ++#ifdef NEED_DL_LOCK + /* ++ * This lock protects the dl wrappers, assuring that two threads aren't ++ * in libdl at the same time. ++ */ ++sys_mon_t _dl_lock; ++#endif ++ ++/* + * create a string for the JNI native function name by adding the + * appropriate decorations. + */ +@@ -102,7 +104,7 @@ sysBuildLibName(char *holder, int holderlen, char *pna + } + + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + static int thr_main(void) + { + return -1; +@@ -120,10 +122,10 @@ sysLoadLibrary(const char *name, char *err_buf, int er + + #ifdef NEED_DL_LOCK + sysMonitorEnter(sysThreadSelf(), &_dl_lock); +- result = dlopen(name, RTLD_NOW); ++ result = dlopen(name, RTLD_NOW|RTLD_GLOBAL); + sysMonitorExit(sysThreadSelf(), &_dl_lock); + #else +- result = dlopen(name, RTLD_LAZY); ++ result = dlopen(name, RTLD_LAZY|RTLD_GLOBAL); + #endif + /* + * This is a bit of bulletproofing to catch the commonly occurring diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_memory_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_memory_md_c new file mode 100644 index 00000000000..61aa4e2a896 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_memory_md_c @@ -0,0 +1,93 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_src_memory_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/src/memory_md.c.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/hpi/src/memory_md.c Fri Jul 27 18:25:14 2007 +@@ -50,12 +50,24 @@ + #include + #include /* For perror() */ + #include ++#if defined(_ALLBSD_SOURCE) ++#include ++#else + #include ++#endif + + #include "hpi_impl.h" + ++#if defined(USE_MALLOC) && defined(_ALLBSD_SOURCE) ++#error "USE_MALLOC cannot be used for BSD" ++#endif ++ + #ifndef USE_MALLOC + ++#if defined(_ALLBSD_SOURCE) ++#define MAP_ANNONYMOUS MAP_ANON ++#endif ++ + #include + #include + #ifdef __linux__ +@@ -73,7 +85,19 @@ static int devZeroFD; + #define MAP_FAILED ((caddr_t)-1) + #endif + static size_t memGrainSize; /* A page for Linux */ ++#elif defined(_ALLBSD_SOURCE) ++static size_t memGrainSize; /* A page for FreeBSD */ ++#if defined(__FreeBSD__) && (__FreeBSD_version >= 700013) ++static inline void * ++memalign(size_t alignment, size_t size) ++{ ++ void *ret; ++ return posix_memalign(&ret, alignment, size) ? NULL : ret; ++} + #else ++#define memalign(a, b) valloc(b) ++#endif ++#else + static unsigned int memGrainSize; /* A page for Solaris */ + #endif + +@@ -154,7 +178,7 @@ mapChunk(long length) + { + char *ret; + +-#if defined(__linux__) && defined(MAP_ANONYMOUS) ++#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(MAP_ANONYMOUS) + ret = (char *) mmap(0, length, PROT_ALL, + MAP_NORESERVE | MAP_PRIVATE | MAP_ANONYMOUS, + -1, (off_t) 0); +@@ -176,7 +200,7 @@ static char * + mapChunkReserve(char *addr, long length) + { + char *ret; +-#if defined(__linux__) && defined(MAP_ANONYMOUS) ++#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(MAP_ANONYMOUS) + ret = (char *) mmap(addr, length, PROT_ALL, + MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, + -1, (off_t) 0); +@@ -199,7 +223,7 @@ mapChunkNoreserve(char *addr, long length) + { + char *ret; + +-#if defined(__linux__) && defined(MAP_ANONYMOUS) ++#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(MAP_ANONYMOUS) + ret = (char *) mmap(addr, length, PROT_ALL, + MAP_FIXED | MAP_PRIVATE | + MAP_NORESERVE | MAP_ANONYMOUS, +@@ -242,7 +266,7 @@ sysMapMem(size_t requestedSize, size_t *mappedSize) + *mappedSize = roundUpToGrain(requestedSize); + #ifdef USE_MALLOC + mappedAddr = (void *) sysMalloc(*mappedSize); /* Returns 0 on failure */ +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + if (mappedAddr) { + memset(mappedAddr, 0, *mappedSize); + mappedAddr = (void *) roundUpToGrain(mappedAddr); +@@ -331,7 +355,7 @@ sysCommitMem(void *requestedAddr, size_t requestedSize + *committedSize = roundUpToGrain(requestedSize); + committedAddr = (void *) roundDownToGrain((long) requestedAddr); + #ifdef USE_MALLOC +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + ret = committedAddr; + #else + ret = requestedAddr; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_system_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_system_md_c new file mode 100644 index 00000000000..60a90c1ed4d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_hpi_src_system_md_c @@ -0,0 +1,56 @@ +$OpenBSD: patch-j2se_src_solaris_hpi_src_system_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/hpi/src/system_md.c.orig Thu Aug 2 03:52:39 2007 ++++ j2se/src/solaris/hpi/src/system_md.c Fri Aug 3 18:25:40 2007 +@@ -41,6 +41,7 @@ + #include + + #include "jni_md.h" ++#include "jvm_md.h" + #include "mutex_md.h" + + #include "hpi_init.h" +@@ -50,9 +51,6 @@ + #include "monitor_md.h" + #include "largefile.h" + +- +-#define O_DELETE 0x10000 +- + int sysThreadBootstrap(sys_thread_t **tidP, sys_mon_t **lockP, int nb) + { + threadBootstrapMD(tidP, lockP, nb); +@@ -85,7 +83,7 @@ sysGetMilliTicks() + { + struct timeval tv; + +- (void) gettimeofday(&tv, (void *) 0); ++ (void) gettimeofday(&tv, NULL); + return((tv.tv_sec * 1000) + (tv.tv_usec / 1000)); + } + +@@ -93,7 +91,7 @@ jlong + sysTimeMillis() + { + struct timeval t; +- gettimeofday(&t, 0); ++ gettimeofday(&t, NULL); + return ((jlong)t.tv_sec) * 1000 + (jlong)(t.tv_usec/1000); + } + +@@ -122,13 +120,13 @@ sysGetLastErrorString(char *buf, int len) + + /* + * Open a file. Unlink the file immediately after open returns +- * if the specified oflag has the O_DELETE flag set. ++ * if the specified oflag has the JVM_O_DELETE flag set. + */ + int sysOpen(const char *path, int oflag, int mode) + { + int fd; +- int delete = (oflag & O_DELETE); +- oflag = oflag & ~O_DELETE; ++ int delete = (oflag & JVM_O_DELETE); ++ oflag = oflag & ~JVM_O_DELETE; + fd = open64_w(path, oflag, mode); + if (delete != 0) { + unlink(path); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_instrument_EncodingSupport_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_instrument_EncodingSupport_md_c new file mode 100644 index 00000000000..db9716d1bc7 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_instrument_EncodingSupport_md_c @@ -0,0 +1,31 @@ +$OpenBSD: patch-j2se_src_solaris_instrument_EncodingSupport_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/instrument/EncodingSupport_md.c.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/instrument/EncodingSupport_md.c Fri Jul 27 18:25:14 2007 +@@ -28,7 +28,10 @@ + #include + #include + #include ++#ifndef __OpenBSD__ ++#define HAVE_NL_LANGINFO + #include ++#endif + #include + + /* Routines to convert back and forth between Platform Encoding and UTF-8 */ +@@ -63,12 +66,16 @@ utfInitialize(void) + /* Set the locale from the environment */ + (void)setlocale(LC_ALL, ""); + ++#ifdef HAVE_NL_LANGINFO + /* Get the codeset name */ + codeset = (char*)nl_langinfo(CODESET); + if ( codeset == NULL || codeset[0] == 0 ) { + UTF_DEBUG(("NO codeset returned by nl_langinfo(CODESET)\n")); + return; + } ++#else ++ codeset = "ISO-8859-1"; ++#endif + + UTF_DEBUG(("Codeset = %s\n", codeset)); + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_javavm_export_jvm_md_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_javavm_export_jvm_md_h new file mode 100644 index 00000000000..604081cdcde --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_javavm_export_jvm_md_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_javavm_export_jvm_md_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/javavm/export/jvm_md.h.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/javavm/export/jvm_md.h Fri Jul 27 18:25:14 2007 +@@ -66,7 +66,7 @@ + #define JVM_O_O_APPEND O_APPEND + #define JVM_O_EXCL O_EXCL + #define JVM_O_CREAT O_CREAT +-#define JVM_O_DELETE 0x10000 ++#define JVM_O_DELETE 0x10000000 + + /* Signals */ + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_javavm_include_typedefs_md_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_javavm_include_typedefs_md_h new file mode 100644 index 00000000000..b70405f6f85 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_javavm_include_typedefs_md_h @@ -0,0 +1,22 @@ +$OpenBSD: patch-j2se_src_solaris_javavm_include_typedefs_md_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/javavm/include/typedefs_md.h.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/javavm/include/typedefs_md.h Fri Jul 27 18:25:14 2007 +@@ -37,9 +37,18 @@ + #include + #define HAVE_INTPTR_T + #define _UINT64_T ++#elif defined(_ALLBSD_SOURCE) ++#ifdef __OpenBSD__ ++#include + #endif ++#define HAVE_INTPTR_T ++#define _UINT64_T ++#define _INT64_T ++#endif + ++#if !defined(_ALLBSD_SOURCE) + #define int8_t char ++#endif + + /* Fix for varargs differences on PowerPC */ + #if defined(__powerpc__) diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_com_sun_management_UnixOperatingSystem_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_com_sun_management_UnixOperatingSystem_md_c new file mode 100644 index 00000000000..041566a35f1 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_com_sun_management_UnixOperatingSystem_md_c @@ -0,0 +1,168 @@ +$OpenBSD: patch-j2se_src_solaris_native_com_sun_management_UnixOperatingSystem_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c Fri Jul 27 18:25:14 2007 +@@ -32,10 +32,16 @@ + + #include + #include ++#if defined(_ALLBSD_SOURCE) ++#include ++#else + #include ++#endif + #include + #include ++#ifndef _ALLBSD_SOURCE + #include ++#endif + #include + #include + #include +@@ -44,18 +50,24 @@ + #include + #include + ++#define MB (1024UL * 1024UL) ++ + static jlong page_size = 0; + ++#if !defined(_ALLBSD_SOURCE) ++ + /* This gets us the new structured proc interfaces of 5.6 & later */ + /* - see comment in */ + #define _STRUCTURED_PROC 1 +-#include ++#include + ++#endif /* !_ALLBSD_SOURCE */ ++ + static struct dirent* read_dir(DIR* dirp, struct dirent* entry) { + #ifdef __solaris__ + struct dirent* dbuf = readdir(dirp); + return dbuf; +-#else /* __linux__ */ ++#else /* __linux__ || _ALLBSD_SOURCE */ + struct dirent* p; + if (readdir_r(dirp, entry, &p) == 0) { + return p; +@@ -124,7 +136,7 @@ static jlong get_total_or_available_swap_space_size(JN + free(strtab); + return available ? ((jlong)avail * page_size) : + ((jlong)total * page_size); +-#else /* __linux__ */ ++#elif defined(__linux__) + int ret; + FILE *fp; + jlong total = 0, avail = 0; +@@ -138,6 +150,13 @@ static jlong get_total_or_available_swap_space_size(JN + avail = (jlong)si.freeswap * si.mem_unit; + + return available ? avail : total; ++#else /* _ALLBSD_SOURCE */ ++ /* ++ * XXXBSD: there's no way available to get swap info in ++ * FreeBSD. Usage of libkvm is not an option here ++ */ ++ // throw_internal_error(env, "Unimplemented in FreeBSD"); ++ return (0); + #endif + } + +@@ -179,7 +198,7 @@ Java_com_sun_management_UnixOperatingSystem_getCommitt + + JVM_Close(fd); + return (jlong) psinfo.pr_size * 1024; +-#else /* __linux__ */ ++#elif defined(__linux__) + FILE *fp; + unsigned long vsize = 0; + +@@ -197,6 +216,12 @@ Java_com_sun_management_UnixOperatingSystem_getCommitt + + fclose(fp); + return (jlong)vsize; ++#else /* _ALLBSD_SOURCE */ ++ /* ++ * XXXBSD: there's no way available to do it in FreeBSD, AFAIK. ++ */ ++ // throw_internal_error(env, "Unimplemented in FreeBSD"); ++ return (64 * MB); + #endif + } + +@@ -222,9 +247,13 @@ Java_com_sun_management_UnixOperatingSystem_getProcess + jlong cpu_time_ns; + struct tms time; + +-#ifdef __solaris__ ++ /* ++ * BSDNOTE: FreeBSD implements _SC_CLK_TCK since FreeBSD 5, so ++ * add a magic to handle it ++ */ ++#if defined(__solaris__) || defined(_SC_CLK_TCK) + clk_tck = (jlong) sysconf(_SC_CLK_TCK); +-#else /* __linux__ */ ++#elif defined(__linux__) || defined(_ALLBSD_SOURCE) + clk_tck = 100; + #endif + if (clk_tck == -1) { +@@ -244,22 +273,51 @@ JNIEXPORT jlong JNICALL + Java_com_sun_management_UnixOperatingSystem_getFreePhysicalMemorySize + (JNIEnv *env, jobject mbean) + { ++#ifdef _ALLBSD_SOURCE ++ /* ++ * XXXBSD: there's no way available to do it in FreeBSD, AFAIK. ++ */ ++ // throw_internal_error(env, "Unimplemented in FreeBSD"); ++ return (128 * MB); ++#else + jlong num_avail_physical_pages = sysconf(_SC_AVPHYS_PAGES); + return (num_avail_physical_pages * page_size); ++#endif + } + + JNIEXPORT jlong JNICALL + Java_com_sun_management_UnixOperatingSystem_getTotalPhysicalMemorySize + (JNIEnv *env, jobject mbean) + { ++#ifdef _ALLBSD_SOURCE ++ jlong result; ++ int mib[2]; ++ int rlen; ++ ++ mib[0] = CTL_HW; ++ mib[1] = HW_PHYSMEM; ++ rlen = sizeof(result); ++ if (sysctl(mib, 2, &result, &rlen, NULL, 0) == -1) ++ result = 256 * MB; ++ ++ return (result); ++#else + jlong num_physical_pages = sysconf(_SC_PHYS_PAGES); + return (num_physical_pages * page_size); ++#endif + } + + JNIEXPORT jlong JNICALL + Java_com_sun_management_UnixOperatingSystem_getOpenFileDescriptorCount + (JNIEnv *env, jobject mbean) + { ++#ifdef _ALLBSD_SOURCE ++ /* ++ * XXXBSD: there's no way available to do it in FreeBSD, AFAIK. ++ */ ++ // throw_internal_error(env, "Unimplemented in FreeBSD"); ++ return (100); ++#else /* solaris/linux */ + DIR *dirp; + struct dirent dbuf; + struct dirent* dentp; +@@ -282,6 +340,7 @@ Java_com_sun_management_UnixOperatingSystem_getOpenFil + closedir(dirp); + // subtract by 1 which was the fd open for this implementation + return (fds - 1); ++#endif + } + + JNIEXPORT jlong JNICALL diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_com_sun_security_auth_module_Unix_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_com_sun_security_auth_module_Unix_c new file mode 100644 index 00000000000..7b75bbcf967 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_com_sun_security_auth_module_Unix_c @@ -0,0 +1,16 @@ +$OpenBSD: patch-j2se_src_solaris_native_com_sun_security_auth_module_Unix_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/com/sun/security/auth/module/Unix.c.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/native/com/sun/security/auth/module/Unix.c Fri Jul 27 18:25:14 2007 +@@ -36,6 +36,12 @@ + #include + #include + ++// hack in the non-thread safe version and fix later. ++#ifdef __OpenBSD__ ++#define getpwuid_r(uid, res_buf, pwd_buf, bufsize, result) \ ++ (*result = getpwuid(uid)) ++#endif ++ + JNIEXPORT void JNICALL + Java_com_sun_security_auth_module_UnixSystem_getUnixInfo + (JNIEnv *env, jobject obj) { diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_common_gdefs_md_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_common_gdefs_md_h new file mode 100644 index 00000000000..3b32098e428 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_common_gdefs_md_h @@ -0,0 +1,13 @@ +$OpenBSD: patch-j2se_src_solaris_native_common_gdefs_md_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/common/gdefs_md.h.orig Thu Jul 5 05:03:37 2007 ++++ j2se/src/solaris/native/common/gdefs_md.h Fri Jul 27 18:25:14 2007 +@@ -36,4 +36,8 @@ + #include + #include + #endif /* __linux__ */ +- ++#if defined(__OpenBSD__) ++#include ++#elif _ALLBSD_SOURCE ++#include ++#endif /* _ALLBSD_SOURCE */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_UnixFileSystem_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_UnixFileSystem_md_c new file mode 100644 index 00000000000..1dd33913d9d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_UnixFileSystem_md_c @@ -0,0 +1,156 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_io_UnixFileSystem_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/io/UnixFileSystem_md.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/io/UnixFileSystem_md.c Fri Jul 27 18:25:14 2007 +@@ -27,7 +27,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include + #include +@@ -41,6 +42,11 @@ + #include "java_io_FileSystem.h" + #include "java_io_UnixFileSystem.h" + ++#if defined(_ALLBSD_SOURCE) ++#define HAVE_LARGEFILE ++#define dirent64 dirent ++#define readdir64 readdir ++#endif + + /* -- Field IDs -- */ + +@@ -61,6 +67,8 @@ Java_java_io_UnixFileSystem_initIDs(JNIEnv *env, jclas + + /* -- Large-file support -- */ + ++#ifndef HAVE_LARGEFILE ++ + /* LINUX_FIXME: ifdef __solaris__ here is wrong. We need to move the + * definition of stat64 into a solaris_largefile.h and create a + * linux_largefile.h with a good stat64 structure to compile on +@@ -121,6 +129,7 @@ static void init64IO(void) { + dlclose(handle); + } + ++#endif /* HAVE_LARGEFILE */ + + /* -- Path operations -- */ + +@@ -151,6 +160,7 @@ Java_java_io_UnixFileSystem_canonicalize0(JNIEnv *env, + static jboolean + statMode(const char *path, int *mode) + { ++#ifndef HAVE_LARGEFILE + if (stat64_ptr) { + struct stat64 sb; + if (((*stat64_ptr)(path, &sb)) == 0) { +@@ -158,12 +168,15 @@ statMode(const char *path, int *mode) + return JNI_TRUE; + } + } else { ++#endif + struct stat sb; + if (stat(path, &sb) == 0) { + *mode = sb.st_mode; + return JNI_TRUE; + } ++#ifndef HAVE_LARGEFILE + } ++#endif + return JNI_FALSE; + } + +@@ -266,17 +279,21 @@ Java_java_io_UnixFileSystem_getLastModifiedTime(JNIEnv + jlong rv = 0; + + WITH_FIELD_PLATFORM_STRING(env, file, ids.path, path) { ++#ifndef HAVE_LARGEFILE + if (stat64_ptr) { + struct stat64 sb; + if (((*stat64_ptr)(path, &sb)) == 0) { + rv = 1000 * (jlong)sb.st_mtime; + } + } else { ++#endif + struct stat sb; + if (stat(path, &sb) == 0) { + rv = 1000 * (jlong)sb.st_mtime; + } ++#ifndef HAVE_LARGEFILE + } ++#endif + } END_PLATFORM_STRING(env, path); + return rv; + } +@@ -289,17 +306,21 @@ Java_java_io_UnixFileSystem_getLength(JNIEnv *env, job + jlong rv = 0; + + WITH_FIELD_PLATFORM_STRING(env, file, ids.path, path) { ++#ifndef HAVE_LARGEFILE + if (stat64_ptr) { + struct stat64 sb; + if (((*stat64_ptr)(path, &sb)) == 0) { + rv = sb.st_size; + } + } else { ++#endif + struct stat sb; + if (stat(path, &sb) == 0) { + rv = sb.st_size; + } ++#ifndef HAVE_LARGEFILE + } ++#endif + } END_PLATFORM_STRING(env, path); + return rv; + } +@@ -378,6 +399,9 @@ Java_java_io_UnixFileSystem_list(JNIEnv *env, jobject + if (rv == NULL) goto error; + + /* Scan the directory */ ++#ifdef _ALLBSD_SOURCE ++#define readdir64_r readdir_r ++#endif + while ((readdir64_r(dir, ptr, &result) == 0) && (result != NULL)) { + jstring name; + if (!strcmp(ptr->d_name, ".") || !strcmp(ptr->d_name, "..")) +@@ -483,7 +507,7 @@ Java_java_io_UnixFileSystem_setLastModifiedTime(JNIEnv + #endif + + /* Preserve access time */ +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + struct stat sb; + + if (stat(path, &sb) == 0) { +@@ -534,20 +558,20 @@ Java_java_io_UnixFileSystem_getSpace(JNIEnv *env, jobj + jlong rv = 0L; + + WITH_FIELD_PLATFORM_STRING(env, file, ids.path, path) { +- struct statvfs fsstat; +- memset(&fsstat, 0, sizeof(struct statvfs)); +- if (statvfs(path, &fsstat) == 0) { ++ struct statfs fsstat; ++ memset(&fsstat, 0, sizeof(struct statfs)); ++ if (statfs(path, &fsstat) == 0) { + switch(t) { + case java_io_FileSystem_SPACE_TOTAL: +- rv = jlong_mul(long_to_jlong(fsstat.f_frsize), ++ rv = jlong_mul(long_to_jlong(fsstat.f_bsize), + long_to_jlong(fsstat.f_blocks)); + break; + case java_io_FileSystem_SPACE_FREE: +- rv = jlong_mul(long_to_jlong(fsstat.f_frsize), ++ rv = jlong_mul(long_to_jlong(fsstat.f_bsize), + long_to_jlong(fsstat.f_bfree)); + break; + case java_io_FileSystem_SPACE_USABLE: +- rv = jlong_mul(long_to_jlong(fsstat.f_frsize), ++ rv = jlong_mul(long_to_jlong(fsstat.f_bsize), + long_to_jlong(fsstat.f_bavail)); + break; + default: diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_canonicalize_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_canonicalize_md_c new file mode 100644 index 00000000000..0e00c08f2d7 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_canonicalize_md_c @@ -0,0 +1,13 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_io_canonicalize_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/io/canonicalize_md.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/io/canonicalize_md.c Fri Jul 27 18:25:14 2007 +@@ -33,7 +33,9 @@ + #include + #include + #include ++#if !defined(_ALLBSD_SOURCE) + #include ++#endif + + + /* Note: The comments in this file use the terminology diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_io_util_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_io_util_md_c new file mode 100644 index 00000000000..9c88cb4d451 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_io_io_util_md_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_io_io_util_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/io/io_util_md.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/io/io_util_md.c Fri Jul 27 18:25:14 2007 +@@ -36,7 +36,7 @@ fileOpen(JNIEnv *env, jobject this, jstring path, jfie + WITH_PLATFORM_STRING(env, path, ps) { + FD fd; + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + /* Remove trailing slashes, since the kernel won't */ + char *p = (char *)ps + strlen(ps) - 1; + while ((p > ps) && (*p == '/')) diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_ProcessEnvironment_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_ProcessEnvironment_md_c new file mode 100644 index 00000000000..f9d7351cd12 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_ProcessEnvironment_md_c @@ -0,0 +1,21 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_lang_ProcessEnvironment_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c Fri Jul 27 18:25:14 2007 +@@ -46,7 +46,7 @@ Java_java_lang_ProcessEnvironment_environ(JNIEnv *env, + + for (i = 0; environ[i]; i++) { + /* Ignore corrupted environment variables */ +- if (strchr(environ[i], '=') != NULL) ++ if (strchr(environ[i], '=') != NULL && *environ[i] != '=') + count++; + } + +@@ -56,7 +56,7 @@ Java_java_lang_ProcessEnvironment_environ(JNIEnv *env, + for (i = 0, j = 0; environ[i]; 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/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c new file mode 100644 index 00000000000..058f47e0370 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c @@ -0,0 +1,204 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/lang/UNIXProcess_md.c.orig Thu Aug 30 05:05:57 2007 ++++ j2se/src/solaris/native/java/lang/UNIXProcess_md.c Mon Sep 3 22:27:54 2007 +@@ -40,7 +40,11 @@ + #include + #include + #include ++#ifdef _ALLBSD_SOURCE ++#include ++#else + #include ++#endif + #include + #include + #include +@@ -49,6 +53,12 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#include ++#include ++#endif ++ + #ifndef STDIN_FILENO + #define STDIN_FILENO 0 + #endif +@@ -259,9 +269,122 @@ Java_java_lang_UNIXProcess_waitForProcessExit(JNIEnv* + } + } + ++#if defined(__OpenBSD__) ++/* ++ * Directly call _thread_sys_closefrom() so the child process ++ * doesn't reset the parrent's file descriptors to be blocking. ++ * This function is only called from the child process which ++ * is single threaded and about to call execvp() so it is ++ * safe to bypass the threaded closefrom(). ++ */ ++int _thread_sys_closefrom(int); ++ + static int + closeDescriptors(void) + { ++ return _thread_sys_closefrom(FAIL_FILENO + 1); ++} ++ ++#elif defined(_ALLBSD_SOURCE) ++ ++/* ++ * BSDNOTE: This function was returning 'int' originally. But it assumed ++ * that OS has some intelegent functionality to close opened-only fds ++ * associated with current process. Since we have to close them lineary ++ * make it void, until something really new functionality will appear. ++ */ ++int closeDescriptors() ++{ ++ int max_fd, savei, i, ebadf; ++ ++ /* ++ * BSDNOTE: There's no known way to find list of all open file descriptors ++ * associated with process in FreeBSD. Therefore we have to pass from ++ * fd == 3 to maximum fd per process number. It's possible to retrive ++ * max number of fd's with three ways: sysctl(kern.maxfilesperproc), ++ * getrlimit(RLIMIT_NOFILE) and getdtablesize(). In current implementation ++ * getdtablesize() returns MIN() of first two ways. ++ * ++ * At my current system maxfileperproc > 7300. And it's unlikely that ++ * all of these descriptors always are allocated. Let's use some ++ * "heuristics" to avoid thousands of unneccessary calls. ++ */ ++ ++#define GUESS_FINISHED 51 ++ ++ max_fd = getdtablesize(); ++ ebadf = 0; ++ ++ for (i = 3; i < max_fd; i++) { ++ if (close(i) < 0) { ebadf++; } else { ebadf = 0; } ++ /* ++ * GUESS_FINISHED subsequent calls to close() returned EBADF, assume ++ * we don't have open descriptors anymore ++ */ ++ if (ebadf > GUESS_FINISHED) { ++ return (0); ++ } ++ } ++ return (0); ++} ++ ++#if defined(__FreeBSD__) ++ ++extern pid_t __sys_fork(void); ++ ++static pid_t ++jdk_fork_wrapper() ++{ ++ pid_t resultPid; ++ typedef void (*void_func)(); ++ static void_func func_defer = NULL; ++ static void_func func_undefer = NULL; ++ static int is_libc_r = -1; ++ ++ if (is_libc_r == -1) { ++ ++ /* ++ * BSDNOTE: Check for loaded symbols. ++ * ++ * If "_thread_kern_sig_defer" symbol is found assume we are ++ * libc_r ++ * ++ * If libc_r is loaded, use fork system call drectly to avoid ++ * problems with using protected pages. ++ * ++ * --phantom ++ */ ++ func_defer = ++ (void_func)dlsym(RTLD_DEFAULT, "_thread_kern_sig_defer"); ++ func_undefer = ++ (void_func)dlsym(RTLD_DEFAULT, "_thread_kern_sig_undefer"); ++ if (func_defer != NULL) ++ is_libc_r = 1; ++ else { ++ is_libc_r = 0; ++ } ++ } ++ ++ if (is_libc_r == 0) { ++ /* Not a libc_r */ ++ resultPid = fork(); ++ } else { ++ (*func_defer)(); /* call _thread_kern_sig_defer() */ ++ resultPid = __sys_fork(); ++ if (resultPid != 0) ++ (*func_undefer)(); /* call _thread_kern_sig_undefer() */ ++ /* leave child with signals disabled, but reenable in parent */ ++ } ++ ++ return resultPid; ++} ++#endif /* __FreeBSD__ */ ++ ++#else /* _ALLBSD_SOURCE */ ++ ++static int ++closeDescriptors(void) ++{ + DIR *dp; + struct dirent64 *dirp; + int from_fd = FAIL_FILENO + 1; +@@ -293,6 +416,7 @@ closeDescriptors(void) + + return 1; + } ++#endif /* !_ALLBSD_SOURCE */ + + static void + moveDescriptor(int fd_from, int fd_to) +@@ -471,10 +595,15 @@ closeSafely(int fd) + close(fd); + } + ++#if defined(__FreeBSD__) ++#undef fork1 ++#define fork1() jdk_fork_wrapper() ++#else + #ifndef __solaris__ + #undef fork1 + #define fork1() fork() + #endif ++#endif + + JNIEXPORT jint JNICALL + Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env, +@@ -535,6 +664,28 @@ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env, + + if (resultPid == 0) { + /* Child process */ ++ ++#ifdef __OpenBSD__ ++// XXXBSD: Work-around userland pthread implementation issue. ++// Closing file descriptors will reset them to be blocking. ++// This is problematic for the parent when it attemts to use ++// the blocking fd and deadlocks. Setting them to non-blocking ++// in the child prevents the close/dup2 from resetting them. ++ { ++ int flags; ++ flags = fcntl(STDIN_FILENO, F_GETFL, NULL); ++ if (flags != -1) ++ fcntl(STDIN_FILENO, F_SETFL, flags | O_NONBLOCK); ++ ++ flags = fcntl(STDOUT_FILENO, F_GETFL, NULL); ++ if (flags != -1) ++ fcntl(STDOUT_FILENO, F_SETFL, flags | O_NONBLOCK); ++ ++ flags = fcntl(STDERR_FILENO, F_GETFL, NULL); ++ if (flags != -1) ++ fcntl(STDOUT_FILENO, F_SETFL, flags | O_NONBLOCK); ++ } ++#endif + + /* Close the parent sides of the pipe. + Give the child sides of the pipes the right fileno's. diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_java_props_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_java_props_md_c new file mode 100644 index 00000000000..cc42163a047 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_lang_java_props_md_c @@ -0,0 +1,198 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_lang_java_props_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/lang/java_props_md.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/lang/java_props_md.c Fri Jul 27 18:25:14 2007 +@@ -23,7 +23,7 @@ + * + */ + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #include + #endif +@@ -32,8 +32,11 @@ + #ifndef ARCHPROPNAME + #error "The macro ARCHPROPNAME has not been defined" + #endif +-#include /* For os_name and os_version */ ++#ifndef __OpenBSD__ ++#define HAVE_NL_LANGINFO + #include /* For nl_langinfo */ ++#endif ++#include /* For os_name and os_version */ + #include + #include + #include +@@ -42,9 +45,17 @@ + #include + #include + ++#if defined(_ALLBSD_SOURCE) ++#if !defined(P_tmpdir) ++#include ++#define P_tmpdir _PATH_VARTMP ++#endif ++#endif ++ + #include "locale_str.h" + #include "java_props.h" + ++#if !defined(_ALLBSD_SOURCE) + #ifdef __linux__ + #define CODESET _NL_CTYPE_CODESET_NAME + #else +@@ -52,6 +63,7 @@ + #define CODESET ALT_CODESET_KEY + #endif + #endif ++#endif /* !_ALLBSD_SOURCE */ + + /* Take an array of string pairs (map of key->value) and a string (key). + * Examine each pair in the map to see if the first string (key) matches the +@@ -121,7 +133,7 @@ setPathEnvironment(char *envstring) + java_props_t * + GetJavaProperties(JNIEnv *env) + { +- static java_props_t sprops = {0}; ++ static java_props_t sprops = { 0 }; + char *v; /* tmp var */ + + if (sprops.user_dir) { +@@ -188,7 +200,12 @@ GetJavaProperties(JNIEnv *env) + { + char *lc; + lc = setlocale(LC_CTYPE, ""); +-#ifndef __linux__ ++#if defined(_ALLBSD_SOURCE) && defined(HAVE_NL_LANGINFO) ++ if (lc == NULL) { ++ lc = "C"; ++ } ++ { ++#elif !defined(__linux__) + if (lc == NULL) { + /* + * 'lc == null' means system doesn't support user's environment +@@ -219,7 +236,7 @@ GetJavaProperties(JNIEnv *env) + char *p, encoding_variant[64]; + int i, found; + +-#ifndef __linux__ ++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) + /* + * Workaround for Solaris bug 4201684: Xlib doesn't like @euro + * locales. Since we don't depend on the libc @euro behavior, +@@ -236,6 +253,13 @@ GetJavaProperties(JNIEnv *env) + *p = '\0'; + setlocale(LC_ALL, temp); + #endif ++ if (lc == NULL) { ++ strncpy(temp, "C", sizeof(temp)-1); ++ temp[sizeof(temp)-1] = '\0'; ++ } else { ++ strncpy(temp, lc, sizeof(temp)-1); ++ temp[sizeof(temp)-1] = '\0'; ++ } + + strcpy(temp, lc); + +@@ -308,7 +332,36 @@ GetJavaProperties(JNIEnv *env) + * (e.g., the C or POSIX locales); we use the default ISO 8859-1 + * converter for such locales. + */ +- ++#if defined(_ALLBSD_SOURCE) ++# if defined(HAVE_NL_LANGINFO) ++ p = nl_langinfo(CODESET); ++ if (p == NULL || *p == '\0' || ++ !strcmp(p, "C") || !strcmp(p, "US-ASCII")) { ++ p = ""; // use default ++ } else { ++ p = strdup(p); ++ if (p == NULL) ++ p = ""; /* strdup failed */ ++ } ++# else ++ if (encoding) { ++ std_encoding = encoding; ++ if (!strcmp(encoding, "EUC") && std_country) { ++ snprintf(encoding_variant, sizeof(encoding_variant) - 1, ++ "%s_%s", encoding, std_country); ++ encoding_variant[sizeof(encoding_variant) - 1] = '\0'; ++ std_encoding = encoding_variant; ++ } ++ p = strdup(std_encoding); ++ if (p == NULL) { ++ /* strdup failed */ ++ p = ""; ++ } ++ } else { ++ p = ""; ++ } ++# endif /* HAVE_NL_LANGINFO */ ++#else + /* OK, not so reliable - nl_langinfo() gives wrong answers on + * Euro locales, in particular. */ + if (strcmp(p, "ISO8859-15") == 0) +@@ -320,11 +373,13 @@ GetJavaProperties(JNIEnv *env) + if (strcmp(p, "646") == 0) + p = "ISO646-US"; + ++#endif /* _ALLBSD_SOURCE */ ++ + /* return same result nl_langinfo would return for en_UK, + * in order to use optimizations. */ + std_encoding = (*p != '\0') ? p : "ISO8859-1"; + +- ++#if !defined(_ALLBSD_SOURCE) + #ifdef __linux__ + /* + * Remap the encoding string to a different value for japanese +@@ -355,20 +410,30 @@ GetJavaProperties(JNIEnv *env) + std_encoding = "Big5_Solaris"; + } + #endif ++#endif /* !_ALLBSD_SOURCE */ ++ + sprops.encoding = std_encoding; + sprops.sun_jnu_encoding = sprops.encoding; + } + } + +-#ifdef __linux__ +-#if __BYTE_ORDER == __LITTLE_ENDIAN ++#ifdef _ALLBSD_SOURCE ++#if BYTE_ORDER == _LITTLE_ENDIAN + sprops.unicode_encoding = "UnicodeLittle"; + #else + sprops.unicode_encoding = "UnicodeBig"; + #endif ++#else /* !_ALLBSD_SOURCE */ ++#ifdef __linux__ ++#if __BYTE_ORDER == _LITTLE_ENDIAN ++ sprops.unicode_encoding = "UnicodeLittle"; + #else + sprops.unicode_encoding = "UnicodeBig"; ++#endif /* __linux__ */ ++#else ++ sprops.unicode_encoding = "UnicodeBig"; + #endif ++#endif /* _ALLBSD_SOURCE */ + + /* user properties */ + { +@@ -405,12 +470,14 @@ GetJavaProperties(JNIEnv *env) + sprops.path_separator = ":"; + sprops.line_separator = "\n"; + ++#if !defined(_ALLBSD_SOURCE) + /* Append CDE message and resource search path to NLSPATH and + * XFILESEARCHPATH, in order to pick localized message for + * FileSelectionDialog window (Bug 4173641). + */ + setPathEnvironment("NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat"); + setPathEnvironment("XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt"); ++#endif + + return &sprops; + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_Inet4AddressImpl_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_Inet4AddressImpl_c new file mode 100644 index 00000000000..6d38e240805 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_Inet4AddressImpl_c @@ -0,0 +1,359 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_net_Inet4AddressImpl_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/net/Inet4AddressImpl.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/net/Inet4AddressImpl.c Fri Jul 27 18:25:14 2007 +@@ -35,17 +35,293 @@ + #include + #include + ++#ifdef _ALLBSD_SOURCE ++#include ++#include ++#endif ++ + #include "jvm.h" + #include "jni_util.h" + #include "net_util.h" + + #include "java_net_Inet4AddressImpl.h" + ++#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104)) ++#define HAS_GLIBC_GETHOSTBY_R 1 ++#endif ++ ++#if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) ++/* Use getaddrinfo(3), which is thread safe */ ++/************************************************************************ ++ * Inet4AddressImpl ++ */ ++ ++/* ++ * Class: java_net_Inet4AddressImpl ++ * Method: getLocalHostName ++ * Signature: ()Ljava/lang/String; ++ */ ++JNIEXPORT jstring JNICALL ++Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv *env, jobject this) { ++ char hostname[NI_MAXHOST+1]; ++ ++ hostname[0] = '\0'; ++ if (JVM_GetHostName(hostname, NI_MAXHOST)) { ++ /* Something went wrong, maybe networking is not setup? */ ++ strcpy(hostname, "localhost"); ++ } else { ++ struct addrinfo hints, *res; ++ int error; ++ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_flags = AI_CANONNAME; ++ hints.ai_family = AF_UNSPEC; ++ ++ error = getaddrinfo(hostname, "domain", &hints, &res); ++ ++ if (error == 0) { ++ /* host is known to name service */ ++ error = getnameinfo(res->ai_addr, ++ res->ai_addrlen, ++ hostname, ++ NI_MAXHOST, ++ NULL, ++ 0, ++ NI_NAMEREQD); ++ ++ /* if getnameinfo fails hostname is still the value ++ from gethostname */ ++ ++ freeaddrinfo(res); ++ } ++ } ++ return (*env)->NewStringUTF(env, hostname); ++} ++ ++static jclass ni_iacls; ++static jclass ni_ia4cls; ++static jmethodID ni_ia4ctrID; ++static jfieldID ni_iaaddressID; ++static jfieldID ni_iahostID; ++static jfieldID ni_iafamilyID; ++static int initialized = 0; ++ ++/* ++ * Find an internet address for a given hostname. Note that this ++ * code only works for addresses of type INET. The translation ++ * of %d.%d.%d.%d to an address (int) occurs in java now, so the ++ * String "host" shouldn't *ever* be a %d.%d.%d.%d string ++ * ++ * Class: java_net_Inet4AddressImpl ++ * Method: lookupAllHostAddr ++ * Signature: (Ljava/lang/String;)[[B ++ */ ++ ++JNIEXPORT jobjectArray JNICALL ++Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, ++ jstring host) { ++ const char *hostname; ++ jobject name; ++ jobjectArray ret = 0; ++ int retLen = 0; ++ ++ int error=0; ++ struct addrinfo hints, *res, *resNew = NULL; ++ ++ if (!initialized) { ++ ni_iacls = (*env)->FindClass(env, "java/net/InetAddress"); ++ ni_iacls = (*env)->NewGlobalRef(env, ni_iacls); ++ ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address"); ++ ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls); ++ ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "", "()V"); ++ ni_iaaddressID = (*env)->GetFieldID(env, ni_iacls, "address", "I"); ++ ni_iafamilyID = (*env)->GetFieldID(env, ni_iacls, "family", "I"); ++ ni_iahostID = (*env)->GetFieldID(env, ni_iacls, "hostName", "Ljava/lang/String;"); ++ initialized = 1; ++ } ++ ++ if (IS_NULL(host)) { ++ JNU_ThrowNullPointerException(env, "host is null"); ++ return 0; ++ } ++ hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE); ++ CHECK_NULL_RETURN(hostname, NULL); ++ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_flags = AI_CANONNAME; ++ hints.ai_family = AF_INET; ++ ++ /* ++ * Workaround for Solaris bug 4160367 - if a hostname contains a ++ * white space then 0.0.0.0 is returned ++ */ ++ if (isspace(hostname[0])) { ++ JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", ++ (char *)hostname); ++ JNU_ReleaseStringPlatformChars(env, host, hostname); ++ return NULL; ++ } ++ ++ error = getaddrinfo(hostname, "domain", &hints, &res); ++ ++ if (error) { ++ /* report error */ ++ JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", ++ (char *)hostname); ++ JNU_ReleaseStringPlatformChars(env, host, hostname); ++ return NULL; ++ } else { ++ int i = 0; ++ struct addrinfo *itr, *last, *iterator = res; ++ while (iterator != NULL) { ++ int skip = 0; ++ itr = resNew; ++ ++ while (itr != NULL) { ++ struct sockaddr_in *addr1, *addr2; ++ ++ addr1 = (struct sockaddr_in *)iterator->ai_addr; ++ addr2 = (struct sockaddr_in *)itr->ai_addr; ++ if (addr1->sin_addr.s_addr == ++ addr2->sin_addr.s_addr) { ++ skip = 1; ++ break; ++ } ++ ++ itr = itr->ai_next; ++ } ++ ++ if (!skip) { ++ struct addrinfo *next ++ = (struct addrinfo*) malloc(sizeof(struct addrinfo)); ++ if (!next) { ++ JNU_ThrowOutOfMemoryError(env, "heap allocation failed"); ++ ret = NULL; ++ goto cleanupAndReturn; ++ } ++ memcpy(next, iterator, sizeof(struct addrinfo)); ++ next->ai_next = NULL; ++ if (resNew == NULL) { ++ resNew = next; ++ } else { ++ last->ai_next = next; ++ } ++ last = next; ++ i++; ++ } ++ iterator = iterator->ai_next; ++ } ++ ++ retLen = i; ++ iterator = resNew; ++ i = 0; ++ ++ name = (*env)->NewStringUTF(env, hostname); ++ if (IS_NULL(name)) { ++ goto cleanupAndReturn; ++ } ++ ++ ret = (*env)->NewObjectArray(env, retLen, ni_iacls, NULL); ++ if (IS_NULL(ret)) { ++ /* we may have memory to free at the end of this */ ++ goto cleanupAndReturn; ++ } ++ ++ while (iterator != NULL) { ++ /* We need 4 bytes to store ipv4 address; */ ++ int len = 4; ++ ++ jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID); ++ if (IS_NULL(iaObj)) { ++ /* we may have memory to free at the end of this */ ++ ret = NULL; ++ goto cleanupAndReturn; ++ } ++ (*env)->SetIntField(env, iaObj, ni_iaaddressID, ++ ntohl(((struct sockaddr_in*)(iterator->ai_addr))->sin_addr.s_addr)); ++ (*env)->SetObjectField(env, iaObj, ni_iahostID, name); ++ (*env)->SetObjectArrayElement(env, ret, retLen - i -1, iaObj); ++ i++; ++ iterator = iterator->ai_next; ++ } ++ } ++ ++cleanupAndReturn: ++ { ++ struct addrinfo *iterator, *tmp; ++ iterator = resNew; ++ while (iterator != NULL) { ++ tmp = iterator; ++ iterator = iterator->ai_next; ++ free(tmp); ++ } ++ JNU_ReleaseStringPlatformChars(env, host, hostname); ++ } ++ ++ freeaddrinfo(res); ++ ++ return ret; ++ ++} ++ ++/* ++ * Class: java_net_Inet4AddressImpl ++ * Method: getHostByAddr ++ * Signature: (I)Ljava/lang/String; ++ */ ++JNIEXPORT jstring JNICALL ++Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this, ++ jbyteArray addrArray) { ++ jstring ret = NULL; ++ ++ char host[NI_MAXHOST+1]; ++ jfieldID fid; ++ int error = 0; ++ jint family; ++ struct sockaddr *him ; ++ int len = 0; ++ jbyte caddr[4]; ++ jint addr; ++ ++ struct sockaddr_in him4; ++ struct sockaddr *sa; ++ ++ /* ++ * For IPv4 addresses construct a sockaddr_in structure. ++ */ ++ (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr); ++ addr = ((caddr[0]<<24) & 0xff000000); ++ addr |= ((caddr[1] <<16) & 0xff0000); ++ addr |= ((caddr[2] <<8) & 0xff00); ++ addr |= (caddr[3] & 0xff); ++ memset((char *) &him4, 0, sizeof(him4)); ++ him4.sin_addr.s_addr = (uint32_t) htonl(addr); ++ him4.sin_family = AF_INET; ++ sa = (struct sockaddr *) &him4; ++ len = sizeof(him4); ++ ++ error = getnameinfo(sa, len, host, NI_MAXHOST, NULL, 0, ++ NI_NAMEREQD); ++ ++ if (!error) { ++ ret = (*env)->NewStringUTF(env, host); ++ } ++ ++ if (ret == NULL) { ++ JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", NULL); ++ } ++ ++ return ret; ++ ++} ++ ++#else /* defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) */ ++ + /* the initial size of our hostent buffers */ + #define HENT_BUF_SIZE 1024 + #define BIG_HENT_BUF_SIZE 10240 /* a jumbo-sized one */ + +-#ifndef __GLIBC__ ++#if !defined(__GLIBC__) && !defined(_ALLBSD_SOURCE) + /* gethostname() is in libc.so but I can't find a header file for it */ + extern int gethostname(char *buf, int buf_len); + #endif +@@ -85,13 +361,13 @@ Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv + char buf2[HENT_BUF_SIZE]; + int h_error=0; + +-#ifdef __GLIBC__ ++#ifdef HAS_GLIBC_GETHOSTBY_R + gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error); + #else + hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error); + #endif + if (hp) { +-#ifdef __GLIBC__ ++#ifdef HAS_GLIBC_GETHOSTBY_R + gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET, + &res2, buf2, sizeof(buf2), &hp, &h_error); + #else +@@ -178,7 +454,7 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEn + } + + /* Try once, with our static buffer. */ +-#ifdef __GLIBC__ ++#ifdef HAS_GLIBC_GETHOSTBY_R + gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error); + #else + hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error); +@@ -191,7 +467,7 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEn + */ + if (hp == NULL && errno == ERANGE) { + if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) { +-#ifdef __GLIBC__ ++#ifdef HAS_GLIBC_GETHOSTBY_R + gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE, + &hp, &h_error); + #else +@@ -281,7 +557,7 @@ Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *e + addr |= ((caddr[2] <<8) & 0xff00); + addr |= (caddr[3] & 0xff); + addr = htonl(addr); +-#ifdef __GLIBC__ ++#ifdef HAS_GLIBC_GETHOSTBY_R + gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent, + buf, sizeof(buf), &hp, &h_error); + #else +@@ -295,7 +571,7 @@ Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *e + */ + if (hp == NULL && errno == ERANGE) { + if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) { +-#ifdef __GLIBC__ ++#ifdef HAS_GLIBC_GETHOSTBY_R + gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, + &hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error); + #else +@@ -316,6 +592,8 @@ Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *e + } + return ret; + } ++ ++#endif /* _ALLBSD_SOURCE */ + + #define SET_NONBLOCKING(fd) { \ + int flags = fcntl(fd, F_GETFL); \ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_Inet6AddressImpl_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_Inet6AddressImpl_c new file mode 100644 index 00000000000..67953e35538 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_Inet6AddressImpl_c @@ -0,0 +1,52 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_net_Inet6AddressImpl_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/net/Inet6AddressImpl.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/net/Inet6AddressImpl.c Fri Jul 27 18:25:14 2007 +@@ -32,6 +32,9 @@ + #include + #include + #include ++#ifdef _ALLBSD_SOURCE ++#include /* gethostname */ ++#endif + + #include "jvm.h" + #include "jni_util.h" +@@ -48,7 +51,7 @@ + #define NI_MAXHOST 1025 + #endif + +-#ifndef __GLIBC__ ++#if !defined(__GLIBC__) && !defined(_ALLBSD_SOURCE) + /* gethostname() is in libc.so but I can't find a header file for it */ + extern int gethostname(char *buf, int buf_len); + #endif +@@ -71,10 +74,18 @@ Java_java_net_Inet6AddressImpl_getLocalHostName(JNIEnv + /* Something went wrong, maybe networking is not setup? */ + strcpy(hostname, "localhost"); + } else { +-#ifdef __linux__ +- /* On Linux gethostname() says "host.domain.sun.com". On ++#if defined(__linux__) && defined(_ALLBSD_SOURCE) ++ /* On Linux/FreeBSD gethostname() says "host.domain.sun.com". On + * Solaris gethostname() says "host", so extra work is needed. + */ ++ /* ++ * XXXBSD: Though on FreeBSD it's possible case then hostname does ++ * not contain '.' (depends on previous sethostname() call). Maybe ++ * we need to proceed with Solaris way, but using getnameinfo() ++ * in conjunction with gethostby*() breaks thread-safeness, so ++ * we need to protect all calls to gethostby*() and getnameinfo() ++ * using same mutex. ++ */ + #else + /* Solaris doesn't want to give us a fully qualified domain name. + * We do a reverse lookup to try and get one. This works +@@ -110,7 +121,7 @@ Java_java_net_Inet6AddressImpl_getLocalHostName(JNIEnv + } + } + #endif /* AF_INET6 */ +-#endif /* __linux__ */ ++#endif /* __linux__ || _ALLBSD_SOURCE */ + } + return (*env)->NewStringUTF(env, hostname); + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_NetworkInterface_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_NetworkInterface_c new file mode 100644 index 00000000000..ba505f6b457 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_NetworkInterface_c @@ -0,0 +1,281 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_net_NetworkInterface_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/net/NetworkInterface.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/net/NetworkInterface.c Fri Jul 27 18:25:14 2007 +@@ -23,13 +23,13 @@ + * + */ + ++#include ++#include + #include + #include + #include + #include + #include +-#include +-#include + #include + #include + #include +@@ -47,6 +47,19 @@ + #else + #include + #endif ++#if defined(_ALLBSD_SOURCE) ++#include ++#include ++#if defined(__FreeBSD__) ++#include ++#include ++#elif defined(__OpenBSD__) ++#include ++#endif ++#include ++#include ++#include ++#endif + + #ifdef __linux__ + #define ifr_index ifr_ifindex +@@ -584,6 +597,7 @@ static netif *enumInterfaces(JNIEnv *env) { + } + + ++#if !defined(_ALLBSD_SOURCE) + /* + * Enumerates and returns all IPv4 interfaces + */ +@@ -694,7 +708,178 @@ static netif *enumIPv4Interfaces(JNIEnv *env, netif *i + return ifs; + } + ++#else /* _ALLBSD_SOURCE */ + ++/* ++ * Enumerates and returns all IPv4 interfaces ++ * ++ * WARNING! Make sure that it's correctly synchronized on future JDK ++ * versions imports! ++ */ ++static netif *enumIPv4Interfaces(JNIEnv *env, netif *ifs) ++{ ++ int sock; ++ struct ifaddrs *ifa, *origifa; ++ ++ sock = JVM_Socket(AF_INET, SOCK_DGRAM, 0); ++ if (sock < 0) { ++ /* ++ * If EPROTONOSUPPORT is returned it means we don't have ++ * IPv4 support so don't throw an exception. ++ */ ++ if (errno != EPROTONOSUPPORT) { ++ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", ++ "Socket creation failed"); ++ } ++ return ifs; ++ } ++ ++ if (getifaddrs(&origifa) != 0) { ++ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", ++ "getifaddrs() function failed"); ++ close(sock); ++ return ifs; ++ } ++ ++ for (ifa = origifa; ifa != NULL; ifa = ifa->ifa_next) { ++ ++ /* ++ * Skip non-AF_INET entries. ++ */ ++ if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET) ++ continue; ++ ++ /* ++ * Add to the list. ++ * ++ * BSDNOTE: in order to optimize code, interface index detection ++ * logic was added directly to addif(). ++ */ ++ ifs = addif(env, ifs, ifa->ifa_name, (-1), AF_INET, ++ ifa->ifa_addr, sizeof(struct sockaddr_in), 0); ++ ++ /* ++ * If an exception occurred then free the list. ++ */ ++ if ((*env)->ExceptionOccurred(env)) { ++ close(sock); ++ freeifaddrs(origifa); ++ freeif(ifs); ++ return NULL; ++ } ++ } ++ ++ /* ++ * Free socket and buffer ++ */ ++ close(sock); ++ freeifaddrs(origifa); ++ return ifs; ++} ++ ++#if defined(AF_INET6) ++/* ++ * Determines the prefix on BSD for IPv6 interfaces. ++ */ ++static ++int prefix(void *val, int size) { ++ u_char *name = (u_char *)val; ++ int byte, bit, plen = 0; ++ ++ for (byte = 0; byte < size; byte++, plen += 8) ++ if (name[byte] != 0xff) ++ break; ++ if (byte == size) ++ return (plen); ++ for (bit = 7; bit != 0; bit--, plen++) ++ if (!(name[byte] & (1 << bit))) ++ break; ++ for (; bit != 0; bit--) ++ if (name[byte] & (1 << bit)) ++ return (0); ++ byte++; ++ for (; byte < size; byte++) ++ if (name[byte]) ++ return (0); ++ return (plen); ++} ++ ++/* ++ * Enumerates and returns all IPv6 interfaces on FreeBSD ++ * ++ * BSDNOTE: it's done in same as IPv4 enumeration and should be carefully ++ * reviewed with each JDK update (according to Solaris/Linux version) ++ */ ++static netif *enumIPv6Interfaces(JNIEnv *env, netif *ifs) { ++ ++ int sock; ++ struct ifaddrs *ifa, *origifa; ++ struct sockaddr_in6 *sin6; ++ struct in6_ifreq ifr6; ++ ++ // Open IPv6 UDP socket. ++ sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0); ++ if (sock < 0) { ++ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", ++ "Failed to create IPv6 socket"); ++ return ifs; ++ } ++ ++ if (getifaddrs(&origifa) != 0) { ++ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", ++ "getifaddrs() function failed"); ++ close(sock); ++ return ifs; ++ } ++ ++ for (ifa = origifa; ifa != NULL; ifa = ifa->ifa_next) { ++ ++ /* ++ * Skip non-AF_INET6 entries. ++ */ ++ if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET6) ++ continue; ++ ++ memset(&ifr6, 0, sizeof(ifr6)); ++ strlcpy(ifr6.ifr_name, ifa->ifa_name, sizeof(ifr6.ifr_name)); ++ memcpy(&ifr6.ifr_addr, ifa->ifa_addr, MIN(sizeof(ifr6.ifr_addr), ifa->ifa_addr->sa_len)); ++ ++ if (ioctl(sock, SIOCGIFNETMASK_IN6, (caddr_t)&ifr6) < 0) { ++ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", ++ "ioctl SIOCGIFNETMASK_IN6 failed"); ++ close(sock); ++ freeifaddrs(origifa); ++ freeif(ifs); ++ return NULL; ++ } ++ ++ /* Add to the list. */ ++ sin6 = (struct sockaddr_in6 *)&ifr6.ifr_addr; ++ ifs = addif(env, ifs, ifa->ifa_name, (-1), AF_INET6, ++ ifa->ifa_addr, sizeof(struct sockaddr_in6), ++ prefix(&sin6->sin6_addr, sizeof(struct in6_addr))); ++ ++ /* If an exception occurred then free the list. */ ++ if ((*env)->ExceptionOccurred(env)) { ++ close(sock); ++ freeifaddrs(origifa); ++ freeif(ifs); ++ return NULL; ++ } ++ } ++ ++ /* ++ * Free socket and ifaddrs buffer ++ */ ++ close(sock); ++ freeifaddrs(origifa); ++ return ifs; ++} ++#endif /* AF_INET6 */ ++ ++#endif /* !_ALLBSD_SOURCE */ ++ ++ + #if defined(__solaris__) && defined(AF_INET6) + /* + * Enumerates and returns all IPv6 interfaces on Solaris +@@ -1014,7 +1199,13 @@ netif *addif(JNIEnv *env, netif *ifs, char *if_name, i + JNU_ThrowOutOfMemoryError(env, "heap allocation failed"); + return ifs; + } ++#if defined(_ALLBSD_SOURCE) ++ currif->index = if_nametoindex(name); ++ if (currif->index == 0) ++ currif->index = -1; ++#else + currif->index = index; ++#endif + currif->addr = NULL; + currif->childs = NULL; + currif->virtual = isVirtual; +@@ -1302,6 +1493,31 @@ int getMacAddress(JNIEnv *env, const struct in_addr* a + * All bytes to 0 means no hardware address. + */ + return -1; ++#elif defined(_ALLBSD_SOURCE) ++ struct ifaddrs *ifa0, *ifa; ++ struct sockaddr *saddr; ++ int i; ++ ++ /* Grab the interface list */ ++ if (!getifaddrs(&ifa0)) { ++ /* Cycle through the interfaces */ ++ for (i = 0, ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next, i++) { ++ saddr = ifa->ifa_addr; ++ /* Link layer contains the MAC address */ ++ if (saddr->sa_family == AF_LINK && !strcmp(ifname, ifa->ifa_name)) { ++ struct sockaddr_dl *sadl = (struct sockaddr_dl *) saddr; ++ /* Check the address is the correct length */ ++ if (sadl->sdl_alen == ETHER_ADDR_LEN) { ++ memcpy(buf, (sadl->sdl_data + sadl->sdl_nlen), ETHER_ADDR_LEN); ++ freeifaddrs(ifa0); ++ return ETHER_ADDR_LEN; ++ } ++ } ++ } ++ freeifaddrs(ifa0); ++ } ++ ++ return -1; + #else + struct arpreq arpreq; + struct sockaddr_in* sin; +@@ -1467,7 +1683,7 @@ JNIEXPORT jint JNICALL Java_java_net_NetworkInterface_ + "Socket creation failed"); + } else { + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + memset((char *) &if2, 0, sizeof(if2)); + strcpy(if2.ifr_name, name_utf); + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_PlainDatagramSocketImpl_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_PlainDatagramSocketImpl_c new file mode 100644 index 00000000000..519918cd43f --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_PlainDatagramSocketImpl_c @@ -0,0 +1,109 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_net_PlainDatagramSocketImpl_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig Thu Aug 2 03:52:40 2007 ++++ j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c Fri Aug 3 18:03:01 2007 +@@ -23,12 +23,12 @@ + * + */ + ++#include ++#include + #include + #include + #include + #include +-#include +-#include + + #ifdef __solaris__ + #include +@@ -335,7 +335,7 @@ Java_java_net_PlainDatagramSocketImpl_disconnect0(JNIE + /* The fdObj'fd */ + jint fd; + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + SOCKADDR addr; + int len; + #endif +@@ -345,26 +345,39 @@ Java_java_net_PlainDatagramSocketImpl_disconnect0(JNIE + } + fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID); + ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #ifdef __linux__ + if (isOldKernel) { + int t = 1; + setsockopt(fd, SOL_SOCKET, SO_BSDCOMPAT, (char*) &t, sizeof(int)); + } else { ++#endif /* __linux__ */ + memset(&addr, 0, sizeof(addr)); + #ifdef AF_INET6 + if (ipv6_available()) { + struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&addr; ++#ifdef __FreeBSD__ ++ him6->sin6_family = AF_INET6; ++#else + him6->sin6_family = AF_UNSPEC; ++#endif + len = sizeof(struct sockaddr_in6); + } else + #endif + { + struct sockaddr_in *him4 = (struct sockaddr_in*)&addr; ++#ifdef __FreeBSD__ ++ him4->sin_family = AF_INET; ++#else + him4->sin_family = AF_UNSPEC; ++#endif + len = sizeof(struct sockaddr_in); + } + JVM_Connect(fd, (struct sockaddr *)&addr, len); ++ /* XXXBSD: here we can get EADDRNOTAVAIL which need to be ignored ++ but since return value is not checked, ignore it */ + ++#ifdef __linux__ + // After disconnecting a UDP socket, Linux kernel will set + // local port to zero if the port number comes from implicit + // bind. Successive send/recv on the same socket will fail. +@@ -387,6 +400,7 @@ Java_java_net_PlainDatagramSocketImpl_disconnect0(JNIE + NET_Bind(fd, (struct sockaddr *)&addr, len); + } + } ++#endif + #else + JVM_Connect(fd, 0, 0); + #endif +@@ -2374,18 +2388,30 @@ static void mcast_join_leave(JNIEnv *env, jobject this + mname6.ipv6mr_interface = idx; + } + ++#if defined(_ALLBSD_SOURCE) ++#define ADD_MEMBERSHIP IPV6_JOIN_GROUP ++#define DRP_MEMBERSHIP IPV6_LEAVE_GROUP ++#define S_ADD_MEMBERSHIP "IPV6_JOIN_GROUP" ++#define S_DRP_MEMBERSHIP "IPV6_LEAVE_GROUP" ++#else ++#define ADD_MEMBERSHIP IPV6_ADD_MEMBERSHIP ++#define DRP_MEMBERSHIP IPV6_DROP_MEMBERSHIP ++#define S_ADD_MEMBERSHIP "IPV6_ADD_MEMBERSHIP" ++#define S_DRP_MEMBERSHIP "IPV6_DROP_MEMBERSHIP" ++#endif ++ + /* Join the multicast group */ +- if (JVM_SetSockOpt(fd, IPPROTO_IPV6, (join ? IPV6_ADD_MEMBERSHIP : IPV6_DROP_MEMBERSHIP), ++ if (JVM_SetSockOpt(fd, IPPROTO_IPV6, (join ? ADD_MEMBERSHIP : DRP_MEMBERSHIP), + (char *) &mname6, sizeof (mname6)) < 0) { + + if (join) { +- NET_ThrowCurrent(env, "setsockopt IPV6_ADD_MEMBERSHIP failed"); ++ NET_ThrowCurrent(env, "setsockopt " S_ADD_MEMBERSHIP " failed"); + } else { + if (errno == ENOENT) { + JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", + "Not a member of the multicast group"); + } else { +- NET_ThrowCurrent(env, "setsockopt IPV6_DROP_MEMBERSHIP failed"); ++ NET_ThrowCurrent(env, "setsockopt " S_DRP_MEMBERSHIP" failed"); + } + } + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_PlainSocketImpl_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_PlainSocketImpl_c new file mode 100644 index 00000000000..f1f8865757e --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_PlainSocketImpl_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_net_PlainSocketImpl_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/net/PlainSocketImpl.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/net/PlainSocketImpl.c Fri Jul 27 18:25:14 2007 +@@ -527,9 +527,11 @@ Java_java_net_PlainSocketImpl_socketConnect(JNIEnv *en + if (connect_rv == JVM_IO_INTR) { + JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException", + "operation interrupted"); ++#if defined(EPROTO) + } else if (errno == EPROTO) { + NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ProtocolException", + "Protocol error"); ++#endif + } else if (errno == ECONNREFUSED) { + NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ConnectException", + "Connection refused"); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_net_util_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_net_util_md_c new file mode 100644 index 00000000000..16d8e5c7fc3 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_net_util_md_c @@ -0,0 +1,169 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_net_net_util_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/net/net_util_md.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/net/net_util_md.c Fri Jul 27 18:25:14 2007 +@@ -34,6 +34,11 @@ + #include + #include + ++#ifdef _ALLBSD_SOURCE ++#include ++#include ++#endif ++ + #ifdef __solaris__ + #include + #include +@@ -219,8 +224,16 @@ NET_GetFileDescriptorID(JNIEnv *env) + return (*env)->GetFieldID(env, cls, "fd", "I"); + } + ++#if defined(DONT_ENABLE_IPV6) + jint IPv6_supported() + { ++ return JNI_FALSE; ++} ++ ++#else /* !DONT_ENABLE_IPV6 */ ++ ++jint IPv6_supported() ++{ + #ifndef AF_INET6 + return JNI_FALSE; + #endif +@@ -355,6 +368,7 @@ jint IPv6_supported() + close(fd); + return JNI_TRUE; + } ++#endif /* DONT_ENABLE_IPV6 */ + + void + NET_AllocSockaddr(struct sockaddr **him, int *len) { +@@ -689,6 +703,10 @@ NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, + him6->sin6_family = AF_INET6; + *len = sizeof(struct sockaddr_in6) ; + ++#if defined(_ALLBSD_SOURCE) && defined(_AF_INET6) ++// XXXBSD: should we do something with scope id here ? see below linux comment ++#endif ++ + /* + * On Linux if we are connecting to a link-local address + * we need to specify the interface in the scope_id (2.4 kernel only) +@@ -1133,6 +1151,17 @@ NET_SetSockOpt(int fd, int level, int opt, const void + #define IPTOS_PREC_MASK 0xe0 + #endif + ++#if defined(__FreeBSD__) || defined(__NetBSD__) ++ int mib[3]; ++ size_t rlen; ++ int *bufsize; ++ ++ static long maxsockbuf = -1; ++ ++ int addopt; ++ struct linger *ling; ++#endif ++ + /* + * IPPROTO/IP_TOS :- + * 1. IPv6 on Solaris: no-op and will be set in flowinfo +@@ -1165,6 +1194,10 @@ NET_SetSockOpt(int fd, int level, int opt, const void + *iptos &= (IPTOS_TOS_MASK | IPTOS_PREC_MASK); + } + ++#if defined(AF_INET6) && defined(_ALLBSD_SOURCE) ++// XXXBSD: to be implemented ? ++#endif ++ + /* + * SOL_SOCKET/{SO_SNDBUF,SO_RCVBUF} - On Solaris need to + * ensure that value is <= max_buf as otherwise we get +@@ -1203,12 +1236,87 @@ NET_SetSockOpt(int fd, int level, int opt, const void + * is that if SO_RCVBUF is too small then small packets + * must be discard. + */ +-#ifdef __linux__ ++#if defined(__linux__) + if (level == SOL_SOCKET && opt == SO_RCVBUF) { + int *bufsize = (int *)arg; + if (*bufsize < 1024) { + *bufsize = 1024; + } ++ } ++#endif ++ ++#if defined(__FreeBSD__) || defined(__NetBSD__) ++ /* ++ * SOL_SOCKET/{SO_SNDBUF,SO_RCVBUF} - On FreeBSD need to ++ * ensure that value is <= kern.ipc.maxsockbuf as otherwise we get ++ * an ENOBUFS error. ++ */ ++ if (level == SOL_SOCKET) { ++ if (opt == SO_SNDBUF || opt == SO_RCVBUF) { ++#ifdef KIPC_MAXSOCKBUF ++ if (maxsockbuf == -1) { ++ mib[0] = CTL_KERN; ++ mib[1] = KERN_IPC; ++ mib[2] = KIPC_MAXSOCKBUF; ++ rlen = sizeof(maxsockbuf); ++ if (sysctl(mib, 3, &maxsockbuf, &rlen, NULL, 0) == -1) ++ maxsockbuf = 1024; ++ ++#if 1 ++ /* XXXBSD: This is a hack to workaround mb_max/mb_max_adj ++ problem. It should be removed when kern.ipc.maxsockbuf ++ will be real value. */ ++ maxsockbuf = (maxsockbuf/5)*4; ++#endif ++ } ++#else ++ maxsockbuf = 64 * 1024; /* XXX: NetBSD */ ++#endif ++ ++ bufsize = (int *)arg; ++ if (*bufsize > maxsockbuf) { ++ *bufsize = maxsockbuf; ++ } ++ ++ if (opt == SO_RCVBUF && *bufsize < 1024) { ++ *bufsize = 1024; ++ } ++ ++ } ++ } ++ ++ /* ++ * On Solaris, SO_REUSEADDR will allow multiple datagram ++ * sockets to bind to the same port. The network jck tests ++ * for this "feature", so we need to emulate it by turning on ++ * SO_REUSEPORT as well for that combination. ++ */ ++ if (level == SOL_SOCKET && opt == SO_REUSEADDR) { ++ int sotype, arglen; ++ ++ arglen = sizeof(sotype); ++ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, (void *)&sotype, &arglen) < 0) { ++ return -1; ++ } ++ ++ if (sotype == SOCK_DGRAM) { ++ addopt = SO_REUSEPORT; ++ setsockopt(fd, level, addopt, arg, len); ++ } ++ } ++ ++ /* ++ * Don't allow SO_LINGER value to be too big. ++ * Current max value (240) is empiric value based on tcp_timer.h's ++ * constant TCP_LINGERTIME, which was doubled. ++ * ++ * XXXBSD: maybe we should step it down to 120 ? ++ */ ++ if (level == SOL_SOCKET && opt == SO_LINGER) { ++ ling = (struct linger *)arg; ++ if (ling->l_linger > 240 || ling->l_linger < 0) { ++ ling->l_linger = 240; ++ } + } + #endif + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_net_util_md_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_net_util_md_h new file mode 100644 index 00000000000..8dd04e28e57 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_net_net_util_md_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_net_net_util_md_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/net/net_util_md.h.orig Thu Aug 2 03:52:40 2007 ++++ j2se/src/solaris/native/java/net/net_util_md.h Fri Aug 3 18:03:01 2007 +@@ -37,7 +37,7 @@ + #endif + + +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD__) + extern int NET_Timeout(int s, long timeout); + extern int NET_Read(int s, void* buf, size_t len); + extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_nio_MappedByteBuffer_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_nio_MappedByteBuffer_c new file mode 100644 index 00000000000..145365ac614 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_nio_MappedByteBuffer_c @@ -0,0 +1,27 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_nio_MappedByteBuffer_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/nio/MappedByteBuffer.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/nio/MappedByteBuffer.c Fri Jul 27 18:25:14 2007 +@@ -38,7 +38,11 @@ Java_java_nio_MappedByteBuffer_isLoaded0(JNIEnv *env, + jlong address, jlong len) + { + jboolean loaded = JNI_TRUE; ++#if defined(_ALLBSD_SOURCE) ++ jint pageSize = getpagesize(); ++#else + jint pageSize = sysconf(_SC_PAGESIZE); ++#endif + jint numPages = (len + pageSize - 1) / pageSize; + int result = 0; + int i = 0; +@@ -92,7 +96,11 @@ JNIEXPORT void JNICALL + Java_java_nio_MappedByteBuffer_force0(JNIEnv *env, jobject obj, jlong address, + jlong len) + { ++#if defined(_ALLBSD_SOURCE) ++ jlong pageSize = getpagesize(); ++#else + jlong pageSize = sysconf(_SC_PAGESIZE); ++#endif + unsigned long lAddress = address; + + jlong offset = lAddress % pageSize; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_util_FileSystemPreferences_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_util_FileSystemPreferences_c new file mode 100644 index 00000000000..15911f76877 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_util_FileSystemPreferences_c @@ -0,0 +1,40 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_util_FileSystemPreferences_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/util/FileSystemPreferences.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/util/FileSystemPreferences.c Fri Jul 27 18:25:14 2007 +@@ -47,8 +47,11 @@ Java_java_util_prefs_FileSystemPreferences_chmod(JNIEn + return (jint) result; + } + +- ++#if defined(_ALLBSD_SOURCE) ++typedef struct flock FLOCK; ++#else + typedef struct flock64 FLOCK; ++#endif + + /** + * Try to open a named lock file. +@@ -86,7 +89,11 @@ Java_java_util_prefs_FileSystemPreferences_lockFile0(J + if (fd < 0) { + result[0] = 0; + } else { ++#if defined(_ALLBSD_SOURCE) ++ rc = fcntl(fd, F_SETLK, &fl); ++#else + rc = fcntl(fd, F_SETLK64, &fl); ++#endif + result[1] = errno; + if (rc < 0) { + result[0]= 0; +@@ -116,7 +123,11 @@ Java_java_util_prefs_FileSystemPreferences_unlockFile0 + fl.l_start = 0; + fl.l_type = F_UNLCK; + ++#if defined(_ALLBSD_SOURCE) ++ rc = fcntl(fd, F_SETLK, &fl); ++#else + rc = fcntl(fd, F_SETLK64, &fl); ++#endif + + if (rc < 0) { + close(fd); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_util_TimeZone_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_util_TimeZone_md_c new file mode 100644 index 00000000000..0cd6681a9fb --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_java_util_TimeZone_md_c @@ -0,0 +1,147 @@ +$OpenBSD: patch-j2se_src_solaris_native_java_util_TimeZone_md_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/java/util/TimeZone_md.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/java/util/TimeZone_md.c Fri Jul 27 18:25:14 2007 +@@ -31,7 +31,7 @@ + #include + #include + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #include + #include +@@ -49,11 +49,14 @@ + #define fileclose fclose + #endif + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + ++#ifdef __linux__ + static const char *sysconfig_clock_file = "/etc/sysconfig/clock"; ++#endif ++ + static const char *zoneinfo_dir = "/usr/share/zoneinfo"; +-static const char *defailt_zoneinfo_file = "/etc/localtime"; ++static const char *default_zoneinfo_file = "/etc/localtime"; + + /* + * Returns a point to the zone ID portion of the given zoneinfo file +@@ -199,7 +202,9 @@ getPlatformTimeZoneID() + int fd; + char *buf; + size_t size; ++ char zoneinfo_file[PATH_MAX+1]; + ++#ifdef __linux__ + /* + * First, try the ZONE entry in /etc/sysconfig/clock. However, the + * ZONE entry is not set up after initial Red Hat Linux +@@ -254,14 +259,18 @@ getPlatformTimeZoneID() + return tz; + } + } ++#endif /* __linux__ */ + + /* + * Next, try /etc/localtime to find the zone ID. + */ +- if (lstat(defailt_zoneinfo_file, &statbuf) == -1) { ++ if (lstat(default_zoneinfo_file, &statbuf) == -1) { + return NULL; + } + ++ strlcpy(zoneinfo_file, default_zoneinfo_file, PATH_MAX+1); ++ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + /* + * If it's a symlink, get the link name and its zone ID part. (The + * older versions of timeconfig created a symlink as described in +@@ -270,21 +279,25 @@ getPlatformTimeZoneID() + * from /etc/localtime.) + */ + if (S_ISLNK(statbuf.st_mode)) { +- char linkbuf[PATH_MAX+1]; + int len; + +- if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) { ++ if ((len = readlink(default_zoneinfo_file, zoneinfo_file, sizeof(zoneinfo_file)-1)) == -1) { + jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n", +- defailt_zoneinfo_file); ++ default_zoneinfo_file); + return NULL; + } +- linkbuf[len] = '\0'; +- tz = getZoneName(linkbuf); ++ zoneinfo_file[len] = '\0'; ++ tz = getZoneName(zoneinfo_file); + if (tz != NULL) { + tz = strdup(tz); ++ return tz; ++ } else { ++ if (lstat(zoneinfo_file, &statbuf) == -1) { ++ return NULL; ++ } + } +- return tz; + } ++#endif /* __linux__ || _ALLBSD_SOURCE */ + + /* + * If it's a regular file, we need to find out the same zoneinfo file +@@ -295,7 +308,7 @@ getPlatformTimeZoneID() + if (buf == NULL) { + return NULL; + } +- if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) { ++ if ((fd = open(zoneinfo_file, O_RDONLY)) == -1) { + free((void *) buf); + return NULL; + } +@@ -524,7 +537,7 @@ findJavaTZ_md(const char *java_home_dir, const char *c + + tz = getenv("TZ"); + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + if (tz == NULL) { + #else + #ifdef __solaris__ +@@ -563,19 +576,33 @@ getGMTOffsetID() + { + time_t offset; + char sign, buf[16]; ++#if defined(_ALLBSD_SOURCE) ++ struct tm *local_tm; ++ time_t clock; ++#endif + ++#if defined(_ALLBSD_SOURCE) ++ clock = time(NULL); ++ tzset(); ++ local_tm = localtime(&clock); ++ if (local_tm->tm_gmtoff >= 0) { ++ offset = (time_t) local_tm->tm_gmtoff; ++ sign = "+"; ++ } else { ++ offset = (time_t) -local_tm->tm_gmtoff; ++ sign = "-"; ++ } ++#else + if (timezone == 0) { + return strdup("GMT"); +- } +- +- /* Note that the time offset direction is opposite. */ +- if (timezone > 0) { ++ } else if (timezone > 0) { + offset = timezone; + sign = '-'; + } else { + offset = -timezone; + sign = '+'; + } ++#endif + sprintf(buf, (const char *)"GMT%c%02d:%02d", + sign, (int)(offset/3600), (int)((offset%3600)/60)); + return strdup(buf); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_VDrawingArea_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_VDrawingArea_c new file mode 100644 index 00000000000..64ba34f0f79 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_VDrawingArea_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_VDrawingArea_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/VDrawingArea.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/sun/awt/VDrawingArea.c Fri Jul 27 18:25:14 2007 +@@ -31,7 +31,11 @@ + #endif /* !HEADLESS */ + + #include ++#if defined(_ALLBSD_SOURCE) ++#include ++#else + #include ++#endif + + #ifdef __linux__ + /* XXX: Shouldn't be necessary. */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_X11Color_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_X11Color_c new file mode 100644 index 00000000000..4db7eae776d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_X11Color_c @@ -0,0 +1,13 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_X11Color_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/X11Color.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/sun/awt/X11Color.c Fri Jul 27 18:25:14 2007 +@@ -33,7 +33,9 @@ + #include + #include + #include ++#if !defined(_ALLBSD_SOURCE) + #include ++#endif + #ifndef HEADLESS + #include + #include diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_XDrawingArea_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_XDrawingArea_c new file mode 100644 index 00000000000..f904e856f33 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_XDrawingArea_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_XDrawingArea_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/XDrawingArea.c.orig Thu Jul 5 05:03:38 2007 ++++ j2se/src/solaris/native/sun/awt/XDrawingArea.c Fri Jul 27 18:25:14 2007 +@@ -32,7 +32,11 @@ + #include + + #include ++#if defined(_ALLBSD_SOURCE) ++#include ++#else + #include ++#endif + + #ifdef DEBUG + #include /* To get jio_fprintf() */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_Xinerama_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_Xinerama_c new file mode 100644 index 00000000000..74294e8c97e --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_Xinerama_c @@ -0,0 +1,29 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_Xinerama_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/Xinerama.c.orig Thu Jul 5 05:03:39 2007 ++++ j2se/src/solaris/native/sun/awt/Xinerama.c Fri Jul 27 18:25:14 2007 +@@ -54,18 +54,20 @@ Equipment Corporation. + ******************************************************************/ + /* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.4 2004/04/03 22:38:52 tsi Exp $ */ + +-#ifndef __linux__ +- #error This file should only be built under Linux ++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) ++ #error This file should only be built under Linux/BSD + #endif + ++#include ++ + #define NEED_EVENTS + #define NEED_REPLIES + #include + #include +-#include "Xext.h" /* in ../include */ +-#include "extutil.h" /* in ../include */ ++#include "Xext.h" ++#include "extutil.h" + #include "panoramiXext.h" +-#include "panoramiXproto.h" /* in ../include */ ++#include "panoramiXproto.h" + #include "Xinerama.h" + + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_Xinerama_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_Xinerama_h new file mode 100644 index 00000000000..923f3dd5e60 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_Xinerama_h @@ -0,0 +1,19 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_Xinerama_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/Xinerama.h.orig Thu Jul 5 05:03:39 2007 ++++ j2se/src/solaris/native/sun/awt/Xinerama.h Fri Jul 27 18:25:14 2007 +@@ -58,7 +58,7 @@ the copyright holder. + + /* $XFree86: xc/include/extensions/Xinerama.h,v 3.2 2000/03/01 01:04:20 dawes Exp $ */ + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + + #ifndef _Xinerama_h + #define _Xinerama_h +@@ -102,5 +102,5 @@ XineramaQueryScreens( + + #endif /* _Xinerama_h */ + +-#endif /* __linux__ */ ++#endif /* __linux__ || _ALLBSD_SOURCE */ + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_Font_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_Font_c new file mode 100644 index 00000000000..064db5d3cfe --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_Font_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_Font_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_Font.c.orig Thu Jul 5 05:03:39 2007 ++++ j2se/src/solaris/native/sun/awt/awt_Font.c Fri Jul 27 18:25:14 2007 +@@ -334,7 +334,7 @@ loadFont(Display * display, char *name, int32_t pointS + if (strcmp(style, "regular") == 0) { + altstyle = "roman"; + } +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + if (!strcmp(family, "lucidasans")) { + family = "lucida"; + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_GraphicsEnv_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_GraphicsEnv_c new file mode 100644 index 00000000000..7c83adc7057 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_GraphicsEnv_c @@ -0,0 +1,57 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_GraphicsEnv_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_GraphicsEnv.c.orig Thu Jul 5 05:03:39 2007 ++++ j2se/src/solaris/native/sun/awt/awt_GraphicsEnv.c Fri Jul 27 18:25:14 2007 +@@ -56,7 +56,7 @@ extern int awt_init_xt; + #endif + + #ifndef HEADLESS +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #include "Xinerama.h" + #endif +@@ -125,7 +125,7 @@ static char *x11GraphicsConfigClassName = "sun/awt/X11 + */ + + #define MAXFRAMEBUFFERS 16 +-#ifndef __linux__ /* SOLARIS */ ++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) /* SOLARIS */ + typedef Status XineramaGetInfoFunc(Display* display, int screen_number, + XRectangle* framebuffer_rects, unsigned char* framebuffer_hints, + int* num_framebuffers); +@@ -630,7 +630,7 @@ void checkNewXineramaScreen(JNIEnv* env, jobject peer, + */ + #ifndef HEADLESS + void xineramaInit(void) { +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + char* XinExtName = "XINERAMA"; + int32_t major_opcode, first_event, first_error; + Bool gotXinExt = False; +@@ -720,7 +720,7 @@ void xineramaInit(void) { + } else { + DTRACE_PRINTLN("Xinerama not available"); + } +-#endif /* __linux__ */ ++#endif /* __linux__ || _ALLBSD_SOURCE */ + } + #endif /* HEADLESS */ + +@@ -1576,7 +1576,7 @@ Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterP + { + jobject point = NULL; + #ifndef HEADLESS /* return NULL in HEADLESS, Linux */ +-#ifndef __linux__ ++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) + int x,y; + + AWT_LOCK(); +@@ -1589,7 +1589,7 @@ Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterP + DTRACE_PRINTLN("unable to call XineramaSolarisCenterFunc: symbol is null"); + } + AWT_FLUSH_UNLOCK(); +-#endif /* __linux __ */ ++#endif /* __linux __ || _ALLBSD_SOURCE */ + #endif /* HEADLESS */ + return point; + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_InputMethod_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_InputMethod_c new file mode 100644 index 00000000000..f1da04ab165 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_InputMethod_c @@ -0,0 +1,189 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_InputMethod_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_InputMethod.c.orig Thu Jul 5 05:03:39 2007 ++++ j2se/src/solaris/native/sun/awt/awt_InputMethod.c Fri Jul 27 18:25:14 2007 +@@ -69,7 +69,7 @@ static void PreeditDrawCallback(XIC, XPointer, + XIMPreeditDrawCallbackStruct *); + static void PreeditCaretCallback(XIC, XPointer, + XIMPreeditCaretCallbackStruct *); +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + static void StatusStartCallback(XIC, XPointer, XPointer); + static void StatusDoneCallback(XIC, XPointer, XPointer); + static void StatusDrawCallback(XIC, XPointer, +@@ -83,7 +83,7 @@ static void StatusDrawCallback(XIC, XPointer, + #define PreeditDoneIndex 1 + #define PreeditDrawIndex 2 + #define PreeditCaretIndex 3 +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #define StatusStartIndex 4 + #define StatusDoneIndex 5 + #define StatusDrawIndex 6 +@@ -101,14 +101,14 @@ static XIMProc callback_funcs[NCALLBACKS] = { + (XIMProc)PreeditDoneCallback, + (XIMProc)PreeditDrawCallback, + (XIMProc)PreeditCaretCallback, +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + (XIMProc)StatusStartCallback, + (XIMProc)StatusDoneCallback, + (XIMProc)StatusDrawCallback, + #endif + }; + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #define MAX_STATUS_LEN 100 + typedef struct { + Window w; /*status window id */ +@@ -148,7 +148,7 @@ typedef struct _X11InputMethodData { + #endif /* XAWT */ + jobject x11inputmethod; /* global ref to X11InputMethod instance */ + /* associated with the XIC */ +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + StatusWindow *statusWindow; /* our own status window */ + #else + #ifndef XAWT +@@ -427,7 +427,7 @@ destroyX11InputMethodData(JNIEnv *env, X11InputMethodD + static void + freeX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData) + { +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + if (pX11IMData->statusWindow != NULL){ + StatusWindow *sw = pX11IMData->statusWindow; + XFreeGC(awt_display, sw->lightGC); +@@ -533,7 +533,7 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *even + pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance); + + if (pX11IMData == NULL) { +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + return False; + #else + return result; +@@ -541,7 +541,7 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *even + } + + if ((ic = pX11IMData->current_ic) == (XIC)0){ +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + return False; + #else + return result; +@@ -650,7 +650,7 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *even + return result; + } + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + static StatusWindow *createStatusWindow( + #ifdef XAWT + Window parent) { +@@ -994,7 +994,7 @@ void adjustStatusWindow(Widget shell){ + } + } + } +-#endif /*__linux__*/ ++#endif /*__linux__||_ALLBSD_SOURCE*/ + /* + * Creates two XICs, one for active clients and the other for passive + * clients. All information on those XICs are stored in the +@@ -1051,7 +1051,7 @@ createXIC(Widget w, X11InputMethodData *pX11IMData, + return FALSE ; + } + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + on_the_spot_styles |= XIMStatusNothing; + + /*kinput does not support XIMPreeditCallbacks and XIMStatusArea +@@ -1135,7 +1135,7 @@ createXIC(Widget w, X11InputMethodData *pX11IMData, + NULL); + if (preedit == (XVaNestedList)NULL) + goto err; +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + /*always try XIMStatusCallbacks for active client...*/ + { + status = (XVaNestedList)XVaCreateNestedList(0, +@@ -1344,7 +1344,7 @@ PreeditCaretCallback(XIC ic, XPointer client_data, + + } + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + static void + StatusStartCallback(XIC ic, XPointer client_data, XPointer call_data) + { +@@ -1522,14 +1522,14 @@ Java_sun_awt_motif_MInputMethod_openXIMNative(JNIEnv * + /* Use IMInstantiate call back only on Linux, as there is a bug in Solaris + (4768335) + */ +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + registered = XRegisterIMInstantiateCallback(dpy, NULL, NULL, + NULL, (XIMProc)OpenXIMCallback, NULL); + if (!registered) { + /* directly call openXIM callback */ + #endif + OpenXIMCallback(dpy, NULL, NULL); +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + } + #endif + +@@ -1593,7 +1593,7 @@ Java_sun_awt_motif_MInputMethod_createXICNative(JNIEnv + #endif /* XAWT */ + globalRef = (*env)->NewGlobalRef(env, this); + pX11IMData->x11inputmethod = globalRef; +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + pX11IMData->statusWindow = NULL; + #else /* __linux__ */ + #ifndef XAWT +@@ -1746,14 +1746,14 @@ Java_sun_awt_X11_XInputMethod_setXICFocusNative(JNIEnv + setXICFocus(pX11IMData->current_ic, req); + currentX11InputMethodInstance = pX11IMData->x11inputmethod; + currentFocusWindow = XtWindow(w); +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + if (active && pX11IMData->statusWindow && pX11IMData->statusWindow->on) + onoffStatusWindow(pX11IMData, w, True); + #endif + } else { + currentX11InputMethodInstance = NULL; + currentFocusWindow = 0; +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + onoffStatusWindow(pX11IMData, 0, False); + if (pX11IMData->current_ic != NULL) + #endif +@@ -1770,7 +1770,7 @@ JNIEXPORT void JNICALL + Java_sun_awt_X11InputMethod_turnoffStatusWindow(JNIEnv *env, + jobject this) + { +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + X11InputMethodData *pX11IMData; + StatusWindow *statusWindow; + +@@ -1867,7 +1867,7 @@ Java_sun_awt_motif_MInputMethod_configureStatusAreaNat + X11InputMethodData *pX11IMData; + XVaNestedList status; + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + /*do nothing for linux? */ + #else + AWT_LOCK(); +@@ -1973,7 +1973,7 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethod + JNIEXPORT void JNICALL Java_sun_awt_X11_XInputMethod_adjustStatusWindow + (JNIEnv *env, jobject this, jlong window) + { +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + AWT_LOCK(); + adjustStatusWindow(window); + AWT_UNLOCK(); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_LoadLibrary_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_LoadLibrary_c new file mode 100644 index 00000000000..2832a6c5d27 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_LoadLibrary_c @@ -0,0 +1,40 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_LoadLibrary_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c.orig Thu Jul 5 05:03:39 2007 ++++ j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c Fri Jul 27 18:25:14 2007 +@@ -180,6 +180,8 @@ AWT_OnLoad(JavaVM *vm, void *reserved) + xt_before_xm = 1; + } + ++/* checking major version is not valid for *BSD */ ++#ifndef _ALLBSD_SOURCE + if (strstr(dlinfo.dli_fname, "libXm.so.3") != NULL) { + #ifdef VERBOSE_AWT_DEBUG + fprintf(stderr, "Motif 1.2 detected, using that.\n"); +@@ -192,6 +194,7 @@ AWT_OnLoad(JavaVM *vm, void *reserved) + #endif + motifVersion = 2; + } ++#endif + } + + /* Determine desired Motif Version, and set appropriate properties +@@ -199,7 +202,10 @@ AWT_OnLoad(JavaVM *vm, void *reserved) + */ + else { + uname(&name); +- ++/* checking major version is not valid for *BSD */ ++#ifdef _ALLBSD_SOURCE ++ motifVersion = 2; ++#else + if ((strcmp(name.release, "5.5.1") == 0) || + (strcmp(name.release, "5.6") == 0)) { + #ifdef VERBOSE_AWT_DEBUG +@@ -223,6 +229,7 @@ AWT_OnLoad(JavaVM *vm, void *reserved) + #endif + motifVersion = 2; + } ++#endif + } + } + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_MToolkit_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_MToolkit_c new file mode 100644 index 00000000000..f21b4a3e52f --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_MToolkit_c @@ -0,0 +1,23 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_MToolkit_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_MToolkit.c.orig Thu Jul 5 05:03:39 2007 ++++ j2se/src/solaris/native/sun/awt/awt_MToolkit.c Fri Jul 27 18:25:14 2007 +@@ -63,8 +63,9 @@ + extern JavaVM *jvm; + + #ifndef HEADLESS +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + extern void statusWindowEventHandler(XEvent event); ++Boolean awt_dnd_process_event(XEvent* event); + #endif + #endif /* !HEADLESS */ + +@@ -1642,7 +1643,7 @@ processOneEvent(XtInputMask iMask) { + */ + Widget widget=XtWindowToWidget(awt_display, xev.xany.window); + eventNumber++; +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + statusWindowEventHandler(xev); + #endif + xembed_eventHandler(&xev); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_Robot_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_Robot_c new file mode 100644 index 00000000000..36ae5d5f6b0 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_Robot_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_Robot_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_Robot.c.orig Thu Jul 5 05:03:40 2007 ++++ j2se/src/solaris/native/sun/awt/awt_Robot.c Fri Jul 27 18:25:14 2007 +@@ -45,7 +45,7 @@ + #include "wsutils.h" + #include "list.h" + #include "multiVis.h" +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #endif + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_TopLevel_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_TopLevel_c new file mode 100644 index 00000000000..216feb1e71d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_TopLevel_c @@ -0,0 +1,137 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_TopLevel_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_TopLevel.c.orig Thu Jul 5 05:03:40 2007 ++++ j2se/src/solaris/native/sun/awt/awt_TopLevel.c Fri Jul 27 18:25:14 2007 +@@ -86,7 +86,7 @@ + #include "awt_xembed.h" + + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + void adjustStatusWindow(Widget shell); + #endif + /* For the moment only InputMethodWindow is taking advantage of +@@ -336,12 +336,36 @@ awt_Frame_guessInsets(struct FrameData *wdata) + + case MOTIF_WM: + case OPENLOOK_WM: ++#if !defined(_ALLBSD_SOURCE) + default: ++#endif + globalTopGuess = 25; + globalLeftGuess = 5; + globalBottomGuess = 5; + globalRightGuess = 5; + break; ++ ++/* XXXBSD: double check values (previous & current defaults are different !? */ ++#if defined(_ALLBSD_SOURCE) ++ case AFTERSTEP_WM: ++ globalTopGuess=21; ++ globalLeftGuess=1; ++ globalBottomGuess=7; ++ globalRightGuess=1; ++ break; ++ case WINDOWMAKER_WM: ++ globalTopGuess=23; ++ globalLeftGuess=1; ++ globalBottomGuess=7; ++ globalRightGuess=1; ++ break; ++ default: ++ globalTopGuess = 24; ++ globalLeftGuess = 4; ++ globalBottomGuess = 4; ++ globalRightGuess = 4; ++ break; ++#endif + } + + if ((insets_env = getenv("AWT_INSETS")) != NULL) { +@@ -779,7 +803,7 @@ awtJNI_setMbAndWwHeightAndOffsets(JNIEnv * env, + child menu and borders, margins, and the menu bar borders*/ + actualHeight = menuHeight + (2 * menuBorderSize) + + (2 * marginHeight) + (2 * menuBarBorderSize); +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #ifdef _pauly_debug + fprintf(stdout," actual height: %d mb height %d\n", actualHeight, menuBarHeight); + fflush(stdout); +@@ -1622,7 +1646,7 @@ shellEH(Widget w, XtPointer data, XEvent *event, Boole + break; + } + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + if (!wdata->fixInsets) { + DTRACE_PRINTLN("TL: insets already fixed"); + break; +@@ -1801,6 +1825,42 @@ shellEH(Widget w, XtPointer data, XEvent *event, Boole + break; + } + ++#if defined(_ALLBSD_SOURCE) ++ case AFTERSTEP_WM: ++ case WINDOWMAKER_WM: { ++ Display *disp = XtDisplay(wdata->winData.shell); ++ int borderWidth, innerHeight, titleHeight, totalHeight; ++ syncTopLevelPos(disp, ++ event->xreparent.parent, ++ &winAttr); ++ XGetWindowAttributes(disp, event->xreparent.window, &actualAttr); ++ if (runningWM == AFTERSTEP_WM) ++ titleHeight = winAttr.y; ++ else /* WINDOWMAKER_WM */ ++ titleHeight = actualAttr.y; ++ innerHeight = actualAttr.height; ++ XQueryTree(disp, event->xreparent.window, ++ &ignore_Window, &containerWindow, ++ &ignore_WindowPtr, &ignore_uint); ++ XGetWindowAttributes(disp, containerWindow, &actualAttr); ++ borderWidth = actualAttr.border_width; ++ if (runningWM == AFTERSTEP_WM) { ++ XQueryTree(disp, containerWindow, ++ &ignore_Window, &containerWindow, ++ &ignore_WindowPtr, &ignore_uint); ++ XGetWindowAttributes(disp, containerWindow, &actualAttr); ++ totalHeight = actualAttr.height; ++ } else /* WINDOWMAKER_WM */ ++ totalHeight = actualAttr.height; ++ ++ correctWMLeft = borderWidth; ++ correctWMTop = titleHeight; ++ correctWMRight = borderWidth; ++ correctWMBottom = (totalHeight - (titleHeight + borderWidth + innerHeight)); ++ break; ++ } ++#endif ++ + case ICE_WM: + case KDE2_WM: /* should've been done in awt_wm_getInsetsFromProp */ + case CDE_WM: +@@ -2168,7 +2228,7 @@ shellEH(Widget w, XtPointer data, XEvent *event, Boole + + (*env)->DeleteLocalRef(env, target); + raiseInputMethodWindow(wdata); +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + adjustStatusWindow(wdata->winData.shell); + #endif + break; +@@ -2562,7 +2622,7 @@ Java_sun_awt_motif_MWindowPeer_pCreate(JNIEnv *env, jo + wdata->menuBarReset = False; + wdata->need_reshape = False; + wdata->focusProxy = NULL; +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + wdata->fixInsets = True; + #endif + wdata->state = state; +@@ -4042,7 +4102,7 @@ Java_sun_awt_motif_MWindowPeer_setResizable(JNIEnv *en + targetHeight = (*env)->GetIntField(env, target, componentIDs.height); + width = targetWidth - (wdata->left + wdata->right); + height = targetHeight - (wdata->top + wdata->bottom) + verticalAdjust; +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + width = (width > 0) ? width : 1; + height = (height > 0) ? height : 1; + #endif diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_motif21_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_motif21_c new file mode 100644 index 00000000000..69e0174c8e7 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_motif21_c @@ -0,0 +1,30 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_motif21_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_motif21.c.orig Thu Jul 5 05:03:40 2007 ++++ j2se/src/solaris/native/sun/awt/awt_motif21.c Fri Jul 27 18:25:14 2007 +@@ -33,9 +33,13 @@ + #include "awt_p.h" + #include "awt_Component.h" + ++#if (XmVersion >= 2001) ++#include ++#else + #define XmPER_SHELL 0 + extern int32_t _XmImGetGeo( + Widget vw) ; ++#endif + + #define MAXARGS 10 + static Arg xic_vlist[MAXARGS]; +@@ -102,9 +106,12 @@ awt_motif_getIMStatusHeight(Widget w, jobject tc) + } + } + ++/* XXXBSD: resolve missing symbol? */ ++#if !defined(_ALLBSD_SOURCE) + if (im_height == 0) { + im_height = _XmImGetGeo(w); + } ++#endif + + #if defined(DEBUG) + jio_fprintf(stderr,"awt_motif_getIMStatusHeight: Height = %d",im_height); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_util_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_util_h new file mode 100644 index 00000000000..4d7b0f8e1f8 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_util_h @@ -0,0 +1,25 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_util_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_util.h.orig Thu Jul 5 05:03:40 2007 ++++ j2se/src/solaris/native/sun/awt/awt_util.h Fri Jul 27 18:25:14 2007 +@@ -187,15 +187,20 @@ JNU_GetCharField(JNIEnv *env, jobject self, const char + #ifdef __solaris__ + extern Widget awt_util_getXICStatusAreaWindow(Widget w); + #else ++#if defined(_ALLBSD_SOURCE) + int32_t awt_util_getIMStatusHeight(Widget vw); ++Widget awt_util_getXICStatusAreaWindow(Widget w); ++#else ++int32_t awt_util_getIMStatusHeight(Widget vw); + XVaNestedList awt_util_getXICStatusAreaList(Widget w); + Widget awt_util_getXICStatusAreaWindow(Widget w); + #endif ++#endif + + + + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + typedef struct _XmImRefRec { + Cardinal num_refs; /* Number of referencing widgets. */ + Cardinal max_refs; /* Maximum length of refs array. */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_wm_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_wm_c new file mode 100644 index 00000000000..89da7fd9afa --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_wm_c @@ -0,0 +1,102 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_wm_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_wm.c.orig Thu Jul 5 05:03:40 2007 ++++ j2se/src/solaris/native/sun/awt/awt_wm.c Fri Jul 27 18:25:14 2007 +@@ -121,12 +121,19 @@ static Atom XA_KWM_WIN_ICONIFIED; + static Atom XA_KWM_WIN_MAXIMIZED; + + /* OpenLook */ ++static Atom _XA_OL_DECOR_ADD; + static Atom _XA_OL_DECOR_DEL; + static Atom _XA_OL_DECOR_HEADER; + static Atom _XA_OL_DECOR_RESIZE; + static Atom _XA_OL_DECOR_PIN; + static Atom _XA_OL_DECOR_CLOSE; + ++/* AfterStep */ ++static Atom _XA_AS_STYLE; ++ ++/* WindowMaker */ ++static Atom _XA_WINDOWMAKER_STATE; ++ + /* For _NET_WM_STATE ClientMessage requests */ + #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ + #define _NET_WM_STATE_ADD 1 /* add/set property */ +@@ -193,7 +200,12 @@ awt_wm_initAtoms(void) + { &_XA_OL_DECOR_HEADER, "_OL_DECOR_HEADER" }, + { &_XA_OL_DECOR_RESIZE, "_OL_DECOR_RESIZE" }, + { &_XA_OL_DECOR_PIN, "_OL_DECOR_PIN" }, +- { &_XA_OL_DECOR_CLOSE, "_OL_DECOR_CLOSE" } ++ { &_XA_OL_DECOR_CLOSE, "_OL_DECOR_CLOSE" }, ++ { &_XA_OL_DECOR_ADD, "_OL_DECOR_ADD" }, ++ ++ { &_XA_AS_STYLE, "_XA_AS_STYLE" }, ++ ++ { &_XA_WINDOWMAKER_STATE, "_XA_WINDOWMAKER_STATE" } + }; + #define ATOM_LIST_LENGTH (sizeof(atom_list)/sizeof(atom_list[0])) + +@@ -942,8 +954,41 @@ awt_wm_isMotif(void) + return True; + } + ++/* ++ * Window Maker. ++ */ ++static Boolean ++awt_wm_isWindowmaker() ++{ ++ if (awt_wm_atomInterned(&_XA_WINDOWMAKER_STATE, "_WINDOWMAKER_STATE")) ++ return True; ++ return False; ++} + ++/* ++ * Afterstep. ++ */ + static Boolean ++awt_wm_isAfterstep() ++{ ++ if (awt_wm_atomInterned(&_XA_AS_STYLE, "_AS_STYLE")) ++ return True; ++ return False; ++} ++ ++/* ++ * FVWM 2. ++ */ ++static Boolean ++awt_wm_isFvwm2() ++{ ++ if (awt_wm_atomInterned(&_XA_OL_DECOR_ADD, "_OL_DECOR_ADD") ++ && !awt_wm_atomInterned(&_XA_OL_DECOR_PIN, "_OL_DECOR_PIN")) ++ return True; ++ return False; ++} ++ ++static Boolean + awt_wm_isNetWMName(char *name) + { + Window anchor; +@@ -1280,6 +1325,12 @@ awt_wm_getRunningWM(void) + else if (awt_wm_isKDE2()) { + awt_wmgr = KDE2_WM; + } ++ else if (awt_wm_isWindowmaker()) { ++ awt_wmgr = WINDOWMAKER_WM; ++ } ++ else if (awt_wm_isAfterstep()) { ++ awt_wmgr = AFTERSTEP_WM; ++ } + /* + * We don't check for legacy WM when we already know that WM + * supports WIN or _NET wm spec. +@@ -1302,6 +1353,9 @@ awt_wm_getRunningWM(void) + awt_wmgr = MOTIF_WM; + } + else if (awt_wm_isOpenLook()) { ++ awt_wmgr = OPENLOOK_WM; ++ } ++ else if (awt_wm_isFvwm2()) { + awt_wmgr = OPENLOOK_WM; + } + else { diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_wm_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_wm_h new file mode 100644 index 00000000000..484aa07a8f1 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_awt_wm_h @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_wm_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/awt_wm.h.orig Thu Jul 5 05:03:40 2007 ++++ j2se/src/solaris/native/sun/awt/awt_wm.h Fri Jul 27 18:25:14 2007 +@@ -45,7 +45,10 @@ enum wmgr_t { + KDE2_WM, + SAWFISH_WM, + ICE_WM, +- METACITY_WM ++ METACITY_WM, ++ AFTERSTEP_WM, ++ WINDOWMAKER_WM, ++ FVWM2_WM + }; + + extern void awt_wm_init(void); diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_canvas_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_canvas_c new file mode 100644 index 00000000000..a3c95ae941f --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_canvas_c @@ -0,0 +1,27 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_canvas_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/canvas.c.orig Thu Jul 5 05:03:40 2007 ++++ j2se/src/solaris/native/sun/awt/canvas.c Fri Jul 27 18:25:14 2007 +@@ -281,10 +281,10 @@ KeymapEntry keymapTable[] = + {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}, +@@ -1454,7 +1454,7 @@ handleKeyEventWithNumLockMask(XEvent *event, KeySym *k + { + 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/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_extutil_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_extutil_h new file mode 100644 index 00000000000..e50ff6feb48 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_extutil_h @@ -0,0 +1,18 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_extutil_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/extutil.h.orig Thu Jul 5 05:03:40 2007 ++++ j2se/src/solaris/native/sun/awt/extutil.h Fri Jul 27 18:25:14 2007 +@@ -58,7 +58,7 @@ in this Software without prior written authorization f + */ + /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + + #ifndef _EXTUTIL_H_ + #define _EXTUTIL_H_ +@@ -248,4 +248,4 @@ char *proc (Display *dpy, int code, XExtCodes *codes, + char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n) + #endif + +-#endif /* __linux__ */ ++#endif /* __linux__ || _ALLBSD_SOURCE */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_fontpath_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_fontpath_c new file mode 100644 index 00000000000..311ee688f6e --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_fontpath_c @@ -0,0 +1,58 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_fontpath_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/fontpath.c.orig Thu Jul 5 05:03:40 2007 ++++ j2se/src/solaris/native/sun/awt/fontpath.c Fri Jul 27 18:25:14 2007 +@@ -23,7 +23,7 @@ + * + */ + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #endif /* __linux__ */ + #include +@@ -61,7 +61,7 @@ extern Display *awt_display; + + #define MAXFDIRS 512 /* Max number of directories that contain fonts */ + +-#ifndef __linux__ ++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) + /* + * This can be set in the makefile to "/usr/X11" if so desired. + */ +@@ -351,7 +351,7 @@ static char **getX11FontPath () + + #endif /* !HEADLESS */ + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + /* from awt_LoadLibrary.c */ + JNIEXPORT jboolean JNICALL AWTIsHeadless(); + #endif +@@ -476,7 +476,7 @@ static char *getPlatformFontPathChars(JNIEnv *env, jbo + */ + fcdirs = getFontConfigLocations(); + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + knowndirs = fullLinuxFontPath; + #else /* IF SOLARIS */ + knowndirs = fullSolarisFontPath; +@@ -488,7 +488,8 @@ static char *getPlatformFontPathChars(JNIEnv *env, jbo + * be initialised. + */ + #ifndef HEADLESS +-#ifdef __linux__ /* There's no headless build on linux ... */ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) ++ /* There's no headless build on linux ... */ + if (!AWTIsHeadless()) { /* .. so need to call a function to check */ + #endif + AWT_LOCK(); +@@ -496,7 +497,7 @@ static char *getPlatformFontPathChars(JNIEnv *env, jbo + x11dirs = getX11FontPath(); + } + AWT_UNLOCK(); +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + } + #endif + #endif /* !HEADLESS */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_list_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_list_c new file mode 100644 index 00000000000..5d42965d873 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_list_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_list_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/list.c.orig Thu Jul 5 05:03:41 2007 ++++ j2se/src/solaris/native/sun/awt/list.c Fri Jul 27 18:25:14 2007 +@@ -66,7 +66,11 @@ from the X Consortium. + ----------------------------------------------------------------------- **/ + + #include ++#ifdef _ALLBSD_SOURCE ++#include ++#else + #include ++#endif + #include "list.h" + + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_panoramiXext_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_panoramiXext_h new file mode 100644 index 00000000000..9389a1a5440 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_panoramiXext_h @@ -0,0 +1,18 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_panoramiXext_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/panoramiXext.h.orig Thu Jul 5 05:03:43 2007 ++++ j2se/src/solaris/native/sun/awt/panoramiXext.h Fri Jul 27 18:25:14 2007 +@@ -57,7 +57,7 @@ Equipment Corporation. + */ + /* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + + /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ + +@@ -80,4 +80,4 @@ extern XPanoramiXInfo *XPanoramiXAllocInfo ( + #endif + ); + +-#endif /* __linux__*/ ++#endif /* __linux__ || _ALLBSD_SOURCE */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_panoramiXproto_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_panoramiXproto_h new file mode 100644 index 00000000000..8ed89babf0c --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_panoramiXproto_h @@ -0,0 +1,18 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_panoramiXproto_h,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/panoramiXproto.h.orig Thu Jul 5 05:03:41 2007 ++++ j2se/src/solaris/native/sun/awt/panoramiXproto.h Fri Jul 27 18:25:14 2007 +@@ -54,7 +54,7 @@ Equipment Corporation. + ******************************************************************/ + /* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + + /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ + +@@ -222,4 +222,4 @@ typedef struct { + + #endif + +-#endif /* __linux__ */ ++#endif /* __linux__ || _ALLBSD_SOURCE */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_robot_common_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_robot_common_c new file mode 100644 index 00000000000..92a6c8b62da --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_awt_robot_common_c @@ -0,0 +1,13 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_awt_robot_common_c,v 1.1 2007/09/06 15:46:19 kurt Exp $ +--- j2se/src/solaris/native/sun/awt/robot_common.c.orig Thu Jul 5 05:03:43 2007 ++++ j2se/src/solaris/native/sun/awt/robot_common.c Fri Jul 27 18:25:14 2007 +@@ -27,6 +27,9 @@ + #error This file should not be included in headless library + #endif + ++#ifdef _ALLBSD_SOURCE ++#include ++#endif + #include "robot_common.h" + + /* diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_font_X11FontScaler_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_font_X11FontScaler_c new file mode 100644 index 00000000000..2a3c82fcb84 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_font_X11FontScaler_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_font_X11FontScaler_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/font/X11FontScaler.c.orig Thu Jul 5 05:03:43 2007 ++++ j2se/src/solaris/native/sun/font/X11FontScaler.c Fri Jul 27 18:25:14 2007 +@@ -32,7 +32,11 @@ + * into X11FontScaler_md.c, which is compiled into another library. + */ + #include ++#if defined(_ALLBSD_SOURCE) ++#include ++#else + #include ++#endif + #include + #include + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_font_X11TextRenderer_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_font_X11TextRenderer_c new file mode 100644 index 00000000000..9b1cfdea29d --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_font_X11TextRenderer_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_font_X11TextRenderer_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/font/X11TextRenderer.c.orig Thu Jul 5 05:03:43 2007 ++++ j2se/src/solaris/native/sun/font/X11TextRenderer.c Fri Jul 27 18:25:14 2007 +@@ -39,7 +39,11 @@ + #include "GraphicsPrimitiveMgr.h" + #include "glyphblitting.h" + #include "sunfontids.h" ++#if defined(_ALLBSD_SOURCE) ++#include ++#else + #include ++#endif + + + JNIEXPORT void JNICALL AWTDrawGlyphList diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_j2d_md_h b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_j2d_md_h new file mode 100644 index 00000000000..8b52576bdc0 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_j2d_md_h @@ -0,0 +1,19 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_java2d_j2d_md_h,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/java2d/j2d_md.h.orig Thu Jul 5 05:03:44 2007 ++++ j2se/src/solaris/native/sun/java2d/j2d_md.h Fri Jul 27 18:25:14 2007 +@@ -29,10 +29,13 @@ + + /* + * Linux version of does not define intptr_t ++ * NetBSD's doesn't either, so let's do it for everyone. + */ +-#ifdef __linux__ ++#if defined(__OpenBSD__) ++#include ++#elif defined(__linux__) || defined(_ALLBSD_SOURCE) + #include +-#endif /* __linux__ */ ++#endif /* __linux__ || _ALLBSD_SOURCE */ + + typedef unsigned char jubyte; + typedef unsigned short jushort; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_loops_mlib_ImageZoom_NN_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_loops_mlib_ImageZoom_NN_c new file mode 100644 index 00000000000..58953fd6e4b --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_loops_mlib_ImageZoom_NN_c @@ -0,0 +1,108 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_java2d_loops_mlib_ImageZoom_NN_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c.orig Thu Jul 5 05:03:43 2007 ++++ j2se/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Fri Jul 27 18:25:14 2007 +@@ -67,6 +67,10 @@ + * MLIB_EDGE_SRC_PADDED + */ + ++#ifdef __OpenBSD__ ++#include ++#endif ++#include + #include + #include + +@@ -103,7 +107,7 @@ typedef union { + + /***************************************************************/ + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + + static const mlib_u32 mlib_bit_mask4[16] = { + 0x00000000u, 0xFF000000u, 0x00FF0000u, 0xFFFF0000u, +@@ -112,7 +116,7 @@ static const mlib_u32 mlib_bit_mask4[16] = { + 0x0000FFFFu, 0xFF00FFFFu, 0x00FFFFFFu, 0xFFFFFFFFu + }; + +-#else /* _LITTLE_ENDIAN */ ++#else /* BIG_ENDIAN */ + + static const mlib_u32 mlib_bit_mask4[16] = { + 0x00000000u, 0x000000FFu, 0x0000FF00u, 0x0000FFFFu, +@@ -121,7 +125,7 @@ static const mlib_u32 mlib_bit_mask4[16] = { + 0xFFFF0000u, 0xFFFF00FFu, 0xFFFFFF00u, 0xFFFFFFFFu + }; + +-#endif /* _LITTLE_ENDIAN */ ++#endif /* LITTLE_ENDIAN */ + + /***************************************************************/ + +@@ -345,11 +349,11 @@ mlib_status mlib_ImageZoom_BIT_1_Nearest(mlib_work_ima + #ifdef _NO_LONGLONG + + typedef struct { +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + mlib_u32 uint1, uint0; +-#else /* _LITTLE_ENDIAN */ ++#else /* BIG_ENDIAN */ + mlib_u32 uint0, uint1; +-#endif /* _LITTLE_ENDIAN */ ++#endif /* LITTLE_ENDIAN */ + } two_uint; + + /***************************************************************/ +@@ -512,11 +516,11 @@ mlib_status mlib_ImageZoom_BitToGray_1_Nearest(mlib_wo + DTYPE mask; + MASK(mask); + off *= 8; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + LSHIFT(dd_old, da[0], 64 - off); +-#else /* _LITTLE_ENDIAN */ ++#else /* BIG_ENDIAN */ + RSHIFT(dd_old, da[0], 64 - off); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* LITTLE_ENDIAN */ + + #ifdef __SUNPRO_C + #pragma pipeloop(0) +@@ -541,30 +545,30 @@ mlib_status mlib_ImageZoom_BitToGray_1_Nearest(mlib_wo + + res = (res & 0xff) | (res >> 8); + dd = gray_mask[res]; +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + /* *da++ = (dd_old >> (64 - off)) | (dd << off);*/ + RSHIFT(dd_old, dd_old, 64 - off); + LSHIFT(dtmp, dd, off); +-#else /* _LITTLE_ENDIAN */ ++#else /* BIG_ENDIAN */ + /* *da++ = (dd_old << (64 - off)) | (dd >> off);*/ + LSHIFT(dd_old, dd_old, 64 - off); + RSHIFT(dtmp, dd, off); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* LITTLE_ENDIAN */ + LOGIC(*da++, dd_old, dtmp, |); + dd_old = dd; + } + +-#ifdef _LITTLE_ENDIAN ++#if (BYTE_ORDER == LITTLE_ENDIAN) + /* da[0] = (dd_old >> (64 - off)) | (da[0] & ((mlib_u64)((mlib_s64) -1) << off));*/ + LSHIFT(dtmp, mask, off); + LOGIC(dtmp, da[0], dtmp, &); + RSHIFT(dtmp1, dd_old, 64 - off); +-#else /* _LITTLE_ENDIAN */ ++#else /* BIG_ENDIAN */ + /* da[0] = (dd_old << (64 - off)) | (da[0] & ((mlib_u64)((mlib_s64) -1) >> off));*/ + RSHIFT(dtmp, mask, off); + LOGIC(dtmp, da[0], dtmp, &); + LSHIFT(dtmp1, dd_old, 64 - off); +-#endif /* _LITTLE_ENDIAN */ ++#endif /* LITTLE_ENDIAN */ + LOGIC(da[0], dtmp, dtmp1, |); + } + else { /* aligned */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_loops_vis_FuncArray_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_loops_vis_FuncArray_c new file mode 100644 index 00000000000..d0b72b63276 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_java2d_loops_vis_FuncArray_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_java2d_loops_vis_FuncArray_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/java2d/loops/vis_FuncArray.c.orig Fri Aug 3 18:38:36 2007 ++++ j2se/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Fri Aug 3 18:39:21 2007 +@@ -794,7 +794,7 @@ static AnyFunc* hash_table_vis[HASH_SIZE]; + static int initialized; + static int usevis = JNI_TRUE; + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + # define ULTRA_CHIP "sparc64" + #else + # define ULTRA_CHIP "sun4u" diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_management_FileSystemImpl_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_management_FileSystemImpl_c new file mode 100644 index 00000000000..62888fe43a2 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_management_FileSystemImpl_c @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_management_FileSystemImpl_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/management/FileSystemImpl.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/management/FileSystemImpl.c Fri Jul 27 18:25:15 2007 +@@ -26,6 +26,10 @@ + #include + #include + ++#if defined(_ALLBSD_SOURCE) ++#include "largefile_bsd.h" ++#endif ++ + #include "jni.h" + #include "jni_util.h" + #include "sun_management_FileSystemImpl.h" diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_net_dns_ResolverConfigurationImpl_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_net_dns_ResolverConfigurationImpl_c new file mode 100644 index 00000000000..9451ea2f637 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_net_dns_ResolverConfigurationImpl_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_net_dns_ResolverConfigurationImpl_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c Fri Jul 27 18:25:15 2007 +@@ -33,7 +33,7 @@ + #include + #endif + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #endif + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_net_spi_DefaultProxySelector_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_net_spi_DefaultProxySelector_c new file mode 100644 index 00000000000..f2c49c32141 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_net_spi_DefaultProxySelector_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_net_spi_DefaultProxySelector_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/net/spi/DefaultProxySelector.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/net/spi/DefaultProxySelector.c Fri Jul 27 18:25:15 2007 +@@ -30,7 +30,7 @@ + #include "sun_net_spi_DefaultProxySelector.h" + #include + #include +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #else + #include diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_DatagramChannelImpl_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_DatagramChannelImpl_c new file mode 100644 index 00000000000..e8cd9680291 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_DatagramChannelImpl_c @@ -0,0 +1,53 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_nio_ch_DatagramChannelImpl_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c Fri Jul 27 18:25:15 2007 +@@ -35,7 +35,7 @@ + #include + #include + +-#if __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #endif + +@@ -86,7 +86,7 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv + rv = connect(fd, 0, 0); + #endif + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + { + int len; + SOCKADDR sa; +@@ -96,17 +96,31 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv + #ifdef AF_INET6 + if (ipv6_available()) { + struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&sa; ++#if defined(_ALLBSD_SOURCE) ++ him6->sin6_family = AF_INET6; ++#else + him6->sin6_family = AF_UNSPEC; ++#endif + len = sizeof(struct sockaddr_in6); + } else + #endif + { + struct sockaddr_in *him4 = (struct sockaddr_in*)&sa; ++#if defined(_ALLBSD_SOURCE) ++ him4->sin_family = AF_INET; ++#else + him4->sin_family = AF_UNSPEC; ++#endif + len = sizeof(struct sockaddr_in); + } + + rv = connect(fd, (struct sockaddr *)&sa, len); ++ ++#if defined(_ALLBSD_SOURCE) ++ if (rv < 0 && errno == EADDRNOTAVAIL) ++ rv = errno = 0; ++#endif ++ + } + #endif + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileChannelImpl_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileChannelImpl_c new file mode 100644 index 00000000000..cb5dacbcb61 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileChannelImpl_c @@ -0,0 +1,115 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_nio_ch_FileChannelImpl_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c Fri Jul 27 18:39:26 2007 +@@ -29,12 +29,17 @@ + #include "jlong.h" + #include + #include ++#include + #include "sun_nio_ch_FileChannelImpl.h" + #include "java_lang_Integer.h" + #include "nio.h" + #include "nio_util.h" + #include + ++#if defined(_ALLBSD_SOURCE) ++#include "largefile_bsd.h" ++#endif ++ + static jfieldID chan_fd; /* jobject 'fd' in sun.io.FileChannelImpl */ + + #ifdef __solaris__ +@@ -59,6 +64,10 @@ sendfile_func* my_sendfile_func = NULL; + typedef ssize_t sendfile64_func(int out_fd, int in_fd, off64_t *offset, size_t count); + + sendfile64_func* my_sendfile64_func = NULL; ++#elif defined(_ALLBSD_SOURCE) ++#include ++#include ++#include + #endif + + JNIEXPORT jlong JNICALL +@@ -278,6 +287,58 @@ Java_sun_nio_ch_FileChannelImpl_transferTo0(JNIEnv *en + return result; + } + #endif ++ ++#ifdef _ALLBSD_SOURCE ++ /* ++ * XXXBSD: make sure that we're returning what java class may understand ++ * ++ * XXXBSD: I'd prefer to have it implemented with sendfile(), but since ++ * FreeBSD's sendfile() is only supposed to be used in file->socket ++ * schema we need to provide some kind of fall-back operation, if ++ * sendfile() failed with ENOTSOCK error only. ++ */ ++ void *buf; ++ off_t offset = (off_t)position; ++ int r, w = 0; ++ ++ buf = malloc(4096); ++ if (buf == NULL) { ++ JNU_ThrowOutOfMemoryError(env, "heap allocation failed"); ++ return IOS_THROWN; ++ } ++ ++ while ((r = pread(srcFD, buf, 4096, offset)) > 0) { ++ w = write(dstFD, buf, r); ++ if (w == -1) ++ break; ++ offset += w; ++ } ++ free(buf); ++ ++ /* ++ * 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) { ++ switch (errno) { ++ case EAGAIN: ++ return IOS_UNAVAILABLE; ++ case EINTR: ++ return IOS_INTERRUPTED; ++ default: ++ JNU_ThrowIOExceptionWithLastError(env, "Transfer failed"); ++ return IOS_THROWN; ++ } ++ } ++ ++ return (0); ++#endif + } + + JNIEXPORT jint JNICALL +@@ -329,6 +390,23 @@ Java_sun_nio_ch_FileChannelImpl_release0(JNIEnv *env, + fl.l_start = (off64_t)pos; + fl.l_type = F_UNLCK; + lockResult = fcntl(fd, cmd, &fl); ++#if defined(__FreeBSD__) ++ /* XXXFREEBSD: While doing of preClose0() we're closing actual fd which ++ was locked, so here we'll get an error which need to be ignored to ++ satisfy TCK FileLock test */ ++ /* XXXFREEBSD: backport to 1.4.2 */ ++ if (lockResult < 0 && errno == EBADF) ++ lockResult = errno = 0; ++#endif ++#if defined(__NetBSD__) ++ /* XXXNETBSD: The dup2 in preClose0 is being done onto 1 end of a ++ socketpair which isn't a valid target for F_UNLCK. No good way to see ++ this vs. a bad lock setup so just return errno = 0 there ++ to pass JCK (lock will get removed once all fd's close anyways) */ ++ /* XXXNETBSD: backport to 1.4.2 */ ++ if (lockResult < 0 && errno == EINVAL) ++ lockResult = errno = 0; ++#endif + if (lockResult < 0) { + JNU_ThrowIOExceptionWithLastError(env, "Release failed"); + } diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileDispatcher_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileDispatcher_c new file mode 100644 index 00000000000..d87d6abf0e9 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileDispatcher_c @@ -0,0 +1,16 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_nio_ch_FileDispatcher_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/nio/ch/FileDispatcher.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/nio/ch/FileDispatcher.c Fri Jul 27 18:25:15 2007 +@@ -32,8 +32,12 @@ + #include + #include + #include ++#include + #include "nio_util.h" + ++#if defined(_ALLBSD_SOURCE) ++#include "largefile_bsd.h" ++#endif + + static int preCloseFD = -1; /* File descriptor to which we dup other fd's + before closing them for real */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileKey_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileKey_c new file mode 100644 index 00000000000..7f03211e2dc --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_FileKey_c @@ -0,0 +1,14 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_nio_ch_FileKey_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/nio/ch/FileKey.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/nio/ch/FileKey.c Fri Jul 27 18:25:15 2007 +@@ -30,6 +30,10 @@ + #include "nio_util.h" + #include "sun_nio_ch_FileKey.h" + ++#if defined(_ALLBSD_SOURCE) ++#include "largefile_bsd.h" ++#endif ++ + static jfieldID key_st_dev; /* id for FileKey.st_dev */ + static jfieldID key_st_ino; /* id for FileKey.st_ino */ + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_Net_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_Net_c new file mode 100644 index 00000000000..a8460ddbde7 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_nio_ch_Net_c @@ -0,0 +1,77 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_nio_ch_Net_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/nio/ch/Net.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/nio/ch/Net.c Fri Jul 27 18:25:15 2007 +@@ -140,8 +140,30 @@ Java_sun_nio_ch_Net_localPort(JNIEnv *env, jclass claz + SOCKADDR sa; + int sa_len = SOCKADDR_LEN; + if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) { ++#ifdef _ALLBSD_SOURCE ++ /* ++ * XXXBSD: ++ * ECONNRESET is specific to the BSDs. We can not return an error, ++ * as the calling Java code with raise a java.lang.Error given the expectation ++ * that getsockname() will never fail. According to the Single UNIX Specification, ++ * it shouldn't fail. As such, we just fill in generic Linux-compatible values. ++ */ ++ if (errno == ECONNRESET) { ++ struct sockaddr_in *sin; ++ sin = (struct sockaddr_in *) &sa; ++ bzero(sin, sizeof(*sin)); ++ sin->sin_len = sizeof(struct sockaddr_in); ++ sin->sin_family = AF_INET; ++ sin->sin_port = htonl(0); ++ sin->sin_addr.s_addr = INADDR_ANY; ++ } else { ++ handleSocketError(env, errno); ++ return -1; ++ } ++#else /* _ALLBSD_SOURCE */ + handleSocketError(env, errno); + return -1; ++#endif /* _ALLBSD_SOURCE */ + } + return NET_GetPortFromSockaddr((struct sockaddr *)&sa); + } +@@ -153,8 +175,30 @@ Java_sun_nio_ch_Net_localInetAddress(JNIEnv *env, jcla + int sa_len = SOCKADDR_LEN; + int port; + if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) { ++#ifdef _ALLBSD_SOURCE ++ /* ++ * XXXBSD: ++ * ECONNRESET is specific to the BSDs. We can not return an error, ++ * as the calling Java code with raise a java.lang.Error with the expectation ++ * that getsockname() will never fail. According to the Single UNIX Specification, ++ * it shouldn't fail. As such, we just fill in generic Linux-compatible values. ++ */ ++ if (errno == ECONNRESET) { ++ struct sockaddr_in *sin; ++ sin = (struct sockaddr_in *) &sa; ++ bzero(sin, sizeof(*sin)); ++ sin->sin_len = sizeof(struct sockaddr_in); ++ sin->sin_family = AF_INET; ++ sin->sin_port = htonl(0); ++ sin->sin_addr.s_addr = INADDR_ANY; ++ } else { ++ handleSocketError(env, errno); ++ return NULL; ++ } ++#else /* _ALLBSD_SOURCE */ + handleSocketError(env, errno); + return NULL; ++#endif /* _ALLBSD_SOURCE */ + } + return NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port); + } +@@ -304,9 +348,11 @@ handleSocketError(JNIEnv *env, jint errorValue) + switch (errorValue) { + case EINPROGRESS: /* Non-blocking connect */ + return 0; ++#ifdef EPROTO + case EPROTO: + xn = JNU_JAVANETPKG "ProtocolException"; + break; ++#endif + case ECONNREFUSED: + xn = JNU_JAVANETPKG "ConnectException"; + break; diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_security_pkcs11_j2secmod_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_security_pkcs11_j2secmod_md_c new file mode 100644 index 00000000000..99e12111cfa --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_security_pkcs11_j2secmod_md_c @@ -0,0 +1,37 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_security_pkcs11_j2secmod_md_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/security/pkcs11/j2secmod_md.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Fri Jul 27 18:25:15 2007 +@@ -34,6 +34,11 @@ + + #include "j2secmod.h" + ++#ifndef RTLD_NOLOAD ++/* A gross hack that will work if the NSS library is only opened once */ ++static void *nssLibHandle = NULL; ++#endif ++ + void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) { + void *hModule = (void*)jHandle; + void *fAddress = dlsym(hModule, functionName); +@@ -51,7 +56,11 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_Secmo + { + const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL); + // look up existing handle only, do not load ++#ifdef RTLD_NOLOAD + void *hModule = dlopen(libName, RTLD_NOLOAD); ++#else ++ void *hModule = nssLibHandle; ++#endif + dprintf2("-handle for %s: %u\n", libName, hModule); + (*env)->ReleaseStringUTFChars(env, jLibName, libName); + return (jlong)hModule; +@@ -65,6 +74,9 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_Secmo + + dprintf1("-lib %s\n", libName); + hModule = dlopen(libName, RTLD_LAZY); ++#ifndef RTLD_NOLOAD ++ nssLibHandle = hModule; ++#endif + (*env)->ReleaseStringUTFChars(env, jLibName, libName); + dprintf2("-handle: %u (0X%X)\n", hModule, hModule); + diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_tools_attach_BsdVirtualMachine_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_tools_attach_BsdVirtualMachine_c new file mode 100644 index 00000000000..96b3f6f7af8 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_tools_attach_BsdVirtualMachine_c @@ -0,0 +1,7 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_tools_attach_BsdVirtualMachine_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c.orig Wed Aug 1 13:18:39 2007 ++++ j2se/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Wed Aug 1 13:19:09 2007 +@@ -0,0 +1,3 @@ ++/* ++ * Dummy file - needs to be implemented for bsd ++ */ diff --git a/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_xawt_XWindow_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_xawt_XWindow_c new file mode 100644 index 00000000000..c7b09d924a4 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_native_sun_xawt_XWindow_c @@ -0,0 +1,27 @@ +$OpenBSD: patch-j2se_src_solaris_native_sun_xawt_XWindow_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/native/sun/xawt/XWindow.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/native/sun/xawt/XWindow.c Fri Jul 27 18:25:15 2007 +@@ -228,10 +228,10 @@ KeymapEntry keymapTable[] = + {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}, +@@ -865,7 +865,7 @@ handleKeyEventWithNumLockMask(XEvent *event, KeySym *k + { + 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/devel/jdk/1.7/patches/patch-j2se_src_solaris_transport_socket_socket_md_c b/devel/jdk/1.7/patches/patch-j2se_src_solaris_transport_socket_socket_md_c new file mode 100644 index 00000000000..e7a3de38939 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-j2se_src_solaris_transport_socket_socket_md_c @@ -0,0 +1,21 @@ +$OpenBSD: patch-j2se_src_solaris_transport_socket_socket_md_c,v 1.1 2007/09/06 15:46:20 kurt Exp $ +--- j2se/src/solaris/transport/socket/socket_md.c.orig Thu Jul 5 05:03:45 2007 ++++ j2se/src/solaris/transport/socket/socket_md.c Fri Jul 27 18:25:15 2007 +@@ -36,7 +36,7 @@ + #ifdef __solaris__ + #include + #endif +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include + #include + #endif +@@ -283,7 +283,7 @@ dbgsysTlsGet(int index) { + + #endif + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + int + dbgsysTlsAlloc() { + pthread_key_t key; diff --git a/devel/jdk/1.7/pkg/DESCR b/devel/jdk/1.7/pkg/DESCR deleted file mode 100644 index 58af4169217..00000000000 --- a/devel/jdk/1.7/pkg/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -Java (TM) 2 SDK, Standard Edition -Version 1.7.0 - -The Java 2 SDK software includes tools useful for developing and -testing programs written in the Java programming language and -running on the Java platform. diff --git a/devel/jdk/1.7/pkg/DESCR-jre b/devel/jdk/1.7/pkg/DESCR-jre new file mode 100644 index 00000000000..501690ac7a2 --- /dev/null +++ b/devel/jdk/1.7/pkg/DESCR-jre @@ -0,0 +1,19 @@ +Java (TM) 2 Runtime Environment, Standard Edition +Version 1.7.0 + +The Java(TM) 2 Runtime Environment contains the Java virtual machine, +runtime class libraries, and Java application launcher that are +necessary to run programs written in the Java programming language. +It is not a development environment and does not contain development +tools such as compilers and debuggers. For development tools, use +the Java 2 SDK, Standard Edition. + +Flavors: + with_ipv6 + Build the jdk/jre with ipv6 support. When the jdk/jre is built + with this flavor, java will create only ipv6 sockets by default. + Since ipv4 to ipv6 address mapping is disabled on OpenBSD, + using ipv4 addresses will fail. Consequently, you may only + use ipv6 addresses or you can start java with + -Djava.net.preferIPv4Stack=true and can only use ipv4 + addresses. diff --git a/devel/jdk/1.7/pkg/DESCR-main b/devel/jdk/1.7/pkg/DESCR-main new file mode 100644 index 00000000000..2ca59c7f976 --- /dev/null +++ b/devel/jdk/1.7/pkg/DESCR-main @@ -0,0 +1,16 @@ +Java (TM) 2 SDK, Standard Edition +Version 1.7.0 + +The Java 2 SDK software includes tools useful for developing and +testing programs written in the Java programming language and +running on the Java platform. + +Flavors: + with_ipv6 + Build the jdk/jre with ipv6 support. When the jdk/jre is built + with this flavor, java will create only ipv6 sockets by default. + Since ipv4 to ipv6 address mapping is disabled on OpenBSD, + using ipv4 addresses will fail. Consequently, you may only + use ipv6 addresses or you can start java with + -Djava.net.preferIPv4Stack=true and can only use ipv4 + addresses. diff --git a/devel/jdk/1.7/pkg/PFRAG.client_vm-jre b/devel/jdk/1.7/pkg/PFRAG.client_vm-jre new file mode 100644 index 00000000000..b3bdfd43393 --- /dev/null +++ b/devel/jdk/1.7/pkg/PFRAG.client_vm-jre @@ -0,0 +1,5 @@ +@comment $OpenBSD: PFRAG.client_vm-jre,v 1.1 2007/09/06 15:46:20 kurt Exp $ +${JREHOME}/lib/${MACHINE_ARCH}/client/ +${JREHOME}/lib/${MACHINE_ARCH}/client/Xusage.txt +${JREHOME}/lib/${MACHINE_ARCH}/client/libjsig.so +${JREHOME}/lib/${MACHINE_ARCH}/client/libjvm.so diff --git a/devel/jdk/1.7/pkg/PFRAG.client_vm b/devel/jdk/1.7/pkg/PFRAG.client_vm-main similarity index 74% rename from devel/jdk/1.7/pkg/PFRAG.client_vm rename to devel/jdk/1.7/pkg/PFRAG.client_vm-main index daf7c0be87f..9dd40f4b485 100644 --- a/devel/jdk/1.7/pkg/PFRAG.client_vm +++ b/devel/jdk/1.7/pkg/PFRAG.client_vm-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.client_vm,v 1.1.1.1 2007/05/08 17:06:20 kurt Exp $ +@comment $OpenBSD: PFRAG.client_vm-main,v 1.1 2007/09/06 15:46:20 kurt Exp $ ${JDKHOME}/bin/java-rmi.cgi ${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/ ${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/Xusage.txt diff --git a/devel/jdk/1.7/pkg/PLIST b/devel/jdk/1.7/pkg/PLIST deleted file mode 100644 index 5d20e989100..00000000000 --- a/devel/jdk/1.7/pkg/PLIST +++ /dev/null @@ -1,2615 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.2 2007/07/13 22:52:36 kurt Exp $ -@option no-default-conflict -@conflict jdk->=1.7,<1.8 -${JDKHOME}/ -${JDKHOME}/COPYRIGHT -${JDKHOME}/LICENSE -${JDKHOME}/README.html -${JDKHOME}/bin/ -@comment ${JDKHOME}/bin/ControlPanel -@comment ${JDKHOME}/bin/HtmlConverter -${JDKHOME}/bin/appletviewer -${JDKHOME}/bin/apt -${JDKHOME}/bin/extcheck -${JDKHOME}/bin/idlj -${JDKHOME}/bin/jar -${JDKHOME}/bin/jarsigner -${JDKHOME}/bin/java -${JDKHOME}/bin/javac -%%client_vm%% -${JDKHOME}/bin/javadoc -${JDKHOME}/bin/javah -${JDKHOME}/bin/javap -@comment ${JDKHOME}/bin/javaws -${JDKHOME}/bin/jconsole -${JDKHOME}/bin/jdb -${JDKHOME}/bin/jinfo -${JDKHOME}/bin/jmap -${JDKHOME}/bin/jps -${JDKHOME}/bin/jsadebugd -${JDKHOME}/bin/jstack -${JDKHOME}/bin/jstat -${JDKHOME}/bin/jstatd -${JDKHOME}/bin/keytool -${JDKHOME}/bin/kinit -${JDKHOME}/bin/klist -${JDKHOME}/bin/ktab -${JDKHOME}/bin/native2ascii -${JDKHOME}/bin/orbd -${JDKHOME}/bin/pack200 -${JDKHOME}/bin/policytool -${JDKHOME}/bin/rmic -${JDKHOME}/bin/rmid -${JDKHOME}/bin/rmiregistry -${JDKHOME}/bin/serialver -${JDKHOME}/bin/servertool -${JDKHOME}/bin/tnameserv -${JDKHOME}/bin/unpack200 -${JDKHOME}/demo/ -${JDKHOME}/demo/applets/ -@comment ${JDKHOME}/demo/applets.html -${JDKHOME}/demo/applets/Animator/ -${JDKHOME}/demo/applets/Animator/Animation.class -${JDKHOME}/demo/applets/Animator/AnimationFrame.class -${JDKHOME}/demo/applets/Animator/Animator.class -${JDKHOME}/demo/applets/Animator/Animator.java -${JDKHOME}/demo/applets/Animator/DescriptionFrame.class -${JDKHOME}/demo/applets/Animator/ParseException.class -${JDKHOME}/demo/applets/Animator/audio/ -${JDKHOME}/demo/applets/Animator/audio/0.au -${JDKHOME}/demo/applets/Animator/audio/1.au -${JDKHOME}/demo/applets/Animator/audio/2.au -${JDKHOME}/demo/applets/Animator/audio/3.au -${JDKHOME}/demo/applets/Animator/audio/4.au -${JDKHOME}/demo/applets/Animator/audio/5.au -${JDKHOME}/demo/applets/Animator/audio/6.au -${JDKHOME}/demo/applets/Animator/audio/7.au -${JDKHOME}/demo/applets/Animator/audio/8.au -${JDKHOME}/demo/applets/Animator/audio/9.au -${JDKHOME}/demo/applets/Animator/audio/spacemusic.au -${JDKHOME}/demo/applets/Animator/example1.html -${JDKHOME}/demo/applets/Animator/example2.html -${JDKHOME}/demo/applets/Animator/example3.html -${JDKHOME}/demo/applets/Animator/example4.html -${JDKHOME}/demo/applets/Animator/images/ -${JDKHOME}/demo/applets/Animator/images/Beans/ -${JDKHOME}/demo/applets/Animator/images/Beans/T1.gif -${JDKHOME}/demo/applets/Animator/images/Beans/T10.gif -${JDKHOME}/demo/applets/Animator/images/Beans/T2.gif -${JDKHOME}/demo/applets/Animator/images/Beans/T3.gif -${JDKHOME}/demo/applets/Animator/images/Beans/T4.gif -${JDKHOME}/demo/applets/Animator/images/Beans/T5.gif -${JDKHOME}/demo/applets/Animator/images/Beans/T6.gif -${JDKHOME}/demo/applets/Animator/images/Beans/T7.gif -${JDKHOME}/demo/applets/Animator/images/Beans/T8.gif -${JDKHOME}/demo/applets/Animator/images/Beans/T9.gif -${JDKHOME}/demo/applets/Animator/images/SimpleAnimation/ -${JDKHOME}/demo/applets/Animator/images/SimpleAnimation/T1.gif -${JDKHOME}/demo/applets/Animator/images/SimpleAnimation/T2.gif -${JDKHOME}/demo/applets/Animator/images/loading-msg.gif -${JDKHOME}/demo/applets/Animator/index.html -${JDKHOME}/demo/applets/ArcTest/ -${JDKHOME}/demo/applets/ArcTest/ArcCanvas.class -${JDKHOME}/demo/applets/ArcTest/ArcControls.class -${JDKHOME}/demo/applets/ArcTest/ArcTest.class -${JDKHOME}/demo/applets/ArcTest/ArcTest.java -${JDKHOME}/demo/applets/ArcTest/IntegerTextField.class -${JDKHOME}/demo/applets/ArcTest/example1.html -${JDKHOME}/demo/applets/BarChart/ -${JDKHOME}/demo/applets/BarChart/BarChart.class -${JDKHOME}/demo/applets/BarChart/BarChart.java -${JDKHOME}/demo/applets/BarChart/example1.html -${JDKHOME}/demo/applets/Blink/ -${JDKHOME}/demo/applets/Blink/Blink$1.class -${JDKHOME}/demo/applets/Blink/Blink.class -${JDKHOME}/demo/applets/Blink/Blink.java -${JDKHOME}/demo/applets/Blink/example1.html -${JDKHOME}/demo/applets/CardTest/ -${JDKHOME}/demo/applets/CardTest/CardPanel.class -${JDKHOME}/demo/applets/CardTest/CardTest.class -${JDKHOME}/demo/applets/CardTest/CardTest.java -${JDKHOME}/demo/applets/CardTest/example1.html -${JDKHOME}/demo/applets/Clock/ -${JDKHOME}/demo/applets/Clock/Clock.class -${JDKHOME}/demo/applets/Clock/Clock.java -${JDKHOME}/demo/applets/Clock/example1.html -${JDKHOME}/demo/applets/DitherTest/ -${JDKHOME}/demo/applets/DitherTest/CardinalTextField.class -${JDKHOME}/demo/applets/DitherTest/DitherCanvas.class -${JDKHOME}/demo/applets/DitherTest/DitherControls.class -${JDKHOME}/demo/applets/DitherTest/DitherTest.class -${JDKHOME}/demo/applets/DitherTest/DitherTest.java -${JDKHOME}/demo/applets/DitherTest/example1.html -${JDKHOME}/demo/applets/DrawTest/ -${JDKHOME}/demo/applets/DrawTest/DrawControls.class -${JDKHOME}/demo/applets/DrawTest/DrawPanel.class -${JDKHOME}/demo/applets/DrawTest/DrawTest.class -${JDKHOME}/demo/applets/DrawTest/DrawTest.java -${JDKHOME}/demo/applets/DrawTest/example1.html -${JDKHOME}/demo/applets/Fractal/ -${JDKHOME}/demo/applets/Fractal/CLSFractal.class -${JDKHOME}/demo/applets/Fractal/CLSFractal.java -${JDKHOME}/demo/applets/Fractal/CLSRule.class -${JDKHOME}/demo/applets/Fractal/CLSTurtle.class -${JDKHOME}/demo/applets/Fractal/ContextLSystem.class -${JDKHOME}/demo/applets/Fractal/example1.html -${JDKHOME}/demo/applets/GraphLayout/ -${JDKHOME}/demo/applets/GraphLayout/Edge.class -${JDKHOME}/demo/applets/GraphLayout/Graph.class -${JDKHOME}/demo/applets/GraphLayout/Graph.java -${JDKHOME}/demo/applets/GraphLayout/GraphPanel.class -${JDKHOME}/demo/applets/GraphLayout/Node.class -${JDKHOME}/demo/applets/GraphLayout/audio/ -${JDKHOME}/demo/applets/GraphLayout/audio/computer.au -${JDKHOME}/demo/applets/GraphLayout/audio/drip.au -${JDKHOME}/demo/applets/GraphLayout/audio/gong.au -${JDKHOME}/demo/applets/GraphLayout/example1.html -${JDKHOME}/demo/applets/GraphLayout/example2.html -${JDKHOME}/demo/applets/GraphLayout/example3.html -${JDKHOME}/demo/applets/GraphLayout/example4.html -${JDKHOME}/demo/applets/GraphicsTest/ -${JDKHOME}/demo/applets/GraphicsTest/AppletFrame.class -${JDKHOME}/demo/applets/GraphicsTest/AppletFrame.java -${JDKHOME}/demo/applets/GraphicsTest/ArcCard.class -${JDKHOME}/demo/applets/GraphicsTest/ArcDegreePanel.class -${JDKHOME}/demo/applets/GraphicsTest/ArcPanel.class -${JDKHOME}/demo/applets/GraphicsTest/ColorUtils.class -${JDKHOME}/demo/applets/GraphicsTest/GraphicsCards.class -${JDKHOME}/demo/applets/GraphicsTest/GraphicsPanel.class -${JDKHOME}/demo/applets/GraphicsTest/GraphicsTest.class -${JDKHOME}/demo/applets/GraphicsTest/GraphicsTest.java -${JDKHOME}/demo/applets/GraphicsTest/OvalShape.class -${JDKHOME}/demo/applets/GraphicsTest/PolygonShape.class -${JDKHOME}/demo/applets/GraphicsTest/RectShape.class -${JDKHOME}/demo/applets/GraphicsTest/RoundRectShape.class -${JDKHOME}/demo/applets/GraphicsTest/Shape.class -${JDKHOME}/demo/applets/GraphicsTest/ShapeTest.class -${JDKHOME}/demo/applets/GraphicsTest/example1.html -${JDKHOME}/demo/applets/ImageMap/ -${JDKHOME}/demo/applets/ImageMap/AniArea.class -${JDKHOME}/demo/applets/ImageMap/AniArea.java -${JDKHOME}/demo/applets/ImageMap/ButtonFilter.class -${JDKHOME}/demo/applets/ImageMap/ButtonFilter.java -${JDKHOME}/demo/applets/ImageMap/ClickArea.class -${JDKHOME}/demo/applets/ImageMap/ClickArea.java -${JDKHOME}/demo/applets/ImageMap/DelayedSoundArea.class -${JDKHOME}/demo/applets/ImageMap/DelayedSoundArea.java -${JDKHOME}/demo/applets/ImageMap/HighlightArea.class -${JDKHOME}/demo/applets/ImageMap/HighlightArea.java -${JDKHOME}/demo/applets/ImageMap/HighlightFilter.class -${JDKHOME}/demo/applets/ImageMap/HighlightFilter.java -${JDKHOME}/demo/applets/ImageMap/HrefButtonArea.class -${JDKHOME}/demo/applets/ImageMap/HrefButtonArea.java -${JDKHOME}/demo/applets/ImageMap/ImageMap.class -${JDKHOME}/demo/applets/ImageMap/ImageMap.java -${JDKHOME}/demo/applets/ImageMap/ImageMapArea.class -${JDKHOME}/demo/applets/ImageMap/ImageMapArea.java -${JDKHOME}/demo/applets/ImageMap/LinkArea.class -${JDKHOME}/demo/applets/ImageMap/LinkArea.java -${JDKHOME}/demo/applets/ImageMap/NameArea.class -${JDKHOME}/demo/applets/ImageMap/NameArea.java -${JDKHOME}/demo/applets/ImageMap/RoundButtonFilter.class -${JDKHOME}/demo/applets/ImageMap/RoundButtonFilter.java -${JDKHOME}/demo/applets/ImageMap/RoundHrefButtonArea.class -${JDKHOME}/demo/applets/ImageMap/RoundHrefButtonArea.java -${JDKHOME}/demo/applets/ImageMap/SoundArea.class -${JDKHOME}/demo/applets/ImageMap/SoundArea.java -${JDKHOME}/demo/applets/ImageMap/TickerArea.class -${JDKHOME}/demo/applets/ImageMap/TickerArea.java -${JDKHOME}/demo/applets/ImageMap/audio/ -${JDKHOME}/demo/applets/ImageMap/audio/chirp1.au -${JDKHOME}/demo/applets/ImageMap/audio/hi.au -${JDKHOME}/demo/applets/ImageMap/example1.html -${JDKHOME}/demo/applets/ImageMap/imagemapcheat.html -${JDKHOME}/demo/applets/ImageMap/images/ -${JDKHOME}/demo/applets/ImageMap/images/jim.graham.gif -${JDKHOME}/demo/applets/ImageMap/sources.html -${JDKHOME}/demo/applets/JumpingBox/ -${JDKHOME}/demo/applets/JumpingBox/JumpingBox.class -${JDKHOME}/demo/applets/JumpingBox/JumpingBox.java -${JDKHOME}/demo/applets/JumpingBox/example1.html -${JDKHOME}/demo/applets/JumpingBox/sounds/ -${JDKHOME}/demo/applets/JumpingBox/sounds/adapt-or-die.au -${JDKHOME}/demo/applets/JumpingBox/sounds/cannot.be.completed.au -${JDKHOME}/demo/applets/JumpingBox/sounds/danger.au -${JDKHOME}/demo/applets/JumpingBox/sounds/ip.au -${JDKHOME}/demo/applets/JumpingBox/sounds/that.hurts.au -${JDKHOME}/demo/applets/JumpingBox/sounds/thin.bell.au -${JDKHOME}/demo/applets/JumpingBox/sounds/tiptoe.thru.the.tulips.au -${JDKHOME}/demo/applets/MoleculeViewer/ -${JDKHOME}/demo/applets/MoleculeViewer/Atom.class -${JDKHOME}/demo/applets/MoleculeViewer/Matrix3D.class -${JDKHOME}/demo/applets/MoleculeViewer/Matrix3D.java -${JDKHOME}/demo/applets/MoleculeViewer/XYZApp.class -${JDKHOME}/demo/applets/MoleculeViewer/XYZApp.java -${JDKHOME}/demo/applets/MoleculeViewer/XYZChemModel.class -${JDKHOME}/demo/applets/MoleculeViewer/example1.html -${JDKHOME}/demo/applets/MoleculeViewer/example2.html -${JDKHOME}/demo/applets/MoleculeViewer/example3.html -${JDKHOME}/demo/applets/MoleculeViewer/models/ -${JDKHOME}/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz -${JDKHOME}/demo/applets/MoleculeViewer/models/benzene.xyz -${JDKHOME}/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz -${JDKHOME}/demo/applets/MoleculeViewer/models/cyclohexane.xyz -${JDKHOME}/demo/applets/MoleculeViewer/models/ethane.xyz -${JDKHOME}/demo/applets/MoleculeViewer/models/water.xyz -${JDKHOME}/demo/applets/NervousText/ -${JDKHOME}/demo/applets/NervousText/NervousText.class -${JDKHOME}/demo/applets/NervousText/NervousText.java -${JDKHOME}/demo/applets/NervousText/example1.html -${JDKHOME}/demo/applets/SimpleGraph/ -${JDKHOME}/demo/applets/SimpleGraph/GraphApplet.class -${JDKHOME}/demo/applets/SimpleGraph/GraphApplet.java -${JDKHOME}/demo/applets/SimpleGraph/example1.html -${JDKHOME}/demo/applets/SortDemo/ -${JDKHOME}/demo/applets/SortDemo/BidirBubbleSortAlgorithm.class -${JDKHOME}/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java -${JDKHOME}/demo/applets/SortDemo/BubbleSortAlgorithm.class -${JDKHOME}/demo/applets/SortDemo/BubbleSortAlgorithm.java -${JDKHOME}/demo/applets/SortDemo/QSortAlgorithm.class -${JDKHOME}/demo/applets/SortDemo/QSortAlgorithm.java -${JDKHOME}/demo/applets/SortDemo/SortAlgorithm.class -${JDKHOME}/demo/applets/SortDemo/SortAlgorithm.java -${JDKHOME}/demo/applets/SortDemo/SortItem.class -${JDKHOME}/demo/applets/SortDemo/SortItem.java -${JDKHOME}/demo/applets/SortDemo/example1.html -${JDKHOME}/demo/applets/SpreadSheet/ -${JDKHOME}/demo/applets/SpreadSheet/Cell.class -${JDKHOME}/demo/applets/SpreadSheet/CellUpdater.class -${JDKHOME}/demo/applets/SpreadSheet/InputField.class -${JDKHOME}/demo/applets/SpreadSheet/Node.class -${JDKHOME}/demo/applets/SpreadSheet/SpreadSheet.class -${JDKHOME}/demo/applets/SpreadSheet/SpreadSheet.java -${JDKHOME}/demo/applets/SpreadSheet/SpreadSheetInput.class -${JDKHOME}/demo/applets/SpreadSheet/example1.html -${JDKHOME}/demo/applets/TicTacToe/ -${JDKHOME}/demo/applets/TicTacToe/TicTacToe.class -${JDKHOME}/demo/applets/TicTacToe/TicTacToe.java -${JDKHOME}/demo/applets/TicTacToe/audio/ -${JDKHOME}/demo/applets/TicTacToe/audio/beep.au -${JDKHOME}/demo/applets/TicTacToe/audio/ding.au -${JDKHOME}/demo/applets/TicTacToe/audio/return.au -${JDKHOME}/demo/applets/TicTacToe/audio/yahoo1.au -${JDKHOME}/demo/applets/TicTacToe/audio/yahoo2.au -${JDKHOME}/demo/applets/TicTacToe/example1.html -${JDKHOME}/demo/applets/TicTacToe/images/ -${JDKHOME}/demo/applets/TicTacToe/images/cross.gif -${JDKHOME}/demo/applets/TicTacToe/images/not.gif -${JDKHOME}/demo/applets/WireFrame/ -${JDKHOME}/demo/applets/WireFrame/FileFormatException.class -${JDKHOME}/demo/applets/WireFrame/Matrix3D.class -${JDKHOME}/demo/applets/WireFrame/Matrix3D.java -${JDKHOME}/demo/applets/WireFrame/Model3D.class -${JDKHOME}/demo/applets/WireFrame/ThreeD.class -${JDKHOME}/demo/applets/WireFrame/ThreeD.java -${JDKHOME}/demo/applets/WireFrame/example1.html -${JDKHOME}/demo/applets/WireFrame/example2.html -${JDKHOME}/demo/applets/WireFrame/example3.html -${JDKHOME}/demo/applets/WireFrame/example4.html -${JDKHOME}/demo/applets/WireFrame/models/ -${JDKHOME}/demo/applets/WireFrame/models/cube.obj -${JDKHOME}/demo/applets/WireFrame/models/dinasaur.obj -${JDKHOME}/demo/applets/WireFrame/models/hughes_500.obj -${JDKHOME}/demo/applets/WireFrame/models/knoxS.obj -${JDKHOME}/demo/jfc/ -${JDKHOME}/demo/jfc/CodePointIM/ -${JDKHOME}/demo/jfc/CodePointIM/CodePointIM.jar -${JDKHOME}/demo/jfc/CodePointIM/README.html -${JDKHOME}/demo/jfc/CodePointIM/README_ja.html -${JDKHOME}/demo/jfc/CodePointIM/README_zh_CN.html -${JDKHOME}/demo/jfc/CodePointIM/src/ -${JDKHOME}/demo/jfc/CodePointIM/src/CodePointIM.java -${JDKHOME}/demo/jfc/CodePointIM/src/CodePointInputMethod.java -${JDKHOME}/demo/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java -${JDKHOME}/demo/jfc/CodePointIM/src/resources/ -${JDKHOME}/demo/jfc/CodePointIM/src/resources/codepoint.properties -${JDKHOME}/demo/jfc/CodePointIM/src/resources/codepoint_ja.properties -${JDKHOME}/demo/jfc/CodePointIM/src/resources/codepoint_zh_CN.properties -${JDKHOME}/demo/jfc/FileChooserDemo/ -${JDKHOME}/demo/jfc/FileChooserDemo/FileChooserDemo.jar -${JDKHOME}/demo/jfc/FileChooserDemo/README.txt -${JDKHOME}/demo/jfc/FileChooserDemo/src/ -${JDKHOME}/demo/jfc/FileChooserDemo/src/ExampleFileFilter.java -${JDKHOME}/demo/jfc/FileChooserDemo/src/ExampleFileView.java -${JDKHOME}/demo/jfc/FileChooserDemo/src/FileChooserDemo.java -${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/ -${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/images/ -${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/images/gifIcon.gif -${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/images/jpgIcon.jpg -${JDKHOME}/demo/jfc/Font2DTest/ -${JDKHOME}/demo/jfc/Font2DTest/Font2DTest.html -${JDKHOME}/demo/jfc/Font2DTest/Font2DTest.jar -${JDKHOME}/demo/jfc/Font2DTest/README.txt -${JDKHOME}/demo/jfc/Font2DTest/src/ -${JDKHOME}/demo/jfc/Font2DTest/src/Font2DTest.java -${JDKHOME}/demo/jfc/Font2DTest/src/Font2DTestApplet.java -${JDKHOME}/demo/jfc/Font2DTest/src/FontPanel.java -${JDKHOME}/demo/jfc/Font2DTest/src/RangeMenu.java -${JDKHOME}/demo/jfc/Java2D/ -${JDKHOME}/demo/jfc/Java2D/Java2Demo.html -${JDKHOME}/demo/jfc/Java2D/Java2Demo.jar -${JDKHOME}/demo/jfc/Java2D/README.txt -${JDKHOME}/demo/jfc/Java2D/src/ -${JDKHOME}/demo/jfc/Java2D/src/fonts/ -${JDKHOME}/demo/jfc/Java2D/src/fonts/A.ttf -${JDKHOME}/demo/jfc/Java2D/src/images/ -${JDKHOME}/demo/jfc/Java2D/src/images/bld.jpg -${JDKHOME}/demo/jfc/Java2D/src/images/boat.png -${JDKHOME}/demo/jfc/Java2D/src/images/box.gif -${JDKHOME}/demo/jfc/Java2D/src/images/boxwave.gif -${JDKHOME}/demo/jfc/Java2D/src/images/clone.gif -${JDKHOME}/demo/jfc/Java2D/src/images/clouds.jpg -${JDKHOME}/demo/jfc/Java2D/src/images/cupanim.gif -${JDKHOME}/demo/jfc/Java2D/src/images/duke.gif -${JDKHOME}/demo/jfc/Java2D/src/images/duke.png -${JDKHOME}/demo/jfc/Java2D/src/images/duke.running.gif -${JDKHOME}/demo/jfc/Java2D/src/images/dukeplug.gif -${JDKHOME}/demo/jfc/Java2D/src/images/fight.gif -${JDKHOME}/demo/jfc/Java2D/src/images/globe.gif -${JDKHOME}/demo/jfc/Java2D/src/images/java-logo.gif -${JDKHOME}/demo/jfc/Java2D/src/images/java_logo.png -${JDKHOME}/demo/jfc/Java2D/src/images/jumptojavastrip.png -${JDKHOME}/demo/jfc/Java2D/src/images/loop.gif -${JDKHOME}/demo/jfc/Java2D/src/images/looping.gif -${JDKHOME}/demo/jfc/Java2D/src/images/magnify.gif -${JDKHOME}/demo/jfc/Java2D/src/images/painting.gif -${JDKHOME}/demo/jfc/Java2D/src/images/print.gif -${JDKHOME}/demo/jfc/Java2D/src/images/remove.gif -${JDKHOME}/demo/jfc/Java2D/src/images/snooze.gif -${JDKHOME}/demo/jfc/Java2D/src/images/star7.gif -${JDKHOME}/demo/jfc/Java2D/src/images/start.gif -${JDKHOME}/demo/jfc/Java2D/src/images/start2.gif -${JDKHOME}/demo/jfc/Java2D/src/images/stop.gif -${JDKHOME}/demo/jfc/Java2D/src/images/stop2.gif -${JDKHOME}/demo/jfc/Java2D/src/images/surfing.gif -${JDKHOME}/demo/jfc/Java2D/src/images/thumbsup.gif -${JDKHOME}/demo/jfc/Java2D/src/images/tip.gif -${JDKHOME}/demo/jfc/Java2D/src/java2d/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/AnimatingControlsSurface.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/AnimatingSurface.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/CloningFeature.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/ControlsSurface.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/CustomControls.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/CustomControlsContext.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/DemoFonts.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/DemoGroup.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/DemoImages.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/DemoPanel.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/GlobalControls.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/GlobalPanel.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/Intro.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/Java2Demo.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/Java2DemoApplet.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/MemoryMonitor.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/PerformanceMonitor.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/RunWindow.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/Surface.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/TextureChooser.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/Tools.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Arcs.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/BezierAnim.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Curves.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Ellipses.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/Areas.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/ClipAnim.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/Intersection.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/Text.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Colors/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Colors/BullsEye.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Colors/ColorConvert.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Colors/Rotator3D.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Composite/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Composite/ACimages.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Composite/ACrules.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Composite/FadeAnim.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/AllFonts.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/AttributedStr.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/Highlighting.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/Outline.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/Tree.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/DukeAnim.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/ImageOps.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/JPEGFlip.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/WarpImage.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/Caps.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/Dash.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/Joins.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/LineAnim.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Mix/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Mix/Balls.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Mix/BezierScroller.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Mix/Stars3D.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/GradAnim.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/Gradient.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/Texture.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/TextureAnim.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/Append.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/CurveQuadTo.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/FillStroke.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/WindingRule.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/ -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/Rotate.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/SelectTx.java -${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/TransformAnim.java -${JDKHOME}/demo/jfc/Metalworks/ -${JDKHOME}/demo/jfc/Metalworks/Metalworks.jar -${JDKHOME}/demo/jfc/Metalworks/README.txt -${JDKHOME}/demo/jfc/Metalworks/src/ -${JDKHOME}/demo/jfc/Metalworks/src/AquaMetalTheme.java -${JDKHOME}/demo/jfc/Metalworks/src/BigContrastMetalTheme.java -${JDKHOME}/demo/jfc/Metalworks/src/ContrastMetalTheme.java -${JDKHOME}/demo/jfc/Metalworks/src/DemoMetalTheme.java -${JDKHOME}/demo/jfc/Metalworks/src/GreenMetalTheme.java -${JDKHOME}/demo/jfc/Metalworks/src/KhakiMetalTheme.java -${JDKHOME}/demo/jfc/Metalworks/src/MetalThemeMenu.java -${JDKHOME}/demo/jfc/Metalworks/src/Metalworks.java -${JDKHOME}/demo/jfc/Metalworks/src/MetalworksDocumentFrame.java -${JDKHOME}/demo/jfc/Metalworks/src/MetalworksFrame.java -${JDKHOME}/demo/jfc/Metalworks/src/MetalworksHelp.java -${JDKHOME}/demo/jfc/Metalworks/src/MetalworksInBox.java -${JDKHOME}/demo/jfc/Metalworks/src/MetalworksPrefs.java -${JDKHOME}/demo/jfc/Metalworks/src/PropertiesMetalTheme.java -${JDKHOME}/demo/jfc/Metalworks/src/UISwitchListener.java -${JDKHOME}/demo/jfc/Metalworks/src/resources/ -${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/ -${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/back.gif -${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/credits.html -${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/duke.gif -${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/javalogo.gif -${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/metal.html -${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/metalworks.html -${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/swing.html -${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/toc.html -${JDKHOME}/demo/jfc/Metalworks/src/resources/MyTheme.theme -${JDKHOME}/demo/jfc/Notepad/ -${JDKHOME}/demo/jfc/Notepad/Notepad.jar -${JDKHOME}/demo/jfc/Notepad/README.txt -${JDKHOME}/demo/jfc/Notepad/src/ -${JDKHOME}/demo/jfc/Notepad/src/ElementTreePanel.java -${JDKHOME}/demo/jfc/Notepad/src/Notepad.java -${JDKHOME}/demo/jfc/Notepad/src/resources/ -${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad.properties -${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad_fr.properties -${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad_sv.properties -${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad_zh_CN.properties -${JDKHOME}/demo/jfc/Notepad/src/resources/copy.gif -${JDKHOME}/demo/jfc/Notepad/src/resources/cut.gif -${JDKHOME}/demo/jfc/Notepad/src/resources/new.gif -${JDKHOME}/demo/jfc/Notepad/src/resources/open.gif -${JDKHOME}/demo/jfc/Notepad/src/resources/paste.gif -${JDKHOME}/demo/jfc/Notepad/src/resources/save.gif -${JDKHOME}/demo/jfc/SampleTree/ -${JDKHOME}/demo/jfc/SampleTree/README.txt -${JDKHOME}/demo/jfc/SampleTree/SampleTree.jar -${JDKHOME}/demo/jfc/SampleTree/src/ -${JDKHOME}/demo/jfc/SampleTree/src/DynamicTreeNode.java -${JDKHOME}/demo/jfc/SampleTree/src/SampleData.java -${JDKHOME}/demo/jfc/SampleTree/src/SampleTree.java -${JDKHOME}/demo/jfc/SampleTree/src/SampleTreeCellRenderer.java -${JDKHOME}/demo/jfc/SampleTree/src/SampleTreeModel.java -${JDKHOME}/demo/jfc/SampleTree/src/resources/ -${JDKHOME}/demo/jfc/SampleTree/src/resources/images/ -${JDKHOME}/demo/jfc/SampleTree/src/resources/images/collapsed.gif -${JDKHOME}/demo/jfc/SampleTree/src/resources/images/expanded.gif -${JDKHOME}/demo/jfc/Stylepad/ -${JDKHOME}/demo/jfc/Stylepad/README.txt -${JDKHOME}/demo/jfc/Stylepad/Stylepad.jar -${JDKHOME}/demo/jfc/Stylepad/src/ -${JDKHOME}/demo/jfc/Stylepad/src/ElementTreePanel.java -${JDKHOME}/demo/jfc/Stylepad/src/HelloWorld.java -${JDKHOME}/demo/jfc/Stylepad/src/Notepad.java -${JDKHOME}/demo/jfc/Stylepad/src/Stylepad.java -${JDKHOME}/demo/jfc/Stylepad/src/Wonderland.java -${JDKHOME}/demo/jfc/Stylepad/src/resources/ -${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad.properties -${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad_fr.properties -${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad_sv.properties -${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad_zh_CN.properties -${JDKHOME}/demo/jfc/Stylepad/src/resources/Stylepad.properties -${JDKHOME}/demo/jfc/Stylepad/src/resources/Stylepad_sv.properties -${JDKHOME}/demo/jfc/Stylepad/src/resources/Stylepad_zh_CN.properties -${JDKHOME}/demo/jfc/Stylepad/src/resources/alice.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/bold.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/bullets.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/caterpillar.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/center.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/copy.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/cut.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/fg.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/hatter.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/italic.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/left.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/new.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/open.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/paste.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/rabbit.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/rabbit2.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/right.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/save.gif -${JDKHOME}/demo/jfc/Stylepad/src/resources/underline.gif -${JDKHOME}/demo/jfc/SwingApplet/ -${JDKHOME}/demo/jfc/SwingApplet/README.txt -${JDKHOME}/demo/jfc/SwingApplet/SwingApplet.html -${JDKHOME}/demo/jfc/SwingApplet/SwingApplet.jar -${JDKHOME}/demo/jfc/SwingApplet/src/ -${JDKHOME}/demo/jfc/SwingApplet/src/SwingApplet.java -${JDKHOME}/demo/jfc/SwingSet2/ -${JDKHOME}/demo/jfc/SwingSet2/README.txt -${JDKHOME}/demo/jfc/SwingSet2/SwingSet2.html -${JDKHOME}/demo/jfc/SwingSet2/SwingSet2.jar -${JDKHOME}/demo/jfc/SwingSet2/src/ -${JDKHOME}/demo/jfc/SwingSet2/src/AquaTheme.java -${JDKHOME}/demo/jfc/SwingSet2/src/BezierAnimationPanel.java -${JDKHOME}/demo/jfc/SwingSet2/src/ButtonDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/CharcoalTheme.java -${JDKHOME}/demo/jfc/SwingSet2/src/CodeViewer.java -${JDKHOME}/demo/jfc/SwingSet2/src/ColorChooserDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/ComboBoxDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/ContrastTheme.java -${JDKHOME}/demo/jfc/SwingSet2/src/DemoModule.java -${JDKHOME}/demo/jfc/SwingSet2/src/DirectionPanel.java -${JDKHOME}/demo/jfc/SwingSet2/src/EmeraldTheme.java -${JDKHOME}/demo/jfc/SwingSet2/src/ExampleFileFilter.java -${JDKHOME}/demo/jfc/SwingSet2/src/ExampleFileView.java -${JDKHOME}/demo/jfc/SwingSet2/src/FileChooserDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/HtmlDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/InternalFrameDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/LayoutControlPanel.java -${JDKHOME}/demo/jfc/SwingSet2/src/ListDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/OptionPaneDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/Permuter.java -${JDKHOME}/demo/jfc/SwingSet2/src/ProgressBarDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/RubyTheme.java -${JDKHOME}/demo/jfc/SwingSet2/src/ScrollPaneDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/SliderDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/SplitPaneDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/SwingSet2.java -${JDKHOME}/demo/jfc/SwingSet2/src/SwingSet2Applet.java -${JDKHOME}/demo/jfc/SwingSet2/src/TabbedPaneDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/TableDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/ToolTipDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/TreeDemo.java -${JDKHOME}/demo/jfc/SwingSet2/src/resources/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/ant.html -${JDKHOME}/demo/jfc/SwingSet2/src/resources/bug.html -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/About.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/COPYRIGHT -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/apple.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/asparagus.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/banana.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/broccoli.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/cantaloupe.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/carrot.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/corn.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/grapefruit.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/grapes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/kiwi.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/onion.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/peach.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pear.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pepper.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pickle.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pineapple.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/raspberry.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/strawberry.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/tomato.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/watermelon.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab_small.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish_small.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon_small.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun_small.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/COPYRIGHT -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/ant.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/book.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/bug.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/bug2.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/crest.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/king.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/micro.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/seaweed.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Splash.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1d.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1p.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1r.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2d.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2p.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2r.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3d.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3p.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3r.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bl.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bldn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bm.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bmdn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/br.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/brdn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/c.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cb.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cbr.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cbrs.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cbs.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cdn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/ml.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/mldn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/mr.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/mrdn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rb.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbp.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbr.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbrs.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbs.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tl.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tldn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tm.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tmdn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/toggle.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/toggledn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tr.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/trdn.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/brenteyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/brenthair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/brentmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/georgeseyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/georgeshair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/georgesmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/hanseyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/hanshair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/hansmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/howardeyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/howardhair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/howardmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jameseyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jameshair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jamesmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jeffeyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jeffhair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jeffmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/joneyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jonhair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jonmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/laraeyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larahair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/laramouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larryeyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larryhair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larrymouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/lisaeyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/lisahair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/lisamouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/michaeleyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/michaelhair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/michaelmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/philipeyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/philiphair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/philipmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/scotteyes.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/scotthair.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/scottmouth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/find.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/gifIcon.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/help.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/jpgIcon.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/back.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/forward.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/header.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/blue.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/cyan.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/gray.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/green.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/magenta.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/red.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/yellow.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/bottle.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/ibd.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/ibu.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/COPYRIGHT -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/colheader.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/crayons.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/lowerleft.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/rowheader.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/upperleft.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/upperright.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/README -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/earth.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/moon.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/blake.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/brooke.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/david.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/hania.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/laine.jpg -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/matthew.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/stephen.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JButton.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JColorChooser.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JComboBox.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JDesktop.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JDialog.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JEditorPane.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JFileChooser.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JList.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JMenu.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JOptionPane.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JProgressBar.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JRadioButton.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JScrollBar.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JScrollPane.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JSlider.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JSplitPane.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JTabbedPane.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JTable.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JTree.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/ToolTip.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tooltip/ -${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tooltip/cow.gif -${JDKHOME}/demo/jfc/SwingSet2/src/resources/index.html -${JDKHOME}/demo/jfc/SwingSet2/src/resources/king.html -${JDKHOME}/demo/jfc/SwingSet2/src/resources/preface.html -${JDKHOME}/demo/jfc/SwingSet2/src/resources/seaweed.html -${JDKHOME}/demo/jfc/SwingSet2/src/resources/swingset.properties -${JDKHOME}/demo/jfc/SwingSet2/src/resources/swingset_ja.properties -${JDKHOME}/demo/jfc/SwingSet2/src/resources/title.html -${JDKHOME}/demo/jfc/SwingSet2/src/resources/tree.txt -${JDKHOME}/demo/jfc/TableExample/ -${JDKHOME}/demo/jfc/TableExample/README.txt -${JDKHOME}/demo/jfc/TableExample/TableExample.jar -${JDKHOME}/demo/jfc/TableExample/src/ -${JDKHOME}/demo/jfc/TableExample/src/JDBCAdapter.java -${JDKHOME}/demo/jfc/TableExample/src/OldJTable.java -${JDKHOME}/demo/jfc/TableExample/src/TableExample.java -${JDKHOME}/demo/jfc/TableExample/src/TableExample2.java -${JDKHOME}/demo/jfc/TableExample/src/TableExample3.java -${JDKHOME}/demo/jfc/TableExample/src/TableExample4.java -${JDKHOME}/demo/jfc/TableExample/src/TableMap.java -${JDKHOME}/demo/jfc/TableExample/src/TableSorter.java -${JDKHOME}/demo/jpda/ -${JDKHOME}/demo/jpda/examples.jar -${JDKHOME}/demo/jvmti/ -${JDKHOME}/demo/jvmti/agent_util/ -${JDKHOME}/demo/jvmti/agent_util/README.txt -${JDKHOME}/demo/jvmti/agent_util/src/ -${JDKHOME}/demo/jvmti/agent_util/src/agent_util.c -${JDKHOME}/demo/jvmti/agent_util/src/agent_util.h -${JDKHOME}/demo/jvmti/gctest/ -${JDKHOME}/demo/jvmti/gctest/README.txt -${JDKHOME}/demo/jvmti/gctest/lib/ -${JDKHOME}/demo/jvmti/gctest/lib/libgctest.so -${JDKHOME}/demo/jvmti/gctest/src/ -${JDKHOME}/demo/jvmti/gctest/src/gctest.c -${JDKHOME}/demo/jvmti/gctest/src/sample.makefile.txt -${JDKHOME}/demo/jvmti/heapTracker/ -${JDKHOME}/demo/jvmti/heapTracker/README.txt -${JDKHOME}/demo/jvmti/heapTracker/heapTracker.jar -${JDKHOME}/demo/jvmti/heapTracker/lib/ -${JDKHOME}/demo/jvmti/heapTracker/lib/libheapTracker.so -${JDKHOME}/demo/jvmti/heapTracker/src/ -${JDKHOME}/demo/jvmti/heapTracker/src/HeapTracker.java -${JDKHOME}/demo/jvmti/heapTracker/src/heapTracker.c -${JDKHOME}/demo/jvmti/heapTracker/src/heapTracker.h -${JDKHOME}/demo/jvmti/heapTracker/src/sample.makefile.txt -${JDKHOME}/demo/jvmti/heapViewer/ -${JDKHOME}/demo/jvmti/heapViewer/README.txt -${JDKHOME}/demo/jvmti/heapViewer/lib/ -${JDKHOME}/demo/jvmti/heapViewer/lib/libheapViewer.so -${JDKHOME}/demo/jvmti/heapViewer/src/ -${JDKHOME}/demo/jvmti/heapViewer/src/heapViewer.c -${JDKHOME}/demo/jvmti/heapViewer/src/sample.makefile.txt -${JDKHOME}/demo/jvmti/hprof/ -${JDKHOME}/demo/jvmti/hprof/README.txt -${JDKHOME}/demo/jvmti/hprof/src/ -${JDKHOME}/demo/jvmti/hprof/src/Tracker.java -${JDKHOME}/demo/jvmti/hprof/src/bsd/ -${JDKHOME}/demo/jvmti/hprof/src/bsd/hprof_md.c -${JDKHOME}/demo/jvmti/hprof/src/bsd/hprof_md.c.orig.bsd -${JDKHOME}/demo/jvmti/hprof/src/debug_malloc.c -${JDKHOME}/demo/jvmti/hprof/src/debug_malloc.h -${JDKHOME}/demo/jvmti/hprof/src/hprof.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_blocks.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_blocks.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_class.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_class.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_cpu.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_cpu.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_error.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_error.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_event.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_event.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_frame.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_frame.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_init.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_init.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_io.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_io.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_ioname.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_ioname.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_listener.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_listener.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_loader.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_loader.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_md.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_monitor.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_monitor.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_object.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_object.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_reference.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_reference.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_site.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_site.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_stack.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_stack.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_string.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_string.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_table.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_table.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_tag.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_tag.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_tls.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_tls.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_trace.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_trace.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_tracker.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_tracker.h -${JDKHOME}/demo/jvmti/hprof/src/hprof_util.c -${JDKHOME}/demo/jvmti/hprof/src/hprof_util.h -${JDKHOME}/demo/jvmti/hprof/src/jvm.hprof.txt -${JDKHOME}/demo/jvmti/hprof/src/manual.html -${JDKHOME}/demo/jvmti/hprof/src/sample.makefile.txt -${JDKHOME}/demo/jvmti/index.html -${JDKHOME}/demo/jvmti/java_crw_demo/ -${JDKHOME}/demo/jvmti/java_crw_demo/README.txt -${JDKHOME}/demo/jvmti/java_crw_demo/src/ -${JDKHOME}/demo/jvmti/java_crw_demo/src/classfile_constants.h -${JDKHOME}/demo/jvmti/java_crw_demo/src/java_crw_demo.c -${JDKHOME}/demo/jvmti/java_crw_demo/src/java_crw_demo.h -${JDKHOME}/demo/jvmti/java_crw_demo/src/sample.makefile.txt -${JDKHOME}/demo/jvmti/java_crw_demo/src/test_crw.c -${JDKHOME}/demo/jvmti/mtrace/ -${JDKHOME}/demo/jvmti/mtrace/README.txt -${JDKHOME}/demo/jvmti/mtrace/lib/ -${JDKHOME}/demo/jvmti/mtrace/lib/libmtrace.so -${JDKHOME}/demo/jvmti/mtrace/mtrace.jar -${JDKHOME}/demo/jvmti/mtrace/src/ -${JDKHOME}/demo/jvmti/mtrace/src/Mtrace.java -${JDKHOME}/demo/jvmti/mtrace/src/mtrace.c -${JDKHOME}/demo/jvmti/mtrace/src/mtrace.h -${JDKHOME}/demo/jvmti/mtrace/src/sample.makefile.txt -${JDKHOME}/demo/jvmti/versionCheck/ -${JDKHOME}/demo/jvmti/versionCheck/README.txt -${JDKHOME}/demo/jvmti/versionCheck/lib/ -${JDKHOME}/demo/jvmti/versionCheck/lib/libversionCheck.so -${JDKHOME}/demo/jvmti/versionCheck/src/ -${JDKHOME}/demo/jvmti/versionCheck/src/sample.makefile.txt -${JDKHOME}/demo/jvmti/versionCheck/src/versionCheck.c -${JDKHOME}/demo/jvmti/waiters/ -${JDKHOME}/demo/jvmti/waiters/README.txt -${JDKHOME}/demo/jvmti/waiters/lib/ -${JDKHOME}/demo/jvmti/waiters/lib/libwaiters.so -${JDKHOME}/demo/jvmti/waiters/src/ -${JDKHOME}/demo/jvmti/waiters/src/Agent.cpp -${JDKHOME}/demo/jvmti/waiters/src/Agent.hpp -${JDKHOME}/demo/jvmti/waiters/src/Monitor.cpp -${JDKHOME}/demo/jvmti/waiters/src/Monitor.hpp -${JDKHOME}/demo/jvmti/waiters/src/Thread.cpp -${JDKHOME}/demo/jvmti/waiters/src/Thread.hpp -${JDKHOME}/demo/jvmti/waiters/src/sample.makefile.txt -${JDKHOME}/demo/jvmti/waiters/src/waiters.cpp -${JDKHOME}/demo/management/ -${JDKHOME}/demo/management/FullThreadDump/ -${JDKHOME}/demo/management/FullThreadDump/FullThreadDump.jar -${JDKHOME}/demo/management/FullThreadDump/README.txt -${JDKHOME}/demo/management/FullThreadDump/src/ -${JDKHOME}/demo/management/FullThreadDump/src/Deadlock.java -${JDKHOME}/demo/management/FullThreadDump/src/FullThreadDump.java -${JDKHOME}/demo/management/FullThreadDump/src/ThreadMonitor.java -${JDKHOME}/demo/management/JTop/ -${JDKHOME}/demo/management/JTop/JTop.jar -${JDKHOME}/demo/management/JTop/README.txt -${JDKHOME}/demo/management/JTop/src/ -${JDKHOME}/demo/management/JTop/src/JTop.java -${JDKHOME}/demo/management/MemoryMonitor/ -${JDKHOME}/demo/management/MemoryMonitor/MemoryMonitor.jar -${JDKHOME}/demo/management/MemoryMonitor/README.txt -${JDKHOME}/demo/management/MemoryMonitor/src/ -${JDKHOME}/demo/management/MemoryMonitor/src/MemoryMonitor.java -${JDKHOME}/demo/management/VerboseGC/ -${JDKHOME}/demo/management/VerboseGC/README.txt -${JDKHOME}/demo/management/VerboseGC/VerboseGC.jar -${JDKHOME}/demo/management/VerboseGC/src/ -${JDKHOME}/demo/management/VerboseGC/src/PrintGCStat.java -${JDKHOME}/demo/management/VerboseGC/src/VerboseGC.java -${JDKHOME}/demo/management/index.html -@comment ${JDKHOME}/demo/plugin/ -@comment ${JDKHOME}/demo/plugin/applets/ -@comment ${JDKHOME}/demo/plugin/applets.html -@comment ${JDKHOME}/demo/plugin/applets/Animator/ -@comment ${JDKHOME}/demo/plugin/applets/Animator/Animation.class -@comment ${JDKHOME}/demo/plugin/applets/Animator/AnimationFrame.class -@comment ${JDKHOME}/demo/plugin/applets/Animator/Animator.class -@comment ${JDKHOME}/demo/plugin/applets/Animator/Animator.java -@comment ${JDKHOME}/demo/plugin/applets/Animator/DescriptionFrame.class -@comment ${JDKHOME}/demo/plugin/applets/Animator/ParseException.class -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/ -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/0.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/1.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/2.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/3.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/4.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/5.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/6.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/7.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/8.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/9.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/audio/spacemusic.au -@comment ${JDKHOME}/demo/plugin/applets/Animator/example1.html -@comment ${JDKHOME}/demo/plugin/applets/Animator/example2.html -@comment ${JDKHOME}/demo/plugin/applets/Animator/example3.html -@comment ${JDKHOME}/demo/plugin/applets/Animator/example4.html -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/ -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/ -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T1.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T10.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T2.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T3.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T4.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T5.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T6.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T7.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T8.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/Beans/T9.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/SimpleAnimation/ -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/SimpleAnimation/T1.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/SimpleAnimation/T2.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/images/loading-msg.gif -@comment ${JDKHOME}/demo/plugin/applets/Animator/index.html -@comment ${JDKHOME}/demo/plugin/applets/ArcTest/ -@comment ${JDKHOME}/demo/plugin/applets/ArcTest/ArcCanvas.class -@comment ${JDKHOME}/demo/plugin/applets/ArcTest/ArcControls.class -@comment ${JDKHOME}/demo/plugin/applets/ArcTest/ArcTest.class -@comment ${JDKHOME}/demo/plugin/applets/ArcTest/ArcTest.java -@comment ${JDKHOME}/demo/plugin/applets/ArcTest/IntegerTextField.class -@comment ${JDKHOME}/demo/plugin/applets/ArcTest/example1.html -@comment ${JDKHOME}/demo/plugin/applets/BarChart/ -@comment ${JDKHOME}/demo/plugin/applets/BarChart/BarChart.class -@comment ${JDKHOME}/demo/plugin/applets/BarChart/BarChart.java -@comment ${JDKHOME}/demo/plugin/applets/BarChart/example1.html -@comment ${JDKHOME}/demo/plugin/applets/Blink/ -@comment ${JDKHOME}/demo/plugin/applets/Blink/Blink$1.class -@comment ${JDKHOME}/demo/plugin/applets/Blink/Blink.class -@comment ${JDKHOME}/demo/plugin/applets/Blink/Blink.java -@comment ${JDKHOME}/demo/plugin/applets/Blink/example1.html -@comment ${JDKHOME}/demo/plugin/applets/CardTest/ -@comment ${JDKHOME}/demo/plugin/applets/CardTest/CardPanel.class -@comment ${JDKHOME}/demo/plugin/applets/CardTest/CardTest.class -@comment ${JDKHOME}/demo/plugin/applets/CardTest/CardTest.java -@comment ${JDKHOME}/demo/plugin/applets/CardTest/example1.html -@comment ${JDKHOME}/demo/plugin/applets/Clock/ -@comment ${JDKHOME}/demo/plugin/applets/Clock/Clock.class -@comment ${JDKHOME}/demo/plugin/applets/Clock/Clock.java -@comment ${JDKHOME}/demo/plugin/applets/Clock/example1.html -@comment ${JDKHOME}/demo/plugin/applets/DitherTest/ -@comment ${JDKHOME}/demo/plugin/applets/DitherTest/CardinalTextField.class -@comment ${JDKHOME}/demo/plugin/applets/DitherTest/DitherCanvas.class -@comment ${JDKHOME}/demo/plugin/applets/DitherTest/DitherControls.class -@comment ${JDKHOME}/demo/plugin/applets/DitherTest/DitherTest.class -@comment ${JDKHOME}/demo/plugin/applets/DitherTest/DitherTest.java -@comment ${JDKHOME}/demo/plugin/applets/DitherTest/example1.html -@comment ${JDKHOME}/demo/plugin/applets/DrawTest/ -@comment ${JDKHOME}/demo/plugin/applets/DrawTest/DrawControls.class -@comment ${JDKHOME}/demo/plugin/applets/DrawTest/DrawPanel.class -@comment ${JDKHOME}/demo/plugin/applets/DrawTest/DrawTest.class -@comment ${JDKHOME}/demo/plugin/applets/DrawTest/DrawTest.java -@comment ${JDKHOME}/demo/plugin/applets/DrawTest/example1.html -@comment ${JDKHOME}/demo/plugin/applets/Fractal/ -@comment ${JDKHOME}/demo/plugin/applets/Fractal/CLSFractal.class -@comment ${JDKHOME}/demo/plugin/applets/Fractal/CLSFractal.java -@comment ${JDKHOME}/demo/plugin/applets/Fractal/CLSRule.class -@comment ${JDKHOME}/demo/plugin/applets/Fractal/CLSTurtle.class -@comment ${JDKHOME}/demo/plugin/applets/Fractal/ContextLSystem.class -@comment ${JDKHOME}/demo/plugin/applets/Fractal/example1.html -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/ -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/Edge.class -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/Graph.class -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/Graph.java -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/GraphPanel.class -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/Node.class -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/audio/ -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/audio/computer.au -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/audio/drip.au -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/audio/gong.au -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/example1.html -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/example2.html -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/example3.html -@comment ${JDKHOME}/demo/plugin/applets/GraphLayout/example4.html -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/ -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/AppletFrame.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/AppletFrame.java -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/ArcCard.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/ArcDegreePanel.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/ArcPanel.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/ColorUtils.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/GraphicsCards.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/GraphicsPanel.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/GraphicsTest.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/GraphicsTest.java -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/OvalShape.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/PolygonShape.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/RectShape.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/RoundRectShape.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/Shape.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/ShapeTest.class -@comment ${JDKHOME}/demo/plugin/applets/GraphicsTest/example1.html -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/ -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/AniArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/AniArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/ButtonFilter.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/ButtonFilter.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/ClickArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/ClickArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/DelayedSoundArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/DelayedSoundArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/HighlightArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/HighlightArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/HighlightFilter.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/HighlightFilter.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/HrefButtonArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/HrefButtonArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/ImageMap.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/ImageMap.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/ImageMapArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/ImageMapArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/LinkArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/LinkArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/NameArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/NameArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/RoundButtonFilter.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/RoundButtonFilter.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/RoundHrefButtonArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/RoundHrefButtonArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/SoundArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/SoundArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/TickerArea.class -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/TickerArea.java -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/audio/ -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/audio/chirp1.au -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/audio/hi.au -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/example1.html -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/imagemapcheat.html -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/images/ -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/images/jim.graham.gif -@comment ${JDKHOME}/demo/plugin/applets/ImageMap/sources.html -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/ -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/JumpingBox.class -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/JumpingBox.java -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/example1.html -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/sounds/ -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/sounds/adapt-or-die.au -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/sounds/cannot.be.completed.au -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/sounds/danger.au -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/sounds/ip.au -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/sounds/that.hurts.au -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/sounds/thin.bell.au -@comment ${JDKHOME}/demo/plugin/applets/JumpingBox/sounds/tiptoe.thru.the.tulips.au -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/ -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/Atom.class -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/Matrix3D.class -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/Matrix3D.java -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/XYZApp.class -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/XYZApp.java -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/XYZChemModel.class -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/example1.html -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/example2.html -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/example3.html -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/models/ -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/models/HyaluronicAcid.xyz -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/models/benzene.xyz -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/models/buckminsterfullerine.xyz -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/models/cyclohexane.xyz -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/models/ethane.xyz -@comment ${JDKHOME}/demo/plugin/applets/MoleculeViewer/models/water.xyz -@comment ${JDKHOME}/demo/plugin/applets/NervousText/ -@comment ${JDKHOME}/demo/plugin/applets/NervousText/NervousText.class -@comment ${JDKHOME}/demo/plugin/applets/NervousText/NervousText.java -@comment ${JDKHOME}/demo/plugin/applets/NervousText/example1.html -@comment ${JDKHOME}/demo/plugin/applets/SimpleGraph/ -@comment ${JDKHOME}/demo/plugin/applets/SimpleGraph/GraphApplet.class -@comment ${JDKHOME}/demo/plugin/applets/SimpleGraph/GraphApplet.java -@comment ${JDKHOME}/demo/plugin/applets/SimpleGraph/example1.html -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/ -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/BidirBubbleSortAlgorithm.class -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/BidirBubbleSortAlgorithm.java -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/BubbleSortAlgorithm.class -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/BubbleSortAlgorithm.java -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/QSortAlgorithm.class -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/QSortAlgorithm.java -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/SortAlgorithm.class -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/SortAlgorithm.java -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/SortItem.class -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/SortItem.java -@comment ${JDKHOME}/demo/plugin/applets/SortDemo/example1.html -@comment ${JDKHOME}/demo/plugin/applets/SpreadSheet/ -@comment ${JDKHOME}/demo/plugin/applets/SpreadSheet/Cell.class -@comment ${JDKHOME}/demo/plugin/applets/SpreadSheet/CellUpdater.class -@comment ${JDKHOME}/demo/plugin/applets/SpreadSheet/InputField.class -@comment ${JDKHOME}/demo/plugin/applets/SpreadSheet/Node.class -@comment ${JDKHOME}/demo/plugin/applets/SpreadSheet/SpreadSheet.class -@comment ${JDKHOME}/demo/plugin/applets/SpreadSheet/SpreadSheet.java -@comment ${JDKHOME}/demo/plugin/applets/SpreadSheet/SpreadSheetInput.class -@comment ${JDKHOME}/demo/plugin/applets/SpreadSheet/example1.html -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/ -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/TicTacToe.class -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/TicTacToe.java -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/audio/ -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/audio/beep.au -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/audio/ding.au -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/audio/return.au -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/audio/yahoo1.au -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/audio/yahoo2.au -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/example1.html -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/images/ -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/images/cross.gif -@comment ${JDKHOME}/demo/plugin/applets/TicTacToe/images/not.gif -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/ -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/FileFormatException.class -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/Matrix3D.class -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/Matrix3D.java -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/Model3D.class -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/ThreeD.class -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/ThreeD.java -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/example1.html -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/example2.html -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/example3.html -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/example4.html -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/models/ -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/models/cube.obj -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/models/dinasaur.obj -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/models/hughes_500.obj -@comment ${JDKHOME}/demo/plugin/applets/WireFrame/models/knoxS.obj -@comment ${JDKHOME}/demo/plugin/jfc/ -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/ -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/CodePointIM.jar -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/README.html -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/README_ja.html -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/README_zh_CN.html -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/ -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/CodePointIM.java -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/CodePointInputMethod.java -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/resources/ -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/resources/codepoint.properties -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/resources/codepoint_ja.properties -@comment ${JDKHOME}/demo/plugin/jfc/CodePointIM/src/resources/codepoint_zh_CN.properties -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/ -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/FileChooserDemo.jar -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/ -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/ExampleFileFilter.java -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/ExampleFileView.java -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/FileChooserDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/resources/ -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/resources/images/ -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/resources/images/gifIcon.gif -@comment ${JDKHOME}/demo/plugin/jfc/FileChooserDemo/src/resources/images/jpgIcon.jpg -@comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/ -@comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/Font2DTest.html -@comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/Font2DTest.jar -@comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/src/ -@comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/src/Font2DTest.java -@comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/src/Font2DTestApplet.java -@comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/src/FontPanel.java -@comment ${JDKHOME}/demo/plugin/jfc/Font2DTest/src/RangeMenu.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/Java2Demo.html -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/Java2Demo.jar -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/fonts/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/fonts/A.ttf -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/bld.jpg -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/boat.png -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/box.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/boxwave.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/clone.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/clouds.jpg -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/cupanim.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/duke.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/duke.png -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/duke.running.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/dukeplug.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/fight.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/globe.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/java-logo.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/java_logo.png -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/jumptojavastrip.png -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/loop.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/looping.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/magnify.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/painting.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/print.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/remove.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/snooze.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/star7.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/start.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/start2.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/stop.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/stop2.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/surfing.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/thumbsup.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/images/tip.gif -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/AnimatingControlsSurface.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/AnimatingSurface.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/CloningFeature.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/ControlsSurface.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/CustomControls.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/CustomControlsContext.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/DemoFonts.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/DemoGroup.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/DemoImages.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/DemoPanel.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/GlobalControls.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/GlobalPanel.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/Intro.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/Java2Demo.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/Java2DemoApplet.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/MemoryMonitor.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/PerformanceMonitor.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/RunWindow.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/Surface.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/TextureChooser.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/Tools.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Arcs_Curves/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Arcs_Curves/Arcs.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Arcs_Curves/BezierAnim.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Arcs_Curves/Curves.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Arcs_Curves/Ellipses.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping/Areas.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping/ClipAnim.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping/Intersection.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Clipping/Text.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Colors/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Colors/BullsEye.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Colors/ColorConvert.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Colors/Rotator3D.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Composite/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Composite/ACimages.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Composite/ACrules.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Composite/FadeAnim.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts/AllFonts.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts/AttributedStr.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts/Highlighting.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts/Outline.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Fonts/Tree.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Images/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Images/DukeAnim.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Images/ImageOps.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Images/JPEGFlip.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Images/WarpImage.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Lines/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Lines/Caps.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Lines/Dash.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Lines/Joins.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Lines/LineAnim.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Mix/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Mix/Balls.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Mix/BezierScroller.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Mix/Stars3D.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paint/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paint/GradAnim.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paint/Gradient.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paint/Texture.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paint/TextureAnim.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paths/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paths/Append.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paths/CurveQuadTo.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paths/FillStroke.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Paths/WindingRule.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms/ -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms/Rotate.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms/SelectTx.java -@comment ${JDKHOME}/demo/plugin/jfc/Java2D/src/java2d/demos/Transforms/TransformAnim.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/ -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/Metalworks.jar -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/ -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/AquaMetalTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/BigContrastMetalTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/ContrastMetalTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/DemoMetalTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/GreenMetalTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/KhakiMetalTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/MetalThemeMenu.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/Metalworks.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/MetalworksDocumentFrame.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/MetalworksFrame.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/MetalworksHelp.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/MetalworksInBox.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/MetalworksPrefs.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/PropertiesMetalTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/UISwitchListener.java -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/ -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/ -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/back.gif -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/credits.html -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/duke.gif -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/javalogo.gif -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/metal.html -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/metalworks.html -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/swing.html -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/HelpFiles/toc.html -@comment ${JDKHOME}/demo/plugin/jfc/Metalworks/src/resources/MyTheme.theme -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/ -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/Notepad.jar -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/ -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/ElementTreePanel.java -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/Notepad.java -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/ -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/Notepad.properties -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/Notepad_fr.properties -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/Notepad_sv.properties -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/Notepad_zh_CN.properties -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/copy.gif -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/cut.gif -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/new.gif -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/open.gif -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/paste.gif -@comment ${JDKHOME}/demo/plugin/jfc/Notepad/src/resources/save.gif -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/ -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/SampleTree.jar -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/ -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/DynamicTreeNode.java -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/SampleData.java -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/SampleTree.java -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/SampleTreeCellRenderer.java -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/SampleTreeModel.java -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/resources/ -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/resources/images/ -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/resources/images/collapsed.gif -@comment ${JDKHOME}/demo/plugin/jfc/SampleTree/src/resources/images/expanded.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/ -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/Stylepad.jar -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/ -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/ElementTreePanel.java -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/HelloWorld.java -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/Notepad.java -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/Stylepad.java -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/Wonderland.java -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/ -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Notepad.properties -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Notepad_fr.properties -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Notepad_sv.properties -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Notepad_zh_CN.properties -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Stylepad.properties -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Stylepad_sv.properties -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/Stylepad_zh_CN.properties -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/alice.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/bold.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/bullets.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/caterpillar.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/center.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/copy.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/cut.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/fg.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/hatter.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/italic.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/left.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/new.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/open.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/paste.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/rabbit.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/rabbit2.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/right.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/save.gif -@comment ${JDKHOME}/demo/plugin/jfc/Stylepad/src/resources/underline.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingApplet/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingApplet/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/SwingApplet/SwingApplet.html -@comment ${JDKHOME}/demo/plugin/jfc/SwingApplet/SwingApplet.jar -@comment ${JDKHOME}/demo/plugin/jfc/SwingApplet/src/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingApplet/src/SwingApplet.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/SwingSet2.html -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/SwingSet2.jar -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/AquaTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/BezierAnimationPanel.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ButtonDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/CharcoalTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/CodeViewer.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ColorChooserDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ComboBoxDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ContrastTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/DemoModule.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/DirectionPanel.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/EmeraldTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ExampleFileFilter.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ExampleFileView.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/FileChooserDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/HtmlDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/InternalFrameDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/LayoutControlPanel.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ListDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/OptionPaneDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/Permuter.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ProgressBarDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/RubyTheme.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ScrollPaneDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/SliderDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/SplitPaneDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/SwingSet2.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/SwingSet2Applet.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/TabbedPaneDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/TableDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/ToolTipDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/TreeDemo.java -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/ant.html -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/bug.html -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/About.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/COPYRIGHT -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/apple.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/asparagus.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/banana.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/broccoli.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/cantaloupe.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/carrot.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/corn.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/grapefruit.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/grapes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/kiwi.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/onion.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/peach.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/pear.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/pepper.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/pickle.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/pineapple.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/raspberry.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/strawberry.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/tomato.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/food/watermelon.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab_small.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish_small.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon_small.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun_small.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/COPYRIGHT -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/ant.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/book.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/bug.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/bug2.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/crest.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/king.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/micro.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Octavo/seaweed.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/Splash.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b1.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b1d.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b1p.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b1r.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b2.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b2d.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b2p.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b2r.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b3.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b3d.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b3p.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/b3r.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/bl.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/bldn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/bm.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/bmdn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/br.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/brdn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/c.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cb.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cbr.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cbrs.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cbs.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/cdn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/ml.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/mldn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/mr.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/mrdn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rb.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rbp.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rbr.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rbrs.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/rbs.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tl.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tldn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tm.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tmdn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/toggle.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/toggledn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/tr.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/buttons/trdn.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/brenteyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/brenthair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/brentmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/georgeseyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/georgeshair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/georgesmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/hanseyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/hanshair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/hansmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/howardeyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/howardhair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/howardmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jameseyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jameshair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jamesmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jeffeyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jeffhair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jeffmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/joneyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jonhair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/jonmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/laraeyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/larahair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/laramouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/larryeyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/larryhair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/larrymouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/lisaeyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/lisahair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/lisamouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/michaeleyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/michaelhair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/michaelmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/philipeyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/philiphair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/philipmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/scotteyes.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/scotthair.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/combobox/scottmouth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/find.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/gifIcon.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/help.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/filechooser/jpgIcon.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/htmldemo/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/htmldemo/back.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/htmldemo/forward.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/htmldemo/header.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/blue.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/cyan.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/gray.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/green.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/magenta.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/red.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/list/yellow.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/optionpane/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/optionpane/bottle.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/optionpane/ibd.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/optionpane/ibu.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/COPYRIGHT -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/colheader.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/crayons.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/lowerleft.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/rowheader.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/upperleft.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/scrollpane/upperright.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/splitpane/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/splitpane/README -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/splitpane/earth.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/splitpane/moon.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/blake.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/brooke.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/david.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/hania.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/laine.jpg -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/matthew.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tabbedpane/stephen.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JButton.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JColorChooser.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JComboBox.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JDesktop.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JDialog.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JEditorPane.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JFileChooser.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JList.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JMenu.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JOptionPane.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JProgressBar.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JRadioButton.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JScrollBar.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JScrollPane.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JSlider.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JSplitPane.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JTabbedPane.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JTable.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/JTree.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/toolbar/ToolTip.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tooltip/ -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/images/tooltip/cow.gif -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/index.html -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/king.html -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/preface.html -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/seaweed.html -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/swingset.properties -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/swingset_ja.properties -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/title.html -@comment ${JDKHOME}/demo/plugin/jfc/SwingSet2/src/resources/tree.txt -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/ -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/README.txt -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/TableExample.jar -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/src/ -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/src/JDBCAdapter.java -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/src/OldJTable.java -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/src/TableExample.java -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/src/TableExample2.java -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/src/TableExample3.java -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/src/TableExample4.java -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/src/TableMap.java -@comment ${JDKHOME}/demo/plugin/jfc/TableExample/src/TableSorter.java -${JDKHOME}/include/ -${JDKHOME}/include/bsd/ -${JDKHOME}/include/bsd/jni_md.h -${JDKHOME}/include/jawt.h -${JDKHOME}/include/jdwpTransport.h -${JDKHOME}/include/jmm.h -${JDKHOME}/include/jni.h -${JDKHOME}/include/jvmdi.h -${JDKHOME}/include/jvmpi.h -${JDKHOME}/include/jvmti.h -${JDKHOME}/include/openbsd/ -${JDKHOME}/include/openbsd/jawt_md.h -${JDKHOME}/include/openbsd/jni_md.h -${JDKHOME}/jre/ -${JDKHOME}/jre/CHANGES -${JDKHOME}/jre/COPYRIGHT -${JDKHOME}/jre/LICENSE -${JDKHOME}/jre/README -${JDKHOME}/jre/Welcome.html -${JDKHOME}/jre/bin/ -@comment ${JDKHOME}/jre/bin/ControlPanel -${JDKHOME}/jre/bin/java -@comment ${JDKHOME}/jre/bin/java_vm -@comment ${JDKHOME}/jre/bin/javaws -${JDKHOME}/jre/bin/keytool -${JDKHOME}/jre/bin/kinit -${JDKHOME}/jre/bin/klist -${JDKHOME}/jre/bin/ktab -${JDKHOME}/jre/bin/orbd -${JDKHOME}/jre/bin/pack200 -${JDKHOME}/jre/bin/policytool -${JDKHOME}/jre/bin/rmid -${JDKHOME}/jre/bin/rmiregistry -${JDKHOME}/jre/bin/servertool -${JDKHOME}/jre/bin/tnameserv -${JDKHOME}/jre/bin/unpack200 -@comment ${JDKHOME}/jre/javaws/ -@comment ${JDKHOME}/jre/javaws/javaws -${JDKHOME}/jre/lib/ -${JDKHOME}/jre/lib/applet/ -${JDKHOME}/jre/lib/audio/ -${JDKHOME}/jre/lib/audio/soundbank.gm -${JDKHOME}/jre/lib/charsets.jar -${JDKHOME}/jre/lib/classlist -${JDKHOME}/jre/lib/cmm/ -${JDKHOME}/jre/lib/cmm/CIEXYZ.pf -${JDKHOME}/jre/lib/cmm/GRAY.pf -${JDKHOME}/jre/lib/cmm/LINEAR_RGB.pf -${JDKHOME}/jre/lib/cmm/PYCC.pf -${JDKHOME}/jre/lib/cmm/sRGB.pf -${JDKHOME}/jre/lib/content-types.properties -@comment ${JDKHOME}/jre/lib/deploy.jar -${JDKHOME}/jre/lib/ext/ -${JDKHOME}/jre/lib/ext/dnsns.jar -${JDKHOME}/jre/lib/ext/localedata.jar -${JDKHOME}/jre/lib/ext/sunjce_provider.jar -${JDKHOME}/jre/lib/flavormap.properties -${JDKHOME}/jre/lib/fontconfig.bfc -${JDKHOME}/jre/lib/fontconfig.properties.src -${JDKHOME}/jre/lib/fonts/ -${JDKHOME}/jre/lib/fonts/LucidaBrightDemiBold.ttf -${JDKHOME}/jre/lib/fonts/LucidaBrightDemiItalic.ttf -${JDKHOME}/jre/lib/fonts/LucidaBrightItalic.ttf -${JDKHOME}/jre/lib/fonts/LucidaBrightRegular.ttf -${JDKHOME}/jre/lib/fonts/LucidaSansDemiBold.ttf -${JDKHOME}/jre/lib/fonts/LucidaSansRegular.ttf -${JDKHOME}/jre/lib/fonts/LucidaTypewriterBold.ttf -${JDKHOME}/jre/lib/fonts/LucidaTypewriterRegular.ttf -${JDKHOME}/jre/lib/fonts/fonts.dir -${JDKHOME}/jre/lib/${MACHINE_ARCH}/ -${JDKHOME}/jre/lib/${MACHINE_ARCH}/awt_robot -${JDKHOME}/jre/lib/${MACHINE_ARCH}/gtkhelper -${JDKHOME}/jre/lib/${MACHINE_ARCH}/headless/ -${JDKHOME}/jre/lib/${MACHINE_ARCH}/headless/libmawt.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/jvm.cfg -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libJdbcOdbc.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libawt.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libcmm.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdcpr.so -@comment ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdeploy.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdt_socket.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libfontmanager.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libhprof.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libinstrument.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libioser12.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjaas_unix.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjava.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.so -@comment ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_jni.so -@comment ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjawt.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjdwp.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjpeg.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsig.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsound.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libmanagement.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libmlib_image.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnative_chmod.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnet.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnio.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/librmi.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libunpack.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libverify.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/libzip.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/motif21/ -${JDKHOME}/jre/lib/${MACHINE_ARCH}/motif21/libmawt.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/native_threads/ -${JDKHOME}/jre/lib/${MACHINE_ARCH}/native_threads/libhpi.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/ -${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/Xusage.txt -${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjsig.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjvm.so -${JDKHOME}/jre/lib/${MACHINE_ARCH}/xawt/ -${JDKHOME}/jre/lib/${MACHINE_ARCH}/xawt/libmawt.so -${JDKHOME}/jre/lib/im/ -${JDKHOME}/jre/lib/im/indicim.jar -${JDKHOME}/jre/lib/im/thaiim.jar -${JDKHOME}/jre/lib/images/ -${JDKHOME}/jre/lib/images/cursors/ -${JDKHOME}/jre/lib/images/cursors/cursors.properties -${JDKHOME}/jre/lib/images/cursors/invalid32x32.gif -${JDKHOME}/jre/lib/images/cursors/motif_CopyDrop32x32.gif -${JDKHOME}/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif -${JDKHOME}/jre/lib/images/cursors/motif_LinkDrop32x32.gif -${JDKHOME}/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif -${JDKHOME}/jre/lib/images/cursors/motif_MoveDrop32x32.gif -${JDKHOME}/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif -@comment ${JDKHOME}/jre/lib/images/icons/ -@comment ${JDKHOME}/jre/lib/images/icons/sun-java.png -@comment ${JDKHOME}/jre/lib/images/icons/sun-java_HighContrast.png -@comment ${JDKHOME}/jre/lib/images/icons/sun-java_HighContrastInverse.png -@comment ${JDKHOME}/jre/lib/images/icons/sun-java_LowContrast.png -@comment ${JDKHOME}/jre/lib/javaws/ -@comment ${JDKHOME}/jre/lib/javaws.jar -@comment ${JDKHOME}/jre/lib/javaws/Java1.5.ico -@comment ${JDKHOME}/jre/lib/javaws/messages.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_de.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_es.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_fr.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_it.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_ja.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_ko.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_sv.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_zh_CN.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_zh_HK.properties -@comment ${JDKHOME}/jre/lib/javaws/messages_zh_TW.properties -@comment ${JDKHOME}/jre/lib/javaws/miniSplash.jpg -${JDKHOME}/jre/lib/jce.jar -${JDKHOME}/jre/lib/jsse.jar -${JDKHOME}/jre/lib/jvm.hprof.txt -@comment ${JDKHOME}/jre/lib/locale/ -@comment ${JDKHOME}/jre/lib/locale/de/ -@comment ${JDKHOME}/jre/lib/locale/de/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/es/ -@comment ${JDKHOME}/jre/lib/locale/es/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/fr/ -@comment ${JDKHOME}/jre/lib/locale/fr/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/it/ -@comment ${JDKHOME}/jre/lib/locale/it/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/ja/ -@comment ${JDKHOME}/jre/lib/locale/ja/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/ko/ -@comment ${JDKHOME}/jre/lib/locale/ko.UTF-8/ -@comment ${JDKHOME}/jre/lib/locale/ko.UTF-8/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/ko/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/sv/ -@comment ${JDKHOME}/jre/lib/locale/sv/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/zh/ -@comment ${JDKHOME}/jre/lib/locale/zh.GBK/ -@comment ${JDKHOME}/jre/lib/locale/zh.GBK/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/zh/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/zh_HK.BIG5HK/ -@comment ${JDKHOME}/jre/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/zh_TW/ -@comment ${JDKHOME}/jre/lib/locale/zh_TW.BIG5/ -@comment ${JDKHOME}/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo -@comment ${JDKHOME}/jre/lib/locale/zh_TW/LC_MESSAGES/ -@comment ${JDKHOME}/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo -${JDKHOME}/jre/lib/logging.properties -${JDKHOME}/jre/lib/management/ -${JDKHOME}/jre/lib/management/jmxremote.access -${JDKHOME}/jre/lib/management/jmxremote.password.template -${JDKHOME}/jre/lib/management/management.properties -${JDKHOME}/jre/lib/management/snmp.acl.template -${JDKHOME}/jre/lib/net.properties -${JDKHOME}/jre/lib/oblique-fonts/ -${JDKHOME}/jre/lib/oblique-fonts/LucidaSansDemiOblique.ttf -${JDKHOME}/jre/lib/oblique-fonts/LucidaSansOblique.ttf -${JDKHOME}/jre/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf -${JDKHOME}/jre/lib/oblique-fonts/LucidaTypewriterOblique.ttf -${JDKHOME}/jre/lib/oblique-fonts/fonts.dir -@comment ${JDKHOME}/jre/lib/plugin.jar -${JDKHOME}/jre/lib/psfont.properties.ja -${JDKHOME}/jre/lib/psfontj2d.properties -${JDKHOME}/jre/lib/rt.jar -${JDKHOME}/jre/lib/security/ -${JDKHOME}/jre/lib/security/US_export_policy.jar -${JDKHOME}/jre/lib/security/cacerts -${JDKHOME}/jre/lib/security/java.policy -${JDKHOME}/jre/lib/security/java.security -@comment ${JDKHOME}/jre/lib/security/javaws.policy -${JDKHOME}/jre/lib/security/local_policy.jar -${JDKHOME}/jre/lib/sound.properties -${JDKHOME}/jre/lib/zi/ -${JDKHOME}/jre/lib/zi/Africa/ -${JDKHOME}/jre/lib/zi/Africa/Abidjan -${JDKHOME}/jre/lib/zi/Africa/Accra -${JDKHOME}/jre/lib/zi/Africa/Addis_Ababa -${JDKHOME}/jre/lib/zi/Africa/Algiers -${JDKHOME}/jre/lib/zi/Africa/Asmera -${JDKHOME}/jre/lib/zi/Africa/Bamako -${JDKHOME}/jre/lib/zi/Africa/Bangui -${JDKHOME}/jre/lib/zi/Africa/Banjul -${JDKHOME}/jre/lib/zi/Africa/Bissau -${JDKHOME}/jre/lib/zi/Africa/Blantyre -${JDKHOME}/jre/lib/zi/Africa/Brazzaville -${JDKHOME}/jre/lib/zi/Africa/Bujumbura -${JDKHOME}/jre/lib/zi/Africa/Cairo -${JDKHOME}/jre/lib/zi/Africa/Casablanca -${JDKHOME}/jre/lib/zi/Africa/Ceuta -${JDKHOME}/jre/lib/zi/Africa/Conakry -${JDKHOME}/jre/lib/zi/Africa/Dakar -${JDKHOME}/jre/lib/zi/Africa/Dar_es_Salaam -${JDKHOME}/jre/lib/zi/Africa/Djibouti -${JDKHOME}/jre/lib/zi/Africa/Douala -${JDKHOME}/jre/lib/zi/Africa/El_Aaiun -${JDKHOME}/jre/lib/zi/Africa/Freetown -${JDKHOME}/jre/lib/zi/Africa/Gaborone -${JDKHOME}/jre/lib/zi/Africa/Harare -${JDKHOME}/jre/lib/zi/Africa/Johannesburg -${JDKHOME}/jre/lib/zi/Africa/Kampala -${JDKHOME}/jre/lib/zi/Africa/Khartoum -${JDKHOME}/jre/lib/zi/Africa/Kigali -${JDKHOME}/jre/lib/zi/Africa/Kinshasa -${JDKHOME}/jre/lib/zi/Africa/Lagos -${JDKHOME}/jre/lib/zi/Africa/Libreville -${JDKHOME}/jre/lib/zi/Africa/Lome -${JDKHOME}/jre/lib/zi/Africa/Luanda -${JDKHOME}/jre/lib/zi/Africa/Lubumbashi -${JDKHOME}/jre/lib/zi/Africa/Lusaka -${JDKHOME}/jre/lib/zi/Africa/Malabo -${JDKHOME}/jre/lib/zi/Africa/Maputo -${JDKHOME}/jre/lib/zi/Africa/Maseru -${JDKHOME}/jre/lib/zi/Africa/Mbabane -${JDKHOME}/jre/lib/zi/Africa/Mogadishu -${JDKHOME}/jre/lib/zi/Africa/Monrovia -${JDKHOME}/jre/lib/zi/Africa/Nairobi -${JDKHOME}/jre/lib/zi/Africa/Ndjamena -${JDKHOME}/jre/lib/zi/Africa/Niamey -${JDKHOME}/jre/lib/zi/Africa/Nouakchott -${JDKHOME}/jre/lib/zi/Africa/Ouagadougou -${JDKHOME}/jre/lib/zi/Africa/Porto-Novo -${JDKHOME}/jre/lib/zi/Africa/Sao_Tome -${JDKHOME}/jre/lib/zi/Africa/Tripoli -${JDKHOME}/jre/lib/zi/Africa/Tunis -${JDKHOME}/jre/lib/zi/Africa/Windhoek -${JDKHOME}/jre/lib/zi/America/ -${JDKHOME}/jre/lib/zi/America/Adak -${JDKHOME}/jre/lib/zi/America/Anchorage -${JDKHOME}/jre/lib/zi/America/Anguilla -${JDKHOME}/jre/lib/zi/America/Antigua -${JDKHOME}/jre/lib/zi/America/Araguaina -${JDKHOME}/jre/lib/zi/America/Argentina/ -${JDKHOME}/jre/lib/zi/America/Argentina/Buenos_Aires -${JDKHOME}/jre/lib/zi/America/Argentina/Catamarca -${JDKHOME}/jre/lib/zi/America/Argentina/Cordoba -${JDKHOME}/jre/lib/zi/America/Argentina/Jujuy -${JDKHOME}/jre/lib/zi/America/Argentina/La_Rioja -${JDKHOME}/jre/lib/zi/America/Argentina/Mendoza -${JDKHOME}/jre/lib/zi/America/Argentina/Rio_Gallegos -${JDKHOME}/jre/lib/zi/America/Argentina/San_Juan -${JDKHOME}/jre/lib/zi/America/Argentina/Tucuman -${JDKHOME}/jre/lib/zi/America/Argentina/Ushuaia -${JDKHOME}/jre/lib/zi/America/Aruba -${JDKHOME}/jre/lib/zi/America/Asuncion -${JDKHOME}/jre/lib/zi/America/Atikokan -${JDKHOME}/jre/lib/zi/America/Bahia -${JDKHOME}/jre/lib/zi/America/Barbados -${JDKHOME}/jre/lib/zi/America/Belem -${JDKHOME}/jre/lib/zi/America/Belize -${JDKHOME}/jre/lib/zi/America/Blanc-Sablon -${JDKHOME}/jre/lib/zi/America/Boa_Vista -${JDKHOME}/jre/lib/zi/America/Bogota -${JDKHOME}/jre/lib/zi/America/Boise -${JDKHOME}/jre/lib/zi/America/Cambridge_Bay -${JDKHOME}/jre/lib/zi/America/Campo_Grande -${JDKHOME}/jre/lib/zi/America/Cancun -${JDKHOME}/jre/lib/zi/America/Caracas -${JDKHOME}/jre/lib/zi/America/Cayenne -${JDKHOME}/jre/lib/zi/America/Cayman -${JDKHOME}/jre/lib/zi/America/Chicago -${JDKHOME}/jre/lib/zi/America/Chihuahua -${JDKHOME}/jre/lib/zi/America/Costa_Rica -${JDKHOME}/jre/lib/zi/America/Cuiaba -${JDKHOME}/jre/lib/zi/America/Curacao -${JDKHOME}/jre/lib/zi/America/Danmarkshavn -${JDKHOME}/jre/lib/zi/America/Dawson -${JDKHOME}/jre/lib/zi/America/Dawson_Creek -${JDKHOME}/jre/lib/zi/America/Denver -${JDKHOME}/jre/lib/zi/America/Detroit -${JDKHOME}/jre/lib/zi/America/Dominica -${JDKHOME}/jre/lib/zi/America/Edmonton -${JDKHOME}/jre/lib/zi/America/Eirunepe -${JDKHOME}/jre/lib/zi/America/El_Salvador -${JDKHOME}/jre/lib/zi/America/Fortaleza -${JDKHOME}/jre/lib/zi/America/Glace_Bay -${JDKHOME}/jre/lib/zi/America/Godthab -${JDKHOME}/jre/lib/zi/America/Goose_Bay -${JDKHOME}/jre/lib/zi/America/Grand_Turk -${JDKHOME}/jre/lib/zi/America/Grenada -${JDKHOME}/jre/lib/zi/America/Guadeloupe -${JDKHOME}/jre/lib/zi/America/Guatemala -${JDKHOME}/jre/lib/zi/America/Guayaquil -${JDKHOME}/jre/lib/zi/America/Guyana -${JDKHOME}/jre/lib/zi/America/Halifax -${JDKHOME}/jre/lib/zi/America/Havana -${JDKHOME}/jre/lib/zi/America/Hermosillo -${JDKHOME}/jre/lib/zi/America/Indiana/ -${JDKHOME}/jre/lib/zi/America/Indiana/Indianapolis -${JDKHOME}/jre/lib/zi/America/Indiana/Knox -${JDKHOME}/jre/lib/zi/America/Indiana/Marengo -${JDKHOME}/jre/lib/zi/America/Indiana/Petersburg -${JDKHOME}/jre/lib/zi/America/Indiana/Vevay -${JDKHOME}/jre/lib/zi/America/Indiana/Vincennes -${JDKHOME}/jre/lib/zi/America/Inuvik -${JDKHOME}/jre/lib/zi/America/Iqaluit -${JDKHOME}/jre/lib/zi/America/Jamaica -${JDKHOME}/jre/lib/zi/America/Juneau -${JDKHOME}/jre/lib/zi/America/Kentucky/ -${JDKHOME}/jre/lib/zi/America/Kentucky/Louisville -${JDKHOME}/jre/lib/zi/America/Kentucky/Monticello -${JDKHOME}/jre/lib/zi/America/La_Paz -${JDKHOME}/jre/lib/zi/America/Lima -${JDKHOME}/jre/lib/zi/America/Los_Angeles -${JDKHOME}/jre/lib/zi/America/Maceio -${JDKHOME}/jre/lib/zi/America/Managua -${JDKHOME}/jre/lib/zi/America/Manaus -${JDKHOME}/jre/lib/zi/America/Martinique -${JDKHOME}/jre/lib/zi/America/Mazatlan -${JDKHOME}/jre/lib/zi/America/Menominee -${JDKHOME}/jre/lib/zi/America/Merida -${JDKHOME}/jre/lib/zi/America/Mexico_City -${JDKHOME}/jre/lib/zi/America/Miquelon -${JDKHOME}/jre/lib/zi/America/Moncton -${JDKHOME}/jre/lib/zi/America/Monterrey -${JDKHOME}/jre/lib/zi/America/Montevideo -${JDKHOME}/jre/lib/zi/America/Montreal -${JDKHOME}/jre/lib/zi/America/Montserrat -${JDKHOME}/jre/lib/zi/America/Nassau -${JDKHOME}/jre/lib/zi/America/New_York -${JDKHOME}/jre/lib/zi/America/Nipigon -${JDKHOME}/jre/lib/zi/America/Nome -${JDKHOME}/jre/lib/zi/America/Noronha -${JDKHOME}/jre/lib/zi/America/North_Dakota/ -${JDKHOME}/jre/lib/zi/America/North_Dakota/Center -${JDKHOME}/jre/lib/zi/America/North_Dakota/New_Salem -${JDKHOME}/jre/lib/zi/America/Panama -${JDKHOME}/jre/lib/zi/America/Pangnirtung -${JDKHOME}/jre/lib/zi/America/Paramaribo -${JDKHOME}/jre/lib/zi/America/Phoenix -${JDKHOME}/jre/lib/zi/America/Port-au-Prince -${JDKHOME}/jre/lib/zi/America/Port_of_Spain -${JDKHOME}/jre/lib/zi/America/Porto_Velho -${JDKHOME}/jre/lib/zi/America/Puerto_Rico -${JDKHOME}/jre/lib/zi/America/Rainy_River -${JDKHOME}/jre/lib/zi/America/Rankin_Inlet -${JDKHOME}/jre/lib/zi/America/Recife -${JDKHOME}/jre/lib/zi/America/Regina -${JDKHOME}/jre/lib/zi/America/Rio_Branco -${JDKHOME}/jre/lib/zi/America/Santiago -${JDKHOME}/jre/lib/zi/America/Santo_Domingo -${JDKHOME}/jre/lib/zi/America/Sao_Paulo -${JDKHOME}/jre/lib/zi/America/Scoresbysund -${JDKHOME}/jre/lib/zi/America/St_Johns -${JDKHOME}/jre/lib/zi/America/St_Kitts -${JDKHOME}/jre/lib/zi/America/St_Lucia -${JDKHOME}/jre/lib/zi/America/St_Thomas -${JDKHOME}/jre/lib/zi/America/St_Vincent -${JDKHOME}/jre/lib/zi/America/Swift_Current -${JDKHOME}/jre/lib/zi/America/Tegucigalpa -${JDKHOME}/jre/lib/zi/America/Thule -${JDKHOME}/jre/lib/zi/America/Thunder_Bay -${JDKHOME}/jre/lib/zi/America/Tijuana -${JDKHOME}/jre/lib/zi/America/Toronto -${JDKHOME}/jre/lib/zi/America/Tortola -${JDKHOME}/jre/lib/zi/America/Vancouver -${JDKHOME}/jre/lib/zi/America/Whitehorse -${JDKHOME}/jre/lib/zi/America/Winnipeg -${JDKHOME}/jre/lib/zi/America/Yakutat -${JDKHOME}/jre/lib/zi/America/Yellowknife -${JDKHOME}/jre/lib/zi/Antarctica/ -${JDKHOME}/jre/lib/zi/Antarctica/Casey -${JDKHOME}/jre/lib/zi/Antarctica/Davis -${JDKHOME}/jre/lib/zi/Antarctica/DumontDUrville -${JDKHOME}/jre/lib/zi/Antarctica/Mawson -${JDKHOME}/jre/lib/zi/Antarctica/McMurdo -${JDKHOME}/jre/lib/zi/Antarctica/Palmer -${JDKHOME}/jre/lib/zi/Antarctica/Rothera -${JDKHOME}/jre/lib/zi/Antarctica/Syowa -${JDKHOME}/jre/lib/zi/Antarctica/Vostok -${JDKHOME}/jre/lib/zi/Asia/ -${JDKHOME}/jre/lib/zi/Asia/Aden -${JDKHOME}/jre/lib/zi/Asia/Almaty -${JDKHOME}/jre/lib/zi/Asia/Amman -${JDKHOME}/jre/lib/zi/Asia/Anadyr -${JDKHOME}/jre/lib/zi/Asia/Aqtau -${JDKHOME}/jre/lib/zi/Asia/Aqtobe -${JDKHOME}/jre/lib/zi/Asia/Ashgabat -${JDKHOME}/jre/lib/zi/Asia/Baghdad -${JDKHOME}/jre/lib/zi/Asia/Bahrain -${JDKHOME}/jre/lib/zi/Asia/Baku -${JDKHOME}/jre/lib/zi/Asia/Bangkok -${JDKHOME}/jre/lib/zi/Asia/Beirut -${JDKHOME}/jre/lib/zi/Asia/Bishkek -${JDKHOME}/jre/lib/zi/Asia/Brunei -${JDKHOME}/jre/lib/zi/Asia/Calcutta -${JDKHOME}/jre/lib/zi/Asia/Choibalsan -${JDKHOME}/jre/lib/zi/Asia/Chongqing -${JDKHOME}/jre/lib/zi/Asia/Colombo -${JDKHOME}/jre/lib/zi/Asia/Damascus -${JDKHOME}/jre/lib/zi/Asia/Dhaka -${JDKHOME}/jre/lib/zi/Asia/Dili -${JDKHOME}/jre/lib/zi/Asia/Dubai -${JDKHOME}/jre/lib/zi/Asia/Dushanbe -${JDKHOME}/jre/lib/zi/Asia/Gaza -${JDKHOME}/jre/lib/zi/Asia/Harbin -${JDKHOME}/jre/lib/zi/Asia/Hong_Kong -${JDKHOME}/jre/lib/zi/Asia/Hovd -${JDKHOME}/jre/lib/zi/Asia/Irkutsk -${JDKHOME}/jre/lib/zi/Asia/Jakarta -${JDKHOME}/jre/lib/zi/Asia/Jayapura -${JDKHOME}/jre/lib/zi/Asia/Jerusalem -${JDKHOME}/jre/lib/zi/Asia/Kabul -${JDKHOME}/jre/lib/zi/Asia/Kamchatka -${JDKHOME}/jre/lib/zi/Asia/Karachi -${JDKHOME}/jre/lib/zi/Asia/Kashgar -${JDKHOME}/jre/lib/zi/Asia/Katmandu -${JDKHOME}/jre/lib/zi/Asia/Krasnoyarsk -${JDKHOME}/jre/lib/zi/Asia/Kuala_Lumpur -${JDKHOME}/jre/lib/zi/Asia/Kuching -${JDKHOME}/jre/lib/zi/Asia/Kuwait -${JDKHOME}/jre/lib/zi/Asia/Macau -${JDKHOME}/jre/lib/zi/Asia/Magadan -${JDKHOME}/jre/lib/zi/Asia/Makassar -${JDKHOME}/jre/lib/zi/Asia/Manila -${JDKHOME}/jre/lib/zi/Asia/Muscat -${JDKHOME}/jre/lib/zi/Asia/Nicosia -${JDKHOME}/jre/lib/zi/Asia/Novosibirsk -${JDKHOME}/jre/lib/zi/Asia/Omsk -${JDKHOME}/jre/lib/zi/Asia/Oral -${JDKHOME}/jre/lib/zi/Asia/Phnom_Penh -${JDKHOME}/jre/lib/zi/Asia/Pontianak -${JDKHOME}/jre/lib/zi/Asia/Pyongyang -${JDKHOME}/jre/lib/zi/Asia/Qatar -${JDKHOME}/jre/lib/zi/Asia/Qyzylorda -${JDKHOME}/jre/lib/zi/Asia/Rangoon -${JDKHOME}/jre/lib/zi/Asia/Riyadh -${JDKHOME}/jre/lib/zi/Asia/Riyadh87 -${JDKHOME}/jre/lib/zi/Asia/Riyadh88 -${JDKHOME}/jre/lib/zi/Asia/Riyadh89 -${JDKHOME}/jre/lib/zi/Asia/Saigon -${JDKHOME}/jre/lib/zi/Asia/Sakhalin -${JDKHOME}/jre/lib/zi/Asia/Samarkand -${JDKHOME}/jre/lib/zi/Asia/Seoul -${JDKHOME}/jre/lib/zi/Asia/Shanghai -${JDKHOME}/jre/lib/zi/Asia/Singapore -${JDKHOME}/jre/lib/zi/Asia/Taipei -${JDKHOME}/jre/lib/zi/Asia/Tashkent -${JDKHOME}/jre/lib/zi/Asia/Tbilisi -${JDKHOME}/jre/lib/zi/Asia/Tehran -${JDKHOME}/jre/lib/zi/Asia/Thimphu -${JDKHOME}/jre/lib/zi/Asia/Tokyo -${JDKHOME}/jre/lib/zi/Asia/Ulaanbaatar -${JDKHOME}/jre/lib/zi/Asia/Urumqi -${JDKHOME}/jre/lib/zi/Asia/Vientiane -${JDKHOME}/jre/lib/zi/Asia/Vladivostok -${JDKHOME}/jre/lib/zi/Asia/Yakutsk -${JDKHOME}/jre/lib/zi/Asia/Yekaterinburg -${JDKHOME}/jre/lib/zi/Asia/Yerevan -${JDKHOME}/jre/lib/zi/Atlantic/ -${JDKHOME}/jre/lib/zi/Atlantic/Azores -${JDKHOME}/jre/lib/zi/Atlantic/Bermuda -${JDKHOME}/jre/lib/zi/Atlantic/Canary -${JDKHOME}/jre/lib/zi/Atlantic/Cape_Verde -${JDKHOME}/jre/lib/zi/Atlantic/Faeroe -${JDKHOME}/jre/lib/zi/Atlantic/Madeira -${JDKHOME}/jre/lib/zi/Atlantic/Reykjavik -${JDKHOME}/jre/lib/zi/Atlantic/South_Georgia -${JDKHOME}/jre/lib/zi/Atlantic/St_Helena -${JDKHOME}/jre/lib/zi/Atlantic/Stanley -${JDKHOME}/jre/lib/zi/Australia/ -${JDKHOME}/jre/lib/zi/Australia/Adelaide -${JDKHOME}/jre/lib/zi/Australia/Brisbane -${JDKHOME}/jre/lib/zi/Australia/Broken_Hill -${JDKHOME}/jre/lib/zi/Australia/Currie -${JDKHOME}/jre/lib/zi/Australia/Darwin -${JDKHOME}/jre/lib/zi/Australia/Hobart -${JDKHOME}/jre/lib/zi/Australia/Lindeman -${JDKHOME}/jre/lib/zi/Australia/Lord_Howe -${JDKHOME}/jre/lib/zi/Australia/Melbourne -${JDKHOME}/jre/lib/zi/Australia/Perth -${JDKHOME}/jre/lib/zi/Australia/Sydney -${JDKHOME}/jre/lib/zi/CET -${JDKHOME}/jre/lib/zi/CST6CDT -${JDKHOME}/jre/lib/zi/EET -${JDKHOME}/jre/lib/zi/EST -${JDKHOME}/jre/lib/zi/EST5EDT -${JDKHOME}/jre/lib/zi/Etc/ -${JDKHOME}/jre/lib/zi/Etc/GMT -${JDKHOME}/jre/lib/zi/Etc/GMT+1 -${JDKHOME}/jre/lib/zi/Etc/GMT+10 -${JDKHOME}/jre/lib/zi/Etc/GMT+11 -${JDKHOME}/jre/lib/zi/Etc/GMT+12 -${JDKHOME}/jre/lib/zi/Etc/GMT+2 -${JDKHOME}/jre/lib/zi/Etc/GMT+3 -${JDKHOME}/jre/lib/zi/Etc/GMT+4 -${JDKHOME}/jre/lib/zi/Etc/GMT+5 -${JDKHOME}/jre/lib/zi/Etc/GMT+6 -${JDKHOME}/jre/lib/zi/Etc/GMT+7 -${JDKHOME}/jre/lib/zi/Etc/GMT+8 -${JDKHOME}/jre/lib/zi/Etc/GMT+9 -${JDKHOME}/jre/lib/zi/Etc/GMT-1 -${JDKHOME}/jre/lib/zi/Etc/GMT-10 -${JDKHOME}/jre/lib/zi/Etc/GMT-11 -${JDKHOME}/jre/lib/zi/Etc/GMT-12 -${JDKHOME}/jre/lib/zi/Etc/GMT-13 -${JDKHOME}/jre/lib/zi/Etc/GMT-14 -${JDKHOME}/jre/lib/zi/Etc/GMT-2 -${JDKHOME}/jre/lib/zi/Etc/GMT-3 -${JDKHOME}/jre/lib/zi/Etc/GMT-4 -${JDKHOME}/jre/lib/zi/Etc/GMT-5 -${JDKHOME}/jre/lib/zi/Etc/GMT-6 -${JDKHOME}/jre/lib/zi/Etc/GMT-7 -${JDKHOME}/jre/lib/zi/Etc/GMT-8 -${JDKHOME}/jre/lib/zi/Etc/GMT-9 -${JDKHOME}/jre/lib/zi/Etc/UCT -${JDKHOME}/jre/lib/zi/Etc/UTC -${JDKHOME}/jre/lib/zi/Europe/ -${JDKHOME}/jre/lib/zi/Europe/Amsterdam -${JDKHOME}/jre/lib/zi/Europe/Andorra -${JDKHOME}/jre/lib/zi/Europe/Athens -${JDKHOME}/jre/lib/zi/Europe/Belgrade -${JDKHOME}/jre/lib/zi/Europe/Berlin -${JDKHOME}/jre/lib/zi/Europe/Brussels -${JDKHOME}/jre/lib/zi/Europe/Bucharest -${JDKHOME}/jre/lib/zi/Europe/Budapest -${JDKHOME}/jre/lib/zi/Europe/Chisinau -${JDKHOME}/jre/lib/zi/Europe/Copenhagen -${JDKHOME}/jre/lib/zi/Europe/Dublin -${JDKHOME}/jre/lib/zi/Europe/Gibraltar -${JDKHOME}/jre/lib/zi/Europe/Helsinki -${JDKHOME}/jre/lib/zi/Europe/Istanbul -${JDKHOME}/jre/lib/zi/Europe/Kaliningrad -${JDKHOME}/jre/lib/zi/Europe/Kiev -${JDKHOME}/jre/lib/zi/Europe/Lisbon -${JDKHOME}/jre/lib/zi/Europe/London -${JDKHOME}/jre/lib/zi/Europe/Luxembourg -${JDKHOME}/jre/lib/zi/Europe/Madrid -${JDKHOME}/jre/lib/zi/Europe/Malta -${JDKHOME}/jre/lib/zi/Europe/Minsk -${JDKHOME}/jre/lib/zi/Europe/Monaco -${JDKHOME}/jre/lib/zi/Europe/Moscow -${JDKHOME}/jre/lib/zi/Europe/Oslo -${JDKHOME}/jre/lib/zi/Europe/Paris -${JDKHOME}/jre/lib/zi/Europe/Prague -${JDKHOME}/jre/lib/zi/Europe/Riga -${JDKHOME}/jre/lib/zi/Europe/Rome -${JDKHOME}/jre/lib/zi/Europe/Samara -${JDKHOME}/jre/lib/zi/Europe/Simferopol -${JDKHOME}/jre/lib/zi/Europe/Sofia -${JDKHOME}/jre/lib/zi/Europe/Stockholm -${JDKHOME}/jre/lib/zi/Europe/Tallinn -${JDKHOME}/jre/lib/zi/Europe/Tirane -${JDKHOME}/jre/lib/zi/Europe/Uzhgorod -${JDKHOME}/jre/lib/zi/Europe/Vaduz -${JDKHOME}/jre/lib/zi/Europe/Vienna -${JDKHOME}/jre/lib/zi/Europe/Vilnius -${JDKHOME}/jre/lib/zi/Europe/Volgograd -${JDKHOME}/jre/lib/zi/Europe/Warsaw -${JDKHOME}/jre/lib/zi/Europe/Zaporozhye -${JDKHOME}/jre/lib/zi/Europe/Zurich -${JDKHOME}/jre/lib/zi/GMT -${JDKHOME}/jre/lib/zi/HST -${JDKHOME}/jre/lib/zi/Indian/ -${JDKHOME}/jre/lib/zi/Indian/Antananarivo -${JDKHOME}/jre/lib/zi/Indian/Chagos -${JDKHOME}/jre/lib/zi/Indian/Christmas -${JDKHOME}/jre/lib/zi/Indian/Cocos -${JDKHOME}/jre/lib/zi/Indian/Comoro -${JDKHOME}/jre/lib/zi/Indian/Kerguelen -${JDKHOME}/jre/lib/zi/Indian/Mahe -${JDKHOME}/jre/lib/zi/Indian/Maldives -${JDKHOME}/jre/lib/zi/Indian/Mauritius -${JDKHOME}/jre/lib/zi/Indian/Mayotte -${JDKHOME}/jre/lib/zi/Indian/Reunion -${JDKHOME}/jre/lib/zi/MET -${JDKHOME}/jre/lib/zi/MST -${JDKHOME}/jre/lib/zi/MST7MDT -${JDKHOME}/jre/lib/zi/PST8PDT -${JDKHOME}/jre/lib/zi/Pacific/ -${JDKHOME}/jre/lib/zi/Pacific/Apia -${JDKHOME}/jre/lib/zi/Pacific/Auckland -${JDKHOME}/jre/lib/zi/Pacific/Chatham -${JDKHOME}/jre/lib/zi/Pacific/Easter -${JDKHOME}/jre/lib/zi/Pacific/Efate -${JDKHOME}/jre/lib/zi/Pacific/Enderbury -${JDKHOME}/jre/lib/zi/Pacific/Fakaofo -${JDKHOME}/jre/lib/zi/Pacific/Fiji -${JDKHOME}/jre/lib/zi/Pacific/Funafuti -${JDKHOME}/jre/lib/zi/Pacific/Galapagos -${JDKHOME}/jre/lib/zi/Pacific/Gambier -${JDKHOME}/jre/lib/zi/Pacific/Guadalcanal -${JDKHOME}/jre/lib/zi/Pacific/Guam -${JDKHOME}/jre/lib/zi/Pacific/Honolulu -${JDKHOME}/jre/lib/zi/Pacific/Johnston -${JDKHOME}/jre/lib/zi/Pacific/Kiritimati -${JDKHOME}/jre/lib/zi/Pacific/Kosrae -${JDKHOME}/jre/lib/zi/Pacific/Kwajalein -${JDKHOME}/jre/lib/zi/Pacific/Majuro -${JDKHOME}/jre/lib/zi/Pacific/Marquesas -${JDKHOME}/jre/lib/zi/Pacific/Midway -${JDKHOME}/jre/lib/zi/Pacific/Nauru -${JDKHOME}/jre/lib/zi/Pacific/Niue -${JDKHOME}/jre/lib/zi/Pacific/Norfolk -${JDKHOME}/jre/lib/zi/Pacific/Noumea -${JDKHOME}/jre/lib/zi/Pacific/Pago_Pago -${JDKHOME}/jre/lib/zi/Pacific/Palau -${JDKHOME}/jre/lib/zi/Pacific/Pitcairn -${JDKHOME}/jre/lib/zi/Pacific/Ponape -${JDKHOME}/jre/lib/zi/Pacific/Port_Moresby -${JDKHOME}/jre/lib/zi/Pacific/Rarotonga -${JDKHOME}/jre/lib/zi/Pacific/Saipan -${JDKHOME}/jre/lib/zi/Pacific/Tahiti -${JDKHOME}/jre/lib/zi/Pacific/Tarawa -${JDKHOME}/jre/lib/zi/Pacific/Tongatapu -${JDKHOME}/jre/lib/zi/Pacific/Truk -${JDKHOME}/jre/lib/zi/Pacific/Wake -${JDKHOME}/jre/lib/zi/Pacific/Wallis -${JDKHOME}/jre/lib/zi/SystemV/ -${JDKHOME}/jre/lib/zi/SystemV/AST4 -${JDKHOME}/jre/lib/zi/SystemV/AST4ADT -${JDKHOME}/jre/lib/zi/SystemV/CST6 -${JDKHOME}/jre/lib/zi/SystemV/CST6CDT -${JDKHOME}/jre/lib/zi/SystemV/EST5 -${JDKHOME}/jre/lib/zi/SystemV/EST5EDT -${JDKHOME}/jre/lib/zi/SystemV/HST10 -${JDKHOME}/jre/lib/zi/SystemV/MST7 -${JDKHOME}/jre/lib/zi/SystemV/MST7MDT -${JDKHOME}/jre/lib/zi/SystemV/PST8 -${JDKHOME}/jre/lib/zi/SystemV/PST8PDT -${JDKHOME}/jre/lib/zi/SystemV/YST9 -${JDKHOME}/jre/lib/zi/SystemV/YST9YDT -${JDKHOME}/jre/lib/zi/WET -${JDKHOME}/jre/lib/zi/ZoneInfoMappings -@comment ${JDKHOME}/jre/plugin/ -@comment ${JDKHOME}/jre/plugin/desktop/ -@comment ${JDKHOME}/jre/plugin/desktop/sun_java.desktop -@comment ${JDKHOME}/jre/plugin/desktop/sun_java.png -@comment ${JDKHOME}/jre/plugin/${MACHINE_ARCH}/ -@comment ${JDKHOME}/jre/plugin/${MACHINE_ARCH}/ns7/ -@comment ${JDKHOME}/jre/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji.so -${JDKHOME}/lib/ -${JDKHOME}/lib/dt.jar -@comment ${JDKHOME}/lib/htmlconverter.jar -${JDKHOME}/lib/ir.idl -${JDKHOME}/lib/jconsole.jar -${JDKHOME}/lib/orb.idl -${JDKHOME}/lib/tools.jar -@mandir ${JDKHOME}/man/ -${JDKHOME}/man/man1/ -@man ${JDKHOME}/man/man1/appletviewer.1 -@man ${JDKHOME}/man/man1/apt.1 -@man ${JDKHOME}/man/man1/extcheck.1 -@man ${JDKHOME}/man/man1/idlj.1 -@man ${JDKHOME}/man/man1/jar.1 -@man ${JDKHOME}/man/man1/jarsigner.1 -@man ${JDKHOME}/man/man1/java.1 -@man ${JDKHOME}/man/man1/javac.1 -@man ${JDKHOME}/man/man1/javadoc.1 -@man ${JDKHOME}/man/man1/javah.1 -@man ${JDKHOME}/man/man1/javap.1 -@comment @man ${JDKHOME}/man/man1/javaws.1 -@man ${JDKHOME}/man/man1/jconsole.1 -@man ${JDKHOME}/man/man1/jdb.1 -@man ${JDKHOME}/man/man1/jinfo.1 -@man ${JDKHOME}/man/man1/jmap.1 -@man ${JDKHOME}/man/man1/jps.1 -@man ${JDKHOME}/man/man1/jsadebugd.1 -@man ${JDKHOME}/man/man1/jstack.1 -@man ${JDKHOME}/man/man1/jstat.1 -@man ${JDKHOME}/man/man1/jstatd.1 -@man ${JDKHOME}/man/man1/keytool.1 -@man ${JDKHOME}/man/man1/kinit.1 -@man ${JDKHOME}/man/man1/klist.1 -@man ${JDKHOME}/man/man1/ktab.1 -@man ${JDKHOME}/man/man1/native2ascii.1 -@man ${JDKHOME}/man/man1/orbd.1 -@man ${JDKHOME}/man/man1/pack200.1 -@man ${JDKHOME}/man/man1/policytool.1 -@man ${JDKHOME}/man/man1/rmic.1 -@man ${JDKHOME}/man/man1/rmid.1 -@man ${JDKHOME}/man/man1/rmiregistry.1 -@man ${JDKHOME}/man/man1/serialver.1 -@man ${JDKHOME}/man/man1/servertool.1 -@man ${JDKHOME}/man/man1/tnameserv.1 -@man ${JDKHOME}/man/man1/unpack200.1 -@comment ${JDKHOME}/man/whatis.db -${JDKHOME}/sample/ -@comment ${JDKHOME}/sample/jnlp/ -@comment ${JDKHOME}/sample/jnlp/corba/ -@comment ${JDKHOME}/sample/jnlp/corba/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/corba/README -@comment ${JDKHOME}/sample/jnlp/corba/src/ -@comment ${JDKHOME}/sample/jnlp/corba/src/core/ -@comment ${JDKHOME}/sample/jnlp/corba/src/core/HelloClient.java -@comment ${JDKHOME}/sample/jnlp/corba/src/core/HelloServer.java -@comment ${JDKHOME}/sample/jnlp/corba/src/stubs/ -@comment ${JDKHOME}/sample/jnlp/corba/src/stubs/HelloImpl.java -@comment ${JDKHOME}/sample/jnlp/corba/src/stubs/HelloInterface.java -@comment ${JDKHOME}/sample/jnlp/corba/war/ -@comment ${JDKHOME}/sample/jnlp/corba/war/WEB-INF/ -@comment ${JDKHOME}/sample/jnlp/corba/war/WEB-INF/web.xml -@comment ${JDKHOME}/sample/jnlp/corba/war/app/ -@comment ${JDKHOME}/sample/jnlp/corba/war/app/helloworld.jnlp -@comment ${JDKHOME}/sample/jnlp/corba/war/index.html -@comment ${JDKHOME}/sample/jnlp/jreinstaller/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/README -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/jreinstallers/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/jreinstallers/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/jreinstallers/j2re1_4_2/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/jreinstallers/j2re1_4_2/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/jreinstallers/resources/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/jreinstallers/resources/javaws-1_0_1-j2re-1_4_2-linux-i586.jnlp -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/jreinstallers/resources/version.xml_linux-i586_1.4.2 -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/minclude/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/linux/minclude/linux.defs -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/share/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/share/Platform.gmk -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/share/jreinstallers/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/share/jreinstallers/bundle.unix.gmk -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/share/jreinstallers/components.gmk -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/share/jreinstallers/installer.gmk -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/jreinstallers/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/jreinstallers/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/jreinstallers/j2re1_4_2/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/jreinstallers/j2re1_4_2/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/jreinstallers/resources/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/jreinstallers/resources/javaws-1_0_1-j2re-1_4_2-solaris-sparc.jnlp -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/jreinstallers/resources/version.xml_solaris-sparc_1.4.2 -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/minclude/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/solaris/minclude/solaris.defs -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/jreinstallers/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/jreinstallers/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/jreinstallers/bundle.win.gmk -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/jreinstallers/j2re1_4_2/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/jreinstallers/j2re1_4_2/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/jreinstallers/resources/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/jreinstallers/resources/javaws-1_0_1-j2re-1_4_2-windows-i586.jnlp -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/jreinstallers/resources/version.xml_windows-i586_1.4.2 -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/minclude/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/build/win32/minclude/windows.defs -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/Config.java -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/Main.java -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/SolarisInstaller.java -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/WinRegistry.java -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/WindowsInstaller.java -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings_de.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings_es.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings_fr.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings_it.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings_ja.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings_ko.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings_sv.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings_zh_CN.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/strings_zh_TW.properties -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/share/classes/jnlp/sample/JreInstaller/resources/sunLogo.gif -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/win32/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/win32/jreinstallers/ -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/win32/jreinstallers/WindowsInstaller.c -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/win32/jreinstallers/registry.cpp -@comment ${JDKHOME}/sample/jnlp/jreinstaller/src/win32/jreinstallers/versionChecker.c -@comment ${JDKHOME}/sample/jnlp/raf/ -@comment ${JDKHOME}/sample/jnlp/raf/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/raf/README -@comment ${JDKHOME}/sample/jnlp/raf/src/ -@comment ${JDKHOME}/sample/jnlp/raf/src/randomFile.java -@comment ${JDKHOME}/sample/jnlp/raf/war/ -@comment ${JDKHOME}/sample/jnlp/raf/war/WEB-INF/ -@comment ${JDKHOME}/sample/jnlp/raf/war/WEB-INF/web.xml -@comment ${JDKHOME}/sample/jnlp/raf/war/app/ -@comment ${JDKHOME}/sample/jnlp/raf/war/app/randomFile.jnlp -@comment ${JDKHOME}/sample/jnlp/raf/war/index.html -@comment ${JDKHOME}/sample/jnlp/servlet/ -@comment ${JDKHOME}/sample/jnlp/servlet/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/servlet/README -@comment ${JDKHOME}/sample/jnlp/servlet/jardiff.jar -@comment ${JDKHOME}/sample/jnlp/servlet/jnlp-servlet.jar -@comment ${JDKHOME}/sample/jnlp/servlet/jnlp.jar -@comment ${JDKHOME}/sample/jnlp/servlet/src/ -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/ -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/ -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/ -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/jardiff/ -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/jardiff/JarDiff.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/jardiff/JarDiffConstants.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/jardiff/JarDiffPatcher.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/jardiff/Patcher.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/jardiff/resources/ -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/jardiff/resources/strings.properties -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/ -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/DownloadRequest.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/DownloadResponse.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/ErrorResponseException.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/JarDiffHandler.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/JnlpDownloadServlet.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/JnlpFileHandler.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/JnlpResource.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/Logger.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/ResourceCatalog.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/XMLAttribute.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/XMLNode.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/XMLParsing.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/resources/ -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/servlet/resources/strings.properties -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/util/ -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/util/VersionID.java -@comment ${JDKHOME}/sample/jnlp/servlet/src/classes/jnlp/sample/util/VersionString.java -@comment ${JDKHOME}/sample/jnlp/webpad/ -@comment ${JDKHOME}/sample/jnlp/webpad/GNUmakefile -@comment ${JDKHOME}/sample/jnlp/webpad/README -@comment ${JDKHOME}/sample/jnlp/webpad/src/ -@comment ${JDKHOME}/sample/jnlp/webpad/src/servlet/ -@comment ${JDKHOME}/sample/jnlp/webpad/src/servlet/TxtServlet.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/ -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/AboutAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/ClipboardHandler.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/CopyAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/CutAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/ExitAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/FileHandler.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/HelpAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/HelpHandler.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/JLFAbstractAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/OpenAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/PasteAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/PrintAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/PublishAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/SaveAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/SaveAsAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/ShowAction.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/WebHandler.java -@comment ${JDKHOME}/sample/jnlp/webpad/src/version1/WebPad.java -@comment ${JDKHOME}/sample/jnlp/webpad/war/ -@comment ${JDKHOME}/sample/jnlp/webpad/war/WEB-INF/ -@comment ${JDKHOME}/sample/jnlp/webpad/war/WEB-INF/web.xml -@comment ${JDKHOME}/sample/jnlp/webpad/war/app/ -@comment ${JDKHOME}/sample/jnlp/webpad/war/app/README -@comment ${JDKHOME}/sample/jnlp/webpad/war/app/holidays__V1.0.jar -@comment ${JDKHOME}/sample/jnlp/webpad/war/app/javahelp.jnlp -@comment ${JDKHOME}/sample/jnlp/webpad/war/app/jhcore__V1.0.jar -@comment ${JDKHOME}/sample/jnlp/webpad/war/app/jlfgr__V1.0.jar -@comment ${JDKHOME}/sample/jnlp/webpad/war/app/version.xml -@comment ${JDKHOME}/sample/jnlp/webpad/war/app/webpad.jnlp -@comment ${JDKHOME}/sample/jnlp/webpad/war/index.html -${JDKHOME}/sample/nio/ -${JDKHOME}/sample/nio/server/ -${JDKHOME}/sample/nio/server/AcceptHandler.java -${JDKHOME}/sample/nio/server/Acceptor.java -${JDKHOME}/sample/nio/server/B1.java -${JDKHOME}/sample/nio/server/BN.java -${JDKHOME}/sample/nio/server/BP.java -${JDKHOME}/sample/nio/server/ChannelIO.java -${JDKHOME}/sample/nio/server/ChannelIOSecure.java -${JDKHOME}/sample/nio/server/Content.java -${JDKHOME}/sample/nio/server/Dispatcher.java -${JDKHOME}/sample/nio/server/Dispatcher1.java -${JDKHOME}/sample/nio/server/DispatcherN.java -${JDKHOME}/sample/nio/server/FileContent.java -${JDKHOME}/sample/nio/server/Handler.java -${JDKHOME}/sample/nio/server/MalformedRequestException.java -${JDKHOME}/sample/nio/server/N1.java -${JDKHOME}/sample/nio/server/N2.java -${JDKHOME}/sample/nio/server/README.txt -${JDKHOME}/sample/nio/server/Reply.java -${JDKHOME}/sample/nio/server/Request.java -${JDKHOME}/sample/nio/server/RequestHandler.java -${JDKHOME}/sample/nio/server/RequestServicer.java -${JDKHOME}/sample/nio/server/Sendable.java -${JDKHOME}/sample/nio/server/Server.java -${JDKHOME}/sample/nio/server/StringContent.java -${JDKHOME}/sample/nio/server/URLDumper.java -${JDKHOME}/src.zip diff --git a/devel/jdk/1.7/pkg/PLIST-jre b/devel/jdk/1.7/pkg/PLIST-jre new file mode 100644 index 00000000000..c44d3005800 --- /dev/null +++ b/devel/jdk/1.7/pkg/PLIST-jre @@ -0,0 +1,609 @@ +@comment $OpenBSD: PLIST-jre,v 1.1 2007/09/06 15:46:20 kurt Exp $ +@option no-default-conflict +@conflict jre->=1.7,<1.8 +${JREHOME}/ +${JREHOME}/COPYRIGHT +${JREHOME}/LICENSE +${JREHOME}/README +${JREHOME}/Welcome.html +${JREHOME}/bin/ +${JREHOME}/bin/java +${JREHOME}/bin/keytool +${JREHOME}/bin/orbd +${JREHOME}/bin/pack200 +${JREHOME}/bin/policytool +${JREHOME}/bin/rmid +${JREHOME}/bin/rmiregistry +${JREHOME}/bin/servertool +${JREHOME}/bin/tnameserv +${JREHOME}/bin/unpack200 +${JREHOME}/lib/ +${JREHOME}/lib/${MACHINE_ARCH}/ +${JREHOME}/lib/${MACHINE_ARCH}/headless/ +${JREHOME}/lib/${MACHINE_ARCH}/headless/libmawt.so +${JREHOME}/lib/${MACHINE_ARCH}/jexec +${JREHOME}/lib/${MACHINE_ARCH}/jli/ +${JREHOME}/lib/${MACHINE_ARCH}/jli/libjli.so +${JREHOME}/lib/${MACHINE_ARCH}/jvm.cfg +${JREHOME}/lib/${MACHINE_ARCH}/libJdbcOdbc.so +${JREHOME}/lib/${MACHINE_ARCH}/libawt.so +${JREHOME}/lib/${MACHINE_ARCH}/libdcpr.so +${JREHOME}/lib/${MACHINE_ARCH}/libdt_socket.so +${JREHOME}/lib/${MACHINE_ARCH}/libfontmanager.so +${JREHOME}/lib/${MACHINE_ARCH}/libhprof.so +${JREHOME}/lib/${MACHINE_ARCH}/libinstrument.so +${JREHOME}/lib/${MACHINE_ARCH}/libioser12.so +${JREHOME}/lib/${MACHINE_ARCH}/libj2gss.so +${JREHOME}/lib/${MACHINE_ARCH}/libj2pcsc.so +${JREHOME}/lib/${MACHINE_ARCH}/libj2pkcs11.so +${JREHOME}/lib/${MACHINE_ARCH}/libjaas_unix.so +${JREHOME}/lib/${MACHINE_ARCH}/libjava.so +${JREHOME}/lib/${MACHINE_ARCH}/libjava_crw_demo.so +${JREHOME}/lib/${MACHINE_ARCH}/libjawt.so +${JREHOME}/lib/${MACHINE_ARCH}/libjdwp.so +${JREHOME}/lib/${MACHINE_ARCH}/libjpeg.so +${JREHOME}/lib/${MACHINE_ARCH}/libjsig.so +${JREHOME}/lib/${MACHINE_ARCH}/libjsound.so +${JREHOME}/lib/${MACHINE_ARCH}/libkcms.so +${JREHOME}/lib/${MACHINE_ARCH}/libmanagement.so +${JREHOME}/lib/${MACHINE_ARCH}/libmlib_image.so +${JREHOME}/lib/${MACHINE_ARCH}/libnet.so +${JREHOME}/lib/${MACHINE_ARCH}/libnio.so +${JREHOME}/lib/${MACHINE_ARCH}/libnpt.so +${JREHOME}/lib/${MACHINE_ARCH}/librmi.so +${JREHOME}/lib/${MACHINE_ARCH}/libsplashscreen.so +${JREHOME}/lib/${MACHINE_ARCH}/libunpack.so +${JREHOME}/lib/${MACHINE_ARCH}/libverify.so +${JREHOME}/lib/${MACHINE_ARCH}/libzip.so +${JREHOME}/lib/${MACHINE_ARCH}/motif21/ +${JREHOME}/lib/${MACHINE_ARCH}/motif21/libmawt.so +${JREHOME}/lib/${MACHINE_ARCH}/native_threads/ +${JREHOME}/lib/${MACHINE_ARCH}/native_threads/libhpi.so +${JREHOME}/lib/${MACHINE_ARCH}/server/ +${JREHOME}/lib/${MACHINE_ARCH}/server/Xusage.txt +${JREHOME}/lib/${MACHINE_ARCH}/server/libjsig.so +${JREHOME}/lib/${MACHINE_ARCH}/server/libjvm.so +${JREHOME}/lib/${MACHINE_ARCH}/xawt/ +${JREHOME}/lib/${MACHINE_ARCH}/xawt/libmawt.so +${JREHOME}/lib/applet/ +${JREHOME}/lib/audio/ +${JREHOME}/lib/audio/soundbank.gm +${JREHOME}/lib/calendars.properties +${JREHOME}/lib/charsets.jar +${JREHOME}/lib/classlist +${JREHOME}/lib/cmm/ +${JREHOME}/lib/cmm/CIEXYZ.pf +${JREHOME}/lib/cmm/GRAY.pf +${JREHOME}/lib/cmm/LINEAR_RGB.pf +${JREHOME}/lib/cmm/PYCC.pf +${JREHOME}/lib/cmm/sRGB.pf +${JREHOME}/lib/content-types.properties +${JREHOME}/lib/currency.data +${JREHOME}/lib/ext/ +${JREHOME}/lib/ext/dnsns.jar +${JREHOME}/lib/ext/localedata.jar +${JREHOME}/lib/ext/meta-index +${JREHOME}/lib/ext/sunjce_provider.jar +${JREHOME}/lib/ext/sunpkcs11.jar +${JREHOME}/lib/flavormap.properties +${JREHOME}/lib/fontconfig.bfc +${JREHOME}/lib/fontconfig.properties.src +${JREHOME}/lib/fonts/ +${JREHOME}/lib/fonts/LucidaBrightDemiBold.ttf +${JREHOME}/lib/fonts/LucidaBrightDemiItalic.ttf +${JREHOME}/lib/fonts/LucidaBrightItalic.ttf +${JREHOME}/lib/fonts/LucidaBrightRegular.ttf +${JREHOME}/lib/fonts/LucidaSansDemiBold.ttf +${JREHOME}/lib/fonts/LucidaSansRegular.ttf +${JREHOME}/lib/fonts/LucidaTypewriterBold.ttf +${JREHOME}/lib/fonts/LucidaTypewriterRegular.ttf +${JREHOME}/lib/fonts/fonts.dir +${JREHOME}/lib/im/ +${JREHOME}/lib/im/indicim.jar +${JREHOME}/lib/im/thaiim.jar +${JREHOME}/lib/images/ +${JREHOME}/lib/images/cursors/ +${JREHOME}/lib/images/cursors/cursors.properties +${JREHOME}/lib/images/cursors/invalid32x32.gif +${JREHOME}/lib/images/cursors/motif_CopyDrop32x32.gif +${JREHOME}/lib/images/cursors/motif_CopyNoDrop32x32.gif +${JREHOME}/lib/images/cursors/motif_LinkDrop32x32.gif +${JREHOME}/lib/images/cursors/motif_LinkNoDrop32x32.gif +${JREHOME}/lib/images/cursors/motif_MoveDrop32x32.gif +${JREHOME}/lib/images/cursors/motif_MoveNoDrop32x32.gif +${JREHOME}/lib/jce.jar +${JREHOME}/lib/jsse.jar +${JREHOME}/lib/jvm.hprof.txt +${JREHOME}/lib/logging.properties +${JREHOME}/lib/management/ +${JREHOME}/lib/management-agent.jar +${JREHOME}/lib/management/jmxremote.access +${JREHOME}/lib/management/jmxremote.password.template +${JREHOME}/lib/management/management.properties +${JREHOME}/lib/management/snmp.acl.template +${JREHOME}/lib/meta-index +${JREHOME}/lib/net.properties +${JREHOME}/lib/oblique-fonts/ +${JREHOME}/lib/oblique-fonts/LucidaSansDemiOblique.ttf +${JREHOME}/lib/oblique-fonts/LucidaSansOblique.ttf +${JREHOME}/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf +${JREHOME}/lib/oblique-fonts/LucidaTypewriterOblique.ttf +${JREHOME}/lib/oblique-fonts/fonts.dir +${JREHOME}/lib/psfont.properties.ja +${JREHOME}/lib/psfontj2d.properties +${JREHOME}/lib/resources.jar +${JREHOME}/lib/rt.jar +${JREHOME}/lib/security/ +${JREHOME}/lib/security/US_export_policy.jar +${JREHOME}/lib/security/cacerts +${JREHOME}/lib/security/java.policy +${JREHOME}/lib/security/java.security +${JREHOME}/lib/security/local_policy.jar +${JREHOME}/lib/sound.properties +${JREHOME}/lib/zi/ +${JREHOME}/lib/zi/Africa/ +${JREHOME}/lib/zi/Africa/Abidjan +${JREHOME}/lib/zi/Africa/Accra +${JREHOME}/lib/zi/Africa/Addis_Ababa +${JREHOME}/lib/zi/Africa/Algiers +${JREHOME}/lib/zi/Africa/Asmara +${JREHOME}/lib/zi/Africa/Bamako +${JREHOME}/lib/zi/Africa/Bangui +${JREHOME}/lib/zi/Africa/Banjul +${JREHOME}/lib/zi/Africa/Bissau +${JREHOME}/lib/zi/Africa/Blantyre +${JREHOME}/lib/zi/Africa/Brazzaville +${JREHOME}/lib/zi/Africa/Bujumbura +${JREHOME}/lib/zi/Africa/Cairo +${JREHOME}/lib/zi/Africa/Casablanca +${JREHOME}/lib/zi/Africa/Ceuta +${JREHOME}/lib/zi/Africa/Conakry +${JREHOME}/lib/zi/Africa/Dakar +${JREHOME}/lib/zi/Africa/Dar_es_Salaam +${JREHOME}/lib/zi/Africa/Djibouti +${JREHOME}/lib/zi/Africa/Douala +${JREHOME}/lib/zi/Africa/El_Aaiun +${JREHOME}/lib/zi/Africa/Freetown +${JREHOME}/lib/zi/Africa/Gaborone +${JREHOME}/lib/zi/Africa/Harare +${JREHOME}/lib/zi/Africa/Johannesburg +${JREHOME}/lib/zi/Africa/Kampala +${JREHOME}/lib/zi/Africa/Khartoum +${JREHOME}/lib/zi/Africa/Kigali +${JREHOME}/lib/zi/Africa/Kinshasa +${JREHOME}/lib/zi/Africa/Lagos +${JREHOME}/lib/zi/Africa/Libreville +${JREHOME}/lib/zi/Africa/Lome +${JREHOME}/lib/zi/Africa/Luanda +${JREHOME}/lib/zi/Africa/Lubumbashi +${JREHOME}/lib/zi/Africa/Lusaka +${JREHOME}/lib/zi/Africa/Malabo +${JREHOME}/lib/zi/Africa/Maputo +${JREHOME}/lib/zi/Africa/Maseru +${JREHOME}/lib/zi/Africa/Mbabane +${JREHOME}/lib/zi/Africa/Mogadishu +${JREHOME}/lib/zi/Africa/Monrovia +${JREHOME}/lib/zi/Africa/Nairobi +${JREHOME}/lib/zi/Africa/Ndjamena +${JREHOME}/lib/zi/Africa/Niamey +${JREHOME}/lib/zi/Africa/Nouakchott +${JREHOME}/lib/zi/Africa/Ouagadougou +${JREHOME}/lib/zi/Africa/Porto-Novo +${JREHOME}/lib/zi/Africa/Sao_Tome +${JREHOME}/lib/zi/Africa/Tripoli +${JREHOME}/lib/zi/Africa/Tunis +${JREHOME}/lib/zi/Africa/Windhoek +${JREHOME}/lib/zi/America/ +${JREHOME}/lib/zi/America/Adak +${JREHOME}/lib/zi/America/Anchorage +${JREHOME}/lib/zi/America/Anguilla +${JREHOME}/lib/zi/America/Antigua +${JREHOME}/lib/zi/America/Araguaina +${JREHOME}/lib/zi/America/Argentina/ +${JREHOME}/lib/zi/America/Argentina/Buenos_Aires +${JREHOME}/lib/zi/America/Argentina/Catamarca +${JREHOME}/lib/zi/America/Argentina/Cordoba +${JREHOME}/lib/zi/America/Argentina/Jujuy +${JREHOME}/lib/zi/America/Argentina/La_Rioja +${JREHOME}/lib/zi/America/Argentina/Mendoza +${JREHOME}/lib/zi/America/Argentina/Rio_Gallegos +${JREHOME}/lib/zi/America/Argentina/San_Juan +${JREHOME}/lib/zi/America/Argentina/Tucuman +${JREHOME}/lib/zi/America/Argentina/Ushuaia +${JREHOME}/lib/zi/America/Aruba +${JREHOME}/lib/zi/America/Asuncion +${JREHOME}/lib/zi/America/Atikokan +${JREHOME}/lib/zi/America/Bahia +${JREHOME}/lib/zi/America/Barbados +${JREHOME}/lib/zi/America/Belem +${JREHOME}/lib/zi/America/Belize +${JREHOME}/lib/zi/America/Blanc-Sablon +${JREHOME}/lib/zi/America/Boa_Vista +${JREHOME}/lib/zi/America/Bogota +${JREHOME}/lib/zi/America/Boise +${JREHOME}/lib/zi/America/Cambridge_Bay +${JREHOME}/lib/zi/America/Campo_Grande +${JREHOME}/lib/zi/America/Cancun +${JREHOME}/lib/zi/America/Caracas +${JREHOME}/lib/zi/America/Cayenne +${JREHOME}/lib/zi/America/Cayman +${JREHOME}/lib/zi/America/Chicago +${JREHOME}/lib/zi/America/Chihuahua +${JREHOME}/lib/zi/America/Costa_Rica +${JREHOME}/lib/zi/America/Cuiaba +${JREHOME}/lib/zi/America/Curacao +${JREHOME}/lib/zi/America/Danmarkshavn +${JREHOME}/lib/zi/America/Dawson +${JREHOME}/lib/zi/America/Dawson_Creek +${JREHOME}/lib/zi/America/Denver +${JREHOME}/lib/zi/America/Detroit +${JREHOME}/lib/zi/America/Dominica +${JREHOME}/lib/zi/America/Edmonton +${JREHOME}/lib/zi/America/Eirunepe +${JREHOME}/lib/zi/America/El_Salvador +${JREHOME}/lib/zi/America/Fortaleza +${JREHOME}/lib/zi/America/Glace_Bay +${JREHOME}/lib/zi/America/Godthab +${JREHOME}/lib/zi/America/Goose_Bay +${JREHOME}/lib/zi/America/Grand_Turk +${JREHOME}/lib/zi/America/Grenada +${JREHOME}/lib/zi/America/Guadeloupe +${JREHOME}/lib/zi/America/Guatemala +${JREHOME}/lib/zi/America/Guayaquil +${JREHOME}/lib/zi/America/Guyana +${JREHOME}/lib/zi/America/Halifax +${JREHOME}/lib/zi/America/Havana +${JREHOME}/lib/zi/America/Hermosillo +${JREHOME}/lib/zi/America/Indiana/ +${JREHOME}/lib/zi/America/Indiana/Indianapolis +${JREHOME}/lib/zi/America/Indiana/Knox +${JREHOME}/lib/zi/America/Indiana/Marengo +${JREHOME}/lib/zi/America/Indiana/Petersburg +${JREHOME}/lib/zi/America/Indiana/Vevay +${JREHOME}/lib/zi/America/Indiana/Vincennes +${JREHOME}/lib/zi/America/Indiana/Winamac +${JREHOME}/lib/zi/America/Inuvik +${JREHOME}/lib/zi/America/Iqaluit +${JREHOME}/lib/zi/America/Jamaica +${JREHOME}/lib/zi/America/Juneau +${JREHOME}/lib/zi/America/Kentucky/ +${JREHOME}/lib/zi/America/Kentucky/Louisville +${JREHOME}/lib/zi/America/Kentucky/Monticello +${JREHOME}/lib/zi/America/La_Paz +${JREHOME}/lib/zi/America/Lima +${JREHOME}/lib/zi/America/Los_Angeles +${JREHOME}/lib/zi/America/Maceio +${JREHOME}/lib/zi/America/Managua +${JREHOME}/lib/zi/America/Manaus +${JREHOME}/lib/zi/America/Martinique +${JREHOME}/lib/zi/America/Mazatlan +${JREHOME}/lib/zi/America/Menominee +${JREHOME}/lib/zi/America/Merida +${JREHOME}/lib/zi/America/Mexico_City +${JREHOME}/lib/zi/America/Miquelon +${JREHOME}/lib/zi/America/Moncton +${JREHOME}/lib/zi/America/Monterrey +${JREHOME}/lib/zi/America/Montevideo +${JREHOME}/lib/zi/America/Montreal +${JREHOME}/lib/zi/America/Montserrat +${JREHOME}/lib/zi/America/Nassau +${JREHOME}/lib/zi/America/New_York +${JREHOME}/lib/zi/America/Nipigon +${JREHOME}/lib/zi/America/Nome +${JREHOME}/lib/zi/America/Noronha +${JREHOME}/lib/zi/America/North_Dakota/ +${JREHOME}/lib/zi/America/North_Dakota/Center +${JREHOME}/lib/zi/America/North_Dakota/New_Salem +${JREHOME}/lib/zi/America/Panama +${JREHOME}/lib/zi/America/Pangnirtung +${JREHOME}/lib/zi/America/Paramaribo +${JREHOME}/lib/zi/America/Phoenix +${JREHOME}/lib/zi/America/Port-au-Prince +${JREHOME}/lib/zi/America/Port_of_Spain +${JREHOME}/lib/zi/America/Porto_Velho +${JREHOME}/lib/zi/America/Puerto_Rico +${JREHOME}/lib/zi/America/Rainy_River +${JREHOME}/lib/zi/America/Rankin_Inlet +${JREHOME}/lib/zi/America/Recife +${JREHOME}/lib/zi/America/Regina +${JREHOME}/lib/zi/America/Resolute +${JREHOME}/lib/zi/America/Rio_Branco +${JREHOME}/lib/zi/America/Santiago +${JREHOME}/lib/zi/America/Santo_Domingo +${JREHOME}/lib/zi/America/Sao_Paulo +${JREHOME}/lib/zi/America/Scoresbysund +${JREHOME}/lib/zi/America/St_Johns +${JREHOME}/lib/zi/America/St_Kitts +${JREHOME}/lib/zi/America/St_Lucia +${JREHOME}/lib/zi/America/St_Thomas +${JREHOME}/lib/zi/America/St_Vincent +${JREHOME}/lib/zi/America/Swift_Current +${JREHOME}/lib/zi/America/Tegucigalpa +${JREHOME}/lib/zi/America/Thule +${JREHOME}/lib/zi/America/Thunder_Bay +${JREHOME}/lib/zi/America/Tijuana +${JREHOME}/lib/zi/America/Toronto +${JREHOME}/lib/zi/America/Tortola +${JREHOME}/lib/zi/America/Vancouver +${JREHOME}/lib/zi/America/Whitehorse +${JREHOME}/lib/zi/America/Winnipeg +${JREHOME}/lib/zi/America/Yakutat +${JREHOME}/lib/zi/America/Yellowknife +${JREHOME}/lib/zi/Antarctica/ +${JREHOME}/lib/zi/Antarctica/Casey +${JREHOME}/lib/zi/Antarctica/Davis +${JREHOME}/lib/zi/Antarctica/DumontDUrville +${JREHOME}/lib/zi/Antarctica/Mawson +${JREHOME}/lib/zi/Antarctica/McMurdo +${JREHOME}/lib/zi/Antarctica/Palmer +${JREHOME}/lib/zi/Antarctica/Rothera +${JREHOME}/lib/zi/Antarctica/Syowa +${JREHOME}/lib/zi/Antarctica/Vostok +${JREHOME}/lib/zi/Asia/ +${JREHOME}/lib/zi/Asia/Aden +${JREHOME}/lib/zi/Asia/Almaty +${JREHOME}/lib/zi/Asia/Amman +${JREHOME}/lib/zi/Asia/Anadyr +${JREHOME}/lib/zi/Asia/Aqtau +${JREHOME}/lib/zi/Asia/Aqtobe +${JREHOME}/lib/zi/Asia/Ashgabat +${JREHOME}/lib/zi/Asia/Baghdad +${JREHOME}/lib/zi/Asia/Bahrain +${JREHOME}/lib/zi/Asia/Baku +${JREHOME}/lib/zi/Asia/Bangkok +${JREHOME}/lib/zi/Asia/Beirut +${JREHOME}/lib/zi/Asia/Bishkek +${JREHOME}/lib/zi/Asia/Brunei +${JREHOME}/lib/zi/Asia/Calcutta +${JREHOME}/lib/zi/Asia/Choibalsan +${JREHOME}/lib/zi/Asia/Chongqing +${JREHOME}/lib/zi/Asia/Colombo +${JREHOME}/lib/zi/Asia/Damascus +${JREHOME}/lib/zi/Asia/Dhaka +${JREHOME}/lib/zi/Asia/Dili +${JREHOME}/lib/zi/Asia/Dubai +${JREHOME}/lib/zi/Asia/Dushanbe +${JREHOME}/lib/zi/Asia/Gaza +${JREHOME}/lib/zi/Asia/Harbin +${JREHOME}/lib/zi/Asia/Hong_Kong +${JREHOME}/lib/zi/Asia/Hovd +${JREHOME}/lib/zi/Asia/Irkutsk +${JREHOME}/lib/zi/Asia/Jakarta +${JREHOME}/lib/zi/Asia/Jayapura +${JREHOME}/lib/zi/Asia/Jerusalem +${JREHOME}/lib/zi/Asia/Kabul +${JREHOME}/lib/zi/Asia/Kamchatka +${JREHOME}/lib/zi/Asia/Karachi +${JREHOME}/lib/zi/Asia/Kashgar +${JREHOME}/lib/zi/Asia/Katmandu +${JREHOME}/lib/zi/Asia/Krasnoyarsk +${JREHOME}/lib/zi/Asia/Kuala_Lumpur +${JREHOME}/lib/zi/Asia/Kuching +${JREHOME}/lib/zi/Asia/Kuwait +${JREHOME}/lib/zi/Asia/Macau +${JREHOME}/lib/zi/Asia/Magadan +${JREHOME}/lib/zi/Asia/Makassar +${JREHOME}/lib/zi/Asia/Manila +${JREHOME}/lib/zi/Asia/Muscat +${JREHOME}/lib/zi/Asia/Nicosia +${JREHOME}/lib/zi/Asia/Novosibirsk +${JREHOME}/lib/zi/Asia/Omsk +${JREHOME}/lib/zi/Asia/Oral +${JREHOME}/lib/zi/Asia/Phnom_Penh +${JREHOME}/lib/zi/Asia/Pontianak +${JREHOME}/lib/zi/Asia/Pyongyang +${JREHOME}/lib/zi/Asia/Qatar +${JREHOME}/lib/zi/Asia/Qyzylorda +${JREHOME}/lib/zi/Asia/Rangoon +${JREHOME}/lib/zi/Asia/Riyadh +${JREHOME}/lib/zi/Asia/Riyadh87 +${JREHOME}/lib/zi/Asia/Riyadh88 +${JREHOME}/lib/zi/Asia/Riyadh89 +${JREHOME}/lib/zi/Asia/Saigon +${JREHOME}/lib/zi/Asia/Sakhalin +${JREHOME}/lib/zi/Asia/Samarkand +${JREHOME}/lib/zi/Asia/Seoul +${JREHOME}/lib/zi/Asia/Shanghai +${JREHOME}/lib/zi/Asia/Singapore +${JREHOME}/lib/zi/Asia/Taipei +${JREHOME}/lib/zi/Asia/Tashkent +${JREHOME}/lib/zi/Asia/Tbilisi +${JREHOME}/lib/zi/Asia/Tehran +${JREHOME}/lib/zi/Asia/Thimphu +${JREHOME}/lib/zi/Asia/Tokyo +${JREHOME}/lib/zi/Asia/Ulaanbaatar +${JREHOME}/lib/zi/Asia/Urumqi +${JREHOME}/lib/zi/Asia/Vientiane +${JREHOME}/lib/zi/Asia/Vladivostok +${JREHOME}/lib/zi/Asia/Yakutsk +${JREHOME}/lib/zi/Asia/Yekaterinburg +${JREHOME}/lib/zi/Asia/Yerevan +${JREHOME}/lib/zi/Atlantic/ +${JREHOME}/lib/zi/Atlantic/Azores +${JREHOME}/lib/zi/Atlantic/Bermuda +${JREHOME}/lib/zi/Atlantic/Canary +${JREHOME}/lib/zi/Atlantic/Cape_Verde +${JREHOME}/lib/zi/Atlantic/Faroe +${JREHOME}/lib/zi/Atlantic/Madeira +${JREHOME}/lib/zi/Atlantic/Reykjavik +${JREHOME}/lib/zi/Atlantic/South_Georgia +${JREHOME}/lib/zi/Atlantic/St_Helena +${JREHOME}/lib/zi/Atlantic/Stanley +${JREHOME}/lib/zi/Australia/ +${JREHOME}/lib/zi/Australia/Adelaide +${JREHOME}/lib/zi/Australia/Brisbane +${JREHOME}/lib/zi/Australia/Broken_Hill +${JREHOME}/lib/zi/Australia/Currie +${JREHOME}/lib/zi/Australia/Darwin +${JREHOME}/lib/zi/Australia/Eucla +${JREHOME}/lib/zi/Australia/Hobart +${JREHOME}/lib/zi/Australia/Lindeman +${JREHOME}/lib/zi/Australia/Lord_Howe +${JREHOME}/lib/zi/Australia/Melbourne +${JREHOME}/lib/zi/Australia/Perth +${JREHOME}/lib/zi/Australia/Sydney +${JREHOME}/lib/zi/CET +${JREHOME}/lib/zi/CST6CDT +${JREHOME}/lib/zi/EET +${JREHOME}/lib/zi/EST +${JREHOME}/lib/zi/EST5EDT +${JREHOME}/lib/zi/Etc/ +${JREHOME}/lib/zi/Etc/GMT +${JREHOME}/lib/zi/Etc/GMT+1 +${JREHOME}/lib/zi/Etc/GMT+10 +${JREHOME}/lib/zi/Etc/GMT+11 +${JREHOME}/lib/zi/Etc/GMT+12 +${JREHOME}/lib/zi/Etc/GMT+2 +${JREHOME}/lib/zi/Etc/GMT+3 +${JREHOME}/lib/zi/Etc/GMT+4 +${JREHOME}/lib/zi/Etc/GMT+5 +${JREHOME}/lib/zi/Etc/GMT+6 +${JREHOME}/lib/zi/Etc/GMT+7 +${JREHOME}/lib/zi/Etc/GMT+8 +${JREHOME}/lib/zi/Etc/GMT+9 +${JREHOME}/lib/zi/Etc/GMT-1 +${JREHOME}/lib/zi/Etc/GMT-10 +${JREHOME}/lib/zi/Etc/GMT-11 +${JREHOME}/lib/zi/Etc/GMT-12 +${JREHOME}/lib/zi/Etc/GMT-13 +${JREHOME}/lib/zi/Etc/GMT-14 +${JREHOME}/lib/zi/Etc/GMT-2 +${JREHOME}/lib/zi/Etc/GMT-3 +${JREHOME}/lib/zi/Etc/GMT-4 +${JREHOME}/lib/zi/Etc/GMT-5 +${JREHOME}/lib/zi/Etc/GMT-6 +${JREHOME}/lib/zi/Etc/GMT-7 +${JREHOME}/lib/zi/Etc/GMT-8 +${JREHOME}/lib/zi/Etc/GMT-9 +${JREHOME}/lib/zi/Etc/UCT +${JREHOME}/lib/zi/Etc/UTC +${JREHOME}/lib/zi/Europe/ +${JREHOME}/lib/zi/Europe/Amsterdam +${JREHOME}/lib/zi/Europe/Andorra +${JREHOME}/lib/zi/Europe/Athens +${JREHOME}/lib/zi/Europe/Belgrade +${JREHOME}/lib/zi/Europe/Berlin +${JREHOME}/lib/zi/Europe/Brussels +${JREHOME}/lib/zi/Europe/Bucharest +${JREHOME}/lib/zi/Europe/Budapest +${JREHOME}/lib/zi/Europe/Chisinau +${JREHOME}/lib/zi/Europe/Copenhagen +${JREHOME}/lib/zi/Europe/Dublin +${JREHOME}/lib/zi/Europe/Gibraltar +${JREHOME}/lib/zi/Europe/Helsinki +${JREHOME}/lib/zi/Europe/Istanbul +${JREHOME}/lib/zi/Europe/Kaliningrad +${JREHOME}/lib/zi/Europe/Kiev +${JREHOME}/lib/zi/Europe/Lisbon +${JREHOME}/lib/zi/Europe/London +${JREHOME}/lib/zi/Europe/Luxembourg +${JREHOME}/lib/zi/Europe/Madrid +${JREHOME}/lib/zi/Europe/Malta +${JREHOME}/lib/zi/Europe/Minsk +${JREHOME}/lib/zi/Europe/Monaco +${JREHOME}/lib/zi/Europe/Moscow +${JREHOME}/lib/zi/Europe/Oslo +${JREHOME}/lib/zi/Europe/Paris +${JREHOME}/lib/zi/Europe/Prague +${JREHOME}/lib/zi/Europe/Riga +${JREHOME}/lib/zi/Europe/Rome +${JREHOME}/lib/zi/Europe/Samara +${JREHOME}/lib/zi/Europe/Simferopol +${JREHOME}/lib/zi/Europe/Sofia +${JREHOME}/lib/zi/Europe/Stockholm +${JREHOME}/lib/zi/Europe/Tallinn +${JREHOME}/lib/zi/Europe/Tirane +${JREHOME}/lib/zi/Europe/Uzhgorod +${JREHOME}/lib/zi/Europe/Vaduz +${JREHOME}/lib/zi/Europe/Vienna +${JREHOME}/lib/zi/Europe/Vilnius +${JREHOME}/lib/zi/Europe/Volgograd +${JREHOME}/lib/zi/Europe/Warsaw +${JREHOME}/lib/zi/Europe/Zaporozhye +${JREHOME}/lib/zi/Europe/Zurich +${JREHOME}/lib/zi/GMT +${JREHOME}/lib/zi/HST +${JREHOME}/lib/zi/Indian/ +${JREHOME}/lib/zi/Indian/Antananarivo +${JREHOME}/lib/zi/Indian/Chagos +${JREHOME}/lib/zi/Indian/Christmas +${JREHOME}/lib/zi/Indian/Cocos +${JREHOME}/lib/zi/Indian/Comoro +${JREHOME}/lib/zi/Indian/Kerguelen +${JREHOME}/lib/zi/Indian/Mahe +${JREHOME}/lib/zi/Indian/Maldives +${JREHOME}/lib/zi/Indian/Mauritius +${JREHOME}/lib/zi/Indian/Mayotte +${JREHOME}/lib/zi/Indian/Reunion +${JREHOME}/lib/zi/MET +${JREHOME}/lib/zi/MST +${JREHOME}/lib/zi/MST7MDT +${JREHOME}/lib/zi/PST8PDT +${JREHOME}/lib/zi/Pacific/ +${JREHOME}/lib/zi/Pacific/Apia +${JREHOME}/lib/zi/Pacific/Auckland +${JREHOME}/lib/zi/Pacific/Chatham +${JREHOME}/lib/zi/Pacific/Easter +${JREHOME}/lib/zi/Pacific/Efate +${JREHOME}/lib/zi/Pacific/Enderbury +${JREHOME}/lib/zi/Pacific/Fakaofo +${JREHOME}/lib/zi/Pacific/Fiji +${JREHOME}/lib/zi/Pacific/Funafuti +${JREHOME}/lib/zi/Pacific/Galapagos +${JREHOME}/lib/zi/Pacific/Gambier +${JREHOME}/lib/zi/Pacific/Guadalcanal +${JREHOME}/lib/zi/Pacific/Guam +${JREHOME}/lib/zi/Pacific/Honolulu +${JREHOME}/lib/zi/Pacific/Johnston +${JREHOME}/lib/zi/Pacific/Kiritimati +${JREHOME}/lib/zi/Pacific/Kosrae +${JREHOME}/lib/zi/Pacific/Kwajalein +${JREHOME}/lib/zi/Pacific/Majuro +${JREHOME}/lib/zi/Pacific/Marquesas +${JREHOME}/lib/zi/Pacific/Midway +${JREHOME}/lib/zi/Pacific/Nauru +${JREHOME}/lib/zi/Pacific/Niue +${JREHOME}/lib/zi/Pacific/Norfolk +${JREHOME}/lib/zi/Pacific/Noumea +${JREHOME}/lib/zi/Pacific/Pago_Pago +${JREHOME}/lib/zi/Pacific/Palau +${JREHOME}/lib/zi/Pacific/Pitcairn +${JREHOME}/lib/zi/Pacific/Ponape +${JREHOME}/lib/zi/Pacific/Port_Moresby +${JREHOME}/lib/zi/Pacific/Rarotonga +${JREHOME}/lib/zi/Pacific/Saipan +${JREHOME}/lib/zi/Pacific/Tahiti +${JREHOME}/lib/zi/Pacific/Tarawa +${JREHOME}/lib/zi/Pacific/Tongatapu +${JREHOME}/lib/zi/Pacific/Truk +${JREHOME}/lib/zi/Pacific/Wake +${JREHOME}/lib/zi/Pacific/Wallis +${JREHOME}/lib/zi/SystemV/ +${JREHOME}/lib/zi/SystemV/AST4 +${JREHOME}/lib/zi/SystemV/AST4ADT +${JREHOME}/lib/zi/SystemV/CST6 +${JREHOME}/lib/zi/SystemV/CST6CDT +${JREHOME}/lib/zi/SystemV/EST5 +${JREHOME}/lib/zi/SystemV/EST5EDT +${JREHOME}/lib/zi/SystemV/HST10 +${JREHOME}/lib/zi/SystemV/MST7 +${JREHOME}/lib/zi/SystemV/MST7MDT +${JREHOME}/lib/zi/SystemV/PST8 +${JREHOME}/lib/zi/SystemV/PST8PDT +${JREHOME}/lib/zi/SystemV/YST9 +${JREHOME}/lib/zi/SystemV/YST9YDT +${JREHOME}/lib/zi/WET +${JREHOME}/lib/zi/ZoneInfoMappings +@mandir ${JREHOME}/man/ +${JREHOME}/man/man1/ +@man ${JREHOME}/man/man1/java.1 +@man ${JREHOME}/man/man1/keytool.1 +@man ${JREHOME}/man/man1/orbd.1 +@man ${JREHOME}/man/man1/pack200.1 +@man ${JREHOME}/man/man1/policytool.1 +@man ${JREHOME}/man/man1/rmid.1 +@man ${JREHOME}/man/man1/rmiregistry.1 +@man ${JREHOME}/man/man1/servertool.1 +@man ${JREHOME}/man/man1/tnameserv.1 +@man ${JREHOME}/man/man1/unpack200.1 +%%client_vm%% diff --git a/devel/jdk/1.7/pkg/PLIST-main b/devel/jdk/1.7/pkg/PLIST-main new file mode 100644 index 00000000000..882b8df42e9 --- /dev/null +++ b/devel/jdk/1.7/pkg/PLIST-main @@ -0,0 +1,2097 @@ +@comment $OpenBSD: PLIST-main,v 1.1 2007/09/06 15:46:20 kurt Exp $ +@option no-default-conflict +@conflict jdk->=1.7,<1.8 +${JDKHOME}/ +${JDKHOME}/COPYRIGHT +${JDKHOME}/LICENSE +${JDKHOME}/README.html +${JDKHOME}/README_ja.html +${JDKHOME}/README_zh_CN.html +${JDKHOME}/bin/ +${JDKHOME}/bin/appletviewer +${JDKHOME}/bin/apt +${JDKHOME}/bin/extcheck +${JDKHOME}/bin/idlj +${JDKHOME}/bin/jar +${JDKHOME}/bin/jarsigner +${JDKHOME}/bin/java +${JDKHOME}/bin/javac +${JDKHOME}/bin/javadoc +${JDKHOME}/bin/javah +${JDKHOME}/bin/javap +${JDKHOME}/bin/jconsole +${JDKHOME}/bin/jdb +${JDKHOME}/bin/jhat +${JDKHOME}/bin/jinfo +${JDKHOME}/bin/jmap +${JDKHOME}/bin/jps +${JDKHOME}/bin/jrunscript +${JDKHOME}/bin/jsadebugd +${JDKHOME}/bin/jstack +${JDKHOME}/bin/jstat +${JDKHOME}/bin/jstatd +${JDKHOME}/bin/keytool +${JDKHOME}/bin/native2ascii +${JDKHOME}/bin/orbd +${JDKHOME}/bin/pack200 +${JDKHOME}/bin/policytool +${JDKHOME}/bin/rmic +${JDKHOME}/bin/rmid +${JDKHOME}/bin/rmiregistry +${JDKHOME}/bin/schemagen +${JDKHOME}/bin/serialver +${JDKHOME}/bin/servertool +${JDKHOME}/bin/tnameserv +${JDKHOME}/bin/unpack200 +${JDKHOME}/bin/wsgen +${JDKHOME}/bin/wsimport +${JDKHOME}/bin/xjc +${JDKHOME}/db/ +${JDKHOME}/db/3RDPARTY +${JDKHOME}/db/CHANGES +${JDKHOME}/db/LICENSE +${JDKHOME}/db/LICENSE-JAVA-DB-EARLY-ACCESS +${JDKHOME}/db/NOTICE +${JDKHOME}/db/RELEASE-NOTES.html +${JDKHOME}/db/demo/ +${JDKHOME}/db/demo/databases/ +${JDKHOME}/db/demo/databases/toursdb/ +${JDKHOME}/db/demo/databases/toursdb.jar +${JDKHOME}/db/demo/databases/toursdb/log/ +${JDKHOME}/db/demo/databases/toursdb/log/log.ctrl +${JDKHOME}/db/demo/databases/toursdb/log/log1.dat +${JDKHOME}/db/demo/databases/toursdb/log/logmirror.ctrl +${JDKHOME}/db/demo/databases/toursdb/seg0/ +${JDKHOME}/db/demo/databases/toursdb/seg0/c10.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c101.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c111.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c121.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c130.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c141.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c150.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c161.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c171.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c180.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c191.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c1a1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c1b1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c1c0.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c1d1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c1e0.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c1f1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c20.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c200.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c211.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c221.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c230.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c241.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c251.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c260.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c271.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c281.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c290.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c2a1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c2b1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c2c1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c2d0.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c2e1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c2f0.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c300.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c31.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c311.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c321.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c331.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c340.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c351.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c361.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c371.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c380.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c391.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c3a1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c3b1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c3c0.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c3d1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c3e0.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c3f1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c401.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c41.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c410.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c421.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c431.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c440.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c451.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c461.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c471.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c480.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c491.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c4a1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c4b0.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c4c1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c4d0.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c51.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c60.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c71.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c81.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/c90.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/ca1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/cb1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/cc0.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/cd1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/ce1.dat +${JDKHOME}/db/demo/databases/toursdb/seg0/cf0.dat +${JDKHOME}/db/demo/databases/toursdb/service.properties +${JDKHOME}/db/demo/programs/ +${JDKHOME}/db/demo/programs/csfull.css +${JDKHOME}/db/demo/programs/demo.html +${JDKHOME}/db/demo/programs/navbar.html +${JDKHOME}/db/demo/programs/nserverdemo/ +${JDKHOME}/db/demo/programs/nserverdemo/NetworkServerUtil.class +${JDKHOME}/db/demo/programs/nserverdemo/NetworkServerUtil.java +${JDKHOME}/db/demo/programs/nserverdemo/NsSample.class +${JDKHOME}/db/demo/programs/nserverdemo/NsSample.java +${JDKHOME}/db/demo/programs/nserverdemo/NsSampleClientThread.class +${JDKHOME}/db/demo/programs/nserverdemo/NsSampleClientThread.java +${JDKHOME}/db/demo/programs/nserverdemo/NsSampleWork.class +${JDKHOME}/db/demo/programs/nserverdemo/SimpleNetworkClientSample.class +${JDKHOME}/db/demo/programs/nserverdemo/SimpleNetworkClientSample.java +${JDKHOME}/db/demo/programs/nserverdemo/SimpleNetworkServerSample.class +${JDKHOME}/db/demo/programs/nserverdemo/SimpleNetworkServerSample.java +${JDKHOME}/db/demo/programs/nserverdemo/nserverdemo.html +${JDKHOME}/db/demo/programs/nserverdemo/readme.html +${JDKHOME}/db/demo/programs/nserverdemo/simpleserversample.html +${JDKHOME}/db/demo/programs/readme.html +${JDKHOME}/db/demo/programs/simple/ +${JDKHOME}/db/demo/programs/simple/SimpleApp.class +${JDKHOME}/db/demo/programs/simple/SimpleApp.java +${JDKHOME}/db/demo/programs/simple/derby.properties +${JDKHOME}/db/demo/programs/simple/example.html +${JDKHOME}/db/demo/programs/toursdb/ +${JDKHOME}/db/demo/programs/toursdb/BART.gif +${JDKHOME}/db/demo/programs/toursdb/Caltrain.gif +${JDKHOME}/db/demo/programs/toursdb/LightRail.gif +${JDKHOME}/db/demo/programs/toursdb/ToursDB_schema.sql +${JDKHOME}/db/demo/programs/toursdb/build.xml +${JDKHOME}/db/demo/programs/toursdb/disconnect.sql +${JDKHOME}/db/demo/programs/toursdb/insertMaps.java +${JDKHOME}/db/demo/programs/toursdb/loadAIRLINES.sql +${JDKHOME}/db/demo/programs/toursdb/loadCITIES.sql +${JDKHOME}/db/demo/programs/toursdb/loadCOUNTRIES.sql +${JDKHOME}/db/demo/programs/toursdb/loadFLIGHTAVAILABILITY1.sql +${JDKHOME}/db/demo/programs/toursdb/loadFLIGHTAVAILABILITY2.sql +${JDKHOME}/db/demo/programs/toursdb/loadFLIGHTS1.sql +${JDKHOME}/db/demo/programs/toursdb/loadFLIGHTS2.sql +${JDKHOME}/db/demo/programs/toursdb/loadTables.sql +${JDKHOME}/db/demo/programs/toursdb/toursdb_readme.html +${JDKHOME}/db/demo/programs/workingwithderby/ +${JDKHOME}/db/demo/programs/workingwithderby/WwdClientExample.class +${JDKHOME}/db/demo/programs/workingwithderby/WwdClientExample.java +${JDKHOME}/db/demo/programs/workingwithderby/WwdEmbedded.class +${JDKHOME}/db/demo/programs/workingwithderby/WwdEmbedded.java +${JDKHOME}/db/demo/programs/workingwithderby/WwdUtils.class +${JDKHOME}/db/demo/programs/workingwithderby/WwdUtils.java +${JDKHOME}/db/demo/programs/workingwithderby/readme.html +${JDKHOME}/db/frameworks/ +${JDKHOME}/db/frameworks/NetworkServer/ +${JDKHOME}/db/frameworks/NetworkServer/bin/ +${JDKHOME}/db/frameworks/NetworkServer/bin/NetworkServerControl.bat +${JDKHOME}/db/frameworks/NetworkServer/bin/NetworkServerControl.ksh +${JDKHOME}/db/frameworks/NetworkServer/bin/dblook.bat +${JDKHOME}/db/frameworks/NetworkServer/bin/dblook.ksh +${JDKHOME}/db/frameworks/NetworkServer/bin/ij.bat +${JDKHOME}/db/frameworks/NetworkServer/bin/ij.ksh +${JDKHOME}/db/frameworks/NetworkServer/bin/setNetworkClientCP.bat +${JDKHOME}/db/frameworks/NetworkServer/bin/setNetworkClientCP.ksh +${JDKHOME}/db/frameworks/NetworkServer/bin/setNetworkServerCP.bat +${JDKHOME}/db/frameworks/NetworkServer/bin/setNetworkServerCP.ksh +${JDKHOME}/db/frameworks/NetworkServer/bin/startNetworkServer.bat +${JDKHOME}/db/frameworks/NetworkServer/bin/startNetworkServer.ksh +${JDKHOME}/db/frameworks/NetworkServer/bin/stopNetworkServer.bat +${JDKHOME}/db/frameworks/NetworkServer/bin/stopNetworkServer.ksh +${JDKHOME}/db/frameworks/NetworkServer/bin/sysinfo.bat +${JDKHOME}/db/frameworks/NetworkServer/bin/sysinfo.ksh +${JDKHOME}/db/frameworks/NetworkServer/readme.html +${JDKHOME}/db/frameworks/embedded/ +${JDKHOME}/db/frameworks/embedded/bin/ +${JDKHOME}/db/frameworks/embedded/bin/dblook.bat +${JDKHOME}/db/frameworks/embedded/bin/dblook.ksh +${JDKHOME}/db/frameworks/embedded/bin/ij.bat +${JDKHOME}/db/frameworks/embedded/bin/ij.ksh +${JDKHOME}/db/frameworks/embedded/bin/setEmbeddedCP.bat +${JDKHOME}/db/frameworks/embedded/bin/setEmbeddedCP.ksh +${JDKHOME}/db/frameworks/embedded/bin/sysinfo.bat +${JDKHOME}/db/frameworks/embedded/bin/sysinfo.ksh +${JDKHOME}/db/frameworks/embedded/readme.html +${JDKHOME}/db/frameworks/readme.html +${JDKHOME}/db/lib/ +${JDKHOME}/db/lib/derby.jar +${JDKHOME}/db/lib/derby.war +${JDKHOME}/db/lib/derbyLocale_de_DE.jar +${JDKHOME}/db/lib/derbyLocale_es.jar +${JDKHOME}/db/lib/derbyLocale_fr.jar +${JDKHOME}/db/lib/derbyLocale_it.jar +${JDKHOME}/db/lib/derbyLocale_ja_JP.jar +${JDKHOME}/db/lib/derbyLocale_ko_KR.jar +${JDKHOME}/db/lib/derbyLocale_pt_BR.jar +${JDKHOME}/db/lib/derbyLocale_zh_CN.jar +${JDKHOME}/db/lib/derbyLocale_zh_TW.jar +${JDKHOME}/db/lib/derbyclient.jar +${JDKHOME}/db/lib/derbynet.jar +${JDKHOME}/db/lib/derbyrun.jar +${JDKHOME}/db/lib/derbytools.jar +${JDKHOME}/demo/ +${JDKHOME}/demo/applets/ +${JDKHOME}/demo/applets/Animator/ +${JDKHOME}/demo/applets/Animator/Animation.class +${JDKHOME}/demo/applets/Animator/AnimationFrame.class +${JDKHOME}/demo/applets/Animator/Animator.class +${JDKHOME}/demo/applets/Animator/Animator.java +${JDKHOME}/demo/applets/Animator/DescriptionFrame.class +${JDKHOME}/demo/applets/Animator/ParseException.class +${JDKHOME}/demo/applets/Animator/audio/ +${JDKHOME}/demo/applets/Animator/audio/0.au +${JDKHOME}/demo/applets/Animator/audio/1.au +${JDKHOME}/demo/applets/Animator/audio/2.au +${JDKHOME}/demo/applets/Animator/audio/3.au +${JDKHOME}/demo/applets/Animator/audio/4.au +${JDKHOME}/demo/applets/Animator/audio/5.au +${JDKHOME}/demo/applets/Animator/audio/6.au +${JDKHOME}/demo/applets/Animator/audio/7.au +${JDKHOME}/demo/applets/Animator/audio/8.au +${JDKHOME}/demo/applets/Animator/audio/9.au +${JDKHOME}/demo/applets/Animator/audio/spacemusic.au +${JDKHOME}/demo/applets/Animator/example1.html +${JDKHOME}/demo/applets/Animator/example2.html +${JDKHOME}/demo/applets/Animator/example3.html +${JDKHOME}/demo/applets/Animator/example4.html +${JDKHOME}/demo/applets/Animator/images/ +${JDKHOME}/demo/applets/Animator/images/Beans/ +${JDKHOME}/demo/applets/Animator/images/Beans/T1.gif +${JDKHOME}/demo/applets/Animator/images/Beans/T10.gif +${JDKHOME}/demo/applets/Animator/images/Beans/T2.gif +${JDKHOME}/demo/applets/Animator/images/Beans/T3.gif +${JDKHOME}/demo/applets/Animator/images/Beans/T4.gif +${JDKHOME}/demo/applets/Animator/images/Beans/T5.gif +${JDKHOME}/demo/applets/Animator/images/Beans/T6.gif +${JDKHOME}/demo/applets/Animator/images/Beans/T7.gif +${JDKHOME}/demo/applets/Animator/images/Beans/T8.gif +${JDKHOME}/demo/applets/Animator/images/Beans/T9.gif +${JDKHOME}/demo/applets/Animator/images/SimpleAnimation/ +${JDKHOME}/demo/applets/Animator/images/SimpleAnimation/T1.gif +${JDKHOME}/demo/applets/Animator/images/SimpleAnimation/T2.gif +${JDKHOME}/demo/applets/Animator/images/loading-msg.gif +${JDKHOME}/demo/applets/Animator/index.html +${JDKHOME}/demo/applets/ArcTest/ +${JDKHOME}/demo/applets/ArcTest/ArcCanvas.class +${JDKHOME}/demo/applets/ArcTest/ArcControls.class +${JDKHOME}/demo/applets/ArcTest/ArcTest.class +${JDKHOME}/demo/applets/ArcTest/ArcTest.java +${JDKHOME}/demo/applets/ArcTest/IntegerTextField.class +${JDKHOME}/demo/applets/ArcTest/example1.html +${JDKHOME}/demo/applets/BarChart/ +${JDKHOME}/demo/applets/BarChart/BarChart.class +${JDKHOME}/demo/applets/BarChart/BarChart.java +${JDKHOME}/demo/applets/BarChart/example1.html +${JDKHOME}/demo/applets/Blink/ +${JDKHOME}/demo/applets/Blink/Blink$1.class +${JDKHOME}/demo/applets/Blink/Blink.class +${JDKHOME}/demo/applets/Blink/Blink.java +${JDKHOME}/demo/applets/Blink/example1.html +${JDKHOME}/demo/applets/CardTest/ +${JDKHOME}/demo/applets/CardTest/CardPanel.class +${JDKHOME}/demo/applets/CardTest/CardTest.class +${JDKHOME}/demo/applets/CardTest/CardTest.java +${JDKHOME}/demo/applets/CardTest/example1.html +${JDKHOME}/demo/applets/Clock/ +${JDKHOME}/demo/applets/Clock/Clock.class +${JDKHOME}/demo/applets/Clock/Clock.java +${JDKHOME}/demo/applets/Clock/example1.html +${JDKHOME}/demo/applets/DitherTest/ +${JDKHOME}/demo/applets/DitherTest/CardinalTextField.class +${JDKHOME}/demo/applets/DitherTest/DitherCanvas.class +${JDKHOME}/demo/applets/DitherTest/DitherControls.class +${JDKHOME}/demo/applets/DitherTest/DitherTest.class +${JDKHOME}/demo/applets/DitherTest/DitherTest.java +${JDKHOME}/demo/applets/DitherTest/example1.html +${JDKHOME}/demo/applets/DrawTest/ +${JDKHOME}/demo/applets/DrawTest/DrawControls.class +${JDKHOME}/demo/applets/DrawTest/DrawPanel.class +${JDKHOME}/demo/applets/DrawTest/DrawTest.class +${JDKHOME}/demo/applets/DrawTest/DrawTest.java +${JDKHOME}/demo/applets/DrawTest/example1.html +${JDKHOME}/demo/applets/Fractal/ +${JDKHOME}/demo/applets/Fractal/CLSFractal.class +${JDKHOME}/demo/applets/Fractal/CLSFractal.java +${JDKHOME}/demo/applets/Fractal/CLSRule.class +${JDKHOME}/demo/applets/Fractal/CLSTurtle.class +${JDKHOME}/demo/applets/Fractal/ContextLSystem.class +${JDKHOME}/demo/applets/Fractal/example1.html +${JDKHOME}/demo/applets/GraphLayout/ +${JDKHOME}/demo/applets/GraphLayout/Edge.class +${JDKHOME}/demo/applets/GraphLayout/Graph.class +${JDKHOME}/demo/applets/GraphLayout/Graph.java +${JDKHOME}/demo/applets/GraphLayout/GraphPanel.class +${JDKHOME}/demo/applets/GraphLayout/Node.class +${JDKHOME}/demo/applets/GraphLayout/audio/ +${JDKHOME}/demo/applets/GraphLayout/audio/computer.au +${JDKHOME}/demo/applets/GraphLayout/audio/drip.au +${JDKHOME}/demo/applets/GraphLayout/audio/gong.au +${JDKHOME}/demo/applets/GraphLayout/example1.html +${JDKHOME}/demo/applets/GraphLayout/example2.html +${JDKHOME}/demo/applets/GraphLayout/example3.html +${JDKHOME}/demo/applets/GraphLayout/example4.html +${JDKHOME}/demo/applets/GraphicsTest/ +${JDKHOME}/demo/applets/GraphicsTest/AppletFrame.class +${JDKHOME}/demo/applets/GraphicsTest/AppletFrame.java +${JDKHOME}/demo/applets/GraphicsTest/ArcCard.class +${JDKHOME}/demo/applets/GraphicsTest/ArcDegreePanel.class +${JDKHOME}/demo/applets/GraphicsTest/ArcPanel.class +${JDKHOME}/demo/applets/GraphicsTest/ColorUtils.class +${JDKHOME}/demo/applets/GraphicsTest/GraphicsCards.class +${JDKHOME}/demo/applets/GraphicsTest/GraphicsPanel.class +${JDKHOME}/demo/applets/GraphicsTest/GraphicsTest.class +${JDKHOME}/demo/applets/GraphicsTest/GraphicsTest.java +${JDKHOME}/demo/applets/GraphicsTest/OvalShape.class +${JDKHOME}/demo/applets/GraphicsTest/PolygonShape.class +${JDKHOME}/demo/applets/GraphicsTest/RectShape.class +${JDKHOME}/demo/applets/GraphicsTest/RoundRectShape.class +${JDKHOME}/demo/applets/GraphicsTest/Shape.class +${JDKHOME}/demo/applets/GraphicsTest/ShapeTest.class +${JDKHOME}/demo/applets/GraphicsTest/example1.html +${JDKHOME}/demo/applets/JumpingBox/ +${JDKHOME}/demo/applets/JumpingBox/JumpingBox.class +${JDKHOME}/demo/applets/JumpingBox/JumpingBox.java +${JDKHOME}/demo/applets/JumpingBox/example1.html +${JDKHOME}/demo/applets/JumpingBox/sounds/ +${JDKHOME}/demo/applets/JumpingBox/sounds/adapt-or-die.au +${JDKHOME}/demo/applets/JumpingBox/sounds/cannot.be.completed.au +${JDKHOME}/demo/applets/JumpingBox/sounds/danger.au +${JDKHOME}/demo/applets/JumpingBox/sounds/ip.au +${JDKHOME}/demo/applets/JumpingBox/sounds/that.hurts.au +${JDKHOME}/demo/applets/JumpingBox/sounds/thin.bell.au +${JDKHOME}/demo/applets/JumpingBox/sounds/tiptoe.thru.the.tulips.au +${JDKHOME}/demo/applets/MoleculeViewer/ +${JDKHOME}/demo/applets/MoleculeViewer/Atom.class +${JDKHOME}/demo/applets/MoleculeViewer/Matrix3D.class +${JDKHOME}/demo/applets/MoleculeViewer/Matrix3D.java +${JDKHOME}/demo/applets/MoleculeViewer/XYZApp.class +${JDKHOME}/demo/applets/MoleculeViewer/XYZApp.java +${JDKHOME}/demo/applets/MoleculeViewer/XYZChemModel.class +${JDKHOME}/demo/applets/MoleculeViewer/example1.html +${JDKHOME}/demo/applets/MoleculeViewer/example2.html +${JDKHOME}/demo/applets/MoleculeViewer/example3.html +${JDKHOME}/demo/applets/MoleculeViewer/models/ +${JDKHOME}/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz +${JDKHOME}/demo/applets/MoleculeViewer/models/benzene.xyz +${JDKHOME}/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz +${JDKHOME}/demo/applets/MoleculeViewer/models/cyclohexane.xyz +${JDKHOME}/demo/applets/MoleculeViewer/models/ethane.xyz +${JDKHOME}/demo/applets/MoleculeViewer/models/water.xyz +${JDKHOME}/demo/applets/NervousText/ +${JDKHOME}/demo/applets/NervousText/NervousText.class +${JDKHOME}/demo/applets/NervousText/NervousText.java +${JDKHOME}/demo/applets/NervousText/example1.html +${JDKHOME}/demo/applets/SimpleGraph/ +${JDKHOME}/demo/applets/SimpleGraph/GraphApplet.class +${JDKHOME}/demo/applets/SimpleGraph/GraphApplet.java +${JDKHOME}/demo/applets/SimpleGraph/example1.html +${JDKHOME}/demo/applets/SortDemo/ +${JDKHOME}/demo/applets/SortDemo/BidirBubbleSortAlgorithm.class +${JDKHOME}/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java +${JDKHOME}/demo/applets/SortDemo/BubbleSortAlgorithm.class +${JDKHOME}/demo/applets/SortDemo/BubbleSortAlgorithm.java +${JDKHOME}/demo/applets/SortDemo/QSortAlgorithm.class +${JDKHOME}/demo/applets/SortDemo/QSortAlgorithm.java +${JDKHOME}/demo/applets/SortDemo/SortAlgorithm.class +${JDKHOME}/demo/applets/SortDemo/SortAlgorithm.java +${JDKHOME}/demo/applets/SortDemo/SortItem.class +${JDKHOME}/demo/applets/SortDemo/SortItem.java +${JDKHOME}/demo/applets/SortDemo/example1.html +${JDKHOME}/demo/applets/SpreadSheet/ +${JDKHOME}/demo/applets/SpreadSheet/Cell.class +${JDKHOME}/demo/applets/SpreadSheet/CellUpdater.class +${JDKHOME}/demo/applets/SpreadSheet/InputField.class +${JDKHOME}/demo/applets/SpreadSheet/Node.class +${JDKHOME}/demo/applets/SpreadSheet/SpreadSheet.class +${JDKHOME}/demo/applets/SpreadSheet/SpreadSheet.java +${JDKHOME}/demo/applets/SpreadSheet/SpreadSheetInput.class +${JDKHOME}/demo/applets/SpreadSheet/example1.html +${JDKHOME}/demo/applets/TicTacToe/ +${JDKHOME}/demo/applets/TicTacToe/TicTacToe.class +${JDKHOME}/demo/applets/TicTacToe/TicTacToe.java +${JDKHOME}/demo/applets/TicTacToe/audio/ +${JDKHOME}/demo/applets/TicTacToe/audio/beep.au +${JDKHOME}/demo/applets/TicTacToe/audio/ding.au +${JDKHOME}/demo/applets/TicTacToe/audio/return.au +${JDKHOME}/demo/applets/TicTacToe/audio/yahoo1.au +${JDKHOME}/demo/applets/TicTacToe/audio/yahoo2.au +${JDKHOME}/demo/applets/TicTacToe/example1.html +${JDKHOME}/demo/applets/TicTacToe/images/ +${JDKHOME}/demo/applets/TicTacToe/images/cross.gif +${JDKHOME}/demo/applets/TicTacToe/images/not.gif +${JDKHOME}/demo/applets/WireFrame/ +${JDKHOME}/demo/applets/WireFrame/FileFormatException.class +${JDKHOME}/demo/applets/WireFrame/Matrix3D.class +${JDKHOME}/demo/applets/WireFrame/Matrix3D.java +${JDKHOME}/demo/applets/WireFrame/Model3D.class +${JDKHOME}/demo/applets/WireFrame/ThreeD.class +${JDKHOME}/demo/applets/WireFrame/ThreeD.java +${JDKHOME}/demo/applets/WireFrame/example1.html +${JDKHOME}/demo/applets/WireFrame/example2.html +${JDKHOME}/demo/applets/WireFrame/example3.html +${JDKHOME}/demo/applets/WireFrame/example4.html +${JDKHOME}/demo/applets/WireFrame/models/ +${JDKHOME}/demo/applets/WireFrame/models/cube.obj +${JDKHOME}/demo/applets/WireFrame/models/dinasaur.obj +${JDKHOME}/demo/applets/WireFrame/models/hughes_500.obj +${JDKHOME}/demo/applets/WireFrame/models/knoxS.obj +${JDKHOME}/demo/jfc/ +${JDKHOME}/demo/jfc/CodePointIM/ +${JDKHOME}/demo/jfc/CodePointIM/CodePointIM.jar +${JDKHOME}/demo/jfc/CodePointIM/README.html +${JDKHOME}/demo/jfc/CodePointIM/README_ja.html +${JDKHOME}/demo/jfc/CodePointIM/README_zh_CN.html +${JDKHOME}/demo/jfc/CodePointIM/src/ +${JDKHOME}/demo/jfc/CodePointIM/src/CodePointIM.java +${JDKHOME}/demo/jfc/CodePointIM/src/CodePointInputMethod.java +${JDKHOME}/demo/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java +${JDKHOME}/demo/jfc/CodePointIM/src/resources/ +${JDKHOME}/demo/jfc/CodePointIM/src/resources/codepoint.properties +${JDKHOME}/demo/jfc/CodePointIM/src/resources/codepoint_ja.properties +${JDKHOME}/demo/jfc/CodePointIM/src/resources/codepoint_zh_CN.properties +${JDKHOME}/demo/jfc/FileChooserDemo/ +${JDKHOME}/demo/jfc/FileChooserDemo/FileChooserDemo.jar +${JDKHOME}/demo/jfc/FileChooserDemo/README.txt +${JDKHOME}/demo/jfc/FileChooserDemo/src/ +${JDKHOME}/demo/jfc/FileChooserDemo/src/ExampleFileView.java +${JDKHOME}/demo/jfc/FileChooserDemo/src/FileChooserDemo.java +${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/ +${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/images/ +${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/images/gifIcon.gif +${JDKHOME}/demo/jfc/FileChooserDemo/src/resources/images/jpgIcon.jpg +${JDKHOME}/demo/jfc/Font2DTest/ +${JDKHOME}/demo/jfc/Font2DTest/Font2DTest.html +${JDKHOME}/demo/jfc/Font2DTest/Font2DTest.jar +${JDKHOME}/demo/jfc/Font2DTest/README.txt +${JDKHOME}/demo/jfc/Font2DTest/src/ +${JDKHOME}/demo/jfc/Font2DTest/src/Font2DTest.java +${JDKHOME}/demo/jfc/Font2DTest/src/Font2DTestApplet.java +${JDKHOME}/demo/jfc/Font2DTest/src/FontPanel.java +${JDKHOME}/demo/jfc/Font2DTest/src/RangeMenu.java +${JDKHOME}/demo/jfc/Java2D/ +${JDKHOME}/demo/jfc/Java2D/Java2Demo.html +${JDKHOME}/demo/jfc/Java2D/Java2Demo.jar +${JDKHOME}/demo/jfc/Java2D/README.txt +${JDKHOME}/demo/jfc/Java2D/src/ +${JDKHOME}/demo/jfc/Java2D/src/fonts/ +${JDKHOME}/demo/jfc/Java2D/src/fonts/A.ttf +${JDKHOME}/demo/jfc/Java2D/src/images/ +${JDKHOME}/demo/jfc/Java2D/src/images/bld.jpg +${JDKHOME}/demo/jfc/Java2D/src/images/boat.png +${JDKHOME}/demo/jfc/Java2D/src/images/box.gif +${JDKHOME}/demo/jfc/Java2D/src/images/boxwave.gif +${JDKHOME}/demo/jfc/Java2D/src/images/clone.gif +${JDKHOME}/demo/jfc/Java2D/src/images/clouds.jpg +${JDKHOME}/demo/jfc/Java2D/src/images/cupanim.gif +${JDKHOME}/demo/jfc/Java2D/src/images/duke.gif +${JDKHOME}/demo/jfc/Java2D/src/images/duke.png +${JDKHOME}/demo/jfc/Java2D/src/images/duke.running.gif +${JDKHOME}/demo/jfc/Java2D/src/images/dukeplug.gif +${JDKHOME}/demo/jfc/Java2D/src/images/fight.gif +${JDKHOME}/demo/jfc/Java2D/src/images/globe.gif +${JDKHOME}/demo/jfc/Java2D/src/images/java-logo.gif +${JDKHOME}/demo/jfc/Java2D/src/images/java_logo.png +${JDKHOME}/demo/jfc/Java2D/src/images/jumptojavastrip.png +${JDKHOME}/demo/jfc/Java2D/src/images/loop.gif +${JDKHOME}/demo/jfc/Java2D/src/images/looping.gif +${JDKHOME}/demo/jfc/Java2D/src/images/magnify.gif +${JDKHOME}/demo/jfc/Java2D/src/images/painting.gif +${JDKHOME}/demo/jfc/Java2D/src/images/print.gif +${JDKHOME}/demo/jfc/Java2D/src/images/remove.gif +${JDKHOME}/demo/jfc/Java2D/src/images/snooze.gif +${JDKHOME}/demo/jfc/Java2D/src/images/star7.gif +${JDKHOME}/demo/jfc/Java2D/src/images/start.gif +${JDKHOME}/demo/jfc/Java2D/src/images/start2.gif +${JDKHOME}/demo/jfc/Java2D/src/images/stop.gif +${JDKHOME}/demo/jfc/Java2D/src/images/stop2.gif +${JDKHOME}/demo/jfc/Java2D/src/images/surfing.gif +${JDKHOME}/demo/jfc/Java2D/src/images/thumbsup.gif +${JDKHOME}/demo/jfc/Java2D/src/images/tip.gif +${JDKHOME}/demo/jfc/Java2D/src/java2d/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/AnimatingControlsSurface.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/AnimatingSurface.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/CloningFeature.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/ControlsSurface.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/CustomControls.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/CustomControlsContext.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/DemoFonts.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/DemoGroup.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/DemoImages.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/DemoPanel.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/GlobalControls.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/GlobalPanel.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/Intro.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/Java2Demo.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/Java2DemoApplet.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/MemoryMonitor.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/PerformanceMonitor.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/RunWindow.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/Surface.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/TextureChooser.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/Tools.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Arcs.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/BezierAnim.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Curves.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Arcs_Curves/Ellipses.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/Areas.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/ClipAnim.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/Intersection.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Clipping/Text.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Colors/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Colors/BullsEye.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Colors/ColorConvert.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Colors/Rotator3D.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Composite/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Composite/ACimages.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Composite/ACrules.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Composite/FadeAnim.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/AllFonts.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/AttributedStr.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/Highlighting.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/Outline.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Fonts/Tree.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/DukeAnim.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/ImageOps.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/JPEGFlip.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Images/WarpImage.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/Caps.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/Dash.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/Joins.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Lines/LineAnim.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Mix/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Mix/Balls.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Mix/BezierScroller.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Mix/Stars3D.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/GradAnim.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/Gradient.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/Texture.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paint/TextureAnim.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/Append.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/CurveQuadTo.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/FillStroke.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Paths/WindingRule.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/ +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/Rotate.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/SelectTx.java +${JDKHOME}/demo/jfc/Java2D/src/java2d/demos/Transforms/TransformAnim.java +${JDKHOME}/demo/jfc/Metalworks/ +${JDKHOME}/demo/jfc/Metalworks/Metalworks.jar +${JDKHOME}/demo/jfc/Metalworks/README.txt +${JDKHOME}/demo/jfc/Metalworks/src/ +${JDKHOME}/demo/jfc/Metalworks/src/AquaMetalTheme.java +${JDKHOME}/demo/jfc/Metalworks/src/BigContrastMetalTheme.java +${JDKHOME}/demo/jfc/Metalworks/src/ContrastMetalTheme.java +${JDKHOME}/demo/jfc/Metalworks/src/DemoMetalTheme.java +${JDKHOME}/demo/jfc/Metalworks/src/GreenMetalTheme.java +${JDKHOME}/demo/jfc/Metalworks/src/KhakiMetalTheme.java +${JDKHOME}/demo/jfc/Metalworks/src/MetalThemeMenu.java +${JDKHOME}/demo/jfc/Metalworks/src/Metalworks.java +${JDKHOME}/demo/jfc/Metalworks/src/MetalworksDocumentFrame.java +${JDKHOME}/demo/jfc/Metalworks/src/MetalworksFrame.java +${JDKHOME}/demo/jfc/Metalworks/src/MetalworksHelp.java +${JDKHOME}/demo/jfc/Metalworks/src/MetalworksInBox.java +${JDKHOME}/demo/jfc/Metalworks/src/MetalworksPrefs.java +${JDKHOME}/demo/jfc/Metalworks/src/PropertiesMetalTheme.java +${JDKHOME}/demo/jfc/Metalworks/src/UISwitchListener.java +${JDKHOME}/demo/jfc/Metalworks/src/resources/ +${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/ +${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/back.gif +${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/credits.html +${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/duke.gif +${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/javalogo.gif +${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/metal.html +${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/metalworks.html +${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/swing.html +${JDKHOME}/demo/jfc/Metalworks/src/resources/HelpFiles/toc.html +${JDKHOME}/demo/jfc/Metalworks/src/resources/MyTheme.theme +${JDKHOME}/demo/jfc/Notepad/ +${JDKHOME}/demo/jfc/Notepad/Notepad.jar +${JDKHOME}/demo/jfc/Notepad/README.txt +${JDKHOME}/demo/jfc/Notepad/src/ +${JDKHOME}/demo/jfc/Notepad/src/ElementTreePanel.java +${JDKHOME}/demo/jfc/Notepad/src/Notepad.java +${JDKHOME}/demo/jfc/Notepad/src/resources/ +${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad.properties +${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad_fr.properties +${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad_sv.properties +${JDKHOME}/demo/jfc/Notepad/src/resources/Notepad_zh_CN.properties +${JDKHOME}/demo/jfc/Notepad/src/resources/copy.gif +${JDKHOME}/demo/jfc/Notepad/src/resources/cut.gif +${JDKHOME}/demo/jfc/Notepad/src/resources/new.gif +${JDKHOME}/demo/jfc/Notepad/src/resources/open.gif +${JDKHOME}/demo/jfc/Notepad/src/resources/paste.gif +${JDKHOME}/demo/jfc/Notepad/src/resources/save.gif +${JDKHOME}/demo/jfc/SampleTree/ +${JDKHOME}/demo/jfc/SampleTree/README.txt +${JDKHOME}/demo/jfc/SampleTree/SampleTree.jar +${JDKHOME}/demo/jfc/SampleTree/src/ +${JDKHOME}/demo/jfc/SampleTree/src/DynamicTreeNode.java +${JDKHOME}/demo/jfc/SampleTree/src/SampleData.java +${JDKHOME}/demo/jfc/SampleTree/src/SampleTree.java +${JDKHOME}/demo/jfc/SampleTree/src/SampleTreeCellRenderer.java +${JDKHOME}/demo/jfc/SampleTree/src/SampleTreeModel.java +${JDKHOME}/demo/jfc/SampleTree/src/resources/ +${JDKHOME}/demo/jfc/SampleTree/src/resources/images/ +${JDKHOME}/demo/jfc/SampleTree/src/resources/images/collapsed.gif +${JDKHOME}/demo/jfc/SampleTree/src/resources/images/expanded.gif +${JDKHOME}/demo/jfc/Stylepad/ +${JDKHOME}/demo/jfc/Stylepad/README.txt +${JDKHOME}/demo/jfc/Stylepad/Stylepad.jar +${JDKHOME}/demo/jfc/Stylepad/src/ +${JDKHOME}/demo/jfc/Stylepad/src/ElementTreePanel.java +${JDKHOME}/demo/jfc/Stylepad/src/HelloWorld.java +${JDKHOME}/demo/jfc/Stylepad/src/Notepad.java +${JDKHOME}/demo/jfc/Stylepad/src/Stylepad.java +${JDKHOME}/demo/jfc/Stylepad/src/Wonderland.java +${JDKHOME}/demo/jfc/Stylepad/src/resources/ +${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad.properties +${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad_fr.properties +${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad_sv.properties +${JDKHOME}/demo/jfc/Stylepad/src/resources/Notepad_zh_CN.properties +${JDKHOME}/demo/jfc/Stylepad/src/resources/Stylepad.properties +${JDKHOME}/demo/jfc/Stylepad/src/resources/Stylepad_sv.properties +${JDKHOME}/demo/jfc/Stylepad/src/resources/Stylepad_zh_CN.properties +${JDKHOME}/demo/jfc/Stylepad/src/resources/alice.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/bold.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/bullets.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/caterpillar.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/center.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/copy.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/cut.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/fg.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/hatter.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/italic.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/left.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/new.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/open.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/paste.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/rabbit.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/rabbit2.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/right.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/save.gif +${JDKHOME}/demo/jfc/Stylepad/src/resources/underline.gif +${JDKHOME}/demo/jfc/SwingApplet/ +${JDKHOME}/demo/jfc/SwingApplet/README.txt +${JDKHOME}/demo/jfc/SwingApplet/SwingApplet.html +${JDKHOME}/demo/jfc/SwingApplet/SwingApplet.jar +${JDKHOME}/demo/jfc/SwingApplet/src/ +${JDKHOME}/demo/jfc/SwingApplet/src/SwingApplet.java +${JDKHOME}/demo/jfc/SwingSet2/ +${JDKHOME}/demo/jfc/SwingSet2/README.txt +${JDKHOME}/demo/jfc/SwingSet2/SwingSet2.html +${JDKHOME}/demo/jfc/SwingSet2/SwingSet2.jar +${JDKHOME}/demo/jfc/SwingSet2/src/ +${JDKHOME}/demo/jfc/SwingSet2/src/AquaTheme.java +${JDKHOME}/demo/jfc/SwingSet2/src/BezierAnimationPanel.java +${JDKHOME}/demo/jfc/SwingSet2/src/ButtonDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/CharcoalTheme.java +${JDKHOME}/demo/jfc/SwingSet2/src/CodeViewer.java +${JDKHOME}/demo/jfc/SwingSet2/src/ColorChooserDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/ComboBoxDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/ContrastTheme.java +${JDKHOME}/demo/jfc/SwingSet2/src/DemoModule.java +${JDKHOME}/demo/jfc/SwingSet2/src/DirectionPanel.java +${JDKHOME}/demo/jfc/SwingSet2/src/EmeraldTheme.java +${JDKHOME}/demo/jfc/SwingSet2/src/ExampleFileView.java +${JDKHOME}/demo/jfc/SwingSet2/src/FileChooserDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/HtmlDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/InternalFrameDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/LayoutControlPanel.java +${JDKHOME}/demo/jfc/SwingSet2/src/ListDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/OptionPaneDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/Permuter.java +${JDKHOME}/demo/jfc/SwingSet2/src/ProgressBarDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/RubyTheme.java +${JDKHOME}/demo/jfc/SwingSet2/src/ScrollPaneDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/SliderDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/SplitPaneDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/SwingSet2.java +${JDKHOME}/demo/jfc/SwingSet2/src/SwingSet2Applet.java +${JDKHOME}/demo/jfc/SwingSet2/src/TabbedPaneDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/TableDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/ToolTipDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/TreeDemo.java +${JDKHOME}/demo/jfc/SwingSet2/src/resources/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/ant.html +${JDKHOME}/demo/jfc/SwingSet2/src/resources/bug.html +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/About.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/COPYRIGHT +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/apple.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/asparagus.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/banana.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/broccoli.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/cantaloupe.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/carrot.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/corn.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/grapefruit.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/grapes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/kiwi.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/onion.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/peach.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pear.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pepper.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pickle.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/pineapple.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/raspberry.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/strawberry.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/tomato.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/food/watermelon.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/cab_small.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/fish_small.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/moon_small.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/ImageClub/misc/sun_small.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/COPYRIGHT +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/ant.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/book.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/bug.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/bug2.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/crest.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/king.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/micro.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/Octavo/seaweed.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1d.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1p.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b1r.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2d.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2p.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b2r.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3d.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3p.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/b3r.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bl.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bldn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bm.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/bmdn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/br.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/brdn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/c.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cb.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cbr.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cbrs.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cbs.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/cdn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/ml.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/mldn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/mr.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/mrdn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rb.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbp.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbr.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbrs.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/rbs.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tl.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tldn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tm.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tmdn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/toggle.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/toggledn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/tr.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/buttons/trdn.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/brenteyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/brenthair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/brentmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/georgeseyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/georgeshair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/georgesmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/hanseyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/hanshair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/hansmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/howardeyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/howardhair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/howardmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jameseyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jameshair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jamesmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jeffeyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jeffhair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jeffmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/joneyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jonhair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/jonmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/laraeyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larahair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/laramouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larryeyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larryhair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/larrymouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/lisaeyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/lisahair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/lisamouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/michaeleyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/michaelhair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/michaelmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/philipeyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/philiphair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/philipmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/scotteyes.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/scotthair.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/combobox/scottmouth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/find.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/gifIcon.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/help.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/filechooser/jpgIcon.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/back.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/forward.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/htmldemo/header.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/blue.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/cyan.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/gray.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/green.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/magenta.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/red.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/list/yellow.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/bottle.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/ibd.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/optionpane/ibu.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/COPYRIGHT +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/colheader.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/crayons.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/lowerleft.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/rowheader.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/upperleft.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/scrollpane/upperright.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splash.png +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/README +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/earth.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/splitpane/moon.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/blake.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/brooke.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/david.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/ewan.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/hania.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/laine.jpg +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/matthew.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tabbedpane/stephen.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JButton.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JColorChooser.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JComboBox.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JDesktop.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JDialog.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JEditorPane.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JFileChooser.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JList.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JMenu.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JOptionPane.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JProgressBar.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JRadioButton.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JScrollBar.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JScrollPane.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JSlider.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JSplitPane.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JTabbedPane.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JTable.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/JTree.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/toolbar/ToolTip.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tooltip/ +${JDKHOME}/demo/jfc/SwingSet2/src/resources/images/tooltip/cow.gif +${JDKHOME}/demo/jfc/SwingSet2/src/resources/index.html +${JDKHOME}/demo/jfc/SwingSet2/src/resources/king.html +${JDKHOME}/demo/jfc/SwingSet2/src/resources/preface.html +${JDKHOME}/demo/jfc/SwingSet2/src/resources/seaweed.html +${JDKHOME}/demo/jfc/SwingSet2/src/resources/swingset.properties +${JDKHOME}/demo/jfc/SwingSet2/src/resources/swingset_ja.properties +${JDKHOME}/demo/jfc/SwingSet2/src/resources/swingset_zh_CN.properties +${JDKHOME}/demo/jfc/SwingSet2/src/resources/title.html +${JDKHOME}/demo/jfc/SwingSet2/src/resources/tree.txt +${JDKHOME}/demo/jfc/TableExample/ +${JDKHOME}/demo/jfc/TableExample/README.txt +${JDKHOME}/demo/jfc/TableExample/TableExample.jar +${JDKHOME}/demo/jfc/TableExample/src/ +${JDKHOME}/demo/jfc/TableExample/src/JDBCAdapter.java +${JDKHOME}/demo/jfc/TableExample/src/OldJTable.java +${JDKHOME}/demo/jfc/TableExample/src/TableExample.java +${JDKHOME}/demo/jfc/TableExample/src/TableExample2.java +${JDKHOME}/demo/jfc/TableExample/src/TableExample3.java +${JDKHOME}/demo/jfc/TableExample/src/TableExample4.java +${JDKHOME}/demo/jfc/TableExample/src/TableMap.java +${JDKHOME}/demo/jfc/TableExample/src/TableSorter.java +${JDKHOME}/demo/jpda/ +${JDKHOME}/demo/jpda/examples.jar +${JDKHOME}/demo/jvmti/ +${JDKHOME}/demo/jvmti/agent_util/ +${JDKHOME}/demo/jvmti/agent_util/README.txt +${JDKHOME}/demo/jvmti/agent_util/src/ +${JDKHOME}/demo/jvmti/agent_util/src/agent_util.c +${JDKHOME}/demo/jvmti/agent_util/src/agent_util.h +${JDKHOME}/demo/jvmti/gctest/ +${JDKHOME}/demo/jvmti/gctest/README.txt +${JDKHOME}/demo/jvmti/gctest/lib/ +${JDKHOME}/demo/jvmti/gctest/lib/libgctest.so +${JDKHOME}/demo/jvmti/gctest/src/ +${JDKHOME}/demo/jvmti/gctest/src/gctest.c +${JDKHOME}/demo/jvmti/gctest/src/sample.makefile.txt +${JDKHOME}/demo/jvmti/heapTracker/ +${JDKHOME}/demo/jvmti/heapTracker/README.txt +${JDKHOME}/demo/jvmti/heapTracker/heapTracker.jar +${JDKHOME}/demo/jvmti/heapTracker/lib/ +${JDKHOME}/demo/jvmti/heapTracker/lib/libheapTracker.so +${JDKHOME}/demo/jvmti/heapTracker/src/ +${JDKHOME}/demo/jvmti/heapTracker/src/HeapTracker.java +${JDKHOME}/demo/jvmti/heapTracker/src/heapTracker.c +${JDKHOME}/demo/jvmti/heapTracker/src/heapTracker.h +${JDKHOME}/demo/jvmti/heapTracker/src/sample.makefile.txt +${JDKHOME}/demo/jvmti/heapViewer/ +${JDKHOME}/demo/jvmti/heapViewer/README.txt +${JDKHOME}/demo/jvmti/heapViewer/lib/ +${JDKHOME}/demo/jvmti/heapViewer/lib/libheapViewer.so +${JDKHOME}/demo/jvmti/heapViewer/src/ +${JDKHOME}/demo/jvmti/heapViewer/src/heapViewer.c +${JDKHOME}/demo/jvmti/heapViewer/src/sample.makefile.txt +${JDKHOME}/demo/jvmti/hprof/ +${JDKHOME}/demo/jvmti/hprof/README.txt +${JDKHOME}/demo/jvmti/hprof/src/ +${JDKHOME}/demo/jvmti/hprof/src/Tracker.java +${JDKHOME}/demo/jvmti/hprof/src/bsd/ +${JDKHOME}/demo/jvmti/hprof/src/bsd/hprof_md.c +${JDKHOME}/demo/jvmti/hprof/src/debug_malloc.c +${JDKHOME}/demo/jvmti/hprof/src/debug_malloc.h +${JDKHOME}/demo/jvmti/hprof/src/hprof.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_b_spec.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_blocks.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_blocks.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_check.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_check.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_class.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_class.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_cpu.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_cpu.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_error.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_error.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_event.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_event.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_frame.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_frame.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_init.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_init.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_io.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_io.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_ioname.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_ioname.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_listener.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_listener.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_loader.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_loader.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_md.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_monitor.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_monitor.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_object.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_object.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_reference.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_reference.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_site.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_site.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_stack.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_stack.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_string.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_string.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_table.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_table.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_tag.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_tag.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_tls.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_tls.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_trace.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_trace.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_tracker.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_tracker.h +${JDKHOME}/demo/jvmti/hprof/src/hprof_util.c +${JDKHOME}/demo/jvmti/hprof/src/hprof_util.h +${JDKHOME}/demo/jvmti/hprof/src/jvm.hprof.txt +${JDKHOME}/demo/jvmti/hprof/src/manual.html +${JDKHOME}/demo/jvmti/hprof/src/sample.makefile.txt +${JDKHOME}/demo/jvmti/java_crw_demo/ +${JDKHOME}/demo/jvmti/java_crw_demo/README.txt +${JDKHOME}/demo/jvmti/java_crw_demo/src/ +${JDKHOME}/demo/jvmti/java_crw_demo/src/java_crw_demo.c +${JDKHOME}/demo/jvmti/java_crw_demo/src/java_crw_demo.h +${JDKHOME}/demo/jvmti/java_crw_demo/src/sample.makefile.txt +${JDKHOME}/demo/jvmti/minst/ +${JDKHOME}/demo/jvmti/minst/README.txt +${JDKHOME}/demo/jvmti/minst/lib/ +${JDKHOME}/demo/jvmti/minst/lib/libminst.so +${JDKHOME}/demo/jvmti/minst/minst.jar +${JDKHOME}/demo/jvmti/minst/src/ +${JDKHOME}/demo/jvmti/minst/src/Minst.java +${JDKHOME}/demo/jvmti/minst/src/minst.c +${JDKHOME}/demo/jvmti/minst/src/minst.h +${JDKHOME}/demo/jvmti/minst/src/sample.makefile.txt +${JDKHOME}/demo/jvmti/mtrace/ +${JDKHOME}/demo/jvmti/mtrace/README.txt +${JDKHOME}/demo/jvmti/mtrace/lib/ +${JDKHOME}/demo/jvmti/mtrace/lib/libmtrace.so +${JDKHOME}/demo/jvmti/mtrace/mtrace.jar +${JDKHOME}/demo/jvmti/mtrace/src/ +${JDKHOME}/demo/jvmti/mtrace/src/Mtrace.java +${JDKHOME}/demo/jvmti/mtrace/src/mtrace.c +${JDKHOME}/demo/jvmti/mtrace/src/mtrace.h +${JDKHOME}/demo/jvmti/mtrace/src/sample.makefile.txt +${JDKHOME}/demo/jvmti/versionCheck/ +${JDKHOME}/demo/jvmti/versionCheck/README.txt +${JDKHOME}/demo/jvmti/versionCheck/lib/ +${JDKHOME}/demo/jvmti/versionCheck/lib/libversionCheck.so +${JDKHOME}/demo/jvmti/versionCheck/src/ +${JDKHOME}/demo/jvmti/versionCheck/src/sample.makefile.txt +${JDKHOME}/demo/jvmti/versionCheck/src/versionCheck.c +${JDKHOME}/demo/jvmti/waiters/ +${JDKHOME}/demo/jvmti/waiters/README.txt +${JDKHOME}/demo/jvmti/waiters/lib/ +${JDKHOME}/demo/jvmti/waiters/lib/libwaiters.so +${JDKHOME}/demo/jvmti/waiters/src/ +${JDKHOME}/demo/jvmti/waiters/src/Agent.cpp +${JDKHOME}/demo/jvmti/waiters/src/Agent.hpp +${JDKHOME}/demo/jvmti/waiters/src/Monitor.cpp +${JDKHOME}/demo/jvmti/waiters/src/Monitor.hpp +${JDKHOME}/demo/jvmti/waiters/src/Thread.cpp +${JDKHOME}/demo/jvmti/waiters/src/Thread.hpp +${JDKHOME}/demo/jvmti/waiters/src/sample.makefile.txt +${JDKHOME}/demo/jvmti/waiters/src/waiters.cpp +${JDKHOME}/demo/management/ +${JDKHOME}/demo/management/FullThreadDump/ +${JDKHOME}/demo/management/FullThreadDump/FullThreadDump.jar +${JDKHOME}/demo/management/FullThreadDump/README.txt +${JDKHOME}/demo/management/FullThreadDump/src/ +${JDKHOME}/demo/management/FullThreadDump/src/Deadlock.java +${JDKHOME}/demo/management/FullThreadDump/src/FullThreadDump.java +${JDKHOME}/demo/management/FullThreadDump/src/ThreadMonitor.java +${JDKHOME}/demo/management/JTop/ +${JDKHOME}/demo/management/JTop/JTop.jar +${JDKHOME}/demo/management/JTop/README.txt +${JDKHOME}/demo/management/JTop/src/ +${JDKHOME}/demo/management/JTop/src/JTop.java +${JDKHOME}/demo/management/JTop/src/JTopPlugin.java +${JDKHOME}/demo/management/JTop/src/META-INF/ +${JDKHOME}/demo/management/JTop/src/META-INF/services/ +${JDKHOME}/demo/management/JTop/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin +${JDKHOME}/demo/management/MemoryMonitor/ +${JDKHOME}/demo/management/MemoryMonitor/MemoryMonitor.jar +${JDKHOME}/demo/management/MemoryMonitor/README.txt +${JDKHOME}/demo/management/MemoryMonitor/src/ +${JDKHOME}/demo/management/MemoryMonitor/src/MemoryMonitor.java +${JDKHOME}/demo/management/VerboseGC/ +${JDKHOME}/demo/management/VerboseGC/README.txt +${JDKHOME}/demo/management/VerboseGC/VerboseGC.jar +${JDKHOME}/demo/management/VerboseGC/src/ +${JDKHOME}/demo/management/VerboseGC/src/PrintGCStat.java +${JDKHOME}/demo/management/VerboseGC/src/VerboseGC.java +${JDKHOME}/demo/nbproject/ +${JDKHOME}/demo/nbproject/README.txt +${JDKHOME}/demo/nbproject/jfc/ +${JDKHOME}/demo/nbproject/jfc/FileChooserDemo/ +${JDKHOME}/demo/nbproject/jfc/FileChooserDemo/build.properties +${JDKHOME}/demo/nbproject/jfc/FileChooserDemo/build.xml +${JDKHOME}/demo/nbproject/jfc/FileChooserDemo/nbproject/ +${JDKHOME}/demo/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml +${JDKHOME}/demo/nbproject/jfc/Font2DTest/ +${JDKHOME}/demo/nbproject/jfc/Font2DTest/build.properties +${JDKHOME}/demo/nbproject/jfc/Font2DTest/build.xml +${JDKHOME}/demo/nbproject/jfc/Font2DTest/nbproject/ +${JDKHOME}/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/Font2DTest/nbproject/project.xml +${JDKHOME}/demo/nbproject/jfc/Java2D/ +${JDKHOME}/demo/nbproject/jfc/Java2D/build.properties +${JDKHOME}/demo/nbproject/jfc/Java2D/build.xml +${JDKHOME}/demo/nbproject/jfc/Java2D/nbproject/ +${JDKHOME}/demo/nbproject/jfc/Java2D/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/Java2D/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/Java2D/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/Java2D/nbproject/project.xml +${JDKHOME}/demo/nbproject/jfc/Metalworks/ +${JDKHOME}/demo/nbproject/jfc/Metalworks/build.properties +${JDKHOME}/demo/nbproject/jfc/Metalworks/build.xml +${JDKHOME}/demo/nbproject/jfc/Metalworks/nbproject/ +${JDKHOME}/demo/nbproject/jfc/Metalworks/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/Metalworks/nbproject/project.xml +${JDKHOME}/demo/nbproject/jfc/Notepad/ +${JDKHOME}/demo/nbproject/jfc/Notepad/build.properties +${JDKHOME}/demo/nbproject/jfc/Notepad/build.xml +${JDKHOME}/demo/nbproject/jfc/Notepad/nbproject/ +${JDKHOME}/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/Notepad/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/Notepad/nbproject/project.xml +${JDKHOME}/demo/nbproject/jfc/SampleTree/ +${JDKHOME}/demo/nbproject/jfc/SampleTree/build.properties +${JDKHOME}/demo/nbproject/jfc/SampleTree/build.xml +${JDKHOME}/demo/nbproject/jfc/SampleTree/nbproject/ +${JDKHOME}/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/SampleTree/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/SampleTree/nbproject/project.xml +${JDKHOME}/demo/nbproject/jfc/Stylepad/ +${JDKHOME}/demo/nbproject/jfc/Stylepad/build.properties +${JDKHOME}/demo/nbproject/jfc/Stylepad/build.xml +${JDKHOME}/demo/nbproject/jfc/Stylepad/nbproject/ +${JDKHOME}/demo/nbproject/jfc/Stylepad/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/Stylepad/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/Stylepad/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/Stylepad/nbproject/project.xml +${JDKHOME}/demo/nbproject/jfc/SwingApplet/ +${JDKHOME}/demo/nbproject/jfc/SwingApplet/build.properties +${JDKHOME}/demo/nbproject/jfc/SwingApplet/build.xml +${JDKHOME}/demo/nbproject/jfc/SwingApplet/nbproject/ +${JDKHOME}/demo/nbproject/jfc/SwingApplet/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/SwingApplet/nbproject/project.xml +${JDKHOME}/demo/nbproject/jfc/SwingSet2/ +${JDKHOME}/demo/nbproject/jfc/SwingSet2/build.properties +${JDKHOME}/demo/nbproject/jfc/SwingSet2/build.xml +${JDKHOME}/demo/nbproject/jfc/SwingSet2/nbproject/ +${JDKHOME}/demo/nbproject/jfc/SwingSet2/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/SwingSet2/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/SwingSet2/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/SwingSet2/nbproject/project.xml +${JDKHOME}/demo/nbproject/jfc/TableExample/ +${JDKHOME}/demo/nbproject/jfc/TableExample/build.properties +${JDKHOME}/demo/nbproject/jfc/TableExample/build.xml +${JDKHOME}/demo/nbproject/jfc/TableExample/nbproject/ +${JDKHOME}/demo/nbproject/jfc/TableExample/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/jfc/TableExample/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/jfc/TableExample/nbproject/project.xml +${JDKHOME}/demo/nbproject/management/ +${JDKHOME}/demo/nbproject/management/FullThreadDump/ +${JDKHOME}/demo/nbproject/management/FullThreadDump/build.properties +${JDKHOME}/demo/nbproject/management/FullThreadDump/build.xml +${JDKHOME}/demo/nbproject/management/FullThreadDump/nbproject/ +${JDKHOME}/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/management/FullThreadDump/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/management/FullThreadDump/nbproject/project.xml +${JDKHOME}/demo/nbproject/management/JTop/ +${JDKHOME}/demo/nbproject/management/JTop/build.properties +${JDKHOME}/demo/nbproject/management/JTop/build.xml +${JDKHOME}/demo/nbproject/management/JTop/nbproject/ +${JDKHOME}/demo/nbproject/management/JTop/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/management/JTop/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/management/JTop/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/management/JTop/nbproject/project.xml +${JDKHOME}/demo/nbproject/management/MemoryMonitor/ +${JDKHOME}/demo/nbproject/management/MemoryMonitor/build.properties +${JDKHOME}/demo/nbproject/management/MemoryMonitor/build.xml +${JDKHOME}/demo/nbproject/management/MemoryMonitor/nbproject/ +${JDKHOME}/demo/nbproject/management/MemoryMonitor/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/management/MemoryMonitor/nbproject/project.xml +${JDKHOME}/demo/nbproject/management/VerboseGC/ +${JDKHOME}/demo/nbproject/management/VerboseGC/build.properties +${JDKHOME}/demo/nbproject/management/VerboseGC/build.xml +${JDKHOME}/demo/nbproject/management/VerboseGC/nbproject/ +${JDKHOME}/demo/nbproject/management/VerboseGC/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/management/VerboseGC/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/management/VerboseGC/nbproject/project.xml +${JDKHOME}/demo/nbproject/project.xml +${JDKHOME}/demo/nbproject/scripting/ +${JDKHOME}/demo/nbproject/scripting/jconsole-plugin/ +${JDKHOME}/demo/nbproject/scripting/jconsole-plugin/build.properties +${JDKHOME}/demo/nbproject/scripting/jconsole-plugin/build.xml +${JDKHOME}/demo/nbproject/scripting/jconsole-plugin/nbproject/ +${JDKHOME}/demo/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml +${JDKHOME}/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml +${JDKHOME}/demo/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml +${JDKHOME}/demo/nbproject/scripting/jconsole-plugin/nbproject/project.xml +${JDKHOME}/demo/scripting/ +${JDKHOME}/demo/scripting/jconsole-plugin/ +${JDKHOME}/demo/scripting/jconsole-plugin/README.txt +${JDKHOME}/demo/scripting/jconsole-plugin/build.xml +${JDKHOME}/demo/scripting/jconsole-plugin/jconsole-plugin.jar +${JDKHOME}/demo/scripting/jconsole-plugin/src/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/META-INF/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/META-INF/services/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin +${JDKHOME}/demo/scripting/jconsole-plugin/src/com/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/com/sun/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/com/sun/demo/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java +${JDKHOME}/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java +${JDKHOME}/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java +${JDKHOME}/demo/scripting/jconsole-plugin/src/resources/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/resources/jconsole.js +${JDKHOME}/demo/scripting/jconsole-plugin/src/scripts/ +${JDKHOME}/demo/scripting/jconsole-plugin/src/scripts/heapdump.js +${JDKHOME}/demo/scripting/jconsole-plugin/src/scripts/hello.js +${JDKHOME}/demo/scripting/jconsole-plugin/src/scripts/invoke.js +${JDKHOME}/demo/scripting/jconsole-plugin/src/scripts/jstack.js +${JDKHOME}/demo/scripting/jconsole-plugin/src/scripts/jtop.js +${JDKHOME}/demo/scripting/jconsole-plugin/src/scripts/sysprops.js +${JDKHOME}/demo/scripting/jconsole-plugin/src/scripts/verbose.js +${JDKHOME}/include/ +${JDKHOME}/include/classfile_constants.h +${JDKHOME}/include/jawt.h +${JDKHOME}/include/jdwpTransport.h +${JDKHOME}/include/jni.h +${JDKHOME}/include/jvmti.h +${JDKHOME}/include/openbsd/ +${JDKHOME}/include/openbsd/jawt_md.h +${JDKHOME}/include/openbsd/jni_md.h +${JDKHOME}/jre/ +${JDKHOME}/jre/COPYRIGHT +${JDKHOME}/jre/LICENSE +${JDKHOME}/jre/README +${JDKHOME}/jre/Welcome.html +${JDKHOME}/jre/bin/ +${JDKHOME}/jre/bin/java +${JDKHOME}/jre/bin/keytool +${JDKHOME}/jre/bin/orbd +${JDKHOME}/jre/bin/pack200 +${JDKHOME}/jre/bin/policytool +${JDKHOME}/jre/bin/rmid +${JDKHOME}/jre/bin/rmiregistry +${JDKHOME}/jre/bin/servertool +${JDKHOME}/jre/bin/tnameserv +${JDKHOME}/jre/bin/unpack200 +${JDKHOME}/jre/lib/ +${JDKHOME}/jre/lib/${MACHINE_ARCH}/ +${JDKHOME}/jre/lib/${MACHINE_ARCH}/headless/ +${JDKHOME}/jre/lib/${MACHINE_ARCH}/headless/libmawt.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/jexec +${JDKHOME}/jre/lib/${MACHINE_ARCH}/jli/ +${JDKHOME}/jre/lib/${MACHINE_ARCH}/jli/libjli.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/jvm.cfg +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libJdbcOdbc.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libattach.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libawt.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdcpr.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdt_socket.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libfontmanager.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libhprof.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libinstrument.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libioser12.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libj2gss.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libj2pcsc.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libj2pkcs11.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjaas_unix.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjava.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjawt.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjdwp.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjpeg.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsig.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsound.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libkcms.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libmanagement.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libmlib_image.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnet.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnio.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnpt.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/librmi.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsplashscreen.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libunpack.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libverify.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/libzip.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/motif21/ +${JDKHOME}/jre/lib/${MACHINE_ARCH}/motif21/libmawt.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/native_threads/ +${JDKHOME}/jre/lib/${MACHINE_ARCH}/native_threads/libhpi.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/ +${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/Xusage.txt +${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjsig.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjvm.so +${JDKHOME}/jre/lib/${MACHINE_ARCH}/xawt/ +${JDKHOME}/jre/lib/${MACHINE_ARCH}/xawt/libmawt.so +${JDKHOME}/jre/lib/applet/ +${JDKHOME}/jre/lib/audio/ +${JDKHOME}/jre/lib/audio/soundbank.gm +${JDKHOME}/jre/lib/calendars.properties +${JDKHOME}/jre/lib/charsets.jar +${JDKHOME}/jre/lib/classlist +${JDKHOME}/jre/lib/cmm/ +${JDKHOME}/jre/lib/cmm/CIEXYZ.pf +${JDKHOME}/jre/lib/cmm/GRAY.pf +${JDKHOME}/jre/lib/cmm/LINEAR_RGB.pf +${JDKHOME}/jre/lib/cmm/PYCC.pf +${JDKHOME}/jre/lib/cmm/sRGB.pf +${JDKHOME}/jre/lib/content-types.properties +${JDKHOME}/jre/lib/currency.data +${JDKHOME}/jre/lib/ext/ +${JDKHOME}/jre/lib/ext/dnsns.jar +${JDKHOME}/jre/lib/ext/localedata.jar +${JDKHOME}/jre/lib/ext/meta-index +${JDKHOME}/jre/lib/ext/sunjce_provider.jar +${JDKHOME}/jre/lib/ext/sunpkcs11.jar +${JDKHOME}/jre/lib/flavormap.properties +${JDKHOME}/jre/lib/fontconfig.bfc +${JDKHOME}/jre/lib/fontconfig.properties.src +${JDKHOME}/jre/lib/fonts/ +${JDKHOME}/jre/lib/fonts/LucidaBrightDemiBold.ttf +${JDKHOME}/jre/lib/fonts/LucidaBrightDemiItalic.ttf +${JDKHOME}/jre/lib/fonts/LucidaBrightItalic.ttf +${JDKHOME}/jre/lib/fonts/LucidaBrightRegular.ttf +${JDKHOME}/jre/lib/fonts/LucidaSansDemiBold.ttf +${JDKHOME}/jre/lib/fonts/LucidaSansRegular.ttf +${JDKHOME}/jre/lib/fonts/LucidaTypewriterBold.ttf +${JDKHOME}/jre/lib/fonts/LucidaTypewriterRegular.ttf +${JDKHOME}/jre/lib/fonts/fonts.dir +${JDKHOME}/jre/lib/im/ +${JDKHOME}/jre/lib/im/indicim.jar +${JDKHOME}/jre/lib/im/thaiim.jar +${JDKHOME}/jre/lib/images/ +${JDKHOME}/jre/lib/images/cursors/ +${JDKHOME}/jre/lib/images/cursors/cursors.properties +${JDKHOME}/jre/lib/images/cursors/invalid32x32.gif +${JDKHOME}/jre/lib/images/cursors/motif_CopyDrop32x32.gif +${JDKHOME}/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif +${JDKHOME}/jre/lib/images/cursors/motif_LinkDrop32x32.gif +${JDKHOME}/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif +${JDKHOME}/jre/lib/images/cursors/motif_MoveDrop32x32.gif +${JDKHOME}/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif +${JDKHOME}/jre/lib/jce.jar +${JDKHOME}/jre/lib/jsse.jar +${JDKHOME}/jre/lib/jvm.hprof.txt +${JDKHOME}/jre/lib/logging.properties +${JDKHOME}/jre/lib/management/ +${JDKHOME}/jre/lib/management-agent.jar +${JDKHOME}/jre/lib/management/jmxremote.access +${JDKHOME}/jre/lib/management/jmxremote.password.template +${JDKHOME}/jre/lib/management/management.properties +${JDKHOME}/jre/lib/management/snmp.acl.template +${JDKHOME}/jre/lib/meta-index +${JDKHOME}/jre/lib/net.properties +${JDKHOME}/jre/lib/oblique-fonts/ +${JDKHOME}/jre/lib/oblique-fonts/LucidaSansDemiOblique.ttf +${JDKHOME}/jre/lib/oblique-fonts/LucidaSansOblique.ttf +${JDKHOME}/jre/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf +${JDKHOME}/jre/lib/oblique-fonts/LucidaTypewriterOblique.ttf +${JDKHOME}/jre/lib/oblique-fonts/fonts.dir +${JDKHOME}/jre/lib/psfont.properties.ja +${JDKHOME}/jre/lib/psfontj2d.properties +${JDKHOME}/jre/lib/resources.jar +${JDKHOME}/jre/lib/rt.jar +${JDKHOME}/jre/lib/security/ +${JDKHOME}/jre/lib/security/US_export_policy.jar +${JDKHOME}/jre/lib/security/cacerts +${JDKHOME}/jre/lib/security/java.policy +${JDKHOME}/jre/lib/security/java.security +${JDKHOME}/jre/lib/security/local_policy.jar +${JDKHOME}/jre/lib/sound.properties +${JDKHOME}/jre/lib/zi/ +${JDKHOME}/jre/lib/zi/Africa/ +${JDKHOME}/jre/lib/zi/Africa/Abidjan +${JDKHOME}/jre/lib/zi/Africa/Accra +${JDKHOME}/jre/lib/zi/Africa/Addis_Ababa +${JDKHOME}/jre/lib/zi/Africa/Algiers +${JDKHOME}/jre/lib/zi/Africa/Asmara +${JDKHOME}/jre/lib/zi/Africa/Bamako +${JDKHOME}/jre/lib/zi/Africa/Bangui +${JDKHOME}/jre/lib/zi/Africa/Banjul +${JDKHOME}/jre/lib/zi/Africa/Bissau +${JDKHOME}/jre/lib/zi/Africa/Blantyre +${JDKHOME}/jre/lib/zi/Africa/Brazzaville +${JDKHOME}/jre/lib/zi/Africa/Bujumbura +${JDKHOME}/jre/lib/zi/Africa/Cairo +${JDKHOME}/jre/lib/zi/Africa/Casablanca +${JDKHOME}/jre/lib/zi/Africa/Ceuta +${JDKHOME}/jre/lib/zi/Africa/Conakry +${JDKHOME}/jre/lib/zi/Africa/Dakar +${JDKHOME}/jre/lib/zi/Africa/Dar_es_Salaam +${JDKHOME}/jre/lib/zi/Africa/Djibouti +${JDKHOME}/jre/lib/zi/Africa/Douala +${JDKHOME}/jre/lib/zi/Africa/El_Aaiun +${JDKHOME}/jre/lib/zi/Africa/Freetown +${JDKHOME}/jre/lib/zi/Africa/Gaborone +${JDKHOME}/jre/lib/zi/Africa/Harare +${JDKHOME}/jre/lib/zi/Africa/Johannesburg +${JDKHOME}/jre/lib/zi/Africa/Kampala +${JDKHOME}/jre/lib/zi/Africa/Khartoum +${JDKHOME}/jre/lib/zi/Africa/Kigali +${JDKHOME}/jre/lib/zi/Africa/Kinshasa +${JDKHOME}/jre/lib/zi/Africa/Lagos +${JDKHOME}/jre/lib/zi/Africa/Libreville +${JDKHOME}/jre/lib/zi/Africa/Lome +${JDKHOME}/jre/lib/zi/Africa/Luanda +${JDKHOME}/jre/lib/zi/Africa/Lubumbashi +${JDKHOME}/jre/lib/zi/Africa/Lusaka +${JDKHOME}/jre/lib/zi/Africa/Malabo +${JDKHOME}/jre/lib/zi/Africa/Maputo +${JDKHOME}/jre/lib/zi/Africa/Maseru +${JDKHOME}/jre/lib/zi/Africa/Mbabane +${JDKHOME}/jre/lib/zi/Africa/Mogadishu +${JDKHOME}/jre/lib/zi/Africa/Monrovia +${JDKHOME}/jre/lib/zi/Africa/Nairobi +${JDKHOME}/jre/lib/zi/Africa/Ndjamena +${JDKHOME}/jre/lib/zi/Africa/Niamey +${JDKHOME}/jre/lib/zi/Africa/Nouakchott +${JDKHOME}/jre/lib/zi/Africa/Ouagadougou +${JDKHOME}/jre/lib/zi/Africa/Porto-Novo +${JDKHOME}/jre/lib/zi/Africa/Sao_Tome +${JDKHOME}/jre/lib/zi/Africa/Tripoli +${JDKHOME}/jre/lib/zi/Africa/Tunis +${JDKHOME}/jre/lib/zi/Africa/Windhoek +${JDKHOME}/jre/lib/zi/America/ +${JDKHOME}/jre/lib/zi/America/Adak +${JDKHOME}/jre/lib/zi/America/Anchorage +${JDKHOME}/jre/lib/zi/America/Anguilla +${JDKHOME}/jre/lib/zi/America/Antigua +${JDKHOME}/jre/lib/zi/America/Araguaina +${JDKHOME}/jre/lib/zi/America/Argentina/ +${JDKHOME}/jre/lib/zi/America/Argentina/Buenos_Aires +${JDKHOME}/jre/lib/zi/America/Argentina/Catamarca +${JDKHOME}/jre/lib/zi/America/Argentina/Cordoba +${JDKHOME}/jre/lib/zi/America/Argentina/Jujuy +${JDKHOME}/jre/lib/zi/America/Argentina/La_Rioja +${JDKHOME}/jre/lib/zi/America/Argentina/Mendoza +${JDKHOME}/jre/lib/zi/America/Argentina/Rio_Gallegos +${JDKHOME}/jre/lib/zi/America/Argentina/San_Juan +${JDKHOME}/jre/lib/zi/America/Argentina/Tucuman +${JDKHOME}/jre/lib/zi/America/Argentina/Ushuaia +${JDKHOME}/jre/lib/zi/America/Aruba +${JDKHOME}/jre/lib/zi/America/Asuncion +${JDKHOME}/jre/lib/zi/America/Atikokan +${JDKHOME}/jre/lib/zi/America/Bahia +${JDKHOME}/jre/lib/zi/America/Barbados +${JDKHOME}/jre/lib/zi/America/Belem +${JDKHOME}/jre/lib/zi/America/Belize +${JDKHOME}/jre/lib/zi/America/Blanc-Sablon +${JDKHOME}/jre/lib/zi/America/Boa_Vista +${JDKHOME}/jre/lib/zi/America/Bogota +${JDKHOME}/jre/lib/zi/America/Boise +${JDKHOME}/jre/lib/zi/America/Cambridge_Bay +${JDKHOME}/jre/lib/zi/America/Campo_Grande +${JDKHOME}/jre/lib/zi/America/Cancun +${JDKHOME}/jre/lib/zi/America/Caracas +${JDKHOME}/jre/lib/zi/America/Cayenne +${JDKHOME}/jre/lib/zi/America/Cayman +${JDKHOME}/jre/lib/zi/America/Chicago +${JDKHOME}/jre/lib/zi/America/Chihuahua +${JDKHOME}/jre/lib/zi/America/Costa_Rica +${JDKHOME}/jre/lib/zi/America/Cuiaba +${JDKHOME}/jre/lib/zi/America/Curacao +${JDKHOME}/jre/lib/zi/America/Danmarkshavn +${JDKHOME}/jre/lib/zi/America/Dawson +${JDKHOME}/jre/lib/zi/America/Dawson_Creek +${JDKHOME}/jre/lib/zi/America/Denver +${JDKHOME}/jre/lib/zi/America/Detroit +${JDKHOME}/jre/lib/zi/America/Dominica +${JDKHOME}/jre/lib/zi/America/Edmonton +${JDKHOME}/jre/lib/zi/America/Eirunepe +${JDKHOME}/jre/lib/zi/America/El_Salvador +${JDKHOME}/jre/lib/zi/America/Fortaleza +${JDKHOME}/jre/lib/zi/America/Glace_Bay +${JDKHOME}/jre/lib/zi/America/Godthab +${JDKHOME}/jre/lib/zi/America/Goose_Bay +${JDKHOME}/jre/lib/zi/America/Grand_Turk +${JDKHOME}/jre/lib/zi/America/Grenada +${JDKHOME}/jre/lib/zi/America/Guadeloupe +${JDKHOME}/jre/lib/zi/America/Guatemala +${JDKHOME}/jre/lib/zi/America/Guayaquil +${JDKHOME}/jre/lib/zi/America/Guyana +${JDKHOME}/jre/lib/zi/America/Halifax +${JDKHOME}/jre/lib/zi/America/Havana +${JDKHOME}/jre/lib/zi/America/Hermosillo +${JDKHOME}/jre/lib/zi/America/Indiana/ +${JDKHOME}/jre/lib/zi/America/Indiana/Indianapolis +${JDKHOME}/jre/lib/zi/America/Indiana/Knox +${JDKHOME}/jre/lib/zi/America/Indiana/Marengo +${JDKHOME}/jre/lib/zi/America/Indiana/Petersburg +${JDKHOME}/jre/lib/zi/America/Indiana/Vevay +${JDKHOME}/jre/lib/zi/America/Indiana/Vincennes +${JDKHOME}/jre/lib/zi/America/Indiana/Winamac +${JDKHOME}/jre/lib/zi/America/Inuvik +${JDKHOME}/jre/lib/zi/America/Iqaluit +${JDKHOME}/jre/lib/zi/America/Jamaica +${JDKHOME}/jre/lib/zi/America/Juneau +${JDKHOME}/jre/lib/zi/America/Kentucky/ +${JDKHOME}/jre/lib/zi/America/Kentucky/Louisville +${JDKHOME}/jre/lib/zi/America/Kentucky/Monticello +${JDKHOME}/jre/lib/zi/America/La_Paz +${JDKHOME}/jre/lib/zi/America/Lima +${JDKHOME}/jre/lib/zi/America/Los_Angeles +${JDKHOME}/jre/lib/zi/America/Maceio +${JDKHOME}/jre/lib/zi/America/Managua +${JDKHOME}/jre/lib/zi/America/Manaus +${JDKHOME}/jre/lib/zi/America/Martinique +${JDKHOME}/jre/lib/zi/America/Mazatlan +${JDKHOME}/jre/lib/zi/America/Menominee +${JDKHOME}/jre/lib/zi/America/Merida +${JDKHOME}/jre/lib/zi/America/Mexico_City +${JDKHOME}/jre/lib/zi/America/Miquelon +${JDKHOME}/jre/lib/zi/America/Moncton +${JDKHOME}/jre/lib/zi/America/Monterrey +${JDKHOME}/jre/lib/zi/America/Montevideo +${JDKHOME}/jre/lib/zi/America/Montreal +${JDKHOME}/jre/lib/zi/America/Montserrat +${JDKHOME}/jre/lib/zi/America/Nassau +${JDKHOME}/jre/lib/zi/America/New_York +${JDKHOME}/jre/lib/zi/America/Nipigon +${JDKHOME}/jre/lib/zi/America/Nome +${JDKHOME}/jre/lib/zi/America/Noronha +${JDKHOME}/jre/lib/zi/America/North_Dakota/ +${JDKHOME}/jre/lib/zi/America/North_Dakota/Center +${JDKHOME}/jre/lib/zi/America/North_Dakota/New_Salem +${JDKHOME}/jre/lib/zi/America/Panama +${JDKHOME}/jre/lib/zi/America/Pangnirtung +${JDKHOME}/jre/lib/zi/America/Paramaribo +${JDKHOME}/jre/lib/zi/America/Phoenix +${JDKHOME}/jre/lib/zi/America/Port-au-Prince +${JDKHOME}/jre/lib/zi/America/Port_of_Spain +${JDKHOME}/jre/lib/zi/America/Porto_Velho +${JDKHOME}/jre/lib/zi/America/Puerto_Rico +${JDKHOME}/jre/lib/zi/America/Rainy_River +${JDKHOME}/jre/lib/zi/America/Rankin_Inlet +${JDKHOME}/jre/lib/zi/America/Recife +${JDKHOME}/jre/lib/zi/America/Regina +${JDKHOME}/jre/lib/zi/America/Resolute +${JDKHOME}/jre/lib/zi/America/Rio_Branco +${JDKHOME}/jre/lib/zi/America/Santiago +${JDKHOME}/jre/lib/zi/America/Santo_Domingo +${JDKHOME}/jre/lib/zi/America/Sao_Paulo +${JDKHOME}/jre/lib/zi/America/Scoresbysund +${JDKHOME}/jre/lib/zi/America/St_Johns +${JDKHOME}/jre/lib/zi/America/St_Kitts +${JDKHOME}/jre/lib/zi/America/St_Lucia +${JDKHOME}/jre/lib/zi/America/St_Thomas +${JDKHOME}/jre/lib/zi/America/St_Vincent +${JDKHOME}/jre/lib/zi/America/Swift_Current +${JDKHOME}/jre/lib/zi/America/Tegucigalpa +${JDKHOME}/jre/lib/zi/America/Thule +${JDKHOME}/jre/lib/zi/America/Thunder_Bay +${JDKHOME}/jre/lib/zi/America/Tijuana +${JDKHOME}/jre/lib/zi/America/Toronto +${JDKHOME}/jre/lib/zi/America/Tortola +${JDKHOME}/jre/lib/zi/America/Vancouver +${JDKHOME}/jre/lib/zi/America/Whitehorse +${JDKHOME}/jre/lib/zi/America/Winnipeg +${JDKHOME}/jre/lib/zi/America/Yakutat +${JDKHOME}/jre/lib/zi/America/Yellowknife +${JDKHOME}/jre/lib/zi/Antarctica/ +${JDKHOME}/jre/lib/zi/Antarctica/Casey +${JDKHOME}/jre/lib/zi/Antarctica/Davis +${JDKHOME}/jre/lib/zi/Antarctica/DumontDUrville +${JDKHOME}/jre/lib/zi/Antarctica/Mawson +${JDKHOME}/jre/lib/zi/Antarctica/McMurdo +${JDKHOME}/jre/lib/zi/Antarctica/Palmer +${JDKHOME}/jre/lib/zi/Antarctica/Rothera +${JDKHOME}/jre/lib/zi/Antarctica/Syowa +${JDKHOME}/jre/lib/zi/Antarctica/Vostok +${JDKHOME}/jre/lib/zi/Asia/ +${JDKHOME}/jre/lib/zi/Asia/Aden +${JDKHOME}/jre/lib/zi/Asia/Almaty +${JDKHOME}/jre/lib/zi/Asia/Amman +${JDKHOME}/jre/lib/zi/Asia/Anadyr +${JDKHOME}/jre/lib/zi/Asia/Aqtau +${JDKHOME}/jre/lib/zi/Asia/Aqtobe +${JDKHOME}/jre/lib/zi/Asia/Ashgabat +${JDKHOME}/jre/lib/zi/Asia/Baghdad +${JDKHOME}/jre/lib/zi/Asia/Bahrain +${JDKHOME}/jre/lib/zi/Asia/Baku +${JDKHOME}/jre/lib/zi/Asia/Bangkok +${JDKHOME}/jre/lib/zi/Asia/Beirut +${JDKHOME}/jre/lib/zi/Asia/Bishkek +${JDKHOME}/jre/lib/zi/Asia/Brunei +${JDKHOME}/jre/lib/zi/Asia/Calcutta +${JDKHOME}/jre/lib/zi/Asia/Choibalsan +${JDKHOME}/jre/lib/zi/Asia/Chongqing +${JDKHOME}/jre/lib/zi/Asia/Colombo +${JDKHOME}/jre/lib/zi/Asia/Damascus +${JDKHOME}/jre/lib/zi/Asia/Dhaka +${JDKHOME}/jre/lib/zi/Asia/Dili +${JDKHOME}/jre/lib/zi/Asia/Dubai +${JDKHOME}/jre/lib/zi/Asia/Dushanbe +${JDKHOME}/jre/lib/zi/Asia/Gaza +${JDKHOME}/jre/lib/zi/Asia/Harbin +${JDKHOME}/jre/lib/zi/Asia/Hong_Kong +${JDKHOME}/jre/lib/zi/Asia/Hovd +${JDKHOME}/jre/lib/zi/Asia/Irkutsk +${JDKHOME}/jre/lib/zi/Asia/Jakarta +${JDKHOME}/jre/lib/zi/Asia/Jayapura +${JDKHOME}/jre/lib/zi/Asia/Jerusalem +${JDKHOME}/jre/lib/zi/Asia/Kabul +${JDKHOME}/jre/lib/zi/Asia/Kamchatka +${JDKHOME}/jre/lib/zi/Asia/Karachi +${JDKHOME}/jre/lib/zi/Asia/Kashgar +${JDKHOME}/jre/lib/zi/Asia/Katmandu +${JDKHOME}/jre/lib/zi/Asia/Krasnoyarsk +${JDKHOME}/jre/lib/zi/Asia/Kuala_Lumpur +${JDKHOME}/jre/lib/zi/Asia/Kuching +${JDKHOME}/jre/lib/zi/Asia/Kuwait +${JDKHOME}/jre/lib/zi/Asia/Macau +${JDKHOME}/jre/lib/zi/Asia/Magadan +${JDKHOME}/jre/lib/zi/Asia/Makassar +${JDKHOME}/jre/lib/zi/Asia/Manila +${JDKHOME}/jre/lib/zi/Asia/Muscat +${JDKHOME}/jre/lib/zi/Asia/Nicosia +${JDKHOME}/jre/lib/zi/Asia/Novosibirsk +${JDKHOME}/jre/lib/zi/Asia/Omsk +${JDKHOME}/jre/lib/zi/Asia/Oral +${JDKHOME}/jre/lib/zi/Asia/Phnom_Penh +${JDKHOME}/jre/lib/zi/Asia/Pontianak +${JDKHOME}/jre/lib/zi/Asia/Pyongyang +${JDKHOME}/jre/lib/zi/Asia/Qatar +${JDKHOME}/jre/lib/zi/Asia/Qyzylorda +${JDKHOME}/jre/lib/zi/Asia/Rangoon +${JDKHOME}/jre/lib/zi/Asia/Riyadh +${JDKHOME}/jre/lib/zi/Asia/Riyadh87 +${JDKHOME}/jre/lib/zi/Asia/Riyadh88 +${JDKHOME}/jre/lib/zi/Asia/Riyadh89 +${JDKHOME}/jre/lib/zi/Asia/Saigon +${JDKHOME}/jre/lib/zi/Asia/Sakhalin +${JDKHOME}/jre/lib/zi/Asia/Samarkand +${JDKHOME}/jre/lib/zi/Asia/Seoul +${JDKHOME}/jre/lib/zi/Asia/Shanghai +${JDKHOME}/jre/lib/zi/Asia/Singapore +${JDKHOME}/jre/lib/zi/Asia/Taipei +${JDKHOME}/jre/lib/zi/Asia/Tashkent +${JDKHOME}/jre/lib/zi/Asia/Tbilisi +${JDKHOME}/jre/lib/zi/Asia/Tehran +${JDKHOME}/jre/lib/zi/Asia/Thimphu +${JDKHOME}/jre/lib/zi/Asia/Tokyo +${JDKHOME}/jre/lib/zi/Asia/Ulaanbaatar +${JDKHOME}/jre/lib/zi/Asia/Urumqi +${JDKHOME}/jre/lib/zi/Asia/Vientiane +${JDKHOME}/jre/lib/zi/Asia/Vladivostok +${JDKHOME}/jre/lib/zi/Asia/Yakutsk +${JDKHOME}/jre/lib/zi/Asia/Yekaterinburg +${JDKHOME}/jre/lib/zi/Asia/Yerevan +${JDKHOME}/jre/lib/zi/Atlantic/ +${JDKHOME}/jre/lib/zi/Atlantic/Azores +${JDKHOME}/jre/lib/zi/Atlantic/Bermuda +${JDKHOME}/jre/lib/zi/Atlantic/Canary +${JDKHOME}/jre/lib/zi/Atlantic/Cape_Verde +${JDKHOME}/jre/lib/zi/Atlantic/Faroe +${JDKHOME}/jre/lib/zi/Atlantic/Madeira +${JDKHOME}/jre/lib/zi/Atlantic/Reykjavik +${JDKHOME}/jre/lib/zi/Atlantic/South_Georgia +${JDKHOME}/jre/lib/zi/Atlantic/St_Helena +${JDKHOME}/jre/lib/zi/Atlantic/Stanley +${JDKHOME}/jre/lib/zi/Australia/ +${JDKHOME}/jre/lib/zi/Australia/Adelaide +${JDKHOME}/jre/lib/zi/Australia/Brisbane +${JDKHOME}/jre/lib/zi/Australia/Broken_Hill +${JDKHOME}/jre/lib/zi/Australia/Currie +${JDKHOME}/jre/lib/zi/Australia/Darwin +${JDKHOME}/jre/lib/zi/Australia/Eucla +${JDKHOME}/jre/lib/zi/Australia/Hobart +${JDKHOME}/jre/lib/zi/Australia/Lindeman +${JDKHOME}/jre/lib/zi/Australia/Lord_Howe +${JDKHOME}/jre/lib/zi/Australia/Melbourne +${JDKHOME}/jre/lib/zi/Australia/Perth +${JDKHOME}/jre/lib/zi/Australia/Sydney +${JDKHOME}/jre/lib/zi/CET +${JDKHOME}/jre/lib/zi/CST6CDT +${JDKHOME}/jre/lib/zi/EET +${JDKHOME}/jre/lib/zi/EST +${JDKHOME}/jre/lib/zi/EST5EDT +${JDKHOME}/jre/lib/zi/Etc/ +${JDKHOME}/jre/lib/zi/Etc/GMT +${JDKHOME}/jre/lib/zi/Etc/GMT+1 +${JDKHOME}/jre/lib/zi/Etc/GMT+10 +${JDKHOME}/jre/lib/zi/Etc/GMT+11 +${JDKHOME}/jre/lib/zi/Etc/GMT+12 +${JDKHOME}/jre/lib/zi/Etc/GMT+2 +${JDKHOME}/jre/lib/zi/Etc/GMT+3 +${JDKHOME}/jre/lib/zi/Etc/GMT+4 +${JDKHOME}/jre/lib/zi/Etc/GMT+5 +${JDKHOME}/jre/lib/zi/Etc/GMT+6 +${JDKHOME}/jre/lib/zi/Etc/GMT+7 +${JDKHOME}/jre/lib/zi/Etc/GMT+8 +${JDKHOME}/jre/lib/zi/Etc/GMT+9 +${JDKHOME}/jre/lib/zi/Etc/GMT-1 +${JDKHOME}/jre/lib/zi/Etc/GMT-10 +${JDKHOME}/jre/lib/zi/Etc/GMT-11 +${JDKHOME}/jre/lib/zi/Etc/GMT-12 +${JDKHOME}/jre/lib/zi/Etc/GMT-13 +${JDKHOME}/jre/lib/zi/Etc/GMT-14 +${JDKHOME}/jre/lib/zi/Etc/GMT-2 +${JDKHOME}/jre/lib/zi/Etc/GMT-3 +${JDKHOME}/jre/lib/zi/Etc/GMT-4 +${JDKHOME}/jre/lib/zi/Etc/GMT-5 +${JDKHOME}/jre/lib/zi/Etc/GMT-6 +${JDKHOME}/jre/lib/zi/Etc/GMT-7 +${JDKHOME}/jre/lib/zi/Etc/GMT-8 +${JDKHOME}/jre/lib/zi/Etc/GMT-9 +${JDKHOME}/jre/lib/zi/Etc/UCT +${JDKHOME}/jre/lib/zi/Etc/UTC +${JDKHOME}/jre/lib/zi/Europe/ +${JDKHOME}/jre/lib/zi/Europe/Amsterdam +${JDKHOME}/jre/lib/zi/Europe/Andorra +${JDKHOME}/jre/lib/zi/Europe/Athens +${JDKHOME}/jre/lib/zi/Europe/Belgrade +${JDKHOME}/jre/lib/zi/Europe/Berlin +${JDKHOME}/jre/lib/zi/Europe/Brussels +${JDKHOME}/jre/lib/zi/Europe/Bucharest +${JDKHOME}/jre/lib/zi/Europe/Budapest +${JDKHOME}/jre/lib/zi/Europe/Chisinau +${JDKHOME}/jre/lib/zi/Europe/Copenhagen +${JDKHOME}/jre/lib/zi/Europe/Dublin +${JDKHOME}/jre/lib/zi/Europe/Gibraltar +${JDKHOME}/jre/lib/zi/Europe/Helsinki +${JDKHOME}/jre/lib/zi/Europe/Istanbul +${JDKHOME}/jre/lib/zi/Europe/Kaliningrad +${JDKHOME}/jre/lib/zi/Europe/Kiev +${JDKHOME}/jre/lib/zi/Europe/Lisbon +${JDKHOME}/jre/lib/zi/Europe/London +${JDKHOME}/jre/lib/zi/Europe/Luxembourg +${JDKHOME}/jre/lib/zi/Europe/Madrid +${JDKHOME}/jre/lib/zi/Europe/Malta +${JDKHOME}/jre/lib/zi/Europe/Minsk +${JDKHOME}/jre/lib/zi/Europe/Monaco +${JDKHOME}/jre/lib/zi/Europe/Moscow +${JDKHOME}/jre/lib/zi/Europe/Oslo +${JDKHOME}/jre/lib/zi/Europe/Paris +${JDKHOME}/jre/lib/zi/Europe/Prague +${JDKHOME}/jre/lib/zi/Europe/Riga +${JDKHOME}/jre/lib/zi/Europe/Rome +${JDKHOME}/jre/lib/zi/Europe/Samara +${JDKHOME}/jre/lib/zi/Europe/Simferopol +${JDKHOME}/jre/lib/zi/Europe/Sofia +${JDKHOME}/jre/lib/zi/Europe/Stockholm +${JDKHOME}/jre/lib/zi/Europe/Tallinn +${JDKHOME}/jre/lib/zi/Europe/Tirane +${JDKHOME}/jre/lib/zi/Europe/Uzhgorod +${JDKHOME}/jre/lib/zi/Europe/Vaduz +${JDKHOME}/jre/lib/zi/Europe/Vienna +${JDKHOME}/jre/lib/zi/Europe/Vilnius +${JDKHOME}/jre/lib/zi/Europe/Volgograd +${JDKHOME}/jre/lib/zi/Europe/Warsaw +${JDKHOME}/jre/lib/zi/Europe/Zaporozhye +${JDKHOME}/jre/lib/zi/Europe/Zurich +${JDKHOME}/jre/lib/zi/GMT +${JDKHOME}/jre/lib/zi/HST +${JDKHOME}/jre/lib/zi/Indian/ +${JDKHOME}/jre/lib/zi/Indian/Antananarivo +${JDKHOME}/jre/lib/zi/Indian/Chagos +${JDKHOME}/jre/lib/zi/Indian/Christmas +${JDKHOME}/jre/lib/zi/Indian/Cocos +${JDKHOME}/jre/lib/zi/Indian/Comoro +${JDKHOME}/jre/lib/zi/Indian/Kerguelen +${JDKHOME}/jre/lib/zi/Indian/Mahe +${JDKHOME}/jre/lib/zi/Indian/Maldives +${JDKHOME}/jre/lib/zi/Indian/Mauritius +${JDKHOME}/jre/lib/zi/Indian/Mayotte +${JDKHOME}/jre/lib/zi/Indian/Reunion +${JDKHOME}/jre/lib/zi/MET +${JDKHOME}/jre/lib/zi/MST +${JDKHOME}/jre/lib/zi/MST7MDT +${JDKHOME}/jre/lib/zi/PST8PDT +${JDKHOME}/jre/lib/zi/Pacific/ +${JDKHOME}/jre/lib/zi/Pacific/Apia +${JDKHOME}/jre/lib/zi/Pacific/Auckland +${JDKHOME}/jre/lib/zi/Pacific/Chatham +${JDKHOME}/jre/lib/zi/Pacific/Easter +${JDKHOME}/jre/lib/zi/Pacific/Efate +${JDKHOME}/jre/lib/zi/Pacific/Enderbury +${JDKHOME}/jre/lib/zi/Pacific/Fakaofo +${JDKHOME}/jre/lib/zi/Pacific/Fiji +${JDKHOME}/jre/lib/zi/Pacific/Funafuti +${JDKHOME}/jre/lib/zi/Pacific/Galapagos +${JDKHOME}/jre/lib/zi/Pacific/Gambier +${JDKHOME}/jre/lib/zi/Pacific/Guadalcanal +${JDKHOME}/jre/lib/zi/Pacific/Guam +${JDKHOME}/jre/lib/zi/Pacific/Honolulu +${JDKHOME}/jre/lib/zi/Pacific/Johnston +${JDKHOME}/jre/lib/zi/Pacific/Kiritimati +${JDKHOME}/jre/lib/zi/Pacific/Kosrae +${JDKHOME}/jre/lib/zi/Pacific/Kwajalein +${JDKHOME}/jre/lib/zi/Pacific/Majuro +${JDKHOME}/jre/lib/zi/Pacific/Marquesas +${JDKHOME}/jre/lib/zi/Pacific/Midway +${JDKHOME}/jre/lib/zi/Pacific/Nauru +${JDKHOME}/jre/lib/zi/Pacific/Niue +${JDKHOME}/jre/lib/zi/Pacific/Norfolk +${JDKHOME}/jre/lib/zi/Pacific/Noumea +${JDKHOME}/jre/lib/zi/Pacific/Pago_Pago +${JDKHOME}/jre/lib/zi/Pacific/Palau +${JDKHOME}/jre/lib/zi/Pacific/Pitcairn +${JDKHOME}/jre/lib/zi/Pacific/Ponape +${JDKHOME}/jre/lib/zi/Pacific/Port_Moresby +${JDKHOME}/jre/lib/zi/Pacific/Rarotonga +${JDKHOME}/jre/lib/zi/Pacific/Saipan +${JDKHOME}/jre/lib/zi/Pacific/Tahiti +${JDKHOME}/jre/lib/zi/Pacific/Tarawa +${JDKHOME}/jre/lib/zi/Pacific/Tongatapu +${JDKHOME}/jre/lib/zi/Pacific/Truk +${JDKHOME}/jre/lib/zi/Pacific/Wake +${JDKHOME}/jre/lib/zi/Pacific/Wallis +${JDKHOME}/jre/lib/zi/SystemV/ +${JDKHOME}/jre/lib/zi/SystemV/AST4 +${JDKHOME}/jre/lib/zi/SystemV/AST4ADT +${JDKHOME}/jre/lib/zi/SystemV/CST6 +${JDKHOME}/jre/lib/zi/SystemV/CST6CDT +${JDKHOME}/jre/lib/zi/SystemV/EST5 +${JDKHOME}/jre/lib/zi/SystemV/EST5EDT +${JDKHOME}/jre/lib/zi/SystemV/HST10 +${JDKHOME}/jre/lib/zi/SystemV/MST7 +${JDKHOME}/jre/lib/zi/SystemV/MST7MDT +${JDKHOME}/jre/lib/zi/SystemV/PST8 +${JDKHOME}/jre/lib/zi/SystemV/PST8PDT +${JDKHOME}/jre/lib/zi/SystemV/YST9 +${JDKHOME}/jre/lib/zi/SystemV/YST9YDT +${JDKHOME}/jre/lib/zi/WET +${JDKHOME}/jre/lib/zi/ZoneInfoMappings +${JDKHOME}/lib/ +${JDKHOME}/lib/ct.sym +${JDKHOME}/lib/dt.jar +${JDKHOME}/lib/ir.idl +${JDKHOME}/lib/jconsole.jar +${JDKHOME}/lib/orb.idl +${JDKHOME}/lib/tools.jar +@mandir ${JDKHOME}/man/ +${JDKHOME}/man/man1/ +@man ${JDKHOME}/man/man1/appletviewer.1 +@man ${JDKHOME}/man/man1/apt.1 +@man ${JDKHOME}/man/man1/extcheck.1 +@man ${JDKHOME}/man/man1/idlj.1 +@man ${JDKHOME}/man/man1/jar.1 +@man ${JDKHOME}/man/man1/jarsigner.1 +@man ${JDKHOME}/man/man1/java.1 +@man ${JDKHOME}/man/man1/javac.1 +@man ${JDKHOME}/man/man1/javadoc.1 +@man ${JDKHOME}/man/man1/javah.1 +@man ${JDKHOME}/man/man1/javap.1 +@comment @man ${JDKHOME}/man/man1/javaws.1 +@man ${JDKHOME}/man/man1/jconsole.1 +@man ${JDKHOME}/man/man1/jdb.1 +@man ${JDKHOME}/man/man1/jhat.1 +@man ${JDKHOME}/man/man1/jinfo.1 +@man ${JDKHOME}/man/man1/jmap.1 +@man ${JDKHOME}/man/man1/jps.1 +@man ${JDKHOME}/man/man1/jrunscript.1 +@man ${JDKHOME}/man/man1/jsadebugd.1 +@man ${JDKHOME}/man/man1/jstack.1 +@man ${JDKHOME}/man/man1/jstat.1 +@man ${JDKHOME}/man/man1/jstatd.1 +@man ${JDKHOME}/man/man1/keytool.1 +@man ${JDKHOME}/man/man1/native2ascii.1 +@man ${JDKHOME}/man/man1/orbd.1 +@man ${JDKHOME}/man/man1/pack200.1 +@man ${JDKHOME}/man/man1/policytool.1 +@man ${JDKHOME}/man/man1/rmic.1 +@man ${JDKHOME}/man/man1/rmid.1 +@man ${JDKHOME}/man/man1/rmiregistry.1 +@man ${JDKHOME}/man/man1/schemagen.1 +@man ${JDKHOME}/man/man1/serialver.1 +@man ${JDKHOME}/man/man1/servertool.1 +@man ${JDKHOME}/man/man1/tnameserv.1 +@man ${JDKHOME}/man/man1/unpack200.1 +@man ${JDKHOME}/man/man1/wsgen.1 +@man ${JDKHOME}/man/man1/wsimport.1 +@man ${JDKHOME}/man/man1/xjc.1 +${JDKHOME}/sample/ +${JDKHOME}/sample/javac/ +${JDKHOME}/sample/javac/processing/ +${JDKHOME}/sample/javac/processing/src/ +${JDKHOME}/sample/javac/processing/src/CheckNamesProcessor.java +${JDKHOME}/sample/jmx/ +${JDKHOME}/sample/jmx/jmx-scandir/ +${JDKHOME}/sample/jmx/jmx-scandir/build.properties +${JDKHOME}/sample/jmx/jmx-scandir/build.xml +${JDKHOME}/sample/jmx/jmx-scandir/docfiles/ +${JDKHOME}/sample/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg +${JDKHOME}/sample/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg +${JDKHOME}/sample/jmx/jmx-scandir/docfiles/connect-local.jpg +${JDKHOME}/sample/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg +${JDKHOME}/sample/jmx/jmx-scandir/docfiles/remote-connection.jpg +${JDKHOME}/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg +${JDKHOME}/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg +${JDKHOME}/sample/jmx/jmx-scandir/docfiles/scandir-start.jpg +${JDKHOME}/sample/jmx/jmx-scandir/index.html +${JDKHOME}/sample/jmx/jmx-scandir/keystore +${JDKHOME}/sample/jmx/jmx-scandir/logging.properties +${JDKHOME}/sample/jmx/jmx-scandir/manifest.mf +${JDKHOME}/sample/jmx/jmx-scandir/nbproject/ +${JDKHOME}/sample/jmx/jmx-scandir/nbproject/file-targets.xml +${JDKHOME}/sample/jmx/jmx-scandir/nbproject/jdk.xml +${JDKHOME}/sample/jmx/jmx-scandir/nbproject/netbeans-targets.xml +${JDKHOME}/sample/jmx/jmx-scandir/nbproject/project.xml +${JDKHOME}/sample/jmx/jmx-scandir/src/ +${JDKHOME}/sample/jmx/jmx-scandir/src/com/ +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/ +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/ +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/ +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultRecord.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html +${JDKHOME}/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html +${JDKHOME}/sample/jmx/jmx-scandir/src/etc/ +${JDKHOME}/sample/jmx/jmx-scandir/src/etc/access.properties +${JDKHOME}/sample/jmx/jmx-scandir/src/etc/management.properties +${JDKHOME}/sample/jmx/jmx-scandir/src/etc/password.properties +${JDKHOME}/sample/jmx/jmx-scandir/src/etc/testconfig.xml +${JDKHOME}/sample/jmx/jmx-scandir/test/ +${JDKHOME}/sample/jmx/jmx-scandir/test/com/ +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/ +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/jmx/ +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/ +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/ +${JDKHOME}/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java +${JDKHOME}/sample/jmx/jmx-scandir/truststore +${JDKHOME}/sample/nbproject/ +${JDKHOME}/sample/nbproject/project.xml +${JDKHOME}/sample/nio/ +${JDKHOME}/sample/nio/server/ +${JDKHOME}/sample/nio/server/AcceptHandler.java +${JDKHOME}/sample/nio/server/Acceptor.java +${JDKHOME}/sample/nio/server/B1.java +${JDKHOME}/sample/nio/server/BN.java +${JDKHOME}/sample/nio/server/BP.java +${JDKHOME}/sample/nio/server/ChannelIO.java +${JDKHOME}/sample/nio/server/ChannelIOSecure.java +${JDKHOME}/sample/nio/server/Content.java +${JDKHOME}/sample/nio/server/Dispatcher.java +${JDKHOME}/sample/nio/server/Dispatcher1.java +${JDKHOME}/sample/nio/server/DispatcherN.java +${JDKHOME}/sample/nio/server/FileContent.java +${JDKHOME}/sample/nio/server/Handler.java +${JDKHOME}/sample/nio/server/MalformedRequestException.java +${JDKHOME}/sample/nio/server/N1.java +${JDKHOME}/sample/nio/server/N2.java +${JDKHOME}/sample/nio/server/README.txt +${JDKHOME}/sample/nio/server/Reply.java +${JDKHOME}/sample/nio/server/Request.java +${JDKHOME}/sample/nio/server/RequestHandler.java +${JDKHOME}/sample/nio/server/RequestServicer.java +${JDKHOME}/sample/nio/server/Sendable.java +${JDKHOME}/sample/nio/server/Server.java +${JDKHOME}/sample/nio/server/StringContent.java +${JDKHOME}/sample/nio/server/URLDumper.java +${JDKHOME}/sample/scripting/ +${JDKHOME}/sample/scripting/scriptpad/ +${JDKHOME}/sample/scripting/scriptpad/README.txt +${JDKHOME}/sample/scripting/scriptpad/build.properties +${JDKHOME}/sample/scripting/scriptpad/build.xml +${JDKHOME}/sample/scripting/scriptpad/nbproject/ +${JDKHOME}/sample/scripting/scriptpad/nbproject/file-targets.xml +${JDKHOME}/sample/scripting/scriptpad/nbproject/jdk.xml +${JDKHOME}/sample/scripting/scriptpad/nbproject/netbeans-targets.xml +${JDKHOME}/sample/scripting/scriptpad/nbproject/project.xml +${JDKHOME}/sample/scripting/scriptpad/src/ +${JDKHOME}/sample/scripting/scriptpad/src/META-INF/ +${JDKHOME}/sample/scripting/scriptpad/src/META-INF/manifest.mf +${JDKHOME}/sample/scripting/scriptpad/src/com/ +${JDKHOME}/sample/scripting/scriptpad/src/com/sun/ +${JDKHOME}/sample/scripting/scriptpad/src/com/sun/sample/ +${JDKHOME}/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/ +${JDKHOME}/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java +${JDKHOME}/sample/scripting/scriptpad/src/resources/ +${JDKHOME}/sample/scripting/scriptpad/src/resources/Main.js +${JDKHOME}/sample/scripting/scriptpad/src/resources/conc.js +${JDKHOME}/sample/scripting/scriptpad/src/resources/gui.js +${JDKHOME}/sample/scripting/scriptpad/src/resources/mm.js +${JDKHOME}/sample/scripting/scriptpad/src/resources/scriptpad.js +${JDKHOME}/sample/scripting/scriptpad/src/scripts/ +${JDKHOME}/sample/scripting/scriptpad/src/scripts/README.txt +${JDKHOME}/sample/scripting/scriptpad/src/scripts/browse.js +${JDKHOME}/sample/scripting/scriptpad/src/scripts/insertfile.js +${JDKHOME}/sample/scripting/scriptpad/src/scripts/linewrap.js +${JDKHOME}/sample/scripting/scriptpad/src/scripts/mail.js +${JDKHOME}/sample/scripting/scriptpad/src/scripts/memmonitor.js +${JDKHOME}/sample/scripting/scriptpad/src/scripts/memory.bat +${JDKHOME}/sample/scripting/scriptpad/src/scripts/memory.js +${JDKHOME}/sample/scripting/scriptpad/src/scripts/memory.sh +${JDKHOME}/sample/scripting/scriptpad/src/scripts/textcolor.js +${JDKHOME}/sample/webservices/ +${JDKHOME}/sample/webservices/EbayClient/ +${JDKHOME}/sample/webservices/EbayClient/build.properties +${JDKHOME}/sample/webservices/EbayClient/build.xml +${JDKHOME}/sample/webservices/EbayClient/eBaySvc.wsdl +${JDKHOME}/sample/webservices/EbayClient/ebay.properties +${JDKHOME}/sample/webservices/EbayClient/index.html +${JDKHOME}/sample/webservices/EbayClient/jax-ws-catalog.xml +${JDKHOME}/sample/webservices/EbayClient/manifest.mf +${JDKHOME}/sample/webservices/EbayClient/nbproject/ +${JDKHOME}/sample/webservices/EbayClient/nbproject/file-targets.xml +${JDKHOME}/sample/webservices/EbayClient/nbproject/jdk.xml +${JDKHOME}/sample/webservices/EbayClient/nbproject/netbeans-targets.xml +${JDKHOME}/sample/webservices/EbayClient/nbproject/project.xml +${JDKHOME}/sample/webservices/EbayClient/src/ +${JDKHOME}/sample/webservices/EbayClient/src/ebay/ +${JDKHOME}/sample/webservices/EbayClient/src/ebay/client/ +${JDKHOME}/sample/webservices/EbayClient/src/ebay/client/MainGUIApp.java +${JDKHOME}/sample/webservices/EbayClient/src/ebay/client/ViewItemDetails.java +${JDKHOME}/sample/webservices/EbayClient/src/ebay/client/handler/ +${JDKHOME}/sample/webservices/EbayClient/src/ebay/client/handler/RequesterCredentials.java +${JDKHOME}/sample/webservices/EbayServer/ +${JDKHOME}/sample/webservices/EbayServer/build.properties +${JDKHOME}/sample/webservices/EbayServer/build.xml +${JDKHOME}/sample/webservices/EbayServer/eBaySvc.wsdl +${JDKHOME}/sample/webservices/EbayServer/images/ +${JDKHOME}/sample/webservices/EbayServer/images/8d_2.jpg +${JDKHOME}/sample/webservices/EbayServer/images/Sun_Fire_E20K_Server.jpg +${JDKHOME}/sample/webservices/EbayServer/images/sun_blade_1000_h400px.jpg +${JDKHOME}/sample/webservices/EbayServer/index.html +${JDKHOME}/sample/webservices/EbayServer/manifest.mf +${JDKHOME}/sample/webservices/EbayServer/nbproject/ +${JDKHOME}/sample/webservices/EbayServer/nbproject/file-targets.xml +${JDKHOME}/sample/webservices/EbayServer/nbproject/jdk.xml +${JDKHOME}/sample/webservices/EbayServer/nbproject/netbeans-targets.xml +${JDKHOME}/sample/webservices/EbayServer/nbproject/project.xml +${JDKHOME}/sample/webservices/EbayServer/src/ +${JDKHOME}/sample/webservices/EbayServer/src/ebay/ +${JDKHOME}/sample/webservices/EbayServer/src/ebay/server/ +${JDKHOME}/sample/webservices/EbayServer/src/ebay/server/Ebay.java +${JDKHOME}/sample/webservices/EbayServer/src/ebay/server/ImageProvider.java +${JDKHOME}/sample/webservices/EbayServer/src/ebay/server/Main.java +${JDKHOME}/src.zip +%%client_vm%%