[pkgsrc/trunk]: pkgsrc/graphics/xart Fix include file so that it doesn't conf...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/68955afdd267
branches:  trunk
changeset: 517357:68955afdd267
user:      darcy <darcy%pkgsrc.org@localhost>
date:      Wed Aug 09 17:13:58 2006 +0000

description:
Fix include file so that it doesn't conflict with code.  Variable 'nib' that
was declared external is only used in one place and is declared static in
that file (quill0p.c).

diffstat:

 graphics/xart/Makefile         |   4 ++--
 graphics/xart/distinfo         |   3 ++-
 graphics/xart/patches/patch-ak |  13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r ebd6e2abeecf -r 68955afdd267 graphics/xart/Makefile
--- a/graphics/xart/Makefile    Wed Aug 09 17:13:53 2006 +0000
+++ b/graphics/xart/Makefile    Wed Aug 09 17:13:58 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2006/04/19 17:04:31 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2006/08/09 17:13:58 darcy Exp $
 #
 
 DISTNAME=      xart19980415
 PKGNAME=       xart-19980415
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    graphics x11
 MASTER_SITES=  http://linux01.gwdg.de/~rhohen/linux/
 EXTRACT_SUFX=  .tgz
diff -r ebd6e2abeecf -r 68955afdd267 graphics/xart/distinfo
--- a/graphics/xart/distinfo    Wed Aug 09 17:13:53 2006 +0000
+++ b/graphics/xart/distinfo    Wed Aug 09 17:13:58 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/04/19 17:04:31 wiz Exp $
+$NetBSD: distinfo,v 1.12 2006/08/09 17:13:58 darcy Exp $
 
 SHA1 (xart19980415.tgz) = d4445392e33a5dcf5ae951babac82394e7cdd65c
 RMD160 (xart19980415.tgz) = 99077c23a798d8c0026bd53450052b1a8cf6ff6f
@@ -13,3 +13,4 @@
 SHA1 (patch-ah) = f888c5167cd8a6111e2064d586ff50984320b210
 SHA1 (patch-ai) = 349170a16199734f35dc56de12e77dd289db412b
 SHA1 (patch-aj) = 7139b114301de5becf1449bd2b346223b205a908
+SHA1 (patch-ak) = a7778776ec8251a51477f3548f28ed30a1ef9770
diff -r ebd6e2abeecf -r 68955afdd267 graphics/xart/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/xart/patches/patch-ak    Wed Aug 09 17:13:58 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2006/08/09 17:13:58 darcy Exp $
+
+--- xpaint.h.orig      1998-04-13 00:27:17.000000000 -0400
++++ xpaint.h
+@@ -45,8 +45,6 @@
+ #define NULL 0
+ #endif                                /* AIXV3 */
+ 
+-extern int nib;
+-
+ extern struct Global_s {
+     struct {
+       void *image;