Update to version 8.0 as per the PR referenced below.

While I'm here, add some more MASTER_SITES and fix a minor portlint
issue.

PR:		ports/52897
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

3 files changed, 55 insertions, 12 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index c99827b084d..5f37108a81e 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -6,12 +6,21 @@
 #
 
 PORTNAME=	amaya
-PORTVERSION=	7.2
+PORTVERSION=	8.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
-		ftp://ftp.w3.org/pub/amaya/
+		ftp://ftp.w3.org/pub/amaya/ \
+		http://ftp.uni-koeln.de/www/amaya/ \
+		http://public.planetmirror.com/pub/amaya/ \
+		ftp://ftp.uni-koeln.de/WWW/amaya/ \
+		http://gd.tuwien.ac.at/infosys/browsers/amaya/ \
+		http://www.mirror.ac.uk/sites/ftp.w3.org/pub/afs/w3.org/ftp/pub/amaya/ \
+		http://ftp.ntua.gr/pub/www/W3C/amaya/ \
+		ftp://ftp.ntua.gr/pub/www/W3C/amaya/ \
+		ftp://nic.funet.fi/index/WWW/W3/amaya/ \
+		http://www.nic.funet.fi/index/WWW/W3/amaya/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tgz
+EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	amaya
 
 MAINTAINER=	adam-ports@blacktabby.org
@@ -24,10 +33,12 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-graphic-libs
 
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
 DICT?=		none
 
 .if ${DICT} != "none"
@@ -44,6 +55,15 @@ DISTFILES+=	${DICT:S/$/.tgz/g}
 .endif
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} >= 4 && defined(WITH_OPENGL)
+LIB_DEPENDS+=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
+USE_MESA=	yes
+CONFIGURE_ARGS+=	--with-gl
+LDFLAGS+=	-lcompat
+.endif
+
 pre-everything::
 .if ${DICT} == "none"
 	@${ECHO_MSG} Several spellchecking dictionaries are available.  To use
@@ -51,7 +71,11 @@ pre-everything::
 .endif
 
 post-extract:
-	${MKDIR} ${WRKSRC}
+	@${MKDIR} ${WRKSRC}
+
+post-patch:
+	@${GREP} -lR "<malloc\.h>" ${WRKDIR} | ${XARGS} ${REINPLACE_CMD} -e \
+		's|<malloc\.h>|<stdlib.h>|g'
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html ${PREFIX}/Amaya/amaya
@@ -64,4 +88,4 @@ post-install:
 	${RM} ${TMPPLIST}.new
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index dece307f84f..4f08fafa35c 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,4 +1,4 @@
-MD5 (amaya/amaya-src-7.2.tgz) = 12c286a3c691c4ca0e620ebd8b2371b2
+MD5 (amaya/amaya-src-8.0.tgz) = e93c1b1bf64567b295bf4f48dfc0fc29
 MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
 MD5 (amaya/English.tgz) = c1f7122288329dc3cbb3871ea00eb4b4
 MD5 (amaya/French.tgz) = 1d3705478bdcb4b5aca827c4492f2a90
diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist
index fb8b7062ac4..37d01118f37 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -1,5 +1,7 @@
+Amaya/amaya/Amaya.svg
 Amaya/amaya/AmayaPage.html
 Amaya/amaya/AmayaPage.html.de
+Amaya/amaya/AmayaPage.html.es
 Amaya/amaya/AmayaPage.html.fr
 Amaya/amaya/AmayaSrcSyncIndex.gif
 Amaya/amaya/Annot.conf
@@ -124,8 +126,10 @@ Amaya/config/fi-amayamsg
 Amaya/config/fi-corrdialogue
 Amaya/config/fi-libdialogue
 Amaya/config/fonts.gl
+Amaya/config/fonts.gl.deb
 Amaya/config/fonts.tmpl
 Amaya/config/fonts.unix
+Amaya/config/fonts.unix.deb
 Amaya/config/fonts.win
 Amaya/config/fr-amayadialogue
 Amaya/config/fr-amayamsg
@@ -330,6 +334,7 @@ Amaya/doc/html/Views.html.de
 Amaya/doc/html/Views.html.es
 Amaya/doc/html/Views.html.fr
 Amaya/doc/html/WebDAV.html
+Amaya/doc/html/WebDAV.html.es
 Amaya/doc/html/Xml.html
 Amaya/doc/html/Xml.html.de
 Amaya/doc/html/Xml.html.es
