Update gtkhtml to 0.11.1

Notable changes include:

* General:
 - Fixed X selections so that we no longer try to pass UTF-8 encoded text
   in STRING atoms.

 - Improved the table layout code so that now we render tables very close
   to the big name browsers, one or two small issues left

 - Added many missing attributes to the HTML export code so that at least
   we pass on the attributes we understand.

 - Support for sub sup and strike elements.

 - We now parse param elements before emitting the object requested signal
   so that we can make an informed choice about whether or not the object
   is supported.


* Editor:
 - We now hook to the gnome-spell component to do spelling.

 - Rename the idl and oafinfo to bring us in line with the new naming
   conventions

 - The editor control now exposes an interface for issuing editor commands


* Ebrowser:
 - New component to support simple browsing tasks.

6 files changed, 108 insertions, 74 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 3144984fd7a..b5e7e80e019 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:54 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/11 18:35:44 rh Exp $
 #
 
-DISTNAME=	gtkhtml-0.8.3
-CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=unstable/sources/gtkhtml/}
+DISTNAME=		gtkhtml-0.11.1
+CATEGORIES=		www gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gtkhtml/}
 
-MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
-COMMENT=	lightweight HTML rendering/printing/editing engine
+MAINTAINER=		rh@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
+COMMENT=		lightweight HTML rendering/printing/editing engine
 
-DEPENDS+=	gal>=0.5nb1:../../devel/gal
-DEPENDS+=	glibwww-*:../../www/glibwww
-DEPENDS+=	bonobo>=0.37:../../devel/bonobo
-DEPENDS+=	control-center>=1.4.0:../../x11/controlcenter
-DEPENDS+=	gnome-print>=0.28:../../print/gnome-print
-DEPENDS+=	libghttp>=1.0:../../www/libghttp
+DEPENDS+=		gal>=0.5nb1:../../devel/gal
+DEPENDS+=		glibwww-*:../../www/glibwww
+DEPENDS+=		bonobo>=0.37:../../devel/bonobo
+DEPENDS+=		{control-center,libcapplet}>=1.4.0:../../x11/controlcenter
+DEPENDS+=		gnome-print>=0.28:../../print/gnome-print
+DEPENDS+=		libghttp>=1.0:../../www/libghttp
 
-GNU_CONFIGURE=	YES
-USE_X11BASE=	YES
-USE_LIBTOOL=	YES
+GNU_CONFIGURE=		YES
+USE_X11BASE=		YES
+USE_LIBTOOL=		YES
+USE_GMAKE=		YES
 
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CPPFLAGS+=	-I${LOCALBASE}/include
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CPPFLAGS+=		-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index 81e2cadff2e..fcf6325b002 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/05/21 05:27:57 tron Exp $
+$NetBSD: distinfo,v 1.3 2001/08/11 18:35:44 rh Exp $
 
-SHA1 (gtkhtml-0.8.3.tar.gz) = 100d74a394531907cba654ff0f29cf7e55f44fd6
-Size (gtkhtml-0.8.3.tar.gz) = 795890 bytes
-SHA1 (patch-aa) = d5a02b5936f0f23c0ea5222ae92eeaf5ebba7218
-SHA1 (patch-ab) = 8450a9e19b4b05eca9d9b4b29f282ebffc647694
+SHA1 (gtkhtml-0.11.1.tar.gz) = 3313ea2ba9ff2db34b247a3a8d3bb530404c2dfc
+Size (gtkhtml-0.11.1.tar.gz) = 1001747 bytes
+SHA1 (patch-aa) = 912181c9a728714275447e89591d6f01052be75e
+SHA1 (patch-ab) = 7f6206a2e886d71dbc3dc22774c1f873ec56c511
+SHA1 (patch-ac) = c99434a59d3b5020bb47363ef26a4d0cd10afca4
diff --git a/www/gtkhtml/patches/patch-aa b/www/gtkhtml/patches/patch-aa
index 6816aa19f4a..a1a3ff9ee51 100644
--- a/www/gtkhtml/patches/patch-aa
+++ b/www/gtkhtml/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/12/31 14:04:44 rh Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/11 18:35:45 rh Exp $
 
---- configure.orig	Thu Dec 14 19:54:55 2000
+--- configure.orig	Tue Jul 31 17:04:35 2001
 +++ configure
-@@ -3522,7 +3522,7 @@
+@@ -3466,7 +3466,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -11,25 +11,3 @@ $NetBSD: patch-aa,v 1.2 2000/12/31 14:04:44 rh Exp $
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -4297,8 +4297,8 @@
- fi
- 
- 
--EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui gdk_pixbuf print unicode gal $bonobo libglade`
--EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui gdk_pixbuf print unicode gal $bonobo libglade`
-+EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui gdk_pixbuf print gal $bonobo libglade` `unicode-config --libs`"
-+EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui gdk_pixbuf print gal $bonobo libglade` `unicode-config --cflags`"
- 
- 
- 
-@@ -4306,8 +4306,8 @@
- 
- GTKHTML_LIBDIR="-L${libdir}"
- GTKHTML_INCLUDEDIR="-I${includedir}"
--GTKHTML_INCLUDEDIR="$GTKHTML_INCLUDEDIR `$GNOME_CONFIG --cflags gdk_pixbuf print unicode gal` $GCONF_CFLAGS"
--GTKHTML_LIBS="-lgtkhtml `$GNOME_CONFIG --libs gdk_pixbuf print unicode gal` $GCONF_LIBS"
-+GTKHTML_INCLUDEDIR="$GTKHTML_INCLUDEDIR `$GNOME_CONFIG --cflags gdk_pixbuf print gal` `unicode-config --cflags` $GCONF_CFLAGS"
-+GTKHTML_LIBS="-lgtkhtml `$GNOME_CONFIG --libs gdk_pixbuf print gal` `unicode-config --libs` $GCONF_LIBS"
- 
- 
- 
diff --git a/www/gtkhtml/patches/patch-ab b/www/gtkhtml/patches/patch-ab
index 9c55a7530d3..5ec0ac7b34d 100644
--- a/www/gtkhtml/patches/patch-ab
+++ b/www/gtkhtml/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2001/03/03 18:49:15 tron Exp $
+$NetBSD: patch-ab,v 1.2 2001/08/11 18:35:45 rh Exp $
 
