4 files changed, 153 insertions, 173 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 5d15f7c4f321..07b2a9411852 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	amaya
-PORTVERSION=	5.1
+PORTVERSION=	5.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tgz
+DIST_SUBDIR=	amaya
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
-DIST_SUBDIR=	amaya
 WRKSRC=		${WRKDIR}/Amaya/obj
 
 USE_MOTIF=	yes
@@ -45,7 +45,7 @@ DISTFILES+=	${DICT:S/$/.tgz/g}
 .endif
 .endif
 
-pre-fetch:
+pre-everything::
 .if ${DICT} == "none"
 	@${ECHO_MSG} Several spellchecking dictionaries are available.  To use
 	@${ECHO_MSG} one of them, define DICT to be the appropriate language.
@@ -54,6 +54,9 @@ pre-fetch:
 post-extract:
 	${MKDIR} ${WRKSRC}
 
+post-patch:
+	${PERL} -pi.dist -e 's|\"1.0\\.|\"1\\.|g' ${WRKSRC}/../configure
+
 post-configure:
 	${CP} ${WRKSRC}/Options.orig ${WRKSRC}/Options
 
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 3cdc8e06adea..b53848b3ae70 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,4 +1,4 @@
-MD5 (amaya/amaya-src-5.1.tgz) = 04c792debcd1aee79300cfbe3b37ba95
+MD5 (amaya/amaya-src-5.2.tgz) = 7f4a8211d89bedea4859be12fe098ef0
 MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
 MD5 (amaya/English.tgz) = e06eb8accd75b3e65d7ffa552244b011
 MD5 (amaya/French.tgz) = 791bc87281b27f10a987815aa7d10108
diff --git a/www/amaya/files/patch-ab b/www/amaya/files/patch-ab
deleted file mode 100644
index 68d4f0671220..000000000000
--- a/www/amaya/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../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 38cc4fbfb1ae..1a42fb07ae9c 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -2,12 +2,6 @@ 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
-Amaya/amaya/GraphMLTX.TRA
 Amaya/amaya/HTML.STR
 Amaya/amaya/HTML.conf
 Amaya/amaya/HTML.en
@@ -33,6 +27,12 @@ Amaya/amaya/MathML.trans
 Amaya/amaya/MathMLP.PRS
 Amaya/amaya/MathMLT.TRA
 Amaya/amaya/MathMLTX.TRA
+Amaya/amaya/SVG.STR
+Amaya/amaya/SVG.conf
+Amaya/amaya/SVG.en
+Amaya/amaya/SVGP.PRS
+Amaya/amaya/SVGT.TRA
+Amaya/amaya/SVGTX.TRA
 Amaya/amaya/TextFile.STR
 Amaya/amaya/TextFile.conf
 Amaya/amaya/TextFile.en
@@ -43,10 +43,11 @@ Amaya/amaya/TextFilePPUS.PRS
 Amaya/amaya/TextFileT.TRA
 Amaya/amaya/TextFileUSL.PRS
 Amaya/amaya/XLink.STR
+Amaya/amaya/XLink.en
 Amaya/amaya/XLinkP.PRS
 Amaya/amaya/XLinkT.TRA
-Amaya/amaya/XLink.en
 Amaya/amaya/XML.STR
+Amaya/amaya/XML.conf
 Amaya/amaya/XMLP.PRS
 Amaya/amaya/XMLPL.PRS
 Amaya/amaya/XMLPP.PRS
@@ -102,6 +103,10 @@ Amaya/config/tr-amayamsg
 Amaya/config/tr-corrdialogue
 Amaya/config/tr-libdialogue
 Amaya/config/unix-thot.rc
+Amaya/dicopar/Eperso.dic
+Amaya/dicopar/Eprinc.dic
+Amaya/dicopar/Fperso.dic
+Amaya/dicopar/Fprinc.dic
 Amaya/dicopar/alphabet
 Amaya/dicopar/american.ptn
 Amaya/dicopar/clavier
