4 files changed, 34 insertions, 39 deletions

diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index 910a692129ef..68c499a11c8c 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	kaffe
-PORTVERSION=	1.1.6
-PORTREVISION=	1
+PORTVERSION=	1.1.7.r1
 CATEGORIES=	java devel
-MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
+#MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
+MASTER_SITES=	http://www.kaffe.org/~robilad/
+DISTNAME=	${PORTNAME}-1.1.7-rc1
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	Multi-platform Java virtual machine with JIT compiler and AWT package
@@ -23,9 +24,7 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		javavm:${PORTSDIR}/java/javavmwrapper
 
-BROKEN=		Does not build
-
-WRKSRC=		${WRKDIR}/kaffe-${PORTVERSION}
+#WRKSRC=		${WRKDIR}/kaffe-${PORTVERSION}
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -37,6 +36,8 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib \
+		--x-includes=${X11BASE}/include \
+		--x-libraries=${X11BASE}/lib \
 		--with-iconv-prefix=${LOCALBASE}
 PREFIX=		${LOCALBASE}/kaffe
 NO_MTREE=	yes
@@ -44,14 +45,14 @@ NO_MTREE=	yes
 USE_GNOME=	esound gtk20 libartlgpl2
 WANT_GNOME=	esound
 
-MAN1=		kaffe.1
+MAN1=		fastjar.1 kaffe.1
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
-PLIST_SUB+=    PORTVER=${PORTVERSION} ARCH=x86_64
+PLIST_SUB+=    PORTVER=1.1.7-rc1 ARCH=x86_64
 .else
-PLIST_SUB+=    PORTVER=${PORTVERSION} ARCH=${ARCH}
+PLIST_SUB+=    PORTVER=1.1.7-rc1 ARCH=${ARCH}
 .endif
 
 post-install:
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index 4cd15d6d1b84..9cf382707330 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1,2 +1,3 @@
-MD5 (kaffe-1.1.6.tar.gz) = 29d4b9ec58080715d13a764e9e4cfc06
-SIZE (kaffe-1.1.6.tar.gz) = 10779887
+MD5 (kaffe-1.1.7-rc1.tar.gz) = 167d80aa86a8090923537bd4d6378461
+SHA256 (kaffe-1.1.7-rc1.tar.gz) = f7aefc7f7862694aeedfe13d12b25f186bf6d8532c4ee1b1778b26bd1e2366a2
+SIZE (kaffe-1.1.7-rc1.tar.gz) = 14199477
diff --git a/java/kaffe/files/patch-x86_64-md.c b/java/kaffe/files/patch-x86_64-md.c
deleted file mode 100644
index 3bde8f9ec4b4..000000000000
--- a/java/kaffe/files/patch-x86_64-md.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/x86_64/freebsd2/md.c.orig	Sat Oct 15 13:49:14 2005
-+++ config/x86_64/freebsd2/md.c		Sat Oct 15 13:50:23 2005
-@@ -13,6 +13,10 @@
- #include "config.h"
- #include "config-std.h"
- 
-+#if defined(HAVE_SYS_TYPES_H)
-+#include <sys/types.h>
-+#endif
-+
- #if defined(HAVE_SYS_SYSCTL_H)
- #include <sys/sysctl.h>
- 
diff --git a/java/kaffe/pkg-plist b/java/kaffe/pkg-plist
index cbb208a6fb74..bfdd090f8d8c 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -1,10 +1,10 @@
 @unexec %%LOCALBASE%%/bin/unregistervm %%PREFIX%%/bin/java
 bin/appletviewer
+bin/fastjar
 bin/install-jar
 bin/jar
 bin/java
 bin/javac
-bin/javadoc
 bin/javah
 bin/javap
 bin/jdb
@@ -31,22 +31,33 @@ include/kaffe/java_lang_VMThrowable.h
 include/kaffe/jmalloc.h
 include/kaffe/trampoline.h
 include/kaffe_jni.h
+info/dir
+info/fastjar.info
+info/hacking.info
+info/vmintegration.info
 jre/bin/java
 jre/bin/kaffe
 jre/bin/kaffe-bin
 jre/bin/rmiregistry
+jre/lib/glibj.zip
 jre/lib/gmpjavamath.jar
 jre/lib/logging.properties
 jre/lib/rt.jar
-jre/lib/security/java.security
-jre/lib/%%ARCH%%/libgtkpeer.a
+jre/lib/security/Kaffe.security
+jre/lib/%%ARCH%%/libgtkpeer.la
 jre/lib/%%ARCH%%/libgtkpeer.so
 jre/lib/%%ARCH%%/libgtkpeer.so.0
-jre/lib/%%ARCH%%/libio-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libio.so
-jre/lib/%%ARCH%%/libjawt.a
-jre/lib/%%ARCH%%/libjawt.so
-jre/lib/%%ARCH%%/libjawt.so.0
+jre/lib/%%ARCH%%/libjavaio-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libjavaio.so
+jre/lib/%%ARCH%%/libjavalang-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libjavalang.so
+jre/lib/%%ARCH%%/libjavanet-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libjavanet.so
+jre/lib/%%ARCH%%/libjavanio-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libjavanio.so
+jre/lib/%%ARCH%%/libjawtgnu.la
+jre/lib/%%ARCH%%/libjawtgnu.so
+jre/lib/%%ARCH%%/libjawtgnu.so.0
 jre/lib/%%ARCH%%/libkaffevm-%%PORTVER%%.so
 jre/lib/%%ARCH%%/libkaffevm.a
 jre/lib/%%ARCH%%/libkaffevm.so
@@ -54,19 +65,14 @@ jre/lib/%%ARCH%%/libmanagement-%%PORTVER%%.so
 jre/lib/%%ARCH%%/libmanagement.so
 jre/lib/%%ARCH%%/libmath-%%PORTVER%%.so
 jre/lib/%%ARCH%%/libmath.so
-jre/lib/%%ARCH%%/libnative-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnative.so
-jre/lib/%%ARCH%%/libnet-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnet.so
-jre/lib/%%ARCH%%/libnio-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnio.so
 jre/lib/%%ARCH%%/libsecurity-%%PORTVER%%.so
 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.so
-lib/awt/font.properties
+lib/logging.properties
+lib/security/classpath.security
 lib/tools.jar
 %%DATADIR%%/BUILD_ENVIRONMENT
 %%DATADIR%%/license.terms