4 files changed, 30 insertions, 15 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index d576f1ec9ef3..de32227e229e 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	0.7
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gtkhtml
@@ -18,7 +17,7 @@ LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		wwwzip.1:${PORTSDIR}/www/libwww \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
 		pspell.2:${PORTSDIR}/textproc/pspell \
-		gal.2:${PORTSDIR}/x11-toolkits/gal
+		gal.3:${PORTSDIR}/x11-toolkits/gal
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index a38619586a53..fcd883d50a47 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1 +1 @@
-MD5 (gtkhtml-0.7.tar.gz) = 505e1096f24ee345fc93e86dc5332412
+MD5 (gtkhtml-0.8.tar.gz) = 3c80b274420d3c205a5d50febcf3ff17
diff --git a/www/gtkhtml/files/patch-af b/www/gtkhtml/files/patch-af
new file mode 100644
index 000000000000..d7e199bf43cc
--- /dev/null
+++ b/www/gtkhtml/files/patch-af
@@ -0,0 +1,7 @@
+--- configure.orig	Thu Dec 14 12:54:55 2000
++++ configure	Thu Dec 14 16:34:25 2000
+@@ -3932,3 +3932,3 @@
+ 	BACKUP_LDFLAGS=$LDFLAGS
+-	LDFLAGS="$LDFLAGS `gtk-config --libs`"
++	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
+ 	echo $ac_n "checking for gdk_im_begin""... $ac_c" 1>&6
diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index 746c2316613b..44bb92d88b65 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -1,16 +1,17 @@
-bin/gtkhtml-editor-properties-capplet
+bin/ebrowser
+bin/gnome-gtkhtml-editor
 bin/gtkhtml-properties-capplet
-bin/html-editor-control
 etc/CORBA/servers/html-component.gnorba
 etc/gtkhtmlConf.sh
 include/gtkhtml/gtkhtml-embedded.h
+include/gtkhtml/gtkhtml-enums.h
 include/gtkhtml/gtkhtml-im.h
-include/gtkhtml/gtkhtml-input.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
@@ -26,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
@@ -50,7 +50,8 @@ include/gtkhtml/htmlengine-save.h
 include/gtkhtml/htmlengine-search.h
 include/gtkhtml/htmlengine.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/htmlgdkpainter.h
@@ -70,6 +71,7 @@ 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
@@ -83,29 +85,36 @@ 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.so
 lib/libgtkhtml.a
 lib/libgtkhtml.so
-lib/libgtkhtml.so.5
-share/gnome/apps/Settings/Documents/gtkhtml-editor-properties.desktop
+lib/libgtkhtml.so.6
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
-share/gnome/control-center/Documents/gtkhtml-editor-properties.desktop
 share/gnome/control-center/Documents/gtkhtml-properties.desktop
+share/gnome/gtkhtml/Editor.idl
+share/gnome/gtkhtml/gtkhtml-capplet.glade
 share/gnome/gtkhtml/keybindingsrc.emacs
 share/gnome/gtkhtml/keybindingsrc.ms
-share/gnome/oaf/html-editor-control.oafinfo
-share/gnome/ui/html-editor-control.xml
+share/gnome/oaf/GNOME_GtkHTML_EBrowser.oafinfo
+share/gnome/oaf/GNOME_GtkHTML_Editor.oafinfo
+share/gnome/ui/GNOME_GtkHTML_Editor.xml
 share/locale/cs/LC_MESSAGES/gtkhtml.mo
+share/locale/da/LC_MESSAGES/gtkhtml.mo
 share/locale/de/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/it/LC_MESSAGES/gtkhtml.mo
 share/locale/ja/LC_MESSAGES/gtkhtml.mo
 share/locale/ko/LC_MESSAGES/gtkhtml.mo
 share/locale/nl/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/sl/LC_MESSAGES/gtkhtml.mo