diff options
author | obache <obache@pkgsrc.org> | 2007-01-05 16:48:58 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2007-01-05 16:48:58 +0000 |
commit | 2305db9848fa5d2575846799c6a2d626466f3503 (patch) | |
tree | 41599ef4a49e23ecc5bb2a5de8f5b642ca77c85c | |
parent | 158819b04cba319e3b7cc1a5bad9e71d305f6dbe (diff) | |
download | pkgsrc-2305db9848fa5d2575846799c6a2d626466f3503.tar.gz |
Update classpath{,-gui} to 0.93.
Patch provided by pancake@youterm.com in PR 35262.
And add patches to build with NetBSD 3.
New in release 0.93 (Dec 8, 2006)
* CORBA objects that exist on the same virtual machine and only are connected
to another ORB are now accessed directly and no longer via network. It is
the same feature that RMI implementation provides. These faster calls should
be completely transparent, as the parameters are cloned, where required.
Currently the direct calls are only possible for the non-deprecated objects
that are connected to the ORB via POA.
* The 'javah' tool has been added. It requires the ASM library
(see asm.objectweb.org); it can be enabled with the --with-asm
option to configure
* Added the rmi and corbaname URL context factories for JNDI.
* Fixes in the JNDI InitialContext now allows to plug-in user implementation.
* Removed currentClassLoader method from
vm/reference/java/io/ObjectInputStream.java.
* Added firstNonNullClassLoader method to
vm/reference/gnu/classpath/VMStackWalker.java. VMs are encouraged to
provide a more efficient implementation.
* Added aton method to vm/reference/java/net/VMInetAddress.java.
* NetworkInterface has been implemented for systems that provide the
`getifaddrs' function.
* java.nio.channels.Selector implementations have been added that use
the kqueue notification mechanism on Mac OS X and *BSD, and that use
the epoll notification mechanism on Linux 2.6.
* java.nio has been refactored to support more non-blocking operations
natively. Blocking IO classes have been refactored to call
non-blocking classes. Non-blocking accepts, connects, and
scatter-gather IO should now be better supported.
* HTML support for Swing has been greatly enhanced.
Runtime interface changes:
* java.net.VMNetworkInterface and java.net.NetworkInterface have been
updated to keep native-modified state in the former, and to simplify
the native code in our reference implementation.
* gnu.java.nio.VMChannel has been expanded to better support native
non-blocking IO. Most native state data (such as file descriptor
integers) has been abstracted away into private state in the runtime
interface.
* gnu.java.nio.VMPipe has been similarly changed.
* gnu.java.net.VMPlainSocketImpl has been changed to remove some
functionality now provided by VMChannel; datagram socket-specific
methods have also been moved here, deprecating VMPlainDatagramSocketImpl.
* gnu.java.net.VMPlainDatagramSocketImpl removed.
New in release 0.92 (Aug 9, 2006)
* GConf is used as a backend for java.util.prefs. GNU Classpath
thanks to Mario Torre for this contribution!
* libjawtgnu.so has been renamed libjawt.so for binary compatibility.
libjawt.so should be installed in a VM-specific directory rather
than directly in /usr/lib. Proprietary VMs put their libjawt.so
implementations in VM-specific directories but search /usr/lib first.
If GNU Classpath's libjawt.so is installed in /usr/lib it will create
problems for people who use a proprietary VM to run AWT Native
Interface applications.
* The GdkGraphics2D backend has been made the default. There is no
longer an explicit dependency on Cairo, the --enable-gtk-cairo
configure option is gone, and GTK 2.8 or higher is now required to
build the GTK peers.
* A Mozilla plugin, 'gcjwebplugin', is now included. It introduces a
dependency on the Mozilla plugin support headers and libraries.
* New java implementations of png and gif imageio readers and writers.
* A tools.texinfo document has been created and now includes
documentation about:
* appletviewer
* gcjwebplugin
* jarsigner
* keytool
* Several new tools are now included:
* appletviewer
* jar
* native2ascii
* serialver
* keytool
* jarsigner
A new configure option --enable-tool-wrappers causes wrapper
binaries to be built for VMs that support the JNI Invocation API.
* javax.sound.midi providers have been added to read and
write standard MIDI files.
* A javax.sound.sampled .au and .wav file readers have been added.
* New Java Virtual Machine Tool Interface header, jvmti.h.
* AWT peers for X Windows based on Escher (a pure java X protocol
implementation) have been added. So far it supports AWT 1.1 style
Graphics, image loading via ImageIO (PNG, GIF and BMP images in this
release), top level components as well as mouse and keyboard input.
It is capable of running many Swing applications. Graphics2D and
AWT widgets are not yet supported with this peer set.
* GConf based util.peers backend (see the --enable-gconf-peer and
--enable-default-preferences-peer configure options).
* Support for batch importing trusted certificates for use with ssl
connections (see script/import-cacerts.sh).
* NIO scatter-gather channel support.
Runtime interface changes:
* A new class, VMURLConnection, is used to implement
URLConnection.guessContentTypeFromStream. The reference
implementation uses libmagic (and falls back to doing nothing if
libmagic is not available).
* The method gnu.java.io.PlatformHelper.toCanonicalForm() has been
replaced with a JNI implementation of VMFile.toCanonicalForm() for
GNU/Posix systems.
* A new class, VMRuntimeMXBeanImpl, is used to implement
the low-level support of the runtime management bean.
VMs should use it to supply the input arguments and start
time of the VM. In addition, one of sun.boot.class.path
or java.boot.class.path should be defined by the VM to
support the optional boot class path access functionality.
* The Unsafe class was moved back to the place expected by the JSR 166
reference implementation. We've also added a couple other new VM
classes to support the JSR 166 code -- sun.reflect.Reflection and
sun.reflect.misc.ReflectUtil.
* Another new class, VMClassLoadingMXBeanImpl, is used to implement
the low-level support of the class loading management bean.
VMs need to supply it with information about how many classes
are currently loaded, how many have been unloaded and whether
verbose class loading output is on or off. Provision should also
be made for the latter to be toggled at runtime.
* VMThreadMXBeanImpl is used to implement the low-level support
of the thread management bean. Providing this interface requires
providing a fair amount of information about threads, including
optional time and contention monitoring, and instances of the
new ThreadInfo class in java.lang.management. getState() has also
been added to the VMThread interface; this is required by the bean
as well as java.lang.Thread.
* VMMemoryMXBeanImpl is used to implement the low-level support
of the memory management bean. Providing this interface requires
providing information about the levels of heap and non-heap memory,
and the number of objects eligible for garbage collection.
* VMCompilationMXBeanImpl is used to allow for optional compilation
time support for Just-In-Time compilers.
* VMMemoryPoolMXBeanImpl is used to implement the low-level support
of the memory pool beans. Providing this interface requires
providing memory usage statistics for each supported bean.
* VMManagementFactory provides the names of the memory pools,
memory managers and garbage collectors maintained by the virtual
machine. These are used to create the beans by the ManagementFactory.
* VMMemoryManagerMXBeanImpl and VMGarbageCollectorMXBeanImpl provide
low-level support for memory managers (including the specific subclass
of garbage collecting memory managers). The interfaces for these
require no more than enumerating the number of collections and the
time spent (for garbage collectors) and a relationship to the memory
pools (for all), along with a validity check.
-rw-r--r-- | lang/classpath-gui/Makefile | 4 | ||||
-rw-r--r-- | lang/classpath-gui/PLIST | 2 | ||||
-rw-r--r-- | lang/classpath/Makefile.common | 9 | ||||
-rw-r--r-- | lang/classpath/PLIST | 45 | ||||
-rw-r--r-- | lang/classpath/distinfo | 10 | ||||
-rw-r--r-- | lang/classpath/patches/patch-aa | 13 | ||||
-rw-r--r-- | lang/classpath/patches/patch-ab | 14 |
7 files changed, 86 insertions, 11 deletions
diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile index e0bf7009cfa..74496cd1525 100644 --- a/lang/classpath-gui/Makefile +++ b/lang/classpath-gui/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:38 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/05 16:48:58 obache Exp $ .include "../../lang/classpath/Makefile.common" PKGNAME= ${DISTNAME:S/classpath/classpath-gui/} COMMENT+= (GUI libraries) -DEPENDS+= classpath>=0.91:../../lang/classpath +DEPENDS+= classpath>=0.93:../../lang/classpath USE_TOOLS+= pkg-config diff --git a/lang/classpath-gui/PLIST b/lang/classpath-gui/PLIST index d5444b71089..58fcb4ea16d 100644 --- a/lang/classpath-gui/PLIST +++ b/lang/classpath-gui/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:39 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/01/05 16:48:58 obache Exp $ lib/classpath/libgtkpeer.la @comment in classpath: @dirrm lib/classpath diff --git a/lang/classpath/Makefile.common b/lang/classpath/Makefile.common index 79a6efd5bc8..e81f655b395 100644 --- a/lang/classpath/Makefile.common +++ b/lang/classpath/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.9 2006/10/04 21:46:13 wiz Exp $ +# $NetBSD: Makefile.common,v 1.10 2007/01/05 16:48:58 obache Exp $ -DISTNAME= classpath-0.91 +DISTNAME= classpath-0.93 CATEGORIES= devel MASTER_SITES= ftp://ftp.gnu.org/gnu/classpath/ @@ -16,4 +16,9 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes +# XXX this must be fixed as an optional build flag +CONFIGURE_ARGS+= --disable-gconf-peer +CONFIGURE_ARGS+= --disable-plugin CONFIGURE_ARGS+= --with-jikes + +.include "../../devel/glib2/buildlink3.mk" diff --git a/lang/classpath/PLIST b/lang/classpath/PLIST index e3376c7298f..0cb83643de2 100644 --- a/lang/classpath/PLIST +++ b/lang/classpath/PLIST @@ -1,4 +1,14 @@ -@comment $NetBSD: PLIST,v 1.9 2006/05/16 13:27:33 tonio Exp $ +@comment $NetBSD: PLIST,v 1.10 2007/01/05 16:48:58 obache Exp $ +bin/gappletviewer +bin/gjar +bin/gjarsigner +bin/gkeytool +bin/gnative2ascii +bin/gorbd +bin/grmid +bin/grmiregistry +bin/gserialver +bin/gtnameserv include/jawt.h include/jawt_md.h include/jni.h @@ -14,7 +24,7 @@ lib/classpath/libjavanio.la lib/classpath/libjavautil.la lib/logging.properties lib/security/classpath.security -share/classpath/README +share/classpath/examples/Makefile.java2d share/classpath/examples/Makefile.jawt share/classpath/examples/README share/classpath/examples/examples.zip @@ -56,14 +66,17 @@ share/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_ share/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java share/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java share/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java +share/classpath/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java share/classpath/examples/gnu/classpath/examples/awt/AnimationApplet.java share/classpath/examples/gnu/classpath/examples/awt/Demo.java share/classpath/examples/gnu/classpath/examples/datatransfer/Demo.java share/classpath/examples/gnu/classpath/examples/html/Demo.java +share/classpath/examples/gnu/classpath/examples/icons/back.png share/classpath/examples/gnu/classpath/examples/icons/badge.png share/classpath/examples/gnu/classpath/examples/icons/big-fullscreen.png share/classpath/examples/gnu/classpath/examples/icons/big-home.png share/classpath/examples/gnu/classpath/examples/icons/big-warning.png +share/classpath/examples/gnu/classpath/examples/icons/reload.png share/classpath/examples/gnu/classpath/examples/icons/stock-copy.png share/classpath/examples/gnu/classpath/examples/icons/stock-cut.png share/classpath/examples/gnu/classpath/examples/icons/stock-go-back.png @@ -77,10 +90,26 @@ share/classpath/examples/gnu/classpath/examples/icons/stock-quit.png share/classpath/examples/gnu/classpath/examples/icons/stock-save-as.png share/classpath/examples/gnu/classpath/examples/icons/stock-save.png share/classpath/examples/gnu/classpath/examples/icons/stock-spell-check.png +share/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmark.java +share/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java +share/classpath/examples/gnu/classpath/examples/java2d/JNIOverhead.java +share/classpath/examples/gnu/classpath/examples/java2d/bench.c +share/classpath/examples/gnu/classpath/examples/java2d/bench.h share/classpath/examples/gnu/classpath/examples/jawt/DemoJAWT.c share/classpath/examples/gnu/classpath/examples/jawt/DemoJAWT.java +share/classpath/examples/gnu/classpath/examples/management/TestBeans.java +share/classpath/examples/gnu/classpath/examples/management/TestClassLoading.java +share/classpath/examples/gnu/classpath/examples/management/TestCompilation.java +share/classpath/examples/gnu/classpath/examples/management/TestGarbageCollector.java +share/classpath/examples/gnu/classpath/examples/management/TestMemory.java +share/classpath/examples/gnu/classpath/examples/management/TestMemoryManager.java +share/classpath/examples/gnu/classpath/examples/management/TestMemoryPool.java +share/classpath/examples/gnu/classpath/examples/management/TestOS.java +share/classpath/examples/gnu/classpath/examples/management/TestRuntime.java +share/classpath/examples/gnu/classpath/examples/management/TestThread.java share/classpath/examples/gnu/classpath/examples/midi/Demo.java share/classpath/examples/gnu/classpath/examples/print/Demo.java +share/classpath/examples/gnu/classpath/examples/swing/BrowserEditorKit.java share/classpath/examples/gnu/classpath/examples/swing/ButtonDemo.java share/classpath/examples/gnu/classpath/examples/swing/ComboBoxDemo.java share/classpath/examples/gnu/classpath/examples/swing/Demo.java @@ -88,6 +117,7 @@ share/classpath/examples/gnu/classpath/examples/swing/DemoDesktop.java share/classpath/examples/gnu/classpath/examples/swing/DemoFactory.java share/classpath/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java share/classpath/examples/gnu/classpath/examples/swing/FileChooserDemo.java +share/classpath/examples/gnu/classpath/examples/swing/HtmlDemo.java share/classpath/examples/gnu/classpath/examples/swing/ListDemo.java share/classpath/examples/gnu/classpath/examples/swing/MetalThemeEditor.java share/classpath/examples/gnu/classpath/examples/swing/MiniDemo.java @@ -101,12 +131,23 @@ share/classpath/examples/gnu/classpath/examples/swing/TableDemo.java share/classpath/examples/gnu/classpath/examples/swing/TextAreaDemo.java share/classpath/examples/gnu/classpath/examples/swing/TextFieldDemo.java share/classpath/examples/gnu/classpath/examples/swing/TreeDemo.java +share/classpath/examples/gnu/classpath/examples/swing/forms.html +share/classpath/examples/gnu/classpath/examples/swing/frame1.html +share/classpath/examples/gnu/classpath/examples/swing/frame2.html +share/classpath/examples/gnu/classpath/examples/swing/frame3.html +share/classpath/examples/gnu/classpath/examples/swing/frame4.html +share/classpath/examples/gnu/classpath/examples/swing/frames.html +share/classpath/examples/gnu/classpath/examples/swing/tables.html +share/classpath/examples/gnu/classpath/examples/swing/textstyles.html +share/classpath/examples/gnu/classpath/examples/swing/welcome.html share/classpath/glibj.zip share/classpath/tools.zip @dirrm share/classpath/examples/gnu/classpath/examples/swing @dirrm share/classpath/examples/gnu/classpath/examples/print @dirrm share/classpath/examples/gnu/classpath/examples/midi +@dirrm share/classpath/examples/gnu/classpath/examples/management @dirrm share/classpath/examples/gnu/classpath/examples/jawt +@dirrm share/classpath/examples/gnu/classpath/examples/java2d @dirrm share/classpath/examples/gnu/classpath/examples/icons @dirrm share/classpath/examples/gnu/classpath/examples/html @dirrm share/classpath/examples/gnu/classpath/examples/datatransfer diff --git a/lang/classpath/distinfo b/lang/classpath/distinfo index 1a515416399..b5cd3cdbf9d 100644 --- a/lang/classpath/distinfo +++ b/lang/classpath/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.8 2006/05/16 13:27:33 tonio Exp $ +$NetBSD: distinfo,v 1.9 2007/01/05 16:48:58 obache Exp $ -SHA1 (classpath-0.91.tar.gz) = fcbfdf64f7a990f1747621772a2e9e69d0baaab7 -RMD160 (classpath-0.91.tar.gz) = 9aa52a1206e1feb965dac21070ea0068d71b998b -Size (classpath-0.91.tar.gz) = 8458627 bytes +SHA1 (classpath-0.93.tar.gz) = 336cae589ec91a4fe212c2149c57b51dab2ca002 +RMD160 (classpath-0.93.tar.gz) = 4c72b68766e35adbb2c89170fbdf7f30dd788836 +Size (classpath-0.93.tar.gz) = 9534222 bytes +SHA1 (patch-aa) = 3c74808a0a0b322b796788483134a7dcec81cfe8 +SHA1 (patch-ab) = a788879bb8c0655174fcd10b9357faaca3b0d3d5 diff --git a/lang/classpath/patches/patch-aa b/lang/classpath/patches/patch-aa new file mode 100644 index 00000000000..f4952c3dc89 --- /dev/null +++ b/lang/classpath/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3 2007/01/05 16:48:58 obache Exp $ + +--- native/jni/native-lib/cpnet.c.orig 2006-09-17 07:31:43.000000000 +0000 ++++ native/jni/native-lib/cpnet.c +@@ -60,7 +60,7 @@ exception statement from your version. * + #elif defined (HAVE_SO_NOSIGPIPE) + #define SOCKET_NOSIGNAL SO_NOSIGPIPE + #else +-#error "No suitable flag found to ommit a SIGPIPE on signal errors with send()." ++#define SOCKET_NOSIGNAL 0 + #endif + + static int socketTimeouts[FD_SETSIZE]; diff --git a/lang/classpath/patches/patch-ab b/lang/classpath/patches/patch-ab new file mode 100644 index 00000000000..0fbf70f97a3 --- /dev/null +++ b/lang/classpath/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.3 2007/01/05 16:48:58 obache Exp $ + +--- native/jni/native-lib/cpnet.h.orig 2006-09-08 08:59:57.000000000 +0000 ++++ native/jni/native-lib/cpnet.h +@@ -43,6 +43,9 @@ exception statement from your version. * + #include <string.h> + + #include <sys/socket.h> ++#ifdef __NetBSD__ ++#include <netinet/in_systm.h> ++#endif + #include <netinet/in.h> + #include <netinet/ip.h> + |