Update amaya to 5.1. Pkgsrc changes include using www/libwww instead of

the libwww distribution included with the Amaya sources.  The two versions
are identical and we want to take advantage of NetBSD fixes/changes to the
libwww library from www/libwww.  Major changes from amaya-4.3.2 include:

* Large number of bug fixes.
* Improvement of tables printing.
* Amaya is now able to share structure schemas.
* Amaya provides a profile for XHTML 1.1.
* Support for Ruby Annotation.
* Amaya supports inclusion of SVG files linked by elements img or object.

9 files changed, 368 insertions, 354 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index afcf335f6fa..83a5eeceea8 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,22 +1,25 @@
-# $NetBSD: Makefile,v 1.10 2001/07/21 15:23:51 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/09 19:03:18 jlam Exp $
 
-DISTNAME=	amaya-src-4.3.2
-PKGNAME=	amaya-4.3.2
+DISTNAME=	amaya-src-5.1
+PKGNAME=	amaya-5.1
 WRKSRC=		${WRKDIR}/Amaya/work
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.w3.org/pub/amaya/
+MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
+		ftp://ftp.w3.org/pub/amaya/ \
+		ftp://mirror.aarnet.edu.au/pub/amaya/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://www.w3.org/Amaya/
 COMMENT=	Web Browser/Editor from the World Wide Web Consortium
 
+EXTRACT_ELEMENTS=	Amaya
 USE_BUILDLINK_ONLY=	yes
 USE_GMAKE=		yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ARGS+=	--without-graphic-libs
+CONFIGURE_ARGS+=	--without-graphic-libs	# use pkgsrc libraries
 CONFIGURE_ARGS+=	--with-motif
 CONFIGURE_ENV+=		ac_cv_path_motif="${ac_cv_path_motif}"
 CFLAGS+=		-Dunix
@@ -31,7 +34,21 @@ ac_cv_path_motif+=	ac_motif_libraries=${BUILDLINK_DIR}/lib
 post-extract:
 	${MKDIR} ${WRKSRC}
 
+# Install into ${PREFIX}/lib/Amaya instead of ${PREFIX}/Amaya.
+post-patch:
+	cd ${WRKSRC}/..;						\
+	files="amaya/Makefile.in";					\
+	for file in $${files}; do					\
+		${MV} $${file} $${file}.fixme;				\
+		${SED}	-e "s|\$$(prefix)/Amaya|\$$(prefix)/lib/Amaya|g" \
+			$${file}.fixme >  $${file};			\
+	done
+
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/Amaya
+
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../x11/lesstif/buildlink.mk"
+.include "../../www/libwww/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index c19a9b2e61e..d60f279ae88 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/07/21 15:23:51 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/09 19:03:18 jlam Exp $
 
-SHA1 (amaya-src-4.3.2.tgz) = 045e5162fb12df65d5bc0ea798f4f77e35b8f599
-Size (amaya-src-4.3.2.tgz) = 5022936 bytes
-SHA1 (patch-aa) = 23774632c468290132020c925823f09f66bae776
-SHA1 (patch-ab) = 701a106edc2d364f3eb848e98547c1446c327609
-SHA1 (patch-ac) = 215bc8e429c249c1c48bb1fcfe358d93ba8a5d38
-SHA1 (patch-ad) = 354e3769fb95c79fb75d872e73c4f39bf432ebff
-SHA1 (patch-ae) = 0392ac77a608950979abb68e02ac6cc93bf9de54
-SHA1 (patch-ag) = 76448c05844a763bbec4d405bdb6ba6bb47d706c
+SHA1 (amaya-src-5.1.tgz) = fe032cce47ed3979606d43bd21e10c2d41d6e05b
+Size (amaya-src-5.1.tgz) = 4925073 bytes
+SHA1 (patch-aa) = aa7212f3424ac2593a9f38a6e2436ff781ba6fd0
+SHA1 (patch-ab) = 6f5940d24e285dcdcaf4420cf25b6bc8f750ab28
+SHA1 (patch-ac) = e8740b482a7422fadadff451fb148beacd081838
+SHA1 (patch-ad) = 18a23b68f0f81d8767d17905cd762956b37e33b4
diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa
index 5f493d2c5b4..0809985fb38 100644
--- a/www/amaya/patches/patch-aa
+++ b/www/amaya/patches/patch-aa
@@ -1,22 +1,17 @@
-$NetBSD: patch-aa,v 1.6 2001/07/21 15:23:52 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2001/08/09 19:03:19 jlam Exp $
 
---- ../configure.orig	Wed Feb 28 02:34:16 2001
+--- ../configure.orig	Tue Jul  3 07:23:50 2001
 +++ ../configure
-@@ -1651,7 +1651,7 @@
-   :
- fi
+@@ -6425,12 +6425,6 @@
  
