Updated to 8.2. This closes PR pkg/23607.

Too many changes to copy here, to see a full list of changes:

http://www.w3.org/Amaya/User/New.html.

5 files changed, 41 insertions, 42 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 5435525f9c9..464aea286ca 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2003/11/17 15:28:31 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2003/12/03 01:36:12 xtraeme Exp $
 #
 
-DISTNAME=	amaya-src-8.0
+DISTNAME=	amaya-src-8.2
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	2
 WRKSRC=		${WRKDIR}/Amaya/work
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
diff --git a/www/amaya/PLIST b/www/amaya/PLIST
index e77f744764c..89ed7f5e2b2 100644
--- a/www/amaya/PLIST
+++ b/www/amaya/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/24 14:38:17 salo Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/03 01:36:12 xtraeme Exp $
 bin/amaya
 lib/Amaya/amaya/Amaya.svg
 lib/Amaya/amaya/AmayaPage.html
@@ -53,6 +53,7 @@ lib/Amaya/amaya/Timeline.en
 lib/Amaya/amaya/TimelineP.PRS
 lib/Amaya/amaya/TimelineT.TRA
 lib/Amaya/amaya/TimelineTX.TRA
+lib/Amaya/amaya/Topics.conf
 lib/Amaya/amaya/XLink.STR
 lib/Amaya/amaya/XLink.en
 lib/Amaya/amaya/XLinkP.PRS
@@ -99,6 +100,12 @@ lib/Amaya/amaya/toggle.gif
 lib/Amaya/annotlib/Annot.STR
 lib/Amaya/annotlib/AnnotP.PRS
 lib/Amaya/annotlib/AnnotT.TRA
+lib/Amaya/annotlib/Topics.STR
+lib/Amaya/annotlib/Topics.en
+lib/Amaya/annotlib/TopicsP.PRS
+lib/Amaya/annotlib/closed.png
+lib/Amaya/annotlib/open.png
+lib/Amaya/annotlib/selected.gif
 lib/Amaya/applis/bin/amaya
 lib/Amaya/applis/bin/print
 lib/Amaya/config/XKeysymDB
@@ -126,6 +133,7 @@ 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.gl.win
 lib/Amaya/config/fonts.tmpl
 lib/Amaya/config/fonts.unix
 lib/Amaya/config/fonts.unix.deb
@@ -347,19 +355,6 @@ 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
@@ -402,6 +397,8 @@ lib/Amaya/doc/html/attaching_annotations/replying_to_annotations.html.es
 lib/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html
 lib/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html.de
 lib/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html.es
+lib/Amaya/doc/html/bookmarks.html
+lib/Amaya/doc/html/bookmarks.html.es
 lib/Amaya/doc/html/browsing/about_access_keys.html
 lib/Amaya/doc/html/browsing/about_access_keys.html.de
 lib/Amaya/doc/html/browsing/about_access_keys.html.es
@@ -465,9 +462,6 @@ lib/Amaya/doc/html/editing_documents/creating_new_documents.html.es
 lib/Amaya/doc/html/editing_documents/the_transform_command.html
 lib/Amaya/doc/html/editing_documents/the_transform_command.html.de
 lib/Amaya/doc/html/editing_documents/the_transform_command.html.es
-lib/Amaya/doc/html/editing_iso-latin-1_characters/about_optional_multikey_support.html
-lib/Amaya/doc/html/editing_iso-latin-1_characters/about_optional_multikey_support.html.de
-lib/Amaya/doc/html/editing_iso-latin-1_characters/about_optional_multikey_support.html.es
 lib/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html
 lib/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html.de
 lib/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html.es
@@ -718,7 +712,6 @@ lib/Amaya/doc/images/Editor.gif
 lib/Amaya/doc/images/Em.gif
 lib/Amaya/doc/images/Forward.gif
 lib/Amaya/doc/images/GeneralMenu-fr.gif
-lib/Amaya/doc/images/GeneralMenu.gif
 lib/Amaya/doc/images/GeomMenu-fr.gif
 lib/Amaya/doc/images/GeomMenu.gif
 lib/Amaya/doc/images/Graph.gif
@@ -768,6 +761,11 @@ lib/Amaya/doc/images/annotationwindow-es.png
 lib/Amaya/doc/images/annotationwindow.png
 lib/Amaya/doc/images/annotorp.png
 lib/Amaya/doc/images/background-de.png
