Update to 3.2.1. This version corresponds to GNOME 2.8.0.

gtkhtml-3.2.1 "Gone stable" 2004-09-10
------------------------------------------------

New in this release

   * Updated translations:
	el (Nikos Charonitakis)
	cs (Miloslav Trmac)
	it (Luca Ferretti)
	ta (Jayaradha)
	ms (Hasbullah Bin Pit)
	sq (Laurent Dhima)

gtkhtml-3.2.0 "Going stable" 2004-08-26
------------------------------------------------

New in this release

   * make sure backstore pixmap has a colormap (Robert McQueen)

New in 3.1.20

   * optionally use new gtk file chooser
   * fixed table layout calculation
   * fixed embedded widgets width
   * do not use title from MOZILLA_URL in text mode
   * fixed table cell cursor
   * a11y fixes (Eric Zhao)
   * fixed style setting in editor

New in 3.1.19

   * fixed crash in embedded widgets code
   * auto* files fixes (release string vs. api version)
   * better size request/allocation handling for child widgets
   * memory leak fix

New in 3.1.18

   * save TT tag again

New in 3.1.17

   * fixed links editing
   * fixed problems with gnome print and  's
   * fixed crash when pasting html with embedded widgets
   * display link attributes in plain text
   * fixed cursor movement
   * set iframe's base url before emitting iframe_created signal
   * disable focus forwarding in editor (Eric Zhao)
   * fixed MOZILLA_URL pasting again
   * fixed leaking pango glyphs (Owen Taylor)
   * removed line breaks around puntuation in links
   * caret is now consistent with focus (Eric Zhao)
   * more compiler warnings fixes (Owen Taylor)

New in 3.1.16

   * compiler warnings fixes
   * font settings fixes
   * fixed pasting MOZILLA_URL crash
   * added missing KP_Home, KP_End bindings

New in 3.1.15

   * fixed printing
   * fixed page color editing
   * fixed table editing
   * fixed local image url's
   * optimalizations
   * colorset fixes
   * fixed crash related to displaying spell errors
   * a11y fixes (Eric Zhao)
   * search dialog fixes (Pratik V. Parikh)
   * line breaking fixes in links
   * make Wrap Lines menu item usable again
   * fixed line breaking
   * use GIT
   * HIGifications

New in 3.1.5

   * improved IM preedit string display
   * removed gal dependency
   * better smiley substitution in the composer (bounty by Jan Arne Petersen)

New in 3.1.5

   * better font sizing
   * updated translations.

New in 3.1.4

   * new and improved html parser handles broken html much better.
   * better pango integration.
   * updated translations.
   * better ascii mode rendering of lists.
   * improved exposure handling.
   * improved animation rendering.
   * versioned .server files for parallel installs with version 3.0.x.

4 files changed, 234 insertions, 211 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 0550fde391c..736d2294f68 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2004/04/02 18:15:11 recht Exp $
+# $NetBSD: Makefile,v 1.13 2004/09/21 16:52:41 jmmv Exp $
 #
 
-DISTNAME=	gtkhtml-3.0.10
+DISTNAME=	gtkhtml-3.2.1
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml3/}
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.2/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	recht@NetBSD.org
@@ -19,9 +19,15 @@ PKGCONFIG_OVERRIDE+=	src/libgtkhtml.pc.in
 GNU_CONFIGURE=		yes
 
 .include "../../devel/gail/buildlink3.mk"
