Update to 3.24.1. Use abs' msgfmtstrip script from wip/ktorrent3.

GtkHTML-3.24.1 2008-10-20
-------------------------

Bug Fixes:
	#546155: Composer crash after pasting text and deleting parts of it (Milan Crha)
	#548540: Spellchecker reports possessive plurals (e.g. "horses'") as misspelled (Matthew Barnes)
	#554326: Critical warning when opening new composer and have preset a signature (Milan Crha)
	#554424: Spellchecker breaks after enabling more languages (Matthew Barnes)
	#554849: Unlocalized strings in Compose mail dialog (Takao Fujiwara)
	#556239: Inline spell-check not redone after changing the language (Matthew Barnes)

Updated Translations:
	Djihed Afifi (ar)
	Pema Geyleg (dz)
	Gil Forcada (ca)
	Takeshi AIHANA (ja)

GtkHTML-3.24.0 2008-09-22
-------------------------

Bug Fixes:
	#423395: Ensure cursor at the right position even when first time focusing to the widget (Milan Crha)
	#549232: Revise the translator comments to reference GtkComboBox, from which the "popup-shown" property and associated descriptions are taken (Matthew Barnes)

Updated Translations:
	Gintautas Miliauskas (lt)
	Lucas Lommer (cs)
	Ask H. Larsen (da)
	Hendrik Richter (de)
	Inaki Larrañaga Murgoitio (eu)
	Ilkka Tuohela (fi)
	Chao-Hsiung Liao (zh_HK, zh_TW)
	Djihed Afifi (ar)
	Gabor Kelemen (hu)
	Sandeep Shedmake (mr)
	Tirumurthi Vasudevan (ta)
	Milo Casagrande (it)
	Leonardo Ferreira Fontenelle (pt_BR)
	Changwoo Ryu (ko)
	Yavor Doganov (bg)
	Ivar Smolin (et)
	Shankar Prasad (kn)
	Philip Withnall (en_GB)
	Åsmund Skjæveland (nn)
	Funda Wang (zh_CN)

GtkHTML-3.23.92 2008-09-08
--------------------------

Bug Fixes:
	#516680: Remember focus object same as in other functions (Milan Crha)

Updated Translations:
	Philip Withnall (en_GB)
	Rodrigo Marques Flores (pt_BR)
	Sweta Kothari (gu)
	Daniel Nylander (sv)

GtkHTML-3.23.91 2008-09-01
--------------------------

Updated Translations:
	Og Maciel (pt_BR)
	Sweta Kothari (gu)
	Shankar Prasad (kn)
	Daniel Nylander (sv)
	Lucas Hermann Negri (pt_BR)
	Inaki Larranaga Murgoitio (eu)
	Ivar Smolin (et)

GtkHTML-3.23.90 2008-08-16
--------------------------

Bug Fixes:
	#540794: Sanitize HTMLENGINE by checking whether we have a HTMLEngine (Tobias Mueller)
	#543318: Force the codeset to UTF-8 (Pascal Terjan)

Other Contributors:
	Fix compiler warnings (Matthew Barnes)

Updated Translations:
	Harivishnu (ml)
	Takeshi AIHANA (ja)
	Duarte Loreto (pt)
	Ilkka Tuohela (fi)
	Yair Hershkovitz (he)
	Chao-Hsiung Liao (zh_HK)
	Chao-Hsiung Liao (zh_TW)
	Youssef Chahibi (ar)

GtkHTML-3.23.6 2008-08-04
--------------------------

Bug Fixes:
	#545559: Respect Gnome settings regarding cursor blinking (Milan Crha)

Updated Translations:
	Ivar Smolin (et)
	Youssef Chahibi (ar)
	Vladimir Melo (pt_BR)
	Bruno Brouard (fr)

GtkHTML-3.23.5 2008-07-21
--------------------------

Bug Fixes:
	#244888: Add accelerators for "justify-left" (Ctrl+L), "justify-center" (Ctrl+E) and "justify-right" (Ctrl+R).  Change the "word-wrap" accelerator from Ctrl+L to Ctrl+Backslash (Matthew Barnes)
	#408707: Implements the first of several suggested UI improvements in the bug (Matthew Barnes)
	#423395: New API to let GtkHTML know where to place cursor on the first focus event, based on the anchor name (Milan Crha)
	#446894: Use the widget style's font rather than a hardcoded font (Matthew Barnes)
	#493783: Restore last scrollbar position when done with substreams (Milan Crha)
	#538703: Delay loading of all dictionaries to improve performance (Wang Xin)
	#539289: Don't use deprecated gtk type macros (Christian Persch)
	#540342: Fix a security vulnerability (Milan Crha)
	#540929: Stop expanding columns as soon as there were no columns expanded during the cycle (Milan Crha)
	#542567: Correct the shortcuts for increasing and decreasing indents (B S Srinidhi)

