4 files changed, 74 insertions, 52 deletions

diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index eadfc1ee0a5d..d938216c9a48 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	kaffe
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	java
-MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/
+MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.0.x-production/
 
-MAINTAINER=	xaa+ports@madison-gurkha.com
+MAINTAINER=	xaa+ports@timewasters.nl
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ungif.5:${PORTSDIR}/graphics/libungif \
@@ -20,10 +20,13 @@ USE_LIBTOOL=	yes
 LIBTOOLFLAGS=
 INSTALLS_SHLIB=	yes
 
+PLIST_SUB+=	PORTVER=${PORTVERSION} ARCH=${ARCH}
+
 MAN1=		kaffe.1
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/BUILD_ENVIRONMENT ${PREFIX}/share/kaffe
-	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
+	@${MKDIR} ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/BUILD_ENVIRONMENT ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/license.terms ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index f51840ed5cf0..90980e3a82e4 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1 +1 @@
-MD5 (kaffe-1.0.6.tar.gz) = 5a900dd33e7bde48d2fa94ada273e80e
+MD5 (kaffe-1.0.7.tar.gz) = 312ada667fc7b7a65f1958b56f839917
diff --git a/java/kaffe/files/patch-configure b/java/kaffe/files/patch-configure
new file mode 100644
index 000000000000..3e1db6ecee90
--- /dev/null
+++ b/java/kaffe/files/patch-configure
@@ -0,0 +1,18 @@
+--- 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/pkg-plist b/java/kaffe/pkg-plist
index da2576588dc7..a2cff8384a43 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -23,57 +23,58 @@ 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/jni_cpp.h
 include/kaffe/jsyscall.h
 include/kaffe/jtypes.h
 include/kaffe/native.h
-lib/kaffe/libawt-1.0.6.so
-lib/kaffe/libawt.la
-lib/kaffe/libawt.so
-lib/kaffe/libio-1.0.6.so
-lib/kaffe/libio.la
-lib/kaffe/libio.so
-lib/kaffe/libmanagement-1.0.6.so
-lib/kaffe/libmanagement.la
-lib/kaffe/libmanagement.so
-lib/kaffe/libmath-1.0.6.so
-lib/kaffe/libmath.la
-lib/kaffe/libmath.so
-lib/kaffe/libmicrosoft-1.0.6.so
-lib/kaffe/libmicrosoft.la
-lib/kaffe/libmicrosoft.so
-lib/kaffe/libnative-1.0.6.so
-lib/kaffe/libnative.la
-lib/kaffe/libnative.so
-lib/kaffe/libnet-1.0.6.so
-lib/kaffe/libnet.la
-lib/kaffe/libnet.so
-lib/kaffe/libsecurity-1.0.6.so
-lib/kaffe/libsecurity.la
-lib/kaffe/libsecurity.so
-lib/kaffe/libzip-1.0.6.so
-lib/kaffe/libzip.la
-lib/kaffe/libzip.so
-lib/kaffe/security/java.security
-lib/libkaffevm-1.0.6.so
-lib/libkaffevm.la
-lib/libkaffevm.so
-lib/libkaffexprof-1.0.6.so
-lib/libkaffexprof.la
-lib/libkaffexprof.so
-libexec/Kaffe
+include/jni.h
+jre/bin/kaffe-bin
+jre/bin/java
+jre/bin/kaffe
+jre/bin/rmiregistry
+jre/lib/%%ARCH%%/libawt-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libawt.so
+jre/lib/%%ARCH%%/libawt.la
+jre/lib/%%ARCH%%/libio-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libio.so
+jre/lib/%%ARCH%%/libio.la
+jre/lib/%%ARCH%%/libkaffevm-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libkaffevm.so
+jre/lib/%%ARCH%%/libkaffevm.la
+jre/lib/%%ARCH%%/libmanagement-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libmanagement.so
+jre/lib/%%ARCH%%/libmanagement.la
+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%%/libnative-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libnative.so
+jre/lib/%%ARCH%%/libnative.la
+jre/lib/%%ARCH%%/libnet-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libnet.so
+jre/lib/%%ARCH%%/libnet.la
+jre/lib/%%ARCH%%/libsecurity-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libsecurity.so
+jre/lib/%%ARCH%%/libsecurity.la
+jre/lib/%%ARCH%%/libzip-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libzip.so
+jre/lib/%%ARCH%%/libzip.la
+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
 share/kaffe/BUILD_ENVIRONMENT
-share/kaffe/Klasses.jar
-share/kaffe/comm.jar
-share/kaffe/kjc.jar
 share/kaffe/license.terms
-share/kaffe/microsoft.jar
-share/kaffe/pjava.jar
-share/kaffe/rmi.jar
-share/kaffe/servlet.jar
-share/kaffe/tools.jar
 @dirrm include/kaffe
-@dirrm lib/kaffe/security
-@dirrm lib/kaffe
+@dirrm jre/bin
+@dirrm jre/lib/%%ARCH%%
+@dirrm jre/lib/security
+@dirrm jre/lib
+@dirrm jre
 @dirrm share/kaffe