Move java/kaffe-devel to java/kaffe

Remove java/kaffe-devel

Submitted by:	maintainer (via irc)

6 files changed, 97 insertions, 58 deletions

diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index f3ad60bba515..e1dc34638eda 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -1,44 +1,79 @@
 # New ports collection makefile for:    kaffe
-# Date created:         20 February 1995
-# Whom:                 Tim Wilkinson <tim@sarc.city.ac.uk>
+# Date created:         4 August 2003
+# Whom:                 Mark Huizer <xaa+ports@timewasters.nl>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kaffe
-PORTVERSION=	1.0.7
+PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	java
-MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.0.x-production/
+MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 
 MAINTAINER=	xaa+ports@timewasters.nl
 COMMENT=	Multi-platform Java virtual machine with JIT compiler and AWT package
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ungif.5:${PORTSDIR}/graphics/libungif \
-		png.5:${PORTSDIR}/graphics/png
+		png.5:${PORTSDIR}/graphics/png \
+		gmp.6:${PORTSDIR}/math/libgmp4
 
-CONFLICTS=	kaffe-devel-1.* javavmwrapper-2.*
+CONFLICTS=	kaffe-1.[!1].* javavmwrapper-2.*
 
-NOT_FOR_ARCHS=	amd64
+WRKSRC=		${WRKDIR}/kaffe-${PORTVERSION}
+
+NOT_FOR_ARCHS=	amd64 alpha
 
 USE_LIBTOOL_VER=13
+USE_GMAKE=	yes
+USE_ICONV=	yes
 LIBTOOLFLAGS=
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib --with-iconv-prefix=${LOCALBASE}
 
-PLIST_SUB+=	PORTVER=${PORTVERSION} ARCH=${ARCH}
+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 ${ARCH} == "alpha"
-BROKEN=		"Configure fails on alpha"
+.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 ${OSVERSION} >= 502000
-BROKEN=		"Does not compile"
+.if defined(AWT)
+  PLIST_SUB+=	SUB_AWT=""
+.else
+  PLIST_SUB+=	SUB_AWT="@comment "
 .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 34b41b964b7d..fd8a12d51e8b 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1,2 +1,2 @@
-MD5 (kaffe-1.0.7.tar.gz) = 312ada667fc7b7a65f1958b56f839917
-SIZE (kaffe-1.0.7.tar.gz) = 4248252
+MD5 (kaffe-1.1.3.tar.gz) = 2563e002e554b1c1644cb84cc3eaba74
+SIZE (kaffe-1.1.3.tar.gz) = 8937585
diff --git a/java/kaffe/files/patch-configure b/java/kaffe/files/patch-configure
deleted file mode 100644
index 3e1db6ecee90..000000000000
--- a/java/kaffe/files/patch-configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.in.orig	Tue Jul  2 20:06:03 2002
-+++ configure.in	Tue Sep 17 18:02:35 2002
-@@ -736,7 +736,6 @@
- netinet/in_systm.h \
- netinet/tcp.h \
- png.h \
--poll.h \
- pwd.h \
- sigcontext.h \
- signal.h \
-@@ -745,7 +744,6 @@
- sys/filio.h \
- sys/ioctl.h \
- sys/param.h \
--sys/poll.h \
- sys/select.h \
- sys/socket.h \
- sys/stat.h \
diff --git a/java/kaffe/files/patch-inetaddressimpl b/java/kaffe/files/patch-inetaddressimpl
new file mode 100644
index 000000000000..7a4017a9f808
--- /dev/null
+++ b/java/kaffe/files/patch-inetaddressimpl
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..0d91b58b0290
--- /dev/null
+++ b/java/kaffe/files/patch-kaffe_kaffevm_jit3_labels.c
@@ -0,0 +1,13 @@
+
+$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 155747129ce9..088ef0ae38d7 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -4,6 +4,7 @@ bin/jar
 bin/java
 bin/javac
 bin/javadoc
+bin/javah
 bin/javakey
 bin/javap
 bin/jdb
@@ -15,62 +16,58 @@ bin/native2ascii
 bin/rmic
 bin/rmiregistry
 bin/serialver
-include/kaffe/Arrays.h
-include/kaffe/errors.h
 include/kaffe/java_lang_Object.h
+include/kaffe/java_lang_StackTraceElement.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/java_lang_VMThrowable.h
 include/kaffe/jmalloc.h
-include/kaffe/jni_cpp.h
-include/kaffe/jsyscall.h
 include/kaffe/jtypes.h
-include/kaffe/native.h
 include/jni.h
-jre/bin/kaffe-bin
+include/jni_cpp.h
+include/jvmpi.h
 jre/bin/java
 jre/bin/kaffe
+jre/bin/kaffe-bin
 jre/bin/rmiregistry
-jre/lib/%%ARCH%%/libawt-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libawt.so
-jre/lib/%%ARCH%%/libawt.la
+%%SUB_AWT%%jre/lib/%%ARCH%%/libawt-%%PORTVER%%.so
+%%SUB_AWT%%jre/lib/%%ARCH%%/libawt.la
+%%SUB_AWT%%jre/lib/%%ARCH%%/libawt.so
 jre/lib/%%ARCH%%/libio-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libio.so
 jre/lib/%%ARCH%%/libio.la
+jre/lib/%%ARCH%%/libio.so
 jre/lib/%%ARCH%%/libkaffevm-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libkaffevm.so
 jre/lib/%%ARCH%%/libkaffevm.la
+jre/lib/%%ARCH%%/libkaffevm.so
 jre/lib/%%ARCH%%/libmanagement-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libmanagement.so
 jre/lib/%%ARCH%%/libmanagement.la
+jre/lib/%%ARCH%%/libmanagement.so
 jre/lib/%%ARCH%%/libmath-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libmath.so
 jre/lib/%%ARCH%%/libmath.la
-jre/lib/%%ARCH%%/libmicrosoft-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libmicrosoft.so
-jre/lib/%%ARCH%%/libmicrosoft.la
+jre/lib/%%ARCH%%/libmath.so
 jre/lib/%%ARCH%%/libnative-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnative.so
 jre/lib/%%ARCH%%/libnative.la
+jre/lib/%%ARCH%%/libnative.so
 jre/lib/%%ARCH%%/libnet-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnet.so
 jre/lib/%%ARCH%%/libnet.la
+jre/lib/%%ARCH%%/libnet.so
+jre/lib/%%ARCH%%/libnio-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libnio.la
+jre/lib/%%ARCH%%/libnio.so
 jre/lib/%%ARCH%%/libsecurity-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libsecurity.so
 jre/lib/%%ARCH%%/libsecurity.la
+jre/lib/%%ARCH%%/libsecurity.so
 jre/lib/%%ARCH%%/libzip-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libzip.so
 jre/lib/%%ARCH%%/libzip.la
+jre/lib/%%ARCH%%/libzip.so
+%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd-%%PORTVER%%.so
+%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.la
+%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.so
 jre/lib/security/java.security
 jre/lib/rt.jar
-jre/lib/comm.jar
-jre/lib/pjava.jar
-jre/lib/servlet.jar
-jre/lib/microsoft.jar
-jre/lib/rmi.jar
 lib/kjc.jar
-lib/tools.jar
 %%DATADIR%%/BUILD_ENVIRONMENT
 %%DATADIR%%/license.terms
 @dirrm include/kaffe