diff options
| author | tnn <tnn@pkgsrc.org> | 2010-03-04 11:01:01 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2010-03-04 11:01:01 +0000 |
| commit | bf0933d8dfda56079446a01c12195b79c5ef4ae7 (patch) | |
| tree | e34f176d6e72a6f51fac8040cf199273477f9e9f /graphics/netpbm | |
| parent | 9e0bfeb176767b72ce809c13af92be5fd572f2cc (diff) | |
| download | pkgsrc-bf0933d8dfda56079446a01c12195b79c5ef4ae7.tar.gz | |
Mixing _XOPEN_SOURCE=500 and _XOPEN_SOURCE=600 in the same package
is asking for trouble. On solaris these options are mutually exclusive
because 600 needs C99 and 500 is not allowed to use C99.
I lowered the requirement to _XOPEN_SOURCE=500 and the build succeeded.
While here I'll note that PR pkg/42897 (netbpm link error on Solaris 10)
should now be fixed by libpng-1.2.41nb1.
Diffstat (limited to 'graphics/netpbm')
| -rw-r--r-- | graphics/netpbm/distinfo | 6 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-da | 11 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-db | 11 |
3 files changed, 15 insertions, 13 deletions
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 71fbafe0a9b..13ae450bba0 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.72 2010/02/19 18:25:44 drochner Exp $ +$NetBSD: distinfo,v 1.73 2010/03/04 11:01:01 tnn Exp $ SHA1 (netpbm-10.35.73.tgz) = e498fcedbc88c618e69163cdb9fa782178a1645e RMD160 (netpbm-10.35.73.tgz) = b4507ac7897227bf0fb8addceb9a14c9f4601ee8 @@ -13,8 +13,8 @@ SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777 SHA1 (patch-ax) = d50e56191192b4caf423ed081581868bb1a63de8 SHA1 (patch-ay) = 60ab532de6d6ec498ada140f795bba327a562e13 SHA1 (patch-cb) = b1be33ae6acfe57bf2f407cd48a6b140c3ddea85 -SHA1 (patch-da) = 5580d9cf0336b6a28010d1448e2749db9ea2ff5d -SHA1 (patch-db) = e087de63043bbae5f45afd17c742fa603188cae4 +SHA1 (patch-da) = 8ae329469bf0bd55b671dffeb4253b8d14621f5c +SHA1 (patch-db) = 23a05e54043ee84a0b7ec507a383d5cd8adfcca5 SHA1 (patch-dc) = 8ed1365dccf5abb0e158a4f7a65749ff5b244ef3 SHA1 (patch-dd) = 2acbcffeef96fd8b0419e60fa44a1eaf9f4b291b SHA1 (patch-eb) = 5c3dfac08038fce372fabc7c526081bb8051e908 diff --git a/graphics/netpbm/patches/patch-da b/graphics/netpbm/patches/patch-da index 36b4fb3c3ef..66f31aad26c 100644 --- a/graphics/netpbm/patches/patch-da +++ b/graphics/netpbm/patches/patch-da @@ -1,15 +1,16 @@ -$NetBSD: patch-da,v 1.2 2010/02/19 18:25:44 drochner Exp $ +$NetBSD: patch-da,v 1.3 2010/03/04 11:01:01 tnn Exp $ ---- converter/other/jpeg2000/pamtojpeg2k.c.orig 2007-12-27 22:32:59.000000000 +0000 -+++ converter/other/jpeg2000/pamtojpeg2k.c +--- converter/other/jpeg2000/jpeg2ktopam.c.orig 2007-12-27 22:32:59.000000000 +0000 ++++ converter/other/jpeg2000/jpeg2ktopam.c @@ -10,7 +10,11 @@ - #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ + #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ +-#define _XOPEN_SOURCE 600 +#ifdef __osf__ +#define _OSF_SOURCE +#else - #define _XOPEN_SOURCE 600 ++#define _XOPEN_SOURCE 500 +#endif /* __osf__ */ #include <string.h> diff --git a/graphics/netpbm/patches/patch-db b/graphics/netpbm/patches/patch-db index 2825f6b099b..f09b1e70821 100644 --- a/graphics/netpbm/patches/patch-db +++ b/graphics/netpbm/patches/patch-db @@ -1,15 +1,16 @@ -$NetBSD: patch-db,v 1.2 2010/02/19 18:25:44 drochner Exp $ +$NetBSD: patch-db,v 1.3 2010/03/04 11:01:01 tnn Exp $ ---- converter/other/jpeg2000/jpeg2ktopam.c.orig 2007-12-27 22:32:59.000000000 +0000 -+++ converter/other/jpeg2000/jpeg2ktopam.c +--- converter/other/jpeg2000/pamtojpeg2k.c.orig 2007-12-27 22:32:59.000000000 +0000 ++++ converter/other/jpeg2000/pamtojpeg2k.c @@ -10,7 +10,11 @@ - #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ + #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ +-#define _XOPEN_SOURCE 600 +#ifdef __osf__ +#define _OSF_SOURCE +#else - #define _XOPEN_SOURCE 600 ++#define _XOPEN_SOURCE 500 +#endif /* __osf__ */ #include <string.h> |