aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-01-07 00:12:14 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-01-07 00:12:14 +0000
commit6d28d61ac6c9cc74561fd6cc1589624e38f9a2ec (patch)
tree4c38371bc76110d989817e69fe16a915a014f585 /math
parentee92ed6602096a506af0796644a20f587dc1fd58 (diff)
downloadports-6d28d61ac6c9cc74561fd6cc1589624e38f9a2ec.tar.gz
ports-6d28d61ac6c9cc74561fd6cc1589624e38f9a2ec.zip
Update to 4.3.35 which should have bland's thousands separator bug
integrated.
Notes
Notes: svn path=/head/; revision=97515
Diffstat (limited to 'math')
-rw-r--r--math/gcalctool/Makefile3
-rw-r--r--math/gcalctool/distinfo2
-rw-r--r--math/gcalctool/files/patch-gcalctool::display.c13
-rw-r--r--math/gcalctool/files/patch-gcalctool::get.c36
-rw-r--r--math/gcalctool/pkg-plist3
5 files changed, 5 insertions, 52 deletions
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 8cbf10b0aeea..a568a80f5b37 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gcalctool
-PORTVERSION= 4.3.31
-PORTREVISION= 2
+PORTVERSION= 4.3.35
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 b7d1ae5ebea6..a02876a21797 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gcalctool-4.3.31.tar.bz2) = 06d193ace7bc1b782ac7d469417f75f4
+MD5 (gnome2/gcalctool-4.3.35.tar.bz2) = 800124057852e83b7beaf7014f63a9d4
diff --git a/math/gcalctool/files/patch-gcalctool::display.c b/math/gcalctool/files/patch-gcalctool::display.c
deleted file mode 100644
index 93ce235da0b7..000000000000
--- a/math/gcalctool/files/patch-gcalctool::display.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gcalctool/display.c.orig Sat Jan 3 13:44:50 2004
-+++ gcalctool/display.c Sat Jan 3 14:01:31 2004
-@@ -88,8 +88,8 @@
- * definitions are potentially in read-only memory, and shouldn't be adjusted.
- */
-
-- if (strstr(str, v->tsep) != NULL) {
-- tsep_len = strlen(v->tsep);
-+ tsep_len = strlen(v->tsep);
-+ if (tsep_len && strstr(str, v->tsep) != NULL) {
- while (*srcp != '\0') {
- if (memcmp(srcp, v->tsep, tsep_len) == 0) {
- srcp += tsep_len;
diff --git a/math/gcalctool/files/patch-gcalctool::get.c b/math/gcalctool/files/patch-gcalctool::get.c
deleted file mode 100644
index a67e74d437a0..000000000000
--- a/math/gcalctool/files/patch-gcalctool::get.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- gcalctool/get.c.orig Tue Dec 23 23:21:12 2003
-+++ gcalctool/get.c Sat Jan 3 13:18:24 2004
-@@ -230,7 +230,7 @@
- setlocale(LC_NUMERIC, "");
- tsep = nl_langinfo(THOUSEP);
-
-- if (tsep == NULL || tsep[0] == '\0') {
-+ if (tsep == NULL) {
- return(",");
- } else {
- return(tsep);
-@@ -242,6 +242,7 @@
- init_vars() /* Setup default values for various variables. */
- {
- int acc, i, n, size;
-+ char *loc_radix;
-
- v->accuracy = 9; /* Initial accuracy. */
- v->show_zeroes = FALSE; /* Don't show trailing zeroes. */
-@@ -264,6 +265,8 @@
-
- read_str(&v->iconlabel, _("calculator")); /* Default icon label. */
-
-+ loc_radix = v->radix;
-+ v->radix = ".";
- 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 */
-@@ -274,6 +277,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 = loc_radix;
-
- n = 0;
- for (i = 0; i < MAXREGS; i++) {
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 4e7593aced09..602ddf7d8b05 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -30,13 +30,16 @@ share/locale/fi/LC_MESSAGES/gcalctool.mo
share/locale/fr/LC_MESSAGES/gcalctool.mo
share/locale/he/LC_MESSAGES/gcalctool.mo
share/locale/hi/LC_MESSAGES/gcalctool.mo
+share/locale/hr/LC_MESSAGES/gcalctool.mo
share/locale/hu/LC_MESSAGES/gcalctool.mo
share/locale/id/LC_MESSAGES/gcalctool.mo
share/locale/it/LC_MESSAGES/gcalctool.mo
share/locale/ja/LC_MESSAGES/gcalctool.mo
share/locale/ko/LC_MESSAGES/gcalctool.mo
+share/locale/lt/LC_MESSAGES/gcalctool.mo
share/locale/mk/LC_MESSAGES/gcalctool.mo
share/locale/ml/LC_MESSAGES/gcalctool.mo
+share/locale/mn/LC_MESSAGES/gcalctool.mo
share/locale/ms/LC_MESSAGES/gcalctool.mo
share/locale/nl/LC_MESSAGES/gcalctool.mo
share/locale/no/LC_MESSAGES/gcalctool.mo