diff options
| author | jschauma <jschauma@pkgsrc.org> | 2006-02-21 20:04:03 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2006-02-21 20:04:03 +0000 |
| commit | 71e29364a7a8527abf18815b3f21e1dbf53812ae (patch) | |
| tree | 3a4a5a8a6485bb7a6c9e9b275efaf66f19b14805 /devel/gettext/patches | |
| parent | f8deb58b4b46184536ebe47a65f426470564dec3 (diff) | |
| download | pkgsrc-71e29364a7a8527abf18815b3f21e1dbf53812ae.tar.gz | |
correct patches, which didn't cleanly apply. Pointed out by joerg@ and
darcy@
Diffstat (limited to 'devel/gettext/patches')
| -rw-r--r-- | devel/gettext/patches/patch-ap | 10 | ||||
| -rw-r--r-- | devel/gettext/patches/patch-aq | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/devel/gettext/patches/patch-ap b/devel/gettext/patches/patch-ap index fc334597ced..f35f7241b26 100644 --- a/devel/gettext/patches/patch-ap +++ b/devel/gettext/patches/patch-ap @@ -1,13 +1,13 @@ -$NetBSD: patch-ap,v 1.3 2006/02/21 04:12:44 jschauma Exp $ +$NetBSD: patch-ap,v 1.4 2006/02/21 20:04:03 jschauma Exp $ ---- src/po-lex.c.orig Mon Feb 20 23:08:56 2006 -+++ src/po-lex.c Mon Feb 20 23:08:11 2006 -@@ -75,7 +75,7 @@ +--- gettext-tools/src/po-lex.c.orig 2005-05-20 16:43:18.000000000 -0400 ++++ gettext-tools/src/po-lex.c 2006-02-21 15:00:22.000000000 -0500 +@@ -70,7 +70,7 @@ /* Error handling during the parsing of a PO file. These functions can access gram_pos and gram_pos_column. */ -#if !(__STDC__ && \ +#if !defined __sgi && !(__STDC__ && \ - ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) \ + ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined __DECC) \ || (defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__))) diff --git a/devel/gettext/patches/patch-aq b/devel/gettext/patches/patch-aq index 6c062f2960a..8bd2a7db699 100644 --- a/devel/gettext/patches/patch-aq +++ b/devel/gettext/patches/patch-aq @@ -1,13 +1,13 @@ -$NetBSD: patch-aq,v 1.1 2006/02/21 04:12:44 jschauma Exp $ +$NetBSD: patch-aq,v 1.2 2006/02/21 20:04:03 jschauma Exp $ ---- src/po-lex.h.orig Mon Feb 20 23:09:02 2006 -+++ src/po-lex.h Mon Feb 20 23:08:11 2006 -@@ -71,7 +71,8 @@ +--- gettext-tools/src/po-lex.h.orig 2005-05-20 16:43:21.000000000 -0400 ++++ gettext-tools/src/po-lex.h 2006-02-21 15:01:02.000000000 -0500 +@@ -109,7 +109,8 @@ + } while (0) - - /* ISO C 99 is smart enough to allow optimizations like this. */ --#if __STDC__ && (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) -+#if __STDC__ && (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) \ + /* GCC is also smart enough to allow optimizations like this. */ +-#elif __STDC__ && defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__ ++#elif __STDC__ && defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__ \ + && !defined __sgi /* CAUTION: If you change this macro, you must also make identical |