Update gtkhtml3 to 3.6.0. Reimporting it as a different package because

the API has changed (thus being incompatible):

gtkhtml-3.6.0 "Airedale" 2004-03-07
------------------------------------------------

New in this release

   * fixed possible infinite loop
   * fixed crash when pasting html with DIV blocks
   * updated translations (Laszlo Dvornik, Danilo Šegan)

gtkhtml-3.5.7 "Snow white" 2004-02-28
------------------------------------------------

New in this release

   * fixed margins calculation for RTL
   * fixed quotation parsing
   * keypress event return value fix (Harry Lu)
   * fixed plain save padding for RTL
   * fixed citation rendering
   * fixed spell errors rendering
   * fixed crash in cursor line down function
   * fixed crash in cursor base calculation
   * bind to Sun Undo/Copy/Cut/Paste keys (Mengjie Yu)
   * a11y fixes (Mengjie Yu)
   * rtl improvements - use keymap, save direction to html elements
   * extended test suite
   * updated translations (Kjartan Maraas, Leonid Kanter, Priit Laes,
     Kostas Papadimas, Takeshi Aihana, David Lodge, Vincent van
     Adrighem, Alexander Shopov, Laurent Dhima, Maxim Dziumanenko,
     Duarte Loreto, Nikos Charonitakis, Raphael Higino, Miloslav
     Trmač, Christophe Merlet, Martin Willemoes Hansen, Ankit Patel,
     Amanpreet Singh Alamwala, Jordi Mallach, Artur Flinta)

gtkhtml-3.5.6 "Winter mood" 2004-02-07
------------------------------------------------

New in this release

   * fixed broken cursor navigation around tables
   * fixed RTL line up/down cursor navigation
   * allow \' in email auto recognition
   * fixed compilation with gcc 4.0.0 (amd)
   * fixed nested cluev's editing
   * fixed RTL item rendering
   * fixed RTL citations
   * more tests in regression test suite
   * updated translations (Changwoo Ryu, Francisco Javier F. Serrador,
     Frank Arnold, Pauli Virtanen, Adam Weinberger, Priit Laes,
     Miloslav Trmac)

gtkhtml-3.5.5 "Try RTL" 2004-01-31
------------------------------------------------

New in this release

   * merged fixes to RTL editing from rtl branch
   * fixed selection drawing
   * added more tests to regression test suite
   * a11y fixes (Mengjie Yu)
   * added a11y names (Mengjie Yu)
   * fixed tabs drawwing/editing
   * fixed nowrap keyword in table cells (Changwoo Ryu)
   * added missing mnenonics in editor (Mengjie Yu)
   * fixed nested iframes rendering
   * fixed crash when deleting table/row/column when selection is active
   * updated translations (Hendrik Brandt, Alexander Shopov, Kjartan
     Maraas, Francisco Javier F. Serrador, Duarte Loreto, Adam Weinberger,
     Miloslav Trmac, Priit Laes, Žygimantas Beručka, Christian Rose,
     Vincent van Adrighem, Funda Wang)

gtkhtml-3.5.4 "Snowman" 2004-01-24
------------------------------------------------

New in this release

   * fixed symbols conflict with gal's color combo
   * fixed performance problem in paragraph direction code
   * fixed bug in quotation code
   * html input logging switching with GTK_HTML_LOG_INPUT_STREAM
     environment variable
   * color combo fixed to be accessible from keyboard (Mengjie Yu)
   * fixed problem with unavailable toolbar icons
   * put 2 insert icons back to be compatible with gnome icon theme
     from gnome 2.6
   * fixed Home/End navigation in Caret Mode (Mengjie Yu)
   * introduced regression test suite

gtkhtml-3.5.3 "Resort" 2004-01-10
------------------------------------------------

New in this release

   * Right-to-Left display support
   * fix crash on a double-click on the background of the mail header
   * i18n fixes (Mengjie Yu)
   * a11y fixes (Mengjie Yu)