-.include "../../devel/gal2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
-.include "../../net/libsoup/buildlink3.mk"
+.include "../../net/libsoup-devel/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml3/PLIST b/www/gtkhtml3/PLIST
index 99bb4f70ed5..cf0e3999c53 100644
--- a/www/gtkhtml3/PLIST
+++ b/www/gtkhtml3/PLIST
@@ -1,200 +1,218 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/02 18:15:11 recht Exp $
-include/libgtkhtml-3.0/gtkhtml/gtkhtml-compat.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtml-embedded.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtml-enums.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtml-keybinding.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtml-private.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtml-properties.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtml-search.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtml-stream.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtml-types.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtml.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtmldebug.h
-include/libgtkhtml-3.0/gtkhtml/gtkhtmlfontstyle.h
-include/libgtkhtml-3.0/gtkhtml/htmlanchor.h
-include/libgtkhtml-3.0/gtkhtml/htmlbutton.h
-include/libgtkhtml-3.0/gtkhtml/htmlcheckbox.h
-include/libgtkhtml-3.0/gtkhtml/htmlclue.h
-include/libgtkhtml-3.0/gtkhtml/htmlcluealigned.h
-include/libgtkhtml-3.0/gtkhtml/htmlclueflow.h
-include/libgtkhtml-3.0/gtkhtml/htmlclueh.h
-include/libgtkhtml-3.0/gtkhtml/htmlcluev.h
-include/libgtkhtml-3.0/gtkhtml/htmlcolor.h
-include/libgtkhtml-3.0/gtkhtml/htmlcolorset.h
-include/libgtkhtml-3.0/gtkhtml/htmlcursor.h
-include/libgtkhtml-3.0/gtkhtml/htmldrawqueue.h
-include/libgtkhtml-3.0/gtkhtml/htmlembedded.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-clueflowstyle.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cursor.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cut-and-paste.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-fontstyle.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-images.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-movement.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-rule.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-selection-updater.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-table.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-tablecell.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-text.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-edit.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-print.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-save.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine-search.h
-include/libgtkhtml-3.0/gtkhtml/htmlengine.h
-include/libgtkhtml-3.0/gtkhtml/htmlentity.h
-include/libgtkhtml-3.0/gtkhtml/htmlenums.h
-include/libgtkhtml-3.0/gtkhtml/htmlenumutils.h
-include/libgtkhtml-3.0/gtkhtml/htmlfontmanager.h
-include/libgtkhtml-3.0/gtkhtml/htmlform.h
-include/libgtkhtml-3.0/gtkhtml/htmlframe.h
-include/libgtkhtml-3.0/gtkhtml/htmlframeset.h
-include/libgtkhtml-3.0/gtkhtml/htmlgdkpainter.h
-include/libgtkhtml-3.0/gtkhtml/htmlhidden.h
-include/libgtkhtml-3.0/gtkhtml/htmliframe.h
-include/libgtkhtml-3.0/gtkhtml/htmlimage.h
-include/libgtkhtml-3.0/gtkhtml/htmlimageinput.h
-include/libgtkhtml-3.0/gtkhtml/htmlinterval.h
-include/libgtkhtml-3.0/gtkhtml/htmllinktext.h
-include/libgtkhtml-3.0/gtkhtml/htmllist.h
-include/libgtkhtml-3.0/gtkhtml/htmlmap.h
-include/libgtkhtml-3.0/gtkhtml/htmlmarshal.h
-include/libgtkhtml-3.0/gtkhtml/htmlobject.h
-include/libgtkhtml-3.0/gtkhtml/htmlpainter.h
-include/libgtkhtml-3.0/gtkhtml/htmlplainpainter.h
-include/libgtkhtml-3.0/gtkhtml/htmlprinter.h
-include/libgtkhtml-3.0/gtkhtml/htmlradio.h
-include/libgtkhtml-3.0/gtkhtml/htmlreplace.h
-include/libgtkhtml-3.0/gtkhtml/htmlrule.h
-include/libgtkhtml-3.0/gtkhtml/htmlsearch.h
-include/libgtkhtml-3.0/gtkhtml/htmlselect.h
-include/libgtkhtml-3.0/gtkhtml/htmlselection.h
-include/libgtkhtml-3.0/gtkhtml/htmlsettings.h
-include/libgtkhtml-3.0/gtkhtml/htmlshape.h
-include/libgtkhtml-3.0/gtkhtml/htmlstack.h
-include/libgtkhtml-3.0/gtkhtml/htmlstringtokenizer.h
-include/libgtkhtml-3.0/gtkhtml/htmlstyle.h
-include/libgtkhtml-3.0/gtkhtml/htmltable.h
-include/libgtkhtml-3.0/gtkhtml/htmltablecell.h
-include/libgtkhtml-3.0/gtkhtml/htmltablepriv.h
-include/libgtkhtml-3.0/gtkhtml/htmltext.h
-include/libgtkhtml-3.0/gtkhtml/htmltextarea.h
-include/libgtkhtml-3.0/gtkhtml/htmltextinput.h
-include/libgtkhtml-3.0/gtkhtml/htmltextslave.h
-include/libgtkhtml-3.0/gtkhtml/htmltokenizer.h
-include/libgtkhtml-3.0/gtkhtml/htmltype.h
-include/libgtkhtml-3.0/gtkhtml/htmltypes.h
-include/libgtkhtml-3.0/gtkhtml/htmlundo-action.h
-include/libgtkhtml-3.0/gtkhtml/htmlundo.h
-lib/bonobo/servers/GNOME_GtkHTML_Editor.server
-lib/gtkhtml/libgnome-gtkhtml-editor-3.0.a
-lib/gtkhtml/libgnome-gtkhtml-editor-3.0.la
-lib/gtkhtml/libgnome-gtkhtml-editor-3.0.so
-lib/libgtkhtml-3.0.a
-lib/libgtkhtml-3.0.la
-lib/libgtkhtml-3.0.so
-lib/libgtkhtml-3.0.so.4
-lib/libgtkhtml-3.0.so.4.0
-lib/pkgconfig/libgtkhtml-3.0.pc
-share/gtkhtml-3.0/Editor.idl
-share/gtkhtml-3.0/GNOME_GtkHTML_Editor-emacs.xml
-share/gtkhtml-3.0/GNOME_GtkHTML_Editor.xml
-share/gtkhtml-3.0/gtkhtml-editor-properties.glade
-share/gtkhtml-3.0/icons/16_copy.png
-share/gtkhtml-3.0/icons/16_cut.png
-share/gtkhtml-3.0/icons/16_paste.png
-share/gtkhtml-3.0/icons/24_copy.png
-share/gtkhtml-3.0/icons/24_cut.png
-share/gtkhtml-3.0/icons/24_paste.png
-share/gtkhtml-3.0/icons/bulb.png
-share/gtkhtml-3.0/icons/empty_image.png
-share/gtkhtml-3.0/icons/flowers.png
-share/gtkhtml-3.0/icons/font-tt-16.png
-share/gtkhtml-3.0/icons/font-tt-24.png
-share/gtkhtml-3.0/icons/html-viewer.png
-share/gtkhtml-3.0/icons/info_bulb.png
-share/gtkhtml-3.0/icons/insert-image-16.png
-share/gtkhtml-3.0/icons/insert-image-24.png
-share/gtkhtml-3.0/icons/insert-link-16.png
-share/gtkhtml-3.0/icons/insert-link-24.png
-share/gtkhtml-3.0/icons/insert-object-16.png
-share/gtkhtml-3.0/icons/insert-object-24.png
-share/gtkhtml-3.0/icons/insert-rule-16.png
-share/gtkhtml-3.0/icons/insert-rule-24.png
-share/gtkhtml-3.0/icons/insert-table-16.png
-share/gtkhtml-3.0/icons/insert-table-24.png
-share/gtkhtml-3.0/icons/paper.png
-share/gtkhtml-3.0/icons/properties-16.png
-share/gtkhtml-3.0/icons/rect.png
-share/gtkhtml-3.0/icons/redo-16.png
-share/gtkhtml-3.0/icons/redo-24.png
-share/gtkhtml-3.0/icons/rule-blue-center.png
-share/gtkhtml-3.0/icons/rule-blue-left.png
-share/gtkhtml-3.0/icons/rule-blue-right.png
-share/gtkhtml-3.0/icons/rule-yellow-flowers-center.png
-share/gtkhtml-3.0/icons/rule-yellow-flowers-left.png
-share/gtkhtml-3.0/icons/rule-yellow-flowers-right.png
-share/gtkhtml-3.0/icons/search-16.png
-share/gtkhtml-3.0/icons/search-24.png
-share/gtkhtml-3.0/icons/search-and-replace-16.png
-share/gtkhtml-3.0/icons/search-and-replace-24.png
-share/gtkhtml-3.0/icons/smiley-1.png
-share/gtkhtml-3.0/icons/smiley-10.png
-share/gtkhtml-3.0/icons/smiley-11.png
-share/gtkhtml-3.0/icons/smiley-2.png
-share/gtkhtml-3.0/icons/smiley-3.png
-share/gtkhtml-3.0/icons/smiley-4.png
-share/gtkhtml-3.0/icons/smiley-5.png
-share/gtkhtml-3.0/icons/smiley-6.png
-share/gtkhtml-3.0/icons/smiley-8.png
-share/gtkhtml-3.0/icons/smiley-9.png
-share/gtkhtml-3.0/icons/texture.png
-share/gtkhtml-3.0/icons/transparent.png
-share/gtkhtml-3.0/icons/undo-16.png
-share/gtkhtml-3.0/icons/undo-24.png
-share/gtkhtml-3.0/keybindingsrc.emacs
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gtkhtml-3.0.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gtkhtml-3.0.mo
-@dirrm share/gtkhtml-3.0/icons
-@dirrm share/gtkhtml-3.0
+@comment $NetBSD: PLIST,v 1.3 2004/09/21 16:52:41 jmmv Exp $
+include/libgtkhtml-3.1/gtkhtml/gtkhtml-compat.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtml-embedded.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtml-enums.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtml-keybinding.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtml-private.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtml-properties.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtml-search.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtml-stream.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtml-types.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtml.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtmldebug.h
+include/libgtkhtml-3.1/gtkhtml/gtkhtmlfontstyle.h
+include/libgtkhtml-3.1/gtkhtml/htmlanchor.h
+include/libgtkhtml-3.1/gtkhtml/htmlbutton.h
+include/libgtkhtml-3.1/gtkhtml/htmlcheckbox.h
+include/libgtkhtml-3.1/gtkhtml/htmlclue.h
+include/libgtkhtml-3.1/gtkhtml/htmlcluealigned.h
+include/libgtkhtml-3.1/gtkhtml/htmlclueflow.h
+include/libgtkhtml-3.1/gtkhtml/htmlclueh.h
+include/libgtkhtml-3.1/gtkhtml/htmlcluev.h
+include/libgtkhtml-3.1/gtkhtml/htmlcolor.h
+include/libgtkhtml-3.1/gtkhtml/htmlcolorset.h
+include/libgtkhtml-3.1/gtkhtml/htmlcursor.h
+include/libgtkhtml-3.1/gtkhtml/htmldrawqueue.h
+include/libgtkhtml-3.1/gtkhtml/htmlembedded.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-clueflowstyle.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-cursor.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-cut-and-paste.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-fontstyle.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-images.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-movement.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-rule.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-selection-updater.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-table.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-tablecell.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit-text.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-edit.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-print.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-save.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine-search.h
+include/libgtkhtml-3.1/gtkhtml/htmlengine.h
+include/libgtkhtml-3.1/gtkhtml/htmlentity.h
+include/libgtkhtml-3.1/gtkhtml/htmlenums.h
+include/libgtkhtml-3.1/gtkhtml/htmlenumutils.h
+include/libgtkhtml-3.1/gtkhtml/htmlfontmanager.h
+include/libgtkhtml-3.1/gtkhtml/htmlform.h
+include/libgtkhtml-3.1/gtkhtml/htmlframe.h
+include/libgtkhtml-3.1/gtkhtml/htmlframeset.h
+include/libgtkhtml-3.1/gtkhtml/htmlgdkpainter.h
+include/libgtkhtml-3.1/gtkhtml/htmlhidden.h
+include/libgtkhtml-3.1/gtkhtml/htmliframe.h
+include/libgtkhtml-3.1/gtkhtml/htmlimage.h
+include/libgtkhtml-3.1/gtkhtml/htmlimageinput.h
+include/libgtkhtml-3.1/gtkhtml/htmlinterval.h
+include/libgtkhtml-3.1/gtkhtml/htmllist.h
+include/libgtkhtml-3.1/gtkhtml/htmlmap.h
+include/libgtkhtml-3.1/gtkhtml/htmlmarshal.h
+include/libgtkhtml-3.1/gtkhtml/htmlobject.h
+include/libgtkhtml-3.1/gtkhtml/htmlpainter.h
+include/libgtkhtml-3.1/gtkhtml/htmlplainpainter.h
+include/libgtkhtml-3.1/gtkhtml/htmlprinter.h
+include/libgtkhtml-3.1/gtkhtml/htmlradio.h
+include/libgtkhtml-3.1/gtkhtml/htmlreplace.h
+include/libgtkhtml-3.1/gtkhtml/htmlrule.h
+include/libgtkhtml-3.1/gtkhtml/htmlsearch.h
+include/libgtkhtml-3.1/gtkhtml/htmlselect.h
+include/libgtkhtml-3.1/gtkhtml/htmlselection.h
+include/libgtkhtml-3.1/gtkhtml/htmlsettings.h
+include/libgtkhtml-3.1/gtkhtml/htmlshape.h
+include/libgtkhtml-3.1/gtkhtml/htmlstack.h
+include/libgtkhtml-3.1/gtkhtml/htmlstringtokenizer.h
+include/libgtkhtml-3.1/gtkhtml/htmlstyle.h
+include/libgtkhtml-3.1/gtkhtml/htmltable.h
+include/libgtkhtml-3.1/gtkhtml/htmltablecell.h
+include/libgtkhtml-3.1/gtkhtml/htmltablepriv.h
+include/libgtkhtml-3.1/gtkhtml/htmltext.h
+include/libgtkhtml-3.1/gtkhtml/htmltextarea.h
+include/libgtkhtml-3.1/gtkhtml/htmltextinput.h
+include/libgtkhtml-3.1/gtkhtml/htmltextslave.h
+include/libgtkhtml-3.1/gtkhtml/htmltokenizer.h
+include/libgtkhtml-3.1/gtkhtml/htmltype.h
+include/libgtkhtml-3.1/gtkhtml/htmltypes.h
+include/libgtkhtml-3.1/gtkhtml/htmlundo-action.h
+include/libgtkhtml-3.1/gtkhtml/htmlundo.h
+lib/bonobo/servers/GNOME_GtkHTML_Editor-3.1.server
+lib/gtkhtml/libgnome-gtkhtml-editor-3.1.a
+lib/gtkhtml/libgnome-gtkhtml-editor-3.1.la
+lib/gtkhtml/libgnome-gtkhtml-editor-3.1.so
+lib/libgtkhtml-3.1.a
+lib/libgtkhtml-3.1.la
+lib/libgtkhtml-3.1.so
+lib/libgtkhtml-3.1.so.11
+lib/libgtkhtml-3.1.so.11.4
+lib/pkgconfig/libgtkhtml-3.1.pc
+share/gtkhtml-3.1/Editor.idl
+share/gtkhtml-3.1/GNOME_GtkHTML_Editor-emacs.xml
+share/gtkhtml-3.1/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-3.1/gtkhtml-editor-properties.glade
+share/gtkhtml-3.1/icons/16_copy.png
+share/gtkhtml-3.1/icons/16_cut.png
+share/gtkhtml-3.1/icons/16_paste.png
+share/gtkhtml-3.1/icons/24_copy.png
+share/gtkhtml-3.1/icons/24_cut.png
+share/gtkhtml-3.1/icons/24_paste.png
+share/gtkhtml-3.1/icons/bulb.png
+share/gtkhtml-3.1/icons/confidential-stamp.jpg
+share/gtkhtml-3.1/icons/draft-paper.png
+share/gtkhtml-3.1/icons/draft-stamp.jpg
+share/gtkhtml-3.1/icons/empty_image.png
+share/gtkhtml-3.1/icons/flowers.png
+share/gtkhtml-3.1/icons/font-tt-16.png
+share/gtkhtml-3.1/icons/font-tt-24.png
+share/gtkhtml-3.1/icons/html-viewer.png
+share/gtkhtml-3.1/icons/info_bulb.png
+share/gtkhtml-3.1/icons/insert-image-16.png
+share/gtkhtml-3.1/icons/insert-image-24.png
+share/gtkhtml-3.1/icons/insert-link-16.png
+share/gtkhtml-3.1/icons/insert-link-24.png
+share/gtkhtml-3.1/icons/insert-object-16.png
+share/gtkhtml-3.1/icons/insert-object-24.png
+share/gtkhtml-3.1/icons/insert-rule-16.png
+share/gtkhtml-3.1/icons/insert-rule-24.png
+share/gtkhtml-3.1/icons/insert-table-16.png
+share/gtkhtml-3.1/icons/insert-table-24.png
+share/gtkhtml-3.1/icons/midnight-stars.jpg
+share/gtkhtml-3.1/icons/paper.png
+share/gtkhtml-3.1/icons/properties-16.png
+share/gtkhtml-3.1/icons/rect.png
+share/gtkhtml-3.1/icons/redo-16.png
+share/gtkhtml-3.1/icons/redo-24.png
+share/gtkhtml-3.1/icons/ribbon.jpg
+share/gtkhtml-3.1/icons/rule-blue-center.png
+share/gtkhtml-3.1/icons/rule-blue-left.png
+share/gtkhtml-3.1/icons/rule-blue-right.png
+share/gtkhtml-3.1/icons/rule-yellow-flowers-center.png
+share/gtkhtml-3.1/icons/rule-yellow-flowers-left.png
+share/gtkhtml-3.1/icons/rule-yellow-flowers-right.png
+share/gtkhtml-3.1/icons/search-16.png
+share/gtkhtml-3.1/icons/search-24.png
+share/gtkhtml-3.1/icons/search-and-replace-16.png
+share/gtkhtml-3.1/icons/search-and-replace-24.png
+share/gtkhtml-3.1/icons/smiley-1.png
+share/gtkhtml-3.1/icons/smiley-10.png
+share/gtkhtml-3.1/icons/smiley-11.png
+share/gtkhtml-3.1/icons/smiley-12.png
+share/gtkhtml-3.1/icons/smiley-2.png
+share/gtkhtml-3.1/icons/smiley-3.png
+share/gtkhtml-3.1/icons/smiley-4.png
+share/gtkhtml-3.1/icons/smiley-5.png
+share/gtkhtml-3.1/icons/smiley-6.png
+share/gtkhtml-3.1/icons/smiley-8.png
+share/gtkhtml-3.1/icons/smiley-9.png
+share/gtkhtml-3.1/icons/table-column-16.png
+share/gtkhtml-3.1/icons/table-row-16.png
+share/gtkhtml-3.1/icons/table-table-16.png
+share/gtkhtml-3.1/icons/texture.png
+share/gtkhtml-3.1/icons/transparent.png
+share/gtkhtml-3.1/icons/undo-16.png
+share/gtkhtml-3.1/icons/undo-24.png
+share/gtkhtml-3.1/keybindingsrc.emacs
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gtkhtml-3.1.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gtkhtml-3.1.mo
+@dirrm share/gtkhtml-3.1/icons
+@dirrm share/gtkhtml-3.1
 @dirrm lib/gtkhtml
