Update gtkhtml to 1.1.7. Changes include:

 - Fix magic link segfaults.
 - Cursor movement crashes.
 - Fix citation printing.
 - Fix citation pasting.
 - Lots more bug fixes
 - Editor UI Improvements.
 - spell checking quotation improved
 - updated to new gnome-spell
   - better language selection
   - more than one language at once
   - spell checking control updated
 - <blockquote type=cite> support for improved quotation logic
 - Cut & Paste of formatted html
 - link insertion / editing completely reworked
 - dirty flag for composer
 - HUGE general speedup
 - selection drawing speedup
 - less flicker
 - new commands and keybindings (delete-word, delete-word-backward,
   text-color-apply)
 - UI usability enhanced
 - gconf as default configuration backend
 - smileys :-)
 - DND for URL's
 - printing API - gtk_html_get_pages_num
 - title setting in editor
 - body templates
 - itemized list fixed
 - animated images fixed (infinite loop)
 - PRIMARY selection fixed
 - header printing fixed

5 files changed, 203 insertions, 209 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 30716bb471a..4d608052194 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2002/12/24 06:10:28 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/01/09 10:51:04 rh Exp $
 
-DISTNAME=		gtkhtml-1.0.1
-PKGREVISION=		3
+DISTNAME=		gtkhtml-1.1.7
 CATEGORIES=		www gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtkhtml/1.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtkhtml/1.1/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@netbsd.org
diff --git a/www/gtkhtml/PLIST b/www/gtkhtml/PLIST
index 340698c73a4..8296da098d0 100644
--- a/www/gtkhtml/PLIST
+++ b/www/gtkhtml/PLIST
@@ -1,104 +1,103 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/17 11:15:32 martti Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/09 10:51:04 rh Exp $
 bin/ebrowser
-bin/gnome-gtkhtml-editor
+bin/gnome-gtkhtml-editor-1.1
 bin/gtkhtml-properties-capplet
