[pkgsrc/trunk]: pkgsrc/graphics/xli Rename zopen on Mac OS X to avoid conflic...

[gson <gson%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf91065e3fb1
branches:  trunk
changeset: 650969:cf91065e3fb1
user:      gson <gson%pkgsrc.org@localhost>
date:      Wed Apr 29 15:52:53 2015 +0000

description:
Rename zopen on Mac OS X to avoid conflict with a function by the same
name defined in stdio.h.

diffstat:

 graphics/xli/Makefile            |   4 ++--
 graphics/xli/distinfo            |   3 ++-
 graphics/xli/patches/patch-xli.h |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r f7af22710caa -r cf91065e3fb1 graphics/xli/Makefile
--- a/graphics/xli/Makefile     Wed Apr 29 15:21:23 2015 +0000
+++ b/graphics/xli/Makefile     Wed Apr 29 15:52:53 2015 +0000
@@ -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 -r f7af22710caa -r cf91065e3fb1 graphics/xli/distinfo
--- a/graphics/xli/distinfo     Wed Apr 29 15:21:23 2015 +0000
+++ b/graphics/xli/distinfo     Wed Apr 29 15:52:53 2015 +0000
@@ -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-af) = e6d762b19dc82377727f045b731b40c04afefe11
 SHA1 (patch-ag) = 4083e488fed49f98f8c9b57ba4cb9b9295d1d5e0
 SHA1 (patch-ah) = 963022472f8c90788197780560a7f833d745ab6b
+SHA1 (patch-xli.h) = b8660bcb6dc221ac4e6edf560810c3e3fc335ab1
diff -r f7af22710caa -r cf91065e3fb1 graphics/xli/patches/patch-xli.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/xli/patches/patch-xli.h  Wed Apr 29 15:52:53 2015 +0000
@@ -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);