diff options
author | joerg <joerg@pkgsrc.org> | 2011-09-21 14:08:28 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2011-09-21 14:08:28 +0000 |
commit | a53fdb354013ee35a12a5e0fbde53772bed1d3d1 (patch) | |
tree | e44c6242a92184899673323c3a650a4b729dcf86 | |
parent | ab578378ec8b4f69cdd08fdf50228c36b984b086 (diff) | |
download | pkgsrc-a53fdb354013ee35a12a5e0fbde53772bed1d3d1.tar.gz |
Fix build with X11R7
-rw-r--r-- | x11/p5-Tk/distinfo | 3 | ||||
-rw-r--r-- | x11/p5-Tk/patches/patch-aj | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/x11/p5-Tk/distinfo b/x11/p5-Tk/distinfo index d3b02708165..ee5c8808e34 100644 --- a/x11/p5-Tk/distinfo +++ b/x11/p5-Tk/distinfo @@ -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-ad) = 63ebc6b66557e7ea36c9e3ee51366a0de43da699 SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877 SHA1 (patch-ah) = 9399bfd03b6cc215cc8f918ac8ae0348bf7f6272 SHA1 (patch-ai) = 37f3651c6491c5d2e3bec1e9649e7e05f45275a9 +SHA1 (patch-aj) = ca4a4d0cf698ebe566e2206785472b5c6bd17319 diff --git a/x11/p5-Tk/patches/patch-aj b/x11/p5-Tk/patches/patch-aj new file mode 100644 index 00000000000..f7f8a70e725 --- /dev/null +++ b/x11/p5-Tk/patches/patch-aj @@ -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 *)); |