Updated to version 8.0.

Patch from Juan RP via PR pkg/21312.

Changes:

- USE_X11BASE->USE_X11

8.0:
====
New features:
- Access keys for activating menu entries (Alt + a letter) are now available
  on Windows versions.
- When the document defines an access key which is also used as a menu access
  key, Amaya gives the priority to the document access key. The user can
  change the modifier key (Ctrl instead of Alt) used by document access keys
  in the Preferences menu to avoid conflicts.
- Amaya now allows to create/change a link without using the mouse.

CSS
---
Bug fixes:
- Background images declared in style attributes were not displayed.
- The CSS parser didn't accept attribute values in selectors without quotes.
- CSS style sheets are reapplied when background images are loaded.
- @font-face could break the CSS parser.
- CSS rules contained in a style attribute were misplaced in the CSS cascade.
- Margins expressed as a percentage were not re-evaluated after some changes.
- When trying to link to a CSS file, the browser filter was not set to -.css.
New features:
- Support of the CSS property float.

SVG
---
Bug fixes:
- Amaya used the xlink:href defined by a SVG anchor instead of the xlink:href
  defined by the included SVG image.
New features:
- Support of all SVG transformations in the OpenGL versions. Transformations
  also apply to embedded XHTML and/or MathML elements.
- Support of SVG animation in the OpenGL versions. Embedded XHTML and/or
  MathML elements are animated too.

User Interface/Editing
----------------------
Bug fixes:
- Multi-script texts were misplaced in the structure view.
- When replacing an image by another image in a different format, the new
  image was not displayed.
- When two images followed each other immediately, it was impossible to insert
  some text in between.
- An existing image can be replaced using the image dialogue (image button or
  menu XHTML/Image).
- Partial redisplay of the background image didn't work correctly in Win32
  versions.
- Transparent images in Win32 versions.
- The combo box and history were not retaining the form data for GET requests.
- Amaya now looks first for the personal version of the fontconfig file in the
  user's work space.
- Background images are correctly redisplayed in all versions (GTK, MOTIF,
  Win32, OpenGL).
- When scrolling back, images with only one dimension constraint were not
  displayed correctly.
- Amaya crashed when opening the timeline view in the Spanish version.
- On Windows it was impossible to copy the content of the "Parsing errors"
  view.
- Some characters entered through the Math/Greek palette were not displayed
  correctly.
- Sometimes the text alignment was not correct.
- Sometimes Amaya displayed two selections.
- Copying text from another application and pasting it into Amaya preserves
  newlines.
New features:
- Support of attribute align="left" and align="right".

Tables
------
Bug fixes:
- Auto margins were computed too early when the document includes tables.
- Avoid to break the table rendering when CSS (or attribute) constraints are
  conflicting.
- Sometimes cells extended vertically were rendered too high.
- When the total of column widths expressed as percentage did not amount to
  100, tables were rendered badly.

HTTP
----
Bug fixes:
- Content-Location headers that gave a relative URL were not converted
  correctly into absolute URLs (related to publishing "page" rather than
  "page.html").
- When submitting a (X)HTML form from a document that had no charset, the form
  values were not translated into the document's default charset.
- Digest authentication failed when the server precised both auth and aut-int
  QoP values.
- When pipelining broke down, the connection to the server wasn't being
  closed. This opened the way to synchronization problems.

(X)HTML
------
Bug fixes:
- The xmlns attribute wasn't updated when Amaya saved a XHTML document as HTML (and vice
  versa).
- When the height of a <hr> element is limited to 1 or 2 pixels, a white line was displayed
  instead of a colored line.
- When pasting in a paragraph some text copied from another application, line breaks now
  generate new paragraphs.

MathML
------
Bug fixes:
- Amaya inserted "LeftArrow" instead of the mathematical operator "not".
- The semantics MathML element is now interpreted as a switch element and
  Amaya displays its first child it can interpret. That child may be an SVG
  construction.

I18N
----
Bug fixes:
- Arabic strings are now displayed with right glyphs.
- Alignment didn't apply correctly with Arabic and Hebrew documents.
- Examples of configuration files for Debian platforms are now provided:
  Amaya/config/fonts.gl.deb and Amaya/config/fonts.unix.deb
New features:
- New complete Spanish documentation provided by Bartolome Sintes.

XML
---
Bug fixes:
- The xmlns attribute was not removed when Amaya saved a XHTML document as
  HTML and it was not generated when Amaya saved a HTML document as XHTML.
- Amaya sometimes generated extra namespace declarations.
New features:
- MathML and SVG elements can now be inserted through the interface.
- Amaya now parses any generic xml element or attribute whatever its length.
- Migrated to the 0.95 version of the expat XML parser.

Annotations
-----------
Bug fixes:
- The Annotea date functions are now fully compatible with the ISO 8601
  format, as specified in http://www.w3.org/TR/NOTE-datetime.

4 files changed, 39 insertions, 22 deletions