--if test "$with_graphic-libs" = "no" ; then
-+if test "$with_graphic_libs" = "no" ; then
-     echo $ac_n "checking for libjpeg version = 6b""... $ac_c" 1>&6
- echo "configure:1657: checking for libjpeg version = 6b" >&5
-     cat > conftest.$ac_ext <<EOF
-@@ -1686,7 +1686,7 @@
-   rm -rf conftest*
-           echo "$ac_t""yes" 1>&6
-         LIBPNG='-lpng'
--        LIBZ=''
-+        LIBZ='-lz'
- 	MAKEPNG='#'
- else
-   rm -rf conftest*
+ 
+ if test "$build_amaya" = "yes" ; then
+-    if test ! -f $srcdir/../libwww/Makefile.in ; then
+-	echo "configure: warning: libwww sources not found !!" 1>&2
+-	echo "configure: warning: Disabling Amaya build !" 1>&2
+-	build_amaya="no"
+-    fi
+-
+     if test ! -f $srcdir/amaya/MathML.S ; then
+ 	if test "$with_math" = "yes" ; then
+ 	    echo "configure: warning: MathML sources not found !!" 1>&2
diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab
index 560e54f394e..0f72057d8fd 100644
--- a/www/amaya/patches/patch-ab
+++ b/www/amaya/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2001/07/21 15:23:52 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2001/08/09 19:03:19 jlam Exp $
 
---- ../Makefile.in.orig	Wed Feb 28 02:34:16 2001
+--- ../Makefile.in.orig	Mon Jun 25 07:14:52 2001
 +++ ../Makefile.in
-@@ -186,8 +186,9 @@
+@@ -180,8 +180,9 @@
  	  cd $(LIBWWW) ; unset LANG; \
  	  if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \
  	  	$$libwwwdir/configure \
diff --git a/www/amaya/patches/patch-ac b/www/amaya/patches/patch-ac
index 025fde8796a..3bc9bb0f10c 100644
--- a/www/amaya/patches/patch-ac
+++ b/www/amaya/patches/patch-ac
@@ -1,22 +1,42 @@
-$NetBSD: patch-ac,v 1.5 2001/07/21 15:23:52 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2001/08/09 19:03:19 jlam Exp $
 
---- ../../libwww/Library/src/Makefile.in.orig	Fri Sep 15 08:45:58 2000
-+++ ../../libwww/Library/src/Makefile.in
-@@ -123,7 +123,7 @@
- have_tn3270 = @have_tn3270@
- subdirs = @subdirs@
+--- ../amaya/Makefile.libwww.orig	Tue Aug 29 12:18:03 2000
++++ ../amaya/Makefile.libwww
+@@ -19,7 +19,6 @@
+ AMAYA_LIBWWW_OPTION_LIBS=
  
--LDFLAGS = -version-info "1:0:1"
-+LDFLAGS = @LDFLAGS@ -version-info "1:0:1"
+ AMAYA_LIBWWW_LIBS= \
+-		-L../$(LIBWWW)/Library/src/.libs \
+ 			-lwwwapp \
+ 			-lwwwhttp \
+ 			-lwwwxml \
+@@ -34,23 +33,19 @@
+ 			-lwwwutils \
+ 			-lwwwzip \
+ 			-lwwwftp \
+-		-L../$(LIBWWW)/modules/md5/.libs \
++			-lwwwnews \
++			-lwwwtelnet \
++			-lwwwgopher \
+ 			-lmd5 \
+-		-L../$(LIBWWW)/modules/expat/xmlparse/.libs \
+ 			-lxmlparse \
+-		-L../$(LIBWWW)/modules/expat/xmltok/.libs \
+ 			-lxmltok
  
- lib_LTLIBRARIES =  	libwwwutils.la 	libwwwcore.la 	libwwwtrans.la 	libwwwstream.la 	libwwwcache.la 	libwwwdir.la 	libwwwfile.la 	libwwwftp.la 	libwwwgopher.la 	libwwwmime.la 	libwwwhttp.la 	libwwwnews.la 	libwwwtelnet.la 	libwwwhtml.la 	libwwwapp.la 	libwwwinit.la 	libwwwmux.la 	@WWWXML@ 	@WWWZIP@ 	@WWWWAIS@ 	@WWWSQL@
+ AMAYA_LIBWWW_EXTRA_LIBS=
  
-@@ -217,7 +217,7 @@
+-AMAYA_LIBWWW_INCLUDES= -I../libwww \
+-		-I$(THOTDIR)/../libwww/Library/src \
+-		-I$(THOTDIR)../libwww/modules/md5 \
+-		-I$(THOTDIR)../libwww/modules/expat/xmlparse \
+-		-I$(THOTDIR)../libwww/modules/expat/xmltok
++AMAYA_LIBWWW_INCLUDES= -I${BUILDLINK_DIR}/include/w3c-libwww
  