-etc/CORBA/servers/html-component.gnorba
-include/gtkhtml/gtkhtml-compat.h
-include/gtkhtml/gtkhtml-embedded.h
-include/gtkhtml/gtkhtml-enums.h
-include/gtkhtml/gtkhtml-im.h
-include/gtkhtml/gtkhtml-keybinding.h
-include/gtkhtml/gtkhtml-private.h
-include/gtkhtml/gtkhtml-properties.h
-include/gtkhtml/gtkhtml-search.h
-include/gtkhtml/gtkhtml-stream.h
-include/gtkhtml/gtkhtml-types.h
-include/gtkhtml/gtkhtml.h
-include/gtkhtml/gtkhtmldebug.h
-include/gtkhtml/gtkhtmlfontstyle.h
-include/gtkhtml/htmlanchor.h
-include/gtkhtml/htmlbutton.h
-include/gtkhtml/htmlcheckbox.h
-include/gtkhtml/htmlclue.h
-include/gtkhtml/htmlcluealigned.h
-include/gtkhtml/htmlclueflow.h
-include/gtkhtml/htmlclueh.h
-include/gtkhtml/htmlcluev.h
-include/gtkhtml/htmlcolor.h
-include/gtkhtml/htmlcolorset.h
-include/gtkhtml/htmlcursor.h
-include/gtkhtml/htmldrawqueue.h
-include/gtkhtml/htmlembedded.h
-include/gtkhtml/htmlengine-edit-clueflowstyle.h
-include/gtkhtml/htmlengine-edit-cursor.h
-include/gtkhtml/htmlengine-edit-cut-and-paste.h
-include/gtkhtml/htmlengine-edit-fontstyle.h
-include/gtkhtml/htmlengine-edit-images.c
-include/gtkhtml/htmlengine-edit-images.h
-include/gtkhtml/htmlengine-edit-movement.h
-include/gtkhtml/htmlengine-edit-rule.h
-include/gtkhtml/htmlengine-edit-selection-updater.h
-include/gtkhtml/htmlengine-edit-table.h
-include/gtkhtml/htmlengine-edit-tablecell.h
-include/gtkhtml/htmlengine-edit-text.h
-include/gtkhtml/htmlengine-edit.h
-include/gtkhtml/htmlengine-print.h
-include/gtkhtml/htmlengine-save.h
-include/gtkhtml/htmlengine-search.h
-include/gtkhtml/htmlengine.h
-include/gtkhtml/htmlentity.h
-include/gtkhtml/htmlenums.h
-include/gtkhtml/htmlenumutils.h
-include/gtkhtml/htmlfontmanager.h
-include/gtkhtml/htmlform.h
-include/gtkhtml/htmlframe.h
-include/gtkhtml/htmlframeset.h
-include/gtkhtml/htmlgdkpainter.h
-include/gtkhtml/htmlhidden.h
-include/gtkhtml/htmlhspace.h
-include/gtkhtml/htmliframe.h
-include/gtkhtml/htmlimage.h
-include/gtkhtml/htmlimageinput.h
-include/gtkhtml/htmlinterval.h
-include/gtkhtml/htmllinktext.h
-include/gtkhtml/htmllist.h
-include/gtkhtml/htmlmap.h
-include/gtkhtml/htmlobject.h
-include/gtkhtml/htmlpainter.h
-include/gtkhtml/htmlplainpainter.h
-include/gtkhtml/htmlprinter.h
-include/gtkhtml/htmlradio.h
-include/gtkhtml/htmlreplace.h
-include/gtkhtml/htmlrule.h
-include/gtkhtml/htmlsearch.h
-include/gtkhtml/htmlselect.h
-include/gtkhtml/htmlselection.h
-include/gtkhtml/htmlsettings.h
-include/gtkhtml/htmlshape.h
-include/gtkhtml/htmlstack.h
-include/gtkhtml/htmlstringtokenizer.h
-include/gtkhtml/htmltable.h
-include/gtkhtml/htmltablecell.h
-include/gtkhtml/htmltablepriv.h
-include/gtkhtml/htmltext.h
-include/gtkhtml/htmltextarea.h
-include/gtkhtml/htmltextinput.h
-include/gtkhtml/htmltextslave.h
-include/gtkhtml/htmltokenizer.h
-include/gtkhtml/htmltype.h
-include/gtkhtml/htmltypes.h
-include/gtkhtml/htmlundo-action.h
-include/gtkhtml/htmlundo.h
-include/gtkhtml/htmlvspace.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-compat.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-embedded.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-enums.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-im.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-keybinding.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-private.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-properties.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-propmanager.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-search.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-stream.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml-types.h
+include/gtkhtml-1.1/gtkhtml/gtkhtml.h
+include/gtkhtml-1.1/gtkhtml/gtkhtmldebug.h
+include/gtkhtml-1.1/gtkhtml/gtkhtmlfontstyle.h
+include/gtkhtml-1.1/gtkhtml/htmlanchor.h
+include/gtkhtml-1.1/gtkhtml/htmlbutton.h
+include/gtkhtml-1.1/gtkhtml/htmlcheckbox.h
+include/gtkhtml-1.1/gtkhtml/htmlclue.h
+include/gtkhtml-1.1/gtkhtml/htmlcluealigned.h
+include/gtkhtml-1.1/gtkhtml/htmlclueflow.h
+include/gtkhtml-1.1/gtkhtml/htmlclueh.h
+include/gtkhtml-1.1/gtkhtml/htmlcluev.h
+include/gtkhtml-1.1/gtkhtml/htmlcolor.h
+include/gtkhtml-1.1/gtkhtml/htmlcolorset.h
+include/gtkhtml-1.1/gtkhtml/htmlcursor.h
+include/gtkhtml-1.1/gtkhtml/htmldrawqueue.h
+include/gtkhtml-1.1/gtkhtml/htmlembedded.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-clueflowstyle.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-cursor.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-cut-and-paste.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-fontstyle.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-images.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-movement.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-rule.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-selection-updater.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-table.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-tablecell.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit-text.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-edit.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-print.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-save.h
+include/gtkhtml-1.1/gtkhtml/htmlengine-search.h
+include/gtkhtml-1.1/gtkhtml/htmlengine.h
+include/gtkhtml-1.1/gtkhtml/htmlentity.h
+include/gtkhtml-1.1/gtkhtml/htmlenums.h
+include/gtkhtml-1.1/gtkhtml/htmlenumutils.h
+include/gtkhtml-1.1/gtkhtml/htmlfontmanager.h
+include/gtkhtml-1.1/gtkhtml/htmlform.h
+include/gtkhtml-1.1/gtkhtml/htmlframe.h
+include/gtkhtml-1.1/gtkhtml/htmlframeset.h
+include/gtkhtml-1.1/gtkhtml/htmlgdkpainter.h
+include/gtkhtml-1.1/gtkhtml/htmlhidden.h
+include/gtkhtml-1.1/gtkhtml/htmlhspace.h
+include/gtkhtml-1.1/gtkhtml/htmliframe.h
+include/gtkhtml-1.1/gtkhtml/htmlimage.h
+include/gtkhtml-1.1/gtkhtml/htmlimageinput.h
+include/gtkhtml-1.1/gtkhtml/htmlinterval.h
+include/gtkhtml-1.1/gtkhtml/htmllinktext.h
+include/gtkhtml-1.1/gtkhtml/htmllist.h
+include/gtkhtml-1.1/gtkhtml/htmlmap.h
+include/gtkhtml-1.1/gtkhtml/htmlobject.h
+include/gtkhtml-1.1/gtkhtml/htmlpainter.h
+include/gtkhtml-1.1/gtkhtml/htmlplainpainter.h
+include/gtkhtml-1.1/gtkhtml/htmlprinter.h
+include/gtkhtml-1.1/gtkhtml/htmlradio.h
+include/gtkhtml-1.1/gtkhtml/htmlreplace.h
+include/gtkhtml-1.1/gtkhtml/htmlrule.h
+include/gtkhtml-1.1/gtkhtml/htmlsearch.h
+include/gtkhtml-1.1/gtkhtml/htmlselect.h
+include/gtkhtml-1.1/gtkhtml/htmlselection.h
+include/gtkhtml-1.1/gtkhtml/htmlsettings.h
+include/gtkhtml-1.1/gtkhtml/htmlshape.h
+include/gtkhtml-1.1/gtkhtml/htmlstack.h
+include/gtkhtml-1.1/gtkhtml/htmlstringtokenizer.h
+include/gtkhtml-1.1/gtkhtml/htmltable.h
+include/gtkhtml-1.1/gtkhtml/htmltablecell.h
+include/gtkhtml-1.1/gtkhtml/htmltablepriv.h
+include/gtkhtml-1.1/gtkhtml/htmltext.h
+include/gtkhtml-1.1/gtkhtml/htmltextarea.h
+include/gtkhtml-1.1/gtkhtml/htmltextinput.h
+include/gtkhtml-1.1/gtkhtml/htmltextslave.h
+include/gtkhtml-1.1/gtkhtml/htmltokenizer.h
+include/gtkhtml-1.1/gtkhtml/htmltype.h
+include/gtkhtml-1.1/gtkhtml/htmltypes.h
+include/gtkhtml-1.1/gtkhtml/htmlundo-action.h
+include/gtkhtml-1.1/gtkhtml/htmlundo.h
+include/gtkhtml-1.1/gtkhtml/htmlvspace.h
 lib/bonobo/plugin/libstorage_http.a
 lib/bonobo/plugin/libstorage_http.la
 lib/bonobo/plugin/libstorage_http.so
