4 files changed, 45 insertions, 43 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 9ab551e8c227..6024520b6ed4 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.98 2007/03/13 01:24:10 marcus Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.113 2007/10/15 14:28:31 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.14.3
+PORTVERSION=	3.16.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,4 +31,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 PLIST_SUB=	VERSION="3.14"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|@INTLTOOL_LIBDIR@|${LOCALBASE}/libdata|' \
+	    	${WRKSRC}/intltool-merge.in
+
 .include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 69a4c791ecc4..8c3bdb5b5032 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.14.3.tar.bz2) = 7c028f07e0eb061b0a895ac514265cf1
-SHA256 (gnome2/gtkhtml-3.14.3.tar.bz2) = 6419265c9766de668bd553742d915df095bdab2737a4583f63e67242d3903832
-SIZE (gnome2/gtkhtml-3.14.3.tar.bz2) = 1283748
+MD5 (gnome2/gtkhtml-3.16.1.tar.bz2) = 71d2d115e3629a634e115b8c0b0fd5b5
+SHA256 (gnome2/gtkhtml-3.16.1.tar.bz2) = 47ab5cd171ba4c0932fc108d4ec45dc6a7bd3afd8ac9801e1d12c40c2c071b72
+SIZE (gnome2/gtkhtml-3.16.1.tar.bz2) = 1303349
diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c
deleted file mode 100644
index cc9534035220..000000000000
--- a/www/gtkhtml3/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
-+++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
-@@ -3104,7 +3104,7 @@
- 	add_bindings (klass);
- 	gtk_html_accessibility_init ();
- 
--	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
-+	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
- 	gtk_rc_parse (filename);
- 	g_free (filename);
- 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 2f85980f058e..a084714f5c45 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -17,33 +17,34 @@ lib/libgtkhtml-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.so.19
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gnome/gtkhtml-%%VERSION%%/Editor.idl
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
-share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
-share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
-share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
-share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
-share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
-share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
+share/gtkhtml-%%VERSION%%/Editor.idl
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
+share/gtkhtml-%%VERSION%%/icons/bulb.png
+share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/draft-paper.png
+share/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/empty_image.png
+share/gtkhtml-%%VERSION%%/icons/flowers.png
+share/gtkhtml-%%VERSION%%/icons/html-viewer.png
+share/gtkhtml-%%VERSION%%/icons/info_bulb.png
+share/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
+share/gtkhtml-%%VERSION%%/icons/paper.png
+share/gtkhtml-%%VERSION%%/icons/rect.png
+share/gtkhtml-%%VERSION%%/icons/ribbon.jpg
+share/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
+share/gtkhtml-%%VERSION%%/icons/texture.png
+share/gtkhtml-%%VERSION%%/icons/transparent.png
+share/gtkhtml-%%VERSION%%/keybindingsrc.emacs
 share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/as/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -89,6 +90,7 @@ share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -97,6 +99,7 @@ share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/si/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -112,8 +115,8 @@ 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
-@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
-@dirrm share/gnome/gtkhtml-%%VERSION%%
+@dirrm share/gtkhtml-%%VERSION%%/icons
+@dirrm share/gtkhtml-%%VERSION%%
 @dirrmtry lib/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%
@@ -121,8 +124,12 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -133,3 +140,5 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as