Update to 4.3.2.

See http://www.w3.org/Amaya/User/New.html for the changelog - it's too
much to list here.

9 files changed, 78 insertions, 109 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 032b3df08ee..783186528c2 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/03/04 09:06:19 tron Exp $
+# $NetBSD: Makefile,v 1.7 2001/04/09 16:44:58 drochner Exp $
 
-DISTNAME=	amaya-src-4.2.1
-PKGNAME=	amaya-4.2.1
+DISTNAME=	amaya-src-4.3.2
+PKGNAME=	amaya-4.3.2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.w3.org/pub/amaya/
 EXTRACT_SUFX=	.tgz
@@ -13,13 +13,12 @@ COMMENT=	Web Browser/Editor from the World Wide Web Consortium
 WRKSRC=		${WRKDIR}/Amaya/work
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ARGS+=	--with-motif
+CONFIGURE_ARGS+=	--with-motif --without-graphic-libs
 CONFIGURE_ENV+=	MOTIFBASE=${MOTIFBASE}
 CFLAGS+=	-Dunix
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-# our libpng is too new (png_read_init() removal)
-#DEPENDS+=	png>1.0.9:../../graphics/png
+DEPENDS+=	png>1.0.9:../../graphics/png
 
 USE_MOTIF=	yes
 USE_GMAKE=	yes
@@ -28,6 +27,6 @@ post-extract:
 	${MKDIR} ${WRKSRC}
 	${RM} -rf ${WRKDIR}/Amaya/libjpeg
 	${RM} -rf ${WRKDIR}/Amaya/libpng/zlib
-#	${RM} -rf ${WRKDIR}/Amaya/libpng
+	${RM} -rf ${WRKDIR}/Amaya/libpng
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/amaya/files/md5 b/www/amaya/files/md5
index aac494e7a5d..02be15d52d0 100644
--- a/www/amaya/files/md5
+++ b/www/amaya/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2001/01/14 12:31:11 drochner Exp $
+$NetBSD: md5,v 1.3 2001/04/09 16:44:59 drochner Exp $
 
-MD5 (amaya-src-4.2.1.tgz) = 2d8af7c6e76544bb92f22abd5c589d86
+SHA1 (amaya-src-4.3.2.tgz) = 045e5162fb12df65d5bc0ea798f4f77e35b8f599
diff --git a/www/amaya/files/patch-sum b/www/amaya/files/patch-sum
index d768571f0da..c42e3d3f4aa 100644
--- a/www/amaya/files/patch-sum
+++ b/www/amaya/files/patch-sum
@@ -1,7 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2001/01/14 12:31:11 drochner Exp $
+$NetBSD: patch-sum,v 1.5 2001/04/09 16:44:59 drochner Exp $
 
-MD5 (patch-aa) = 2fd412b0e1e4c576e6ac285e8a4a5cfb
-MD5 (patch-ab) = 4560550206a0d54188ec1112979725c2
-MD5 (patch-ac) = 30c3d00148c1bc45dc6e8b5cce0fcb85
-MD5 (patch-af) = 0356628158e3a974b7e6529d32be22ed
-MD5 (patch-ag) = 9703c6645bea3229261a5e6a47ab41b7
+SHA1 (patch-aa) = cfeacf95e8cd2b3638acc9451aaa60eb29fa524d
+SHA1 (patch-ab) = 7a2c449b42814bb71544d4d4fcbc93d98b7ec336
+SHA1 (patch-af) = 66042e4a4299645d809150b3d70806892ed3f203
diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa
index 06abf147727..d9829906c96 100644
--- a/www/amaya/patches/patch-aa
+++ b/www/amaya/patches/patch-aa
@@ -1,11 +1,12 @@
-$NetBSD: patch-aa,v 1.4 2001/02/28 10:26:03 wiz Exp $
---- ../configure.orig	Sun Jan 14 12:11:19 2001
-+++ ../configure	Sun Jan 14 12:20:22 2001
-@@ -1651,58 +1651,12 @@
+$NetBSD: patch-aa,v 1.5 2001/04/09 16:44:59 drochner Exp $
+
+--- ../configure.orig	Wed Feb 28 11:34:16 2001
++++ ../configure
+@@ -1651,57 +1651,11 @@
    :
  fi
  
--if test "$with_included_jpeg" != "yes" ; 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
@@ -15,7 +16,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/28 10:26:03 wiz Exp $
 -         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'
@@ -26,8 +27,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/28 10:26:03 wiz Exp $
 -        LIBJPEG='../libjpeg.a'              
 -fi
 -rm -f conftest*
-+	JPEGINCL=-I${LOCALBASE}/include
- 
+-
 -    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
@@ -37,16 +37,16 @@ $NetBSD: patch-aa,v 1.4 2001/02/28 10:26:03 wiz Exp $
 -	x PNG_LIBPNG_VER_STRING x
 -EOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "x \"1.0\..*\" 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
