Update wonka to 0.9.6.

Once again lots of fixes in Rudolph (various speed improvements, support for
overlapping components, a working MemoryImageSource and PixelGrabber, ...)
A few new packages: java.awt.dnd, java.awt.datatransfer and java.beans
Garbage collection safe points have been added (though disabled by default),
stdin/out/err no longer need javax.comm, javax.comm got a make over, an
ExtensionClassLoader has been introduced, ...
Use asynchronous IO for network, serial ports and touchscreen.
Lots of bugfixes and speed improvements.

A full list of changes can be found at http://www.acunia.com/wonka/CHANGES/0.9.6

We would like to thank Nick Hudson, Mark Anderson, Richard Vanderlaan and Willem
Geldhof for their substantial contributions.

8 files changed, 45 insertions, 44 deletions

diff --git a/lang/wonka/Makefile b/lang/wonka/Makefile
index c2474a78a1a..88ff0736799 100644
--- a/lang/wonka/Makefile
+++ b/lang/wonka/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/06/11 20:50:56 abs Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/03 11:04:42 skrll Exp $
 #
 
-DISTNAME=	wonka-src-0.9.5-release
-PKGNAME=	wonka-0.9.5
+DISTNAME=	wonka-src-0.9.6-release
+PKGNAME=	wonka-0.9.6
 WRKSRC=		${WRKDIR}/open-wonka
 CATEGORIES=	lang
 MASTER_SITES=	http://wonka.acunia.com/
@@ -65,8 +65,7 @@ JAM_COMMAND=	\
 			-sWONKA_CONFIG=pkgsrc				\
 			-sCPU=${LOWER_ARCH}				\
 			-sHOSTOS=${LOWER_OPSYS}				\
-			-sAWT_DEVICE=xsim				\
-			-sDEBUG=false
+			-sAWT_DEVICE=xsim
 
 do-build:
 	${JAM_COMMAND}
diff --git a/lang/wonka/PLIST b/lang/wonka/PLIST
index f261d61d529..4e2e1effefa 100644
--- a/lang/wonka/PLIST
+++ b/lang/wonka/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/10 13:07:25 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/07/03 11:04:42 skrll Exp $
 bin/java
 bin/wonka
-lib/claudia.fr
 lib/device.config
+lib/ext/crypto.jar
+lib/font.properties
 lib/font/courR10.pcf
 lib/font/courR12.pcf
 lib/font/courR14.pcf
@@ -63,6 +64,7 @@ test/rudolph3.gif
 test/utf8test.data
 test/vte.jar
 @dirrm test
+@dirrm lib/ext
 @dirrm lib/font
 @dirrm lib
 @dirrm bin
diff --git a/lang/wonka/distinfo b/lang/wonka/distinfo
index 18cdea64b74..c0fd6ee02ae 100644
--- a/lang/wonka/distinfo
+++ b/lang/wonka/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2003/03/10 13:07:25 skrll Exp $
+$NetBSD: distinfo,v 1.6 2003/07/03 11:04:42 skrll Exp $
 
-SHA1 (wonka-src-0.9.5-release.tar.gz) = 617751e2673e1158eb9f86b283f06a3c5f5accce
-Size (wonka-src-0.9.5-release.tar.gz) = 6209767 bytes
+SHA1 (wonka-src-0.9.6-release.tar.gz) = 2affc5b0387af97b8e6ea05168834736c3765cf4
+Size (wonka-src-0.9.6-release.tar.gz) = 6315866 bytes
 SHA1 (patch-aa) = 4d60701fb4f600f336a10d4dd22df8ffd86599c0
 SHA1 (patch-ab) = de27e5f58ffc11ce45f09c56831f332e9b6121f7
 SHA1 (patch-ac) = 1511555de9c012bff21e265fb2d58e395a2c97fd
 SHA1 (patch-ad) = 68ec03d82285c080148efe4fa6f10fdd55fde82a
-SHA1 (patch-ae) = 8fdfd438e8df91384c916d2e196963417f9b46c8
+SHA1 (patch-ae) = 4a7dde7385859226b6f5605a6031a477590db841
 SHA1 (patch-ai) = fa59835a737096e0859d600db9883b9a01aaa245
 SHA1 (patch-aj) = 0d0fc4471e9a7993f31f036d603985adaf87c855
 SHA1 (patch-ak) = 13c08a35550ef83872532b40401e3698a4f64168
@@ -14,5 +14,4 @@ SHA1 (patch-al) = daf9ba8561fd42fb3772075c44836cba0cd14a23
 SHA1 (patch-am) = 60ee234ab999e49804ac8cb5d7d2a79c32bd4937
 SHA1 (patch-an) = 879dfcde48bd272dbb2968f85c6691237116d0c2
 SHA1 (patch-ao) = b70f421279870f2895e75cd0cd4138057132ec50
-SHA1 (patch-ap) = 2a2138a91c1431b671953f7a16e1757c1a13a02c
-SHA1 (patch-aq) = 2d4b70bd5129d9cdcc65cb9c35c6453f1f936206
+SHA1 (patch-ar) = c36ea50a35b5af08e585826d7d6ead89de6b3330
diff --git a/lang/wonka/files/pkgsrc b/lang/wonka/files/pkgsrc
index 8bdff9f86c0..70b86d1c406 100644
--- a/lang/wonka/files/pkgsrc
+++ b/lang/wonka/files/pkgsrc
@@ -2,7 +2,6 @@ DEBUG = false ;
 PROFILING = false ;
 STATIC = false ;
 SCHEDULER = oswald ;
