diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/kaffe/Makefile | 5 | ||||
| -rw-r--r-- | lang/kaffe/Makefile.common | 6 | ||||
| -rw-r--r-- | lang/kaffe/PLIST | 20 | ||||
| -rw-r--r-- | lang/kaffe/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/kaffe/distinfo | 17 | ||||
| -rw-r--r-- | lang/kaffe/patches/patch-aa | 60 | ||||
| -rw-r--r-- | lang/kaffe/patches/patch-ab | 108 | ||||
| -rw-r--r-- | lang/kaffe/patches/patch-ac | 39 | ||||
| -rw-r--r-- | lang/kaffe/patches/patch-ad | 35 | ||||
| -rw-r--r-- | lang/kaffe/patches/patch-af | 10 |
10 files changed, 118 insertions, 186 deletions
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index af3cf87389a..ce2bc3ca36e 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2005/09/06 19:11:24 tonio Exp $ +# $NetBSD: Makefile,v 1.64 2005/10/11 10:00:15 tonio Exp $ # .include "Makefile.common" @@ -13,6 +13,9 @@ CONF_FILES= ${JAVA_HOME}/jre/lib/security/java.security.default \ .include "../../mk/bsd.prefs.mk" +UNLIMIT_RESOURCES= datasize +LIBS= -lltdl + PRINT_PLIST_AWK+= /^java\/kaffe\/jre\/lib\/security\/java.security$$/ \ { next; } diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common index d8332b502ef..925270783c7 100644 --- a/lang/kaffe/Makefile.common +++ b/lang/kaffe/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.8 2005/09/07 11:58:56 tonio Exp $ +# $NetBSD: Makefile.common,v 1.9 2005/10/11 10:00:15 tonio Exp $ -DISTNAME= kaffe-1.1.5 +DISTNAME= kaffe-1.1.6 CATEGORIES= lang java MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/ @@ -31,6 +31,8 @@ DISTINFO_FILE= ${.CURDIR}/../../lang/kaffe/distinfo BUILDLINK_PASSTHRU_DIRS+= ${JAVA_HOME}/jre/lib/${MACHINE_ARCH} +CONFIGURE_ARGS+= --with-gc=kaffe-gc +CONFIGURE_ARGS+= --disable-boehm-gc-configuration CONFIGURE_ARGS+= --without-alsa CONFIGURE_ARGS+= --without-esd CONFIGURE_ARGS+= --disable-esdtest diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST index 2eb485b8aa4..eeeac6d892d 100644 --- a/lang/kaffe/PLIST +++ b/lang/kaffe/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2005/09/06 18:15:32 tonio Exp $ +@comment $NetBSD: PLIST,v 1.13 2005/10/11 10:00:15 tonio Exp $ bin/kaffe-appletviewer bin/kaffe-jar bin/kaffe-java @@ -19,16 +19,19 @@ java/kaffe/bin/javac java/kaffe/bin/javadoc java/kaffe/bin/javah java/kaffe/bin/javap +java/kaffe/bin/jdb java/kaffe/bin/kaffe java/kaffe/bin/kaffeh java/kaffe/bin/native2ascii java/kaffe/bin/rmic java/kaffe/bin/rmiregistry java/kaffe/bin/serialver +java/kaffe/include/config-int.h java/kaffe/include/jawt.h java/kaffe/include/jawt_md.h java/kaffe/include/jni.h java/kaffe/include/jni_cpp.h +java/kaffe/include/jni_md.h java/kaffe/include/jvmpi.h java/kaffe/include/kaffe/java_lang_Object.h java/kaffe/include/kaffe/java_lang_StackTraceElement.h @@ -38,35 +41,28 @@ java/kaffe/include/kaffe/java_lang_ThreadGroup.h java/kaffe/include/kaffe/java_lang_Throwable.h java/kaffe/include/kaffe/java_lang_VMThrowable.h java/kaffe/include/kaffe/jmalloc.h -java/kaffe/include/kaffe/jni_md.h +java/kaffe/include/kaffe/trampoline.h java/kaffe/include/kaffe_jni.h java/kaffe/jre/bin/java java/kaffe/jre/bin/kaffe java/kaffe/jre/bin/kaffe-bin java/kaffe/jre/bin/rmiregistry -java/kaffe/jre/lib/${MACHINE_ARCH}/libclasspath.la +java/kaffe/jre/lib/gmpjavamath.jar java/kaffe/jre/lib/${MACHINE_ARCH}/libio.la -java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffegc.la -java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffeverifier.la java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffevm.la java/kaffe/jre/lib/${MACHINE_ARCH}/libmanagement.la java/kaffe/jre/lib/${MACHINE_ARCH}/libmath.la java/kaffe/jre/lib/${MACHINE_ARCH}/libnative.la java/kaffe/jre/lib/${MACHINE_ARCH}/libnet.la java/kaffe/jre/lib/${MACHINE_ARCH}/libnio.la -java/kaffe/jre/lib/${MACHINE_ARCH}/libreplace.la java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.la java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la -java/kaffe/jre/lib/gmpjavamath.jar java/kaffe/jre/lib/logging.properties java/kaffe/jre/lib/rt.jar java/kaffe/jre/lib/security/java.security -java/kaffe/jre/lib/tools.jar +java/kaffe/lib/tools.jar java/kaffe/license.terms -java/kaffe/man/man1/kaffe.1 -@dirrm java/kaffe/man/man1 -@dirrm java/kaffe/man -@exec ${MKDIR} %D/java/kaffe/lib +man/man1/kaffe.1 @dirrm java/kaffe/lib @dirrm java/kaffe/jre/lib/security @dirrm java/kaffe/jre/lib/${MACHINE_ARCH} diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk index 256f00636a9..e2adb9a1559 100644 --- a/lang/kaffe/buildlink3.mk +++ b/lang/kaffe/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2005/09/06 18:15:32 tonio Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2005/10/11 10:00:15 tonio Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KAFFE_BUILDLINK3_MK:= ${KAFFE_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkaffe} BUILDLINK_PACKAGES+= kaffe .if !empty(KAFFE_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.kaffe+= kaffe>=1.1.5 +BUILDLINK_DEPENDS.kaffe+= kaffe>=1.1.6 BUILDLINK_PKGSRCDIR.kaffe?= ../../lang/kaffe BUILDLINK_JAVA_PREFIX.kaffe= ${PREFIX}/java/kaffe .endif # KAFFE_BUILDLINK3_MK diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo index cfe4ad864e6..370d50f4fc9 100644 --- a/lang/kaffe/distinfo +++ b/lang/kaffe/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.14 2005/10/10 20:37:01 joerg Exp $ +$NetBSD: distinfo,v 1.15 2005/10/11 10:00:15 tonio Exp $ -SHA1 (kaffe-1.1.5.tar.gz) = ebd8da490783ed189fb25fad0d674f384194e2f3 -RMD160 (kaffe-1.1.5.tar.gz) = 516b5dbaa13efed099f59ff9b7121700ef6ad13b -Size (kaffe-1.1.5.tar.gz) = 9796278 bytes -SHA1 (patch-aa) = 951e719e59e03e1e656c63d1a989d1bae3ab9984 -SHA1 (patch-ab) = 21202b63143330175fcc0dbbf029e6d66375ce2e -SHA1 (patch-ac) = 7c16de2815a2bca67e042efb367d7ec751aa0ea8 -SHA1 (patch-ad) = d00ce5cafeaffe97347f6952c81d1971b0a11b94 -SHA1 (patch-af) = 489763ca17560fcf7927d521bdaeb11719a7fcd7 +SHA1 (kaffe-1.1.6.tar.gz) = 8987c3a596db89ddc793013eaf0fab5cf8730128 +RMD160 (kaffe-1.1.6.tar.gz) = 9fd1177a43923346f9a21e4c0e89015ae42c4dfa +Size (kaffe-1.1.6.tar.gz) = 10779887 bytes +SHA1 (patch-aa) = 24f3720fded5a786bd2c4af354433ab19298ff7f +SHA1 (patch-ab) = e2ba7816d3b2c9bf850a4ad9aadec5d306a8115e +SHA1 (patch-ac) = 287fa93128361897ea0fc1bc305004b336609c88 +SHA1 (patch-af) = c170e9bb8c559db660ba2d6e7af716c29b981235 diff --git a/lang/kaffe/patches/patch-aa b/lang/kaffe/patches/patch-aa index d826bbeb19e..d901bf376bd 100644 --- a/lang/kaffe/patches/patch-aa +++ b/lang/kaffe/patches/patch-aa @@ -1,28 +1,34 @@ -$NetBSD: patch-aa,v 1.13 2005/09/06 18:15:32 tonio Exp $ +$NetBSD: patch-aa,v 1.14 2005/10/11 10:00:15 tonio Exp $ ---- config/i386/netbsd1/md.h.orig 2005-04-24 19:53:29.000000000 +0200 -+++ config/i386/netbsd1/md.h 2005-04-24 19:58:35.000000000 +0200 -@@ -17,6 +17,7 @@ - - #include "i386/common.h" - #include "i386/threads.h" -+#include <sys/ucontext.h> - - #if defined(HAVE_SYS_RESOURCE_H) - #include <sys/resource.h> -@@ -31,11 +32,11 @@ - #undef SP_OFFSET - #define SP_OFFSET 2 - --#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct sigcontext *sc --#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext *scp -+#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct __ucontext *sc -+#define SIGNAL_CONTEXT_POINTER(scp) struct __ucontext *scp - #define GET_SIGNAL_CONTEXT_POINTER(sc) (sc) --#define SIGNAL_PC(scp) (scp)->sc_pc --#define STACK_POINTER(scp) (scp)->sc_sp -+#define SIGNAL_PC(scp) ((scp)->uc_mcontext.__gregs[_REG_EIP]) -+#define STACK_POINTER(scp) ((scp)->uc_mcontext.__gregs[_REG_ESP]) - - #if defined(TRANSLATOR) - #include "jit-md.h" +--- configure.orig 2005-09-19 05:08:29.000000000 +0200 ++++ configure +@@ -490,7 +490,6 @@ ac_includes_default="\ + #endif" + + ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm" +-ac_subdirs_all="$ac_subdirs_all libltdl" + ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE GTK_CAIRO_ENABLED GTK_CAIRO_TRUE GTK_CAIRO_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS COND_CLASSPATH_GTK_AWT_TRUE COND_CLASSPATH_GTK_AWT_FALSE COND_CLASSPATH_QT_AWT_TRUE COND_CLASSPATH_QT_AWT_FALSE PKG_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS GTK_CFLAGS GTK_LIBS CAIRO_CFLAGS CAIRO_LIBS QT_CFLAGS QT_LIBS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS PROFILE XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY BINRELOC_CFLAGS ENABLE_BINRELOC_TRUE ENABLE_BINRELOC_FALSE KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES LTLIBOBJS' + ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag' + +@@ -5411,10 +5410,10 @@ echo "$as_me: error: this package needs + "") enable_ltdl_convenience=yes + ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; + esac +- LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la +- LTDLINCL='-I${top_srcdir}/''libltdl' ++ #LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la ++ #LTDLINCL='-I${top_srcdir}/''libltdl' + # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" ++ #INCLTDL="$LTDLINCL" + + + +@@ -51688,7 +51687,6 @@ CLASSPATH_INCLUDES="-I\$(top_srcdir)/lib + + + +-subdirs="$subdirs libltdl" + + ac_config_headers="$ac_config_headers config/config.h" + diff --git a/lang/kaffe/patches/patch-ab b/lang/kaffe/patches/patch-ab index a9f3dac8921..b48a79c2929 100644 --- a/lang/kaffe/patches/patch-ab +++ b/lang/kaffe/patches/patch-ab @@ -1,85 +1,29 @@ -$NetBSD: patch-ab,v 1.9 2005/09/06 18:15:32 tonio Exp $ +$NetBSD: patch-ab,v 1.10 2005/10/11 10:00:15 tonio Exp $ ---- ./kaffe/kaffevm/systems/unix-pthreads/signal.c.orig 2005-04-24 19:46:52.000000000 +0200 -+++ ./kaffe/kaffevm/systems/unix-pthreads/signal.c 2005-04-24 19:50:12.000000000 +0200 -@@ -47,8 +47,6 @@ - #define SIG_T void* - #endif +--- Makefile.am.orig 2005-08-25 02:54:34.000000000 +0200 ++++ Makefile.am +@@ -25,7 +25,6 @@ SUBDIRS = \ + . \ + libraries/javalib \ + config \ +- libltdl \ + $(MAYBE_BINRELOC_DIR) \ + kaffe/kaffeh \ + include \ +@@ -36,7 +35,7 @@ SUBDIRS = \ + po \ + tools --static void nullException(SIGNAL_ARGS(sig, sc)); --static void floatingException(EXCEPTIONPROTO); - static void ignoreSignal(int sig); +-DIST_SUBDIRS = config include replace libltdl kaffe libraries tools test po ++DIST_SUBDIRS = config include replace kaffe libraries tools test po - static exchandler_t nullHandler; -@@ -56,35 +54,6 @@ - static exchandler_t stackOverflowHandler; - - /* -- * Setup the internal exceptions. -- */ --void --jthread_initexceptions(exchandler_t _nullHandler, -- exchandler_t _floatingHandler, -- exchandler_t _stackOverflowHandler) --{ -- nullHandler = _nullHandler; -- floatingHandler = _floatingHandler; -- stackOverflowHandler = _stackOverflowHandler; -- -- if (DBGEXPR(EXCEPTION, false, true)) { -- /* Catch signals we need to convert to exceptions */ --#if defined(SIGSEGV) -- registerSyncSignalHandler(SIGSEGV, nullException); --#endif --#if defined(SIGBUS) -- registerSyncSignalHandler(SIGBUS, nullException); --#endif --#if defined(SIGFPE) -- registerSyncSignalHandler(SIGFPE, floatingException); --#endif --#if defined(SIGPIPE) -- ignoreSignal(SIGPIPE); --#endif -- } --} -- --/* - * Null exception - catches bad memory accesses. - */ - static void -@@ -141,6 +110,35 @@ - floatingHandler(EXCEPTIONFRAMEPTR); - } - -+/* -+ * Setup the internal exceptions. -+ */ -+void -+jthread_initexceptions(exchandler_t _nullHandler, -+ exchandler_t _floatingHandler, -+ exchandler_t _stackOverflowHandler) -+{ -+ nullHandler = _nullHandler; -+ floatingHandler = _floatingHandler; -+ stackOverflowHandler = _stackOverflowHandler; -+ -+ if (DBGEXPR(EXCEPTION, false, true)) { -+ /* Catch signals we need to convert to exceptions */ -+#if defined(SIGSEGV) -+ registerSyncSignalHandler(SIGSEGV, nullException); -+#endif -+#if defined(SIGBUS) -+ registerSyncSignalHandler(SIGBUS, nullException); -+#endif -+#if defined(SIGFPE) -+ registerSyncSignalHandler(SIGFPE, floatingException); -+#endif -+#if defined(SIGPIPE) -+ ignoreSignal(SIGPIPE); -+#endif -+ } -+} -+ - /* ----------------------------------------------- - * OS signal handling code. See FAQ/FAQ.jsignal for information. - * ----------------------------------------------- */ + EXTRA_DIST = \ + ChangeLog.1 \ +@@ -199,7 +198,6 @@ DIRECTORIES_BEFORE_RTJAR = \ + config \ + include \ + replace \ +- libltdl \ + kaffe/kaffevm \ + libraries/clib \ + kaffe diff --git a/lang/kaffe/patches/patch-ac b/lang/kaffe/patches/patch-ac index 1dda7484149..33c7737a05f 100644 --- a/lang/kaffe/patches/patch-ac +++ b/lang/kaffe/patches/patch-ac @@ -1,14 +1,29 @@ -$NetBSD: patch-ac,v 1.8 2005/09/06 18:15:32 tonio Exp $ +$NetBSD: patch-ac,v 1.9 2005/10/11 10:00:15 tonio Exp $ ---- config/i386/netbsd1/jit-md.h.orig 2005-04-24 20:01:15.000000000 +0200 -+++ config/i386/netbsd1/jit-md.h 2005-04-24 20:01:46.000000000 +0200 -@@ -26,7 +26,7 @@ +--- Makefile.in.orig 2005-09-17 23:41:50.000000000 +0200 ++++ Makefile.in +@@ -406,7 +406,6 @@ SUBDIRS = \ + . \ + libraries/javalib \ + config \ +- libltdl \ + $(MAYBE_BINRELOC_DIR) \ + kaffe/kaffeh \ + include \ +@@ -417,7 +416,7 @@ SUBDIRS = \ + po \ + tools - /* Get the first exception frame from a signal handler */ - #define EXCEPTIONFRAME(f, c) \ -- (f).retbp = (c)->sc_ebp; \ -- (f).retpc = (c)->sc_eip + 1 -+ (f).retbp = (c)->uc_mcontext.__gregs[_REG_EBP]; \ -+ (f).retpc = (c)->uc_mcontext.__gregs[_REG_EIP] + 1 - - #endif +-DIST_SUBDIRS = config include replace libltdl kaffe libraries tools test po ++DIST_SUBDIRS = config include replace kaffe libraries tools test po + EXTRA_DIST = \ + ChangeLog.1 \ + ChangeLog.2 \ +@@ -538,7 +537,6 @@ DIRECTORIES_BEFORE_RTJAR = \ + config \ + include \ + replace \ +- libltdl \ + kaffe/kaffevm \ + libraries/clib \ + kaffe diff --git a/lang/kaffe/patches/patch-ad b/lang/kaffe/patches/patch-ad deleted file mode 100644 index 62e7521a553..00000000000 --- a/lang/kaffe/patches/patch-ad +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2005/09/06 18:15:32 tonio Exp $ - ---- libraries/javalib/java/util/logging/Logger.java.orig 2005-04-29 10:56:27.000000000 +0200 -+++ libraries/javalib/java/util/logging/Logger.java 2005-04-29 10:59:10.000000000 +0200 -@@ -290,7 +290,7 @@ - if (!couldBeAdded) - throw new IllegalStateException("cannot register new logger"); - } -- else -+ else if (resourceBundleName != null) - { - /* The logger already exists. Make sure it uses - * the same resource bundle for localizing messages. -@@ -303,7 +303,7 @@ - * resourceBundle of the registered logger to the bundle - * whose name was passed to getLogger. - */ -- if ((existingBundleName == null) && (resourceBundleName != null)) -+ if (existingBundleName == null) - { - /* If ResourceBundle.getBundle throws an exception, the - * existing logger will be unchanged. This would be -@@ -319,7 +319,11 @@ - && ((existingBundleName == null) - || !existingBundleName.equals(resourceBundleName))) - { -- throw new IllegalArgumentException(); -+ throw new IllegalArgumentException("name: " + name -+ + ", existing bundle name: " -+ + existingBundleName -+ + ", resource bundle name: " -+ + resourceBundleName); - } - } - } diff --git a/lang/kaffe/patches/patch-af b/lang/kaffe/patches/patch-af index ea1fcd0de48..d82be4d2984 100644 --- a/lang/kaffe/patches/patch-af +++ b/lang/kaffe/patches/patch-af @@ -1,10 +1,12 @@ ---- config/config.alias.orig 2005-08-04 19:13:02.000000000 +0000 -+++ config/config.alias 2005-08-04 19:13:12.000000000 +0000 -@@ -26,6 +26,7 @@ +$NetBSD: patch-af,v 1.6 2005/10/11 10:00:15 tonio Exp $ + +--- config/config.alias.orig 2005-07-04 00:02:55.000000000 +0200 ++++ config/config.alias +@@ -29,6 +29,7 @@ bsdi*) Khost_os=bsdi ;; cygwin*) Khost_os=cygwin32 ;; darwin*) Khost_os=darwin ;; freebsd*) Khost_os=freebsd2 ;; -+dragonfly*) Khost_os=freebsd2 ;; ++dragonfly*) Khost_os=freebsd2 ;; hpux*) Khost_os=hpux ;; gnu*) Khost_os=gnu ;; irix*) Khost_os=irix5 ;; |