diff options
author | tonio <tonio@pkgsrc.org> | 2006-05-10 16:46:20 +0000 |
---|---|---|
committer | tonio <tonio@pkgsrc.org> | 2006-05-10 16:46:20 +0000 |
commit | 160fd74649239de35d0180a619de78ff50dbe98a (patch) | |
tree | 47004df9ee16d68056d98b301fb84d7fdd1115f1 /lang/kaffe | |
parent | 3c767781e7d7f07011d1fd9e77260564f80b9f30 (diff) | |
download | pkgsrc-160fd74649239de35d0180a619de78ff50dbe98a.tar.gz |
Update lang/kaffe{-x11,-esound} to 1.1.7
What's New In Kaffe 1.1.7
------------------------------------------------------
* Many cleanups, warning fixes and bug fixes.
* Removed support for class library profiles, since
--with-glibj-zip offers a more convenient replacement.
* Updated to boehm-gc 6.6
* Updated to gjdoc 0.7.7
* Merged in fastjar.
* Merged in zlib. There is a new configure option,
--with-system-zlib to allow the use of the system zlib,
instead of the merged in one.
* Merged in GNU Classpath completely. Updated to version 0.90,
with additional fixes.
* Merged in port to DROPS.
* Merged in port to Blackfin CPU.
* Support for DragonFly BSD.
* Ported to ia64-freebsd and alpha-freebsd.
* Ported to powerpc-openbsd.
* Improved support for Cygwin and sparc64-openbsd.
* Improved stack handling for pthreads on openbsd.
* Added simple direct threading interpreter implementation.
The patches have been removes, since they were either included upstram or are
no more necessary
Diffstat (limited to 'lang/kaffe')
-rw-r--r-- | lang/kaffe/Makefile | 11 | ||||
-rw-r--r-- | lang/kaffe/Makefile.common | 17 | ||||
-rw-r--r-- | lang/kaffe/PLIST | 27 | ||||
-rw-r--r-- | lang/kaffe/buildlink3.mk | 6 | ||||
-rw-r--r-- | lang/kaffe/distinfo | 18 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-aa | 50 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ab | 29 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ac | 29 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ad | 15 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ae | 14 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-af | 12 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ag | 51 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ah | 58 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ai | 18 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-aj | 20 |
15 files changed, 40 insertions, 335 deletions
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index e5f1f2de13c..5cd4ae8dd05 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,12 +1,16 @@ -# $NetBSD: Makefile,v 1.67 2006/02/05 23:09:46 joerg Exp $ +# $NetBSD: Makefile,v 1.68 2006/05/10 16:46:20 tonio Exp $ # .include "Makefile.common" -PKGREVISION= 2 - CONFLICTS+= kaffe-nox11-[0-9]* +CONFIGURE_ARGS+= --disable-native-awt +CONFIGURE_ARGS+= --disable-gtk-peer +CONFIGURE_ARGS+= --without-x +CONFIGURE_ARGS+= --without-esd +CONFIGURE_ARGS+= --disable-esdtest + JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javakey \ javap jdb rmic rmiregistry serialver @@ -24,6 +28,5 @@ PRINT_PLIST_AWK+= /^java\/kaffe\/jre\/lib\/security\/java.security$$/ \ post-install: ${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME} -.include "../../devel/libltdl/buildlink3.mk" .include "../../mk/java-env.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common index ceb6abdf97a..9410b3cd512 100644 --- a/lang/kaffe/Makefile.common +++ b/lang/kaffe/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.13 2006/03/02 18:46:16 joerg Exp $ +# $NetBSD: Makefile.common,v 1.14 2006/05/10 16:46:20 tonio Exp $ -DISTNAME= kaffe-1.1.6 +DISTNAME= kaffe-1.1.7 CATEGORIES= lang java MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/ @@ -8,11 +8,10 @@ MAINTAINER= tonio@NetBSD.org HOMEPAGE= http://www.kaffe.org/ COMMENT= Virtual machine capable of running Java(tm) code -BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip -BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip DEPENDS+= jikes>=1.22:../../lang/jikes +DEPENDS+= fastjar>=0.93:../../archivers/fastjar -EXTRACT_USING= pax +EXTRACT_USING= gtar GNU_CONFIGURE_PREFIX= ${JAVA_HOME} GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} JAVA_HOME= ${PREFIX}/java/kaffe @@ -22,8 +21,8 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake TEST_TARGET= check -ONLY_FOR_PLATFORM= *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips* \ - *-*-sparc *-*-powerpc +ONLY_FOR_PLATFORM= *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \ + *-*-mipsel *-*-sparc *-*-powerpc GNU_CONFIGURE= yes CPPFLAGS+= -Dunix @@ -37,7 +36,7 @@ CONFIGURE_ARGS+= --disable-boehm-gc-configuration CONFIGURE_ARGS+= --without-alsa CONFIGURE_ARGS+= --without-esd CONFIGURE_ARGS+= --disable-esdtest -CONFIGURE_ARGS+= --disable-native-awt +CONFIGURE_ARGS+= --disable-fastjar .include "../../mk/bsd.prefs.mk" @@ -54,7 +53,7 @@ CONFIGURE_ENV+= VM_LIBS="-lc" CONFIGURE_ARGS+= --with-engine=intrp .endif +.include "../../devel/libltdl/convenience.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST index eeeac6d892d..b7aed83d65e 100644 --- a/lang/kaffe/PLIST +++ b/lang/kaffe/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2005/10/11 10:00:15 tonio Exp $ +@comment $NetBSD: PLIST,v 1.14 2006/05/10 16:46:20 tonio Exp $ bin/kaffe-appletviewer bin/kaffe-jar bin/kaffe-java @@ -11,12 +11,10 @@ bin/kaffe-jdb bin/kaffe-rmic bin/kaffe-rmiregistry bin/kaffe-serialver -java/kaffe/bin/appletviewer java/kaffe/bin/install-jar java/kaffe/bin/jar java/kaffe/bin/java java/kaffe/bin/javac -java/kaffe/bin/javadoc java/kaffe/bin/javah java/kaffe/bin/javap java/kaffe/bin/jdb @@ -43,32 +41,43 @@ java/kaffe/include/kaffe/java_lang_VMThrowable.h java/kaffe/include/kaffe/jmalloc.h java/kaffe/include/kaffe/trampoline.h java/kaffe/include/kaffe_jni.h +java/kaffe/info/dir +java/kaffe/info/hacking.info +java/kaffe/info/vmintegration.info 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/glibj.zip java/kaffe/jre/lib/gmpjavamath.jar -java/kaffe/jre/lib/${MACHINE_ARCH}/libio.la +java/kaffe/jre/lib/${MACHINE_ARCH}/libjavaio.la +java/kaffe/jre/lib/${MACHINE_ARCH}/libjavalang.la +java/kaffe/jre/lib/${MACHINE_ARCH}/libjavanet.la +java/kaffe/jre/lib/${MACHINE_ARCH}/libjavanio.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}/libsecurity.la java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la java/kaffe/jre/lib/logging.properties -java/kaffe/jre/lib/rt.jar -java/kaffe/jre/lib/security/java.security +java/kaffe/jre/lib/security/Kaffe.security +java/kaffe/lib/logging.properties +java/kaffe/lib/security/classpath.security java/kaffe/lib/tools.jar java/kaffe/license.terms man/man1/kaffe.1 +java/kaffe/share/classpath/README +java/kaffe/share/classpath/tools.zip +@dirrm java/kaffe/share/classpath +@dirrm java/kaffe/share +@dirrm java/kaffe/lib/security @dirrm java/kaffe/lib @dirrm java/kaffe/jre/lib/security @dirrm java/kaffe/jre/lib/${MACHINE_ARCH} @dirrm java/kaffe/jre/lib @dirrm java/kaffe/jre/bin @dirrm java/kaffe/jre +@dirrm java/kaffe/info @dirrm java/kaffe/include/kaffe @dirrm java/kaffe/include @dirrm java/kaffe/bin diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk index 37b3d8489e9..8a0755426d3 100644 --- a/lang/kaffe/buildlink3.mk +++ b/lang/kaffe/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/04/12 10:27:21 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2006/05/10 16:46:20 tonio Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KAFFE_BUILDLINK3_MK:= ${KAFFE_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkaffe} BUILDLINK_PACKAGES+= kaffe .if !empty(KAFFE_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.kaffe+= kaffe>=1.1.6 -BUILDLINK_ABI_DEPENDS.kaffe?= kaffe>=1.1.6nb2 +BUILDLINK_API_DEPENDS.kaffe+= kaffe>=1.1.7 +BUILDLINK_ABI_DEPENDS.kaffe?= kaffe>=1.1.7 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 aeed6086bac..845d30e8896 100644 --- a/lang/kaffe/distinfo +++ b/lang/kaffe/distinfo @@ -1,15 +1,5 @@ -$NetBSD: distinfo,v 1.19 2006/02/20 22:36:00 tonio Exp $ +$NetBSD: distinfo,v 1.20 2006/05/10 16:46:20 tonio Exp $ -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) = 9a042663db270d706bb983ce3da7297fe016a458 -SHA1 (patch-ab) = e2ba7816d3b2c9bf850a4ad9aadec5d306a8115e -SHA1 (patch-ac) = 287fa93128361897ea0fc1bc305004b336609c88 -SHA1 (patch-ad) = d952245f70a61459e527cd846b76dede1df226e4 -SHA1 (patch-ae) = fac9c2e3e6c711d05f9ddb9f3109c46895f2e835 -SHA1 (patch-af) = c170e9bb8c559db660ba2d6e7af716c29b981235 -SHA1 (patch-ag) = ee05e2356c118f048a6a712147b6ccff82a9478a -SHA1 (patch-ah) = 2ff354a18becaa544dd9ba794ef02442307fe360 -SHA1 (patch-ai) = 0bdd95c4227299d9a03bf36a4d7f8449351fa08b -SHA1 (patch-aj) = b1f337967de4c9912d7f8938e319560f66df2e2d +SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817 +RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b +Size (kaffe-1.1.7.tar.gz) = 14494274 bytes diff --git a/lang/kaffe/patches/patch-aa b/lang/kaffe/patches/patch-aa deleted file mode 100644 index c8ab3c15647..00000000000 --- a/lang/kaffe/patches/patch-aa +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-aa,v 1.15 2005/11/04 21:21:02 tonio Exp $ - ---- configure.orig 2005-09-20 02:33:57.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" - - - -@@ -25084,6 +25083,15 @@ echo "$as_me: error: Missing library lib - - VMLIBS="$VM_LIBS $PTHREAD_LIBS" - CPPFLAGS="$CPPFLAGS -D_REENTRANT" -+ -+ if test "x$Khost_os" = "xnetbsd1"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define KAFFE_BUGGY_NETBSD_SIGWAIT 1 -+_ACEOF -+ -+ fi -+ - else - CPPFLAGS="$CPPFLAGS -DBR_PTHREADS=0" - fi -@@ -51688,7 +51696,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 deleted file mode 100644 index b48a79c2929..00000000000 --- a/lang/kaffe/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ab,v 1.10 2005/10/11 10:00:15 tonio Exp $ - ---- 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 - --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 \ -@@ -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 deleted file mode 100644 index 33c7737a05f..00000000000 --- a/lang/kaffe/patches/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ac,v 1.9 2005/10/11 10:00:15 tonio Exp $ - ---- 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 - --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 9ee65f3d2be..00000000000 --- a/lang/kaffe/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.8 2005/10/15 21:49:53 tonio Exp $ - ---- config/x86_64/freebsd2/md.c.orig 2005-07-04 00:02:58.000000000 +0200 -+++ config/x86_64/freebsd2/md.c -@@ -13,6 +13,10 @@ - #include "config.h" - #include "config-std.h" - -+#if defined(HAVE_SYS_TYPES_H) -+#include <sys/types.h> -+#endif -+ - #if defined(HAVE_SYS_SYSCTL_H) - #include <sys/sysctl.h> - diff --git a/lang/kaffe/patches/patch-ae b/lang/kaffe/patches/patch-ae deleted file mode 100644 index 5c44e018e3c..00000000000 --- a/lang/kaffe/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2005/11/04 21:21:02 tonio Exp $ - ---- config/config.h.in.orig 2005-09-20 02:31:32.000000000 +0200 -+++ config/config.h.in -@@ -747,6 +747,9 @@ - /* additional directories to search for native jni libraries */ - #undef JNI_LIBRARY_PATH - -+/* Defined on NetBSD because sigwait needs the handle not to be registered */ -+#undef KAFFE_BUGGY_NETBSD_SIGWAIT -+ - /* Full path to the directory containing kaffe's locales */ - #undef KAFFE_LOCALEDIR - diff --git a/lang/kaffe/patches/patch-af b/lang/kaffe/patches/patch-af deleted file mode 100644 index d82be4d2984..00000000000 --- a/lang/kaffe/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$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 ;; - hpux*) Khost_os=hpux ;; - gnu*) Khost_os=gnu ;; - irix*) Khost_os=irix5 ;; diff --git a/lang/kaffe/patches/patch-ag b/lang/kaffe/patches/patch-ag deleted file mode 100644 index c7e16237f9d..00000000000 --- a/lang/kaffe/patches/patch-ag +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2005/11/04 21:21:02 tonio Exp $ - ---- kaffe/kaffevm/systems/unix-pthreads/thread-impl.c.orig 2005-08-20 14:31:02.000000000 +0200 -+++ kaffe/kaffevm/systems/unix-pthreads/thread-impl.c -@@ -415,7 +415,7 @@ tInitSignalHandlers (void) - saResume.sa_flags = 0; /* Note that we do not want restart here. */ - saResume.sa_handler = resume_signal_handler; - saResume.sa_mask = saSuspend.sa_mask; --#ifndef KAFFE_BOEHM_GC -+#if !defined(KAFFE_BOEHM_GC) && !defined(KAFFE_BUGGY_NETBSD_SIGWAIT) - sigaction( sigResume, &saResume, NULL); - #endif - -@@ -1275,7 +1275,12 @@ void KaffePThread_WaitForResume(int rele - - /* freeze until we get a subsequent sigResume */ - while( cur->suspendState == SS_SUSPENDED ) -- sigwait( &suspendSet, &s); -+ { -+ sigwait( &suspendSet, &s); -+ /* Post something even if it is not the right thread. */ -+ if (cur->suspendState == SS_SUSPENDED) -+ repsem_post(&critSem); -+ } - - DBG( JTHREADDETAIL, dprintf("sigwait return: %p\n", cur)); - -@@ -1497,13 +1502,17 @@ jthread_unsuspendall (void) - if ((t->blockState & (BS_SYSCALL|BS_CV|BS_CV_TO|BS_MUTEX)) == 0) - { - DBG (JTHREADDETAIL, dprintf(" sending sigResume\n")); -- status = pthread_kill( t->tid, sigResume); -- if ( status ) -+ do - { -- DBG( JTHREAD, dprintf("error sending RESUME signal to %p: %d\n", t, status)); -- } -- /* ack wait workaround, see jthread_suspendall remarks */ -- repsem_wait( &critSem); -+ status = pthread_kill( t->tid, sigResume); -+ if ( status ) -+ { -+ DBG( JTHREAD, dprintf("error sending RESUME signal to %p: %d\n", t, status)); -+ } -+ /* ack wait workaround, see jthread_suspendall remarks */ -+ repsem_wait( &critSem); -+ } -+ while (t->suspendState == SS_PENDING_RESUME); - } - else - { diff --git a/lang/kaffe/patches/patch-ah b/lang/kaffe/patches/patch-ah deleted file mode 100644 index dacf3d9ef20..00000000000 --- a/lang/kaffe/patches/patch-ah +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ah,v 1.5 2005/12/07 16:25:51 tonio Exp $ - ---- config/alpha/netbsd1/md.h.orig 2005-07-04 00:02:55.000000000 +0200 -+++ config/alpha/netbsd1/md.h -@@ -15,6 +15,19 @@ - #include "alpha/common.h" - #include "alpha/threads.h" - -+#if defined(HAVE_SIGNAL_H) -+#include <signal.h> -+#endif -+#if defined(HAVE_SYS_RESOURCE_H) -+#include <sys/resource.h> -+#endif -+#if defined(HAVE_SYS_SIGNAL_H) -+#include <sys/signal.h> -+#endif -+#if defined(HAVE_UNISTD_H) -+#include <unistd.h> -+#endif -+ - #if defined(TRANSLATOR) - #include "jit-md.h" - #endif -@@ -29,4 +42,33 @@ extern void init_md(void); - #undef SP_OFFSET - #define SP_OFFSET 34 - -+#if defined(HAVE_SYS_UCONTEXT_H) -+#include <sys/ucontext.h> -+ -+/* older netbsd's could have this macro missing, so we provide it */ -+#ifndef _UC_MACHINE_SP -+#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_UESP]) -+#endif -+#ifndef _UC_MACHINE_PC -+#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_EIP]) -+#endif -+ -+#define SIGCONTEXT ucontext_t -+ -+#define SIGNAL_ARGS(sig, sc) int sig, siginfo_t *__si, void *sc -+#define SIGNAL_CONTEXT_POINTER(scp) SIGCONTEXT *scp -+#define SIGNAL_PC(scp) _UC_MACHINE_PC(((SIGCONTEXT *)(scp))) -+#define STACK_POINTER(scp) _UC_MACHINE_SP(((SIGCONTEXT *)(scp))) -+#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc) -+ -+#else -+ -+#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct sigcontext *sc -+#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext *scp -+#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc) -+#define SIGNAL_PC(scp) (scp)->sc_pc -+#define STACK_POINTER(scp) (scp)->sc_sp -+ -+#endif -+ - #endif diff --git a/lang/kaffe/patches/patch-ai b/lang/kaffe/patches/patch-ai deleted file mode 100644 index 8a2f527ceb6..00000000000 --- a/lang/kaffe/patches/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ai,v 1.6 2006/02/20 22:36:00 tonio Exp $ - ---- libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am.orig 2005-09-19 02:38:49.000000000 +0200 -+++ libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am -@@ -69,7 +69,6 @@ libgtkpeer_la_LIBADD = \ - $(libgtkpeer_la_DEPENDENCIES) - - libgtkpeer_la_LDFLAGS = \ -- @CLASSPATH_MODULE@ \ - @GTK_LIBS@ \ - @CAIRO_LIBS@ \ - @PANGOFT2_LIBS@ \ -@@ -90,5 +89,4 @@ libjawt_la_LIBADD = \ - libgtkpeer.la \ - $(top_builddir)/kaffe/kaffevm/libkaffevm.la - libjawt_la_LDFLAGS = \ -- @CLASSPATH_MODULE@ \ - @X_LIBS@ diff --git a/lang/kaffe/patches/patch-aj b/lang/kaffe/patches/patch-aj deleted file mode 100644 index 2a164ecf918..00000000000 --- a/lang/kaffe/patches/patch-aj +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aj,v 1.6 2006/02/20 22:36:00 tonio Exp $ - ---- libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in.orig 2005-09-20 02:32:44.000000000 +0200 -+++ libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in -@@ -521,7 +521,6 @@ libgtkpeer_la_LIBADD = \ - $(libgtkpeer_la_DEPENDENCIES) - - libgtkpeer_la_LDFLAGS = \ -- @CLASSPATH_MODULE@ \ - @GTK_LIBS@ \ - @CAIRO_LIBS@ \ - @PANGOFT2_LIBS@ \ -@@ -544,7 +543,6 @@ libjawt_la_LIBADD = \ - $(top_builddir)/kaffe/kaffevm/libkaffevm.la - - libjawt_la_LDFLAGS = \ -- @CLASSPATH_MODULE@ \ - @X_LIBS@ - - all: all-am |