Update to 1.1.6. Tested on i386 and amd64 -- only one regression test failure,

and on amd64!

4 files changed, 26 insertions, 20 deletions

diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index c11cfea4fde4..ee7d0d0008f1 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kaffe
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	java devel
 MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index bb4b35946ddf..4cd15d6d1b84 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1,2 +1,2 @@
-MD5 (kaffe-1.1.5.tar.gz) = 928c578d4808012fe5ba5587071d2aa2
-SIZE (kaffe-1.1.5.tar.gz) = 9796278
+MD5 (kaffe-1.1.6.tar.gz) = 29d4b9ec58080715d13a764e9e4cfc06
+SIZE (kaffe-1.1.6.tar.gz) = 10779887
diff --git a/java/kaffe/files/patch-x86_64-md.c b/java/kaffe/files/patch-x86_64-md.c
new file mode 100644
index 000000000000..3bde8f9ec4b4
--- /dev/null
+++ b/java/kaffe/files/patch-x86_64-md.c
@@ -0,0 +1,13 @@
+--- config/x86_64/freebsd2/md.c.orig	Sat Oct 15 13:49:14 2005
++++ config/x86_64/freebsd2/md.c		Sat Oct 15 13:50:23 2005
+@@ -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/java/kaffe/pkg-plist b/java/kaffe/pkg-plist
index fcea283d4e90..c10a184533ec 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -7,16 +7,19 @@ bin/javac
 bin/javadoc
 bin/javah
 bin/javap
+bin/jdb
 bin/kaffe
 bin/kaffeh
 bin/native2ascii
 bin/rmic
 bin/rmiregistry
 bin/serialver
+include/config-int.h
 include/jawt.h
 include/jawt_md.h
 include/jni.h
 include/jni_cpp.h
+include/jni_md.h
 include/jvmpi.h
 include/kaffe/java_lang_Object.h
 include/kaffe/java_lang_StackTraceElement.h
@@ -26,16 +29,16 @@ include/kaffe/java_lang_ThreadGroup.h
 include/kaffe/java_lang_Throwable.h
 include/kaffe/java_lang_VMThrowable.h
 include/kaffe/jmalloc.h
-include/kaffe/jni_md.h
+include/kaffe/trampoline.h
 include/kaffe_jni.h
 jre/bin/java
 jre/bin/kaffe
 jre/bin/kaffe-bin
 jre/bin/rmiregistry
 jre/lib/gmpjavamath.jar
-jre/lib/%%ARCH%%/libclasspath-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libclasspath.a
-jre/lib/%%ARCH%%/libclasspath.so
+jre/lib/logging.properties
+jre/lib/rt.jar
+jre/lib/security/java.security
 jre/lib/%%ARCH%%/libgtkpeer.a
 jre/lib/%%ARCH%%/libgtkpeer.so
 jre/lib/%%ARCH%%/libgtkpeer.so.0
@@ -44,12 +47,6 @@ jre/lib/%%ARCH%%/libio.so
 jre/lib/%%ARCH%%/libjawt.a
 jre/lib/%%ARCH%%/libjawt.so
 jre/lib/%%ARCH%%/libjawt.so.0
-jre/lib/%%ARCH%%/libkaffegc-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libkaffegc.a
-jre/lib/%%ARCH%%/libkaffegc.so
-jre/lib/%%ARCH%%/libkaffeverifier-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libkaffeverifier.a
-jre/lib/%%ARCH%%/libkaffeverifier.so
 jre/lib/%%ARCH%%/libkaffevm-%%PORTVER%%.so
 jre/lib/%%ARCH%%/libkaffevm.a
 jre/lib/%%ARCH%%/libkaffevm.so
@@ -63,23 +60,19 @@ jre/lib/%%ARCH%%/libnet-%%PORTVER%%.so
 jre/lib/%%ARCH%%/libnet.so
 jre/lib/%%ARCH%%/libnio-%%PORTVER%%.so
 jre/lib/%%ARCH%%/libnio.so
-jre/lib/%%ARCH%%/libreplace-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libreplace.a
-jre/lib/%%ARCH%%/libreplace.so
 jre/lib/%%ARCH%%/libsecurity-%%PORTVER%%.so
 jre/lib/%%ARCH%%/libsecurity.so
 jre/lib/%%ARCH%%/libtritonusesd-%%PORTVER%%.so
 jre/lib/%%ARCH%%/libtritonusesd.so
 jre/lib/%%ARCH%%/libzip-%%PORTVER%%.so
 jre/lib/%%ARCH%%/libzip.so
-jre/lib/logging.properties
-jre/lib/rt.jar
-jre/lib/security/java.security
-jre/lib/tools.jar
 lib/awt/font.properties
+lib/tools.jar
 %%DATADIR%%/BUILD_ENVIRONMENT
 %%DATADIR%%/license.terms
+share/locale/de/LC_MESSAGES/kaffe.mo
 share/locale/fr/LC_MESSAGES/kaffe.mo
+share/locale/zh_CN/LC_MESSAGES/kaffe.mo
 share/locale/zh_TW/LC_MESSAGES/kaffe.mo
 @dirrm bin
 @dirrm lib/awt