Update kaffe to 1.0.6.

1.0.6 fixes a number of bugs, supports libffi, features gcj integration
and a new version of kjc.

Converted kaffe to use our libtool.

Closes PR 10673.

4 files changed, 43 insertions, 20 deletions

diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index ef9d461eea6..7ff6445b4e8 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2001/03/04 09:06:16 tron Exp $
+# $NetBSD: Makefile,v 1.31 2001/03/19 17:07:16 wennmach Exp $
 #
 
-DISTNAME=		kaffe-1.0.5
-PKGNAME=		kaffe-1.0.5nb1
+DISTNAME=		kaffe-1.0.6
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.kaffe.org/pub/kaffe/
 
@@ -16,6 +15,7 @@ DEPENDS+=		libungif-*:../../graphics/libungif
 DEPENDS+=		gmp>=3.0.0:../../devel/gmp
 
 USE_X11=		yes
+USE_LIBTOOL=		yes
 
 ONLY_FOR_PLATFORM=	*-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc
 
@@ -26,6 +26,12 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 CPPFLAGS+=		-Dunix -I${LOCALBASE}/include -I${X11BASE}/include
 
+post-configure:
+	${RM} ${WRKDIR}/${PKGNAME}/libtool
+	${LN} -s ${LOCALBASE}/bin/libtool ${WRKDIR}/${PKGNAME}/libtool
+	${RM} ${WRKDIR}/${PKGNAME}/libltdl/libtool
+	${LN} -s ${LOCALBASE}/bin/libtool ${WRKDIR}/${PKGNAME}/libltdl/libtool
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/license.terms \
 		${PREFIX}/kaffe/share
diff --git a/lang/kaffe/files/md5 b/lang/kaffe/files/md5
index 97a7915bffb..f51d6b7e947 100644
--- a/lang/kaffe/files/md5
+++ b/lang/kaffe/files/md5
@@ -1,2 +1,3 @@
-$NetBSD: md5,v 1.7 1999/11/10 18:03:26 drochner Exp $
-MD5 (kaffe-1.0.5.tar.gz) = f75b697759d355b4e5ce5598e62de515
+$NetBSD: md5,v 1.8 2001/03/19 17:07:16 wennmach Exp $
+
+MD5 (kaffe-1.0.6.tar.gz) = 5a900dd33e7bde48d2fa94ada273e80e
diff --git a/lang/kaffe/files/patch-sum b/lang/kaffe/files/patch-sum
index 4472ad1e791..d1a6e6153ac 100644
--- a/lang/kaffe/files/patch-sum
+++ b/lang/kaffe/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/09/13 16:53:56 wennmach Exp $
+$NetBSD: patch-sum,v 1.4 2001/03/19 17:07:16 wennmach Exp $
 
-MD5 (patch-aa) = 1a59ab0c92c3e99f881093e309d1d065
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/lang/kaffe/pkg/PLIST b/lang/kaffe/pkg/PLIST
index 1e9ba43e26e..d816d356155 100644
--- a/lang/kaffe/pkg/PLIST
+++ b/lang/kaffe/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2001/03/12 11:23:05 skrll Exp $
+@comment $NetBSD: PLIST,v 1.16 2001/03/19 17:07:16 wennmach Exp $
 kaffe/bin/appletviewer
 kaffe/bin/install-jar
 kaffe/bin/jar
@@ -11,6 +11,7 @@ kaffe/bin/jdb
 kaffe/bin/kaffe
 kaffe/bin/kaffeh
 kaffe/bin/kjc
+kaffe/bin/kopi
 kaffe/bin/native2ascii
 kaffe/bin/rmic
 kaffe/bin/rmiregistry
@@ -28,39 +29,51 @@ kaffe/include/kaffe/jni_cpp.h
 kaffe/include/kaffe/jsyscall.h
 kaffe/include/kaffe/jtypes.h
 kaffe/include/kaffe/native.h
+kaffe/lib/kaffe/libawt-1.0.6.so
 kaffe/lib/kaffe/libawt.a
 kaffe/lib/kaffe/libawt.la
-kaffe/lib/kaffe/libio-1.0.5.so
-kaffe/lib/kaffe/libio-1.0.5.so.0.0
+kaffe/lib/kaffe/libawt.so
+kaffe/lib/kaffe/libio-1.0.6.so
+kaffe/lib/kaffe/libio.a
 kaffe/lib/kaffe/libio.la
 kaffe/lib/kaffe/libio.so.0.0
-kaffe/lib/kaffe/libmanagement-1.0.5.so
-kaffe/lib/kaffe/libmanagement-1.0.5.so.0.0
+kaffe/lib/kaffe/libmanagement-1.0.6.so
+kaffe/lib/kaffe/libmanagement.a
 kaffe/lib/kaffe/libmanagement.la
 kaffe/lib/kaffe/libmanagement.so.0.0
+kaffe/lib/kaffe/libmath-1.0.6.so
 kaffe/lib/kaffe/libmath.a
 kaffe/lib/kaffe/libmath.la
-kaffe/lib/kaffe/libmicrosoft-1.0.5.so
-kaffe/lib/kaffe/libmicrosoft-1.0.5.so.0.0
+kaffe/lib/kaffe/libmath.so
+kaffe/lib/kaffe/libmicrosoft-1.0.6.so
+kaffe/lib/kaffe/libmicrosoft.a
 kaffe/lib/kaffe/libmicrosoft.la
 kaffe/lib/kaffe/libmicrosoft.so.0.0
+kaffe/lib/kaffe/libnative-1.0.6.so
 kaffe/lib/kaffe/libnative.a
 kaffe/lib/kaffe/libnative.la
-kaffe/lib/kaffe/libnet-1.0.5.so
-kaffe/lib/kaffe/libnet-1.0.5.so.0.0
+kaffe/lib/kaffe/libnative.so
+kaffe/lib/kaffe/libnet-1.0.6.so
+kaffe/lib/kaffe/libnet.a
 kaffe/lib/kaffe/libnet.la
 kaffe/lib/kaffe/libnet.so.0.0
-kaffe/lib/kaffe/libsecurity-1.0.5.so
-kaffe/lib/kaffe/libsecurity-1.0.5.so.0.0
+kaffe/lib/kaffe/libsecurity-1.0.6.so
+kaffe/lib/kaffe/libsecurity.a
 kaffe/lib/kaffe/libsecurity.la
 kaffe/lib/kaffe/libsecurity.so.0.0
+kaffe/lib/kaffe/libzip-1.0.6.so
 kaffe/lib/kaffe/libzip.a
 kaffe/lib/kaffe/libzip.la
+kaffe/lib/kaffe/libzip.so
 kaffe/lib/kaffe/security/java.security
-kaffe/lib/libkaffevm-1.0.5.so
-kaffe/lib/libkaffevm-1.0.5.so.0.0
+kaffe/lib/libkaffevm-1.0.6.so
+kaffe/lib/libkaffevm.a
 kaffe/lib/libkaffevm.la
 kaffe/lib/libkaffevm.so.0.0
+kaffe/lib/libkaffexprof-1.0.6.so
+kaffe/lib/libkaffexprof.a
+kaffe/lib/libkaffexprof.la
+kaffe/lib/libkaffexprof.so
 kaffe/libexec/Kaffe
 kaffe/man/man1/kaffe.1
 kaffe/share/kaffe/Klasses.jar