pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Update lang/kaffe{-x11,-esound} to 1.1.7
details: https://anonhg.NetBSD.org/pkgsrc/rev/7c4f02508550
branches: trunk
changeset: 512487:7c4f02508550
user: tonio <tonio%pkgsrc.org@localhost>
date: Wed May 10 16:46:20 2006 +0000
description:
Update lang/kaffe{-x11,-esound} to 1.1.7
What's New In Kaffe 1.1.7
------------------------------------------------------
* Many cleanups, warning fixes and bug fixes.
* Removed support for class library profiles, since
--with-glibj-zip offers a more convenient replacement.
* Updated to boehm-gc 6.6
* Updated to gjdoc 0.7.7
* Merged in fastjar.
* Merged in zlib. There is a new configure option,
--with-system-zlib to allow the use of the system zlib,
instead of the merged in one.
* Merged in GNU Classpath completely. Updated to version 0.90,
with additional fixes.
* Merged in port to DROPS.
* Merged in port to Blackfin CPU.
* Support for DragonFly BSD.
* Ported to ia64-freebsd and alpha-freebsd.
* Ported to powerpc-openbsd.
* Improved support for Cygwin and sparc64-openbsd.
* Improved stack handling for pthreads on openbsd.
* Added simple direct threading interpreter implementation.
The patches have been removes, since they were either included upstram or are
no more necessary
diffstat:
lang/kaffe-esound/Makefile | 22 ++++++++++------
lang/kaffe-x11/Makefile | 30 ++++++++++++++--------
lang/kaffe-x11/PLIST | 8 ++---
lang/kaffe/Makefile | 11 +++++---
lang/kaffe/Makefile.common | 17 ++++++------
lang/kaffe/PLIST | 27 +++++++++++++------
lang/kaffe/buildlink3.mk | 6 ++--
lang/kaffe/distinfo | 18 +++----------
lang/kaffe/patches/patch-aa | 50 --------------------------------------
lang/kaffe/patches/patch-ab | 29 ----------------------
lang/kaffe/patches/patch-ac | 29 ----------------------
lang/kaffe/patches/patch-ad | 15 -----------
lang/kaffe/patches/patch-ae | 14 ----------
lang/kaffe/patches/patch-af | 12 ---------
lang/kaffe/patches/patch-ag | 51 ---------------------------------------
lang/kaffe/patches/patch-ah | 58 ---------------------------------------------
lang/kaffe/patches/patch-ai | 18 -------------
lang/kaffe/patches/patch-aj | 20 ---------------
18 files changed, 75 insertions(+), 360 deletions(-)
diffs (truncated from 634 to 300 lines):
diff -r a1374ac55a87 -r 7c4f02508550 lang/kaffe-esound/Makefile
--- a/lang/kaffe-esound/Makefile Wed May 10 16:45:35 2006 +0000
+++ b/lang/kaffe-esound/Makefile Wed May 10 16:46:20 2006 +0000
@@ -1,21 +1,25 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/05/10 16:46:21 tonio Exp $
#
.include "../../lang/kaffe/Makefile.common"
PKGNAME= ${DISTNAME:S/kaffe/kaffe-esound/}
-PKGREVISION= 1
COMMENT+= (sound support through esound)
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-esd/--with-esd/}
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-esdtest//}
+CONFIGURE_ARGS+= --disable-native-awt
+CONFIGURE_ARGS+= --disable-gtk-peer
+CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+= --with-esd
-BUILD_DIRS= ${WRKSRC}/config
-BUILD_DIRS+= ${WRKSRC}/libraries/javalib
-BUILD_DIRS+= ${WRKSRC}/include
-BUILD_DIRS+= ${WRKSRC}/libraries/clib/sound/esd
-INSTALL_DIRS= ${WRKSRC}/libraries/clib/sound/esd
+BUILD_DIRS= config
+BUILD_DIRS+= libraries/javalib
+BUILD_DIRS+= libraries/clib/classpath
+BUILD_DIRS+= libraries/clib/sound/esd
+INSTALL_DIRS= libraries/clib/sound/esd
+
+pre-build:
+ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} BUILD_ENVIRONMENT
PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
diff -r a1374ac55a87 -r 7c4f02508550 lang/kaffe-x11/Makefile
--- a/lang/kaffe-x11/Makefile Wed May 10 16:45:35 2006 +0000
+++ b/lang/kaffe-x11/Makefile Wed May 10 16:46:20 2006 +0000
@@ -1,23 +1,31 @@
-# $NetBSD: Makefile,v 1.9 2006/04/17 13:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/05/10 16:46:21 tonio Exp $
#
.include "../../lang/kaffe/Makefile.common"
PKGNAME= ${DISTNAME:S/kaffe/kaffe-x11/}
-PKGREVISION= 3
COMMENT+= (AWT support through X11)
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-native-awt/--with-kaffe-x-awt/}
+CONFIGURE_ARGS+= --with-kaffe-x-awt
+CONFIGURE_ARGS+= --enable-gtk-peer
+CONFIGURE_ARGS+= --with-x
+CONFIGURE_ARGS+= --without-esd
+CONFIGURE_ARGS+= --disable-esdtest
+
-BUILD_DIRS= ${WRKSRC}/config
-BUILD_DIRS+= ${WRKSRC}/libraries/javalib
-BUILD_DIRS+= ${WRKSRC}/include
-BUILD_DIRS+= ${WRKSRC}/replace
-BUILD_DIRS+= ${WRKSRC}/kaffe/kaffevm
-BUILD_DIRS+= ${WRKSRC}/libraries/clib/classpath
-BUILD_DIRS+= ${WRKSRC}/libraries/clib/awt
-INSTALL_DIRS= ${WRKSRC}/libraries/clib/awt
+BUILD_DIRS= config
+BUILD_DIRS+= libraries/javalib
+BUILD_DIRS+= libraries/clib/classpath
+BUILD_DIRS+= libraries/clib/awt
+BUILD_DIRS+= libraries/javalib/external/classpath/native/jni/gtk-peer
+BUILD_DIRS+= libraries/javalib/external/classpath/native/jawt
+INSTALL_DIRS= libraries/clib/awt
+INSTALL_DIRS+= libraries/javalib/external/classpath/native/jni/gtk-peer
+INSTALL_DIRS+= libraries/javalib/external/classpath/native/jawt
+
+pre-build:
+ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} BUILD_ENVIRONMENT
PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
diff -r a1374ac55a87 -r 7c4f02508550 lang/kaffe-x11/PLIST
--- a/lang/kaffe-x11/PLIST Wed May 10 16:45:35 2006 +0000
+++ b/lang/kaffe-x11/PLIST Wed May 10 16:46:20 2006 +0000
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/09/06 18:18:01 tonio Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/10 16:46:21 tonio Exp $
java/kaffe/jre/lib/${MACHINE_ARCH}/libgtkpeer.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libjawt.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libjawtgnu.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libxawt.la
-java/kaffe/lib/awt/font.properties
-@dirrm java/kaffe/lib/awt
-@comment in kaffe: @dirrm java/kaffe/lib
@comment in kaffe: @dirrm java/kaffe/jre/lib/${MACHINE_ARCH}
+@comment in kaffe: @dirrm java/kaffe/jre/lib
diff -r a1374ac55a87 -r 7c4f02508550 lang/kaffe/Makefile
--- a/lang/kaffe/Makefile Wed May 10 16:45:35 2006 +0000
+++ b/lang/kaffe/Makefile Wed May 10 16:46:20 2006 +0000
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.67 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: Makefile,v 1.68 2006/05/10 16:46:20 tonio Exp $
#
.include "Makefile.common"
-PKGREVISION= 2
+CONFLICTS+= kaffe-nox11-[0-9]*
-CONFLICTS+= kaffe-nox11-[0-9]*
+CONFIGURE_ARGS+= --disable-native-awt
+CONFIGURE_ARGS+= --disable-gtk-peer
+CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+= --without-esd
+CONFIGURE_ARGS+= --disable-esdtest
JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javakey \
javap jdb rmic rmiregistry serialver
@@ -24,6 +28,5 @@
post-install:
${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME}
-.include "../../devel/libltdl/buildlink3.mk"
.include "../../mk/java-env.mk"
.include "../../mk/bsd.pkg.mk"
diff -r a1374ac55a87 -r 7c4f02508550 lang/kaffe/Makefile.common
--- a/lang/kaffe/Makefile.common Wed May 10 16:45:35 2006 +0000
+++ b/lang/kaffe/Makefile.common Wed May 10 16:46:20 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.13 2006/03/02 18:46:16 joerg Exp $
+# $NetBSD: Makefile.common,v 1.14 2006/05/10 16:46:20 tonio Exp $
-DISTNAME= kaffe-1.1.6
+DISTNAME= kaffe-1.1.7
CATEGORIES= lang java
MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
@@ -8,11 +8,10 @@
HOMEPAGE= http://www.kaffe.org/
COMMENT= Virtual machine capable of running Java(tm) code
-BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
DEPENDS+= jikes>=1.22:../../lang/jikes
+DEPENDS+= fastjar>=0.93:../../archivers/fastjar
-EXTRACT_USING= pax
+EXTRACT_USING= gtar
GNU_CONFIGURE_PREFIX= ${JAVA_HOME}
GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR}
JAVA_HOME= ${PREFIX}/java/kaffe
@@ -22,8 +21,8 @@
USE_TOOLS+= gmake
TEST_TARGET= check
-ONLY_FOR_PLATFORM= *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips* \
- *-*-sparc *-*-powerpc
+ONLY_FOR_PLATFORM= *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
+ *-*-mipsel *-*-sparc *-*-powerpc
GNU_CONFIGURE= yes
CPPFLAGS+= -Dunix
@@ -37,7 +36,7 @@
CONFIGURE_ARGS+= --without-alsa
CONFIGURE_ARGS+= --without-esd
CONFIGURE_ARGS+= --disable-esdtest
-CONFIGURE_ARGS+= --disable-native-awt
+CONFIGURE_ARGS+= --disable-fastjar
.include "../../mk/bsd.prefs.mk"
@@ -54,7 +53,7 @@
CONFIGURE_ARGS+= --with-engine=intrp
.endif
+.include "../../devel/libltdl/convenience.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
diff -r a1374ac55a87 -r 7c4f02508550 lang/kaffe/PLIST
--- a/lang/kaffe/PLIST Wed May 10 16:45:35 2006 +0000
+++ b/lang/kaffe/PLIST Wed May 10 16:46:20 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/10/11 10:00:15 tonio Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/05/10 16:46:20 tonio Exp $
bin/kaffe-appletviewer
bin/kaffe-jar
bin/kaffe-java
@@ -11,12 +11,10 @@
bin/kaffe-rmic
bin/kaffe-rmiregistry
bin/kaffe-serialver
-java/kaffe/bin/appletviewer
java/kaffe/bin/install-jar
java/kaffe/bin/jar
java/kaffe/bin/java
java/kaffe/bin/javac
-java/kaffe/bin/javadoc
java/kaffe/bin/javah
java/kaffe/bin/javap
java/kaffe/bin/jdb
@@ -43,32 +41,43 @@
java/kaffe/include/kaffe/jmalloc.h
java/kaffe/include/kaffe/trampoline.h
java/kaffe/include/kaffe_jni.h
+java/kaffe/info/dir
+java/kaffe/info/hacking.info
+java/kaffe/info/vmintegration.info
java/kaffe/jre/bin/java
java/kaffe/jre/bin/kaffe
java/kaffe/jre/bin/kaffe-bin
java/kaffe/jre/bin/rmiregistry
+java/kaffe/jre/lib/glibj.zip
java/kaffe/jre/lib/gmpjavamath.jar
-java/kaffe/jre/lib/${MACHINE_ARCH}/libio.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libjavaio.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libjavalang.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libjavanet.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libjavanio.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffevm.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libmanagement.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libmath.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libnative.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libnet.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libnio.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la
java/kaffe/jre/lib/logging.properties
-java/kaffe/jre/lib/rt.jar
-java/kaffe/jre/lib/security/java.security
+java/kaffe/jre/lib/security/Kaffe.security
+java/kaffe/lib/logging.properties
+java/kaffe/lib/security/classpath.security
java/kaffe/lib/tools.jar
java/kaffe/license.terms
man/man1/kaffe.1
+java/kaffe/share/classpath/README
+java/kaffe/share/classpath/tools.zip
+@dirrm java/kaffe/share/classpath
+@dirrm java/kaffe/share
+@dirrm java/kaffe/lib/security
@dirrm java/kaffe/lib
@dirrm java/kaffe/jre/lib/security
@dirrm java/kaffe/jre/lib/${MACHINE_ARCH}
@dirrm java/kaffe/jre/lib
@dirrm java/kaffe/jre/bin
@dirrm java/kaffe/jre
+@dirrm java/kaffe/info
@dirrm java/kaffe/include/kaffe
@dirrm java/kaffe/include
@dirrm java/kaffe/bin
diff -r a1374ac55a87 -r 7c4f02508550 lang/kaffe/buildlink3.mk
--- a/lang/kaffe/buildlink3.mk Wed May 10 16:45:35 2006 +0000
+++ b/lang/kaffe/buildlink3.mk Wed May 10 16:46:20 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/12 10:27:21 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/05/10 16:46:20 tonio Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KAFFE_BUILDLINK3_MK:= ${KAFFE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@
BUILDLINK_PACKAGES+= kaffe
.if !empty(KAFFE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.kaffe+= kaffe>=1.1.6
-BUILDLINK_ABI_DEPENDS.kaffe?= kaffe>=1.1.6nb2
+BUILDLINK_API_DEPENDS.kaffe+= kaffe>=1.1.7
+BUILDLINK_ABI_DEPENDS.kaffe?= kaffe>=1.1.7
BUILDLINK_PKGSRCDIR.kaffe?= ../../lang/kaffe
BUILDLINK_JAVA_PREFIX.kaffe= ${PREFIX}/java/kaffe
.endif # KAFFE_BUILDLINK3_MK
diff -r a1374ac55a87 -r 7c4f02508550 lang/kaffe/distinfo
--- a/lang/kaffe/distinfo Wed May 10 16:45:35 2006 +0000
+++ b/lang/kaffe/distinfo Wed May 10 16:46:20 2006 +0000
@@ -1,15 +1,5 @@
-$NetBSD: distinfo,v 1.19 2006/02/20 22:36:00 tonio Exp $
+$NetBSD: distinfo,v 1.20 2006/05/10 16:46:20 tonio Exp $
-SHA1 (kaffe-1.1.6.tar.gz) = 8987c3a596db89ddc793013eaf0fab5cf8730128
-RMD160 (kaffe-1.1.6.tar.gz) = 9fd1177a43923346f9a21e4c0e89015ae42c4dfa
-Size (kaffe-1.1.6.tar.gz) = 10779887 bytes
-SHA1 (patch-aa) = 9a042663db270d706bb983ce3da7297fe016a458
-SHA1 (patch-ab) = e2ba7816d3b2c9bf850a4ad9aadec5d306a8115e
-SHA1 (patch-ac) = 287fa93128361897ea0fc1bc305004b336609c88
-SHA1 (patch-ad) = d952245f70a61459e527cd846b76dede1df226e4
-SHA1 (patch-ae) = fac9c2e3e6c711d05f9ddb9f3109c46895f2e835
-SHA1 (patch-af) = c170e9bb8c559db660ba2d6e7af716c29b981235
-SHA1 (patch-ag) = ee05e2356c118f048a6a712147b6ccff82a9478a
-SHA1 (patch-ah) = 2ff354a18becaa544dd9ba794ef02442307fe360
-SHA1 (patch-ai) = 0bdd95c4227299d9a03bf36a4d7f8449351fa08b
-SHA1 (patch-aj) = b1f337967de4c9912d7f8938e319560f66df2e2d
+SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817
+RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b
+Size (kaffe-1.1.7.tar.gz) = 14494274 bytes
diff -r a1374ac55a87 -r 7c4f02508550 lang/kaffe/patches/patch-aa
--- a/lang/kaffe/patches/patch-aa Wed May 10 16:45:35 2006 +0000
Home |
Main Index |
Thread Index |
Old Index