4 files changed, 113 insertions, 0 deletions
diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa
new file mode 100644
index 00000000000..27d9d0b19dc
--- /dev/null
+++ b/www/amaya/patches/patch-aa
@@ -0,0 +1,64 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/06/20 16:50:11 drochner Exp $
+
+--- ../configure.orig	Wed Apr 19 14:33:08 2000
++++ ../configure	Sat Jun 17 20:50:20 2000
+@@ -1659,57 +1659,14 @@
+   :
+ fi
+ 
+-if test "$with_included_jpeg" != "yes" ; then
+-    echo $ac_n "checking for libjpeg version = 6b""... $ac_c" 1>&6
+-echo "configure:1665: checking for libjpeg version = 6b" >&5
+-    cat > conftest.$ac_ext <<EOF
+-#line 1667 "configure"
+-#include "confdefs.h"
+-#include <jpeglib.h>
+-         x JPEG_LIB_VERSION x
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "x 62  x" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-          echo "$ac_t""yes" 1>&6
+         LIBJPEG='-ljpeg'
+         MAKEJPEG='#'
+-else
+-  rm -rf conftest*
+-          echo "$ac_t""no" 1>&6
+-        LIBJPEG='../libjpeg.a'              
+-fi
+-rm -f conftest*
++	JPEGINCL=-I${LOCALBASE}/include
+ 
+-    echo $ac_n "checking for libpng version = 1.0.1""... $ac_c" 1>&6
+-echo "configure:1686: checking for libpng version = 1.0.1" >&5
+-    cat > conftest.$ac_ext <<EOF
+-#line 1688 "configure"
+-#include "confdefs.h"
+-#include <png.h>
+-	x PNG_LIBPNG_VER_STRING x
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "x \"1.0.1\"  x" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-          echo "$ac_t""yes" 1>&6
+         LIBPNG='-lpng'
+         LIBZ=''
+ 	MAKEPNG='#'
+-else
+-  rm -rf conftest*
+-          echo "$ac_t""no" 1>&6
+-        LIBPNG='../libpng.a'
+-        LIBZ='../libz.a'
+-        
+-fi
+-rm -f conftest*
+-
+-else
+-    LIBJPEG='../libjpeg.a'
+-    LIBPNG='../libpng.a'
+-    LIBZ='../libz.a'
+-fi
++	PNGINCL=-I${LOCALBASE}/include
+ 
+ 
+ 
diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab
new file mode 100644
index 00000000000..c7704f116ff
--- /dev/null
+++ b/www/amaya/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/06/20 16:50:11 drochner Exp $
+
+--- ../thotlib/Makefile.in.orig	Sat Jun 17 21:18:05 2000
++++ ../thotlib/Makefile.in	Sat Jun 17 21:19:04 2000
+@@ -302,7 +302,7 @@
+ 	@(mkdir ../bin)
+ 
+ ../bin/print : $(THOTK_OBJ) $(DISPLAY_OBJ) $(PRINT_OBJ) ../tablelib/libThotTable.a \
+-        ../libpng.a ../libz.a ../libjpeg.a ../amaya/libCSS.a
++        ../amaya/libCSS.a
+ 	$(CC) $(LDFLAGS) -o $@ $(THOTK_OBJ) $(DISPLAY_OBJ) $(PRINT_OBJ) ../amaya/libCSS.a -lThotTable $(LIBS)
+ 	@$(ECHO) "====>" print is done
+ 
diff --git a/www/amaya/patches/patch-ac b/www/amaya/patches/patch-ac
new file mode 100644
index 00000000000..28a65916f28
--- /dev/null
+++ b/www/amaya/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/06/20 16:50:11 drochner Exp $
+
+--- ../amaya/Makefile.libwww.orig	Sat Jun 17 22:14:35 2000
++++ ../amaya/Makefile.libwww	Sat Jun 17 22:14:59 2000
+@@ -42,7 +42,7 @@
+ 		-I$(THOTDIR)../libwww/modules/md5
+ 
+ # this dependency calls the ../Makefile rule that compiles libwww
+-AMAYA_LIBWWW_SRC= ../libz.a amaya_comp_libwww
++AMAYA_LIBWWW_SRC= amaya_comp_libwww
+ 
+ amaya_comp_libwww : force
+ 		@(cd .. ; $(MAKE) libwww)
diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad
new file mode 100644
index 00000000000..95cbb70076a
--- /dev/null
+++ b/www/amaya/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/06/20 16:50:11 drochner Exp $
+
+--- ../thotlib/base/registry.c.orig	Sun Jun 18 18:07:20 2000
++++ ../thotlib/base/registry.c	Sun Jun 18 18:03:11 2000
+@@ -1597,14 +1597,16 @@
+ 	  if (c_filename[0] == DIR_SEP)
+ 	    {
+ 	      strcpy (c_execname, c_filename);
++	    }
++	  else
++	    {
+ 	      c_end = c_execname;
+ 	      while (*c_end)
+ 		c_end++; /* go to the ending NUL */
+ 	      while (c_end > c_execname && *c_end != DIR_SEP)
+ 		c_end--;
++	      strcpy (c_end + 1, c_filename);
+ 	    }
+-	  else
+-	    strcpy (c_end + 1, c_filename);
+ 	} 
+     }
+   iso2wc_strcpy (execname, c_execname);