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.

6 files changed, 66 insertions, 77 deletions

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