gtkhtml-3.5.2 "Valley" 2004-12-20
------------------------------------------------

New in this release

   * run ask replace dialog until finished
   * fix symbol conflicts with gal
   * a11y fixes (Mengjie Yu)

gtkhtml-3.5.1 "Fern" 2004-11-01
------------------------------------------------

New in this release

   * padding, border style for DIV tag
   * background color style for clues
   * merged changes from gtkhtml 3.3.x (Owen Taylor, gnome-2-8-devel branch)
   * beginning of rtl support - HTML tags
   * i18n fixes - use glib's i18n instead of deprecated libgnome i18n (Mariano Suarez-Alvarez)
   * fixed crash in aligned images drawing
   * use more GIT icons
   * fixed two memory leaks

gtkhtml-3.5.0 "Frond" 2004-11-01
------------------------------------------------

New in this release

   * added id attribute to objects
   * beginning of border style

7 files changed, 308 insertions, 0 deletions

diff --git a/www/gtkhtml36/DESCR b/www/gtkhtml36/DESCR
new file mode 100644
index 00000000000..74accc669a6
--- /dev/null
+++ b/www/gtkhtml36/DESCR
@@ -0,0 +1,3 @@
+GtkHTML is a lightweight HTML rendering/printing/editing engine. It
+was originally based on KHTMLW, part of the KDE project, but is now
+being developed independently.
diff --git a/www/gtkhtml36/Makefile b/www/gtkhtml36/Makefile
new file mode 100644
index 00000000000..f8cb01a2eb1
--- /dev/null
+++ b/www/gtkhtml36/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1.1.1 2005/03/22 16:07:33 jmmv Exp $
+#
+
+DISTNAME=	gtkhtml-3.6.0
+PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml36/}
+CATEGORIES=	www gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.6/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	recht@NetBSD.org
+HOMEPAGE=	http://www.gnome.org/
+COMMENT=	Lightweight HTML rendering/printing/editing engine
+
+USE_GNU_TOOLS+=		make
+USE_BUILDLINK3=		yes
+USE_PKGLOCALEDIR=	yes
+USE_LIBTOOL=		yes
+PKGCONFIG_OVERRIDE+=	src/libgtkhtml.pc.in
+GNU_CONFIGURE=		yes
+
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gail/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../net/libsoup-devel/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml36/PLIST b/www/gtkhtml36/PLIST
new file mode 100644
index 00000000000..ca37b3eb1d5
--- /dev/null
+++ b/www/gtkhtml36/PLIST
@@ -0,0 +1,213 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/22 16:07:33 jmmv Exp $
+include/libgtkhtml-3.6/gtkhtml/gtkhtml-compat.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtml-embedded.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtml-enums.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtml-keybinding.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtml-private.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtml-properties.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtml-search.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtml-stream.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtml-types.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtml.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtmldebug.h
+include/libgtkhtml-3.6/gtkhtml/gtkhtmlfontstyle.h
+include/libgtkhtml-3.6/gtkhtml/htmlanchor.h
+include/libgtkhtml-3.6/gtkhtml/htmlbutton.h
+include/libgtkhtml-3.6/gtkhtml/htmlcheckbox.h
+include/libgtkhtml-3.6/gtkhtml/htmlclue.h
+include/libgtkhtml-3.6/gtkhtml/htmlcluealigned.h
+include/libgtkhtml-3.6/gtkhtml/htmlclueflow.h
+include/libgtkhtml-3.6/gtkhtml/htmlclueh.h
+include/libgtkhtml-3.6/gtkhtml/htmlcluev.h
+include/libgtkhtml-3.6/gtkhtml/htmlcolor.h
+include/libgtkhtml-3.6/gtkhtml/htmlcolorset.h
+include/libgtkhtml-3.6/gtkhtml/htmlcursor.h
+include/libgtkhtml-3.6/gtkhtml/htmldrawqueue.h
+include/libgtkhtml-3.6/gtkhtml/htmlembedded.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-clueflowstyle.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-cursor.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-cut-and-paste.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-fontstyle.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-images.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-movement.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-rule.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-selection-updater.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-table.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-tablecell.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit-text.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-edit.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-print.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-save.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine-search.h
+include/libgtkhtml-3.6/gtkhtml/htmlengine.h
+include/libgtkhtml-3.6/gtkhtml/htmlentity.h
+include/libgtkhtml-3.6/gtkhtml/htmlenums.h
+include/libgtkhtml-3.6/gtkhtml/htmlenumutils.h
+include/libgtkhtml-3.6/gtkhtml/htmlfontmanager.h
+include/libgtkhtml-3.6/gtkhtml/htmlform.h
+include/libgtkhtml-3.6/gtkhtml/htmlframe.h
+include/libgtkhtml-3.6/gtkhtml/htmlframeset.h
+include/libgtkhtml-3.6/gtkhtml/htmlgdkpainter.h
+include/libgtkhtml-3.6/gtkhtml/htmlhidden.h
+include/libgtkhtml-3.6/gtkhtml/htmliframe.h
+include/libgtkhtml-3.6/gtkhtml/htmlimage.h
+include/libgtkhtml-3.6/gtkhtml/htmlimageinput.h
+include/libgtkhtml-3.6/gtkhtml/htmlinterval.h
+include/libgtkhtml-3.6/gtkhtml/htmllist.h
+include/libgtkhtml-3.6/gtkhtml/htmlmap.h
+include/libgtkhtml-3.6/gtkhtml/htmlmarshal.h
+include/libgtkhtml-3.6/gtkhtml/htmlobject.h
+include/libgtkhtml-3.6/gtkhtml/htmlpainter.h
+include/libgtkhtml-3.6/gtkhtml/htmlplainpainter.h
+include/libgtkhtml-3.6/gtkhtml/htmlprinter.h
+include/libgtkhtml-3.6/gtkhtml/htmlradio.h
+include/libgtkhtml-3.6/gtkhtml/htmlreplace.h
+include/libgtkhtml-3.6/gtkhtml/htmlrule.h
+include/libgtkhtml-3.6/gtkhtml/htmlsearch.h
+include/libgtkhtml-3.6/gtkhtml/htmlselect.h
+include/libgtkhtml-3.6/gtkhtml/htmlselection.h
+include/libgtkhtml-3.6/gtkhtml/htmlsettings.h
+include/libgtkhtml-3.6/gtkhtml/htmlshape.h
+include/libgtkhtml-3.6/gtkhtml/htmlstack.h
+include/libgtkhtml-3.6/gtkhtml/htmlstringtokenizer.h
+include/libgtkhtml-3.6/gtkhtml/htmlstyle.h
+include/libgtkhtml-3.6/gtkhtml/htmltable.h
+include/libgtkhtml-3.6/gtkhtml/htmltablecell.h
+include/libgtkhtml-3.6/gtkhtml/htmltablepriv.h
+include/libgtkhtml-3.6/gtkhtml/htmltext.h
+include/libgtkhtml-3.6/gtkhtml/htmltextarea.h
+include/libgtkhtml-3.6/gtkhtml/htmltextinput.h
+include/libgtkhtml-3.6/gtkhtml/htmltextslave.h
+include/libgtkhtml-3.6/gtkhtml/htmltokenizer.h
+include/libgtkhtml-3.6/gtkhtml/htmltype.h
+include/libgtkhtml-3.6/gtkhtml/htmltypes.h
+include/libgtkhtml-3.6/gtkhtml/htmlundo-action.h
+include/libgtkhtml-3.6/gtkhtml/htmlundo.h
+lib/bonobo/servers/GNOME_GtkHTML_Editor-3.6.server
+lib/gtkhtml/libgnome-gtkhtml-editor-3.6.la
+lib/libgtkhtml-3.6.la
+lib/pkgconfig/libgtkhtml-3.6.pc
+share/gtkhtml-3.6/Editor.idl
+share/gtkhtml-3.6/GNOME_GtkHTML_Editor-emacs.xml
+share/gtkhtml-3.6/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-3.6/gtkhtml-editor-properties.glade
+share/gtkhtml-3.6/icons/16_copy.png
+share/gtkhtml-3.6/icons/16_cut.png
+share/gtkhtml-3.6/icons/16_paste.png
+share/gtkhtml-3.6/icons/24_copy.png
+share/gtkhtml-3.6/icons/24_cut.png
+share/gtkhtml-3.6/icons/24_paste.png
+share/gtkhtml-3.6/icons/bulb.png
+share/gtkhtml-3.6/icons/confidential-stamp.jpg
+share/gtkhtml-3.6/icons/draft-paper.png
+share/gtkhtml-3.6/icons/draft-stamp.jpg
+share/gtkhtml-3.6/icons/empty_image.png
+share/gtkhtml-3.6/icons/flowers.png
+share/gtkhtml-3.6/icons/font-tt-16.png
+share/gtkhtml-3.6/icons/font-tt-24.png
+share/gtkhtml-3.6/icons/html-viewer.png
+share/gtkhtml-3.6/icons/info_bulb.png
+share/gtkhtml-3.6/icons/insert-image-16.png
+share/gtkhtml-3.6/icons/insert-image-24.png
+share/gtkhtml-3.6/icons/insert-link-16.png
+share/gtkhtml-3.6/icons/insert-link-24.png
+share/gtkhtml-3.6/icons/insert-object-16.png
+share/gtkhtml-3.6/icons/insert-object-24.png
+share/gtkhtml-3.6/icons/insert-rule-16.png
+share/gtkhtml-3.6/icons/insert-rule-24.png
+share/gtkhtml-3.6/icons/insert-table-16.png
+share/gtkhtml-3.6/icons/insert-table-24.png
+share/gtkhtml-3.6/icons/midnight-stars.jpg
+share/gtkhtml-3.6/icons/paper.png
+share/gtkhtml-3.6/icons/properties-16.png
+share/gtkhtml-3.6/icons/rect.png
+share/gtkhtml-3.6/icons/redo-16.png
+share/gtkhtml-3.6/icons/redo-24.png
+share/gtkhtml-3.6/icons/ribbon.jpg
+share/gtkhtml-3.6/icons/rule-blue-center.png
+share/gtkhtml-3.6/icons/rule-blue-left.png
+share/gtkhtml-3.6/icons/rule-blue-right.png
+share/gtkhtml-3.6/icons/rule-yellow-flowers-center.png
+share/gtkhtml-3.6/icons/rule-yellow-flowers-left.png
+share/gtkhtml-3.6/icons/rule-yellow-flowers-right.png
+share/gtkhtml-3.6/icons/search-16.png
+share/gtkhtml-3.6/icons/search-24.png
+share/gtkhtml-3.6/icons/search-and-replace-16.png
+share/gtkhtml-3.6/icons/search-and-replace-24.png
+share/gtkhtml-3.6/icons/smiley-1.png
+share/gtkhtml-3.6/icons/smiley-10.png
+share/gtkhtml-3.6/icons/smiley-11.png
+share/gtkhtml-3.6/icons/smiley-12.png
+share/gtkhtml-3.6/icons/smiley-2.png
+share/gtkhtml-3.6/icons/smiley-3.png
+share/gtkhtml-3.6/icons/smiley-4.png
+share/gtkhtml-3.6/icons/smiley-5.png
+share/gtkhtml-3.6/icons/smiley-6.png
+share/gtkhtml-3.6/icons/smiley-8.png
+share/gtkhtml-3.6/icons/smiley-9.png
+share/gtkhtml-3.6/icons/table-column-16.png
+share/gtkhtml-3.6/icons/table-row-16.png
+share/gtkhtml-3.6/icons/table-table-16.png
+share/gtkhtml-3.6/icons/texture.png
+share/gtkhtml-3.6/icons/transparent.png
+share/gtkhtml-3.6/icons/undo-16.png
+share/gtkhtml-3.6/icons/undo-24.png
+share/gtkhtml-3.6/keybindingsrc.emacs
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gtkhtml-3.6.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gtkhtml-3.6.mo
+@dirrm share/gtkhtml-3.6/icons
+@dirrm share/gtkhtml-3.6
+@dirrm lib/gtkhtml
+@comment in libbonobo: @dirrm lib/bonobo/servers
+@dirrm include/libgtkhtml-3.6/gtkhtml
+@dirrm include/libgtkhtml-3.6
diff --git a/www/gtkhtml36/buildlink3.mk b/www/gtkhtml36/buildlink3.mk
new file mode 100644
index 00000000000..7769ec71760
--- /dev/null
+++ b/www/gtkhtml36/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/03/22 16:07:33 jmmv Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GTKHTML36_BUILDLINK3_MK:=	${GTKHTML36_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gtkhtml36
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkhtml36}
+BUILDLINK_PACKAGES+=	gtkhtml36
+
+.if !empty(GTKHTML36_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gtkhtml36+=	gtkhtml36>=3.6.0
+BUILDLINK_PKGSRCDIR.gtkhtml36?=	../../www/gtkhtml36
+.endif	# GTKHTML36_BUILDLINK3_MK
+
+.include "../../devel/gail/buildlink3.mk"
+.include "../../devel/gal2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/gtkhtml36/distinfo b/www/gtkhtml36/distinfo
new file mode 100644
index 00000000000..f0bf99539bd
--- /dev/null
+++ b/www/gtkhtml36/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2005/03/22 16:07:33 jmmv Exp $
+
+SHA1 (gtkhtml-3.6.0.tar.bz2) = 61ef01b7db7b22dc9eb99d075f028adf52ead07c
+RMD160 (gtkhtml-3.6.0.tar.bz2) = 8b3165154aa8317b395c9bd0d8fc68f1fe7ce6d1
+Size (gtkhtml-3.6.0.tar.bz2) = 1348975 bytes
+SHA1 (patch-aa) = ada12e6ddc5519c49742d652cd2643b3a7cc1983
+SHA1 (patch-ab) = c673e7bcfc749f8ee6fe19d2ccaeb3da6f64b636
diff --git a/www/gtkhtml36/patches/patch-aa b/www/gtkhtml36/patches/patch-aa
new file mode 100644
index 00000000000..72924723c91
--- /dev/null
+++ b/www/gtkhtml36/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2005/03/22 16:07:33 jmmv Exp $
+
+--- src/htmlpainter.c.orig	2004-09-16 17:25:10.000000000 +0100
++++ src/htmlpainter.c	2004-11-12 16:47:43.986145000 +0000
+@@ -663,7 +663,7 @@
+ void
+ html_painter_set_widget (HTMLPainter *painter, GtkWidget *widget)
+ {
+-	return 	(* HP_CLASS (painter)->set_widget) (painter, widget);
++	(* HP_CLASS (painter)->set_widget) (painter, widget);
+ }
+ 
+ HTMLTextPangoInfo *
diff --git a/www/gtkhtml36/patches/patch-ab b/www/gtkhtml36/patches/patch-ab
new file mode 100644
index 00000000000..fb9e62d365e
--- /dev/null
+++ b/www/gtkhtml36/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1 2005/03/22 16:07:33 jmmv Exp $
+
+--- po/Makefile.in.in.orig	2005-03-07 19:35:22.000000000 +0100
++++ po/Makefile.in.in
+@@ -35,6 +35,7 @@ subdir = po
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ CC = @CC@
+ GENCAT = @GENCAT@