Update gtkhtml to 0.8. 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.

5 files changed, 68 insertions, 20 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index f924d555a37..cc7e8ea3af5 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2000/09/02 06:56:17 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/12/31 14:04:43 rh Exp $
 #
 
-DISTNAME=	gtkhtml-0.6.1
+DISTNAME=	gtkhtml-0.8
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=unstable/sources/gtkhtml/}
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 
-DEPENDS+=	libwww>=5.2.8:../../www/libwww
-DEPENDS+=	bonobo>=0.15:../../devel/bonobo
+DEPENDS+=	gal>=0.4.1:../../devel/gal
+DEPENDS+=	glibwww-*:../../www/glibwww
+DEPENDS+=	bonobo>=0.29:../../devel/bonobo
 DEPENDS+=	control-center>=1.2.0:../../x11/controlcenter
 DEPENDS+=	gnome-print>=0.20:../../print/gnome-print
 
@@ -17,7 +18,7 @@ GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
 USE_LIBTOOL=	YES
 
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml/files/md5 b/www/gtkhtml/files/md5
index aa9968d80e6..728b92b73ac 100644
--- a/www/gtkhtml/files/md5
+++ b/www/gtkhtml/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/08/30 07:16:34 rh Exp $
+$NetBSD: md5,v 1.2 2000/12/31 14:04:44 rh Exp $
 
-MD5 (gtkhtml-0.6.1.tar.gz) = d303c543c0b7b6616862aebd7af75dc5
+MD5 (gtkhtml-0.8.tar.gz) = 3c80b274420d3c205a5d50febcf3ff17
diff --git a/www/gtkhtml/files/patch-sum b/www/gtkhtml/files/patch-sum
index e89e02e8421..2b9ded49f14 100644
--- a/www/gtkhtml/files/patch-sum
+++ b/www/gtkhtml/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/08/30 07:16:34 rh Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/31 14:04:44 rh Exp $
 
-MD5 (patch-aa) = 3fe3327585f23b4235173f9c46f05274
+MD5 (patch-aa) = d8188d2f33ba6c2dd29a2f1114dc4b96
diff --git a/www/gtkhtml/patches/patch-aa b/www/gtkhtml/patches/patch-aa
index bd31c7d3986..6816aa19f4a 100644
--- a/www/gtkhtml/patches/patch-aa
+++ b/www/gtkhtml/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/30 07:16:34 rh Exp $
+$NetBSD: patch-aa,v 1.2 2000/12/31 14:04:44 rh Exp $
 
---- configure.orig	Wed Aug 30 08:38:32 2000
+--- configure.orig	Thu Dec 14 19:54:55 2000
 +++ configure
 @@ -3522,7 +3522,7 @@
    cat conftest.$ac_ext >&5
@@ -11,3 +11,25 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/08/30 07:16:34 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/pkg/PLIST b/www/gtkhtml/pkg/PLIST
index b740577b431..64106f52b19 100644
--- a/www/gtkhtml/pkg/PLIST
+++ b/www/gtkhtml/pkg/PLIST
@@ -1,12 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/30 07:16:34 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/31 14:04:44 rh Exp $
+bin/ebrowser
+bin/gnome-gtkhtml-editor
 bin/gtkhtml-properties-capplet
-bin/html-editor-control
 etc/CORBA/servers/html-component.gnorba
 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
@@ -22,7 +27,6 @@ include/gtkhtml/htmlcolor.h
 include/gtkhtml/htmlcolorset.h
 include/gtkhtml/htmlcursor.h
 include/gtkhtml/htmldrawqueue.h
-include/gtkhtml/htmlelement.h
 include/gtkhtml/htmlembedded.h
 include/gtkhtml/htmlengine-cutbuffer.h
 include/gtkhtml/htmlengine-edit-clueflowstyle.h
@@ -44,27 +48,30 @@ 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/htmlentity.h
-include/gtkhtml/htmlfont.h
+include/gtkhtml/htmlenums.h
+include/gtkhtml/htmlenumutils.h
+include/gtkhtml/htmlfontmanager.h
 include/gtkhtml/htmlform.h
-include/gtkhtml/htmlgdkfontmanager.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/htmllinktextmaster.h
 include/gtkhtml/htmllist.h
 include/gtkhtml/htmlobject.h
 include/gtkhtml/htmlpainter.h
 include/gtkhtml/htmlprinter.h
-include/gtkhtml/htmlprintfontmanager.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/htmlstack.h
 include/gtkhtml/htmlstringtokenizer.h
@@ -78,18 +85,35 @@ include/gtkhtml/htmltextmaster.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/htmlurl.h
 include/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.4.0
+lib/libgtkhtml.so.6.0
 share/control-center/Documents/gtkhtml-properties.desktop
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
+share/gnome/ui/GNOME_GtkHTML_Editor.xml
+share/gtkhtml/Editor.idl
+share/gtkhtml/gtkhtml-capplet.glade
 share/gtkhtml/keybindingsrc.emacs
 share/gtkhtml/keybindingsrc.ms
+share/locale/cs/LC_MESSAGES/gtkhtml.mo
+share/locale/da/LC_MESSAGES/gtkhtml.mo
+share/locale/es/LC_MESSAGES/gtkhtml.mo
+share/locale/fi/LC_MESSAGES/gtkhtml.mo
+share/locale/gl/LC_MESSAGES/gtkhtml.mo
+share/locale/it/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
@@ -98,6 +122,7 @@ share/locale/no/LC_MESSAGES/gtkhtml.mo
 share/locale/ru/LC_MESSAGES/gtkhtml.mo
 share/locale/sl/LC_MESSAGES/gtkhtml.mo
 share/locale/tr/LC_MESSAGES/gtkhtml.mo
-share/oaf/html-editor-control.oafinfo
+share/oaf/GNOME_GtkHTML_EBrowser.oafinfo
+share/oaf/GNOME_GtkHTML_Editor.oafinfo
 @dirrm include/gtkhtml
 @dirrm share/gtkhtml