- libwwwsql_la_LDFLAGS = -rpath $(libdir)
+-# this dependency calls the ../Makefile rule that compiles libwww
+-AMAYA_LIBWWW_SRC= ../libz.a amaya_comp_libwww
++# Use an installed libwww library
++AMAYA_LIBWWW_SRC= # empty
  
--INCLUDES =  	-I/usr/local/include 	-I${top_srcdir}/modules/md5 	-I${top_srcdir}/modules/expat/xmlparse
-+INCLUDES =  	-I${top_srcdir}/modules/md5 	-I${top_srcdir}/modules/expat/xmlparse
- 
- 
- BUILT_SOURCES =  	wwwsys.h 	HTAABrow.h 	HTAAUtil.h 	HTANSI.h 	HTAccess.h 	HTAlert.h 	HTAncMan.h 	HTAnchor.h 	HTArray.h 	HTAssoc.h 	HTAtom.h 	HTBInit.h 	HTBTree.h 	HTBind.h 	HTBind.h 	HTBound.h 	HTBufWrt.h 	HTCache.h 	HTChannl.h 	HTChunk.h 	HTConLen.h 	HTCookie.h 	HTDNS.h 	HTDemux.h 	HTDescpt.h 	HTDialog.h 	HTDigest.h 	HTDir.h 	HTEPtoCl.h 	HTError.h 	HTEscape.h 	HTEvent.h 	HTEvtLst.h 	HTFSave.h 	HTFTP.h 	HTFTPDir.h 	HTFWrite.h 	HTFile.h 	HTFilter.h 	HTFormat.h 	HTGopher.h 	HTGuess.h 	HTHInit.h 	HTHash.h 	HTHeader.h 	HTHist.h 	HTHome.h 	HTHost.h 	HTHstMan.h 	HTIOStream.h 	HTIcons.h 	HTInet.h 	HTInit.h 	HTLib.h 	HTLink.h 	HTList.h 	HTLocal.h 	HTLog.h 	HTMIME.h 	HTMIMERq.h 	HTMIMImp.h 	HTMIMPrs.h 	HTML.h 	HTMLGen.h 	HTMLPDTD.h 	HTMemLog.h 	HTMemory.h 	HTMerge.h 	HTMethod.h 	HTMulpar.h 	HTMulti.h 	HTMuxCh.h 	HTMuxHeader.h 	HTMuxTx.h 	HTNDir.h 	HTNet.h 	HTNetMan.h 	HTNetTxt.h 	HTNews.h 	HTNewsLs.h 	HTNewsRq.h 	HTNoFree.h 	HTPEP.h 	HTParse.h 	HTPlain.h 	HTProfil.h 	HTProt.h 	HTProxy.h 	HTRDF.h 	HTReader.h 	HTReq.h 	HTReqMan.h 	HTResMan.h 	HTResponse.h 	HTRules.h 	HTSChunk.h 	HTSQL.h 	HTSQLLog.h 	HTSocket.h 	HTStream.h 	HTString.h 	HTStruct.h 	HTStyle.h 	HTTCP.h 	HTTChunk.h 	HTTP.h 	HTTPGen.h 	HTTPReq.h 	HTTPRes.h 	HTTPServ.h 	HTTPUtil.h 	HTTeXGen.h 	HTTee.h 	HTTelnet.h 	HTTimer.h 	HTTrans.h 	HTUTree.h 	HTUU.h 	HTUser.h 	HTUtils.h 	HTWAIS.h 	HTWSRC.h 	HTWWWStr.h 	HTWriter.h 	HTXML.h 	HTXParse.h 	HTZip.h 	HText.h 	HTextImp.h 	SGML.h 	WWWApp.h 	WWWCache.h 	WWWCore.h 	WWWDir.h 	WWWFTP.h 	WWWFile.h 	WWWGophe.h 	WWWHTML.h 	WWWHTTP.h 	WWWInit.h 	WWWLib.h 	WWWMIME.h 	WWWMux.h 	WWWNews.h 	WWWSQL.h 	WWWStream.h 	WWWTelnt.h 	WWWTrans.h 	WWWUtil.h 	WWWWAIS.h 	WWWXML.h 	WWWZip.h
+ amaya_comp_libwww : force
+ 		@(cd .. ; $(MAKE) libwww)
diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad
index e232ac5e790..7f400064792 100644
--- a/www/amaya/patches/patch-ad
+++ b/www/amaya/patches/patch-ad
@@ -1,13 +1,17 @@
-$NetBSD: patch-ad,v 1.3 2001/07/21 15:23:52 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2001/08/09 19:03:19 jlam Exp $
 
