Update gcalctool-gtk3 to 6.6.1

    * Fix error reporting not working for certain types of error
    * Add shadow around display
    * Remove reference to removed source file
    * Replace lex/bison parser with hand-written parser
    * Use g_warning not g_error when unable to parse currency file
    * Set window icon correctly
    * Port to GtkApplication
    * Replace menubar with a GMenu
    * Only show thousands separators in decimal mode
    * Translation updates
(unimpressed by https://bugzilla.gnome.org/show_bug.cgi?id=670098)

7 files changed, 174 insertions, 13 deletions

diff --git a/math/gcalctool-gtk3/Makefile b/math/gcalctool-gtk3/Makefile
index 4a7f6bcaa78..4a2aa8ae0ad 100644
--- a/math/gcalctool-gtk3/Makefile
+++ b/math/gcalctool-gtk3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2012/10/08 23:02:01 adam Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/26 11:36:34 prlw1 Exp $
 #
 
-DISTNAME=		gcalctool-6.4.2.1
-PKGREVISION=		4
+DISTNAME=		gcalctool-6.6.1
 CATEGORIES=		math gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/6.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/6.6/}
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		prlw1@cam.ac.uk
@@ -12,11 +11,9 @@ HOMEPAGE=		http://live.gnome.org/Gcalctool
 COMMENT=		Desktop calculator for GNOME
 LICENSE=		gnu-gpl-v2
 
-GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=		HAVE_YACC=yes
-
+GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		bison gmake gsed intltool flex msgfmt pkg-config
+USE_TOOLS+=		gmake gsed intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 
 BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
diff --git a/math/gcalctool-gtk3/PLIST b/math/gcalctool-gtk3/PLIST
index 02fef4a4c8b..843826d871a 100644
--- a/math/gcalctool-gtk3/PLIST
+++ b/math/gcalctool-gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/07/04 20:01:58 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/10/26 11:36:34 prlw1 Exp $
 bin/gcalccmd
 bin/gcalctool
 bin/gnome-calculator
@@ -515,6 +515,34 @@ share/help/pt_BR/gcalctool/scientific.page
 share/help/pt_BR/gcalctool/superscript.page
 share/help/pt_BR/gcalctool/trigonometry.page
 share/help/pt_BR/gcalctool/variables.page
+share/help/ro/gcalctool/absolute.page
+share/help/ro/gcalctool/base.page
+share/help/ro/gcalctool/boolean.page
+share/help/ro/gcalctool/complex.page
+share/help/ro/gcalctool/conv-base.page
+share/help/ro/gcalctool/conv-character.page
+share/help/ro/gcalctool/conv-currency.page
+share/help/ro/gcalctool/conv-length.page
+share/help/ro/gcalctool/conv-time.page
+share/help/ro/gcalctool/conv-weight.page
+share/help/ro/gcalctool/equation.page
+share/help/ro/gcalctool/factorial.page
+share/help/ro/gcalctool/factorize.page
+share/help/ro/gcalctool/financial.page
+share/help/ro/gcalctool/functions.page
+share/help/ro/gcalctool/index.page
+share/help/ro/gcalctool/keyboard.page
+share/help/ro/gcalctool/legal.xml
+share/help/ro/gcalctool/logarithm.page
+share/help/ro/gcalctool/modulus.page
+share/help/ro/gcalctool/mouse.page
+share/help/ro/gcalctool/number-display.page
+share/help/ro/gcalctool/percentage.page
+share/help/ro/gcalctool/power.page
+share/help/ro/gcalctool/scientific.page
+share/help/ro/gcalctool/superscript.page
+share/help/ro/gcalctool/trigonometry.page
+share/help/ro/gcalctool/variables.page
 share/help/ru/gcalctool/absolute.page
 share/help/ru/gcalctool/base.page
 share/help/ru/gcalctool/boolean.page
