diff options
| author | gson <gson> | 2015-04-29 15:52:53 +0000 |
|---|---|---|
| committer | gson <gson> | 2015-04-29 15:52:53 +0000 |
| commit | 02bfb914202e6953078c46ab37935cfe36d3c443 (patch) | |
| tree | 705302c11e76948eaacd719ae34dcf1042c9cd21 /graphics | |
| parent | da036e313da48726f711356a2407fda93182e56f (diff) | |
| download | pkgsrc-02bfb914202e6953078c46ab37935cfe36d3c443.tar.gz | |
Rename zopen on Mac OS X to avoid conflict with a function by the same
name defined in stdio.h.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/xli/Makefile | 4 | ||||
| -rw-r--r-- | graphics/xli/distinfo | 3 | ||||
| -rw-r--r-- | graphics/xli/patches/patch-xli.h | 17 |
3 files changed, 21 insertions, 3 deletions
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 5ee678618ed..6cb02fc0d21 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.44 2013/02/16 11:22:34 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2015/04/29 15:52:53 gson Exp $ DISTNAME= xli-2005-02-27 PKGNAME= xli-1.17.0 -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= graphics x11 MASTER_SITES= http://pantransit.reptiles.org/prog/xli/ diff --git a/graphics/xli/distinfo b/graphics/xli/distinfo index 809dc986528..79a9ce7a09f 100644 --- a/graphics/xli/distinfo +++ b/graphics/xli/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2009/04/29 09:24:17 wiz Exp $ +$NetBSD: distinfo,v 1.21 2015/04/29 15:52:53 gson Exp $ SHA1 (xli-2005-02-27.tar.gz) = 977d8ece0edd41f3ec606310496cf3231f046d88 RMD160 (xli-2005-02-27.tar.gz) = fc83fa5173befa73a0eeb56ad323dad148ef1426 @@ -11,3 +11,4 @@ SHA1 (patch-ae) = 9085d53b8823ec0ce42dc8072f74e97763abc86b SHA1 (patch-af) = e6d762b19dc82377727f045b731b40c04afefe11 SHA1 (patch-ag) = 4083e488fed49f98f8c9b57ba4cb9b9295d1d5e0 SHA1 (patch-ah) = 963022472f8c90788197780560a7f833d745ab6b +SHA1 (patch-xli.h) = b8660bcb6dc221ac4e6edf560810c3e3fc335ab1 diff --git a/graphics/xli/patches/patch-xli.h b/graphics/xli/patches/patch-xli.h new file mode 100644 index 00000000000..c0e8feedf71 --- /dev/null +++ b/graphics/xli/patches/patch-xli.h @@ -0,0 +1,17 @@ +$NetBSD: patch-xli.h,v 1.1 2015/04/29 15:52:53 gson Exp $ + +Rename zopen to avoid conflict with a function by the same +name defined in stdio.h on Mac OS X. + +--- xli.h.orig 1999-10-25 02:15:07.000000000 +0000 ++++ xli.h +@@ -338,6 +338,9 @@ void flipBits(byte *p, unsigned int len) + int xpmoption(char *s); + + /* zio.c */ ++#ifdef __APPLE__ ++#define zopen zzopen ++#endif + ZFILE *zopen(char *name); + int zread(ZFILE *zf, byte *buf, int len); + int zeof(ZFILE *zf); |