4 files changed, 27 insertions, 17 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 25dcf1a0a9c5..018808b6bb8b 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTVERSION=	0.7
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gtkhtml
@@ -17,7 +16,8 @@ MAINTAINER=	ade@FreeBSD.org
 LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		wwwzip.1:${PORTSDIR}/www/libwww \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
-		pspell.2:${PORTSDIR}/textproc/pspell
+		pspell.2:${PORTSDIR}/textproc/pspell \
+		gal.1:${PORTSDIR}/x11-toolkits/gal
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index 315ddac1380f..a38619586a53 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1 +1 @@
-MD5 (gtkhtml-0.6.1.tar.gz) = d303c543c0b7b6616862aebd7af75dc5
+MD5 (gtkhtml-0.7.tar.gz) = 505e1096f24ee345fc93e86dc5332412
diff --git a/www/gtkhtml/files/patch-ad b/www/gtkhtml/files/patch-ad
index 5bf95839374c..5ef7772b0a97 100644
--- a/www/gtkhtml/files/patch-ad
+++ b/www/gtkhtml/files/patch-ad
@@ -1,11 +1,7 @@
---- src/gtkhtml.c.orig	Thu Aug 10 14:54:13 2000
-+++ src/gtkhtml.c	Mon Aug 14 12:52:42 2000
-@@ -2331,7 +2331,7 @@
+--- src/gtkhtml.c.orig	Thu Oct 19 04:04:22 2000
++++ src/gtkhtml.c	Fri Oct 20 10:40:47 2000
+@@ -2625,3 +2625,3 @@
  
- 	if (strcmp (klass->properties->keybindings_theme, "custom")) {
- 		base = g_strconcat ("keybindingsrc.", klass->properties->keybindings_theme, NULL);
--		rcfile = g_concat_dir_and_file (PREFIX "/share/gtkhtml", base);
-+		rcfile = g_concat_dir_and_file (PREFIX "/share/gnome/gtkhtml", base);
- 		g_free (base);
- 	} else {
- 		rcfile = g_strconcat (gnome_util_user_home (), "/.gnome/gtkhtml-bindings-custom", NULL);
+-	rcfile = g_strconcat ((from_share ? PREFIX "/share/gtkhtml/" : gnome_util_user_home ()),
++	rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml/" : gnome_util_user_home ()),
+ 			      (from_share ? "" : "/.gnome/"), name, NULL);
diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index 6a8716fdc63b..746c2316613b 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -1,11 +1,15 @@
+bin/gtkhtml-editor-properties-capplet
 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-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.h
 include/gtkhtml/gtkhtmldebug.h
@@ -43,23 +47,24 @@ 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/htmlfont.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
@@ -84,19 +89,28 @@ include/gtkhtml/htmlurl.h
 include/gtkhtml/htmlvspace.h
 lib/libgtkhtml.a
 lib/libgtkhtml.so
-lib/libgtkhtml.so.4
+lib/libgtkhtml.so.5
+share/gnome/apps/Settings/Documents/gtkhtml-editor-properties.desktop
 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/keybindingsrc.emacs
 share/gnome/gtkhtml/keybindingsrc.ms
 share/gnome/oaf/html-editor-control.oafinfo
+share/gnome/ui/html-editor-control.xml
+share/locale/cs/LC_MESSAGES/gtkhtml.mo
 share/locale/de/LC_MESSAGES/gtkhtml.mo
 share/locale/fr/LC_MESSAGES/gtkhtml.mo
+share/locale/gl/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/pt_BR/LC_MESSAGES/gtkhtml.mo
 share/locale/ru/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
 @dirrm share/gnome/gtkhtml
 @dirrm include/gtkhtml