Update to 10.0.1 and add destdir support.

Changes are large and can be found at http://www.w3.org/Amaya/User/New.html.
This update also fixes an ancient security vulnerability and makes the
package build on amd64.

17 files changed, 521 insertions, 89 deletions

diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa
index 722821fd386..4a367430d5c 100644
--- a/www/amaya/patches/patch-aa
+++ b/www/amaya/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2003/03/22 06:46:20 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2008/09/11 04:22:50 dholland Exp $
 
---- ../config.h.in.orig	Thu Jan 30 10:40:15 2003
-+++ ../config.h.in
+--- ../config.h.in~	2003-01-07 09:33:07.000000000 -0500
++++ ../config.h.in	2008-09-08 04:37:57.000000000 -0400
 @@ -321,6 +321,9 @@
  /* Define if you have the <unixlib.h> header file.  */
  #undef HAVE_UNIXLIB_H
diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab
index 031fb048750..b2905920546 100644
--- a/www/amaya/patches/patch-ab
+++ b/www/amaya/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2005/07/14 08:06:58 adam Exp $
+$NetBSD: patch-ab,v 1.13 2008/09/11 04:22:50 dholland Exp $
 
---- ../configure.orig	2005-07-12 13:50:46.000000000 +0000
-+++ ../configure
-@@ -4944,7 +4944,7 @@ done
+--- ../configure.orig	2008-01-31 09:07:46.000000000 -0500
++++ ../configure	2008-09-09 20:44:33.000000000 -0400
+@@ -4939,7 +4939,7 @@ done
  
  
  
@@ -11,12 +11,37 @@ $NetBSD: patch-ab,v 1.12 2005/07/14 08:06:58 adam Exp $
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -13927,8 +13927,6 @@ if test "$with_debug" = "yes" ; then
+@@ -13574,11 +13574,11 @@ echo "$as_me: error: wxWidgets library s
+     #   --enable-unicode        compile wxString with Unicode support
+     #   --with-gtk              use GTK+
+     #   --with-opengl           use OpenGL (or Mesa)
+-    WXCONFIGURE_OPTION="--build=$build_alias --host=$host_alias --target=$target_alias --with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared  --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin  --with-libxpm=builtin $WXCONFIGURE_TUNNING_OPTION"
++    WXCONFIGURE_OPTION="--build=$build_alias --host=$host_alias --target=$target_alias --with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared  --with-libpng=sys --with-libjpeg=sys --with-libtiff=sys  --with-libxpm=sys --disable-precomp-headers $WXCONFIGURE_TUNNING_OPTION"
+   fi
+   if test "$AMAYAOS" = "MACOSX" ; then
+     # MACOSX
+-    WXCONFIGURE_OPTION="--with-opengl --disable-shared --disable-tga --enable-unicode --with-libpng=builtin --with-libjpeg=builtin"
++    WXCONFIGURE_OPTION="--with-opengl --disable-shared --disable-tga --enable-unicode --with-libpng=sys --with-libjpeg=sys --with-libtiff=sys --with-libxpm=sys"
+   fi
+   if test $with_wxdebug = yes ; then
+     WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug"
+@@ -13696,8 +13696,8 @@ if test "$with_debug" = "yes" ; then
    CXXFLAGS="-g"
  else
    with_debug="no"
 -  CFLAGS="-O2"
 -  CXXFLAGS="-O2"
++  #CFLAGS="-O2"
++  #CXXFLAGS="-O2"
  fi
  
  if test "${CC}" = "gcc" ; then
+@@ -14510,7 +14510,7 @@ if test "${VPATHOPT}" = "" ; then
+ 	VPATHOPT="VPATH"
+ fi
+ 
+-AMAYA_INSTALLDIR="Amaya"
++AMAYA_INSTALLDIR="share/Amaya"
+ 
+ 
+ 
diff --git a/www/amaya/patches/patch-ac b/www/amaya/patches/patch-ac
index 125ba90739e..c3b18561282 100644
--- a/www/amaya/patches/patch-ac
+++ b/www/amaya/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.10 2004/05/13 03:47:29 xtraeme Exp $
+$NetBSD: patch-ac,v 1.11 2008/09/11 04:22:50 dholland Exp $
 