@@ -114,162 +119,146 @@ Amaya/dicopar/italiano.ptn
 Amaya/dicopar/nederl.ptn
 Amaya/dicopar/portug.ptn
 Amaya/dicopar/swedish.ptn
-Amaya/doc/Icons/Back.gif
-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/Reload.png
-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/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
-Amaya/doc/amaya/HTML-elements/infoTypes.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/HTML.html
-Amaya/doc/amaya/ImageMaps.html
-Amaya/doc/amaya/ImageMaps.html.fr
-Amaya/doc/amaya/Index.html
-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/doc/amaya/index.css
+Amaya/doc/html/Access.html
+Amaya/doc/html/Access.html.fr
+Amaya/doc/html/Annotations.html
+Amaya/doc/html/Annotations.html.fr
+Amaya/doc/html/Attributes.html
+Amaya/doc/html/Attributes.html.fr
+Amaya/doc/html/Browsing.html
+Amaya/doc/html/Browsing.html.fr
+Amaya/doc/html/Changing.html
+Amaya/doc/html/Changing.html.fr
+Amaya/doc/html/Configure.html
+Amaya/doc/html/Configure.html.fr
+Amaya/doc/html/Creating.html
+Amaya/doc/html/Creating.html.fr
+Amaya/doc/html/HTML-elements/40styling.html
+Amaya/doc/html/HTML-elements/address.html
+Amaya/doc/html/HTML-elements/headings.html
+Amaya/doc/html/HTML-elements/infoTypes.html
+Amaya/doc/html/HTML-elements/inline.html
+Amaya/doc/html/HTML-elements/lists.html
+Amaya/doc/html/HTML-elements/structure.html
+Amaya/doc/html/HTML.html
+Amaya/doc/html/HTML.html.fr
+Amaya/doc/html/ImageMaps.html
+Amaya/doc/html/ImageMaps.html.fr
+Amaya/doc/html/Index.html
+Amaya/doc/html/Index.html.fr
+Amaya/doc/html/Keyboard.html
+Amaya/doc/html/Keyboard.html.fr
+Amaya/doc/html/Links.html
+Amaya/doc/html/Links.html.fr
+Amaya/doc/html/MakeBook.html
+Amaya/doc/html/MakeBook.html.fr
+Amaya/doc/html/Manual.html
+Amaya/doc/html/Manual.html.fr
+Amaya/doc/html/Math.html
+Amaya/doc/html/Math.html.fr
+Amaya/doc/html/Numbering.html
+Amaya/doc/html/Numbering.html.fr
+Amaya/doc/html/Printing.html
+Amaya/doc/html/Printing.html.fr
+Amaya/doc/html/Publishing.html
+Amaya/doc/html/Publishing.html.fr
+Amaya/doc/html/SVG.html
+Amaya/doc/html/SVG.html.fr
+Amaya/doc/html/Searching.html
+Amaya/doc/html/Searching.html.fr
+Amaya/doc/html/Selecting.html
+Amaya/doc/html/Selecting.html.fr
+Amaya/doc/html/ShortCuts.html
+Amaya/doc/html/ShortCuts.html.fr
+Amaya/doc/html/SpellChecking.html
+Amaya/doc/html/SpellChecking.html.fr
+Amaya/doc/html/StyleSheets.html
+Amaya/doc/html/StyleSheets.html.fr
+Amaya/doc/html/Tables.html
+Amaya/doc/html/Tables.html.fr
+Amaya/doc/html/Transform.html
+Amaya/doc/html/Views.html
+Amaya/doc/html/Views.html.fr
+Amaya/doc/html/index.css
+Amaya/doc/images/Back.gif
+Amaya/doc/images/Browser.gif
+Amaya/doc/images/CacheMenu.gif
+Amaya/doc/images/CacheMenufr.gif
+Amaya/doc/images/ColorMenu.gif
+Amaya/doc/images/ColorMenufr.gif
+Amaya/doc/images/Cour.gif
+Amaya/doc/images/DL.gif
+Amaya/doc/images/Editor.gif
+Amaya/doc/images/Em.gif
+Amaya/doc/images/Forward.gif
+Amaya/doc/images/GeneralMenu.gif
+Amaya/doc/images/GeneralMenufr.gif
+Amaya/doc/images/GeomMenu.gif
+Amaya/doc/images/GeomMenufr.gif
+Amaya/doc/images/Graph.gif
+Amaya/doc/images/H1.gif
+Amaya/doc/images/H2.gif
+Amaya/doc/images/H3.gif
+Amaya/doc/images/IDMenu.png
+Amaya/doc/images/Image.gif
+Amaya/doc/images/LangueNegotiation.gif
+Amaya/doc/images/LangueNegotiationfr.gif
+Amaya/doc/images/Link.gif
+Amaya/doc/images/Math.gif
+Amaya/doc/images/NumList.gif
+Amaya/doc/images/OList.gif
+Amaya/doc/images/Print.gif
+Amaya/doc/images/ProfilesMenu.gif
+Amaya/doc/images/ProfilesMenufr.gif
+Amaya/doc/images/ProxyMenu.gif
+Amaya/doc/images/ProxyMenufr.gif
+Amaya/doc/images/PublishMenu.gif
+Amaya/doc/images/PublishMenufr.gif
+Amaya/doc/images/Reload.png
+Amaya/doc/images/SaveAs.gif
+Amaya/doc/images/SaveAsfr.gif
+Amaya/doc/images/Strong.gif
+Amaya/doc/images/TemplatesMenu.gif
+Amaya/doc/images/TemplatesMenufr.gif
+Amaya/doc/images/amaya.gif
+Amaya/doc/images/annot.png
+Amaya/doc/images/annotationicon.png
+Amaya/doc/images/annotationsmenu.png
+Amaya/doc/images/annotationsmenu_fr.png
+Amaya/doc/images/annotationwindow.png
+Amaya/doc/images/annotorp.png
+Amaya/doc/images/check.gif
+Amaya/doc/images/configurebox.png
+Amaya/doc/images/configureboxfr.png
+Amaya/doc/images/css.gif
+Amaya/doc/images/cssfr.gif
+Amaya/doc/images/doc48x.gif
+Amaya/doc/images/find.gif
+Amaya/doc/images/floppy.gif
+Amaya/doc/images/left.gif
+Amaya/doc/images/linkwindow.png
+Amaya/doc/images/localfilter.png
+Amaya/doc/images/put.gif
+Amaya/doc/images/right.gif
+Amaya/doc/images/table.gif
+Amaya/doc/images/target.gif
+Amaya/doc/images/up.gif
+Amaya/doc/images/w3c_home
 Amaya/fonts/Families.list
 Amaya/fonts/fonts.dir
 Amaya/fonts/icones.ff
 Amaya/fonts/icones.pcf
 Amaya/fonts/icones1.fb
 Amaya/fonts/icones11.fb
-@dirrm Amaya/amaya
-@dirrm Amaya/annotlib
+@dirrm Amaya/fonts
+@dirrm Amaya/doc/images
+@dirrm Amaya/doc/html/HTML-elements
+@dirrm Amaya/doc/html
+@dirrm Amaya/doc
+@dirrm Amaya/dicopar
+@dirrm Amaya/config
 @dirrm Amaya/applis/bin
 @dirrm Amaya/applis
-@dirrm Amaya/config
-@dirrm Amaya/dicopar
-@dirrm Amaya/doc/Icons
-@dirrm Amaya/doc/amaya/HTML-elements
-@dirrm Amaya/doc/amaya
-@dirrm Amaya/doc
-@dirrm Amaya/fonts
+@dirrm Amaya/annotlib
+@dirrm Amaya/amaya
 @dirrm Amaya