Update to 1.1.4 (latest development version) based on the patches sent

by M.Negovanovic PRs pkg/24507, pkg/24508, also add a new Makefile.common
which will be used for the upcoming kaffe-nox11 package and finally
bl3ify.

Changes:

* Support for security policy files
* AttachCurrentThread jni function for posix threads
* Bug fixes:
  * jar tool and jar file fixes
  * URL context handling
  * EUC-JP support rewritten to use libiconv
  * HTTP fixes
  * MulticastSocket
  * DNSJava binding
  * ARM jit
  * ServerSocket.bind
  * java.math.BigDecimal - fix rounding operations
  * JNI fixes
  * FTP handler from GNU Inetlib
  * SHA1PRNG randomness fixes (can use /dev/urandom if
    available)
  * java.security.SecureClassLoader fix
* GNU Classpath merges and updates:
  * Object serialization
  * almost all of java.io from Classpath
  * java.nio, java.net
  * java.util, java.util.regex
  * java.math, javax.naming
  * java.text, java.beans
  * java.net.protocol.file.Handler
  * java.util.Random
  * java.awt.GridBadLayout
  * java.awt.geom
  * javax.swing.event.EventListenerList
  * javax.swing.text.AttributeSet
* Updated sound code from Tritonus.org
* Updated javax.net.ssl/javax.security code
  from Jessie
* kjc bug fixes:
  * .this expressions
  * extra generated <clinit> methods
  * static initializers fixed.  Circular
    definitions of fields are now supported.
* Build fixes:
  * m68k atomic compare and exchange
  * m68k-netbsd
  * ALSA 1.0
  * mipsel-linux / jit3
  * Cygwin
  * FreeBSD networking
  * parisc and HP-UX

And more... http://www.kaffe.org/pipermail/kaffe-announce/2004/000023.html

1 files changed, 7 insertions, 55 deletions

diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index ff57c829620..d7deb986689 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,63 +1,15 @@
-# $NetBSD: Makefile,v 1.51 2004/01/24 13:51:14 grant Exp $
-
-DISTNAME=		kaffe-1.1.0
-CATEGORIES=		lang java
-MASTER_SITES=		ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.kaffe.org/
-COMMENT=		Virtual machine capable of running Java(tm) code
-
-USE_BUILDLINK2=		yes
-USE_PKGINSTALL=		yes
-USE_X11=		yes
-USE_LIBTOOL=		yes
-USE_GNU_TOOLS+=		make
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-TEST_TARGET=		check
-
-ONLY_FOR_PLATFORM=	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips*	\
-			*-*-sparc *-*-powerpc
-
-GNU_CONFIGURE=		yes
-CPPFLAGS+=		-Dunix
-
-JVM_HOME=		${LOCALBASE}/java/kaffe
-NO_MTREE=		yes	# since we change PREFIX below
-
-OWN_DIRS=	${PREFIX}
-OWN_DIRS+=	${PREFIX}/etc
-OWN_DIRS+=	${PREFIX}/jre
-OWN_DIRS+=	${PREFIX}/jre/lib
-OWN_DIRS+=	${PREFIX}/jre/lib/security
-SUPPORT_FILES=	${PREFIX}/jre/lib/security/java.security.default	\
-		${PREFIX}/jre/lib/security/java.security
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
-#
-# We need to explicitly link libkaffe*.so with libc.so so that libc symbols
-# are resolved correctly when libkaffe*.so are dynamically loaded.
+# $NetBSD: Makefile,v 1.52 2004/04/06 16:59:36 xtraeme Exp $
 #
-CONFIGURE_ENV+=		VM_LIBS="-lc"
-.endif
 
-.if (${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "alpha")
-# On these systems, jit3 is not working.
-CONFIGURE_ARGS+=	--with-engine=intrp
-.endif
+PKGNAME=	kaffe-${KAFFE_VERSION}
+COMMENT=	Virtual machine capable of running Java(tm) code
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}
+USE_X11=	yes
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gmp/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
+CONFLICTS=	kaffe-nox11-[0-9]*
+PLIST_SUBST+=	WITH_X11=
 
+.include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX=		${JVM_HOME}