-FICL = true ;
 FILESYSTEM = native ;
 FSROOT = "/" ;
 BUILDROOT = "$(OROOT)/wonka/fsroot" ;
@@ -13,9 +12,13 @@ USERDIR = "@PREFIX@/user" ;
 TESTDIR = "@PREFIX@/test" ;
 BOOTCLASSDIR = "$(LIBDIR)" ;
 BOOTCLASSFILE = "wre.jar" ;
+EXTCLASSDIR = "$(LIBDIR)/ext" ;
 INSTALLBOOTCLASSDIR = $(BOOTCLASSDIR) ;
+INSTALLEXTCLASSDIR = $(EXTCLASSDIR) ;
 CCLASSPATH = "$(ETCDIR):$(TESTDIR)" ;
 NETWORK = native ;
 SHARED_OBJECTS = true ;
 DEVCONFDIR = $(ETCDIR) ;
-
+JAVAX_CRYPTO = true ;
+SECURITY = coarse ;
+JAVA_BEANS = true ;
diff --git a/lang/wonka/patches/patch-ae b/lang/wonka/patches/patch-ae
index 5786fc40dd8..da5eb579bd7 100644
--- a/lang/wonka/patches/patch-ae
+++ b/lang/wonka/patches/patch-ae
@@ -1,12 +1,19 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/11/01 10:49:33 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2003/07/03 11:04:42 skrll Exp $
 
---- wonka/resource/system/system.properties.orig	Wed Aug 14 11:09:07 2002
+--- wonka/resource/system/system.properties.orig	2003-03-19 14:12:41.000000000 +0000
 +++ wonka/resource/system/system.properties
-@@ -1,5 +1,5 @@
+@@ -1,12 +1,12 @@
  # Wonka system properties file
- com.acunia.wonka.System.out.autoflush=true
- com.acunia.wonka.System.err.autoflush=true
+ # This curiously-named property defines command-line parameters to be used
+ # if Wonka is run with no parameters.
 -com.acunia.wonka.Init.linux.start=com.acunia.wonka.test.awt.VisualTestEngine
--com.acunia.wonka.jarfiles = /test/vte.jar:/test/mauve-suite.jar
 +com.acunia.wonka.Init.netbsd.start=com.acunia.wonka.test.awt.VisualTestEngine
-+com.acunia.wonka.jarfiles = @PREFIX@/test/vte.jar:@PREFIX@/test/mauve-suite.jar
+ # There are two ways to define 'extensions' : the Wonka way and the "official" way.
+ # First the Wonka way: just put the jarfiles you want searched in a list.
+ # Actually despite the name you can also put directories in the list.
+ # (In the example, the last entry allows us to find /test/car-image.png).
+-com.acunia.wonka.jarfiles = /test/vte.jar:/test/mauve-suite.jar:/
++com.acunia.wonka.jarfiles = @PREFIX@/test/vte.jar:@PREFIX@/test/mauve-suite.jar:@PREFIX@/
+ # Now the official way: supply a list of directories. Extensions will be found
+ # in any .jar or .zip files in these directories, or (this is a Wonka extension)
+ # in the directory itself.
diff --git a/lang/wonka/patches/patch-ap b/lang/wonka/patches/patch-ap
deleted file mode 100644
index af47f006515..00000000000
--- a/lang/wonka/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2002/11/12 11:17:19 skrll Exp $
-
---- wonka/src/native/java/lang/ClassLoader.c.orig	Thu Oct  3 14:57:03 2002
-+++ wonka/src/native/java/lang/ClassLoader.c
-@@ -400,6 +400,7 @@ w_instance ClassLoader_getCommandLineCla
-     }
-     else {
-       /* HACK! HACK! HACK! */
-+      /* XXX NAH Do I need to do anything here? */
-       result = cstring2String(thread, "./:/system/:/user/", 18);
-     }
-     attachString(Result, result);
diff --git a/lang/wonka/patches/patch-aq b/lang/wonka/patches/patch-aq
deleted file mode 100644
index db5d3d3762f..00000000000
--- a/lang/wonka/patches/patch-aq
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2003/01/15 21:02:07 he Exp $
-
---- network/native/hal/hostos/netbsd/include/network.h.orig	Wed Jan 15 21:58:56 2003
-+++ network/native/hal/hostos/netbsd/include/network.h
-@@ -29,4 +29,5 @@
- */
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
diff --git a/lang/wonka/patches/patch-ar b/lang/wonka/patches/patch-ar
new file mode 100644
index 00000000000..74e168814c8
--- /dev/null
+++ b/lang/wonka/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2003/07/03 11:04:43 skrll Exp $
+
+--- Jamrules.orig	2003-06-11 14:34:53.000000000 +0100
++++ Jamrules
+@@ -661,7 +661,7 @@ switch $(TESTS) {
+ 
+ switch $(JAVAX_CRYPTO) {
+   case true : {
+-    ECHO "Code for javax.crypto will be generated and placed in" $(BUILDROOT)"/"$(EXTCLASSDIR)"/crypto.jar" ;
++    ECHO "Code for javax.crypto will be generated and placed in" $(INSTALLEXTCLASSDIR)"/crypto.jar" ;
+   }
+ 
+   case false : {