---- src/Makefile.in.orig	Thu Dec 14 20:37:44 2000
-+++ src/Makefile.in	Sat Mar  3 19:42:49 2001
-@@ -161,7 +161,7 @@
+--- src/Makefile.in.orig	Tue Jul 31 19:35:05 2001
++++ src/Makefile.in
+@@ -169,7 +169,7 @@
+ testgtkhtml_SOURCES =  	testgtkhtml.c			htmlurl.h			htmlurl.c
  
- 
- testgtkhtml_CFLAGS = $(GLIBWWW_CFLAGS)
+ testgtkhtml_CFLAGS = 
 -testgtkhtml_LDFLAGS =  -static
 +testgtkhtml_LDFLAGS =
  testgtkhtml_LDADD =  	libgtkhtml.la					$(GNOMEUI_LIBS)					$(GNOME_LIBDIR)					$(EXTRA_GNOME_LIBS)                     	$(GLIBWWW_LIBS)					$(GCONF_LIBS)
  
- 
+ #	-lccmalloc -ldl
diff --git a/www/gtkhtml/patches/patch-ac b/www/gtkhtml/patches/patch-ac
new file mode 100644
index 00000000000..8319275ba38
--- /dev/null
+++ b/www/gtkhtml/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/08/11 18:35:45 rh Exp $
+
+--- src/gtkhtml.c.orig	Mon Jul 30 22:49:12 2001
++++ src/gtkhtml.c
+@@ -63,6 +63,8 @@
+ #include "math.h"
+ #include <libgnome/gnome-util.h>
+ 
++int allow_severity, deny_severity;
++
+ 
+ static GtkLayoutClass *parent_class = NULL;
+ 
diff --git a/www/gtkhtml/pkg/PLIST b/www/gtkhtml/pkg/PLIST
index d7e7ee8f75e..fe0c616d212 100644
--- a/www/gtkhtml/pkg/PLIST
+++ b/www/gtkhtml/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2001/04/06 22:21:10 rh Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/08/11 18:35:45 rh Exp $
 bin/ebrowser
 bin/gnome-gtkhtml-editor
 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
@@ -29,8 +30,8 @@ include/gtkhtml/htmlcursor.h
 include/gtkhtml/htmldrawqueue.h
 include/gtkhtml/htmlembedded.h
 include/gtkhtml/htmlengine-edit-clueflowstyle.h
-include/gtkhtml/htmlengine-edit-cut-and-paste.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
@@ -38,17 +39,20 @@ 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.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
@@ -58,8 +62,10 @@ 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
@@ -68,10 +74,12 @@ 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
@@ -89,46 +97,79 @@ lib/gtkhtmlConf.sh
 lib/libgtkhtml.a
 lib/libgtkhtml.la
 lib/libgtkhtml.so
-lib/libgtkhtml.so.8
-lib/libgtkhtml.so.8.1
+lib/libgtkhtml.so.14
+lib/libgtkhtml.so.14.1
 share/control-center/Documents/gtkhtml-properties.desktop
+share/control-center/capplets/gtkhtml-properties.desktop
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
-share/gnome/html/gtkhtml.sgml
-share/gnome/html/gtkhtml.hierarchy
-share/gnome/html/gtkhtml.types
 share/gnome/html/gtkhtml-decl.txt
 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/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-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/search-24.png
+share/gtkhtml/icons/search-and-replace-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/sk/LC_MESSAGES/gtkhtml.mo
-share/locale/ko/LC_MESSAGES/gtkhtml.mo
-share/locale/pl/LC_MESSAGES/gtkhtml.mo
-share/locale/pt_BR/LC_MESSAGES/gtkhtml.mo
-share/locale/sv/LC_MESSAGES/gtkhtml.mo
-share/locale/uk/LC_MESSAGES/gtkhtml.mo
-share/locale/de/LC_MESSAGES/gtkhtml.mo
-share/locale/fr/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/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_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/oaf/GNOME_GtkHTML_EBrowser.oafinfo
-share/oaf/GNOME_GtkHTML_Editor.oafinfo
+share/locale/uk/LC_MESSAGES/gtkhtml.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gtkhtml.mo
+share/oaf/GNOME_GtkHTML_EBrowser.oaf
+share/oaf/GNOME_GtkHTML_Editor.oaf
 @exec mkdir -p -m 0755 %D/share/gnome/html/gtkhtml
+@dirrm share/gtkhtml/icons
+@dirrm share/gtkhtml
 @dirrm share/gnome/html/gtkhtml
 @dirrm include/gtkhtml
-@dirrm share/gtkhtml