---- ../thotlib/include/ustring.h.orig	2004-05-13 05:33:50.000000000 +0200
-+++ ../thotlib/include/ustring.h	2004-05-13 05:34:13.000000000 +0200
+--- ../thotlib/include/ustring.h~	2007-10-18 03:40:32.000000000 -0400
++++ ../thotlib/include/ustring.h	2008-09-08 04:46:10.000000000 -0400
 @@ -6,6 +6,11 @@
  #include <windows.h>
  #endif /* _WINGUI */
  
-+#include "config.h" 
-+#ifdef HAVE_WCHAR_H 
-+#include <wchar.h> 
-+#endif 
++#include "config.h"
++#ifdef HAVE_WCHAR_H
++#include <wchar.h>
++#endif
 +
  #ifdef _WINDOWS
  #define strncasecmp _strnicmp
diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad
deleted file mode 100644
index 1052fc776bf..00000000000
--- a/www/amaya/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2005/07/12 14:34:22 adam Exp $
-
---- ../Options.in.orig	2005-07-12 15:10:31.000000000 +0000
-+++ ../Options.in
-@@ -47,7 +47,7 @@ EXPAT_INCLUDES=
- EXPAT_LIBRARIES=
- EXPAT_OPTIONS=-DXML_DTD -DXML_NS
- 
--AMAYA_INSTALLDIR=Amaya-@APP_VER@
-+AMAYA_INSTALLDIR=share/Amaya
- 
- # used to identify amaya gui/os when 'make install' is called.
- AMAYAGUI=@AMAYAGUI@
diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae
index 1ac97dde403..2718a6d2e70 100644
--- a/www/amaya/patches/patch-ae
+++ b/www/amaya/patches/patch-ae
@@ -1,22 +1,13 @@
-$NetBSD: patch-ae,v 1.9 2006/04/20 22:54:53 wiz Exp $
+$NetBSD: patch-ae,v 1.10 2008/09/11 04:22:50 dholland Exp $
 
