diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-09-25 10:58:01 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-09-25 10:58:01 +0000 |
commit | 5eb71b8d7c67f0103b5980b633df3c7ee7bfa4dd (patch) | |
tree | 602dbd5d44f9fb8dd8b4f31a325d485f8dec461d /graphics/xart | |
parent | 172d4916381b54044e50668bb37699f8d0b80231 (diff) | |
download | pkgsrc-5eb71b8d7c67f0103b5980b633df3c7ee7bfa4dd.tar.gz |
strerror() fixes for SunOS.
Diffstat (limited to 'graphics/xart')
-rw-r--r-- | graphics/xart/distinfo | 6 | ||||
-rw-r--r-- | graphics/xart/patches/patch-ac | 15 | ||||
-rw-r--r-- | graphics/xart/patches/patch-aj | 15 |
3 files changed, 28 insertions, 8 deletions
diff --git a/graphics/xart/distinfo b/graphics/xart/distinfo index b2e9ae75ae4..7ee439e72d0 100644 --- a/graphics/xart/distinfo +++ b/graphics/xart/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.16 2012/11/01 19:53:04 joerg Exp $ +$NetBSD: distinfo,v 1.17 2014/09/25 10:58:01 jperkin Exp $ SHA1 (xart19980415.tgz) = d4445392e33a5dcf5ae951babac82394e7cdd65c RMD160 (xart19980415.tgz) = 99077c23a798d8c0026bd53450052b1a8cf6ff6f Size (xart19980415.tgz) = 343909 bytes SHA1 (patch-aa) = 7d8ae61d9a624cc537396f406b496f28376cf7b5 SHA1 (patch-ab) = 326a02c9cb6698a0d4f4cbf372ce71ff2be00958 -SHA1 (patch-ac) = 618003b6d192e85a1aa5f64b0f8eccfec991012e +SHA1 (patch-ac) = 9b4223d07972fd79d853c6f9707328a291d378cf SHA1 (patch-ad) = 9bea96736f23880863f1aa2ccb5499d64f5e781c SHA1 (patch-ae) = d0d87fe957cbec5979e635270d2ad05b294f7530 SHA1 (patch-af) = 7253489721eead898cd3a67878584d86b7719e3f SHA1 (patch-ag) = 58bf357debce54707378b6598ca813af6a632e3b SHA1 (patch-ah) = f888c5167cd8a6111e2064d586ff50984320b210 SHA1 (patch-ai) = 349170a16199734f35dc56de12e77dd289db412b -SHA1 (patch-aj) = 7139b114301de5becf1449bd2b346223b205a908 +SHA1 (patch-aj) = e3de702a58e50cc8ddf405473355a41e551615f1 SHA1 (patch-ak) = fb0de4cead898e3d41bdd7380020e8058031556f SHA1 (patch-image.h) = ccc9233baac771801028ddfcc9b4863456f0bfda SHA1 (patch-main.c) = 145840a9baf90164cda10656eac8f8f6f31a400d diff --git a/graphics/xart/patches/patch-ac b/graphics/xart/patches/patch-ac index b2a27fc175e..1a6001af937 100644 --- a/graphics/xart/patches/patch-ac +++ b/graphics/xart/patches/patch-ac @@ -1,7 +1,18 @@ -$NetBSD: patch-ac,v 1.8 2010/06/13 22:44:46 wiz Exp $ +$NetBSD: patch-ac,v 1.9 2014/09/25 10:58:02 jperkin Exp $ ---- Local.config.orig 1998-04-01 02:58:05.000000000 +0200 +Newer SunOS has strerror(). + +--- Local.config.orig 1998-04-01 00:58:05.000000000 +0000 +++ Local.config +@@ -38,7 +38,7 @@ XCOMM + + EXTRA_DEFINES = -DERRORBEEP -DFEATURE_FRACTAL -DFEATURE_TILT + +-#ifdef SunArchitecture ++#ifdef notSunArchitecture + ARCH_DEFINES = -DMISSING_STRERROR + #endif + @@ -62,8 +62,8 @@ XCOMM #define HaveTIFF diff --git a/graphics/xart/patches/patch-aj b/graphics/xart/patches/patch-aj index 9b401a5f6fd..6bcf0a014f2 100644 --- a/graphics/xart/patches/patch-aj +++ b/graphics/xart/patches/patch-aj @@ -1,6 +1,8 @@ -$NetBSD: patch-aj,v 1.2 2006/03/01 14:40:34 joerg Exp $ +$NetBSD: patch-aj,v 1.3 2014/09/25 10:58:02 jperkin Exp $ ---- rw/libpnmrw.c.orig 2006-02-23 21:15:15.000000000 +0000 +Support strerror(). + +--- rw/libpnmrw.c.orig 1996-06-25 08:50:42.000000000 +0000 +++ rw/libpnmrw.c @@ -32,6 +32,7 @@ /* #define MSDOS */ @@ -10,7 +12,7 @@ $NetBSD: patch-aj,v 1.2 2006/03/01 14:40:34 joerg Exp $ #include <stdio.h> #include "libpnmrw.h" -@@ -128,12 +129,6 @@ pm_freearray(char **its, int rows) +@@ -128,15 +129,13 @@ pm_freearray(char **its, int rows) static void pm_perror(char *reason) { @@ -22,4 +24,11 @@ $NetBSD: patch-aj,v 1.2 2006/03/01 14:40:34 joerg Exp $ - extern int errno; char *e; ++#if defined(__STDC__) && !defined(MISSING_STRERROR) ++ e = strerror(errno); ++#else e = sys_errlist[errno]; ++#endif + + if (reason != 0 && reason[0] != '\0') + fprintf(stderr, "%s: %s - %s\n", progname, reason, e); |