update to 1.0b4

15 files changed, 85 insertions, 245 deletions

diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 25ba40fecd0..913f6bb59ea 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 1999/07/11 23:05:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.20 1999/08/07 10:23:52 drochner Exp $
 #
 
-DISTNAME=		kaffe-1.0.b3
+DISTNAME=		kaffe-1.0.b4
+WRKSRC=			${WRKDIR}/kaffe-1.0b4
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.transvirtual.com/pub/kaffe/
 
@@ -14,18 +15,14 @@ DEPENDS=		jpeg-6b:../../graphics/jpeg \
 
 ONLY_FOR_PLATFORM=	*-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc
 
-GNU_CONFIGURE=		yes
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS=		--prefix=${PREFIX}/kaffe
+CONFIGURE_ARGS+=	--with-rtlibraries="${LOCALBASE}/lib ${X11BASE}/lib"
 CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-			CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LOCALBASE=${LOCALBASE}
-MAKE_ENV=		PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} \
-			LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
-			MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}"
-CFLAGS+=		-Dunix -I${LOCALBASE}/include -I${X11BASE}/include
+			CPPFLAGS="-Dunix -I${LOCALBASE}/include -I${X11BASE}/include"
 
 post-install:
-	${MKDIR} ${PREFIX}/share/kaffe
-	${INSTALL_DATA} ${WRKSRC}/ENVIRONMENT ${WRKSRC}/license.terms \
-		${PREFIX}/share/kaffe
+	${INSTALL_DATA} ${WRKSRC}/license.terms \
+		${PREFIX}/kaffe/share
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe/files/md5 b/lang/kaffe/files/md5
index 0d9a039b24b..c8cb569c020 100644
--- a/lang/kaffe/files/md5
+++ b/lang/kaffe/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1998/12/08 23:19:49 frueauf Exp $
+$NetBSD: md5,v 1.6 1999/08/07 10:23:53 drochner Exp $
 
