4 files changed, 17 insertions, 23 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 5afc4a824318..d7e40fc2888b 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.62 2005/10/03 15:21:56 ahze Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.8.2
-PORTREVISION=	1
+PORTVERSION=	3.10.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,13 +19,14 @@ COMMENT=	Lightweight HTML rendering/printing/editing engine
 
 LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup
 
+USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui \
 		libgnomeprintui ltverhack
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 0af85a2477c8..24036a9892c8 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.8.2.tar.bz2) = 4455e24142cc914f00f1e8b81940df68
-SHA256 (gnome2/gtkhtml-3.8.2.tar.bz2) = d8fc9e7111773448bb07cc2619fbc3b8534a14a9b3075724465c7567cf1a94d0
-SIZE (gnome2/gtkhtml-3.8.2.tar.bz2) = 1247395
+MD5 (gnome2/gtkhtml-3.10.1.tar.bz2) = f2b7ff386dae9fcc3b01c4116564722d
+SHA256 (gnome2/gtkhtml-3.10.1.tar.bz2) = e2a1910fccc4f081f70028cf28a82406cf81bf1e8a0b4fd1d44898c2bb4b59ba
+SIZE (gnome2/gtkhtml-3.10.1.tar.bz2) = 1264910
diff --git a/www/gtkhtml3/files/patch-src_htmltext.c b/www/gtkhtml3/files/patch-src_htmltext.c
deleted file mode 100644
index f970e5b654c2..000000000000
--- a/www/gtkhtml3/files/patch-src_htmltext.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/htmltext.c.orig	Wed Dec  8 01:45:57 2004
-+++ src/htmltext.c	Wed Dec  8 01:46:10 2004
-@@ -2433,10 +2433,11 @@
- gsize
- html_text_sanitize (const gchar **str, gint *len)
- {
-+	gchar *end;
- 	g_return_val_if_fail (str != NULL, 0);
- 	g_return_val_if_fail (len != NULL, 0);
- 	
--	gchar *end = offset_to_pointer_validated (*str, *len, len);
-+	end = offset_to_pointer_validated (*str, *len, len);
- 	if (end) {
- 		return end - *str;
- 	} else {
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index b03ec689fc53..9bb8dfce8c6f 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -94,6 +94,7 @@ share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -113,7 +114,9 @@ share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -138,12 +141,18 @@ share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/gtkhtml-%%VERSION%%/icons
 @dirrm share/gnome/gtkhtml-%%VERSION%%
 @dirrm lib/gtkhtml