diff options
| author | jschauma <jschauma> | 2006-02-21 20:04:03 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2006-02-21 20:04:03 +0000 |
| commit | 6aa310d69499326fb65aae8e56c2732137a95b50 (patch) | |
| tree | 3a4a5a8a6485bb7a6c9e9b275efaf66f19b14805 /devel/gettext | |
| parent | 18a262be0a55c9b03b7d14db5e88f1170ad239a1 (diff) | |
| download | pkgsrc-6aa310d69499326fb65aae8e56c2732137a95b50.tar.gz | |
correct patches, which didn't cleanly apply. Pointed out by joerg@ and
darcy@
Diffstat (limited to 'devel/gettext')
| -rw-r--r-- | devel/gettext/distinfo | 6 | ||||
| -rw-r--r-- | devel/gettext/patches/patch-ap | 10 | ||||
| -rw-r--r-- | devel/gettext/patches/patch-aq | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo index b5d2c3704aa..63566a97235 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2006/02/21 04:12:44 jschauma Exp $ +$NetBSD: distinfo,v 1.17 2006/02/21 20:04:03 jschauma Exp $ SHA1 (gettext-0.14.5.tar.gz) = 68737eee1a6427044eef901dc88e4144d371fb6b RMD160 (gettext-0.14.5.tar.gz) = d31c8e49671f00623ce1e6f73716a5abcd1c7ec2 @@ -14,5 +14,5 @@ SHA1 (patch-ak) = 3f2aa72291aae5e024a3bb833b46973221be3b95 SHA1 (patch-al) = 2ed0cbf8e2e9a03ac3f8aaff447a07f578010472 SHA1 (patch-an) = f99f345f9b23f72e4a462445bcce8281dd1e5308 SHA1 (patch-ao) = 9e81b05b6e1ee76197c360a441264588607a475c -SHA1 (patch-ap) = 01eefa6de4fde2057bb458aaa298d5b9448830c1 -SHA1 (patch-aq) = b1a44404150f8938ccb47154feee1c68ed5ff084 +SHA1 (patch-ap) = c01087cbbac18051435a817bb028061e463bd923 +SHA1 (patch-aq) = fcdcbd1fd042f77c666245ca9c43ca21bf24e350 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 |