Update to 1.1.6.

1 files changed, 185 insertions, 167 deletions

diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index d1b7072f5918..e011376209c6 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -1,99 +1,99 @@
 bin/ebrowser
-bin/gnome-gtkhtml-editor
+bin/gnome-gtkhtml-editor-1.1
 bin/gtkhtml-properties-capplet
-etc/CORBA/servers/html-component.gnorba
 etc/gtkhtmlConf.sh
-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.so
-lib/libgtkhtml.a
-lib/libgtkhtml.so
-lib/libgtkhtml.so.21
+lib/libgtkhtml-1.1.so.3
+lib/libgtkhtml-1.1.a
+lib/libgtkhtml-1.1.so
+libdata/pkgconfig/gtkhtml-1.1.pc
 share/doc/gtkhtml/gtkhtml-decl.txt
 share/doc/gtkhtml/gtkhtml-sections.txt
 share/doc/gtkhtml/gtkhtml.hierarchy
@@ -101,83 +101,101 @@ share/doc/gtkhtml/gtkhtml.sgml
 share/doc/gtkhtml/gtkhtml.types
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
 share/gnome/control-center/Documents/gtkhtml-properties.desktop
-share/gnome/gtkhtml/Editor.idl
-share/gnome/gtkhtml/gtkhtml-capplet.glade
-share/gnome/gtkhtml/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml/icons/16_copy.png
-share/gnome/gtkhtml/icons/16_cut.png
-share/gnome/gtkhtml/icons/16_paste.png
-share/gnome/gtkhtml/icons/24_copy.png
-share/gnome/gtkhtml/icons/24_cut.png
-share/gnome/gtkhtml/icons/24_paste.png
-share/gnome/gtkhtml/icons/bulb.png
-share/gnome/gtkhtml/icons/empty_image.png
-share/gnome/gtkhtml/icons/flowers.png
-share/gnome/gtkhtml/icons/html-viewer.png
-share/gnome/gtkhtml/icons/insert-image-16.png
-share/gnome/gtkhtml/icons/insert-image-24.png
-share/gnome/gtkhtml/icons/insert-link-16.png
-share/gnome/gtkhtml/icons/insert-link-24.png
-share/gnome/gtkhtml/icons/insert-object-16.png
-share/gnome/gtkhtml/icons/insert-object-24.png
-share/gnome/gtkhtml/icons/insert-rule-16.png
-share/gnome/gtkhtml/icons/insert-rule-24.png
-share/gnome/gtkhtml/icons/insert-table-16.png
-share/gnome/gtkhtml/icons/insert-table-24.png
-share/gnome/gtkhtml/icons/properties-16.png
-share/gnome/gtkhtml/icons/redo-16.png
-share/gnome/gtkhtml/icons/redo-24.png
-share/gnome/gtkhtml/icons/rule-blue-center.png
-share/gnome/gtkhtml/icons/rule-blue-left.png
-share/gnome/gtkhtml/icons/rule-blue-right.png
-share/gnome/gtkhtml/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml/icons/search-16.png
-share/gnome/gtkhtml/icons/search-24.png
-share/gnome/gtkhtml/icons/search-and-replace-16.png
-share/gnome/gtkhtml/icons/search-and-replace-24.png
-share/gnome/gtkhtml/icons/transparent.png
-share/gnome/gtkhtml/icons/undo-16.png
-share/gnome/gtkhtml/icons/undo-24.png
-share/gnome/gtkhtml/keybindingsrc.emacs
-share/gnome/gtkhtml/keybindingsrc.ms
-share/gnome/gtkhtml/keybindingsrc.xemacs
+share/gnome/gtkhtml-1.1/Editor.idl
+share/gnome/gtkhtml-1.1/gtkhtml-capplet.glade
+share/gnome/gtkhtml-1.1/gtkhtml-editor-properties.glade
+share/gnome/gtkhtml-1.1/icons/16_copy.png
+share/gnome/gtkhtml-1.1/icons/16_cut.png
+share/gnome/gtkhtml-1.1/icons/16_paste.png
+share/gnome/gtkhtml-1.1/icons/24_copy.png
+share/gnome/gtkhtml-1.1/icons/24_cut.png
+share/gnome/gtkhtml-1.1/icons/24_paste.png
+share/gnome/gtkhtml-1.1/icons/bulb.png
+share/gnome/gtkhtml-1.1/icons/empty_image.png
+share/gnome/gtkhtml-1.1/icons/flowers.png
+share/gnome/gtkhtml-1.1/icons/html-viewer.png
+share/gnome/gtkhtml-1.1/icons/insert-image-16.png
+share/gnome/gtkhtml-1.1/icons/insert-image-24.png
+share/gnome/gtkhtml-1.1/icons/insert-link-16.png
+share/gnome/gtkhtml-1.1/icons/insert-link-24.png
+share/gnome/gtkhtml-1.1/icons/insert-object-16.png
+share/gnome/gtkhtml-1.1/icons/insert-object-24.png
+share/gnome/gtkhtml-1.1/icons/insert-rule-16.png
+share/gnome/gtkhtml-1.1/icons/insert-rule-24.png
+share/gnome/gtkhtml-1.1/icons/insert-table-16.png
+share/gnome/gtkhtml-1.1/icons/insert-table-24.png
+share/gnome/gtkhtml-1.1/icons/paper.png
+share/gnome/gtkhtml-1.1/icons/properties-16.png
+share/gnome/gtkhtml-1.1/icons/rect.png
+share/gnome/gtkhtml-1.1/icons/redo-16.png
+share/gnome/gtkhtml-1.1/icons/redo-24.png
+share/gnome/gtkhtml-1.1/icons/rule-blue-center.png
+share/gnome/gtkhtml-1.1/icons/rule-blue-left.png
+share/gnome/gtkhtml-1.1/icons/rule-blue-right.png
+share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-center.png
+share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-left.png
+share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-right.png
+share/gnome/gtkhtml-1.1/icons/search-16.png
+share/gnome/gtkhtml-1.1/icons/search-24.png
+share/gnome/gtkhtml-1.1/icons/search-and-replace-16.png
+share/gnome/gtkhtml-1.1/icons/search-and-replace-24.png
+share/gnome/gtkhtml-1.1/icons/smiley-1.png
+share/gnome/gtkhtml-1.1/icons/smiley-10.png
+share/gnome/gtkhtml-1.1/icons/smiley-11.png
+share/gnome/gtkhtml-1.1/icons/smiley-2.png
+share/gnome/gtkhtml-1.1/icons/smiley-3.png
+share/gnome/gtkhtml-1.1/icons/smiley-4.png
+share/gnome/gtkhtml-1.1/icons/smiley-5.png
+share/gnome/gtkhtml-1.1/icons/smiley-6.png
+share/gnome/gtkhtml-1.1/icons/smiley-8.png
+share/gnome/gtkhtml-1.1/icons/smiley-9.png
+share/gnome/gtkhtml-1.1/icons/texture.png
+share/gnome/gtkhtml-1.1/icons/transparent.png
+share/gnome/gtkhtml-1.1/icons/undo-16.png
+share/gnome/gtkhtml-1.1/icons/undo-24.png
+share/gnome/gtkhtml-1.1/keybindingsrc.emacs
+share/gnome/gtkhtml-1.1/keybindingsrc.ms
+share/gnome/gtkhtml-1.1/keybindingsrc.xemacs
 share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
 share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
 share/gnome/ui/GNOME_GtkHTML_Editor.xml
-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/eu/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
-@dirrm share/gnome/gtkhtml/icons
-@dirrm share/gnome/gtkhtml
+share/locale/az/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ca/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/cs/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/da/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/de/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/el/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/es/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/et/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/eu/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/fi/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/fr/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/gl/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/hu/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/it/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ja/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ko/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/lt/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/lv/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ms/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/nl/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/nn/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/no/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/pl/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/pt/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/pt_BR/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ru/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/sk/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/sl/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/sv/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/tr/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/uk/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/vi/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/zh_CN/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/zh_TW/LC_MESSAGES/gtkhtml-1.1.mo
+@dirrm share/gnome/gtkhtml-1.1/icons
+@dirrm share/gnome/gtkhtml-1.1
 @dirrm share/doc/gtkhtml/gtkhtml
 @dirrm share/doc/gtkhtml
-@dirrm include/gtkhtml
+@dirrm include/gtkhtml-1.1/gtkhtml
+@dirrm include/gtkhtml-1.1