update to 5.20.2

This switches to the new gnome-2.20 branch.

4 files changed, 26 insertions, 24 deletions

diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index e2cb9a4dcf3..6e5bfc67115 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.64 2007/09/21 13:03:58 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2007/11/03 16:30:30 drochner Exp $
 #
 
-DISTNAME=		gcalctool-5.9.14
-PKGREVISION=		3
+DISTNAME=		gcalctool-5.20.2
 CATEGORIES=		math gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/5.9/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/5.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/math/gcalctool/PLIST b/math/gcalctool/PLIST
index 00890a6773d..e5c93eb8c74 100644
--- a/math/gcalctool/PLIST
+++ b/math/gcalctool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2007/09/25 10:54:14 hira Exp $
+@comment $NetBSD: PLIST,v 1.20 2007/11/03 16:30:30 drochner Exp $
 bin/gcalctool
 bin/gnome-calculator
 man/man1/gcalctool.1
@@ -22,7 +22,6 @@ share/gnome/help/gcalctool/de/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/de/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/de/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/de/gcalctool.xml
-share/gnome/help/gcalctool/de/legal.xml
 share/gnome/help/gcalctool/es/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_menu_symbol.png
@@ -50,7 +49,16 @@ share/gnome/help/gcalctool/ko/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/ko/gcalctool.xml
-share/gnome/help/gcalctool/ko/legal.xml
+share/gnome/help/gcalctool/oc/figures/gcalctool_basic_window.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_financial_window.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_scientific_window.png
+share/gnome/help/gcalctool/oc/gcalctool.xml
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_basic_window.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_financial_window.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_scientific_window.png
+share/gnome/help/gcalctool/pt_BR/gcalctool.xml
 share/gnome/help/gcalctool/sv/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_menu_symbol.png
@@ -122,6 +130,7 @@ share/locale/ms/LC_MESSAGES/gcalctool.mo
 share/locale/nb/LC_MESSAGES/gcalctool.mo
 share/locale/ne/LC_MESSAGES/gcalctool.mo
 share/locale/nl/LC_MESSAGES/gcalctool.mo
+share/locale/oc/LC_MESSAGES/gcalctool.mo
 share/locale/or/LC_MESSAGES/gcalctool.mo
 share/locale/pa/LC_MESSAGES/gcalctool.mo
 share/locale/pl/LC_MESSAGES/gcalctool.mo
@@ -130,6 +139,7 @@ share/locale/pt_BR/LC_MESSAGES/gcalctool.mo
 share/locale/ro/LC_MESSAGES/gcalctool.mo
 share/locale/ru/LC_MESSAGES/gcalctool.mo
 share/locale/rw/LC_MESSAGES/gcalctool.mo
+share/locale/si/LC_MESSAGES/gcalctool.mo
 share/locale/sk/LC_MESSAGES/gcalctool.mo
 share/locale/sl/LC_MESSAGES/gcalctool.mo
 share/locale/sq/LC_MESSAGES/gcalctool.mo
@@ -155,6 +165,8 @@ share/omf/gcalctool/gcalctool-fr.omf
 share/omf/gcalctool/gcalctool-it.omf
 share/omf/gcalctool/gcalctool-ja.omf
 share/omf/gcalctool/gcalctool-ko.omf
+share/omf/gcalctool/gcalctool-oc.omf
+share/omf/gcalctool/gcalctool-pt_BR.omf
 share/omf/gcalctool/gcalctool-sv.omf
 share/omf/gcalctool/gcalctool-zh_CN.omf
 share/omf/gcalctool/gcalctool-zh_HK.omf
@@ -169,6 +181,10 @@ share/omf/gcalctool/gcalctool-zh_TW.omf
 @dirrm share/gnome/help/gcalctool/zh_CN
 @dirrm share/gnome/help/gcalctool/sv/figures
 @dirrm share/gnome/help/gcalctool/sv
+@dirrm share/gnome/help/gcalctool/pt_BR/figures
+@dirrm share/gnome/help/gcalctool/pt_BR
+@dirrm share/gnome/help/gcalctool/oc/figures
+@dirrm share/gnome/help/gcalctool/oc
 @dirrm share/gnome/help/gcalctool/ko/figures
 @dirrm share/gnome/help/gcalctool/ko
 @dirrm share/gnome/help/gcalctool/ja/figures
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index ab75d27e8ef..d7e593df109 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.27 2007/09/29 13:07:46 drochner Exp $
+$NetBSD: distinfo,v 1.28 2007/11/03 16:30:30 drochner Exp $
 
-SHA1 (gcalctool-5.9.14.tar.bz2) = 299489f6090c3f88cca754e8a513b8a8e3d16cf9
-RMD160 (gcalctool-5.9.14.tar.bz2) = a790a820c1b2e7321badc2ef3aef4f814159baac
-Size (gcalctool-5.9.14.tar.bz2) = 1189518 bytes
-SHA1 (patch-aa) = eea2a8cf270d35de75555c90ea12308a45e852a6
+SHA1 (gcalctool-5.20.2.tar.bz2) = c33733a5885f33e21d64628393feaaf93b4db345
+RMD160 (gcalctool-5.20.2.tar.bz2) = e8dfca5d3751858420c8a03a1600afc3a020c4f4
+Size (gcalctool-5.20.2.tar.bz2) = 1343757 bytes
diff --git a/math/gcalctool/patches/patch-aa b/math/gcalctool/patches/patch-aa
deleted file mode 100644
index f477249297b..00000000000
--- a/math/gcalctool/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2007/09/29 13:07:46 drochner Exp $
-
---- gcalctool/Makefile.in.orig	2007-09-29 15:00:28.000000000 +0200
-+++ gcalctool/Makefile.in
-@@ -262,7 +262,6 @@ INCLUDES = \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED \
- 	-DGDK_DISABLE_DEPRECATED \
- 	-DGNOME_DISABLE_DEPRECATED \
--	-DGTK_DISABLE_DEPRECATED \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- 	-DPACKAGE_PIXMAP_DIR=\""$(prefix)/$(DATADIRNAME)/pixmaps"\" \