update to 5.22.1

This switches to the gnome-2.22 release branch.

3 files changed, 26 insertions, 12 deletions

diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index b5169202c59..4c8041aee8f 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.68 2008/03/06 14:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2008/04/15 18:46:40 drochner Exp $
 #
 
-DISTNAME=		gcalctool-5.20.2
-PKGREVISION=		1
+DISTNAME=		gcalctool-5.22.1
 CATEGORIES=		math gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/5.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/5.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -30,6 +29,6 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gcalctool/PLIST b/math/gcalctool/PLIST
index e5c93eb8c74..29bdc7c0507 100644
--- a/math/gcalctool/PLIST
+++ b/math/gcalctool/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.20 2007/11/03 16:30:30 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/04/15 18:46:40 drochner Exp $
 bin/gcalctool
 bin/gnome-calculator
 man/man1/gcalctool.1
 share/applications/gcalctool.desktop
+share/gcalctool/gcalctool.glade
 share/gconf/schemas/gcalctool.schemas
+share/gnome/help/gcalctool/C/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_menu_symbol.png
@@ -17,48 +19,55 @@ share/gnome/help/gcalctool/bg/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/bg/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/bg/gcalctool.xml
 share/gnome/help/gcalctool/bg/legal.xml
+share/gnome/help/gcalctool/de/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/de/figures/gcalctool_basic_window.png
 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/es/figures/gcalctool_advanced_window.png
 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
 share/gnome/help/gcalctool/es/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/es/gcalctool.xml
+share/gnome/help/gcalctool/fr/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/fr/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/fr/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/fr/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/fr/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/fr/gcalctool.xml
+share/gnome/help/gcalctool/it/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/it/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/it/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/it/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/it/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/it/gcalctool.xml
-share/gnome/help/gcalctool/it/legal.xml
 share/gnome/help/gcalctool/ja/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/ja/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/ja/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/ja/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/ja/gcalctool.xml
 share/gnome/help/gcalctool/ja/legal.xml
+share/gnome/help/gcalctool/ko/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_basic_window.png
 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/oc/figures/gcalctool_advanced_window.png
 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_advanced_window.png
 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_advanced_window.png
 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
@@ -82,10 +91,13 @@ share/gnome/help/gcalctool/zh_TW/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/zh_TW/gcalctool.xml
 share/gnome/help/gcalctool/zh_TW/legal.xml
+share/locale/af/LC_MESSAGES/gcalctool.mo
 share/locale/am/LC_MESSAGES/gcalctool.mo
 share/locale/ar/LC_MESSAGES/gcalctool.mo
+share/locale/as/LC_MESSAGES/gcalctool.mo
 share/locale/az/LC_MESSAGES/gcalctool.mo
 share/locale/be/LC_MESSAGES/gcalctool.mo
+share/locale/be@latin/LC_MESSAGES/gcalctool.mo
 share/locale/bg/LC_MESSAGES/gcalctool.mo
 share/locale/bn/LC_MESSAGES/gcalctool.mo
 share/locale/bn_IN/LC_MESSAGES/gcalctool.mo
@@ -117,6 +129,7 @@ share/locale/id/LC_MESSAGES/gcalctool.mo
 share/locale/it/LC_MESSAGES/gcalctool.mo
 share/locale/ja/LC_MESSAGES/gcalctool.mo
 share/locale/ka/LC_MESSAGES/gcalctool.mo
+share/locale/kn/LC_MESSAGES/gcalctool.mo
 share/locale/ko/LC_MESSAGES/gcalctool.mo
 share/locale/ku/LC_MESSAGES/gcalctool.mo
 share/locale/lt/LC_MESSAGES/gcalctool.mo
@@ -130,6 +143,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/nn/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
@@ -172,7 +186,7 @@ share/omf/gcalctool/gcalctool-zh_CN.omf
 share/omf/gcalctool/gcalctool-zh_HK.omf
 share/omf/gcalctool/gcalctool-zh_TW.omf
 @dirrm share/omf/gcalctool
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @dirrm share/gnome/help/gcalctool/zh_TW/figures
 @dirrm share/gnome/help/gcalctool/zh_TW
 @dirrm share/gnome/help/gcalctool/zh_HK/figures
@@ -204,4 +218,5 @@ share/omf/gcalctool/gcalctool-zh_TW.omf
 @dirrm share/gnome/help/gcalctool
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf: @dirrm share/gconf/schemas
+@dirrm share/gcalctool
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index d7e593df109..33605edde74 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.28 2007/11/03 16:30:30 drochner Exp $
+$NetBSD: distinfo,v 1.29 2008/04/15 18:46:40 drochner Exp $
 
-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
+SHA1 (gcalctool-5.22.1.tar.bz2) = 8436067dfb3e91338abf236c4b229ae435aa3681
+RMD160 (gcalctool-5.22.1.tar.bz2) = e53335cdbb3c07ad6d311e15a8debda73e829fef
+Size (gcalctool-5.22.1.tar.bz2) = 1488395 bytes