diff --git a/www/amaya/DESCR b/www/amaya/DESCR
index 707f4fab38a..86cf6482ff7 100644
--- a/www/amaya/DESCR
+++ b/www/amaya/DESCR
@@ -1,4 +1,4 @@
-Amaya is a complete web browsing and authoring environment and comes
-equipped with a WYSIWYG style of interface, similar to that of the
-most popular commercial browsers. With such an interface, users do not
-need to know the HTML or CSS languages.
+Amaya is a complete web browsing and authoring environment and comes equipped
+with a WYSIWYG style of interface, similar to that of the most popular
+commercial browsers.  With such an interface, users do not need to know the
+HTML or CSS languages.
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index bdc1981e640..b9edc3842f6 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/05/05 19:05:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2003/05/24 14:38:17 salo Exp $
 #
 
-DISTNAME=	amaya-src-7.2
-PKGNAME=	amaya-7.2
-PKGREVISION=	1
+DISTNAME=	amaya-src-8.0
+PKGNAME=	${DISTNAME:S/-src//}
 WRKSRC=		${WRKDIR}/Amaya/work
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
@@ -16,12 +15,12 @@ HOMEPAGE=	http://www.w3.org/Amaya/
 COMMENT=	Web browser/editor from the World Wide Web Consortium (W3C)
 
 EXTRACT_ELEMENTS=	Amaya libwww
-USE_BUILDLINK2=	YES
 
-USE_X11BASE=		yes
-USE_GMAKE=		yes
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+USE_GMAKE=	YES
+GNU_CONFIGURE=	YES
 
-GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ARGS+=	--without-graphic-libs	# Use pkgsrc libraries
 CFLAGS+=		-Dunix
@@ -43,8 +42,6 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/Amaya
 
 .include "../../graphics/imlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/amaya/PLIST b/www/amaya/PLIST
index 185df0bb0c5..e77f744764c 100644
--- a/www/amaya/PLIST
+++ b/www/amaya/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/22 06:46:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/24 14:38:17 salo Exp $
 bin/amaya
+lib/Amaya/amaya/Amaya.svg
 lib/Amaya/amaya/AmayaPage.html
 lib/Amaya/amaya/AmayaPage.html.de
+lib/Amaya/amaya/AmayaPage.html.es
 lib/Amaya/amaya/AmayaPage.html.fr
 lib/Amaya/amaya/AmayaSrcSyncIndex.gif
 lib/Amaya/amaya/Annot.conf
@@ -123,8 +125,10 @@ lib/Amaya/config/fi-amayamsg
 lib/Amaya/config/fi-corrdialogue
 lib/Amaya/config/fi-libdialogue
 lib/Amaya/config/fonts.gl
+lib/Amaya/config/fonts.gl.deb
 lib/Amaya/config/fonts.tmpl
 lib/Amaya/config/fonts.unix
+lib/Amaya/config/fonts.unix.deb
 lib/Amaya/config/fonts.win
 lib/Amaya/config/fr-amayadialogue
 lib/Amaya/config/fr-amayamsg
@@ -329,6 +333,7 @@ lib/Amaya/doc/html/Views.html.de
 lib/Amaya/doc/html/Views.html.es
 lib/Amaya/doc/html/Views.html.fr
 lib/Amaya/doc/html/WebDAV.html
+lib/Amaya/doc/html/WebDAV.html.es
 lib/Amaya/doc/html/Xml.html
 lib/Amaya/doc/html/Xml.html.de
 lib/Amaya/doc/html/Xml.html.es
@@ -342,6 +347,19 @@ lib/Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.htm
 lib/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html
 lib/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.de
 lib/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.es
+lib/Amaya/doc/html/attaching_annotations/About_Reading_Annotations.html.de
+lib/Amaya/doc/html/attaching_annotations/About_Storing_Local_Annotations.html.de
+lib/Amaya/doc/html/attaching_annotations/About_Storing_Remote_Annotations.html.de
+lib/Amaya/doc/html/attaching_annotations/Annotation_Issues.html.de
+lib/Amaya/doc/html/attaching_annotations/Annotation_Menu.html.de
+lib/Amaya/doc/html/attaching_annotations/Configuring_Annotation_Settings.html.de
+lib/Amaya/doc/html/attaching_annotations/Configuring_Icons.html.de
+lib/Amaya/doc/html/attaching_annotations/Creating_an_Annotation.html.de
+lib/Amaya/doc/html/attaching_annotations/Loading_and_Presenting_Annotations.html.de
+lib/Amaya/doc/html/attaching_annotations/Moving_Annotations.html.de
+lib/Amaya/doc/html/attaching_annotations/Navigating_Annotations.html.de
+lib/Amaya/doc/html/attaching_annotations/Replying_To_Annotations.html.de
+lib/Amaya/doc/html/attaching_annotations/What_is_an_Annotation.html.de
 lib/Amaya/doc/html/attaching_annotations/about_reading_annotations.html
 lib/Amaya/doc/html/attaching_annotations/about_reading_annotations.html.de
 lib/Amaya/doc/html/attaching_annotations/about_reading_annotations.html.es
@@ -501,7 +519,6 @@ lib/Amaya/doc/html/editing_tables/remove_column.html.es
 lib/Amaya/doc/html/editing_tables/working_with_tables.html
 lib/Amaya/doc/html/editing_tables/working_with_tables.html.de
 lib/Amaya/doc/html/editing_tables/working_with_tables.html.es
-lib/Amaya/doc/html/elements/about_white_space_handling.html.es
 lib/Amaya/doc/html/elements/buttons_and_types_menu.html
 lib/Amaya/doc/html/elements/buttons_and_types_menu.html.de
 lib/Amaya/doc/html/elements/buttons_and_types_menu.html.es
@@ -511,7 +528,6 @@ lib/Amaya/doc/html/elements/changing_the_document_title.html.es
 lib/Amaya/doc/html/elements/creating_nested_structures.html
 lib/Amaya/doc/html/elements/creating_nested_structures.html.de
 lib/Amaya/doc/html/elements/creating_nested_structures.html.es
-lib/Amaya/doc/html/elements/creating_new_documents.html.es
 lib/Amaya/doc/html/elements/exiting_anchors.html
 lib/Amaya/doc/html/elements/exiting_anchors.html.de
 lib/Amaya/doc/html/elements/exiting_anchors.html.es
@@ -619,9 +635,13 @@ lib/Amaya/doc/html/style_sheets/working_with_styles.html.es
 lib/Amaya/doc/html/tans_annot.html.de
 lib/Amaya/doc/html/timeline_help.html
 lib/Amaya/doc/html/using_graphics/AddSVGLib.html
+lib/Amaya/doc/html/using_graphics/AddSVGLib.html.es
 lib/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html
+lib/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html.es
 lib/Amaya/doc/html/using_graphics/SVGLibrary.html
+lib/Amaya/doc/html/using_graphics/SVGLibrary.html.es
 lib/Amaya/doc/html/using_graphics/UseSVGLib.html
+lib/Amaya/doc/html/using_graphics/UseSVGLib.html.es
 lib/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html
 lib/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.de
 lib/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.es
@@ -721,11 +741,11 @@ lib/Amaya/doc/images/ProfilesMenu-fr.gif
 lib/Amaya/doc/images/ProfilesMenu.gif
 lib/Amaya/doc/images/ProxyMenu-fr.gif
 lib/Amaya/doc/images/ProxyMenu.gif
-lib/Amaya/doc/images/PublishMenu-es.gif
 lib/Amaya/doc/images/PublishMenu-fr.gif
 lib/Amaya/doc/images/PublishMenu.gif
 lib/Amaya/doc/images/Reload.gif
 lib/Amaya/doc/images/Reload.png
+lib/Amaya/doc/images/SVGLibrary.gif
 lib/Amaya/doc/images/SaveAs-fr.gif
 lib/Amaya/doc/images/SaveAs.gif
 lib/Amaya/doc/images/Strong.gif
@@ -763,7 +783,6 @@ lib/Amaya/doc/images/color_preferences.png
 lib/Amaya/doc/images/configuration_for_annotations-de.png
 lib/Amaya/doc/images/configuration_for_annotations-es.png
 lib/Amaya/doc/images/configuration_for_annotations.png
-lib/Amaya/doc/images/configurebox-es.png
 lib/Amaya/doc/images/configurebox-fr.png
 lib/Amaya/doc/images/configurebox.png
 lib/Amaya/doc/images/createRule-de.png
@@ -860,6 +879,7 @@ lib/Amaya/fonts/icones11.fb
 @dirrm lib/Amaya/doc/html
 @dirrm lib/Amaya/doc
 @dirrm lib/Amaya/dicopar
+@exec ${MKDIR} %D/lib/Amaya/davlib
 @dirrm lib/Amaya/davlib
 @dirrm lib/Amaya/config/libconfig
 @dirrm lib/Amaya/config
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 58866dfbe44..7ea421e786d 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2003/03/22 06:46:20 wiz Exp $
+$NetBSD: distinfo,v 1.9 2003/05/24 14:38:17 salo Exp $
 
-SHA1 (amaya-src-7.2.tgz) = c91dbca570f6fb2c9ec2075c87b15b115ae96b6c
-Size (amaya-src-7.2.tgz) = 7776292 bytes
+SHA1 (amaya-src-8.0.tgz) = af00de3f055219d61398844a79973ba6604eb82c
+Size (amaya-src-8.0.tgz) = 8095311 bytes
 SHA1 (patch-aa) = daa3b4ad4e00d6e6ca855bb638cc8ec8d2565791
 SHA1 (patch-ab) = ea97ea600b9b9f785146b28c0eaae06de1f7aed4
 SHA1 (patch-ac) = 01804caad910698bc61a8f0c6dea73cafbd610c2