-lib/gtkhtmlConf.sh
-lib/libgtkhtml.a
-lib/libgtkhtml.la
-lib/libgtkhtml.so
-lib/libgtkhtml.so.21
-lib/libgtkhtml.so.21.0
+lib/libgtkhtml-1.1.a
+lib/libgtkhtml-1.1.la
+lib/libgtkhtml-1.1.so
+lib/libgtkhtml-1.1.so.3
+lib/libgtkhtml-1.1.so.3.2
+lib/pkgconfig/gtkhtml-1.1.pc
 share/control-center/Documents/gtkhtml-properties.desktop
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
 share/gnome/html/gtkhtml-decl.txt
@@ -106,89 +105,101 @@ share/gnome/html/gtkhtml-sections.txt
 share/gnome/html/gtkhtml.hierarchy
 share/gnome/html/gtkhtml.sgml
 share/gnome/html/gtkhtml.types
-share/gnome/html/gtkhtml/gtkhtml-gtkhtml-enums.html
-share/gnome/html/gtkhtml/gtkhtml-gtkhtml-stream.html
-share/gnome/html/gtkhtml/gtkhtml-gtkhtml-types.html
-share/gnome/html/gtkhtml/gtkhtml-gtkhtmlembedded.html
-share/gnome/html/gtkhtml/gtkhtml.html
-share/gnome/html/gtkhtml/index.html
-share/gnome/html/gtkhtml/license.html
-share/gnome/html/gtkhtml/r27.html
 share/gnome/ui/GNOME_GtkHTML_Editor.xml
