Add some patches to fix some compile/install errors and make sure to actually

install the zip file if it's there.

4 files changed, 68 insertions, 1 deletions

diff --git a/lang/classpath/distinfo b/lang/classpath/distinfo
index eca61079354..2f5125fa5ef 100644
--- a/lang/classpath/distinfo
+++ b/lang/classpath/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/24 13:36:43 agc Exp $
+$NetBSD: distinfo,v 1.2 2003/06/25 20:50:44 jmc Exp $
 
 SHA1 (classpath-0.05.tar.gz) = e73a81c314d4dba57e9115bef3ec7f0519831d4d
 Size (classpath-0.05.tar.gz) = 6800324 bytes
+SHA1 (patch-aa) = be36bf95ddbc4a8f5b4375d0c0bdaff4d449e560
+SHA1 (patch-ab) = 4d7a67ea14930b9432acdc701514fd8f4c30d229
+SHA1 (patch-ac) = 41d86c30a1989aa28e0f73c7122168418cdbfa1e
diff --git a/lang/classpath/patches/patch-aa b/lang/classpath/patches/patch-aa
new file mode 100644
index 00000000000..f17f655646a
--- /dev/null
+++ b/lang/classpath/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2003/06/25 20:50:44 jmc Exp $
+
+--- lib/gen-classlist.sh.in.orig	Sat Feb  1 05:44:14 2003
++++ lib/gen-classlist.sh.in	Wed Jun 25 13:29:30 2003
+@@ -1,9 +1,9 @@
+ #! @SH@
+ # @configure_input@
+ if test "@top_srcdir@" = "${top_builddir}"; then
+-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/source ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
++  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/jaxp/source ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
+ else
+-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/source ${top_builddir}/java ${top_builddir}/javax ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
++  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/jaxp/source ${top_builddir}/java ${top_builddir}/javax ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
+ fi
+ 
+ for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < ${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done
diff --git a/lang/classpath/patches/patch-ab b/lang/classpath/patches/patch-ab
new file mode 100644
index 00000000000..bc28b81df00
--- /dev/null
+++ b/lang/classpath/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2003/06/25 20:50:45 jmc Exp $
+
+--- lib/Makefile.am.orig	Sat Feb  1 05:44:14 2003
++++ lib/Makefile.am	Wed Jun 25 14:56:02 2003
+@@ -45,10 +45,10 @@
+ # handling javac definition including programs like jikes here
+ #-----------------------------------------------------------------
+ if FOUND_JIKES
+-JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes
++JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes
+ else
+ if FOUND_GCJ
+-JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes
++JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes
+ else
+ if FOUND_KJC
+ JAVAC = $(USER_JABBA) $(ARG_CLASSPATH_VM) $(KJC_CLASSPATH):$(USER_CLASSLIB) $(KJC_MAIN) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes
+@@ -89,6 +89,7 @@
+ 	if ! [ -e glibj.zip ]; then cp -R java $(DESTDIR)$(pkgdatadir); fi
+ 	if ! [ -e glibj.zip ]; then cp -R javax $(DESTDIR)$(pkgdatadir); fi
+ 	if ! [ -e glibj.zip ]; then cp -R org $(DESTDIR)$(pkgdatadir); fi
++	if [ -e glibj.zip ]; then cp glibj.zip $(DESTDIR)$(pkgdatadir); fi
+ 
+ # FIXME - should mimic doc/api/Makefile.am instead...
+ uninstall-local:
diff --git a/lang/classpath/patches/patch-ac b/lang/classpath/patches/patch-ac
new file mode 100644
index 00000000000..91baac5f250
--- /dev/null
+++ b/lang/classpath/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2003/06/25 20:50:45 jmc Exp $
+
+--- lib/Makefile.in.orig	Wed Jun 25 14:55:37 2003
++++ lib/Makefile.in	Wed Jun 25 14:55:51 2003
+@@ -161,8 +161,8 @@
+ # handling javac definition including programs like jikes here
+ #-----------------------------------------------------------------
+ @FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE@@FOUND_KJC_TRUE@JAVAC = $(USER_JABBA) $(ARG_CLASSPATH_VM) $(KJC_CLASSPATH):$(USER_CLASSLIB) $(KJC_MAIN) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes
+-@FOUND_GCJ_TRUE@@FOUND_JIKES_FALSE@JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes
+-@FOUND_JIKES_TRUE@JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes
++@FOUND_GCJ_TRUE@@FOUND_JIKES_FALSE@JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes
++@FOUND_JIKES_TRUE@JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes
+ 
+ #-----------------------------------------------------------------
+ 
+@@ -357,6 +357,7 @@
+ 	if ! [ -e glibj.zip ]; then cp -R java $(DESTDIR)$(pkgdatadir); fi
+ 	if ! [ -e glibj.zip ]; then cp -R javax $(DESTDIR)$(pkgdatadir); fi
+ 	if ! [ -e glibj.zip ]; then cp -R org $(DESTDIR)$(pkgdatadir); fi
++	if [ -e glibj.zip ]; then cp glibj.zip $(DESTDIR)$(pkgdatadir); fi
+ 
+ # FIXME - should mimic doc/api/Makefile.am instead...
+ uninstall-local: