update to 4.2.1

From the changelog:
                            Amaya 4.2.1

   22 December, 2000

Bug fixes

     * The Docttype was not generated for HTML documents after
       creation of a new HTML element.
     * Doing  a  transformation  on  an  HTML document crashed
       Amaya without saving the edited document.

                             Amaya 4.2

   21 December, 2000

New features

     * Amaya  is  now able to read and save UTF8 documents but
       it's   only  able  to  display  ASCII  and  ISO-latin-1
       characters  and  some  mathematical  symbols. For other
       characters  it keeps the Unicode value of the character
       and  displays  a '?'. When an encoding is not supported
       by Amaya, the document is not parsed.
     * MathML:   attributes   rowalign   and  columnalign  are
       interpreted.
     * MathML   2.0:  new  attributes  mathvariant,  mathsize,
       mathcolor, mathbackground, linebreak
     * Annotations:  new  configuration  options for disabling
       the  automatic download of local and remote annotations
       each  time  Amaya  is  started for users who frequently
       work  without network access. Note that this new option
       is  enabled  by  default; users who prefer the previous
       behavior  of  always  querying  annotation  servers can
       select  that behavior from the Annotations/Configure...
       dialog  by  unchecking  the 'Disable remote autoload at
       each startup' and checking the two 'Autoload' boxes.

Bug fixes

     * Annotations:  Annotations  didn't  work  under Windows,
       when Amaya was installed in a directory with a space on
       its  name (e.g., Program Files). Similarly, annotations
       on  local  documents  didn't  work  if the path to this
       document had a space.
     * After  doing a form POST, Amaya always proposed to save
       the  answer  sent  back by the server, even if it could
       understand  its content type (bug introduced in the 4.0
       version).
     * Since  version  4.1,  it's  possible to change the user
       preferences  directory by setting the APP_HOME variable
       in  the win-thot.rc file. However, the user preferences
       were still being read from the default location.
     * After a crash, modified documents with a space in their
       name were not restored.
     * When  Amaya  crashed  during a text insertion, the last
       inserted text was lost.
     * Configure   failed  to  read  the  version  numbers  in
       /usr/include/libjpeg.h  and  /usr/include/png.h (thanks
       to Patrik Hagglund).
     * Updating of German and Italian translations.
     * Contribution   from   Johannes   Zellner  for  enabling
       tear-off menus on Unix platforms.
     * The command Save As added the suffix ".html" to SVG and
       MathML documents.
     * Amaya  was sometimes confusing MathML and SVG elements:
       Schema  ids  were  based  on  the  compiling  time  (in
       seconds)  and  Amaya  used  ids  to  detect whether two
       elements  belong to the same schema or not. That method
       doesn't  work  with  computers that are able to compile
       more  than  one  schema  per  second. Now, Amaya checks
       schema names instead of schema ids.
     * Selection:   When   the   hyphanation  was  active  the
       selection didn't work correctly.
     * Print:  The  command  Print  crashed  when the document
       included XLink attributes.
     * Print:  In  some cases Amaya hanged during the printing
       or generated too short pages.
     * Windows: The dialogue Underline didn't work correctly.
     * Windows:  Improving drawing functions and a part of the
       program print.
     * SVG:  CSS  rules  of  the  SVG  element  style were not
       interpreted when printing.
     * SVG:  Images can be created and edited freely within an
       SVG drawing
     * SVG: When changing the xlink:href attribute of elements
       image  and  use  in SVG, those elements are redisplayed
       according to the new value of the attribute.
     * SVG:  When  the  user created a mathematical expression
       into  a  SVG, the math element was displayed before the
       user selected a position. This was confusing.
     * HTML:  Amaya  hanged  when  the  META  Content-Type was
       quoted by simple quotes.

                             Amaya 4.1

   23 November, 2000

New features

     * Annotations: localization of the Local Filter menu.
     * Windows:  It's  now possible to change the value of the
       user's  preferences  directory.  To  do  so,  edit  the
       win-thot.rc  and  add a variable called APP_HOME in the
       [amaya]  section.  The value of this variable should be
       the  path to directory. This is interesting if you want
       to  install Amaya in an NFS drive, but store the user's
       preferences locally.
     * When the encoding of a XML document is not set, it uses
       the  default  enconding  (UTF 8). This version of Amaya
       doesn't  handle  UTF  8  and this document shouldn't be
       edited  with  Amaya.  In  many  cases  these  documents
       contain  only  ASCII  characters and can be interperted
       correctly  as  ISOlatin-1encoded  documents.  It is why
       Amaya  proposes to set the ISOlatin-1encoding when it's
       not found.