@@ -343,6 +348,19 @@ Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html.es
 Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html
 Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.de
 Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.es
+Amaya/doc/html/attaching_annotations/About_Reading_Annotations.html.de
+Amaya/doc/html/attaching_annotations/About_Storing_Local_Annotations.html.de
+Amaya/doc/html/attaching_annotations/About_Storing_Remote_Annotations.html.de
+Amaya/doc/html/attaching_annotations/Annotation_Issues.html.de
+Amaya/doc/html/attaching_annotations/Annotation_Menu.html.de
+Amaya/doc/html/attaching_annotations/Configuring_Annotation_Settings.html.de
+Amaya/doc/html/attaching_annotations/Configuring_Icons.html.de
+Amaya/doc/html/attaching_annotations/Creating_an_Annotation.html.de
+Amaya/doc/html/attaching_annotations/Loading_and_Presenting_Annotations.html.de
+Amaya/doc/html/attaching_annotations/Moving_Annotations.html.de
+Amaya/doc/html/attaching_annotations/Navigating_Annotations.html.de
+Amaya/doc/html/attaching_annotations/Replying_To_Annotations.html.de
+Amaya/doc/html/attaching_annotations/What_is_an_Annotation.html.de
 Amaya/doc/html/attaching_annotations/about_reading_annotations.html
 Amaya/doc/html/attaching_annotations/about_reading_annotations.html.de
 Amaya/doc/html/attaching_annotations/about_reading_annotations.html.es
@@ -502,7 +520,6 @@ Amaya/doc/html/editing_tables/remove_column.html.es
 Amaya/doc/html/editing_tables/working_with_tables.html
 Amaya/doc/html/editing_tables/working_with_tables.html.de
 Amaya/doc/html/editing_tables/working_with_tables.html.es
-Amaya/doc/html/elements/about_white_space_handling.html.es
 Amaya/doc/html/elements/buttons_and_types_menu.html
 Amaya/doc/html/elements/buttons_and_types_menu.html.de
 Amaya/doc/html/elements/buttons_and_types_menu.html.es
@@ -512,7 +529,6 @@ Amaya/doc/html/elements/changing_the_document_title.html.es
 Amaya/doc/html/elements/creating_nested_structures.html
 Amaya/doc/html/elements/creating_nested_structures.html.de
 Amaya/doc/html/elements/creating_nested_structures.html.es
-Amaya/doc/html/elements/creating_new_documents.html.es
 Amaya/doc/html/elements/exiting_anchors.html
 Amaya/doc/html/elements/exiting_anchors.html.de
 Amaya/doc/html/elements/exiting_anchors.html.es
@@ -620,9 +636,13 @@ Amaya/doc/html/style_sheets/working_with_styles.html.es
 Amaya/doc/html/tans_annot.html.de
 Amaya/doc/html/timeline_help.html
 Amaya/doc/html/using_graphics/AddSVGLib.html
+Amaya/doc/html/using_graphics/AddSVGLib.html.es
 Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html
+Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html.es
 Amaya/doc/html/using_graphics/SVGLibrary.html
+Amaya/doc/html/using_graphics/SVGLibrary.html.es
 Amaya/doc/html/using_graphics/UseSVGLib.html
+Amaya/doc/html/using_graphics/UseSVGLib.html.es
 Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html
 Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.de
 Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.es
@@ -722,11 +742,11 @@ Amaya/doc/images/ProfilesMenu-fr.gif
 Amaya/doc/images/ProfilesMenu.gif
 Amaya/doc/images/ProxyMenu-fr.gif
 Amaya/doc/images/ProxyMenu.gif
-Amaya/doc/images/PublishMenu-es.gif
 Amaya/doc/images/PublishMenu-fr.gif
 Amaya/doc/images/PublishMenu.gif
 Amaya/doc/images/Reload.gif
 Amaya/doc/images/Reload.png
+Amaya/doc/images/SVGLibrary.gif
 Amaya/doc/images/SaveAs-fr.gif
 Amaya/doc/images/SaveAs.gif
 Amaya/doc/images/Strong.gif
@@ -764,7 +784,6 @@ Amaya/doc/images/color_preferences.png
 Amaya/doc/images/configuration_for_annotations-de.png
 Amaya/doc/images/configuration_for_annotations-es.png
 Amaya/doc/images/configuration_for_annotations.png
-Amaya/doc/images/configurebox-es.png
 Amaya/doc/images/configurebox-fr.png
 Amaya/doc/images/configurebox.png
 Amaya/doc/images/createRule-de.png