Update to 1.1.5, which includes a port to amd64. (Ports to alpha, powerpc,

sparc64 should be quick, but I haven't been able to scare up the resources on
the cluster machines).  Also, remove the compile-time options such as different
AWTs, which are intended by the developers for use in embedded systems, not
general users.

Also, move maintainership to myself, since I'm working on kaffe too frequently.
Thanks Mark for your work on this port!

PR:		ports/80641
Submitted by:	anholt
Approved by:	maintainer

5 files changed, 44 insertions, 99 deletions

diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index be255a8cf8a6..c7d324fbd8d2 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	kaffe
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTVERSION=	1.1.5
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 
-MAINTAINER=	xaa+ports@timewasters.nl
+MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	Multi-platform Java virtual machine with JIT compiler and AWT package
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -23,9 +22,9 @@ CONFLICTS=	kaffe-1.[!1].* javavmwrapper-2.*
 
 WRKSRC=		${WRKDIR}/kaffe-${PORTVERSION}
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 USE_ICONV=	yes
 LIBTOOLFLAGS=
@@ -33,47 +32,19 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib --with-iconv-prefix=${LOCALBASE}
 
+USE_GNOME=	esound gtk20 libartlgpl2
 WANT_GNOME=	esound
 
 MAN1=		kaffe.1
 
-OPTIONS=	AWT_X "Use AWT widgets with X" On \
-		AWT_QT "Use AWT widgets with Qt" Off
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_AWT_X)
-. if defined(WITH_AWT_QT)
-    BROKEN=	"Choose either 'X' or 'Qt' in 'make config'"
-. endif
-  CONFIGURE_ARGS+=	--with-awt=X
-  USE_XLIB=		yes
-  AWT=			yes
-  WITH_ESOUND=		yes
-.elif defined(WITH_AWT_QT)
-  CONFIGURE_ARGS+=	--with-awt=qt --with-qtdir=${X11BASE}
-  AWT=			yes
-  USE_QT_VER=		3
-  WITH_ESOUND=		yes
-.else
-  CONFIGURE_ARGS+=	--with-awt=no
-.endif
-
-.if defined(AWT)
-  PLIST_SUB+=	SUB_AWT=""
+.if ${ARCH} == amd64
+PLIST_SUB+=    PORTVER=${PORTVERSION} ARCH=x86_64
 .else
-  PLIST_SUB+=	SUB_AWT="@comment "
+PLIST_SUB+=    PORTVER=${PORTVERSION} ARCH=${ARCH}
 .endif
 