-@comment in bonobo-activation: @dirrm lib/bonobo/servers
-@dirrm include/libgtkhtml-3.0/gtkhtml
-@dirrm include/libgtkhtml-3.0
+@comment in libbonobo: @dirrm lib/bonobo/servers
+@dirrm include/libgtkhtml-3.1/gtkhtml
+@dirrm include/libgtkhtml-3.1
diff --git a/www/gtkhtml3/buildlink3.mk b/www/gtkhtml3/buildlink3.mk
index 01200bbc3cd..bc21844cbe6 100644
--- a/www/gtkhtml3/buildlink3.mk
+++ b/www/gtkhtml3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/09/21 16:52:41 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML3_BUILDLINK3_MK:=	${GTKHTML3_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkhtml3}
 BUILDLINK_PACKAGES+=	gtkhtml3
 
 .if !empty(GTKHTML3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkhtml3+=	gtkhtml3>=3.0.9nb5
-BUILDLINK_RECOMMENDED.gtkhtml3?=	gtkhtml3>=3.0.9nb6
+BUILDLINK_DEPENDS.gtkhtml3+=	gtkhtml3>=3.2.1
 BUILDLINK_PKGSRCDIR.gtkhtml3?=	../../www/gtkhtml3
 .endif	# GTKHTML3_BUILDLINK3_MK
 
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index b4300e871f3..8b06e800604 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/04/02 18:15:11 recht Exp $
+$NetBSD: distinfo,v 1.3 2004/09/21 16:52:41 jmmv Exp $
 
-SHA1 (gtkhtml-3.0.10.tar.bz2) = 1bda154cedea59088c7a2e4ae6236bbdf746d158
-Size (gtkhtml-3.0.10.tar.bz2) = 1074973 bytes
+SHA1 (gtkhtml-3.2.1.tar.bz2) = a95e07e23896c8cae5459562c80d8821afce5c5a
+Size (gtkhtml-3.2.1.tar.bz2) = 1315940 bytes