Fix-up some more file references. I should work out a proper fix for

this...

9 files changed, 124 insertions, 2 deletions

diff --git a/lang/wonka/Makefile b/lang/wonka/Makefile
index 05078067a0e..fcd75795e2a 100644
--- a/lang/wonka/Makefile
+++ b/lang/wonka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/06 15:38:25 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/12 11:17:15 skrll Exp $
 #
 
 DISTNAME=	wonka-src-0.9.4-release
@@ -24,6 +24,14 @@ NO_MTREE=	# defined, since we change PREFIX below
 WRKSRC=		${WRKDIR}/open-wonka
 
 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					\
diff --git a/lang/wonka/distinfo b/lang/wonka/distinfo
index 296f8c80110..9596953841f 100644
--- a/lang/wonka/distinfo
+++ b/lang/wonka/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/11/06 15:38:25 skrll Exp $
+$NetBSD: distinfo,v 1.3 2002/11/12 11:17:15 skrll Exp $
 
 SHA1 (wonka-src-0.9.4-release.tar.gz) = 4ddf85278f15ce88c534053c635ce632d94b5a73
 Size (wonka-src-0.9.4-release.tar.gz) = 6165841 bytes
@@ -11,3 +11,10 @@ SHA1 (patch-af) = 3cca513ef5bf53476019dab5269df5e410b2e05c
 SHA1 (patch-ag) = b0f388571958c46cefca23bfb18d9d8968e49b4a
 SHA1 (patch-ah) = 44293810568767bca0bb5c51d9f6c3941b8d7734
 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-ap) = 2a2138a91c1431b671953f7a16e1757c1a13a02c
diff --git a/lang/wonka/patches/patch-aj b/lang/wonka/patches/patch-aj
new file mode 100644
index 00000000000..926f1ff334f
--- /dev/null
+++ b/lang/wonka/patches/patch-aj
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..8661e83efd1
--- /dev/null
+++ b/lang/wonka/patches/patch-ak
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..f2b55d55482
--- /dev/null
+++ b/lang/wonka/patches/patch-al
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..7dba520c05a
--- /dev/null
+++ b/lang/wonka/patches/patch-am
@@ -0,0 +1,17 @@
+$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
new file mode 100644
index 00000000000..2e022a19090
--- /dev/null
+++ b/lang/wonka/patches/patch-an
@@ -0,0 +1,26 @@
+$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
new file mode 100644
index 00000000000..57e48f306fd
--- /dev/null
+++ b/lang/wonka/patches/patch-ao
@@ -0,0 +1,13 @@
+$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-ap b/lang/wonka/patches/patch-ap
new file mode 100644
index 00000000000..af47f006515
--- /dev/null
+++ b/lang/wonka/patches/patch-ap
@@ -0,0 +1,12 @@
+$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);