diff options
| -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> + |