Remove wonka -- the project is dead.

skrll@ ok.

22 files changed, 1 insertions, 466 deletions

diff --git a/lang/Makefile b/lang/Makefile
index 99a1a66530d..7f01499f371 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.211 2005/03/23 15:47:56 minskim Exp $
+# $NetBSD: Makefile,v 1.212 2005/04/19 09:49:07 wiz Exp $
 #
 
 COMMENT=	Programming languages
@@ -180,7 +180,6 @@ SUBDIR+=	utilisp
 SUBDIR+=	vscm
 SUBDIR+=	vslisp
 SUBDIR+=	win32-jdk
-SUBDIR+=	wonka
 SUBDIR+=	yabasic
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/lang/wonka/DESCR b/lang/wonka/DESCR
deleted file mode 100644
index 8b5def9b975..00000000000
--- a/lang/wonka/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Wonka is ACUNIA's cleanroom Virtual Machine for the Java(tm) language.
-It is extremely portable and self-contained, and can optionally be
-used with its own real-time executive (OSwaldTM) to provide a complete
-solution for embedded devices.  It is a full implementation of the
-Java language, not just a subset.  And it's Open Source.
diff --git a/lang/wonka/Makefile b/lang/wonka/Makefile
deleted file mode 100644
index c3496acc9fe..00000000000
--- a/lang/wonka/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:17 tv Exp $
-#
-
-DISTNAME=	wonka-src-0.9.6-release
-PKGNAME=	wonka-0.9.6
-PKGREVISION=	1
-CATEGORIES=	lang java
-MASTER_SITES=	http://wonka.acunia.com/
-
-MAINTAINER=	skrll@NetBSD.org
-HOMEPAGE=	http://wonka.acunia.com/download.html
-COMMENT=	BSD-licenced java virtual machine
-
-# This has only been ported to arm and x86 so far.
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-arm *-*-arm32
-
-BUILD_DEPENDS+=	acunia-jam>=1.0nb1:../../devel/acunia-jam
-BUILD_DEPENDS+=	jamjar-[0-9]*:../../archivers/jamjar
-BUILD_DEPENDS+=	jikes>=1.18:../../lang/jikes
-BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
-
-WRKSRC=		${WRKDIR}/open-wonka
-USE_X11=	# defined
-
-JVM_HOME=	${PREFIX}/java/${PKGBASE}
-
-SEDFILES=	\
-	${WRKSRC}/tool/mauve/java/gnu/testlet/wonka/lang/ClassLoader/AcuniaClassLoaderTest.java \
-	${WRKSRC}/tool/mauve/java/gnu/testlet/wonka/util/zip/GZIPInputStream/basic.java \
-	${WRKSRC}/tool/mauve/java/gnu/testlet/wonkax/microedition/io/Connector/AcuniaConnectorTest.java \
-	${WRKSRC}/wonka/resource/system/wonka.security \
-	${WRKSRC}/tool/mauve/java/gnu/testlet/wonka/util/zip/GZIPInputStream/basic.java \
-	${WRKSRC}/tool/mauve/java/gnu/testlet/wonka/lang/ClassLoader/AcuniaClassLoaderTest.java \
-	${WRKSRC}/tool/mauve/java/gnu/testlet/wonka/io/Utf8Encoding/ReadReference.java \
-	${WRKSRC}/tool/mauve/java/gnu/testlet/wonka/io/DataInputOutput/ReadReference.java \
-	${WRKSRC}/tool/visualtest/java/com/acunia/wonka/test/awt/vte.properties \
-	${WRKSRC}/wonka/resource/system/system.properties		\
-	${WRKSRC}/Configuration/cpu/arm					\
-	${WRKSRC}/Configuration/cpu/x86
-
-post-extract:
-	@${MKDIR} -p ${WRKSRC}/class/doclet/com/acunia/doclet
-	@${SED}	-e "s|@PREFIX@|${JVM_HOME}|g"				\
-		${FILESDIR}/pkgsrc 					\
-		> ${WRKSRC}/Configuration/wonka/pkgsrc
-
-post-patch:
-	@for file in ${SEDFILES}; do					\
-		${SED}	-e "s|@PREFIX@|${JVM_HOME}|g"			\
-			-e "s|@CC@|${CC}|g"				\
-			-e "s|@LD@|${LD}|g"				\
-			-e "s|@AS@|${CC} -c|g"				\
-			-e "s|@AR@|${AR}|g"				\
-			-e "s|@RANLIB@|${RANLIB}|g"			\
-			$${file} > $${file}.fixed &&			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
-
-MAKE_ENV+=	WONKA_TOP=${WRKSRC}
-JAM_COMMAND=	\
-	cd ${WRKSRC} && 						\
-		${SETENV} ${MAKE_ENV}					\
-		${LOCALBASE}/bin/jam					\
-			-sWONKA_CONFIG=pkgsrc				\
-			-sCPU=${LOWER_ARCH}				\
-			-sHOSTOS=${LOWER_OPSYS}				\
-			-sAWT_DEVICE=xsim
-
-do-build:
-	${JAM_COMMAND}
-
-do-install:
-	${JAM_COMMAND} install
-	${RM} -f ${JVM_HOME}/bin/java
-	${LN} -sf wonka ${JVM_HOME}/bin/java
-
-test:	install
-	cd ${WRKDIR} && LD_LIBRARY_PATH=${JVM_HOME}/test		\
-		${JVM_HOME}/bin/wonka gnu.testlet.TestRunner
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/wonka/PLIST b/lang/wonka/PLIST
deleted file mode 100644
index 08c7750b897..00000000000
--- a/lang/wonka/PLIST
+++ /dev/null
@@ -1,72 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/07/01 00:51:23 wiz Exp $
-java/wonka/bin/java
-java/wonka/bin/wonka
-java/wonka/lib/device.config
-java/wonka/lib/ext/crypto.jar
-java/wonka/lib/font.properties
-java/wonka/lib/font/courR10.pcf
-java/wonka/lib/font/courR12.pcf
-java/wonka/lib/font/courR14.pcf
-java/wonka/lib/font/courR17.pcf
-java/wonka/lib/font/courR20.pcf
-java/wonka/lib/font/courR25.pcf
-java/wonka/lib/font/helvB08.pcf
-java/wonka/lib/font/helvB12.pcf
-java/wonka/lib/font/helvB14.pcf
-java/wonka/lib/font/helvB17.pcf
-java/wonka/lib/font/helvB18.pcf
-java/wonka/lib/font/helvB20.pcf
-java/wonka/lib/font/helvB25.pcf
-java/wonka/lib/font/helvR08.pcf
-java/wonka/lib/font/helvR12.pcf
-java/wonka/lib/font/helvR14.pcf
-java/wonka/lib/font/helvR17.pcf
-java/wonka/lib/font/helvR18.pcf
-java/wonka/lib/font/helvR20.pcf
-java/wonka/lib/font/helvR25.pcf
-java/wonka/lib/font/nippon13.pcf
-java/wonka/lib/font/nippon18.pcf
-java/wonka/lib/kbdIcon_d.png
-java/wonka/lib/kbdIcon_e.png
-java/wonka/lib/kbdSelect_d.png
-java/wonka/lib/kbdSelect_e.png
-java/wonka/lib/system.properties
-java/wonka/lib/taskbar.png
-java/wonka/lib/taskbar.properties
-java/wonka/lib/taskbar_large.png
-java/wonka/lib/vte.properties
-java/wonka/lib/wonka.policy
-java/wonka/lib/wonka.properties
-java/wonka/lib/wonka.security
-java/wonka/lib/wonkatest.properties
-java/wonka/lib/wre.jar
-java/wonka/test/CLTest.jar
-java/wonka/test/appletViewer.jar
-java/wonka/test/car-image.png
-java/wonka/test/car.png
-java/wonka/test/forest.png
-java/wonka/test/lena1.png
-java/wonka/test/lena2.png
-java/wonka/test/libJNIArrayTest.so
-java/wonka/test/libJNIClassAccessTest.so
-java/wonka/test/libJNIClassConstructionTest.so
-java/wonka/test/libJNIMemberAccessTest.so
-java/wonka/test/libJNIObjectFunctionAccessTest.so
-java/wonka/test/libJNIPrimitiveFunctionAccessTest.so
-java/wonka/test/libJNIPrimitiveTest.so
-java/wonka/test/libJNIStringTest.so
-java/wonka/test/mauve-suite.jar
-java/wonka/test/reference.data
-java/wonka/test/reference.data2
-java/wonka/test/reference.gz
-java/wonka/test/reference.zip
-java/wonka/test/rudolph3.gif
-java/wonka/test/utf8test.data
-java/wonka/test/vte.jar
-@dirrm java/wonka/test
-@dirrm java/wonka/lib/ext
-@dirrm java/wonka/lib/font
-@dirrm java/wonka/lib
-@dirrm java/wonka/bin
-@dirrm java/wonka
-@unexec ${RMDIR} %D/java 2>/dev/null || ${TRUE}
diff --git a/lang/wonka/buildlink3.mk b/lang/wonka/buildlink3.mk
deleted file mode 100644
index a8aee89fc11..00000000000
--- a/lang/wonka/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/07/01 00:54:25 wiz Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WONKA_BUILDLINK3_MK:=	${WONKA_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	wonka
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwonka}
-BUILDLINK_PACKAGES+=	wonka
-
-.if !empty(WONKA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wonka+=	wonka-[0-9]*
-BUILDLINK_PKGSRCDIR.wonka?=	../../lang/wonka
-BUILDLINK_JAVA_PREFIX.wonka=	${PREFIX}/java/wonka
-.endif	# WONKA_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/wonka/distinfo b/lang/wonka/distinfo
deleted file mode 100644
index 741e7eed3dd..00000000000
--- a/lang/wonka/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 09:03:12 agc Exp $
-
-SHA1 (wonka-src-0.9.6-release.tar.gz) = 2affc5b0387af97b8e6ea05168834736c3765cf4
-RMD160 (wonka-src-0.9.6-release.tar.gz) = dfed2eba1c6c3d1f613effa645f0000e7d998cc0
-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) = 4a7dde7385859226b6f5605a6031a477590db841
-SHA1 (patch-ai) = fa59835a737096e0859d600db9883b9a01aaa245
-SHA1 (patch-aj) = 0d0fc4471e9a7993f31f036d603985adaf87c855
-SHA1 (patch-ak) = 13c08a35550ef83872532b40401e3698a4f64168
-SHA1 (patch-al) = daf9ba8561fd42fb3772075c44836cba0cd14a23
-SHA1 (patch-am) = 60ee234ab999e49804ac8cb5d7d2a79c32bd4937
-SHA1 (patch-an) = 879dfcde48bd272dbb2968f85c6691237116d0c2
-SHA1 (patch-ao) = b70f421279870f2895e75cd0cd4138057132ec50
-SHA1 (patch-ar) = c36ea50a35b5af08e585826d7d6ead89de6b3330
-SHA1 (patch-as) = 500808978e3c1e737776192ed849f238f011924d
-SHA1 (patch-at) = d978f1f06e159ad426c512fd61c29e03cf0da70b
diff --git a/lang/wonka/files/pkgsrc b/lang/wonka/files/pkgsrc
deleted file mode 100644
index 70b86d1c406..00000000000
--- a/lang/wonka/files/pkgsrc
+++ /dev/null
@@ -1,24 +0,0 @@
-DEBUG = false ;
-PROFILING = false ;
-STATIC = false ;
-SCHEDULER = oswald ;
-FILESYSTEM = native ;
-FSROOT = "/" ;
-BUILDROOT = "$(OROOT)/wonka/fsroot" ;
-BINDIR = "@PREFIX@/bin" ;
-LIBDIR = "@PREFIX@/lib" ;
-ETCDIR = "@PREFIX@/lib" ;
-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-aa b/lang/wonka/patches/patch-aa
deleted file mode 100644
index f2ec5e2a3c0..00000000000
--- a/lang/wonka/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/11/01 10:49:33 skrll Exp $
-
---- Configuration/cpu/arm.orig	Wed Aug 14 11:09:00 2002
-+++ Configuration/cpu/arm
-@@ -23,12 +23,12 @@
- 
- ECHO Configuring build for an arm cpu. ;
- 
--CC = arm-linux-gcc ;
--AR = arm-linux-ar ru ;
--AS = arm-linux-as ;
--RANLIB = arm-linux-ranlib ;
--LINK = arm-linux-gcc ;
-+CC = @CC@ ;
-+AR = @AR@ ru ;
-+AS = @AS@ ;
-+RANLIB = @RANLIB@ ;
-+LINK = @CC@ ;
- 
--LD_TOOL = arm-linux-ld ;
--AR_TOOL = arm-linux-ar ;
-+LD_TOOL = @LD@ ;
-+AR_TOOL = @AR@ ;
- 
diff --git a/lang/wonka/patches/patch-ab b/lang/wonka/patches/patch-ab
deleted file mode 100644
index 7fd2f093f71..00000000000
--- a/lang/wonka/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/11/01 10:49:33 skrll Exp $
-
---- Configuration/cpu/x86.orig	Wed Aug 14 11:09:00 2002
-+++ Configuration/cpu/x86
-@@ -23,11 +23,11 @@
- 
- ECHO Configuring build for an x86 cpu. ;
- 
--CC = gcc ;
--AR = ar ru ;
--AS = as ;
--RANLIB = ranlib ;
--LINK = gcc ;
--LD_TOOL = ld ;
--AR_TOOL = ar ;
-+CC = @CC@ ;
-+AR = @AR@ ru ;
-+AS = @AS@ ;
-+RANLIB = @RANLIB@ ;
-+LINK = @CC@ ;
-+LD_TOOL = @LD@ ;
-+AR_TOOL = @AR@ ;
- 
diff --git a/lang/wonka/patches/patch-ac b/lang/wonka/patches/patch-ac
deleted file mode 100644
index 56369cbd85d..00000000000
--- a/lang/wonka/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/03/10 13:07:25 skrll Exp $
-
---- tool/Jamfile.orig	2002-11-06 12:28:31.000000000 +0000
-+++ tool/Jamfile
-@@ -31,7 +31,6 @@ SubDir WONKA_TOP tools ;
- SubInclude WONKA_TOP tool crestab ;
- SubInclude WONKA_TOP tool credtab ;
- SubInclude WONKA_TOP tool files2c ;
--SubInclude WONKA_TOP tool doclet ;
- if $(TESTS) = true {
- SubInclude WONKA_TOP tool mauve ;
- }
diff --git a/lang/wonka/patches/patch-ad b/lang/wonka/patches/patch-ad
deleted file mode 100644
index 20869a5f1bb..00000000000
--- a/lang/wonka/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/11/01 10:49:33 skrll Exp $
-
---- wonka/java/wonka/vm/Init.java.orig	Wed Sep 11 09:40:29 2002
-+++ wonka/java/wonka/vm/Init.java
-@@ -288,7 +288,7 @@ final class Init implements Runnable {
-   String getStartCommProp(String arch) {
-     String arch1, arch2;
- 
--    arch1 = "linux";
-+    arch1 = "netbsd";
-     arch2 = null;
- 
-     debug("Init: looking up System property com.acunia.wonka.Init."+arch1+".start");
diff --git a/lang/wonka/patches/patch-ae b/lang/wonka/patches/patch-ae
deleted file mode 100644
index da5eb579bd7..00000000000
--- a/lang/wonka/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/07/03 11:04:42 skrll Exp $
-
---- wonka/resource/system/system.properties.orig	2003-03-19 14:12:41.000000000 +0000
-+++ wonka/resource/system/system.properties
-@@ -1,12 +1,12 @@
- # Wonka system properties file
- # 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.Init.netbsd.start=com.acunia.wonka.test.awt.VisualTestEngine
- # 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-ai b/lang/wonka/patches/patch-ai
deleted file mode 100644
index 771d199acb0..00000000000
--- a/lang/wonka/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/11/06 15:38:26 skrll Exp $
-
---- tool/visualtest/java/com/acunia/wonka/test/awt/vte.properties.orig	Thu Oct 24 15:10:07 2002
-+++ tool/visualtest/java/com/acunia/wonka/test/awt/vte.properties
-@@ -11,7 +11,7 @@ property.exitAfterAutorun = true
- 
- ! the number of minutes the autorunner will run (if 0 it won't stop)
- property.autorunTime = 240
--property.path = /test
-+property.path = @PREFIX@/test
- 
- ! property height and width allow to specify the size of the vte frame
- ! when a negative value is encountered the actual screen height/width is used.
diff --git a/lang/wonka/patches/patch-aj b/lang/wonka/patches/patch-aj
deleted file mode 100644
index 926f1ff334f..00000000000
--- a/lang/wonka/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/11/12 11:17:16 skrll Exp $
-
---- tool/mauve/java/gnu/testlet/wonka/io/DataInputOutput/ReadReference.java.orig	Wed Aug 14 12:09:03 2002
-+++ tool/mauve/java/gnu/testlet/wonka/io/DataInputOutput/ReadReference.java
-@@ -37,7 +37,7 @@ test(TestHarness harness)
- {
-   try
-     {
--      InputStream is = new FileInputStream("test/reference.data2");
-+      InputStream is = new FileInputStream("@PREFIX@/test/reference.data2");
-       DataInputStream dis = new DataInputStream(is); 
- 
-       harness.debug("Reading reference DataInput data");
diff --git a/lang/wonka/patches/patch-ak b/lang/wonka/patches/patch-ak
deleted file mode 100644
index 8661e83efd1..00000000000
--- a/lang/wonka/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/11/12 11:17:16 skrll Exp $
-
---- tool/mauve/java/gnu/testlet/wonka/io/Utf8Encoding/ReadReference.java.orig	Wed Aug 14 12:09:03 2002
-+++ tool/mauve/java/gnu/testlet/wonka/io/Utf8Encoding/ReadReference.java
-@@ -38,7 +38,7 @@ test(TestHarness harness)
- 
-   try
-     {
--      InputStream is = new FileInputStream("test/utf8test.data");
-+      InputStream is = new FileInputStream("@PREFIX@/test/utf8test.data");
-       InputStreamReader isr = new InputStreamReader(is, "UTF8");
-       char[] buf = new char[255];
- 
diff --git a/lang/wonka/patches/patch-al b/lang/wonka/patches/patch-al
deleted file mode 100644
index f2b55d55482..00000000000
--- a/lang/wonka/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/11/12 11:17:17 skrll Exp $
-
---- tool/mauve/java/gnu/testlet/wonka/lang/ClassLoader/AcuniaClassLoaderTest.java.orig	Tue Sep  3 10:07:06 2002
-+++ tool/mauve/java/gnu/testlet/wonka/lang/ClassLoader/AcuniaClassLoaderTest.java
-@@ -70,7 +70,7 @@ public class AcuniaClassLoaderTest imple
-       hm = new HashMap();
-       th.debug("start seting up ClassLoaderTest");
-       try {
--        JarFile jf = new JarFile("/test/CLTest.jar");
-+        JarFile jf = new JarFile("@PREFIX@/test/CLTest.jar");
-         Enumeration e = jf.entries();
-         while (e.hasMoreElements()){
-         	JarEntry je = (JarEntry) e.nextElement();
diff --git a/lang/wonka/patches/patch-am b/lang/wonka/patches/patch-am
deleted file mode 100644
index 7dba520c05a..00000000000
--- a/lang/wonka/patches/patch-am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/11/12 11:17:17 skrll Exp $
-
---- tool/mauve/java/gnu/testlet/wonka/util/zip/GZIPInputStream/basic.java.orig	Wed Aug 14 12:09:04 2002
-+++ tool/mauve/java/gnu/testlet/wonka/util/zip/GZIPInputStream/basic.java
-@@ -57,10 +57,10 @@ public class basic implements Testlet
-     InputStream is = null;
-     try
-       {
--	is = new FileInputStream("/test/reference.data");
-+	is = new FileInputStream("@PREFIX@/test/reference.data");
- 	plain = readall (is);
- 
--	gzin = new GZIPInputStream (new FileInputStream("/test/reference.gz"));
-+	gzin = new GZIPInputStream (new FileInputStream("@PREFIX@/test/reference.gz"));
- 	String uncompressed = readall (gzin);
- 
- 	harness.check (plain, uncompressed);
diff --git a/lang/wonka/patches/patch-an b/lang/wonka/patches/patch-an
deleted file mode 100644
index 2e022a19090..00000000000
--- a/lang/wonka/patches/patch-an
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/11/12 11:17:18 skrll Exp $
-
---- tool/mauve/java/gnu/testlet/wonkax/microedition/io/Connector/AcuniaConnectorTest.java.orig	Wed Aug 14 12:09:04 2002
-+++ tool/mauve/java/gnu/testlet/wonkax/microedition/io/Connector/AcuniaConnectorTest.java
-@@ -197,10 +197,10 @@ public class AcuniaConnectorTest impleme
- */
-   public void test_File(){
-     th.checkPoint("file");
--    String name = "/test/AcuniaConnectorTestFile";
-+    String name = "@PREFIX@/test/AcuniaConnectorTestFile";
-     String text = "This is a simple test string\n";
-     try {
--      Connection c = Connector.open("file:/system/system.properties",Connector.READ);
-+      Connection c = Connector.open("file:@PREFIX@/system/system.properties",Connector.READ);
-       th.check(c instanceof InputConnection);
-       InputConnection in = (InputConnection) c;
-       in.close();
-@@ -273,7 +273,7 @@ public class AcuniaConnectorTest impleme
-     th.checkPoint("URL");
-     try {
-       Connection c =
--        Connector.open("jar:file:/test/mauve-suite.jar!/gnu/testlet/wonkax/microedition/io/Connector/AcuniaConnectorTest.class;a=b");
-+        Connector.open("jar:file:@PREFIX@/test/mauve-suite.jar!/gnu/testlet/wonkax/microedition/io/Connector/AcuniaConnectorTest.class;a=b");
-       th.check(c instanceof ContentConnection);
-       ContentConnection cc = (ContentConnection)c;
-       InputStream in = cc.openInputStream();
diff --git a/lang/wonka/patches/patch-ao b/lang/wonka/patches/patch-ao
deleted file mode 100644
index 57e48f306fd..00000000000
--- a/lang/wonka/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2002/11/12 11:17:18 skrll Exp $
-
---- wonka/resource/system/wonka.security.orig	Mon Nov 11 14:47:53 2002
-+++ wonka/resource/system/wonka.security
-@@ -5,7 +5,7 @@ security.provider.1=com.acunia.wonka.sec
- policy.provider=com.acunia.wonka.security.DefaultPolicy
- 
- # list of url to look for policy files
--policy.url.1=file:/system/wonka.policy
-+policy.url.1=file:@PREFIX@/system/wonka.policy
- 
- # (dis)allow property expanding while parsing policy files
- policy.expandProperties=true
diff --git a/lang/wonka/patches/patch-ar b/lang/wonka/patches/patch-ar
deleted file mode 100644
index 74e168814c8..00000000000
--- a/lang/wonka/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$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 : {
diff --git a/lang/wonka/patches/patch-as b/lang/wonka/patches/patch-as
deleted file mode 100644
index 0e91b5e3619..00000000000
--- a/lang/wonka/patches/patch-as
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-as,v 1.1 2003/09/28 10:25:25 agc Exp $
-
---- tool/script/unicode.awk	2003/09/28 10:19:19	1.1
-+++ tool/script/unicode.awk	2003/09/28 10:20:03
-@@ -1295,11 +1295,11 @@
-   print  ""
-   print  "  if (to_category[try].from == ch) {"
-   print  "    woempa(7, \"Looking for %04X, found it (category %d) at %d\\n\", ch, to_category[try].to, try);"
--  print  "    woempa(7, \"Returning ``%w''\n\", category_name[to_category[try].to]);"
-+  print  "    woempa(7, \"Returning ``%w''\\n\", category_name[to_category[try].to]);"
-   print  "  }"
-   print  "  else {"
-   print  "    woempa(7, \"Looking for %04X, found %04X (%d) at %d\\n\", ch, to_category[min].from, to_category[min].to, min);"
--  print  "    woempa(7, \"Returning ``%w''\n\", category_name[to_category[min].to]);"
-+  print  "    woempa(7, \"Returning ``%w''\\n\", category_name[to_category[min].to]);"
-   print  "  }"
-   print  ""
-   print  "  return category_name[to_category[to_category[try].from == ch ? try : min].to];"
diff --git a/lang/wonka/patches/patch-at b/lang/wonka/patches/patch-at
deleted file mode 100644
index 64981d574e8..00000000000
--- a/lang/wonka/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/05/21 12:42:23 he Exp $
-
---- wonka/hal/hostos/netbsd/src/Etc.c.orig	Thu Mar 13 16:09:43 2003
-+++ wonka/hal/hostos/netbsd/src/Etc.c
-@@ -65,7 +65,7 @@ Etc_getOSVersion (JNIEnv *env, w_instanc
-   if (!uname_called) {
-     uname(&uname_buffer);
-   }
--  string = cstring2String(thread, uname_buffer.version, strlen(uname_buffer.version));
-+  string = cstring2String(thread, uname_buffer.release, strlen(uname_buffer.release));
-   result = newStringInstance(string);
-   deregisterString(string);
-