update to 3.16.1

This switches to the new gnome-2.20 branch.

4 files changed, 11 insertions, 29 deletions

diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index e0d5c6b7e73..69c7838a34a 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2007/09/21 13:04:27 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/11/03 15:43:06 drochner Exp $
 #
 
-DISTNAME=	gtkhtml-3.14.3
+DISTNAME=	gtkhtml-3.16.1
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml314/}
-PKGREVISION=	2
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.14/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.16/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/gtkhtml314/PLIST b/www/gtkhtml314/PLIST
index 038b6a7df78..567cdb05aa4 100644
--- a/www/gtkhtml314/PLIST
+++ b/www/gtkhtml314/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/17 06:24:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/11/03 15:43:06 drochner Exp $
 include/libgtkhtml-3.14/gtkhtml/gtkhtml-embedded.h
 include/libgtkhtml-3.14/gtkhtml/gtkhtml-enums.h
 include/libgtkhtml-3.14/gtkhtml/gtkhtml-properties.h
@@ -40,6 +40,7 @@ share/gtkhtml-3.14/icons/transparent.png
 share/gtkhtml-3.14/keybindingsrc.emacs
 share/locale/am/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/ar/LC_MESSAGES/gtkhtml-3.14.mo
+share/locale/as/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/az/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/be/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/bg/LC_MESSAGES/gtkhtml-3.14.mo
@@ -85,6 +86,7 @@ share/locale/nb/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/ne/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/nl/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/nn/LC_MESSAGES/gtkhtml-3.14.mo
+share/locale/oc/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/or/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/pa/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/pl/LC_MESSAGES/gtkhtml-3.14.mo
@@ -93,6 +95,7 @@ share/locale/pt_BR/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/ro/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/ru/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/rw/LC_MESSAGES/gtkhtml-3.14.mo
+share/locale/si/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/sk/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/sl/LC_MESSAGES/gtkhtml-3.14.mo
 share/locale/sq/LC_MESSAGES/gtkhtml-3.14.mo
diff --git a/www/gtkhtml314/distinfo b/www/gtkhtml314/distinfo
index 286df0ccb98..47ef3475403 100644
--- a/www/gtkhtml314/distinfo
+++ b/www/gtkhtml314/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/11/03 13:58:58 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/11/03 15:43:06 drochner Exp $
 
-SHA1 (gtkhtml-3.14.3.tar.bz2) = aede744b666fdefb9478e214aa5d38e0122aa289
-RMD160 (gtkhtml-3.14.3.tar.bz2) = 2761c056a1ed9d8759c1897afb61808872305f9d
-Size (gtkhtml-3.14.3.tar.bz2) = 1283748 bytes
-SHA1 (patch-aa) = 6fd74ede168c11f4f48300b4b2f3f1ab56ff63e5
+SHA1 (gtkhtml-3.16.1.tar.bz2) = d9be478f1cbdcb2f8b624b78bc9f546a24491ab9
+RMD160 (gtkhtml-3.16.1.tar.bz2) = 3eea84b1029260d90a1accde4b16b9b7e81aa3a5
+Size (gtkhtml-3.16.1.tar.bz2) = 1303349 bytes
diff --git a/www/gtkhtml314/patches/patch-aa b/www/gtkhtml314/patches/patch-aa
deleted file mode 100644
index a769417014e..00000000000
--- a/www/gtkhtml314/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/11/03 13:58:58 wiz Exp $
-
---- components/html-editor/paragraph-style.c.orig	2007-04-05 09:15:26.000000000 +0000
-+++ components/html-editor/paragraph-style.c
-@@ -19,6 +19,14 @@
-     Boston, MA 02111-1307, USA.
- */
- 
-+#include <config.h>
-+
-+#ifdef GNOME_GTKHTML_EDITOR_SHLIB
-+#include <glib/gi18n-lib.h>
-+#else
-+#include <glib/gi18n.h>
-+#endif
-+
- #include "gtkhtml.h"
- #include "paragraph-style.h"
-