update to 2.20.0

This switches to the new gnome-2.20 branch.

3 files changed, 39 insertions, 9 deletions

diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 37487f4283f..cf4c3e09ca3 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2007/09/21 13:04:45 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2007/11/03 16:16:44 drochner Exp $
 #
 
-DISTNAME=	zenity-2.18.2
-PKGREVISION=	2
+DISTNAME=	zenity-2.20.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/zenity/PLIST b/x11/zenity/PLIST
index eb8aa775038..e98b577bd34 100644
--- a/x11/zenity/PLIST
+++ b/x11/zenity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2007/06/15 17:58:20 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2007/11/03 16:16:44 drochner Exp $
 bin/gdialog
 bin/zenity
 man/man1/zenity.1
@@ -27,6 +27,18 @@ share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/bg/zenity.xml
+share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/en_GB/zenity.xml
 share/gnome/help/zenity/es/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/es/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/es/figures/zenity-error-screenshot.png
@@ -51,6 +63,18 @@ share/gnome/help/zenity/fr/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/fr/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/fr/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/fr/zenity.xml
+share/gnome/help/zenity/oc/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/oc/zenity.xml
 share/gnome/help/zenity/ru/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/ru/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/ru/figures/zenity-error-screenshot.png
@@ -137,6 +161,7 @@ share/locale/nb/LC_MESSAGES/zenity.mo
 share/locale/ne/LC_MESSAGES/zenity.mo
 share/locale/nl/LC_MESSAGES/zenity.mo
 share/locale/nn/LC_MESSAGES/zenity.mo
+share/locale/oc/LC_MESSAGES/zenity.mo
 share/locale/or/LC_MESSAGES/zenity.mo
 share/locale/pa/LC_MESSAGES/zenity.mo
 share/locale/pl/LC_MESSAGES/zenity.mo
@@ -163,8 +188,10 @@ share/locale/zh_HK/LC_MESSAGES/zenity.mo
 share/locale/zh_TW/LC_MESSAGES/zenity.mo
 share/omf/zenity/zenity-C.omf
 share/omf/zenity/zenity-bg.omf
+share/omf/zenity/zenity-en_GB.omf
 share/omf/zenity/zenity-es.omf
 share/omf/zenity/zenity-fr.omf
+share/omf/zenity/zenity-oc.omf
 share/omf/zenity/zenity-ru.omf
 share/omf/zenity/zenity-sv.omf
 share/omf/zenity/zenity-uk.omf
@@ -193,10 +220,14 @@ share/zenity/zenity.png
 @dirrm share/gnome/help/zenity/sv
 @dirrm share/gnome/help/zenity/ru/figures
 @dirrm share/gnome/help/zenity/ru
+@dirrm share/gnome/help/zenity/oc/figures
+@dirrm share/gnome/help/zenity/oc
 @dirrm share/gnome/help/zenity/fr/figures
 @dirrm share/gnome/help/zenity/fr
 @dirrm share/gnome/help/zenity/es/figures
 @dirrm share/gnome/help/zenity/es
+@dirrm share/gnome/help/zenity/en_GB/figures
+@dirrm share/gnome/help/zenity/en_GB
 @dirrm share/gnome/help/zenity/bg/figures
 @dirrm share/gnome/help/zenity/bg
 @dirrm share/gnome/help/zenity/C/figures
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 17d1296bf49..22dfeb97804 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2007/06/15 17:58:20 drochner Exp $
+$NetBSD: distinfo,v 1.22 2007/11/03 16:16:44 drochner Exp $
 
-SHA1 (zenity-2.18.2.tar.bz2) = 8b8e51e88d9036ebb4b009119e1e5aeeab88f716
-RMD160 (zenity-2.18.2.tar.bz2) = be9bc3ccbc89ce99aff6be32b1faeae82ef799eb
-Size (zenity-2.18.2.tar.bz2) = 1752871 bytes
+SHA1 (zenity-2.20.0.tar.bz2) = 062cb61bc07a4de61fb531d745648552285f6858
+RMD160 (zenity-2.20.0.tar.bz2) = a5d67b31af023ace9b92bb541efd824a332c6b58
+Size (zenity-2.20.0.tar.bz2) = 1787052 bytes