Update to version 2.2.

PR:		14699
Submitted by:	maintainer

4 files changed, 33 insertions, 9 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 89edb51157a4..77eb63d4fb3c 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,17 +1,18 @@
 # New ports collection makefile for:	amaya
-# Version required:	2.1
+# Version required:	2.2
 # Date created:		26 Dec 1998
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	amaya-src-2.1
-PKGNAME=	amaya-2.1
+DISTNAME=	amaya-src-2.2
+PKGNAME=	amaya-2.2
 CATEGORIES= 	www
 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=	croyle@gelemna.ft-wayne.in.us
 
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index a81a208b2573..4655a88a3491 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,3 +1,3 @@
-MD5 (amaya/amaya-src-2.1.tar.gz) = 048b5bb22a2fc424480bc9ec40315db4
+MD5 (amaya/amaya-src-2.2.tgz) = 0ba0f33f02e4e6ae5083feaf153c9ace
 MD5 (amaya/English.tar.gz) = db59f59244fbc6698934aeefd6f5e53e
 MD5 (amaya/French.tar.gz) = c18bd862588d187b86c5c0c4d0cfd306
diff --git a/www/amaya/files/patch-aa b/www/amaya/files/patch-aa
index fce3b9bdf53e..06ba164e114e 100644
--- a/www/amaya/files/patch-aa
+++ b/www/amaya/files/patch-aa
@@ -1,11 +1,11 @@
---- ../amaya/Makefile.in.orig	Tue May  4 15:54:53 1999
-+++ ../amaya/Makefile.in	Wed May  5 11:01:05 1999
+--- ../amaya/Makefile.in.orig	Wed Oct 20 04:35:53 1999
++++ ../amaya/Makefile.in	Tue Oct 26 18:05:51 1999
 @@ -10,7 +10,7 @@
  include ../Options
  
  INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(X_FLAGS)
 -XMLIB   = -lXm
-+XMLIB   = ${MOTIFLIB}
- LIBS	=  $(LIBWWW_LIBS) $(AMAYA_JAVA_LIBS) $(AMAYA_PLUGIN_LIBS) \
- 	  $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) $(AMAYA_ILU_LIBS) \
++XMLIB   = ${MOTIFLIB} 
+ LIBS	=  $(AMAYA_LIBWWW_LIBS) $(AMAYA_JAVA_LIBS) $(AMAYA_PLUGIN_LIBS) \
+ 	  $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) $(AMAYA_ANNOT_LIBS) \
            -L../tablelib -L../thotlib -L.. -lThotTable -lThotEditor \
diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist
index aae0cc73ee63..5c06567828cb 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -1,5 +1,10 @@
 Amaya/amaya/AmayaPage.html
 Amaya/amaya/COPYRIGHT.html
+Amaya/amaya/GraphML.STR
+Amaya/amaya/GraphML.en
+Amaya/amaya/GraphMLP.PRS
+Amaya/amaya/GraphMLT.TRA
+Amaya/amaya/GraphMLTX.TRA
 Amaya/amaya/HTML.STR
 Amaya/amaya/HTML.conf
 Amaya/amaya/HTML.en
@@ -14,6 +19,13 @@ Amaya/amaya/HTMLPPUS.PRS
 Amaya/amaya/HTMLT.TRA
 Amaya/amaya/HTMLTT.TRA
 Amaya/amaya/HTMLTX.TRA
+Amaya/amaya/MathML.STR
+Amaya/amaya/MathML.en
+Amaya/amaya/MathML.fr
+Amaya/amaya/MathML.trans
+Amaya/amaya/MathMLP.PRS
+Amaya/amaya/MathMLT.TRA
+Amaya/amaya/MathMLTX.TRA
 Amaya/amaya/TextFile.STR
 Amaya/amaya/TextFileP.PRS
 Amaya/amaya/TextFilePP.PRS
@@ -60,20 +72,30 @@ Amaya/doc/Icons/Back.gif
 Amaya/doc/Icons/Browser.gif
 Amaya/doc/Icons/CacheMenu.gif
 Amaya/doc/Icons/ColorMenu.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/GeomMenu.gif
+Amaya/doc/Icons/H1.gif
+Amaya/doc/Icons/H2.gif
+Amaya/doc/Icons/H3.gif
 Amaya/doc/Icons/Image.gif
 Amaya/doc/Icons/LangueNegotiation.gif
 Amaya/doc/Icons/Link.gif
 Amaya/doc/Icons/NumList.gif
+Amaya/doc/Icons/OList.gif
 Amaya/doc/Icons/Plugin.gif
+Amaya/doc/Icons/ProfilesMenu.gif
 Amaya/doc/Icons/ProxyMenu.gif
 Amaya/doc/Icons/PublishMenu.gif
 Amaya/doc/Icons/SaveAs.gif
 Amaya/doc/Icons/SourceJava.gif
 Amaya/doc/Icons/Sources.gif
+Amaya/doc/Icons/Strong.gif
+Amaya/doc/Icons/TemplatesMenu.gif
 Amaya/doc/Icons/amaya.gif
 Amaya/doc/Icons/background.gif
 Amaya/doc/Icons/bug.gif
@@ -85,6 +107,7 @@ 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/opera.gif
 Amaya/doc/Icons/put.gif