upgrade to 6.1

PR:		38390
Submitted by:	maintainer, Ports Fury

3 files changed, 31 insertions, 13 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index c0170e4cbafe..56ea84f84cee 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amaya
-PORTVERSION=	5.3
+PORTVERSION=	6.1
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/
@@ -21,13 +21,13 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/Amaya/obj
 
-USE_MOTIF=	yes
+USE_IMLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--without-graphic-libs
+CONFIGURE_ARGS=	--with-gtk --without-graphic-libs --without-i18n
 
 DICT?=		none
 
@@ -55,10 +55,13 @@ post-extract:
 	${MKDIR} ${WRKSRC}
 
 post-patch:
-	${PERL} -pi.dist -e 's|\"1.0\\.|\"1\\.|g' ${WRKSRC}/../configure
+	${PERL} -pi.dist -e 's|\"1.0\\.|\"1\\.|g ; \
+		 s|gtk-config --cflags|imlib-config --cflags-gdk|g ; \
+		 s|gtk-config --libs|imlib-config --libs-gdk|g ; \
+		 s| -lgdk_imlib||g' ${WRKSRC}/../configure
 
 post-configure:
-	${CP} ${WRKSRC}/Options.orig ${WRKSRC}/Options
+	${LN} -sf ${WRKSRC}/Options.orig ${WRKSRC}/Options
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html ${PREFIX}/Amaya/amaya
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 69c1fbbe7674..6151ba97f5c0 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,4 +1,4 @@
-MD5 (amaya/amaya-src-5.3.tgz) = 2275a7d74aa7148caab9e30a1bfbcd5a
+MD5 (amaya/amaya-src-6.1.tgz) = 4d085e1b69c4399813347ccc2cc66078
 MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
 MD5 (amaya/English.tgz) = e06eb8accd75b3e65d7ffa552244b011
 MD5 (amaya/French.tgz) = 791bc87281b27f10a987815aa7d10108
diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist
index bceee93f1d79..28c49df8d7b9 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -54,14 +54,22 @@ Amaya/amaya/XMLPP.PRS
 Amaya/amaya/XMLPPUS.PRS
 Amaya/amaya/XMLT.TRA
 Amaya/amaya/XMLUSL.PRS
+Amaya/amaya/advice.png
 Amaya/amaya/amaya.png
 Amaya/amaya/annot.gif
+Amaya/amaya/annot.png
 Amaya/amaya/annotorp.gif
+Amaya/amaya/change.png
+Amaya/amaya/comment.png
+Amaya/amaya/example.png
+Amaya/amaya/explanation.png
 Amaya/amaya/index.gif
 Amaya/amaya/lost.gif
 Amaya/amaya/option.gif
+Amaya/amaya/question.png
 Amaya/amaya/radio-s.gif
 Amaya/amaya/radio.gif
+Amaya/amaya/seealso.png
 Amaya/amaya/target.gif
 Amaya/amaya/toggle-s.gif
 Amaya/amaya/toggle.gif
@@ -126,6 +134,8 @@ Amaya/doc/html/Browsing.html
 Amaya/doc/html/Changing.html
 Amaya/doc/html/Configure.html
 Amaya/doc/html/Creating.html
+Amaya/doc/html/Document.html
+Amaya/doc/html/EditChar.html
 Amaya/doc/html/HTML-elements/40styling.html
 Amaya/doc/html/HTML-elements/address.html
 Amaya/doc/html/HTML-elements/headings.html
@@ -136,7 +146,6 @@ Amaya/doc/html/HTML-elements/structure.html
 Amaya/doc/html/HTML.html
 Amaya/doc/html/ImageMaps.html
 Amaya/doc/html/Index.html
-Amaya/doc/html/Keyboard.html
 Amaya/doc/html/Links.html
 Amaya/doc/html/MakeBook.html
 Amaya/doc/html/Manual.html
@@ -153,9 +162,10 @@ Amaya/doc/html/StyleSheets.html
 Amaya/doc/html/Tables.html
 Amaya/doc/html/Transform.html
 Amaya/doc/html/Views.html
