aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbland <bland@FreeBSD.org>2003-12-06 17:00:58 +0800
committerbland <bland@FreeBSD.org>2003-12-06 17:00:58 +0800
commit722ee12aa0048b37dd1152cdcc71b89a95c727c3 (patch)
tree9eb99c413695e0090e900d9ec343c4e8100b3fc0
parentac9e3f48c3dc42ce80e3ac2a3832c2f4ff9b108b (diff)
downloadfreebsd-ports-gnome-722ee12aa0048b37dd1152cdcc71b89a95c727c3.tar.gz
freebsd-ports-gnome-722ee12aa0048b37dd1152cdcc71b89a95c727c3.tar.zst
freebsd-ports-gnome-722ee12aa0048b37dd1152cdcc71b89a95c727c3.zip
Update to 4.3.29
-rw-r--r--math/gcalctool/Makefile2
-rw-r--r--math/gcalctool/distinfo2
-rw-r--r--math/gcalctool/files/patch-gcalctool::get.c46
-rw-r--r--math/gcalctool/pkg-plist1
4 files changed, 49 insertions, 2 deletions
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 1afba2b097fd..4299cd181210 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gcalctool
-PORTVERSION= 4.3.16
+PORTVERSION= 4.3.29
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/4.3
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index df9fa68ed057..f5209c9d9545 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gcalctool-4.3.16.tar.bz2) = 45927afa85386e3a75a40a52459e8615
+MD5 (gnome2/gcalctool-4.3.29.tar.bz2) = ded0110b5142c3fb9210ad8e169fbaec
diff --git a/math/gcalctool/files/patch-gcalctool::get.c b/math/gcalctool/files/patch-gcalctool::get.c
new file mode 100644
index 000000000000..2c91de180eac
--- /dev/null
+++ b/math/gcalctool/files/patch-gcalctool::get.c
@@ -0,0 +1,46 @@
+--- gcalctool/get.c.orig Thu Nov 27 05:29:52 2003
++++ gcalctool/get.c Sat Dec 6 17:50:52 2003
+@@ -125,7 +125,6 @@
+ {
+ char *radix_char;
+
+- setlocale(LC_NUMERIC, "");
+ radix_char = nl_langinfo(RADIXCHAR);
+
+ return(radix_char[0]);
+@@ -220,8 +219,9 @@
+ {
+ char *tsep_char;
+
+- setlocale(LC_NUMERIC, "");
+ tsep_char = nl_langinfo(THOUSEP);
++ if (!*tsep_char)
++ return ' ';
+
+ return(tsep_char[0]);
+ }
+@@ -231,6 +231,7 @@
+ init_vars() /* Setup default values for various variables. */
+ {
+ int acc, i, n, size;
++ char lrc;
+
+ v->accuracy = 9; /* Initial accuracy. */
+ v->show_zeroes = FALSE; /* Don't show trailing zeroes. */
+@@ -253,6 +254,8 @@
+
+ read_str(&v->iconlabel, _("calculator")); /* Default icon label. */
+
++ lrc = v->radix_char;
++ v->radix_char = '.';
+ MPstr_to_num("0.621", DEC, v->MPcon_vals[0]); /* kms/hr <=> miles/hr. */
+ MPstr_to_num("1.4142135623", DEC, v->MPcon_vals[1]); /* square root of 2 */
+ MPstr_to_num("2.7182818284", DEC, v->MPcon_vals[2]); /* e */
+@@ -263,6 +266,7 @@
+ MPstr_to_num("0.0353", DEC, v->MPcon_vals[7]); /* grams <=> ounce. */
+ MPstr_to_num("0.948", DEC, v->MPcon_vals[8]); /* Kjoules <=> BTU's. */
+ MPstr_to_num("0.0610", DEC, v->MPcon_vals[9]); /* cms3 <=> inches3. */
++ v->radix_char = lrc;
+
+ n = 0;
+ for (i = 0; i < MAXREGS; i++) {
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 9a9e7e270fb5..59a3514511d3 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -23,6 +23,7 @@ share/locale/da/LC_MESSAGES/gcalctool.mo
share/locale/de/LC_MESSAGES/gcalctool.mo
share/locale/el/LC_MESSAGES/gcalctool.mo
share/locale/es/LC_MESSAGES/gcalctool.mo
+share/locale/eu/LC_MESSAGES/gcalctool.mo
share/locale/fa/LC_MESSAGES/gcalctool.mo
share/locale/fi/LC_MESSAGES/gcalctool.mo
share/locale/fr/LC_MESSAGES/gcalctool.mo