-share/gtkhtml/Editor.idl
-share/gtkhtml/gtkhtml-capplet.glade
-share/gtkhtml/gtkhtml-editor-properties.glade
-share/gtkhtml/icons/16_copy.png
-share/gtkhtml/icons/16_cut.png
-share/gtkhtml/icons/16_paste.png
-share/gtkhtml/icons/24_copy.png
-share/gtkhtml/icons/24_cut.png
-share/gtkhtml/icons/24_paste.png
-share/gtkhtml/icons/bulb.png
-share/gtkhtml/icons/empty_image.png
-share/gtkhtml/icons/flowers.png
-share/gtkhtml/icons/html-viewer.png
-share/gtkhtml/icons/insert-image-16.png
-share/gtkhtml/icons/insert-image-24.png
-share/gtkhtml/icons/insert-link-16.png
-share/gtkhtml/icons/insert-link-24.png
-share/gtkhtml/icons/insert-object-16.png
-share/gtkhtml/icons/insert-object-24.png
-share/gtkhtml/icons/insert-rule-16.png
-share/gtkhtml/icons/insert-rule-24.png
-share/gtkhtml/icons/insert-table-16.png
-share/gtkhtml/icons/insert-table-24.png
-share/gtkhtml/icons/properties-16.png
-share/gtkhtml/icons/redo-16.png
-share/gtkhtml/icons/redo-24.png
-share/gtkhtml/icons/rule-blue-center.png
-share/gtkhtml/icons/rule-blue-left.png
-share/gtkhtml/icons/rule-blue-right.png
-share/gtkhtml/icons/rule-yellow-flowers-center.png
-share/gtkhtml/icons/rule-yellow-flowers-left.png
-share/gtkhtml/icons/rule-yellow-flowers-right.png
-share/gtkhtml/icons/search-16.png
-share/gtkhtml/icons/search-24.png
-share/gtkhtml/icons/search-and-replace-16.png
-share/gtkhtml/icons/search-and-replace-24.png
-share/gtkhtml/icons/transparent.png
-share/gtkhtml/icons/undo-16.png
-share/gtkhtml/icons/undo-24.png
-share/gtkhtml/keybindingsrc.emacs
-share/gtkhtml/keybindingsrc.ms
-share/gtkhtml/keybindingsrc.xemacs
-share/locale/az/LC_MESSAGES/gtkhtml.mo
-share/locale/cs/LC_MESSAGES/gtkhtml.mo
-share/locale/da/LC_MESSAGES/gtkhtml.mo
-share/locale/de/LC_MESSAGES/gtkhtml.mo
-share/locale/el/LC_MESSAGES/gtkhtml.mo
-share/locale/es/LC_MESSAGES/gtkhtml.mo
-share/locale/fi/LC_MESSAGES/gtkhtml.mo
-share/locale/fr/LC_MESSAGES/gtkhtml.mo
-share/locale/gl/LC_MESSAGES/gtkhtml.mo
-share/locale/hu/LC_MESSAGES/gtkhtml.mo
-share/locale/it/LC_MESSAGES/gtkhtml.mo
-share/locale/ja/LC_MESSAGES/gtkhtml.mo
-share/locale/ko/LC_MESSAGES/gtkhtml.mo
-share/locale/lt/LC_MESSAGES/gtkhtml.mo
-share/locale/lv/LC_MESSAGES/gtkhtml.mo
-share/locale/nl/LC_MESSAGES/gtkhtml.mo
-share/locale/nn/LC_MESSAGES/gtkhtml.mo
-share/locale/no/LC_MESSAGES/gtkhtml.mo
-share/locale/pl/LC_MESSAGES/gtkhtml.mo
-share/locale/pt/LC_MESSAGES/gtkhtml.mo
-share/locale/pt_BR/LC_MESSAGES/gtkhtml.mo
-share/locale/ru/LC_MESSAGES/gtkhtml.mo
-share/locale/sk/LC_MESSAGES/gtkhtml.mo
-share/locale/sl/LC_MESSAGES/gtkhtml.mo
-share/locale/sv/LC_MESSAGES/gtkhtml.mo
-share/locale/tr/LC_MESSAGES/gtkhtml.mo
-share/locale/uk/LC_MESSAGES/gtkhtml.mo
-share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
-share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
+share/gtkhtml-1.1/Editor.idl
+share/gtkhtml-1.1/gtkhtml-capplet.glade
+share/gtkhtml-1.1/gtkhtml-editor-properties.glade
+share/gtkhtml-1.1/icons/16_copy.png
+share/gtkhtml-1.1/icons/16_cut.png
+share/gtkhtml-1.1/icons/16_paste.png
+share/gtkhtml-1.1/icons/24_copy.png
+share/gtkhtml-1.1/icons/24_cut.png
+share/gtkhtml-1.1/icons/24_paste.png
+share/gtkhtml-1.1/icons/bulb.png
+share/gtkhtml-1.1/icons/empty_image.png
+share/gtkhtml-1.1/icons/flowers.png
+share/gtkhtml-1.1/icons/html-viewer.png
+share/gtkhtml-1.1/icons/insert-image-16.png
+share/gtkhtml-1.1/icons/insert-image-24.png
+share/gtkhtml-1.1/icons/insert-link-16.png
+share/gtkhtml-1.1/icons/insert-link-24.png
+share/gtkhtml-1.1/icons/insert-object-16.png
+share/gtkhtml-1.1/icons/insert-object-24.png
+share/gtkhtml-1.1/icons/insert-rule-16.png
+share/gtkhtml-1.1/icons/insert-rule-24.png
+share/gtkhtml-1.1/icons/insert-table-16.png
+share/gtkhtml-1.1/icons/insert-table-24.png
+share/gtkhtml-1.1/icons/paper.png
+share/gtkhtml-1.1/icons/properties-16.png
+share/gtkhtml-1.1/icons/rect.png
+share/gtkhtml-1.1/icons/redo-16.png
+share/gtkhtml-1.1/icons/redo-24.png
+share/gtkhtml-1.1/icons/rule-blue-center.png
+share/gtkhtml-1.1/icons/rule-blue-left.png
+share/gtkhtml-1.1/icons/rule-blue-right.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-center.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-left.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-right.png
+share/gtkhtml-1.1/icons/search-16.png
+share/gtkhtml-1.1/icons/search-24.png
+share/gtkhtml-1.1/icons/search-and-replace-16.png
+share/gtkhtml-1.1/icons/search-and-replace-24.png
+share/gtkhtml-1.1/icons/smiley-1.png
+share/gtkhtml-1.1/icons/smiley-10.png
+share/gtkhtml-1.1/icons/smiley-11.png
+share/gtkhtml-1.1/icons/smiley-2.png
+share/gtkhtml-1.1/icons/smiley-3.png
+share/gtkhtml-1.1/icons/smiley-4.png
+share/gtkhtml-1.1/icons/smiley-5.png
+share/gtkhtml-1.1/icons/smiley-6.png
+share/gtkhtml-1.1/icons/smiley-8.png
+share/gtkhtml-1.1/icons/smiley-9.png
+share/gtkhtml-1.1/icons/texture.png
+share/gtkhtml-1.1/icons/transparent.png
+share/gtkhtml-1.1/icons/undo-16.png
+share/gtkhtml-1.1/icons/undo-24.png
+share/gtkhtml-1.1/keybindingsrc.emacs
+share/gtkhtml-1.1/keybindingsrc.ms
+share/gtkhtml-1.1/keybindingsrc.xemacs
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gtkhtml-1.1.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gtkhtml-1.1.mo
 share/oaf/GNOME_GtkHTML_EBrowser.oaf
 share/oaf/GNOME_GtkHTML_Editor.oaf
