Update gcalctool to 5.26.0.

Overview of changes in gcalctool 5.26.0

    * Fix button expansion (nowak2000, Bug #575385)

    * Removed deprecated test/ directory (Bug #574048)

    * Updated documentation: C (Robin Sonefors), ca (Joan Duran)

    * Updated translations: as (Amitakhya Phukan), da (Ask H. Larsen),
                            el (Jennie Petoumenou), es (Jorge Gonzalez),
                            fi (Tommi Vainikainen), gl (Ignacio Casal Quinteiro),
                            gu (Ankitkumar Patel), hi (Rajesh Ranjan),
                            hu (Gabor Kelemen), it (Sergio Durzu),
                            lt (Vytautas Rėkus), mai (Rajesh Ranjan),
                            ml (Ani Peter), mr (Sandeep Shedmake),
                            nb (Kjartan Maraas), nl (Tino Meinen),
                            pl (Wadim Dziedzic), ru (Nickolay V. Shmyrev),
                            ta (felix), te (Krishnababu K),
                            zh_HK (Chao-Hsiung Liao), zh_TW (Chao-Hsiung Liao)

Overview of changes in gcalctool 5.25.92

    * Restore number display mode (FIX/SCI/ENG) on startup (Robert Ancell, Bug #572881)

    * Fix rounding errors in integer power calulations (Robert Ancell, Bug #527540)

    * Fix error in cosine/tangent calculations (Robert Ancell, Bug #571007)

    * Updated documentation: eu (Inaki Larranaga Murgoitio)

    * Updated translations: en_GB (Philip Withnall), fi (Ilkka Tuohela),
                            fr (Bruno Brouard, Claude Paroz), ja (Takeshi AIHANA)
                            kn (Shankar Prasad), lv (Raivis Dejus),
                            nl (Wouter Bolsterlee), pt (Duarte Loreto)
                            pt_BR (Og Maciel, Rodrigo Flores), sv (Daniel Nylander)

Overview of changes in gcalctool 5.25.91

    * Initialise GType system so usage of GConf doesn't cause crashes (Matthias Clasen, Bug #571581)

    * Rework command-line arguments to be standard (Robert Ancell, Bug #569885)

    * Correctly handle decimal points for languages not using '.' (Robert Ancell, Bug #566929)

    * Fix shortcut keys so standard menu keys work (Robert Ancell)

    * Updated documentation: eu (Inaki Larranaga Murgoitio)

    * Updated translations: ast (Mikel González), cs (Petr Pulc), da (Ask H. Larsen), eu (Inaki Larranaga Murgoitio),
                            gu (Sweta Kothari), hu (Gabor Kelemen), ro (Adi Roiban), vi (Clytie Siddall),
                            zh_HK (Chao-Hsiung Liao), zh_TW (Chao-Hsiung Liao)

Overview of changes in gcalctool 5.25.90

    * Fixed incorrect bit shift operation (Robert Ancell, Bug #569176)

    * Updated documentation: sv (Daniel Nylander)

    * Updated translations: ca (Joan Duran), de (Christian Kirbach), ko (Changwoo Ryu), or (Manoj Kumar Giri)

Overview of changes in gcalctool 5.25.5

    * Updated documentation: de (Christian Kirbach)

    * Updated translations: nb (Kjartan Maraas), th (Theppitak Karoonboonyanan)

Overview of changes in gcalctool 5.25.4

    * Updated translations: de (ckirbach), es (Jorge Gonzalez), zh_CN (甘露)

Overview of changes in gcalctool 5.25.3

    * Made exponential numbers work without a sign, e.g. '1e2' works
      the same as '1e+2' (Robert Ancell).

    * Correctly calculate exponential numbers in binary mode and
      convert correctly when changing bases (Robert Ancell, Bug #516159).

    * Fix broken accelerator keys from changes in 5.25.2 (Robert Ancell, Bug #379476).

Overview of changes in gcalctool 5.25.2

    * Changed the scientific UI so that inverse operations (e.g. Ln/e^x) are controlled by the shift key.
      The following shortcut keys have changed:

      Function     | Old | New
      --------------------------
      Sine         | K   | k
      Inv. Sine    | -   | K
      Cosine       | J   | j
      Inv. Cosine  | -   | J
      Tangent      | L   | w
      Inv. Tangent | -   | W
      Natural Log  | N   | n
      e^x          | {   | N
      Log          | G   | g
      10^x         | }   | G
      Log_2        | H   | h
      2^x          | -   | H
      x^y          | ^   | ^ or o
      x^(1/y)      | -   | O

      (Robin Sonefors, Bug #379476).

    * Fixed crash where financial dialogs are activated from other modes on startup
      (Robin Sonefors, Bug #560196).

    * Give binary invert operation higher precedence so that ~X and X == 0 (Sami Pietilä, Bug #562251)

    * Fixed calculation errors for boolean operations on very large numbers (Robert Ancell, Bug #509988)

    * Always read configuration from /apps/gcalctool not /apps/(appname) as the application
      name is different when symlinked (e.g. the gnome-calculator symlink) (Matt Keenan, Bug #559260).

    * Correct gconf key names in man page (Robert Ancell, Bug #559458).

    * Updated translations: es (Jorge Gonzalez)

    * Updated help: es (Jorge Gonzalez)

Overview of changes in gcalctool 5.25.1

    * Added a programming mode that contains the bit editor (Robin Sonefors, Bug #501508).

    * Made finacial operations GUI-based not register based (Robin Sonefors, Bug #318686).

    * Added Gross Profit Margin Ration Financial Function (Robin Sonefors, Bug #150663).

    * Don't clear display when changing modes and allow all functions to work in all non-basic
      modes (Robert Ancell, Bug #554133).

    * Set decimal point label to be based on LC_NUMERIC as users can set their numerical
      representation to different to their language settings (Robin Sonefors, Bug #557331).

    * More refactoring in MP math library (Klaus Niederkrueger, Robert Ancell, Bug #524091).

    * Fixed GtkSpinButton warning (Robin Sonefors, Bug #553965).

    * Only update bit panel when display contains a solved number (Robert Ancell, Bug #548690).

    * Remove inline declaration so can compile in C89 (Jens Granseuer, Bug #553307).

    * Open help with gtk_show_uri() (Thomas Andersen, Bug #556207).

    * Added translator comments (Robert Ancell)

    * Updated translations: bg (Alexander Shopov),
                            da (Ask H. Larsen, Kenneth Nielsen),
                            es (Jorge Gonzalez),
                            et (Ivar Smolin),
                            fi (Ilkka Tuohela),
                            mk (Jovan Naumovski),
                            pt_BR (Vladimir Melo, Leonardo Ferreira Fontenelle)

    * Updated help: es (Jorge Gonzalez)

4 files changed, 64 insertions, 8 deletions

diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 5d0e77c5a3d..223cbbf2e63 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.77 2009/02/05 21:40:36 drochner Exp $
+# $NetBSD: Makefile,v 1.78 2009/03/18 00:32:45 jmcneill Exp $
 #
 
-DISTNAME=		gcalctool-5.24.3.1
+DISTNAME=		gcalctool-5.26.0
 CATEGORIES=		math gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/5.24/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/5.26/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -22,6 +22,14 @@ USE_PKGLOCALEDIR=	yes
 
 GCONF_SCHEMAS=		gcalctool.schemas
 
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ${WRKSRC}/help/*/*.po ; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/math/gcalctool/PLIST b/math/gcalctool/PLIST
index 16305f1dd7d..70aaeb10e7d 100644
--- a/math/gcalctool/PLIST
+++ b/math/gcalctool/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.22 2008/10/25 00:43:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/03/18 00:32:45 jmcneill Exp $
 bin/gcalctool
 bin/gnome-calculator
 man/man1/gcalctool.1
 share/applications/gcalctool.desktop
+share/gcalctool/financial.glade
 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
+share/gnome/help/gcalctool/C/figures/gcalctool_programming_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/C/gcalctool.xml
 share/gnome/help/gcalctool/C/legal.xml
@@ -16,96 +18,119 @@ share/gnome/help/gcalctool/bg/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/bg/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/bg/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/bg/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/bg/figures/gcalctool_programming_window.png
 share/gnome/help/gcalctool/bg/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/bg/gcalctool.xml
 share/gnome/help/gcalctool/ca/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/ca/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/ca/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/ca/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/ca/figures/gcalctool_programming_window.png
 share/gnome/help/gcalctool/ca/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/ca/gcalctool.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_programming_window.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_programming_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/es/gcalctool.xml
+share/gnome/help/gcalctool/eu/figures/gcalctool_advanced_window.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_basic_window.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_financial_window.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_programming_window.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_scientific_window.png
+share/gnome/help/gcalctool/eu/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_programming_window.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_programming_window.png
 share/gnome/help/gcalctool/it/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/it/gcalctool.xml
 share/gnome/help/gcalctool/ja/figures/gcalctool_advanced_window.png
 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_programming_window.png
 share/gnome/help/gcalctool/ja/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/ja/gcalctool.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_programming_window.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_programming_window.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_programming_window.png
 share/gnome/help/gcalctool/pt_BR/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/pt_BR/gcalctool.xml
 share/gnome/help/gcalctool/ru/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/ru/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/ru/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/ru/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/ru/figures/gcalctool_programming_window.png
 share/gnome/help/gcalctool/ru/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/ru/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
+share/gnome/help/gcalctool/sv/figures/gcalctool_programming_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/sv/gcalctool.xml
 share/gnome/help/gcalctool/zh_CN/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/zh_CN/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/zh_CN/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/zh_CN/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/zh_CN/figures/gcalctool_programming_window.png
 share/gnome/help/gcalctool/zh_CN/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/zh_CN/gcalctool.xml
 share/gnome/help/gcalctool/zh_HK/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/zh_HK/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/zh_HK/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/zh_HK/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/zh_HK/figures/gcalctool_programming_window.png
 share/gnome/help/gcalctool/zh_HK/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/zh_HK/gcalctool.xml
 share/gnome/help/gcalctool/zh_TW/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/zh_TW/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/zh_TW/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/zh_TW/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/zh_TW/figures/gcalctool_programming_window.png
 share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/zh_TW/gcalctool.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/ast/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
@@ -145,6 +170,7 @@ share/locale/ko/LC_MESSAGES/gcalctool.mo
 share/locale/ku/LC_MESSAGES/gcalctool.mo
 share/locale/lt/LC_MESSAGES/gcalctool.mo
 share/locale/lv/LC_MESSAGES/gcalctool.mo
+share/locale/mai/LC_MESSAGES/gcalctool.mo
 share/locale/mg/LC_MESSAGES/gcalctool.mo
 share/locale/mk/LC_MESSAGES/gcalctool.mo
 share/locale/ml/LC_MESSAGES/gcalctool.mo
@@ -187,6 +213,7 @@ share/omf/gcalctool/gcalctool-bg.omf
 share/omf/gcalctool/gcalctool-ca.omf
 share/omf/gcalctool/gcalctool-de.omf
 share/omf/gcalctool/gcalctool-es.omf
+share/omf/gcalctool/gcalctool-eu.omf
 share/omf/gcalctool/gcalctool-fr.omf
 share/omf/gcalctool/gcalctool-it.omf
 share/omf/gcalctool/gcalctool-ja.omf
@@ -222,6 +249,8 @@ share/omf/gcalctool/gcalctool-zh_TW.omf
 @dirrm share/gnome/help/gcalctool/it
 @dirrm share/gnome/help/gcalctool/fr/figures
 @dirrm share/gnome/help/gcalctool/fr
+@dirrm share/gnome/help/gcalctool/eu/figures
+@dirrm share/gnome/help/gcalctool/eu
 @dirrm share/gnome/help/gcalctool/es/figures
 @dirrm share/gnome/help/gcalctool/es
 @dirrm share/gnome/help/gcalctool/de/figures
@@ -234,6 +263,7 @@ share/omf/gcalctool/gcalctool-zh_TW.omf
 @dirrm share/gnome/help/gcalctool/C
 @dirrm share/gnome/help/gcalctool
 @comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome
 @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 24d65b33f60..4fd239eb341 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.36 2009/02/05 21:40:36 drochner Exp $
+$NetBSD: distinfo,v 1.37 2009/03/18 00:32:45 jmcneill Exp $
 
-SHA1 (gcalctool-5.24.3.1.tar.bz2) = e84bfbddb937f0afe6025a6a8eebe8c825ac3c53
-RMD160 (gcalctool-5.24.3.1.tar.bz2) = 1ffa493b82ce78caa72e051fe3f92bbf6fd61224
-Size (gcalctool-5.24.3.1.tar.bz2) = 1795492 bytes
+SHA1 (gcalctool-5.26.0.tar.bz2) = e0b4574dc2a7642e597a99f7e2066434218c5549
+RMD160 (gcalctool-5.26.0.tar.bz2) = fae8acbcb62caab18e0c34997f0ef52df7c10247
+Size (gcalctool-5.26.0.tar.bz2) = 1994858 bytes
diff --git a/math/gcalctool/files/msgfmtstrip b/math/gcalctool/files/msgfmtstrip
new file mode 100644
index 00000000000..056975f4d07
--- /dev/null
+++ b/math/gcalctool/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/18 00:32:45 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}