@@ -57,17 +57,26 @@ $NetBSD: patch-aa,v 1.4 2001/02/28 10:26:03 wiz Exp $
 -    LIBPNG='../libpng.a'
 -    LIBZ='../libz.a'
 -fi
--
-+	LIBZ=''
  
  
  
-@@ -6518,7 +6472,7 @@
+@@ -6453,10 +6407,7 @@
+ #there is a modified header file we need
+ PNGINCL="-I\$(THOTDIR)/libpng -I\$(THOTDIR)/libpng/zlib"
+ fi
+-if test "${LIBJPEG}" = "../libjpeg.a" ; then
+-#there is a modified header file we need
+-JPEGINCL="-I\$(THOTDIR)/libjpeg"
+-fi
++JPEGINCL="-I${LOCALBASE}/include"
+ 
+ 
+ THOTINCLUDES="-I${API} -I${VAR} -I${INCL} -I${FUNC} -I${SCHEMAS} ${JPEGINCL} ${PNGINCL}"
+@@ -6523,7 +6474,6 @@
  
  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 50f3b0d8c6e..32aa5b266a3 100644
--- a/www/amaya/patches/patch-ab
+++ b/www/amaya/patches/patch-ab
@@ -1,12 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2001/02/28 10:26:03 wiz Exp $
---- ../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
-+        ../libpng.a ../amaya/libCSS.a
- 	$(CC) $(LDFLAGS) -o $@ $(THOTK_OBJ) $(DISPLAY_OBJ) $(PRINT_OBJ) ../amaya/libCSS.a -lThotTable $(LIBS)
- 	@$(ECHO) "====>" print is done
- 
+$NetBSD: patch-ab,v 1.4 2001/04/09 16:44:59 drochner Exp $
+
+--- ../Makefile.in.orig	Fri Mar 23 22:50:48 2001
++++ ../Makefile.in
+@@ -364,11 +364,7 @@
+ $(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/patches/patch-ac b/www/amaya/patches/patch-ac
deleted file mode 100644
index 5b2046a9d16..00000000000
--- a/www/amaya/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/02/28 10:26:03 wiz Exp $
---- ../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
-+AMAYA_LIBWWW_SRC= amaya_comp_libwww
- 
- amaya_comp_libwww : force
- 		@(cd .. ; $(MAKE) libwww)
diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af
index d53d0920227..aa7e8722861 100644
--- a/www/amaya/patches/patch-af
+++ b/www/amaya/patches/patch-af
@@ -1,14 +1,13 @@
-$NetBSD: patch-af,v 1.1 2000/08/22 17:28:29 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2001/04/09 16:45:00 drochner Exp $
 
-make sure the private libwww is searched first instead of a locally
-installed one
-
---- ../amaya/Makefile.in.orig	Wed Apr 19 08:33:09 2000
-+++ ../amaya/Makefile.in	Tue Aug 22 13:10:42 2000
-@@ -344,5 +344,5 @@
+--- ../amaya/Makefile.in.orig	Mon Apr  9 17:33:08 2001
++++ ../amaya/Makefile.in	Mon Apr  9 17:35:24 2001
+@@ -411,7 +411,7 @@
+ # amaya application
  ../bin/amaya : $(AMAYA_OBJ) $(AMAYA_OPTION_OBJ) $(AMAYA_LIBS)
  	@(if test ! -d ../bin ; then $(MKDIR) ../bin ; fi)
 -	$(CC) $(LDFLAGS) -o ../bin/amaya $(AMAYA_OBJ) $(AMAYA_OPTION_OBJ) libCSS.a $(LIBS)
 +	$(CC) -o ../bin/amaya $(AMAYA_OBJ) $(AMAYA_OPTION_OBJ) libCSS.a $(LIBS) $(LDFLAGS)
  	@$(ECHO) "====>" amaya is done
  
+ ../bin/print :
diff --git a/www/amaya/patches/patch-ag b/www/amaya/patches/patch-ag
deleted file mode 100644
index 7de41dd16d1..00000000000
--- a/www/amaya/patches/patch-ag
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2001/02/28 10:26:03 wiz Exp $
---- ../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 54b5e249775..8d30dd3b74e 100644
--- a/www/amaya/pkg/PLIST
+++ b/www/amaya/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/14 12:31:11 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/04/09 16:45:00 drochner Exp $
 bin/amaya
 Amaya/amaya/AmayaPage.html.fr
 Amaya/amaya/Annot.conf
@@ -13,6 +13,7 @@ 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
@@ -111,14 +112,18 @@ 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
@@ -126,6 +131,7 @@ 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
@@ -133,26 +139,35 @@ 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
@@ -161,7 +176,9 @@ 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