---- ../../libwww/modules/expat/xmlparse/Makefile.in.orig	Fri Sep 15 08:45:55 2000
-+++ ../../libwww/modules/expat/xmlparse/Makefile.in
-@@ -124,7 +124,7 @@
- icondir = @icondir@
- subdirs = @subdirs@
+--- ../annotlib/Makefile.in.orig	Thu Apr  5 06:49:33 2001
++++ ../annotlib/Makefile.in
+@@ -14,10 +14,8 @@
  
--LDFLAGS = -version-info "1:0:1"
-+LDFLAGS = @LDFLAGS@ -version-info "1:0:1"
+ INCLUDES= -DHAVE_CONFIG_H -DANNOTATIONS \
+ 	  -I.. -I../amaya  -I@srcdir@/f -I@top_srcdir@/amaya \
+-	  -I@top_srcdir@/amaya/f -I../libwww \
+-	  -I@top_srcdir@/../libwww/Library/src \
+-	  -I@top_srcdir@/../libwww/modules/expat/xmlparse \
+-	  -I@top_srcdir@/../libwww/modules/expat/xmltok \
++	  -I@top_srcdir@/amaya/f \
++	  -I${BUILDLINK_DIR}/include/w3c-libwww \
+ 	   @THOTINCLUDES@ $(X_FLAGS)
  
- CFLAGS = @CFLAGS@ -DXML_NS
  
diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae
deleted file mode 100644
index d857df70df6..00000000000
--- a/www/amaya/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2001/07/21 15:23:52 jlam Exp $
-
---- ../../libwww/modules/expat/xmltok/Makefile.in.orig	Fri Sep 15 08:45:54 2000
-+++ ../../libwww/modules/expat/xmltok/Makefile.in
-@@ -124,7 +124,7 @@
- icondir = @icondir@
- subdirs = @subdirs@
- 
--LDFLAGS = -version-info "1:0:1"
-+LDFLAGS = @LDFLAGS@ -version-info "1:0:1"
- 
- CFLAGS = @CFLAGS@ -DXML_NS
- 
diff --git a/www/amaya/patches/patch-ag b/www/amaya/patches/patch-ag
deleted file mode 100644
index 5b0b4bcce66..00000000000
--- a/www/amaya/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2001/07/21 15:23:52 jlam Exp $
-
---- ../amaya/Makefile.libwww.orig	Fri Sep 15 07:24:40 2000
-+++ ../amaya/Makefile.libwww
-@@ -45,9 +45,9 @@
- 
- AMAYA_LIBWWW_INCLUDES= -I../libwww \
- 		-I$(THOTDIR)/../libwww/Library/src \
--		-I$(THOTDIR)../libwww/modules/md5 \
--		-I$(THOTDIR)../libwww/modules/expat/xmlparse \
--		-I$(THOTDIR)../libwww/modules/expat/xmltok
-+		-I$(THOTDIR)/../libwww/modules/md5 \
-+		-I$(THOTDIR)/../libwww/modules/expat/xmlparse \
-+		-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/pkg/PLIST b/www/amaya/pkg/PLIST
index 8d30dd3b74e..99fe318b5c3 100644
--- a/www/amaya/pkg/PLIST
+++ b/www/amaya/pkg/PLIST
@@ -1,264 +1,274 @@
-@comment $NetBSD: PLIST,v 1.3 2001/04/09 16:45:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/08/09 19:03:19 jlam 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/TextFile.en
-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/GraphMLP.PRS
-Amaya/amaya/HTMLP.PRS
-Amaya/amaya/HTMLPBW.PRS
-Amaya/amaya/HTMLPLP.PRS
-Amaya/amaya/HTMLPLPUS.PRS
-Amaya/amaya/HTMLPP.PRS
-Amaya/amaya/HTMLPPUS.PRS
-Amaya/amaya/MathMLP.PRS
-Amaya/amaya/TextFileP.PRS
-Amaya/amaya/TextFilePP.PRS
-Amaya/amaya/TextFilePPUS.PRS
-Amaya/amaya/GraphMLT.TRA
-Amaya/amaya/GraphMLTX.TRA
-Amaya/amaya/HTMLT.TRA
-Amaya/amaya/HTMLTT.TRA
-Amaya/amaya/HTMLTX.TRA
-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/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
-Amaya/config/fr-corrdialogue
-Amaya/config/de-amayadialogue
-Amaya/config/de-amayamsg
-Amaya/config/de-libdialogue
-Amaya/config/de-corrdialogue
-Amaya/config/tr-amayadialogue
-Amaya/config/tr-amayamsg
-Amaya/config/tr-libdialogue
-Amaya/config/tr-corrdialogue
-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
-Amaya/fonts/icones.pcf
-Amaya/fonts/icones1.fb
-Amaya/fonts/icones11.fb
-Amaya/dicopar/american.ptn
-Amaya/dicopar/deutsch.ptn
-Amaya/dicopar/english.ptn
-Amaya/dicopar/espanol.ptn
-Amaya/dicopar/finish.ptn
-Amaya/dicopar/francais.ptn
-Amaya/dicopar/italiano.ptn
-Amaya/dicopar/nederl.ptn
-Amaya/dicopar/portug.ptn
-Amaya/dicopar/swedish.ptn
-Amaya/dicopar/alphabet
-Amaya/dicopar/clavier
-Amaya/doc/Icons/Reload.png
-Amaya/doc/Icons/Browser.gif
-Amaya/doc/Icons/CacheMenu.gif
-Amaya/doc/Icons/CacheMenufr.gif
-Amaya/doc/Icons/ColorMenu.gif
-Amaya/doc/Icons/ColorMenufr.gif
-Amaya/doc/Icons/Cour.gif
-Amaya/doc/Icons/DL.gif
-Amaya/doc/Icons/Editor.gif
-Amaya/doc/Icons/Em.gif
-Amaya/doc/Icons/Forward.gif
-Amaya/doc/Icons/GeneralMenu.gif
-Amaya/doc/Icons/GeneralMenufr.gif
-Amaya/doc/Icons/GeomMenu.gif
-Amaya/doc/Icons/GeomMenufr.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/LangueNegotiationfr.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/ProfilesMenufr.gif
-Amaya/doc/Icons/ProxyMenu.gif
-Amaya/doc/Icons/ProxyMenufr.gif
-Amaya/doc/Icons/PublishMenu.gif
-Amaya/doc/Icons/PublishMenufr.gif
-Amaya/doc/Icons/SaveAs.gif
-Amaya/doc/Icons/SaveAsfr.gif
-Amaya/doc/Icons/SourceJava.gif
-Amaya/doc/Icons/Sources.gif
-Amaya/doc/Icons/Strong.gif
-Amaya/doc/Icons/TemplatesMenu.gif
-Amaya/doc/Icons/TemplatesMenufr.gif
-Amaya/doc/Icons/amaya.gif
-Amaya/doc/Icons/annot.png
-Amaya/doc/Icons/annotationicon.png
-Amaya/doc/Icons/annotationiconfr.gif
-Amaya/doc/Icons/annotationsmenu.png
-Amaya/doc/Icons/annotationsmenu_fr.png
-Amaya/doc/Icons/annotationwindow.png
-Amaya/doc/Icons/annotationwindowfr.gif
-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/configureboxfr.png
-Amaya/doc/Icons/cross.gif
-Amaya/doc/Icons/css.gif
-Amaya/doc/Icons/cssfr.gif
-Amaya/doc/Icons/doc48x.gif
-Amaya/doc/Icons/drapeau-F.gif
-Amaya/doc/Icons/eyec.gif
-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/linkwindowfr.gif
-Amaya/doc/Icons/localfilter.png
-Amaya/doc/Icons/localfilterfr.gif
-Amaya/doc/Icons/opera.gif
-Amaya/doc/Icons/put.gif
-Amaya/doc/Icons/question.gif
-Amaya/doc/Icons/right.gif
-Amaya/doc/Icons/table.gif
-Amaya/doc/Icons/target.gif
-Amaya/doc/Icons/ui.gif
-Amaya/doc/Icons/up.gif
-Amaya/doc/Icons/w3c-amaya.gif
-Amaya/doc/Icons/warning.gif
-Amaya/doc/Icons/Back.gif
-Amaya/doc/amaya/HTML-elements/infoTypes.html
-Amaya/doc/amaya/HTML-elements/address.html
-Amaya/doc/amaya/HTML-elements/headings.html
-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/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
-@dirrm Amaya/doc/Icons
-@dirrm Amaya/doc/amaya/HTML-elements
-@dirrm Amaya/doc/amaya
-@dirrm Amaya/doc
-@dirrm Amaya/applis/bin
-@dirrm Amaya/applis
-@dirrm Amaya
+lib/Amaya/amaya/AmayaPage.html
+lib/Amaya/amaya/AmayaPage.html.fr
+lib/Amaya/amaya/Annot.conf
+lib/Amaya/amaya/GraphML.STR
+lib/Amaya/amaya/GraphML.conf
+lib/Amaya/amaya/GraphML.en
+lib/Amaya/amaya/GraphMLP.PRS
+lib/Amaya/amaya/GraphMLT.TRA
+lib/Amaya/amaya/GraphMLTX.TRA
+lib/Amaya/amaya/HTML.STR
+lib/Amaya/amaya/HTML.conf
+lib/Amaya/amaya/HTML.en
+lib/Amaya/amaya/HTML.trans
+lib/Amaya/amaya/HTMLP.PRS
+lib/Amaya/amaya/HTMLPBW.PRS
+lib/Amaya/amaya/HTMLPL.PRS
+lib/Amaya/amaya/HTMLPLL.PRS
+lib/Amaya/amaya/HTMLPLP.PRS
+lib/Amaya/amaya/HTMLPLPUS.PRS
+lib/Amaya/amaya/HTMLPP.PRS
+lib/Amaya/amaya/HTMLPPUS.PRS
+lib/Amaya/amaya/HTMLT.TRA
+lib/Amaya/amaya/HTMLT11.TRA
+lib/Amaya/amaya/HTMLTT.TRA
+lib/Amaya/amaya/HTMLTX.TRA
+lib/Amaya/amaya/HTMLUSL.PRS
+lib/Amaya/amaya/HTMLUSLL.PRS
+lib/Amaya/amaya/MathML.STR
+lib/Amaya/amaya/MathML.conf
+lib/Amaya/amaya/MathML.en
+lib/Amaya/amaya/MathML.trans
+lib/Amaya/amaya/MathMLP.PRS
+lib/Amaya/amaya/MathMLT.TRA
+lib/Amaya/amaya/MathMLTX.TRA
+lib/Amaya/amaya/TextFile.STR
+lib/Amaya/amaya/TextFile.conf
+lib/Amaya/amaya/TextFile.en
+lib/Amaya/amaya/TextFileP.PRS
+lib/Amaya/amaya/TextFilePL.PRS
+lib/Amaya/amaya/TextFilePP.PRS
+lib/Amaya/amaya/TextFilePPUS.PRS
+lib/Amaya/amaya/TextFileT.TRA
+lib/Amaya/amaya/TextFileUSL.PRS
+lib/Amaya/amaya/XLink.STR
+lib/Amaya/amaya/XLink.en
+lib/Amaya/amaya/XLinkP.PRS
+lib/Amaya/amaya/XLinkT.TRA
+lib/Amaya/amaya/XML.STR
+lib/Amaya/amaya/XMLP.PRS
+lib/Amaya/amaya/XMLPL.PRS
+lib/Amaya/amaya/XMLPP.PRS
+lib/Amaya/amaya/XMLPPUS.PRS
+lib/Amaya/amaya/XMLT.TRA
+lib/Amaya/amaya/XMLUSL.PRS
+lib/Amaya/amaya/amaya.png
+lib/Amaya/amaya/annot.gif
+lib/Amaya/amaya/annotorp.gif
+lib/Amaya/amaya/index.gif
+lib/Amaya/amaya/lost.gif
+lib/Amaya/amaya/option.gif
+lib/Amaya/amaya/radio-s.gif
+lib/Amaya/amaya/radio.gif
+lib/Amaya/amaya/target.gif
+lib/Amaya/amaya/toggle-s.gif
+lib/Amaya/amaya/toggle.gif
+lib/Amaya/annotlib/Annot.STR
+lib/Amaya/annotlib/AnnotP.PRS
+lib/Amaya/annotlib/AnnotT.TRA
+lib/Amaya/applis/bin/amaya
+lib/Amaya/applis/bin/print
+lib/Amaya/config/XKeysymDB
+lib/Amaya/config/amaya.keyboard
+lib/Amaya/config/amaya.profiles
+lib/Amaya/config/annot.schemas
+lib/Amaya/config/annotschema.rdf
+lib/Amaya/config/annottypes.rdf
+lib/Amaya/config/de-amayadialogue
+lib/Amaya/config/de-amayamsg
+lib/Amaya/config/de-corrdialogue
+lib/Amaya/config/de-libdialogue
+lib/Amaya/config/en-amayadialogue
+lib/Amaya/config/en-amayamsg
+lib/Amaya/config/en-corrdialogue
+lib/Amaya/config/en-libdialogue
+lib/Amaya/config/es-amayadialogue
+lib/Amaya/config/es-amayamsg
+lib/Amaya/config/es-corrdialogue
+lib/Amaya/config/es-libdialogue
+lib/Amaya/config/fr-amayadialogue
+lib/Amaya/config/fr-amayamsg
+lib/Amaya/config/fr-corrdialogue
+lib/Amaya/config/fr-libdialogue
+lib/Amaya/config/it-amayadialogue
+lib/Amaya/config/it-amayamsg
+lib/Amaya/config/it-corrdialogue
+lib/Amaya/config/it-libdialogue
+lib/Amaya/config/tr-amayadialogue
+lib/Amaya/config/tr-amayamsg
+lib/Amaya/config/tr-corrdialogue
+lib/Amaya/config/tr-libdialogue
+lib/Amaya/config/unix-thot.rc
+lib/Amaya/dicopar/alphabet
+lib/Amaya/dicopar/american.ptn
+lib/Amaya/dicopar/clavier
+lib/Amaya/dicopar/deutsch.ptn
+lib/Amaya/dicopar/english.ptn
+lib/Amaya/dicopar/espanol.ptn
+lib/Amaya/dicopar/finish.ptn
+lib/Amaya/dicopar/francais.ptn
+lib/Amaya/dicopar/italiano.ptn
+lib/Amaya/dicopar/nederl.ptn
+lib/Amaya/dicopar/portug.ptn
+lib/Amaya/dicopar/swedish.ptn
+lib/Amaya/doc/Icons/Back.gif
+lib/Amaya/doc/Icons/Browser.gif
+lib/Amaya/doc/Icons/CacheMenu.gif
+lib/Amaya/doc/Icons/CacheMenufr.gif
+lib/Amaya/doc/Icons/ColorMenu.gif
+lib/Amaya/doc/Icons/ColorMenufr.gif
+lib/Amaya/doc/Icons/Cour.gif
+lib/Amaya/doc/Icons/DL.gif
+lib/Amaya/doc/Icons/Editor.gif
+lib/Amaya/doc/Icons/Em.gif
+lib/Amaya/doc/Icons/Forward.gif
+lib/Amaya/doc/Icons/GeneralMenu.gif
+lib/Amaya/doc/Icons/GeneralMenufr.gif
+lib/Amaya/doc/Icons/GeomMenu.gif
+lib/Amaya/doc/Icons/GeomMenufr.gif
+lib/Amaya/doc/Icons/Graph.gif
+lib/Amaya/doc/Icons/H1.gif
+lib/Amaya/doc/Icons/H2.gif
+lib/Amaya/doc/Icons/H3.gif
+lib/Amaya/doc/Icons/IDMenu.png
+lib/Amaya/doc/Icons/Image.gif
+lib/Amaya/doc/Icons/LangueNegotiation.gif
+lib/Amaya/doc/Icons/LangueNegotiationfr.gif
+lib/Amaya/doc/Icons/Link.gif
+lib/Amaya/doc/Icons/Math.gif
+lib/Amaya/doc/Icons/NumList.gif
+lib/Amaya/doc/Icons/OList.gif
+lib/Amaya/doc/Icons/Plugin.gif
+lib/Amaya/doc/Icons/Print.gif
+lib/Amaya/doc/Icons/ProfilesMenu.gif
+lib/Amaya/doc/Icons/ProfilesMenufr.gif
+lib/Amaya/doc/Icons/ProxyMenu.gif
+lib/Amaya/doc/Icons/ProxyMenufr.gif
+lib/Amaya/doc/Icons/PublishMenu.gif
+lib/Amaya/doc/Icons/PublishMenufr.gif
+lib/Amaya/doc/Icons/Reload.png
+lib/Amaya/doc/Icons/SaveAs.gif
+lib/Amaya/doc/Icons/SaveAsfr.gif
+lib/Amaya/doc/Icons/SourceJava.gif
+lib/Amaya/doc/Icons/Sources.gif
+lib/Amaya/doc/Icons/Strong.gif
+lib/Amaya/doc/Icons/TemplatesMenu.gif
+lib/Amaya/doc/Icons/TemplatesMenufr.gif
+lib/Amaya/doc/Icons/amaya.gif
+lib/Amaya/doc/Icons/annot.png
+lib/Amaya/doc/Icons/annotationicon.png
+lib/Amaya/doc/Icons/annotationiconfr.gif
+lib/Amaya/doc/Icons/annotationsmenu.png
+lib/Amaya/doc/Icons/annotationsmenu_fr.png
+lib/Amaya/doc/Icons/annotationwindow.png
+lib/Amaya/doc/Icons/annotationwindowfr.gif
+lib/Amaya/doc/Icons/annotorp.png
+lib/Amaya/doc/Icons/background.gif
+lib/Amaya/doc/Icons/bug.gif
+lib/Amaya/doc/Icons/check.gif
+lib/Amaya/doc/Icons/configurebox.png
+lib/Amaya/doc/Icons/configureboxfr.png
+lib/Amaya/doc/Icons/cross.gif
+lib/Amaya/doc/Icons/css.gif
+lib/Amaya/doc/Icons/cssfr.gif
+lib/Amaya/doc/Icons/doc48x.gif
+lib/Amaya/doc/Icons/drapeau-F.gif
+lib/Amaya/doc/Icons/eyec.gif
+lib/Amaya/doc/Icons/find.gif
+lib/Amaya/doc/Icons/floppy.gif
+lib/Amaya/doc/Icons/home.gif
+lib/Amaya/doc/Icons/left.gif
+lib/Amaya/doc/Icons/linkwindow.png
+lib/Amaya/doc/Icons/linkwindowfr.gif
+lib/Amaya/doc/Icons/localfilter.png
+lib/Amaya/doc/Icons/localfilterfr.gif
+lib/Amaya/doc/Icons/opera.gif
+lib/Amaya/doc/Icons/put.gif
+lib/Amaya/doc/Icons/question.gif
+lib/Amaya/doc/Icons/right.gif
+lib/Amaya/doc/Icons/table.gif
+lib/Amaya/doc/Icons/target.gif
+lib/Amaya/doc/Icons/ui.gif
+lib/Amaya/doc/Icons/up.gif
+lib/Amaya/doc/Icons/w3c-amaya.gif
+lib/Amaya/doc/Icons/warning.gif
+lib/Amaya/doc/amaya/Access.html
+lib/Amaya/doc/amaya/Access.html.fr
+lib/Amaya/doc/amaya/Annotations.html
+lib/Amaya/doc/amaya/Annotations.html.fr
+lib/Amaya/doc/amaya/Attributes.html
+lib/Amaya/doc/amaya/Attributes.html.fr
+lib/Amaya/doc/amaya/Browsing.html
+lib/Amaya/doc/amaya/Browsing.html.fr
+lib/Amaya/doc/amaya/CSS.html
+lib/Amaya/doc/amaya/Changing.html
+lib/Amaya/doc/amaya/Changing.html.fr
+lib/Amaya/doc/amaya/Configure.html
+lib/Amaya/doc/amaya/Configure.html.fr
+lib/Amaya/doc/amaya/Creating.html
+lib/Amaya/doc/amaya/Creating.html.fr
+lib/Amaya/doc/amaya/HTML-elements/40styling.html
+lib/Amaya/doc/amaya/HTML-elements/address.html
+lib/Amaya/doc/amaya/HTML-elements/headings.html
+lib/Amaya/doc/amaya/HTML-elements/infoTypes.html
+lib/Amaya/doc/amaya/HTML-elements/inline.html
+lib/Amaya/doc/amaya/HTML-elements/lists.html
+lib/Amaya/doc/amaya/HTML-elements/structure.html
+lib/Amaya/doc/amaya/HTML.html
+lib/Amaya/doc/amaya/ImageMaps.html
+lib/Amaya/doc/amaya/ImageMaps.html.fr
+lib/Amaya/doc/amaya/Index.html
+lib/Amaya/doc/amaya/Keyboard.html
+lib/Amaya/doc/amaya/Keyboard.html.fr
+lib/Amaya/doc/amaya/Links.html
+lib/Amaya/doc/amaya/Links.html.fr
+lib/Amaya/doc/amaya/MakeBook.html
+lib/Amaya/doc/amaya/MakeBook.html.fr
+lib/Amaya/doc/amaya/Manual.html
+lib/Amaya/doc/amaya/Manual.html.fr
+lib/Amaya/doc/amaya/Math.html
+lib/Amaya/doc/amaya/Math.html.fr
+lib/Amaya/doc/amaya/Numbering.html
+lib/Amaya/doc/amaya/Numbering.html.fr
+lib/Amaya/doc/amaya/Printing.html
+lib/Amaya/doc/amaya/Printing.html.fr
+lib/Amaya/doc/amaya/Publishing.html
+lib/Amaya/doc/amaya/Publishing.html.fr
+lib/Amaya/doc/amaya/SVG.html
+lib/Amaya/doc/amaya/SVG.html.fr
+lib/Amaya/doc/amaya/Searching.html
+lib/Amaya/doc/amaya/Searching.html.fr
+lib/Amaya/doc/amaya/Selecting.html
+lib/Amaya/doc/amaya/Selecting.html.fr
+lib/Amaya/doc/amaya/ShortCuts.html
+lib/Amaya/doc/amaya/ShortCuts.html.fr
+lib/Amaya/doc/amaya/SpellChecking.html
+lib/Amaya/doc/amaya/SpellChecking.html.fr
+lib/Amaya/doc/amaya/StyleSheets.html
+lib/Amaya/doc/amaya/StyleSheets.html.fr
+lib/Amaya/doc/amaya/Tables.html
+lib/Amaya/doc/amaya/Tables.html.fr
+lib/Amaya/doc/amaya/Transform.html
+lib/Amaya/doc/amaya/Views.html
+lib/Amaya/doc/amaya/Views.html.fr
+lib/Amaya/doc/amaya/index.css
+lib/Amaya/fonts/Families.list
+lib/Amaya/fonts/fonts.dir
+lib/Amaya/fonts/icones.ff
+lib/Amaya/fonts/icones.pcf
+lib/Amaya/fonts/icones1.fb
+lib/Amaya/fonts/icones11.fb
+@dirrm lib/Amaya/fonts
+@dirrm lib/Amaya/doc/amaya/HTML-elements
+@dirrm lib/Amaya/doc/amaya
+@dirrm lib/Amaya/doc/Icons
+@dirrm lib/Amaya/doc
+@dirrm lib/Amaya/dicopar
+@dirrm lib/Amaya/config
+@dirrm lib/Amaya/applis/bin
+@dirrm lib/Amaya/applis
+@dirrm lib/Amaya/annotlib
+@dirrm lib/Amaya/amaya
+@dirrm lib/Amaya