+lib/Amaya/doc/images/bmbprop.png
+lib/Amaya/doc/images/bmmenu.png
+lib/Amaya/doc/images/bmtprop.png
+lib/Amaya/doc/images/bmview1.png
+lib/Amaya/doc/images/bmview2.png
 lib/Amaya/doc/images/browser_preferences-de.png
 lib/Amaya/doc/images/browsing_preferences-es.png
 lib/Amaya/doc/images/browsing_preferences.png
@@ -775,6 +773,7 @@ lib/Amaya/doc/images/cache_preferences-de.png
 lib/Amaya/doc/images/cache_preferences-es.png
 lib/Amaya/doc/images/cache_preferences.png
 lib/Amaya/doc/images/check.gif
+lib/Amaya/doc/images/closed.png
 lib/Amaya/doc/images/code.gif
 lib/Amaya/doc/images/color-de.png
 lib/Amaya/doc/images/color_preferences-de.png
@@ -814,6 +813,7 @@ lib/Amaya/doc/images/linkwindow.png
 lib/Amaya/doc/images/localfilter-es.png
 lib/Amaya/doc/images/localfilter.png
 lib/Amaya/doc/images/math_palette-de.png
+lib/Amaya/doc/images/open.png
 lib/Amaya/doc/images/printoptions_w32-de.png
 lib/Amaya/doc/images/profiles_preferences-de.png
 lib/Amaya/doc/images/profiles_preferences-es.png
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 7ea421e786d..5416b776d3a 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2003/05/24 14:38:17 salo Exp $
+$NetBSD: distinfo,v 1.10 2003/12/03 01:36:12 xtraeme Exp $
 
-SHA1 (amaya-src-8.0.tgz) = af00de3f055219d61398844a79973ba6604eb82c
-Size (amaya-src-8.0.tgz) = 8095311 bytes
+SHA1 (amaya-src-8.2.tgz) = 0c5b83ccc5f275c7a2ee35a3ab8076acf2221b75
+Size (amaya-src-8.2.tgz) = 9306337 bytes
 SHA1 (patch-aa) = daa3b4ad4e00d6e6ca855bb638cc8ec8d2565791
-SHA1 (patch-ab) = ea97ea600b9b9f785146b28c0eaae06de1f7aed4
-SHA1 (patch-ac) = 01804caad910698bc61a8f0c6dea73cafbd610c2
+SHA1 (patch-ab) = 7a3dbdff2acc18202cd31b7516b1f645a1bc0f68
+SHA1 (patch-ac) = f17a0a2112aa32481b2768871a84fdf64c1cea3b
diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab
index 93bbe73bb9b..43fedbceaa4 100644
--- a/www/amaya/patches/patch-ab
+++ b/www/amaya/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.8 2003/03/22 06:46:21 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2003/12/03 01:36:12 xtraeme Exp $
 
---- ../configure.orig	Mon Feb  3 09:43:57 2003
+--- ../configure.orig	Tue Nov  4 09:01:02 2003
 +++ ../configure
-@@ -3008,7 +3008,7 @@ EOF
- fi
+@@ -5577,7 +5577,7 @@
+ 
  
  
--for ac_hdr in stdio.h
-+for ac_hdr in stdio.h wchar.h
+-for ac_header in stdio.h
++for ac_header in stdio.h wchar.h
  do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -7019,6 +7019,8 @@ fi
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -14772,6 +14772,8 @@
  if test "$with_dav" = "yes" ; then
-     
+ 
      dav_frag=$srcdir/davlib/Makefile.dav
 +else
 +    dav_frag=/dev/null
diff --git a/www/amaya/patches/patch-ac b/www/amaya/patches/patch-ac
index 855ae92ccb4..bd8f994a84c 100644
--- a/www/amaya/patches/patch-ac
+++ b/www/amaya/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.8 2003/03/22 06:46:21 wiz Exp $
+$NetBSD: patch-ac,v 1.9 2003/12/03 01:36:12 xtraeme Exp $
 
---- ../thotlib/include/ustring.h.orig	Mon Jun 17 04:10:14 2002
+--- ../thotlib/include/ustring.h.orig	Fri Jul  4 14:35:37 2003
 +++ ../thotlib/include/ustring.h
 @@ -6,6 +6,11 @@
  #include <windows.h>
  #endif /* _WINDOWS */
  
-+#include "config.h"
-+#ifdef HAVE_WCHAR_H
-+#include <wchar.h>
-+#endif
++#include "config.h" 
++#ifdef HAVE_WCHAR_H 
++#include <wchar.h> 
++#endif 
 +
  #ifdef _WINDOWS
  #define strncasecmp _strnicmp