pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/kaffe Update to 1.1.4 (latest development version...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8cd7a503897b
branches: trunk
changeset: 472230:8cd7a503897b
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Tue Apr 06 16:59:36 2004 +0000
description:
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
diffstat:
lang/kaffe/Makefile | 64 +++-------------------------
lang/kaffe/Makefile.common | 76 ++++++++++++++++++++++++++++++++++
lang/kaffe/PLIST | 44 +++++++++----------
lang/kaffe/buildlink3.mk | 36 ++++++++++++++++
lang/kaffe/distinfo | 11 +---
lang/kaffe/patches/patch-ac | 25 -----------
lang/kaffe/patches/patch-ad | 13 -----
lang/kaffe/patches/patch-ah | 38 -----------------
lang/kaffe/patches/patch-ai | 99 ---------------------------------------------
lang/kaffe/patches/patch-aj | 27 ------------
10 files changed, 144 insertions(+), 289 deletions(-)
diffs (truncated from 533 to 300 lines):
diff -r f69cfdca781e -r 8cd7a503897b lang/kaffe/Makefile
--- a/lang/kaffe/Makefile Tue Apr 06 16:36:00 2004 +0000
+++ b/lang/kaffe/Makefile Tue Apr 06 16:59:36 2004 +0000
@@ -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@localhost
-HOMEPAGE= http://www.kaffe.org/
-COMMENT= Virtual machine capable of running Java(tm) code
+# $NetBSD: Makefile,v 1.52 2004/04/06 16:59:36 xtraeme Exp $
+#
-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
+PKGNAME= kaffe-${KAFFE_VERSION}
+COMMENT= Virtual machine capable of running Java(tm) code
-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"
+USE_X11= yes
-.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.
-#
-CONFIGURE_ENV+= VM_LIBS="-lc"
-.endif
+CONFLICTS= kaffe-nox11-[0-9]*
+PLIST_SUBST+= WITH_X11=
-.if (${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "alpha")
-# On these systems, jit3 is not working.
-CONFIGURE_ARGS+= --with-engine=intrp
-.endif
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}
-
-.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"
-
+.include "Makefile.common"
.include "../../mk/bsd.pkg.mk"
PREFIX= ${JVM_HOME}
diff -r f69cfdca781e -r 8cd7a503897b lang/kaffe/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe/Makefile.common Tue Apr 06 16:59:36 2004 +0000
@@ -0,0 +1,76 @@
+# $NetBSD: Makefile.common,v 1.1 2004/04/06 16:59:37 xtraeme Exp $
+
+DISTNAME= kaffe-${KAFFE_VERSION}
+CATEGORIES= lang java
+MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
+
+MAINTAINER= tech-pkg%NetBSD.org@localhost
+HOMEPAGE= http://www.kaffe.org/
+
+USE_BUILDLINK3= yes
+USE_PKGINSTALL= 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
+PATCHDIR= ${.CURDIR}/../../lang/kaffe/patches
+DISTINFO_FILE= ${.CURDIR}/../../lang/kaffe/distinfo
+DESCR_SRC= ${.CURDIR}/../../lang/kaffe/DESCR
+PLIST_SRC= ${.CURDIR}/../../lang/kaffe/PLIST
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS+= USE_ESOUND
+
+.if !empty(USE_ESOUND:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --with-esd
+.include "../../audio/esound/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-esd
+.endif
+
+KAFFE_VERSION= 1.1.4
+
+BUILDLINK_PASSTHRU_DIRS+= ${JVM_HOME}/jre/lib/${MACHINE_ARCH}
+
+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.
+#
+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
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
diff -r f69cfdca781e -r 8cd7a503897b lang/kaffe/PLIST
--- a/lang/kaffe/PLIST Tue Apr 06 16:36:00 2004 +0000
+++ b/lang/kaffe/PLIST Tue Apr 06 16:59:36 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/09/22 03:04:16 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/06 16:59:37 xtraeme Exp $
bin/appletviewer
bin/install-jar
bin/jar
@@ -18,68 +18,66 @@
bin/rmiregistry
bin/serialver
include/jni.h
-include/kaffe/Arrays.h
-include/kaffe/errors.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
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
-jre/.pkgsrc
jre/bin/java
jre/bin/kaffe
jre/bin/kaffe-bin
jre/bin/rmiregistry
-jre/lib/.pkgsrc
-jre/lib/${MACHINE_ARCH}/libawt-${PKGVERSION}.so
-jre/lib/${MACHINE_ARCH}/libawt.la
-jre/lib/${MACHINE_ARCH}/libawt.so
+${WITH_X11}jre/lib/${MACHINE_ARCH}/libawt-${PKGVERSION}.so
+${WITH_X11}jre/lib/${MACHINE_ARCH}/libawt.a
+${WITH_X11}jre/lib/${MACHINE_ARCH}/libawt.la
+${WITH_X11}jre/lib/${MACHINE_ARCH}/libawt.so
jre/lib/${MACHINE_ARCH}/libio-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libio.a
jre/lib/${MACHINE_ARCH}/libio.la
jre/lib/${MACHINE_ARCH}/libio.so
jre/lib/${MACHINE_ARCH}/libkaffevm-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libkaffevm.a
jre/lib/${MACHINE_ARCH}/libkaffevm.la
jre/lib/${MACHINE_ARCH}/libkaffevm.so
jre/lib/${MACHINE_ARCH}/libmanagement-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libmanagement.a
jre/lib/${MACHINE_ARCH}/libmanagement.la
jre/lib/${MACHINE_ARCH}/libmanagement.so
jre/lib/${MACHINE_ARCH}/libmath-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libmath.a
jre/lib/${MACHINE_ARCH}/libmath.la
jre/lib/${MACHINE_ARCH}/libmath.so
jre/lib/${MACHINE_ARCH}/libnative-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libnative.a
jre/lib/${MACHINE_ARCH}/libnative.la
jre/lib/${MACHINE_ARCH}/libnative.so
jre/lib/${MACHINE_ARCH}/libnet-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libnet.a
jre/lib/${MACHINE_ARCH}/libnet.la
jre/lib/${MACHINE_ARCH}/libnet.so
+jre/lib/${MACHINE_ARCH}/libnio-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libnio.a
+jre/lib/${MACHINE_ARCH}/libnio.la
+jre/lib/${MACHINE_ARCH}/libnio.so
jre/lib/${MACHINE_ARCH}/libsecurity-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libsecurity.a
jre/lib/${MACHINE_ARCH}/libsecurity.la
jre/lib/${MACHINE_ARCH}/libsecurity.so
-jre/lib/${MACHINE_ARCH}/libtritonuscommon-${PKGVERSION}.so
-jre/lib/${MACHINE_ARCH}/libtritonuscommon.la
-jre/lib/${MACHINE_ARCH}/libtritonuscommon.so
jre/lib/${MACHINE_ARCH}/libzip-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libzip.a
jre/lib/${MACHINE_ARCH}/libzip.la
jre/lib/${MACHINE_ARCH}/libzip.so
jre/lib/rt.jar
-jre/lib/security/.pkgsrc
jre/lib/security/java.security.default
lib/kjc.jar
license.terms
man/man1/kaffe.1
-@dirrm lib
@dirrm man/man1
-@dirrm man
-@dirrm jre/lib/security
@dirrm jre/lib/${MACHINE_ARCH}
-@dirrm jre/lib
-@dirrm jre/bin
-@dirrm jre
@dirrm include/kaffe
-@dirrm include
-@dirrm bin
diff -r f69cfdca781e -r 8cd7a503897b lang/kaffe/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe/buildlink3.mk Tue Apr 06 16:59:36 2004 +0000
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/06 16:59:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+KAFFE_BUILDLINK3_MK:= ${KAFFE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= kaffe
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkaffe}
+BUILDLINK_PACKAGES+= kaffe
+
+.if !empty(KAFFE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kaffe+= kaffe-[0-9]*
+BUILDLINK_PKGSRCDIR.kaffe?= ../../lang/kaffe
+.endif # KAFFE_BUILDLINK3_MK
+
+BUILDLINK_FILES_CMD.kaffe= \
+ ${BUILDLINK_PLIST_CMD.kaffe} | \
+ ${GREP} '\(include.*/\|lib.*/lib[^/]*$$\)' | \
+ ${SED} "s,^,$${pkg_prefix},"
+
+BUILDLINK_JAVA_PREFIX.kaffe= ${BUILDLINK_PREFIX.kaffe}/java/kaffe
+
+BUILDLINK_CPPFLAGS.kaffe= \
+ -I${BUILDLINK_JAVA_PREFIX.kaffe}/include \
+ -I${BUILDLINK_JAVA_PREFIX.kaffe}/include/kaffe
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r f69cfdca781e -r 8cd7a503897b lang/kaffe/distinfo
--- a/lang/kaffe/distinfo Tue Apr 06 16:36:00 2004 +0000
+++ b/lang/kaffe/distinfo Tue Apr 06 16:59:36 2004 +0000
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/09/22 03:04:17 jschauma Exp $
+$NetBSD: distinfo,v 1.9 2004/04/06 16:59:37 xtraeme Exp $
Home |
Main Index |
Thread Index |
Old Index