Updated Translations:
	Luca Ferretti (it)
	Andre Klapper (de)
	Ignacio Casal Quinteiro (gl)
	Daniel Nylander (sv)
	Matej Urbanči (sl)
	Theppitak Karoonboonyanan (th)
	Kjartan Maraas (nb)
	Jorge Gonzalez (es)
	Yannig Marchegay (oc)

GtkHTML-3.23.4 2008-06-16
--------------------------

Bug Fixes:
	#533741: Don't insert BOM into UTF-8 text when copying to clipboard; filter it out when pasting from clipboard (Vaclav Slavik)
	#536635: Allow gtkhtml to build with G_DISABLE_SINGLE_INCLUDES and GTK_DISABLE_SINGLE_INCLUDES defined (Matthew Barnes)
	#537397: Fix a duplicate mnemonic (Matthew Barnes)

Updated Translations:
	Ivar Smolin (et)
	Theppitak Karoonboonyanan (th)
	Khaled Hosny (ar)
	Ignacio Casal Quinteiro  (gl)

GtkHTML-3.23.3 2008-06-02
--------------------------

Bug Fixes:
	#524338: Reverting the fix for bug #342659 which caused the fickering (Srinivasa Ragavan)

Updated Translations:
	Máté Őry (hu)
	Clytie Siddall (vi)
	Khaled Hosny (ar)

GtkHTML-3.23.2 2008-05-12
--------------------------

Bug Fixes:
	#525996: Look for data files in our own installation prefix, to make running local builds easier (Matthew Barnes)

Other Contributors:
	Don't translate a bunch of useless widget labels. (Kjartan Maraas)

Updated Translations:
	Yair Hershkovitz (he)
	Kjartan Maraas (nb)
	Jorge Gonzalez (es)

GtkHTML-3.23.1 2008-04-21
--------------------------

Bug Fixes:
	#266206: Bunch of  input method fixes (Owen Taylor, Matthew Barnes)
	#339093: Skip ZOOM commands only when in non-editing mode and when not invoked by key bindings. (Milan Crha)
	#458369: Merge two similar translated strings. (Matthew Barnes)
	#483745: Add tooltip for text color combo. (Milan Crha)
	#512046: Gtkhtml freezes when backward searching in e-mail editing window (Takao Fujiwara)
	#520711: Fix runtime critical warnings (Milan Crha)
	#525977: Add a --with-glade-catalog option for installing Glade 3 catalog files (for maintainers only). Defaults to 'no'. (Matthew Barnes)
	#526152: Defer management of spell check languages and color to the editor component. (Matthew Barnes)

Updated Translations:
	Kjartan Maraas (nb)
	Jorge Gonzalez (es)
	Eskild Hustvedt (nn)

5 files changed, 55 insertions, 26 deletions

diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index d15618dd1a3..483dd1a1420 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2008/07/15 10:38:32 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2008/10/24 19:27:18 wiz Exp $
 #
 
-DISTNAME=	gtkhtml-3.18.3
+DISTNAME=	gtkhtml-3.24.1
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml314/}
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -18,9 +18,17 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
-PKGCONFIG_OVERRIDE+=	src/libgtkhtml.pc.in
+PKGCONFIG_OVERRIDE+=	components/editor/gtkhtml-editor.pc.in
+PKGCONFIG_OVERRIDE+=	gtkhtml/libgtkhtml.pc.in
+
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ; do \
+	    mv $$f $$f.original ; \
+	    ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
 
-.include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
@@ -30,5 +38,7 @@ PKGCONFIG_OVERRIDE+=	src/libgtkhtml.pc.in
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml314/PLIST b/www/gtkhtml314/PLIST
index 567cdb05aa4..6f6e4335636 100644
--- a/www/gtkhtml314/PLIST
+++ b/www/gtkhtml314/PLIST
@@ -1,4 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2007/11/03 15:43:06 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/10/24 19:27:18 wiz Exp $
+bin/gtkhtml-editor-test
+include/libgtkhtml-3.14/editor/gtkhtml-editor-actions.h
+include/libgtkhtml-3.14/editor/gtkhtml-editor-common.h
+include/libgtkhtml-3.14/editor/gtkhtml-editor-widgets.h
+include/libgtkhtml-3.14/editor/gtkhtml-editor.h
+include/libgtkhtml-3.14/editor/gtkhtml-spell-checker.h
+include/libgtkhtml-3.14/editor/gtkhtml-spell-language.h
 include/libgtkhtml-3.14/gtkhtml/gtkhtml-embedded.h
 include/libgtkhtml-3.14/gtkhtml/gtkhtml-enums.h
 include/libgtkhtml-3.14/gtkhtml/gtkhtml-properties.h
@@ -9,14 +16,12 @@ include/libgtkhtml-3.14/gtkhtml/gtkhtml.h
 include/libgtkhtml-3.14/gtkhtml/htmlenums.h
 include/libgtkhtml-3.14/gtkhtml/htmltokenizer.h
 include/libgtkhtml-3.14/gtkhtml/htmltypes.h
