From 880834d7a50e7ca6eb82f877072a44d73b92f295 Mon Sep 17 00:00:00 2001 From: jmmv Date: Sun, 7 Mar 2004 21:31:09 +0000 Subject: Update to 0.07: New in release 0.07 (2003/30/11) * Works with libtool 1.5 (and 1.4.3). * java.awt gtk+ peers now depend on gtk+ 2.2.x and uses pango. Lots and lots improvements on the peers. * java.awt.geom.CubicCurve2D, java.awt.geom.QuadCurve2D: Subdivision and flatness calculation implemented. * java.awt.geom.FlatteningPathIterator: Working implementation. * gnu.java.awt.BitwiseXORComposite helper class. * New rmic compilers (jikes, kjc) support. * java.text bug fixing and 1.4 updates (Currency). * Hashtable and HashMap function more similar to other implementations. * javax.naming and java.beans classloader fixes. * URL parsing, URLConnection, protocol and (needed) permission fixes. * More java.nio implementation (API complete, but implementation not finished yet). * Lots of java.net code cleanup. * Improved documentation. * Numerous bug fixes in almost every package, and lots of updates for 1.4 functionality. * Fixed Classpath bugs: #2944 Incorrect synchronization in java.util.logging.ErrorManager #6075 java.awt.geom.GeneralPath.getCurrentPoint returns wrong results #6076 java.awt.geom.GeneralPath constructor sometimes hangs #6089 java.awt.geom.GeneralPath.getPathIterator does not work [...] VM Interface changes: * Thread has been split in a VM-independent Thread class and a VM-dependent VMThread class. New in release 0.06 (2003/22/08) * Update java.awt peers to GTK+2. * java.awt.GridBagLayout implementation. * javax.swing.border implementation. * java.security and java.security.cert updated to 1.4 spec. * New JNI native target code layer. See native/target/readme.txt. * --enable-regen-headers configure flag for automatic jni .h file generation. * Removed workaround for gcj 3.2 and lower, gcj 3.3+ or jikes 1.18+ is now needed for compiling. * Lots of improvements and/or new classes for java.awt, java.awt.dnd, java.awt.font, java.awt.geom, java.awt.image, java.io, java.math, java.net, java.nio, java.rmi, java.text, java.util, javax.swing, javax.swing.plaf, javax.swing.text. VM Interface changes: * VMClassLoader.loadClass(), the bootstrap classloader called by Class.forName() and ClassLoader.loadClass(), may now return null when a class is not found instead of throwing a new ClassNotFoundException. This is a performance optimization in some cases. This also changes the Class.forName() reference code. * Native methods in Class have been moved to VMClass. A few additional methods are also available in VMClass to provide optional performance improvements. * A VM can now supply its own String.intern() strategy through the VMString class. The supplied VMString reference class implements the original WeakHashMap strategy. * Float and Double to/from bits conversion functions can now be supplied by the VM through VMFloat and VMDouble. Default JNI conversion methods are supplied. --- lang/classpath/Makefile | 17 ++++++++++++++--- lang/classpath/PLIST | 41 ++++++++++++++++++++++++++++++++++++++--- lang/classpath/distinfo | 9 +++------ lang/classpath/patches/patch-aa | 16 ---------------- lang/classpath/patches/patch-ab | 25 ------------------------- lang/classpath/patches/patch-ac | 23 ----------------------- 6 files changed, 55 insertions(+), 76 deletions(-) delete mode 100644 lang/classpath/patches/patch-aa delete mode 100644 lang/classpath/patches/patch-ab delete mode 100644 lang/classpath/patches/patch-ac (limited to 'lang/classpath') diff --git a/lang/classpath/Makefile b/lang/classpath/Makefile index c762dce5bd8..587ab39b70f 100644 --- a/lang/classpath/Makefile +++ b/lang/classpath/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:43 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/07 21:31:09 jmmv Exp $ -DISTNAME= classpath-0.05 +DISTNAME= classpath-0.07 CATEGORIES= devel MASTER_SITES= ftp://alpha.gnu.org/gnu/classpath/ @@ -11,7 +11,18 @@ COMMENT= Class libraries for Java VM DEPENDS+= jikes>=1.18:../../lang/jikes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-jikes +INFO_FILES= hacking.info vmintegration.info +USE_BUILDLINK3= yes +USE_GNU_TOOLS+= make USE_LIBTOOL= yes +CONFIGURE_ARGS+= --with-jikes + +BUILDLINK_FILES.libart2+= bin/libart2-config +BUILDLINK_TRANSFORM.libart2+= -e 's|/libart2-config|/libart-config|g' + +.include "../../graphics/libart2/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/classpath/PLIST b/lang/classpath/PLIST index 82ff88a39e3..377e47946a0 100644 --- a/lang/classpath/PLIST +++ b/lang/classpath/PLIST @@ -1,10 +1,45 @@ -@comment $NetBSD: PLIST,v 1.2 2003/06/24 13:47:14 agc Exp $ -info/hacking.info -info/vmintegration.info +@comment $NetBSD: PLIST,v 1.3 2004/03/07 21:31:09 jmmv Exp $ lib/awt/font.properties +lib/classpath/libgtkpeer.a +lib/classpath/libgtkpeer.la +lib/classpath/libgtkpeer.so +lib/classpath/libgtkpeer.so.0 +lib/classpath/libgtkpeer.so.0.0 +lib/classpath/libjavaio.a +lib/classpath/libjavaio.la +lib/classpath/libjavaio.so +lib/classpath/libjavaio.so.0 +lib/classpath/libjavaio.so.0.0 +lib/classpath/libjavalang.a +lib/classpath/libjavalang.la +lib/classpath/libjavalang.so +lib/classpath/libjavalang.so.0 +lib/classpath/libjavalang.so.0.0 +lib/classpath/libjavalangreflect.a +lib/classpath/libjavalangreflect.la +lib/classpath/libjavalangreflect.so +lib/classpath/libjavalangreflect.so.0 +lib/classpath/libjavalangreflect.so.0.0 +lib/classpath/libjavanet.a +lib/classpath/libjavanet.la +lib/classpath/libjavanet.so +lib/classpath/libjavanet.so.0 +lib/classpath/libjavanet.so.0.0 +lib/classpath/libjavanio.a +lib/classpath/libjavanio.la +lib/classpath/libjavanio.so +lib/classpath/libjavanio.so.0 +lib/classpath/libjavanio.so.0.0 +lib/classpath/libjavautil.a +lib/classpath/libjavautil.la +lib/classpath/libjavautil.so +lib/classpath/libjavautil.so.0 +lib/classpath/libjavautil.so.0.0 lib/security/classpath.security share/classpath/glibj.zip @exec ${MKDIR} %D/share/classpath/api @dirrm share/classpath/api @dirrm share/classpath +@dirrm lib/security +@dirrm lib/classpath @dirrm lib/awt diff --git a/lang/classpath/distinfo b/lang/classpath/distinfo index 2f5125fa5ef..fa77ca5899c 100644 --- a/lang/classpath/distinfo +++ b/lang/classpath/distinfo @@ -1,7 +1,4 @@ -$NetBSD: distinfo,v 1.2 2003/06/25 20:50:44 jmc Exp $ +$NetBSD: distinfo,v 1.3 2004/03/07 21:31:09 jmmv Exp $ -SHA1 (classpath-0.05.tar.gz) = e73a81c314d4dba57e9115bef3ec7f0519831d4d -Size (classpath-0.05.tar.gz) = 6800324 bytes -SHA1 (patch-aa) = be36bf95ddbc4a8f5b4375d0c0bdaff4d449e560 -SHA1 (patch-ab) = 4d7a67ea14930b9432acdc701514fd8f4c30d229 -SHA1 (patch-ac) = 41d86c30a1989aa28e0f73c7122168418cdbfa1e +SHA1 (classpath-0.07.tar.gz) = a3b34e4850e9741812f42e14b1e68c6c90a04136 +Size (classpath-0.07.tar.gz) = 5745703 bytes diff --git a/lang/classpath/patches/patch-aa b/lang/classpath/patches/patch-aa deleted file mode 100644 index f17f655646a..00000000000 --- a/lang/classpath/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2003/06/25 20:50:44 jmc Exp $ - ---- lib/gen-classlist.sh.in.orig Sat Feb 1 05:44:14 2003 -+++ lib/gen-classlist.sh.in Wed Jun 25 13:29:30 2003 -@@ -1,9 +1,9 @@ - #! @SH@ - # @configure_input@ - if test "@top_srcdir@" = "${top_builddir}"; then -- @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/source ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 -+ @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/jaxp/source ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 - else -- @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/source ${top_builddir}/java ${top_builddir}/javax ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 -+ @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/jaxp/source ${top_builddir}/java ${top_builddir}/javax ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 - fi - - for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < ${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done diff --git a/lang/classpath/patches/patch-ab b/lang/classpath/patches/patch-ab deleted file mode 100644 index bc28b81df00..00000000000 --- a/lang/classpath/patches/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2003/06/25 20:50:45 jmc Exp $ - ---- lib/Makefile.am.orig Sat Feb 1 05:44:14 2003 -+++ lib/Makefile.am Wed Jun 25 14:56:02 2003 -@@ -45,10 +45,10 @@ - # handling javac definition including programs like jikes here - #----------------------------------------------------------------- - if FOUND_JIKES --JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes -+JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes - else - if FOUND_GCJ --JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes -+JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes - else - if FOUND_KJC - JAVAC = $(USER_JABBA) $(ARG_CLASSPATH_VM) $(KJC_CLASSPATH):$(USER_CLASSLIB) $(KJC_MAIN) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes -@@ -89,6 +89,7 @@ - if ! [ -e glibj.zip ]; then cp -R java $(DESTDIR)$(pkgdatadir); fi - if ! [ -e glibj.zip ]; then cp -R javax $(DESTDIR)$(pkgdatadir); fi - if ! [ -e glibj.zip ]; then cp -R org $(DESTDIR)$(pkgdatadir); fi -+ if [ -e glibj.zip ]; then cp glibj.zip $(DESTDIR)$(pkgdatadir); fi - - # FIXME - should mimic doc/api/Makefile.am instead... - uninstall-local: diff --git a/lang/classpath/patches/patch-ac b/lang/classpath/patches/patch-ac deleted file mode 100644 index 91baac5f250..00000000000 --- a/lang/classpath/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/06/25 20:50:45 jmc Exp $ - ---- lib/Makefile.in.orig Wed Jun 25 14:55:37 2003 -+++ lib/Makefile.in Wed Jun 25 14:55:51 2003 -@@ -161,8 +161,8 @@ - # handling javac definition including programs like jikes here - #----------------------------------------------------------------- - @FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE@@FOUND_KJC_TRUE@JAVAC = $(USER_JABBA) $(ARG_CLASSPATH_VM) $(KJC_CLASSPATH):$(USER_CLASSLIB) $(KJC_MAIN) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes --@FOUND_GCJ_TRUE@@FOUND_JIKES_FALSE@JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes --@FOUND_JIKES_TRUE@JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes -+@FOUND_GCJ_TRUE@@FOUND_JIKES_FALSE@JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes -+@FOUND_JIKES_TRUE@JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes - - #----------------------------------------------------------------- - -@@ -357,6 +357,7 @@ - if ! [ -e glibj.zip ]; then cp -R java $(DESTDIR)$(pkgdatadir); fi - if ! [ -e glibj.zip ]; then cp -R javax $(DESTDIR)$(pkgdatadir); fi - if ! [ -e glibj.zip ]; then cp -R org $(DESTDIR)$(pkgdatadir); fi -+ if [ -e glibj.zip ]; then cp glibj.zip $(DESTDIR)$(pkgdatadir); fi - - # FIXME - should mimic doc/api/Makefile.am instead... - uninstall-local: -- cgit v1.2.3