Update to 4.2.1.

Change maintainer to ports@freebsd.org

PR:		23952
Submitted by:	Don Croyle <croyle@gelemna.org>

5 files changed, 88 insertions, 11 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index a41ab281a13e..32dde83ce058 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	amaya
-PORTVERSION=	3.2.1
+PORTVERSION=	4.2.1
 CATEGORIES= 	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	croyle@gelemna.org
+MAINTAINER=	ports@freebsd.org
 
 USE_MOTIF=	yes
 USE_XLIB=	yes
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index cf4c1b1c788b..5605beb75f3f 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,4 +1,4 @@
-MD5 (amaya/amaya-src-3.2.1.tgz) = 4b9ab0be44413dd35790bafb8d43737a
+MD5 (amaya/amaya-src-4.2.1.tgz) = 2d8af7c6e76544bb92f22abd5c589d86
 MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
 MD5 (amaya/English.tgz) = e06eb8accd75b3e65d7ffa552244b011
 MD5 (amaya/French.tgz) = 791bc87281b27f10a987815aa7d10108
diff --git a/www/amaya/files/patch-aa b/www/amaya/files/patch-aa
index 02ffc3874aa3..e4281d9c2670 100644
--- a/www/amaya/files/patch-aa
+++ b/www/amaya/files/patch-aa
@@ -1,11 +1,11 @@
---- ../amaya/Makefile.in.orig	Tue Mar  7 11:45:48 2000
-+++ ../amaya/Makefile.in	Sun Apr 16 04:39:12 2000
+--- ../amaya/Makefile.in.orig	Thu Nov 23 09:03:30 2000
++++ ../amaya/Makefile.in	Sat Dec 30 01:39:48 2000
 @@ -10,7 +10,7 @@
  include ../Options
  
- INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(X_FLAGS)
+ INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(EXPAT_INCLUDES) $(X_FLAGS)
 -XMLIB   = -lXm
-+XMLIB   = ${MOTIFLIB} 
- LIBS	=  $(AMAYA_LIBWWW_LIBS) $(AMAYA_PLUGIN_LIBS) \
- 	  $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) $(AMAYA_ANNOT_LIBS) \
++XMLIB   = ${MOTIFLIB}
+ LIBS	=  $(AMAYA_PLUGIN_LIBS) $(AMAYA_ANNOT_LIBS) \
+ 	   $(AMAYA_LIBWWW_LIBS) $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \
            -L../tablelib -L../thotlib -L.. -lThotTable -lThotEditor \
diff --git a/www/amaya/files/patch-ab b/www/amaya/files/patch-ab
new file mode 100644
index 000000000000..68d4f0671220
--- /dev/null
+++ b/www/amaya/files/patch-ab
@@ -0,0 +1,12 @@
+--- ../thotlib/include/ustring.h.orig	Thu Dec 21 06:07:13 2000
++++ ../thotlib/include/ustring.h	Sat Dec 30 01:45:55 2000
+@@ -5,7 +5,9 @@
+ #ifdef _WINDOWS
+ #include <windows.h>
+ #endif /* _WINDOWS */
++#ifdef _I18N_
+ #include <wchar.h>
++#endif /* _I18N_ */
+ 
+ #ifdef _WINDOWS
+ #define strncasecmp _strnicmp
diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist
index 3c3dd5908ed6..9714f449b32d 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -1,6 +1,9 @@
 Amaya/amaya/AmayaPage.html
+Amaya/amaya/AmayaPage.html.fr
+Amaya/amaya/Annot.conf
 Amaya/amaya/COPYRIGHT.html
 Amaya/amaya/GraphML.STR
+Amaya/amaya/GraphML.conf
 Amaya/amaya/GraphML.en
 Amaya/amaya/GraphMLP.PRS
 Amaya/amaya/GraphMLT.TRA
@@ -8,7 +11,6 @@ Amaya/amaya/GraphMLTX.TRA
 Amaya/amaya/HTML.STR
 Amaya/amaya/HTML.conf
 Amaya/amaya/HTML.en
-Amaya/amaya/HTML.fr
 Amaya/amaya/HTML.trans
 Amaya/amaya/HTMLP.PRS
 Amaya/amaya/HTMLPBW.PRS
@@ -24,8 +26,8 @@ Amaya/amaya/HTMLTX.TRA
 Amaya/amaya/HTMLUSL.PRS
 Amaya/amaya/HTMLUSLL.PRS
 Amaya/amaya/MathML.STR
+Amaya/amaya/MathML.conf
 Amaya/amaya/MathML.en
-Amaya/amaya/MathML.fr
 Amaya/amaya/MathML.trans
 Amaya/amaya/MathMLP.PRS
 Amaya/amaya/MathMLT.TRA
@@ -41,12 +43,31 @@ Amaya/amaya/TextFileUSL.PRS
 Amaya/amaya/XLink.STR
 Amaya/amaya/XLinkP.PRS
 Amaya/amaya/XLinkT.TRA
+Amaya/amaya/XLink.en
+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/applis/bin/amaya
 @exec ln -sf %D/%F %D/bin/amaya
 @unexec rm -f %D/bin/amaya
 Amaya/applis/bin/print
 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/de-amayadialogue
 Amaya/config/de-amayamsg
 Amaya/config/de-corrdialogue
@@ -55,6 +76,10 @@ Amaya/config/en-amayadialogue
 Amaya/config/en-amayamsg
 Amaya/config/en-corrdialogue
 Amaya/config/en-libdialogue
+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-corrdialogue
@@ -91,12 +116,15 @@ 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
@@ -111,9 +139,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
@@ -123,6 +158,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
@@ -134,12 +171,20 @@ Amaya/doc/Icons/up.gif
 Amaya/doc/Icons/warning.gif
 Amaya/doc/Icons/w3c-amaya.gif
 Amaya/doc/amaya/Access.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/CSS.html
 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/HTML-elements/40styling.html
 Amaya/doc/amaya/HTML-elements/address.html
 Amaya/doc/amaya/HTML-elements/headings.html
@@ -149,21 +194,40 @@ Amaya/doc/amaya/HTML-elements/lists.html
 Amaya/doc/amaya/HTML-elements/structure.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/Views.html
+Amaya/doc/amaya/Views.html.fr
 Amaya/fonts/Families.list
 Amaya/fonts/fonts.dir
 Amaya/fonts/icones.ff
@@ -171,6 +235,7 @@ Amaya/fonts/icones.pcf
 Amaya/fonts/icones1.fb
 Amaya/fonts/icones11.fb
 @dirrm Amaya/amaya
+@dirrm Amaya/annotlib
 @dirrm Amaya/applis/bin
 @dirrm Amaya/applis
 @dirrm Amaya/config