aboutsummaryrefslogtreecommitdiff
path: root/math/gnumeric
diff options
context:
space:
mode:
authorYukihiro Nakai <nakai@FreeBSD.org>2002-03-03 10:12:42 +0000
committerYukihiro Nakai <nakai@FreeBSD.org>2002-03-03 10:12:42 +0000
commit82c07df8d387e8c5fc54f1b9b01369a2ac0e0a78 (patch)
tree64b60a92177c6861bb59ceeb42037dd5e29a1da8 /math/gnumeric
parent144c06d3f0e6935401a98f57974b11f2b3a0bfc3 (diff)
downloadports-82c07df8d387e8c5fc54f1b9b01369a2ac0e0a78.tar.gz
ports-82c07df8d387e8c5fc54f1b9b01369a2ac0e0a78.zip
Notes
Diffstat (limited to 'math/gnumeric')
-rw-r--r--math/gnumeric/Makefile1
-rw-r--r--math/gnumeric/files/patch-src::stf-parse.c43
2 files changed, 10 insertions, 34 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 4d6a1f333a1b..db58961dc952 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnumeric
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES?= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnumeric
diff --git a/math/gnumeric/files/patch-src::stf-parse.c b/math/gnumeric/files/patch-src::stf-parse.c
index b0610997e852..b45569925e68 100644
--- a/math/gnumeric/files/patch-src::stf-parse.c
+++ b/math/gnumeric/files/patch-src::stf-parse.c
@@ -1,37 +1,12 @@
-
-$FreeBSD$
-
---- src/stf-parse.c 2001/12/27 19:36:17 1.1
-+++ src/stf-parse.c 2001/12/27 19:44:24
-@@ -29,8 +29,6 @@
- #include "clipboard.h"
-
- #include <ctype.h>
--#include <wctype.h>
--#include <stdlib.h>
-
- #define WARN_TOO_MANY_ROWS _("Too many rows in data to parse: %d")
- #define WARN_TOO_MANY_COLS _("Too many columns in data to parse: %d")
-@@ -865,20 +863,9 @@
- wchar_t wstr;
- int len;
-
-- for (s = data; *s != '\0';) {
-- len = mblen(s, MB_CUR_MAX);
-- if (len == -1)
-+ for (s = data; *s != '\0'; s++) {
-+ if (!isprint (*s) && !isspace (*s))
+--- src/stf-parse.c.orig Fri Mar 1 21:03:09 2002
++++ src/stf-parse.c Fri Mar 1 21:03:17 2002
+@@ -870,8 +870,7 @@
+ if (len == -1)
return (char *)s;
-- if (len > 1) {
+ if (len > 1) {
- if (mbstowcs (&wstr, s, 1) == 1 &&
- !iswprint (wstr) && !iswspace (wstr))
-- return (char *)s;
-- s += len;
-- } else {
-- if (!isprint (*s) && !isspace (*s))
-- return (char *)s;
-- s++;
-- }
- }
-
- return NULL;
++ if (mbstowcs (&wstr, s, 1) == 1)
+ return (char *)s;
+ s += len;
+ } else {