Update kaffe to 1.0.b2.

11 files changed, 131 insertions, 32 deletions

diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 2af440bcb22..49a06e7b2a9 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,25 +1,30 @@
-# $NetBSD: Makefile,v 1.12 1998/09/22 06:11:38 garbled Exp $
+# $NetBSD: Makefile,v 1.13 1998/10/14 21:34:41 frueauf Exp $
 #
 
-DISTNAME=	kaffe-1.0.b1
+DISTNAME=	kaffe-1.0.b2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.transvirtual.com/pub/kaffe/
 
-NOT_FOR_ARCHS=	alpha	#assembler problems
-
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.transvirtual.com/kaffe.html
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
+DEPENDS+=	png-1.0.2:../../graphics/png
+DEPENDS+=	giflib-3.0:../../graphics/giflib
 
-CONFLICTS=	kaffe-0.9.2
+CONFLICTS=	kaffe-0.9.2 kaffe-1.0.b1
 
-ONLY_FOR_ARCHS=	alpha arm32 i386 m68k mips* sparc
+ONLY_FOR_ARCHS=	arm32 i386 m68k mips* sparc
+NOT_FOR_ARCHS=	alpha	#assembler problems
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
-CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
+		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
 
 post-install:
 	${MKDIR} ${PREFIX}/share/kaffe
diff --git a/lang/kaffe/files/md5 b/lang/kaffe/files/md5
index c7095205a3d..297008f089f 100644
--- a/lang/kaffe/files/md5
+++ b/lang/kaffe/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:24:57 agc Exp $
+$NetBSD: md5,v 1.4 1998/10/14 21:34:42 frueauf Exp $
 
-MD5 (kaffe-1.0.b1.tar.gz) = 90cc0fe53f3dc9fea9c08181d8cba076
+MD5 (kaffe-1.0.b2.tar.gz) = f9aad2da214df83abb54c9c9f5af0646
diff --git a/lang/kaffe/patches/patch-aa b/lang/kaffe/patches/patch-aa
index acd780a4796..a07de7b9cdc 100644
--- a/lang/kaffe/patches/patch-aa
+++ b/lang/kaffe/patches/patch-aa
@@ -1,24 +1,24 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:09:18 agc Exp $
+$NetBSD: patch-aa,v 1.5 1998/10/14 21:34:43 frueauf Exp $
 
---- configure.orig	Tue Jul 14 08:54:26 1998
-+++ configure	Wed Jul 15 13:08:19 1998
-@@ -2587,7 +2587,7 @@
+--- 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$libdir $LIBS"
++LIBS="-ljpeg -L${LOCALBASE}/lib $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2593 "configure"
+ #line 2713 "configure"
  #include "confdefs.h"
-@@ -2615,8 +2615,8 @@
+@@ -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$libdir $JPEG_LIBRARIES";
-+  LIBS="-ljpeg  -L$libdir $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
new file mode 100644
index 00000000000..c42eedaccbb
--- /dev/null
+++ b/lang/kaffe/patches/patch-ab
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..ba04cfe893c
--- /dev/null
+++ b/lang/kaffe/patches/patch-ac
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..8700ba05e2a
--- /dev/null
+++ b/lang/kaffe/patches/patch-ad
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..65ee29a0ee2
--- /dev/null
+++ b/lang/kaffe/patches/patch-ae
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..685723dab31
--- /dev/null
+++ b/lang/kaffe/patches/patch-af
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..502e768117e
--- /dev/null
+++ b/lang/kaffe/patches/patch-ag
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..c84df48a0e7
--- /dev/null
+++ b/lang/kaffe/patches/patch-ah
@@ -0,0 +1,13 @@
+$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/pkg/PLIST b/lang/kaffe/pkg/PLIST
index 852485296ef..4a348c9b8f7 100644
--- a/lang/kaffe/pkg/PLIST
+++ b/lang/kaffe/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 1998/07/16 13:02:35 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.8 1998/10/14 21:34:45 frueauf Exp $
 bin/Kaffe
 bin/appletviewer
 bin/install-jar
@@ -25,27 +25,30 @@ 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/libawt.so
-lib/libawt.so.1.00
 lib/libkaffevm.so
 lib/libkaffevm.so.1.00
-lib/libmanagement.so
-lib/libmanagement.so.1.00
-lib/libmath.so
-lib/libmath.so.1.00
-lib/libnative.so
-lib/libnative.so.1.00
-lib/libnet.so
-lib/libnet.so.1.00
-lib/libzip.so
-lib/libzip.so.1.00
 man/man1/kaffe.1
 share/kaffe/ENVIRONMENT
 share/kaffe/Klasses.jar
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libawt.so
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libawt.so.1.00
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libmanagement.so
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libmanagement.so.1.00
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libmath.so
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libmath.so.1.00
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libnative.so
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libnative.so.1.00
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libnet.so
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libnet.so.1.00
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libzip.so
+share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1/libzip.so.1.00
 share/kaffe/license.terms
 share/kaffe/pizza.jar
 @dirrm include/kaffe
+@dirrm share/kaffe/lib/${MACHINE_GNU_ARCH}-netbsd1
+@dirrm share/kaffe/lib
 @dirrm share/kaffe