[pkgsrc/trunk]: pkgsrc/x11/p5-Tk Fix build with X11R7

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70eff421c981
branches:  trunk
changeset: 593042:70eff421c981
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Sep 21 14:08:28 2011 +0000

description:
Fix build with X11R7

diffstat:

 x11/p5-Tk/distinfo         |   3 ++-
 x11/p5-Tk/patches/patch-aj |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 3c0c505e5391 -r 70eff421c981 x11/p5-Tk/distinfo
--- a/x11/p5-Tk/distinfo        Wed Sep 21 13:51:11 2011 +0000
+++ b/x11/p5-Tk/distinfo        Wed Sep 21 14:08:28 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2010/09/12 12:59:47 wiz Exp $
+$NetBSD: distinfo,v 1.18 2011/09/21 14:08:28 joerg Exp $
 
 SHA1 (Tk-804.029.tar.gz) = 1076d736e43fdf416c664bde0e4c3d035d6903e3
 RMD160 (Tk-804.029.tar.gz) = 1feac57c5799c286a3e81258d3e7621b84b1cfc2
@@ -10,3 +10,4 @@
 SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877
 SHA1 (patch-ah) = 9399bfd03b6cc215cc8f918ac8ae0348bf7f6272
 SHA1 (patch-ai) = 37f3651c6491c5d2e3bec1e9649e7e05f45275a9
+SHA1 (patch-aj) = ca4a4d0cf698ebe566e2206785472b5c6bd17319
diff -r 3c0c505e5391 -r 70eff421c981 x11/p5-Tk/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/p5-Tk/patches/patch-aj        Wed Sep 21 14:08:28 2011 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2011/09/21 14:08:29 joerg Exp $
+
+X11R7 uses a different include guard.
+
+--- pTk/Xlib.h.orig    2011-09-21 13:58:35.000000000 +0000
++++ pTk/Xlib.h
+@@ -1,5 +1,8 @@
+ #ifndef _XLIB
+ #define _XLIB
++#if defined(_X11_XLIB_H_) && !defined(_XLIB_H_)
++#define _XLIB_H_
++#endif
+ #ifndef _XLIB_H_
+ extern XFontStruct *XLoadQueryFont  _ANSI_ARGS_((Display *, const char *));
+ extern XModifierKeymap *XGetModifierMapping  _ANSI_ARGS_((Display *));