Bug fixes

     * Open  the  Log  file and close it. Then open the source
       view and close it: all other wiews of that document are
       also closed
     * The  entry  "Show parsing errors" (previously "Show Log
       file") is now located in the Views menu
     * Amaya  didn't find out the encoding when it is given by
       a META element. It works now.
     * When  saving a HTML document as XML a wrong DOCTYPE was
       generated: it said the document was HTML 4.0 whereas it
       was XHTML 1.0 actually.
     * In  a  XHTML  document, if you copy and paste an anchor
       with  both  a  name  and  an id, the name of the pasted
       element was changed to make it unique, but not the id.
     * The   MakeBook  command  didn't  work  well  on  remote
       documents that included images and could crash Amaya.
     * The  default  Windows  geometry  was too small for some
       views and documents.
     * Spell  checker: some options didn't reflect the current
       value.  The  special  characters  entry  wasn't working
       under Windows.
     * MathML:  entity  LeftAngleBracket was not recognized by
       the parser
     * MathML:  the entity InvisibleTimes was displayed with a
       too large space on Windows platforms.
     * SVG:  element style is now recognized and the CSS rules
       it contains are applied as expected.
     * SVG: element use is recognized and handled correctly
     * SVG:  comments  and PIs were not displayed correctly in
       the structure view
     * SVG:  text  elements  were  displayed a bit below their
       normal position
     * SVG:  in some cases polylines and polygons were resized
       by mistake
     * SVG:  when  printing the background of the whole SVG or
       group was painted if there was a CSS rule fill
     * SVG:  elements  are  now created with the right default
       colors (fill=black, stroke=none).
     * Annotations:   the  Annotation  element  (pencil  icon)
       wasn't being skipped always when resolving an XPointer.
       This  problem  could  occur  with  orphan  and document
       annotations.
     * Annotations:   ID  attributes  were  not  always  being
       searched correctly in the document's tree.
     * Annotations:   The   Windows  annotations  project  was
       missing from the source tar package.

                             Amaya 4.0

   10 November, 2000

New features

     * Support for a subset of the SVG graphics format, namely
       basic  shapes,  text,  images,  and  foreignObject (the
       later  is  useful  to  include HTML fragments or MathML
       expressions in drawings).
     * Support for native MathML and SVG documents.
     * Support  for  collaborative  annotations, based on RDF,
       XPointer, and XLink..
     * A  single  structure  view  displays  the  structure of
       equations   and   drawings   along  with  the  document
       structure.
     * Generates XHTML document with the right charset.
     * Three  new  profiles: XHTML-transitional, XHTML-strict,
       XHTML-basic. In these profiles, Amaya checks the validy
       of  the  (X)HTML  documents it loads, and it allows the
       user   to   create   only   elements   and   attributes
       corresponding to the chosen profile.
     * MathML:  attributes  macros,  display, overflow, altimg
       and  alttext  are  now available for the top-level math
       element. Attribute alttext is rendered in the Alternate
       view.  Attribute  linethickness  allows  to control the
       aspect of fraction bars.
       Many improvements to math formatting.
       Keys  ->  and <- move the caret according to the MathML
       structure.
     * Upgraded libwww to release 5.3.1
     * Added  the  HTTP  reason  string  to the the save error
       dialog box.
     * Spanish  translation of the Amaya dialogues contributed
       by Pedro Pablo Fabrega
     * The  inline  documentation  is  now available in French
       (other translations are welcome).
     * New  menu  (Special/Create Remove IDs) to add or remove
       ID  attributes  to/from  elements,  either  globally or
       within a selection.
     * Searching is case insensitive by default.
     * The  dialog  box  of link creation allows you to browse
       local files.
     * When  the selection is within a link (an anchor with an
       attribute  href),  the  status line displays the URI of
       the target.
     * The  geometry  of  windows  is now expressed in pixels.
       Users   may   have   to   update   their  configuration
       (Special/Preferences/Window Geometry menu).

Bug fixes

     * When  the selected OPTION in a SELECT within a FORM had
       no content and no value attribute, the value posted for
       the SELECT element was some random garbage.
     * Amaya  hung  when  reading  a  textarea with an initial
       value.
     * When  converting  a  document from HTML to XHTML, Amaya
       did  not  check whether the id's it created were valid.
       For instance, it generated id's starting with a digit.
     * The charset given in the XML declaration was ignored by
       Amaya.
     * 24  bits per pixel images were not handled correctly on
       Unix platforms (thanks to Walter Bächi)
     * Saving a document source crashed Amaya when it followed
       an aborted closing of that document source.
     * When  the  BODY  element  of  an  (X)HTML  document  is
       selected,  command  Delete is no longer refused: it let
       you with an empty BODY element.
     * When  a  background  image is not repeated, Amaya takes
       into  account  the  transparency  now (Unix and Windows
       platforms).
     * After  a synchronisation Amaya considered that both the
       source view and the formatted view should be saved. Now
       the  user  can  decide to save either the source or the
       formatted view but only one of them.
     * The text editing is now more robust.
     * When  browsing a remote URL, Amaya systematically added
       a "/" end character to the URL if the URL didn't finish
       by an extension.
     * It  was  hard  to  create  an  area Polygon because the
       selection hid the associated image.
     * When  a  paragraph  with  a top margin was reformatted,
       included  lines (excepted the last one) were shifted by
       error.
     * In the Structure view, an anchor repeated the attribute
       ID of its parent.
     * Opening  an image that didn' have an extension resulted
       in a crash.

   Windows bugs
     * The  menu Background Image on Windows platforms crashed
       Amaya.
     * On  Windows  platforms,  sometimes Amaya didn't display
       background images correctly.
     * Some  colors  (like  border  colors) were not correctly
       displayed on Windows platforms.
     * Each  time  the  user clicked on the button Math, a new
       Math  palette  was  generated,  now only one palette is
       displayed.
     * It was the same for the dialogue Search/Replace.
     * When  all  entries  of  a  submenu  were  hidden in the
       current profile, the submenu entry was not removed. Now
       it works like on Unix platforms.
     * Troubles   after  a  cancel  of  the  operation  "Close
       Dcument".

10 files changed, 172 insertions, 98 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index cb622e9d61f..0abbf5dfd11 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2000/10/06 14:04:07 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/14 12:31:10 drochner Exp $
 #
 
-DISTNAME=	amaya-src-3.1
-PKGNAME=	amaya-3.1
+DISTNAME=	amaya-src-4.2.1
+PKGNAME=	amaya-4.2.1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.w3.org/pub/amaya/
 EXTRACT_SUFX=	.tgz
@@ -18,12 +18,16 @@ CONFIGURE_ENV+=	MOTIFBASE=${MOTIFBASE}
 CFLAGS+=	-Dunix
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png>=1.0.1:../../graphics/png
+# our libpng is too new (png_read_init() removal)
+#DEPENDS+=	png-1.0.*:../../graphics/png
 
 USE_MOTIF=	yes
 USE_GMAKE=	yes
 
 post-extract:
 	${MKDIR} ${WRKSRC}
+	${RM} -rf ${WRKDIR}/Amaya/libjpeg 
+	${RM} -rf ${WRKDIR}/Amaya/libpng/zlib
+#	${RM} -rf ${WRKDIR}/Amaya/libpng
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/amaya/files/md5 b/www/amaya/files/md5
index d592febd5fa..aac494e7a5d 100644
--- a/www/amaya/files/md5
+++ b/www/amaya/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/06/20 16:50:10 drochner Exp $
+$NetBSD: md5,v 1.2 2001/01/14 12:31:11 drochner Exp $
 
-MD5 (amaya-src-3.1.tgz) = ee9cf1219c471eff5ac8403bc575312c
+MD5 (amaya-src-4.2.1.tgz) = 2d8af7c6e76544bb92f22abd5c589d86
diff --git a/www/amaya/files/patch-sum b/www/amaya/files/patch-sum
index eef7fa63e48..d768571f0da 100644
--- a/www/amaya/files/patch-sum
+++ b/www/amaya/files/patch-sum
@@ -1,8 +1,7 @@
-$NetBSD: patch-sum,v 1.3 2000/10/06 14:06:46 agc Exp $
+$NetBSD: patch-sum,v 1.4 2001/01/14 12:31:11 drochner Exp $
 
-MD5 (patch-aa) = bae94d9202937bfb404ed16327f1ce14
-MD5 (patch-ab) = 81059d037ca460259df1bbaca70a4c5d
-MD5 (patch-ac) = 2f4734dcce017cf9486c0b2df3d388a3
-MD5 (patch-ad) = 45df852941943d3ec5060ad1bf35a519
-MD5 (patch-ae) = 8141ce7895ddbaf0ee7ff760820567a7
+MD5 (patch-aa) = 2fd412b0e1e4c576e6ac285e8a4a5cfb
+MD5 (patch-ab) = 4560550206a0d54188ec1112979725c2
+MD5 (patch-ac) = 30c3d00148c1bc45dc6e8b5cce0fcb85
 MD5 (patch-af) = 0356628158e3a974b7e6529d32be22ed
+MD5 (patch-ag) = 9703c6645bea3229261a5e6a47ab41b7
diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa
index 26be4f7e21f..bb5f5361e87 100644
--- a/www/amaya/patches/patch-aa
+++ b/www/amaya/patches/patch-aa
@@ -1,22 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2000/10/06 14:05:50 agc Exp $
-
---- ../configure.orig	Wed Apr 19 14:33:08 2000
-+++ ../configure	Sat Jun 17 20:50:20 2000
-@@ -1659,57 +1659,14 @@
+--- ../configure.orig	Sun Jan 14 12:11:19 2001
++++ ../configure	Sun Jan 14 12:20:22 2001
+@@ -1651,58 +1651,12 @@
    :
  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
+-echo "configure:1657: checking for libjpeg version = 6b" >&5
 -    cat > conftest.$ac_ext <<EOF
--#line 1667 "configure"
+-#line 1659 "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
+-  egrep "x 62 x" >/dev/null 2>&1; then
 -  rm -rf conftest*
 -          echo "$ac_t""yes" 1>&6
          LIBJPEG='-ljpeg'
@@ -29,25 +27,25 @@ $NetBSD: patch-aa,v 1.2 2000/10/06 14:05:50 agc Exp $
 -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
+-    echo $ac_n "checking for libpng version = 1.0.x""... $ac_c" 1>&6
+-echo "configure:1678: checking for libpng version = 1.0.x" >&5
 -    cat > conftest.$ac_ext <<EOF
--#line 1688 "configure"
+-#line 1680 "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
+-  egrep "x \"1.0\..*\" x" >/dev/null 2>&1; then
 -  rm -rf conftest*
 -          echo "$ac_t""yes" 1>&6
-         LIBPNG='-lpng'
-         LIBZ=''
- 	MAKEPNG='#'
+-        LIBPNG='-lpng'
+-        LIBZ=''
+-	MAKEPNG='#'
 -else
 -  rm -rf conftest*
 -          echo "$ac_t""no" 1>&6
--        LIBPNG='../libpng.a'
+         LIBPNG='../libpng.a'
 -        LIBZ='../libz.a'
 -        
 -fi
@@ -58,23 +56,17 @@ $NetBSD: patch-aa,v 1.2 2000/10/06 14:05:50 agc Exp $
 -    LIBPNG='../libpng.a'
 -    LIBZ='../libz.a'
 -fi
-+	PNGINCL=-I${LOCALBASE}/include
+-
++	LIBZ=''
+ 
  
  
+@@ -6518,7 +6472,7 @@
  
-@@ -6220,6 +6177,7 @@
-     /usr/local/lesstif/include\
-     /usr/gnu/lesstif/include  \
-     $HOME/lesstif/include     \
-+    $MOTIFBASE/include		\
-     ; \
-   do
-     if test -r "$ac_dir/$motif_direct_test_include"; then
-@@ -6271,6 +6229,7 @@
-     /usr/local/lesstif/lib\
-     /usr/gnu/lesstif/lib  \
-     $HOME/lesstif/lib     \
-+    $MOTIFBASE/lib		\
-     ; \
- do
-   for ac_extension in a so sl; do
+ EXTRA_MAKEFILE_IN=
+ make_output="Makefile Options.orig:Options.in tools/Makefile \
+-       libjpeg/Makefile libpng/Makefile libpng/zlib/Makefile \
++       libpng/Makefile \
+        tools/mkdep/Makefile \
+        tools/cextract-1.7/Makefile thotlib/Makefile \
+        thotlib/include/Makefile batch/Makefile tablelib/Makefile"
diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab
index c7704f116ff..462149aa2f2 100644
--- a/www/amaya/patches/patch-ab
+++ b/www/amaya/patches/patch-ab
@@ -1,13 +1,11 @@
-$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 @@
+--- ../thotlib/Makefile.in.orig	Sun Jan 14 12:26:38 2001
++++ ../thotlib/Makefile.in	Sun Jan 14 12:27:45 2001
+@@ -301,7 +301,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
++        ../libpng.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
index 28a65916f28..c8499033778 100644
--- a/www/amaya/patches/patch-ac
+++ b/www/amaya/patches/patch-ac
@@ -1,9 +1,7 @@
-$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
+--- ../amaya/Makefile.libwww.orig	Sun Jan 14 12:28:46 2001
++++ ../amaya/Makefile.libwww	Sun Jan 14 12:29:22 2001
+@@ -50,7 +50,7 @@
+ 		-I$(THOTDIR)../libwww/modules/expat/xmltok
  
  # this dependency calls the ../Makefile rule that compiles libwww
 -AMAYA_LIBWWW_SRC= ../libz.a amaya_comp_libwww
diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad
deleted file mode 100644
index 95cbb70076a..00000000000
--- a/www/amaya/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$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);
diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae
deleted file mode 100644
index c254fa9ac48..00000000000
--- a/www/amaya/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/08/22 17:28:29 dmcmahill Exp $
-
-wchar.h doesn't exist on pre-1.5 systems.
-
---- ../thotlib/include/ustring.h.orig	Thu Mar 30 10:32:44 2000
-+++ ../thotlib/include/ustring.h	Tue Aug 22 13:08:35 2000
-@@ -8,5 +8,5 @@
- #endif /* _WINDOWS */
- 
--#include <wchar.h>
-+#include <machine/ansi.h>
- 
- #ifdef _WINDOWS
diff --git a/www/amaya/patches/patch-ag b/www/amaya/patches/patch-ag
new file mode 100644
index 00000000000..e89bc7df96f
--- /dev/null
+++ b/www/amaya/patches/patch-ag
@@ -0,0 +1,44 @@
+--- ../Makefile.in.orig	Fri Dec 22 17:16:48 2000
++++ ../Makefile.in	Sun Jan 14 12:38:48 2001
+@@ -263,14 +263,6 @@
+ 		@($(ECHO) "libwww is installed")
+ 
+ #
+-# Rules to rebuild the libjpeg package
+-#
+-
+-libjpeg libjpeg.a : force
+-	@($(RM) $(THOTDIR)/libjpeg/*.o)
+-	@(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O")
+-
+-#
+ # Rules to rebuild the libpng package
+ #
+ 
+@@ -279,14 +271,6 @@
+ 	@(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O")
+ 
+ #
+-# Rules to rebuild the libpng package
+-#
+-
+-libz libz.a : force
+-	@($(RM) $(THOTDIR)/libpng/libz/*.o)
+-	@(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O")
+-
+-#
+ # Rules to rebuild the Kaffe package
+ #
+ 
+@@ -364,11 +348,8 @@
+ $(THOTDIR)/Options.in \
+ $(THOTDIR)/configure.in \
+ $(THOTDIR)/Makefile.in \
+-$(THOTDIR)/libjpeg/Makefile.in \
+ $(THOTDIR)/batch/Makefile.in \
+-$(THOTDIR)/libjpeg/Makefile.in \
+ $(THOTDIR)/libpng/Makefile.in \
+-$(THOTDIR)/libpng/zlib/Makefile.in \
+ $(THOTDIR)/tablelib/Makefile.in \
+ $(THOTDIR)/thotlib/Makefile.in \
+ $(THOTDIR)/thotlib/include/Makefile.in \
diff --git a/www/amaya/pkg/PLIST b/www/amaya/pkg/PLIST
index 9991a8ca400..54b5e249775 100644
--- a/www/amaya/pkg/PLIST
+++ b/www/amaya/pkg/PLIST
@@ -1,17 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/06/20 16:50:09 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/14 12:31:11 drochner Exp $
 bin/amaya
+Amaya/amaya/AmayaPage.html.fr
+Amaya/amaya/Annot.conf
 Amaya/amaya/GraphML.STR
+Amaya/amaya/GraphML.conf
 Amaya/amaya/HTML.STR
+Amaya/amaya/HTMLPL.PRS
+Amaya/amaya/HTMLPLL.PRS
+Amaya/amaya/HTMLUSL.PRS
+Amaya/amaya/HTMLUSLL.PRS
 Amaya/amaya/MathML.STR
+Amaya/amaya/MathML.conf
 Amaya/amaya/TextFile.STR
+Amaya/amaya/TextFile.conf
+Amaya/amaya/TextFilePL.PRS
+Amaya/amaya/TextFileUSL.PRS
 Amaya/amaya/HTML.conf
 Amaya/amaya/HTML.trans
 Amaya/amaya/MathML.trans
 Amaya/amaya/GraphML.en
 Amaya/amaya/HTML.en
 Amaya/amaya/MathML.en
-Amaya/amaya/HTML.fr
-Amaya/amaya/MathML.fr
 Amaya/amaya/GraphMLP.PRS
 Amaya/amaya/HTMLP.PRS
 Amaya/amaya/HTMLPBW.PRS
@@ -32,13 +41,38 @@ Amaya/amaya/MathMLT.TRA
 Amaya/amaya/MathMLTX.TRA
 Amaya/amaya/TextFileT.TRA
 Amaya/amaya/AmayaPage.html
+Amaya/amaya/XLink.STR
+Amaya/amaya/XLink.en
+Amaya/amaya/XLinkP.PRS
+Amaya/amaya/XLinkT.TRA
+Amaya/amaya/amaya.png
+Amaya/amaya/annot.gif
+Amaya/amaya/annotorp.gif
+Amaya/amaya/index.gif
+Amaya/amaya/lost.gif
+Amaya/amaya/option.gif
+Amaya/amaya/radio-s.gif
+Amaya/amaya/radio.gif
+Amaya/amaya/target.gif
+Amaya/amaya/toggle-s.gif
+Amaya/amaya/toggle.gif
+Amaya/annotlib/Annot.STR
+Amaya/annotlib/AnnotP.PRS
+Amaya/annotlib/AnnotT.TRA
 Amaya/config/XKeysymDB
-Amaya/config/unix-thot.rc
 Amaya/config/amaya.keyboard
+Amaya/config/amaya.profiles
+Amaya/config/annot.schemas
+Amaya/config/annotschema.rdf
+Amaya/config/annottypes.rdf
 Amaya/config/en-amayadialogue
 Amaya/config/en-amayamsg
 Amaya/config/en-libdialogue
 Amaya/config/en-corrdialogue
+Amaya/config/es-amayadialogue
+Amaya/config/es-amayamsg
+Amaya/config/es-corrdialogue
+Amaya/config/es-libdialogue
 Amaya/config/fr-amayadialogue
 Amaya/config/fr-amayamsg
 Amaya/config/fr-libdialogue
@@ -55,6 +89,7 @@ Amaya/config/it-amayadialogue
 Amaya/config/it-amayamsg
 Amaya/config/it-libdialogue
 Amaya/config/it-corrdialogue
+Amaya/config/unix-thot.rc
 Amaya/fonts/Families.list
 Amaya/fonts/fonts.dir
 Amaya/fonts/icones.ff
@@ -84,15 +119,19 @@ Amaya/doc/Icons/Em.gif
 Amaya/doc/Icons/Forward.gif
 Amaya/doc/Icons/GeneralMenu.gif
 Amaya/doc/Icons/GeomMenu.gif
+Amaya/doc/Icons/Graph.gif
 Amaya/doc/Icons/H1.gif
 Amaya/doc/Icons/H2.gif
 Amaya/doc/Icons/H3.gif
+Amaya/doc/Icons/IDMenu.png
 Amaya/doc/Icons/Image.gif
 Amaya/doc/Icons/LangueNegotiation.gif
 Amaya/doc/Icons/Link.gif
+Amaya/doc/Icons/Math.gif
 Amaya/doc/Icons/NumList.gif
 Amaya/doc/Icons/OList.gif
 Amaya/doc/Icons/Plugin.gif
+Amaya/doc/Icons/Print.gif
 Amaya/doc/Icons/ProfilesMenu.gif
 Amaya/doc/Icons/ProxyMenu.gif
 Amaya/doc/Icons/PublishMenu.gif
@@ -102,9 +141,16 @@ Amaya/doc/Icons/Sources.gif
 Amaya/doc/Icons/Strong.gif
 Amaya/doc/Icons/TemplatesMenu.gif
 Amaya/doc/Icons/amaya.gif
+Amaya/doc/Icons/annot.png
+Amaya/doc/Icons/annotationicon.png
+Amaya/doc/Icons/annotationsmenu.png
+Amaya/doc/Icons/annotationsmenu_fr.png
+Amaya/doc/Icons/annotationwindow.png
+Amaya/doc/Icons/annotorp.png
 Amaya/doc/Icons/background.gif
 Amaya/doc/Icons/bug.gif
 Amaya/doc/Icons/check.gif
+Amaya/doc/Icons/configurebox.png
 Amaya/doc/Icons/cross.gif
 Amaya/doc/Icons/css.gif
 Amaya/doc/Icons/doc48x.gif
@@ -114,6 +160,8 @@ Amaya/doc/Icons/find.gif
 Amaya/doc/Icons/floppy.gif
 Amaya/doc/Icons/home.gif
 Amaya/doc/Icons/left.gif
+Amaya/doc/Icons/linkwindow.png
+Amaya/doc/Icons/localfilter.png
 Amaya/doc/Icons/opera.gif
 Amaya/doc/Icons/put.gif
 Amaya/doc/Icons/question.gif
@@ -132,34 +180,61 @@ Amaya/doc/amaya/HTML-elements/40styling.html
 Amaya/doc/amaya/HTML-elements/inline.html
 Amaya/doc/amaya/HTML-elements/lists.html
 Amaya/doc/amaya/HTML-elements/structure.html
+Amaya/doc/amaya/Access.html.fr
+Amaya/doc/amaya/Annotations.html
+Amaya/doc/amaya/Annotations.html.fr
 Amaya/doc/amaya/Attributes.html
+Amaya/doc/amaya/Attributes.html.fr
 Amaya/doc/amaya/Browsing.html
+Amaya/doc/amaya/Browsing.html.fr
 Amaya/doc/amaya/Changing.html
+Amaya/doc/amaya/Changing.html.fr
 Amaya/doc/amaya/Configure.html
+Amaya/doc/amaya/Configure.html.fr
 Amaya/doc/amaya/Creating.html
+Amaya/doc/amaya/Creating.html.fr
 Amaya/doc/amaya/CSS.html
 Amaya/doc/amaya/HTML.html
 Amaya/doc/amaya/ImageMaps.html
+Amaya/doc/amaya/ImageMaps.html.fr
 Amaya/doc/amaya/Keyboard.html
+Amaya/doc/amaya/Keyboard.html.fr
 Amaya/doc/amaya/Links.html
+Amaya/doc/amaya/Links.html.fr
 Amaya/doc/amaya/MakeBook.html
+Amaya/doc/amaya/MakeBook.html.fr
 Amaya/doc/amaya/Manual.html
+Amaya/doc/amaya/Manual.html.fr
 Amaya/doc/amaya/Math.html
+Amaya/doc/amaya/Math.html.fr
 Amaya/doc/amaya/Numbering.html
+Amaya/doc/amaya/Numbering.html.fr
 Amaya/doc/amaya/Printing.html
+Amaya/doc/amaya/Printing.html.fr
 Amaya/doc/amaya/Publishing.html
-Amaya/doc/amaya/Registry.html
+Amaya/doc/amaya/Publishing.html.fr
+Amaya/doc/amaya/SVG.html
+Amaya/doc/amaya/SVG.html.fr
 Amaya/doc/amaya/Searching.html
+Amaya/doc/amaya/Searching.html.fr
 Amaya/doc/amaya/Selecting.html
+Amaya/doc/amaya/Selecting.html.fr
+Amaya/doc/amaya/ShortCuts.html
+Amaya/doc/amaya/ShortCuts.html.fr
 Amaya/doc/amaya/SpellChecking.html
+Amaya/doc/amaya/SpellChecking.html.fr
 Amaya/doc/amaya/StyleSheets.html
+Amaya/doc/amaya/StyleSheets.html.fr
 Amaya/doc/amaya/Tables.html
+Amaya/doc/amaya/Tables.html.fr
 Amaya/doc/amaya/Transform.html
 Amaya/doc/amaya/Access.html
 Amaya/doc/amaya/Views.html
+Amaya/doc/amaya/Views.html.fr
 Amaya/applis/bin/amaya
 Amaya/applis/bin/print
 @dirrm Amaya/amaya
+@dirrm Amaya/annotlib
 @dirrm Amaya/config
 @dirrm Amaya/fonts
 @dirrm Amaya/dicopar