-Amaya/doc/html/accessibility_in _amaya/about_amayas_accessibility_features.html
-Amaya/doc/html/accessibility_in _amaya/about_producing_accessible_content.html
-Amaya/doc/html/accessibility_in _amaya/accessibility_in_amaya.html
+Amaya/doc/html/Xml.html
+Amaya/doc/html/accessibility_in_amaya/about_amayas_accessibility_features.html
+Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html
+Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html
 Amaya/doc/html/attaching_annotations/about_reading_annotations.html
 Amaya/doc/html/attaching_annotations/about_storing_local_annotations.html
 Amaya/doc/html/attaching_annotations/about_storing_remote_annotations.html
@@ -173,6 +183,7 @@ Amaya/doc/html/browsing/about_access_keys.html
 Amaya/doc/html/browsing/about_moving_backward_and_forward.html
 Amaya/doc/html/browsing/about_target_anchors.html
 Amaya/doc/html/browsing/activating_a_link.html
+Amaya/doc/html/browsing/forms.html
 Amaya/doc/html/browsing/opening_documents.html
 Amaya/doc/html/browsing/reloading_a_page.html
 Amaya/doc/html/browsing/types.html
@@ -188,9 +199,11 @@ Amaya/doc/html/editing_attributes/working_with_attributes.html
 Amaya/doc/html/editing_documents/about_inserting_a_division.html
 Amaya/doc/html/editing_documents/about_merging_elements.html
 Amaya/doc/html/editing_documents/changing_the_document_structure.html
+Amaya/doc/html/editing_documents/creating_new_documents.html
 Amaya/doc/html/editing_documents/the_transform_command.html
 Amaya/doc/html/editing_iso-latin-1_characters/about_optional_multikey_support.html
 Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html
+Amaya/doc/html/editing_iso-latin-1_characters/about_white_space_handling.html
 Amaya/doc/html/editing_iso-latin-1_characters/entering_ISOLatin1_characters_in_amaya.html
 Amaya/doc/html/editing_mathematics/about_entering_math_characters.html
 Amaya/doc/html/editing_mathematics/about_entering_math_constructs_using_the_keyboard.html
@@ -206,11 +219,9 @@ Amaya/doc/html/editing_tables/add_tbody.html
 Amaya/doc/html/editing_tables/create_table.html
 Amaya/doc/html/editing_tables/remove_column.html
 Amaya/doc/html/editing_tables/working_with_tables.html
-Amaya/doc/html/elements/about_white_space_handling.html
 Amaya/doc/html/elements/buttons_and_types_menu.html
 Amaya/doc/html/elements/changing_the_document_title.html
 Amaya/doc/html/elements/creating_nested_structures.html
-Amaya/doc/html/elements/creating_new_documents.html
 Amaya/doc/html/elements/exiting_anchors.html
 Amaya/doc/html/elements/the_enter_key.html
 Amaya/doc/html/elements/the_structure_menu.html
@@ -260,6 +271,9 @@ Amaya/doc/html/using_image_maps/resizing_image_map_areas.html
 Amaya/doc/html/using_image_maps/using_clientside_image_maps.html
 Amaya/doc/html/using_image_maps/working_with_image_maps.html
 Amaya/doc/html/using_the_makebook_function/assembling_large_document_collections.html
+Amaya/doc/html/using_xml/editing_xml_document.html
+Amaya/doc/html/using_xml/loading_xml_document.html
+Amaya/doc/html/using_xml/xml_using_style.html
 Amaya/doc/html/viewing/about_synchronized_views.html
 Amaya/doc/html/viewing/closing_a_view.html
 Amaya/doc/html/viewing/opening_a_view.html
@@ -355,6 +369,7 @@ Amaya/fonts/icones11.fb
 @dirrm Amaya/fonts
 @dirrm Amaya/doc/images
 @dirrm Amaya/doc/html/viewing
+@dirrm Amaya/doc/html/using_xml
 @dirrm Amaya/doc/html/using_the_makebook_function
 @dirrm Amaya/doc/html/using_image_maps
 @dirrm Amaya/doc/html/using_graphics
@@ -375,7 +390,7 @@ Amaya/fonts/icones11.fb
 @dirrm Amaya/doc/html/configuring_amaya
 @dirrm Amaya/doc/html/browsing
 @dirrm Amaya/doc/html/attaching_annotations
-@dirrm Amaya/doc/html/accessibility_in _amaya
+@dirrm Amaya/doc/html/accessibility_in_amaya
 @dirrm Amaya/doc/html/HTML-elements
 @dirrm Amaya/doc/html
 @dirrm Amaya/doc