-.if defined(WITH_ESOUND)
-  USE_GNOME+=	esound
-  PLIST_SUB+=	SUB_ESOUND=""
-.else
-  PLIST_SUB+=	SUB_ESOUND="@comment "
-.endif
-
-PLIST_SUB+=	PORTVER=${PORTVERSION} ARCH=${ARCH}
-
 post-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/BUILD_ENVIRONMENT ${DATADIR}
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index fd8a12d51e8b..bb4b35946ddf 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1,2 +1,2 @@
-MD5 (kaffe-1.1.3.tar.gz) = 2563e002e554b1c1644cb84cc3eaba74
-SIZE (kaffe-1.1.3.tar.gz) = 8937585
+MD5 (kaffe-1.1.5.tar.gz) = 928c578d4808012fe5ba5587071d2aa2
+SIZE (kaffe-1.1.5.tar.gz) = 9796278
diff --git a/java/kaffe/files/patch-inetaddressimpl b/java/kaffe/files/patch-inetaddressimpl
deleted file mode 100644
index 7a4017a9f808..000000000000
--- a/java/kaffe/files/patch-inetaddressimpl
+++ /dev/null
@@ -1,12 +0,0 @@
---- libraries/clib/net/InetAddressImpl.c.orig	Wed Dec 31 13:43:03 2003
-+++ libraries/clib/net/InetAddressImpl.c	Wed Dec 31 13:43:09 2003
-@@ -241,7 +241,9 @@
- 			   "Unable to contact name server");
-       break;
-     case EAI_NONAME:
-+#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
-     case EAI_NODATA:
-+#endif
-       postExceptionMessage(&einfo,
- 			   JAVA_NET(UnknownHostException),
- 			   "Unknown host: %s",
diff --git a/java/kaffe/files/patch-kaffe_kaffevm_jit3_labels.c b/java/kaffe/files/patch-kaffe_kaffevm_jit3_labels.c
deleted file mode 100644
index 0d91b58b0290..000000000000
--- a/java/kaffe/files/patch-kaffe_kaffevm_jit3_labels.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/java/kaffe/files/Attic/patch-kaffe_kaffevm_jit3_labels.c,v 1.1 2005-01-10 11:04:50 edwin Exp $
-
---- kaffe/kaffevm/jit3/labels.c.orig
-+++ kaffe/kaffevm/jit3/labels.c
-@@ -217,6 +217,7 @@
- #endif
- 			ABORT();
- #endif
-+			break;
- 		}
- #if 0
- 		/*
diff --git a/java/kaffe/pkg-plist b/java/kaffe/pkg-plist
index 51740370e992..d0f80a82c825 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -5,17 +5,18 @@ bin/java
 bin/javac
 bin/javadoc
 bin/javah
-bin/javakey
 bin/javap
-bin/jdb
 bin/kaffe
 bin/kaffeh
-bin/kjc
-bin/kopi
 bin/native2ascii
 bin/rmic
 bin/rmiregistry
 bin/serialver
+include/jawt.h
+include/jawt_md.h
+include/jni.h
+include/jni_cpp.h
+include/jvmpi.h
 include/kaffe/java_lang_Object.h
 include/kaffe/java_lang_StackTraceElement.h
 include/kaffe/java_lang_String.h
@@ -24,63 +25,61 @@ include/kaffe/java_lang_ThreadGroup.h
 include/kaffe/java_lang_Throwable.h
 include/kaffe/java_lang_VMThrowable.h
 include/kaffe/jmalloc.h
-include/kaffe/jtypes.h
-include/jni.h
-include/jni_cpp.h
-include/jvmpi.h
+include/kaffe/jni_md.h
+include/kaffe_jni.h
 jre/bin/java
 jre/bin/kaffe
 jre/bin/kaffe-bin
 jre/bin/rmiregistry
-%%SUB_AWT%%jre/lib/%%ARCH%%/libawt-%%PORTVER%%.so
-%%SUB_AWT%%jre/lib/%%ARCH%%/libawt.a
-%%SUB_AWT%%jre/lib/%%ARCH%%/libawt.la
-%%SUB_AWT%%jre/lib/%%ARCH%%/libawt.so
+jre/lib/gmpjavamath.jar
+jre/lib/%%ARCH%%/libclasspath-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libclasspath.a
+jre/lib/%%ARCH%%/libclasspath.so
+jre/lib/%%ARCH%%/libgtkpeer.a
+jre/lib/%%ARCH%%/libgtkpeer.so
+jre/lib/%%ARCH%%/libgtkpeer.so.0
 jre/lib/%%ARCH%%/libio-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libio.a
-jre/lib/%%ARCH%%/libio.la
 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.la
 jre/lib/%%ARCH%%/libkaffevm.so
 jre/lib/%%ARCH%%/libmanagement-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libmanagement.a
-jre/lib/%%ARCH%%/libmanagement.la
 jre/lib/%%ARCH%%/libmanagement.so
 jre/lib/%%ARCH%%/libmath-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libmath.a
-jre/lib/%%ARCH%%/libmath.la
 jre/lib/%%ARCH%%/libmath.so
 jre/lib/%%ARCH%%/libnative-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnative.a
-jre/lib/%%ARCH%%/libnative.la
 jre/lib/%%ARCH%%/libnative.so
 jre/lib/%%ARCH%%/libnet-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnet.a
-jre/lib/%%ARCH%%/libnet.la
 jre/lib/%%ARCH%%/libnet.so
 jre/lib/%%ARCH%%/libnio-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnio.a
-jre/lib/%%ARCH%%/libnio.la
 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.a
-jre/lib/%%ARCH%%/libsecurity.la
 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.a
-jre/lib/%%ARCH%%/libzip.la
 jre/lib/%%ARCH%%/libzip.so
-%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd-%%PORTVER%%.so
-%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.a
-%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.la
-%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.so
-jre/lib/security/java.security
+jre/lib/logging.properties
 jre/lib/rt.jar
-lib/kjc.jar
+jre/lib/security/java.security
+jre/lib/tools.jar
+lib/awt/font.properties
 %%DATADIR%%/BUILD_ENVIRONMENT
 %%DATADIR%%/license.terms
+share/locale/fr/LC_MESSAGES/kaffe.mo
+share/locale/zh_TW/LC_MESSAGES/kaffe.mo
 @dirrm include/kaffe
 @dirrm jre/bin
 @dirrm jre/lib/%%ARCH%%