diff --git a/math/gcalctool-gtk3/distinfo b/math/gcalctool-gtk3/distinfo
index ce66372fb67..03c37b757a9 100644
--- a/math/gcalctool-gtk3/distinfo
+++ b/math/gcalctool-gtk3/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2012/07/04 20:01:58 drochner Exp $
+$NetBSD: distinfo,v 1.3 2012/10/26 11:36:34 prlw1 Exp $
 
-SHA1 (gcalctool-6.4.2.1.tar.xz) = 808cdacb849a75e37c7cd0df418aa220c3cb93ed
-RMD160 (gcalctool-6.4.2.1.tar.xz) = ec0d3b722ba694bca159344c69836f60bf11f6b0
-Size (gcalctool-6.4.2.1.tar.xz) = 1009352 bytes
+SHA1 (gcalctool-6.6.1.tar.xz) = 2aa52bfee77068b01cf5afaa239c6de67fcbe49d
+RMD160 (gcalctool-6.6.1.tar.xz) = c28adcee28095806522188a20abe1cdf4c729754
+Size (gcalctool-6.6.1.tar.xz) = 967848 bytes
+SHA1 (patch-data_buttons-advanced.ui) = f7ce6b1dd5dde6f8fa2a3b88bf68ce6312a2ad9e
+SHA1 (patch-data_buttons-basic.ui) = c2631f72858f607e2038cf84e7b9626b68d8cd9a
+SHA1 (patch-data_buttons-financial.ui) = 8939389bd39d6cc762b2836e9a5d2e91e2248d52
+SHA1 (patch-data_buttons-programming.ui) = 529de5e486436ffb9d8f11a24390f66bb9d85e81
diff --git a/math/gcalctool-gtk3/patches/patch-data_buttons-advanced.ui b/math/gcalctool-gtk3/patches/patch-data_buttons-advanced.ui
new file mode 100644
index 00000000000..b903674ad02
--- /dev/null
+++ b/math/gcalctool-gtk3/patches/patch-data_buttons-advanced.ui
@@ -0,0 +1,36 @@
+$NetBSD: patch-data_buttons-advanced.ui,v 1.1 2012/10/26 11:36:34 prlw1 Exp $
+
+Revert the following commit, as the window doesn't look "more seamless"
+with "missing icon" icons.
+
+commit f962134f6683a1cfcdc51fd19abd6f9fb03d5e10
+Author: Rui Matos <tiagomatos@gmail.com>
+Date:   Tue Feb 14 16:44:13 2012 +0100
+
+    Change 'undo' and 'clear' buttons to use symbolic icons
+    
+    This way they don't stand out as much and the whole window looks more
+    seamless.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=670098
+
+--- data/buttons-advanced.ui.orig	2012-07-28 16:40:03.000000000 +0000
++++ data/buttons-advanced.ui
+@@ -444,7 +444,7 @@
+             <child>
+               <object class="GtkImage" id="image1">
+                 <property name="visible">True</property>
+-                <property name="icon-name">edit-clear-symbolic</property>
++                <property name="stock">gtk-clear</property>
+               </object>
+             </child>
+           </object>
+@@ -822,7 +822,7 @@
+             <child>
+               <object class="GtkImage" id="image2">
+                 <property name="visible">True</property>
+-                <property name="icon-name">edit-undo-symbolic</property>
++                <property name="stock">gtk-undo</property>
+               </object>
+             </child>
+           </object>
diff --git a/math/gcalctool-gtk3/patches/patch-data_buttons-basic.ui b/math/gcalctool-gtk3/patches/patch-data_buttons-basic.ui
new file mode 100644
index 00000000000..27032976f05
--- /dev/null
+++ b/math/gcalctool-gtk3/patches/patch-data_buttons-basic.ui
@@ -0,0 +1,35 @@
+$NetBSD: patch-data_buttons-basic.ui,v 1.1 2012/10/26 11:36:34 prlw1 Exp $
+
+Revert the following commit, as the window doesn't look "more seamless"
+with "missing icon" icons.
+
+commit f962134f6683a1cfcdc51fd19abd6f9fb03d5e10
+Author: Rui Matos <tiagomatos@gmail.com>
+Date:   Tue Feb 14 16:44:13 2012 +0100
+
+    Change 'undo' and 'clear' buttons to use symbolic icons
+
+    This way they don't stand out as much and the whole window looks more
+    seamless.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=670098
+--- data/buttons-basic.ui.orig	2012-02-15 22:30:59.000000000 +0000
++++ data/buttons-basic.ui
+@@ -366,7 +366,7 @@
+             <child>
+               <object class="GtkImage" id="image2">
+                 <property name="visible">True</property>
+-                <property name="icon-name">edit-clear-symbolic</property>
++                <property name="stock">gtk-clear</property>
+               </object>
+             </child>
+           </object>
+@@ -436,7 +436,7 @@
+             <child>
+               <object class="GtkImage" id="image1">
+                 <property name="visible">True</property>
+-                <property name="icon-name">edit-undo-symbolic</property>
++                <property name="stock">gtk-undo</property>
+               </object>
+             </child>
+           </object>
diff --git a/math/gcalctool-gtk3/patches/patch-data_buttons-financial.ui b/math/gcalctool-gtk3/patches/patch-data_buttons-financial.ui
new file mode 100644
index 00000000000..74c04378521
--- /dev/null
+++ b/math/gcalctool-gtk3/patches/patch-data_buttons-financial.ui
@@ -0,0 +1,35 @@
+$NetBSD: patch-data_buttons-financial.ui,v 1.1 2012/10/26 11:36:34 prlw1 Exp $
+
+Revert the following commit, as the window doesn't look "more seamless"
+with "missing icon" icons.
+
+commit f962134f6683a1cfcdc51fd19abd6f9fb03d5e10
+Author: Rui Matos <tiagomatos@gmail.com>
+Date:   Tue Feb 14 16:44:13 2012 +0100
+
+    Change 'undo' and 'clear' buttons to use symbolic icons
+
+    This way they don't stand out as much and the whole window looks more
+    seamless.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=670098
+--- data/buttons-financial.ui.orig	2012-07-28 16:40:03.000000000 +0000
++++ data/buttons-financial.ui
+@@ -2350,7 +2350,7 @@
+               <object class="GtkImage" id="image2">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="icon-name">edit-clear-symbolic</property>
++                <property name="stock">gtk-clear</property>
+               </object>
+             </child>
+           </object>
+@@ -2567,7 +2567,7 @@
+               <object class="GtkImage" id="image1">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="icon-name">edit-undo-symbolic</property>
++                <property name="stock">gtk-undo</property>
+               </object>
+             </child>
+           </object>
diff --git a/math/gcalctool-gtk3/patches/patch-data_buttons-programming.ui b/math/gcalctool-gtk3/patches/patch-data_buttons-programming.ui
new file mode 100644
index 00000000000..471861ca23d
--- /dev/null
+++ b/math/gcalctool-gtk3/patches/patch-data_buttons-programming.ui
@@ -0,0 +1,26 @@
+$NetBSD: patch-data_buttons-programming.ui,v 1.1 2012/10/26 11:36:34 prlw1 Exp $
+
+Revert the following commit, as the window doesn't look "more seamless"
+with "missing icon" icons.
+
+commit f962134f6683a1cfcdc51fd19abd6f9fb03d5e10
+Author: Rui Matos <tiagomatos@gmail.com>
+Date:   Tue Feb 14 16:44:13 2012 +0100
+
+    Change 'undo' and 'clear' buttons to use symbolic icons
+
+    This way they don't stand out as much and the whole window looks more
+    seamless.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=670098
+--- data/buttons-programming.ui.orig	2012-02-15 22:30:59.000000000 +0000
++++ data/buttons-programming.ui
+@@ -2113,7 +2113,7 @@
+                 <child>
+                   <object class="GtkImage" id="image1">
+                     <property name="visible">True</property>
+-                    <property name="icon-name">edit-clear-symbolic</property>
++                    <property name="stock">gtk-clear</property>
+                   </object>
+                 </child>
+               </object>