-MD5 (kaffe-1.0.b3.tar.gz) = 2b911676c380b88e5d3e3ba65b584740
+MD5 (kaffe-1.0.b4.tar.gz) = 86f917a3e592a80fff9affa2f92712a7
diff --git a/lang/kaffe/files/patch-sum b/lang/kaffe/files/patch-sum
deleted file mode 100644
index 04cc5c0ce53..00000000000
--- a/lang/kaffe/files/patch-sum
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:54:09 agc Exp $
-
-MD5 (patch-aa) = 7052afd098f50835d84169b189c1d25a
-MD5 (patch-ab) = 0a49fb3ea37cfd3295999ec51b50eeeb
-MD5 (patch-ac) = ec1d49780a19f015cd92b89c548f7867
-MD5 (patch-ad) = dd70813bd030fb448de60445776b70da
-MD5 (patch-ae) = 9a962a853d254f9a946238d3a256dbcd
-MD5 (patch-af) = cffc4101138a746a29019616b4548053
-MD5 (patch-ag) = 94a6c586e9e967bb814298bebc4e1e67
-MD5 (patch-ah) = f2c4ada476328190697d45abbfc1df01
-MD5 (patch-ai) = e9b4c6b653b3b88d9b6b4d911d73f487
-MD5 (patch-aj) = 64f87d0cda133dd14192db530c2f1c2c
-MD5 (patch-ak) = e475e0d5ccda443275096828a97503cd
diff --git a/lang/kaffe/patches/patch-aa b/lang/kaffe/patches/patch-aa
deleted file mode 100644
index a07de7b9cdc..00000000000
--- a/lang/kaffe/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1998/10/14 21:34:43 frueauf Exp $
-
---- configure.orig	Fri Oct  2 00:27:20 1998
-+++ configure	Wed Oct  7 18:08:26 1998
-@@ -2707,7 +2707,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ljpeg  $LIBS"
-+LIBS="-ljpeg -L${LOCALBASE}/lib $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2713 "configure"
- #include "confdefs.h"
-@@ -2735,8 +2735,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    JPEG_LIBRARIES="-ljpeg $JPEG_LIBRARIES";
--  LIBS="-ljpeg $LIBS"
-+    JPEG_LIBRARIES="-ljpeg -L${LOCALBASE}/lib $JPEG_LIBRARIES";
-+  LIBS="-ljpeg  -L${LOCALBASE}/lib $LIBS"
-   ac_tr_lib=HAVE_LIB`echo jpeg | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
diff --git a/lang/kaffe/patches/patch-ab b/lang/kaffe/patches/patch-ab
deleted file mode 100644
index c42eedaccbb..00000000000
--- a/lang/kaffe/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 1998/10/14 21:34:43 frueauf Exp $
-
---- kaffe/kaffevm/Makefile.in-orig	Tue Oct  6 14:06:07 1998
-+++ kaffe/kaffevm/Makefile.in	Wed Oct 14 22:54:03 1998
-@@ -23,7 +23,7 @@
- DLLTOOL=	@DLLTOOL@
- DEPTOOL=	@DEPTOOL@
- PIC=		@PICVM@
--LDFLAGS=	@LIBSHARE@ @LDFLAGS@
-+LDFLAGS=	@LIBSHARE@
- LIBS=		@LIBS@
- LDTAIL=		@LDTAIL@ @NET_LIBRARIES@ @STD_LIBRARIES@ @VM_LIBRARIES@
- KVER=		@KVER@
diff --git a/lang/kaffe/patches/patch-ac b/lang/kaffe/patches/patch-ac
deleted file mode 100644
index ba04cfe893c..00000000000
--- a/lang/kaffe/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/10/14 21:34:43 frueauf Exp $
-
---- libraries/clib/awt/Makefile.in-orig	Tue Oct  6 14:06:09 1998
-+++ libraries/clib/awt/Makefile.in	Wed Oct 14 22:49:22 1998
-@@ -28,7 +28,7 @@
- DLLTOOL=	@DLLTOOL@
- DEPTOOL=        @DEPTOOL@
- PIC=		@PIC@
--LDFLAGS=	@LIBSHARE@ @LDFLAGS@
-+LDFLAGS=	@LIBSHARE@
- LIBS=		@LIBS@
- LDTAIL=		@LDTAIL@ @AWTLIB@
- KVER=		@KVER@
diff --git a/lang/kaffe/patches/patch-ad b/lang/kaffe/patches/patch-ad
deleted file mode 100644
index 8700ba05e2a..00000000000
--- a/lang/kaffe/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1998/10/14 21:34:43 frueauf Exp $
-
---- libraries/clib/math/Makefile.in-orig	Tue Oct  6 14:06:11 1998
-+++ libraries/clib/math/Makefile.in	Wed Oct 14 22:50:25 1998
-@@ -27,7 +27,7 @@
- DLLTOOL=	@DLLTOOL@
- DEPTOOL=	@DEPTOOL@
- PIC=		@PIC@
--LDFLAGS=	@LIBSHARE@ @LDFLAGS@
-+LDFLAGS=	@LIBSHARE@
- LIBS=		@LIBS@
- LDTAIL=		@LDTAIL@ @STD_LIBRARIES@ @MATH_LIBRARIES@
- KVER=		@KVER@
diff --git a/lang/kaffe/patches/patch-ae b/lang/kaffe/patches/patch-ae
deleted file mode 100644
index 65ee29a0ee2..00000000000
--- a/lang/kaffe/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/10/14 21:34:44 frueauf Exp $
-
---- libraries/clib/management/Makefile.in-orig	Tue Oct  6 14:06:10 1998
-+++ libraries/clib/management/Makefile.in	Wed Oct 14 22:49:59 1998
-@@ -27,7 +27,7 @@
- DLLTOOL=	@DLLTOOL@
- DEPTOOL=        @DEPTOOL@
- PIC=		@PIC@
--LDFLAGS=	@LIBSHARE@ @LDFLAGS@
-+LDFLAGS=	@LIBSHARE@
- LIBS=		@LIBS@
- LDTAIL=		@LDTAIL@ @STD_LIBRARIES@
- KVER=		@KVER@
diff --git a/lang/kaffe/patches/patch-af b/lang/kaffe/patches/patch-af
deleted file mode 100644
index 685723dab31..00000000000
--- a/lang/kaffe/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 1998/10/14 21:34:44 frueauf Exp $
-
---- libraries/clib/native/Makefile.in-orig	Tue Oct  6 14:06:12 1998
-+++ libraries/clib/native/Makefile.in	Wed Oct 14 22:51:01 1998
-@@ -27,7 +27,7 @@
- DLLTOOL=	@DLLTOOL@
- DEPTOOL=	@DEPTOOL@
- PIC=		@PIC@
--LDFLAGS=	@LIBSHARE@ @LDFLAGS@
-+LDFLAGS=	@LIBSHARE@
- LIBS=		@LIBS@
- LDTAIL=		@LDTAIL@ @STD_LIBRARIES@
- KVER=		@KVER@
diff --git a/lang/kaffe/patches/patch-ag b/lang/kaffe/patches/patch-ag
deleted file mode 100644
index 502e768117e..00000000000
--- a/lang/kaffe/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1998/10/14 21:34:44 frueauf Exp $
-
---- libraries/clib/net/Makefile.in-orig	Fri Sep 11 17:25:27 1998
-+++ libraries/clib/net/Makefile.in	Wed Oct 14 22:51:26 1998
-@@ -26,7 +26,7 @@
- DLLTOOL=	@DLLTOOL@
- DEPTOOL=	@DEPTOOL@
- PIC=		@PIC@
--LDFLAGS=	@LIBSHARE@ @LDFLAGS@
-+LDFLAGS=	@LIBSHARE@
- LIBS=		@LIBS@
- LDTAIL=		@LDTAIL@ @NET_LIBRARIES@
- KVER=		@KVER@
diff --git a/lang/kaffe/patches/patch-ah b/lang/kaffe/patches/patch-ah
deleted file mode 100644
index c84df48a0e7..00000000000
--- a/lang/kaffe/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1998/10/14 21:34:44 frueauf Exp $
-
---- libraries/clib/zip/Makefile.in-orig	Tue Oct  6 14:06:14 1998
-+++ libraries/clib/zip/Makefile.in	Wed Oct 14 22:51:49 1998
-@@ -27,7 +27,7 @@
- DLLTOOL=	@DLLTOOL@
- DEPTOOL=	@DEPTOOL@
- PIC=		@PIC@
--LDFLAGS=	@LIBSHARE@ @LDFLAGS@
-+LDFLAGS=	@LIBSHARE@
- LIBS=		@LIBS@
- LDTAIL=		@LDTAIL@ @STD_LIBRARIES@ @ZIP_LIBRARIES@
- KVER=		@KVER@
diff --git a/lang/kaffe/patches/patch-ai b/lang/kaffe/patches/patch-ai
deleted file mode 100644
index 9bd546a10e4..00000000000
--- a/lang/kaffe/patches/patch-ai
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ai,v 1.2 1998/11/12 23:37:59 frueauf Exp $
-
---- config/arm/netbsd1/config.frag.orig	Thu Jun  4 22:15:46 1998
-+++ config/arm/netbsd1/config.frag	Sat Nov  7 13:07:45 1998
-@@ -1,10 +1,14 @@
- #
--# We do not support shared libraries yet
-+# arm/Netbsd1 configuration
- #
--dynamic_libraries=no
-+host_cpu=arm
-+host_os=netbsd1
-+PIC=-fpic
-+LIBSHARE=-Bshareable
-+LIBEXT=.so
- 
- #
- # Unfortunately, it doesn't pass GCTest when preemption is enabled,
- # so old threads only for now.  XXX
- #
- with_threads=unix-internal
diff --git a/lang/kaffe/patches/patch-aj b/lang/kaffe/patches/patch-aj
deleted file mode 100644
index 9883441e2e1..00000000000
--- a/lang/kaffe/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1998/11/12 23:37:59 frueauf Exp $
-
---- config/i386/netbsd1/config.frag.orig	Tue Mar 31 14:10:53 1998
-+++ config/i386/netbsd1/config.frag	Sun Nov  8 18:13:28 1998
-@@ -6,3 +6,9 @@
- PIC=-fpic
- LIBSHARE=-Bshareable
- LIBEXT=.so
-+
-+#
-+# Unfortunately, it doesn't pass GCTest when preemption is enabled,
-+# so old threads only for now.  XXX
-+#
-+with_threads=unix-internal
diff --git a/lang/kaffe/patches/patch-ak b/lang/kaffe/patches/patch-ak
deleted file mode 100644
index d2a56130661..00000000000
--- a/lang/kaffe/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1998/12/08 23:19:49 frueauf Exp $
-
---- libraries/clib/io/Makefile.in-orig	Tue Dec  8 05:18:52 1998
-+++ libraries/clib/io/Makefile.in	Tue Dec  8 23:05:21 1998
-@@ -26,7 +26,7 @@
- DLLTOOL=	@DLLTOOL@
- DEPTOOL=	@DEPTOOL@
- PIC=		@PIC@
--LDFLAGS=	@LIBSHARE@ @LDFLAGS@
-+LDFLAGS=	@LIBSHARE@
- LIBS=		@LIBS@
- LDTAIL=		@LDTAIL@ @STD_LIBRARIES@
- KVER=		@KVER@
diff --git a/lang/kaffe/pkg/PLIST b/lang/kaffe/pkg/PLIST
index 2ff2abf0959..cc98b79525b 100644
--- a/lang/kaffe/pkg/PLIST
+++ b/lang/kaffe/pkg/PLIST
@@ -1,55 +1,74 @@
-@comment $NetBSD: PLIST,v 1.9 1998/12/08 23:19:49 frueauf Exp $
-bin/Kaffe
-bin/appletviewer
-bin/install-jar
-bin/jar
-bin/java
-bin/javac
-bin/javadoc
-bin/javakey
-bin/javap
-bin/jdb
-bin/kaffe
-bin/kaffeh
-bin/native2ascii
-bin/pizza
-bin/pizzadoc
-bin/report-kaffe-bug
-bin/rmic
-bin/rmiregistry
-bin/serialver
-include/kaffe/Arrays.h
-include/kaffe/java_lang_Object.h
-include/kaffe/java_lang_String.h
-include/kaffe/java_lang_Thread.h
-include/kaffe/java_lang_ThreadGroup.h
-include/kaffe/java_lang_Throwable.h
-include/kaffe/jmalloc.h
-include/kaffe/jni.h
-include/kaffe/jsyscall.h
-include/kaffe/jtypes.h
-include/kaffe/native.h
-lib/libkaffevm.so
-lib/libkaffevm.so.1.00
-lib/kaffe/libawt.so
-lib/kaffe/libawt.so.1.00
-lib/kaffe/libio.so
-lib/kaffe/libio.so.1.00
-lib/kaffe/libmanagement.so
-lib/kaffe/libmanagement.so.1.00
-lib/kaffe/libmath.so
-lib/kaffe/libmath.so.1.00
-lib/kaffe/libnative.so
-lib/kaffe/libnative.so.1.00
-lib/kaffe/libnet.so
-lib/kaffe/libnet.so.1.00
-lib/kaffe/libzip.so
-lib/kaffe/libzip.so.1.00
-man/man1/kaffe.1
-share/kaffe/ENVIRONMENT
-share/kaffe/Klasses.jar
-share/kaffe/license.terms
-share/kaffe/pizza.jar
-@dirrm include/kaffe
-@dirrm lib/kaffe
-@dirrm share/kaffe
+@comment $NetBSD: PLIST,v 1.10 1999/08/07 10:23:55 drochner Exp $
+kaffe/bin/appletviewer
+kaffe/bin/install-jar
+kaffe/bin/jar
+kaffe/bin/java
+kaffe/bin/javac
+kaffe/bin/javadoc
+kaffe/bin/javakey
+kaffe/bin/javap
+kaffe/bin/jdb
+kaffe/bin/kaffe
+kaffe/bin/kaffeh
+kaffe/bin/native2ascii
+kaffe/bin/pizza
+kaffe/bin/pizzadoc
+kaffe/bin/report-kaffe-bug
+kaffe/bin/rmic
+kaffe/bin/rmiregistry
+kaffe/bin/serialver
+kaffe/include/kaffe/Arrays.h
+kaffe/include/kaffe/java_lang_Object.h
+kaffe/include/kaffe/java_lang_String.h
+kaffe/include/kaffe/java_lang_Thread.h
+kaffe/include/kaffe/java_lang_ThreadGroup.h
+kaffe/include/kaffe/java_lang_Throwable.h
+kaffe/include/kaffe/jmalloc.h
+kaffe/include/kaffe/jni.h
+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.a
+kaffe/lib/kaffe/libawt.la
+kaffe/lib/kaffe/libio-1.0b4.so
+kaffe/lib/kaffe/libio-1.0b4.so.0.0
+kaffe/lib/kaffe/libio.la
+kaffe/lib/kaffe/libio.so
+kaffe/lib/kaffe/libmanagement-1.0b4.so
+kaffe/lib/kaffe/libmanagement-1.0b4.so.0.0
+kaffe/lib/kaffe/libmanagement.la
+kaffe/lib/kaffe/libmanagement.so
+kaffe/lib/kaffe/libmath.a
+kaffe/lib/kaffe/libmath.la
+kaffe/lib/kaffe/libnative.a
+kaffe/lib/kaffe/libnative.la
+kaffe/lib/kaffe/libnet-1.0b4.so
+kaffe/lib/kaffe/libnet-1.0b4.so.0.0
+kaffe/lib/kaffe/libnet.la
+kaffe/lib/kaffe/libnet.so
+kaffe/lib/kaffe/libzip.a
+kaffe/lib/kaffe/libzip.la
+kaffe/lib/libkaffevm-1.0b4.so
+kaffe/lib/libkaffevm-1.0b4.so.0.0
+kaffe/lib/libkaffevm.la
+kaffe/lib/libkaffevm.so
+kaffe/libexec/Kaffe
+kaffe/man/man1/kaffe.1
+kaffe/share/kaffe/Klasses.jar
+kaffe/share/kaffe/comm.jar
+kaffe/share/kaffe/pizza.jar
+kaffe/share/kaffe/pjava.jar
+kaffe/share/kaffe/servlet.jar
+kaffe/share/license.terms
+@dirrm kaffe/bin
+@dirrm kaffe/include/kaffe
+@dirrm kaffe/include
+@dirrm kaffe/lib/kaffe
+@dirrm kaffe/lib
+@dirrm kaffe/libexec
+@dirrm kaffe/man/man1
+@dirrm kaffe/man
+@dirrm kaffe/share/kaffe
+@dirrm kaffe/share
+@dirrm kaffe