-lib/bonobo/servers/GNOME_GtkHTML_Editor-3.14.server
-lib/gtkhtml/libgnome-gtkhtml-editor-3.14.la
 lib/libgtkhtml-3.14.la
+lib/libgtkhtml-editor.la
+lib/pkgconfig/gtkhtml-editor.pc
 lib/pkgconfig/libgtkhtml-3.14.pc
-share/gtkhtml-3.14/Editor.idl
-share/gtkhtml-3.14/GNOME_GtkHTML_Editor-emacs.xml
-share/gtkhtml-3.14/GNOME_GtkHTML_Editor.xml
-share/gtkhtml-3.14/gtkhtml-editor-properties.glade
+share/gtkhtml-3.14/gtkhtml-editor.glade
+share/gtkhtml-3.14/gtkhtml-editor.ui
 share/gtkhtml-3.14/icons/bulb.png
 share/gtkhtml-3.14/icons/confidential-stamp.jpg
 share/gtkhtml-3.14/icons/draft-paper.png
@@ -72,6 +77,7 @@ share/locale/id/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/it/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/ja/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/ka/LC_MESSAGES/gtkhtml-3.14.mo
+share/locale/kn/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/ko/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/ku/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/lt/LC_MESSAGES/gtkhtml-3.14.mo
@@ -100,9 +106,10 @@ share/locale/sk/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/sl/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/sq/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/sr/LC_MESSAGES/gtkhtml-3.14.mo
-share/locale/sr@Latn/LC_MESSAGES/gtkhtml-3.14.mo
+share/locale/sr@latin/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/sv/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/ta/LC_MESSAGES/gtkhtml-3.14.mo
+share/locale/te/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/th/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/tr/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/uk/LC_MESSAGES/gtkhtml-3.14.mo
@@ -113,7 +120,6 @@ share/locale/zh_HK/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/zh_TW/LC_MESSAGES/gtkhtml-3.14.mo
 @dirrm share/gtkhtml-3.14/icons
 @dirrm share/gtkhtml-3.14
-@unexec ${RMDIR} %D/lib/gtkhtml 2>/dev/null || ${TRUE}
-@comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/libgtkhtml-3.14/gtkhtml
+@dirrm include/libgtkhtml-3.14/editor
 @dirrm include/libgtkhtml-3.14
diff --git a/www/gtkhtml314/buildlink3.mk b/www/gtkhtml314/buildlink3.mk
index c9fdbb480fa..75b6d80239b 100644
--- a/www/gtkhtml314/buildlink3.mk
+++ b/www/gtkhtml314/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/04/22 05:59:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2008/10/24 19:27:18 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML314_BUILDLINK3_MK:=	${GTKHTML314_BUILDLINK3_MK}+
@@ -12,15 +12,10 @@ BUILDLINK_PACKAGES+=	gtkhtml314
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkhtml314
 
 .if !empty(GTKHTML314_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gtkhtml314+=	gtkhtml314>=3.14.0
-BUILDLINK_ABI_DEPENDS.gtkhtml314?=	gtkhtml314>=3.18
+BUILDLINK_API_DEPENDS.gtkhtml314+=	gtkhtml314>=3.24.0
 BUILDLINK_PKGSRCDIR.gtkhtml314?=	../../www/gtkhtml314
 .endif	# GTKHTML314_BUILDLINK3_MK
 
-# XXX: gail is not required by the .pc file but appears as a library
-# '-lgailutil' in the .la file...  I'm not sure about putting the dependency
-# here.
-.include "../../devel/gail/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 
diff --git a/www/gtkhtml314/distinfo b/www/gtkhtml314/distinfo
index 647334bb56a..4f71284c5ca 100644
--- a/www/gtkhtml314/distinfo
+++ b/www/gtkhtml314/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2008/07/15 10:38:32 drochner Exp $
+$NetBSD: distinfo,v 1.11 2008/10/24 19:27:18 wiz Exp $
 
-SHA1 (gtkhtml-3.18.3.tar.bz2) = f9b46f521295f19f2a5ad1d6f204159454808f26
-RMD160 (gtkhtml-3.18.3.tar.bz2) = 954823159af30e49e3ae1ea6b996ebd893a1d110
-Size (gtkhtml-3.18.3.tar.bz2) = 1313556 bytes
+SHA1 (gtkhtml-3.24.1.tar.bz2) = 66f6fe5f4830514144e2d565589c36823d8de0c7
+RMD160 (gtkhtml-3.24.1.tar.bz2) = 844b288d414c6b8895f35102d29c9a25882ee3da
+Size (gtkhtml-3.24.1.tar.bz2) = 1438443 bytes
diff --git a/www/gtkhtml314/files/msgfmtstrip b/www/gtkhtml314/files/msgfmtstrip
new file mode 100644
index 00000000000..c61056b92a8
--- /dev/null
+++ b/www/gtkhtml314/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2008/10/24 19:27:18 wiz Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}