---- ../thotlib/image/pnghandler.c.orig	2005-05-31 11:50:35.000000000 +0200
-+++ ../thotlib/image/pnghandler.c
-@@ -217,8 +217,6 @@ static unsigned char *ReadPng (FILE *pfF
-     png_read_end(png_ptr, NULL);
-     TtaFreeMemory (ppbRowPointers);
-     ppbRowPointers = NULL; 
--    /* clean up after the read, and free any memory allocated */
--    png_read_destroy (png_ptr, info_ptr, (png_info*) NULL);
-     /* Free all of the memory associated with the png_ptr and info_ptr */
-     png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
-     return pixels;
-@@ -586,8 +584,6 @@ static unsigned char *ReadPng (FILE *inf
-       *bg = -1;
+--- ../thotlib/image/pnghandler.c~	2007-03-02 05:33:21.000000000 -0500
++++ ../thotlib/image/pnghandler.c	2008-09-08 04:47:23.000000000 -0400
+@@ -587,7 +587,7 @@ static unsigned char *ReadPng (FILE *inf
      }
  
--  /* clean up after the read, and free any memory allocated */
+   /* clean up after the read, and free any memory allocated */
 -  png_read_destroy (png_ptr, info_ptr, (png_info*) NULL);
++  //png_read_destroy (png_ptr, info_ptr, (png_info*) NULL);
    /* Free all of the memory associated with the png_ptr and info_ptr */
    png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
    /* free the structures */
diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af
deleted file mode 100644
index f4db67257a1..00000000000
--- a/www/amaya/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.7 2006/10/07 19:16:57 schwarz Exp $
-
---- ../thotlib/view/tesse.c.orig	2006-10-06 21:36:50.000000000 +0200
-+++ ../thotlib/view/tesse.c	2006-10-06 21:37:08.000000000 +0200
-@@ -11,7 +11,9 @@
-  */
- 
- #include <stdio.h>
-+#ifndef _MACOS
- #include <malloc.h>
-+#endif
- #include <string.h>
- 
- #ifdef _WINGUI
diff --git a/www/amaya/patches/patch-ag b/www/amaya/patches/patch-ag
index d486b8d502d..a499fb327d3 100644
--- a/www/amaya/patches/patch-ag
+++ b/www/amaya/patches/patch-ag
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.6 2006/10/07 19:16:57 schwarz Exp $
+$NetBSD: patch-ag,v 1.7 2008/09/11 04:22:50 dholland Exp $
 
---- ../tools/cextract-1.7/xtract.h.orig	2006-10-07 20:26:18.000000000 +0200
-+++ ../tools/cextract-1.7/xtract.h	2006-10-07 20:29:52.000000000 +0200
-@@ -15,7 +15,8 @@
+--- ../tools/cextract-1.7/xtract.h.orig	2005-05-30 10:21:42.000000000 -0400
++++ ../tools/cextract-1.7/xtract.h	2008-09-08 05:20:38.000000000 -0400
+@@ -15,9 +15,7 @@
  #include <stdio.h>
  #include <ctype.h>
  #include <time.h>
 -#ifdef _POSIX_SOURCE
-+#if defined(_POSIX_SOURCE) || defined(__APPLE__)
-+/* Darwin defines malloc() in stdlib.h. */
  #include <stdlib.h>
- #endif /* _POSIX_SOURCE_ */
+-#endif /* _POSIX_SOURCE_ */
  #if __STDC__ 
+ #ifndef VMS
+ #include <unistd.h>
diff --git a/www/amaya/patches/patch-ah b/www/amaya/patches/patch-ah
deleted file mode 100644
index ed7f70eddf9..00000000000
--- a/www/amaya/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2005/07/12 14:34:22 adam Exp $
-
---- ../thotlib/presentation/presvariables.c.orig	2005-06-07 13:37:13.000000000 +0000
-+++ ../thotlib/presentation/presvariables.c
-@@ -1109,8 +1109,8 @@ ThotBool NewVariable (int varNum, PtrSSc
- {
-    int                 f, l;
-    int                 i;
--   long                tod;
--   long               *pt;
-+   time_t                tod;
-+   time_t               *pt;
-    struct tm          *ptm;
-    PtrTextBuffer       isOld, isNew;
-    PtrAttribute        pA;
diff --git a/www/amaya/patches/patch-ai b/www/amaya/patches/patch-ai
index cd281c4ecd3..5c7807bd0f2 100644
--- a/www/amaya/patches/patch-ai
+++ b/www/amaya/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2006/10/07 19:16:57 schwarz Exp $
+$NetBSD: patch-ai,v 1.2 2008/09/11 04:22:50 dholland Exp $
 
---- ../amaya/Makefile.in.orig	2006-10-07 20:38:11.000000000 +0200
-+++ ../amaya/Makefile.in	2006-10-07 20:38:40.000000000 +0200
-@@ -615,7 +615,7 @@
- 	fi)
+--- ../batch/script_install_macosxbundle.in~	2007-03-29 09:24:04.000000000 -0400
++++ ../batch/script_install_macosxbundle.in	2008-09-08 04:50:37.000000000 -0400
+@@ -44,7 +44,7 @@ fi
+ $ECHO "-- Creating a MacOSX bundle for $AMAYA_INSTALLDIR into $PREFIX/Amaya.app --"
  
  # MACOSX bundelization
--	@(if test $(AMAYAOS) = "MACOSX" ; then \
-+	@(if test $(AMAYAOS) = "XXXXXX" ; then \
- 			$(RM) -r $(prefix)/Amaya.app ; \
- 			$(MKDIR) $(prefix)/Amaya.app ; \
- 			$(MKDIR) $(prefix)/Amaya.app/Contents ; \
+-if test $AMAYAOS = "MACOSX" ; then
++if test $AMAYAOS = "XXXXXX" ; then
+   $RM -r $PREFIX/Amaya.app
+   $MKDIR $PREFIX/Amaya.app
+   $MKDIR $PREFIX/Amaya.app/Contents
diff --git a/www/amaya/patches/patch-aj b/www/amaya/patches/patch-aj
new file mode 100644
index 00000000000..265221766b2
--- /dev/null
+++ b/www/amaya/patches/patch-aj
@@ -0,0 +1,208 @@
+$NetBSD: patch-aj,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../Makefile.in.orig	2007-12-06 08:09:56.000000000 -0500
++++ ../Makefile.in	2008-09-08 14:19:26.000000000 -0400
+@@ -37,44 +37,44 @@ force :
+ 
+ batch: rebuild force
+ 	@(if test -d batch ; then cd batch ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" ; fi)
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" ; fi) || exit 1
+ 
+ tools: rebuild force
+ 	@(if test -d tools ; then cd tools ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi)
++	  $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi) || exit 1
+ 
+ thotlib: rebuild force
+ 	@(if test -d thotlib ; then cd thotlib ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi)
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi) || exit 1
+ 
+ amaya_prog: rebuild force bin/str
+ 	@(if test -d amaya ; then cd amaya ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" amaya ; fi)
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" amaya ; fi) || exit 1
+ 
+ wxwidgets: rebuild force
+ 	@(if test -d "$(WX_BUILDDIR)" ; then cd "$(WX_BUILDDIR)" ; \
+-	  $(MAKE) ; fi)
++	  $(MAKE) ; fi) || exit 1
+ 
+ gl: rebuild force
+ 	@(if test -d "$(GL_BUILDDIR)" ; then cd "$(GL_BUILDDIR)" ; \
+-	  $(MAKE) ; fi)
++	  $(MAKE) ; fi) || exit 1
+ 
+ print_prog: rebuild force bin/str
+ 	@(if test -d thotlib ; then cd thotlib ; \
+-  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi)
++  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi) || exit 1
+ 
+ all : rebuild
+ 	@(for dir in $(EXTRA_SUBDIRS) $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ clean : rebuild
+ 	$(RM) libpng.a libz.a libjpeg.a
+ 	@(for dir in $(SUBDIRS) $(EXTRA_SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" clean ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" clean || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ reallyclean : clean
+ 	$(RM) config.cache config.h config.log config.status
+@@ -87,14 +87,14 @@ tempclean : 
+ install : rebuild
+ 	@(for dir in $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" install ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" install || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ uninstall : 
+ 	@(for dir in $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" uninstall ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" uninstall || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ update :
+ 	@(cd $(THOTDIR) ; cvs update -dP)
+@@ -105,26 +105,26 @@ commit :
+ 	@(cd $(THOTDIR) ; cvs commit)
+ 
+ tools/mkdep/mkdep :
+-	@(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" mkdep)
++	@(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" mkdep) || exit 1
+ 
+ depend depends : rebuild tools/mkdep/mkdep
+ 	@(for dir in $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" depend ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" depend || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ bin/cextract :
+-	@(cd tools/cextract-$(CEXTRACT_VER) ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" cextract)
++	@(cd tools/cextract-$(CEXTRACT_VER) ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" cextract) || exit 1
+ 
+ proto : rebuild bin/cextract
+ 	@(for dir in $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" proto ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" proto || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ mkid : 
+ 	@(echo rebuilding $(THOTDIR)/ID reference file)
+-	@(cd $(THOTDIR); mkid --lang-map=makes/id-lang.map . classes/org/w3c/*)
++	@(cd $(THOTDIR); mkid --lang-map=makes/id-lang.map . classes/org/w3c/*) || exit 1
+ 
+ #
+ # Rules to rebuild the libWWW package
+@@ -150,11 +150,11 @@ AMAYA_LIBWWW_STANDARD_LIBS = \
+ 
+ libwww_config :
+ 	@(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \
+-	      $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; \
+-	  fi)
++	      $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; exit 1; \
++	  fi) || exit 1
+ 	@(if [ ! -d $(LIBWWW) ] ; then \
+ 		$(MKDIR) $(LIBWWW) ; \
+-          fi)
++          fi) || exit 1
+ #MKP: adding --with-dav
+ 	@(localdir=`pwd` ; libwwwdir="$$localdir/../../$(LIBWWW)" ; \
+ 	  cd $(LIBWWW) ; unset LANG; \
+@@ -170,7 +170,7 @@ libwww_config :
+ 		$(SED) "s/\(\#define HAVE_APPKIT_APPKIT_H 1\)/\/* \1 *\//" \
+ 			wwwconf.h.orig > wwwconf.h ; \
+                 $(ECHO) "wwwconf.h patched !" ; \
+-	  fi)
++	  fi) || exit 1
+ 
+ libwww_make_module_md5 \
+ libmd5 : force
+@@ -178,7 +178,7 @@ libmd5 : force
+ 		 cd $(LIBWWW)/modules/md5 ; \
+ 		 $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
+ 		 CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
+-	        	    libmd5.la)
++	        	    libmd5.la) || exit 1
+ 
+ libwww_install_module_md5 : force
+ 		@(if [ -e libmd5.a -a ! -L libmd5.a ] ; then \
+@@ -194,7 +194,7 @@ libexpat : force
+ 		  cd $(LIBWWW)/modules/expat/ ; \
+ 		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
+ 		  CPPFLAGS="$(CPPFLAGS)" \
+-	        	    )
++	        	    ) || exit 1
+ 
+ libwww_install_module_expat : force
+ 		@(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \
+@@ -230,7 +230,7 @@ $(AMAYA_LIBWWW_STANDARD_LIBS) : force
+ 		  cd $(LIBWWW)/Library/src ; \
+ 		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
+ 		  CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
+-			     $$all_libs)
++			     $$all_libs) || exit 1
+ 
+ libwww_install_standard : force
+ 		@(for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
+@@ -299,7 +299,7 @@ redland_config: @MAKEREDLAND@ force
+ redland_make: @MAKEREDLAND@ force
+ 	@(cd $(REDLAND) ; \
+ 	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -DLIBRDF_INTERNAL=1"; \
+-	)
++	) || exit 1
+ 
+ redland: @MAKEREDLAND@ redland_config redland_make
+ 	@($(ECHO) "redland is installed")
+@@ -308,25 +308,25 @@ redland: @MAKEREDLAND@ redland_config re
+ # Rules to rebuild the libjpeg package
+ #
+ 
+-libjpeg libjpeg.a : force
+-	@($(RM) $(THOTDIR)/libjpeg/*.o)
+-	@(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#libjpeg libjpeg.a : force
++#	@($(RM) $(THOTDIR)/libjpeg/*.o)
++#	@(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1
+ 
+ #
+ # Rules to rebuild the libpng package
+ #
+ 
+-libpng libpng.a : force
+-	@($(RM) $(THOTDIR)/libpng/*.o)
+-	@(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#libpng libpng.a : force
++#	@($(RM) $(THOTDIR)/libpng/*.o)
++#	@(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1
+ 
+ #
+ # Rules to rebuild the libpng package
+ #
+ 
+-libz libz.a : force
+-	@($(RM) $(THOTDIR)/libpng/libz/*.o)
+-	@(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#libz libz.a : force
++#	@($(RM) $(THOTDIR)/libpng/libz/*.o)
++#	@(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1
+ 
+ #
+ # This section try to maintain the Makefile(s) up-to-date in
diff --git a/www/amaya/patches/patch-ak b/www/amaya/patches/patch-ak
new file mode 100644
index 00000000000..0dc0ef4ee68
--- /dev/null
+++ b/www/amaya/patches/patch-ak
@@ -0,0 +1,43 @@
+$NetBSD: patch-ak,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../amaya/Makefile.in.orig	2008-02-05 05:31:51.000000000 -0500
++++ ../amaya/Makefile.in	2008-09-08 15:33:36.000000000 -0400
+@@ -17,7 +17,7 @@ INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUD
+ LIBS	=  $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) \
+ 	   @AMAYA_RAPTOR_LIBS@ \
+ 	   $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \
+-           -L../thotlib -L.. -lThotEditor \
++           ../thotlib/libThotEditor.a \
+           $(AMAYA_OPTION_EXTRA_LIBS) $(IMGLIBS) $(EXPAT_LIBRARIES) \
+ 	  $(AMAYA_LIBWWW_LIBS) \
+ 	  @LIBS@ $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \
+@@ -73,14 +73,14 @@ force :
+ ../thotlib/libThotEditor.a : force
+ 	@(cd ../thotlib ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" libThotEditor)
+ 
+-../libjpeg.a : @MAKEJPEG@ force
+-	@(cd ../libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#../libjpeg.a : @MAKEJPEG@ force
++#	@(cd ../libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+ 
+-../libpng.a : @MAKEPNG@ force
+-	@(cd ../libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#../libpng.a : @MAKEPNG@ force
++#	@(cd ../libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+ 
+-../libz.a : @MAKEPNG@ force
+-	@(cd ../libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#../libz.a : @MAKEPNG@ force
++#	@(cd ../libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+ 
+ ../tools/mkdep/mkdep : 
+ 	@(cd ../tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+@@ -169,7 +169,7 @@ AMAYA_LIBS= ../thotlib/libThotEditor.a \
+             libCSS.a $(AMAYA_OPTION_LIBS) \
+              $(WX_LINKDEPS)
+ 
+-HTML2THOT_LIBS= -L../thotlib/ -lThotKernel -L.. -lz
++HTML2THOT_LIBS= ../thotlib/libThotKernel.a -lz
+ 
+ amaya_schemas : compHTML compHTMLP compHTMLT compTextFile  compTextFileP compTextFileT compXLink compXLinkP compXLinkT compXML compXMLP compXMLT compHTMLA compTextFileA compXLinkA compXMLA $(svg_schema) $(math_schema) $(annot_schema) compEDITORA $(template_schema)
+ 
diff --git a/www/amaya/patches/patch-al b/www/amaya/patches/patch-al
new file mode 100644
index 00000000000..afcdb2126a1
--- /dev/null
+++ b/www/amaya/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../tools/cextract-1.7/io.c~	2005-05-30 10:21:55.000000000 -0400
++++ ../tools/cextract-1.7/io.c	2008-09-08 05:30:58.000000000 -0400
+@@ -2224,7 +2224,7 @@ do_config ()
+ char *
+ mach_time ()
+ {
+-  long timeval;
++  time_t timeval;
+ 
+   timeval = time(0);
+   return(ctime(&timeval));
diff --git a/www/amaya/patches/patch-am b/www/amaya/patches/patch-am
new file mode 100644
index 00000000000..b8149b7f19f
--- /dev/null
+++ b/www/amaya/patches/patch-am
@@ -0,0 +1,30 @@
+$NetBSD: patch-am,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../thotlib/base/testcase.c~	2007-04-25 03:25:54.000000000 -0400
++++ ../thotlib/base/testcase.c	2008-09-08 05:34:11.000000000 -0400
+@@ -208,9 +208,9 @@ void TtaStopBenchmarkTimer( int bench_id
+   FILE *fp = g_benchmark_timer[bench_id].fp;
+   if (fp)
+     {
+-      fprintf (fp, "[%s] Stop timer\tElapsed time=%ld ms.\n",
++      fprintf (fp, "[%s] Stop timer\tElapsed time=%u ms.\n",
+ 	       g_benchmark_timer[bench_id].name,
+-	       (g_benchmark_timer[bench_id].time-g_benchmark_timer[bench_id].start_time)/(CLOCKS_PER_SEC/1000));
++	       (g_benchmark_timer[bench_id].time-g_benchmark_timer[bench_id].start_time)*1000/CLOCKS_PER_SEC);
+       TtaWriteClose(fp);
+     }
+ 
+@@ -236,10 +236,10 @@ void TtaSetBenchmarkMark( int bench_id, 
+   FILE *fp = g_benchmark_timer[bench_id].fp;
+   if (fp)
+     {
+-      fprintf (fp, "[%s] %s\tElapsed time=%ld ms\tDelta time=%ld ms.\n",
++      fprintf (fp, "[%s] %s\tElapsed time=%u ms\tDelta time=%u ms.\n",
+ 	       g_benchmark_timer[bench_id].name,
+ 	       mark_name,
+-	       (g_benchmark_timer[bench_id].time-g_benchmark_timer[bench_id].start_time)/(CLOCKS_PER_SEC/1000),
+-	       (g_benchmark_timer[bench_id].time-last_time)/(CLOCKS_PER_SEC/1000));
++	       (g_benchmark_timer[bench_id].time-g_benchmark_timer[bench_id].start_time)*1000/CLOCKS_PER_SEC,
++	       (g_benchmark_timer[bench_id].time-last_time)*1000/CLOCKS_PER_SEC);
+     }
+ }
diff --git a/www/amaya/patches/patch-an b/www/amaya/patches/patch-an
new file mode 100644
index 00000000000..ffa38395d3a
--- /dev/null
+++ b/www/amaya/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../thotlib/unicode/ustring.c~	2007-10-18 03:40:32.000000000 -0400
++++ ../thotlib/unicode/ustring.c	2008-09-08 05:37:01.000000000 -0400
+@@ -437,7 +437,7 @@ CHARSET TtaGetLocaleCharset ()
+   if (LocaleSystemCharset == UNSUPPORTED_CHARSET)
+     {
+       char *buffer;
+-      buffer = nl_langinfo(_NL_MESSAGES_CODESET);
++      buffer = nl_langinfo(CODESET);
+       if (buffer != NULL)
+         LocaleSystemCharset = TtaGetCharset(buffer);
+     }
diff --git a/www/amaya/patches/patch-ao b/www/amaya/patches/patch-ao
new file mode 100644
index 00000000000..17c5a04ebb2
--- /dev/null
+++ b/www/amaya/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../thotlib/base/structlist.c~	2008-01-21 06:24:18.000000000 -0500
++++ ../thotlib/base/structlist.c	2008-09-08 05:45:32.000000000 -0400
+@@ -577,7 +577,7 @@ static void WrTree (PtrElement pNode, in
+               switch (pAttr1->AttrType)
+                 {
+                 case AtNumAttr:
+-                  fprintf (fileDescriptor, "%d", pAttr->AeAttrValue);
++                  fprintf (fileDescriptor, "%lld", (long long) pAttr->AeAttrValue);
+                   break;
+                 case AtTextAttr:
+                   if (pAttr->AeAttrText)
diff --git a/www/amaya/patches/patch-ap b/www/amaya/patches/patch-ap
new file mode 100644
index 00000000000..4d3543350ed
--- /dev/null
+++ b/www/amaya/patches/patch-ap
@@ -0,0 +1,125 @@
+$NetBSD: patch-ap,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../../wxWidgets/configure.orig	2007-05-14 05:08:25.000000000 -0400
++++ ../../wxWidgets/configure	2008-09-08 06:27:09.000000000 -0400
+@@ -23470,43 +23470,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ SEARCH_INCLUDE="\
+-    /usr/local/include        \
+-                              \
+-    /usr/Motif-2.1/include    \
+-    /usr/Motif-1.2/include    \
+-    /usr/include/Motif1.2     \
+-                              \
+-    /usr/dt/include           \
+-    /usr/openwin/include      \
+-                              \
+-    /usr/include/Xm           \
+-                              \
+-    /usr/X11R6/include        \
+-    /usr/X11R6.4/include      \
+-    /usr/X11R5/include        \
+-    /usr/X11R4/include        \
+-                              \
+-    /usr/include/X11R6        \
+-    /usr/include/X11R5        \
+-    /usr/include/X11R4        \
+-                              \
+-    /usr/local/X11R6/include  \
+-    /usr/local/X11R5/include  \
+-    /usr/local/X11R4/include  \
+-                              \
+-    /usr/local/include/X11R6  \
+-    /usr/local/include/X11R5  \
+-    /usr/local/include/X11R4  \
+-                              \
+-    /usr/X11/include          \
+-    /usr/include/X11          \
+-    /usr/local/X11/include    \
+-    /usr/local/include/X11    \
+-                              \
+-    /usr/XFree86/include/X11  \
+-    /usr/pkg/include          \
+-                              \
+-    /usr/openwin/share/include"
++    ${BUILDLINK_DIR}/include  \
++"
+ 
+ echo "$as_me:$LINENO: checking for libraries directory" >&5
+ echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
+@@ -23596,16 +23561,16 @@ esac
+ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
+ echo "${ECHO_T}$wx_cv_std_libpath" >&6
+ 
+-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
++SEARCH_LIB="${BUILDLINK_DIR}/lib"
+ 
+ if test "$build" != "$host" -a "$GCC" = yes; then
+                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+         cross_root=`dirname $cross_root`
+         cross_root=`dirname $cross_root`
+ 
+-                        SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+-        SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+-        SEARCH_INCLUDE="$SEARCH_INCLUDE $cross_root/include"
++#                        SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
++#        SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
++#        SEARCH_INCLUDE="$SEARCH_INCLUDE $cross_root/include"
+ 
+                 if test -z "$PKG_CONFIG_PATH"; then
+             PKG_CONFIG_PATH="$cross_root/local/lib/pkgconfig:$cross_root/lib/pkgconfig"
+@@ -23615,7 +23580,7 @@ if test "$build" != "$host" -a "$GCC" = 
+                                 if test -z "$x_includes" -o "$x_includes" = NONE; then
+ 
+ ac_find_includes=
+-for ac_dir in $SEARCH_INCLUDE /usr/include;
++for ac_dir in $SEARCH_INCLUDE;
+   do
+     if test -f "$ac_dir/X11/Intrinsic.h"; then
+       ac_find_includes=$ac_dir
+@@ -30134,7 +30099,7 @@ echo "$as_me: error: Unicode configurati
+ echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6
+ 
+ ac_find_includes=
+-for ac_dir in $SEARCH_INCLUDE /usr/include;
++for ac_dir in $SEARCH_INCLUDE;
+   do
+     if test -f "$ac_dir/Xm/Xm.h"; then
+       ac_find_includes=$ac_dir
+@@ -31685,7 +31650,7 @@ echo "$as_me: WARNING: wxGLCanvas not im
+ echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6
+ 
+ ac_find_includes=
+-for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include;
++for ac_dir in $SEARCH_INCLUDE;
+   do
+     if test -f "$ac_dir/GL/gl.h"; then
+       ac_find_includes=$ac_dir
+@@ -31908,7 +31873,7 @@ if test $ac_cv_header_GL_glu_h = yes; th
+ echo $ECHO_N "checking for -lGL... $ECHO_C" >&6
+ 
+   ac_find_libraries=
+-  for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib;
++  for ac_dir in $SEARCH_LIB;
+   do
+     for ac_extension in a so sl dylib dll.a; do
+       if test -f "$ac_dir/libGL.$ac_extension"; then
+@@ -45541,7 +45506,7 @@ fi
+ 
+ if test "$wxUSE_MAC" = 1 ; then
+     if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
+-                        if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
++                        if test "x$wxUSE_UNIVERSAL_BINARY" = xyes; then
+             OSX_UNIV_OPTS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+         else
+                                     OSX_UNIV_OPTS=${wxUSE_UNIVERSAL_BINARY:+"-isysroot '$wxUSE_UNIVERSAL_BINARY'"}
+@@ -46566,7 +46531,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
+             SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+         fi
+ 
+-        if test "x$GCC" == "xyes"; then
++        if test "x$GCC" = "xyes"; then
+             PIC_FLAG="-dynamic -fPIC"
+         fi
+         if test "x$XLCC" = "xyes"; then
diff --git a/www/amaya/patches/patch-aq b/www/amaya/patches/patch-aq
new file mode 100644
index 00000000000..25f36492dda
--- /dev/null
+++ b/www/amaya/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../batch/Makefile.in~	2006-11-13 07:24:16.000000000 -0500
++++ ../batch/Makefile.in	2008-09-08 07:32:38.000000000 -0400
+@@ -11,7 +11,7 @@ THOTDIR = @top_srcdir@
+ 
+ include ../Options
+ 
+-LIBS	= -L../thotlib/ -lThotKernel -lz @LIBS@ $(WX_LIBRARIES)
++LIBS	= ../thotlib/libThotKernel.a -lz @LIBS@ $(WX_LIBRARIES)
+ INCLUDES= -DHAVE_CONFIG_H -I.. -I@srcdir@/f @THOTINCLUDES@ $(GUI_INCLUDES)
+ 
+ prefix = @prefix@