Update to 2.4.1, based on work done by xtraeme@:

Overview of Changes in gtkhtml2 2.4.1
=====================================
* Fix crasher bug after using debug->properties dialog in testgtkhtml
(bug #121301)

* Fix crashewr bug in balsa (bug #121434)

* Add check that variable is not NULL before dereferencing it [Sven Neumann]

* Correct inconsistencies in atk_object_get_index_in_parent for children
of tables (bug #123450)

* Replace gettimeofday with g_get_current_time to allow build on Windows.
(bug #123704)

* Fix crasher bug in balsa when UTF-8 characters encountered (bug #123721)

* Fix crasher bug when dom-test is run (bug #121300)

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

Overview of Changes in gtkhtml2 2.3.6
=====================================
* Fix crasher bug when used with python. (bug #119496)

Overview of Changes in gtkhtml2 2.3.5
=====================================
* Fix name of library (.so was missing) (bug #117029)

Overview of Changes in gtkhtml2 2.3.4
=====================================
*  Ensure that activating a link when using Assistive Technology works.
(bug #116105)

* Fix ref counting error (bug #116177) [Richard Hult]

* Make link colour more visible when using Inverse themes (bug #95190)

* Fix crasher bug on devhelp startup (bug #114341)

* Set shadow_type to GTK_SHADOW_IN for scrolled windows containing
GtkTreeView for lists in forms (bug #114705) [Rodney Dawes]

* Embed GtkTextView in a scolled window and set scrolled windows shadow_type
to GTK_SHADOW_IN (bug #114713) [Rodney Dawes]

* Set form defaults correctly. (bug #114703) [Rodney Dawes]


Overview of Changes in gtkhtml2 2.3.3
=====================================

* Fix error exposed on 64-bit (bug #113869)


Overview of Changes in gtkhtml2 2.3.2
=====================================

* Fix crasher bug when mouse is moved while page is being loaded (bug #112302)


Overview of Changes in gtkhtml2 2.3.1
=====================================

* Fix crasher in yelp when changing page with text selected (bug #110012)

* Add support for <nobr> tag (bug #110265) (yuedong.du@sun.com)

* Do not return NULL for accessible child of HtmlBoxTable if there are
subsequent cells in the table. (bug #110247)

* Send notification of page change when running yelp with accessibility
enabled (bug #110267)

* Report correct number of links when run with accessibility enabled
(bug #109946)

* Make function html_selection_get_text public (bug #98381)


Overview of Changes in gtkhtml2 2.3.0
=====================================

* Fix crasher caused by incorrect reference to GtkStyle, (bug #104946)

* Rework how accessible text is presented. All the text in a paragraph is
in one accessible object instead of having an accessible object corresponding
to each HtmlBoxText, (bug #98324)

* Fix crasher caused by Korean spam, (bug #107910)

3 files changed, 10 insertions, 12 deletions

diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 56806733b1e..f26b7cf395c 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:26 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/14 19:52:26 jmmv Exp $
 #
 
-DISTNAME=	libgtkhtml-2.2.1
-PKGREVISION=	5
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgtkhtml/2.2/}
+DISTNAME=	libgtkhtml-2.4.1
+CATEGORIES=	www devel gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgtkhtml/2.4/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -20,7 +19,7 @@ USE_LIBTOOL=		yes
 USE_X11=		yes
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE=	${WRKSRC}/libgtkhtml-2.0.pc.in
+PKGCONFIG_OVERRIDE=	libgtkhtml-2.0.pc.in
 
 .include "../../devel/gail/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/www/libgtkhtml/buildlink2.mk b/www/libgtkhtml/buildlink2.mk
index f7da68428aa..6b8e3f9f0f8 100644
--- a/www/libgtkhtml/buildlink2.mk
+++ b/www/libgtkhtml/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/12/13 00:45:26 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/12/14 19:52:26 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use libgtkhtml.
 #
@@ -9,7 +9,7 @@
 LIBGTKHTML_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgtkhtml
-BUILDLINK_DEPENDS.libgtkhtml?=		libgtkhtml>=2.2.1nb5
+BUILDLINK_DEPENDS.libgtkhtml?=		libgtkhtml>=2.4.1
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgtkhtml=libgtkhtml
@@ -29,7 +29,6 @@ BUILDLINK_FILES.libgtkhtml+=	include/gtkhtml-2.0/libgtkhtml/util/*
 BUILDLINK_FILES.libgtkhtml+=	include/gtkhtml-2.0/libgtkhtml/view/*
 BUILDLINK_FILES.libgtkhtml+=	include/gtkhtml-2.0/libgtkhtml/*
 BUILDLINK_FILES.libgtkhtml+=	lib/libgtkhtml-2.*
-BUILDLINK_FILES.libgtkhtml+=	lib/pkgconfig/libgtkhtml-2.0.pc
 
 .include "../../devel/gail/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo
index 52c475a02b9..d81b6821153 100644
--- a/www/libgtkhtml/distinfo
+++ b/www/libgtkhtml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/03/15 17:15:37 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/12/14 19:52:26 jmmv Exp $
 
-SHA1 (libgtkhtml-2.2.1.tar.bz2) = 5c7528745825626e9263ca9ae5f09ef0a5623e10
-Size (libgtkhtml-2.2.1.tar.bz2) = 333024 bytes
+SHA1 (libgtkhtml-2.4.1.tar.bz2) = 0fa5be591bd66aa8e9f958d0995ddef522443de7
+Size (libgtkhtml-2.4.1.tar.bz2) = 408563 bytes