-@dirrm include/gtkhtml
+@dirrm share/gtkhtml-1.1/icons
+@dirrm share/gtkhtml-1.1
+@exec ${MKDIR} %D/share/gnome/html/gtkhtml
 @dirrm share/gnome/html/gtkhtml
-@dirrm share/gtkhtml/icons
-@dirrm share/gtkhtml
+@dirrm include/gtkhtml-1.1/gtkhtml
+@dirrm include/gtkhtml-1.1
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index 71b459a1f51..dc76ed47a04 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.10 2002/09/27 09:53:14 wiz Exp $
+$NetBSD: distinfo,v 1.11 2003/01/09 10:51:04 rh Exp $
 
-SHA1 (gtkhtml-1.0.1.tar.bz2) = 67f9ab77def69365209ec189f0a74d2f05e0359a
-Size (gtkhtml-1.0.1.tar.bz2) = 939965 bytes
-SHA1 (patch-ab) = e87b80de2c0a64ca7076264e9d23addb57b709b2
-SHA1 (patch-ac) = ac61550a67e032bc04995137d28293d7b3a714ca
+SHA1 (gtkhtml-1.1.7.tar.bz2) = db57a993a4b0e1021926e9393de701f4f2544d5c
+Size (gtkhtml-1.1.7.tar.bz2) = 1080066 bytes
+SHA1 (patch-ac) = 4b01bcab28a1bd6ba609bf6987af9d2eb9bccdc9
diff --git a/www/gtkhtml/patches/patch-ab b/www/gtkhtml/patches/patch-ab
deleted file mode 100644
index 57747f94213..00000000000
--- a/www/gtkhtml/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2002/01/17 11:15:33 martti Exp $
-
---- capplet/Makefile.in.orig	Tue Dec 18 22:30:48 2001
-+++ capplet/Makefile.in	Wed Jan 16 13:26:20 2002
-@@ -426,8 +426,8 @@
- install-exec-am: install-binPROGRAMS
- install-exec: install-exec-am
- 
--install-data-am: install-deskDATA install-gladeDATA install-newsysDATA \
--		install-sysDATA
-+install-data-am: install-deskDATA install-gladeDATA install-sysDATA
-+#		install-sysDATA
- install-data: install-data-am
- 
- install-am: all-am
diff --git a/www/gtkhtml/patches/patch-ac b/www/gtkhtml/patches/patch-ac
index 2aefbe8aad2..43451109a0d 100644
--- a/www/gtkhtml/patches/patch-ac
+++ b/www/gtkhtml/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2002/01/17 11:15:33 martti Exp $
+$NetBSD: patch-ac,v 1.3 2003/01/09 10:51:04 rh Exp $
 
---- src/gtkhtml.c.orig	Mon Dec 10 18:10:43 2001
-+++ src/gtkhtml.c	Wed Jan 16 13:26:40 2002
-@@ -65,6 +65,8 @@
+--- src/gtkhtml.c.orig	Wed Nov  6 06:56:58 2002
++++ src/gtkhtml.c
+@@ -71,6 +71,8 @@
  #include "math.h"
  #include <libgnome/gnome-util.h>
  
 +int allow_severity, deny_severity;
 +
- 
- static GtkLayoutClass *parent_class = NULL;
- 
+ enum DndTargetType {
+ 	DND_TARGET_TYPE_TEXT_URI_LIST,
+ 	DND_TARGET_TYPE__NETSCAPE_URL,