Update to 2.6.0. Changes since previous stable version (2.4.x):

Overview of Changes in gtkhtml2 2.6.0
=====================================
None.

Overview of Changes in gtkhtml2 2.5.6
=====================================
* Redraw cursor quickly when cursor is moved. (bug #135484)

=====================================
Overview of Changes in gtkhtml2 2.5.5
=====================================
* Fix porting issues for AIX C complier (bug #134860)
[bugzilla-gnome@thewrittenword.com].

Overview of Changes in gtkhtml2 2.5.4
=====================================
* Fix memory corruption problems. (bug #133518).

Overview of Changes in gtkhtml2 2.5.3
=====================================
* Correct inconsistency between byte offset and character offset when
selecting text. (bug #131425)

* Add support for virtual cursor position when scrolling up and down with
cursor showing. (bug 131216)

* Fix loooping error which occurred when reading accessible content of page
which contained HtmlBoxText without any text. (bug #131453)

* Correct cursor placement at end of paragraphs. (bug #131550)

* Correct creation of accessible objects for objects containing text.
(bug #131553)

* Emit text-caret-moved signal when cursor is moved and accessibility is
enabled. (bug #131465)

* Added FLOWS_FROM and FLOW_TO relations for accessible objects containing
text. (bug #131462)

* Move cursor when focus changes. (bug #131908)

* Correct link index value in link-selected signal (bug #131912)

* Remove file data/gtkhtml2.xcf as it is not used.


Overview of Changes in gtkhtml2 2.5.2
=====================================
* Emit selection-changed events when accessibility is enabled and
text is selected. (bug #125309)

* Fix crasher bug when float:center is specified in the html. (bug #129486)

* Fix crasher bug when multiple HTML documents are used in a HtmlView.
(bug #130789)

* Implement F7 to toggle showing cursor. Implement moving cursor by character,
word, line and page and to top or end using the keyboard.. Also implement
selection of text.

Overview of Changes in gtkhtml2 2.5.1
=====================================
* Fix crasher bug when document is deleted. (bug #127946)

Overview of Changes in gtkhtml2 2.5.0
=====================================
* Emit notification when new HTML page is displayed. (bugg #124199)

* Use correct language so that glyphs are displayed correctly for Chinese.
[Phill Zhang] (bug #124650)

* Make focus line visible, particularly when large font is uded. (bug #125290)

* Show text in correct font after font size is decreased. (bug #125301)

* Fix crasher problem when gok is used with yelp. (bug #126294)

* Correct implementation of moving focus out of HtmlView (bug #90281)

4 files changed, 10 insertions, 13 deletions

diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index c41be7d1690..ffecb529246 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2004/04/01 18:32:37 jmmv Exp $
 #
 
-DISTNAME=	libgtkhtml-2.4.1
-PKGREVISION=	6
+DISTNAME=	libgtkhtml-2.6.0
 CATEGORIES=	www devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgtkhtml/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/www/libgtkhtml/buildlink2.mk b/www/libgtkhtml/buildlink2.mk
index f95c24db6df..098d0828f74 100644
--- a/www/libgtkhtml/buildlink2.mk
+++ b/www/libgtkhtml/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.13 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2004/04/01 18:32:38 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use libgtkhtml.
 #
@@ -9,8 +9,7 @@
 LIBGTKHTML_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgtkhtml
-BUILDLINK_DEPENDS.libgtkhtml?=		libgtkhtml>=2.4.1nb2
-BUILDLINK_RECOMMENDED.libgtkhtml?=	libgtkhtml>=2.4.1nb6
+BUILDLINK_DEPENDS.libgtkhtml?=		libgtkhtml>=2.6.0
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgtkhtml=libgtkhtml
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index df1052737be..932fb45b424 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/04/01 18:32:38 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGTKHTML_BUILDLINK3_MK:=	${LIBGTKHTML_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtkhtml}
 BUILDLINK_PACKAGES+=	libgtkhtml
 
 .if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtkhtml+=		libgtkhtml>=2.4.1nb5
-BUILDLINK_RECOMMENDED.libgtkhtml?=	libgtkhtml>=2.4.1nb6
+BUILDLINK_DEPENDS.libgtkhtml+=		libgtkhtml>=2.6.0
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 .endif	# LIBGTKHTML_BUILDLINK3_MK
 
diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo
index d81b6821153..408fba8bfab 100644
--- a/www/libgtkhtml/distinfo
+++ b/www/libgtkhtml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/12/14 19:52:26 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2004/04/01 18:32:38 jmmv Exp $
 
-SHA1 (libgtkhtml-2.4.1.tar.bz2) = 0fa5be591bd66aa8e9f958d0995ddef522443de7
-Size (libgtkhtml-2.4.1.tar.bz2) = 408563 bytes
+SHA1 (libgtkhtml-2.6.0.tar.bz2) = 24d31acfc923ef214a3d4e4e66527e5800a76217
+Size (libgtkhtml-2.6.0.tar.bz2) = 426126 bytes