diff options
| author | recht <recht@pkgsrc.org> | 2003-09-14 14:04:31 +0000 |
|---|---|---|
| committer | recht <recht@pkgsrc.org> | 2003-09-14 14:04:31 +0000 |
| commit | 9b36f82e484d38232ad4c52bc30e1cd947494f8f (patch) | |
| tree | 1fcf9226fc3324bff41ac2463e5d3ddf8be0f696 /lang | |
| parent | 0c330b09b1e1ea003993b75633cc3cb899d66662 (diff) | |
| download | pkgsrc-9b36f82e484d38232ad4c52bc30e1cd947494f8f.tar.gz | |
Avoid redefinition of redefinition of wchar_t and wint_ if
_XOPEN_SOURCE_EXTENDED is defined. This fixes py-curses on NetBSD > 1.6T.
Bumb PKGREVSION to 2, because of the header change.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python23-pth/Makefile | 4 | ||||
| -rw-r--r-- | lang/python23-pth/distinfo | 3 | ||||
| -rw-r--r-- | lang/python23-pth/patches/patch-am | 26 | ||||
| -rw-r--r-- | lang/python23/Makefile | 4 | ||||
| -rw-r--r-- | lang/python23/distinfo | 3 | ||||
| -rw-r--r-- | lang/python23/patches/patch-am | 26 |
6 files changed, 60 insertions, 6 deletions
diff --git a/lang/python23-pth/Makefile b/lang/python23-pth/Makefile index 281f960d1fa..430d2855a22 100644 --- a/lang/python23-pth/Makefile +++ b/lang/python23-pth/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2003/09/10 00:11:04 recht Exp $ +# $NetBSD: Makefile,v 1.7 2003/09/14 14:04:32 recht Exp $ # DISTNAME= Python-2.3 PKGNAME= python23-pth-2.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ftp://ftp.python.org/pub/python/2.3/ EXTRACT_SUFX= .tgz diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo index 5dc27745420..a6f0649770d 100644 --- a/lang/python23-pth/distinfo +++ b/lang/python23-pth/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2003/09/10 00:11:04 recht Exp $ +$NetBSD: distinfo,v 1.7 2003/09/14 14:04:32 recht Exp $ SHA1 (Python-2.3.tgz) = ce5fbde09be17ea5dddd4baa62d2b90e06e7e5c1 Size (Python-2.3.tgz) = 8436880 bytes @@ -10,6 +10,7 @@ SHA1 (patch-ai) = 75d30db64343afcf2f0bcfe8e73dc9948acb237e SHA1 (patch-aj) = e2291bde6a59fc0441bc7c87c0946b7f5601aa5c SHA1 (patch-ak) = 341e7dd750e46463f6174676e06fd3a847efd311 SHA1 (patch-al) = 5614ef46970b5eea2bfdcfc64d1018aa0f4a6e85 +SHA1 (patch-am) = 20235b2febbc2811ca5f9b54958a4064722431ed SHA1 (patch-ba) = 9be4490e38c895dfc5041af1889ca7ab1c6d8bd9 SHA1 (patch-bb) = 1390c5f0bcd75f5f3f1b9949921b555e1021954f SHA1 (patch-bc) = 0a83a90aea8a1414b43fa3506912ab09aafbc3c0 diff --git a/lang/python23-pth/patches/patch-am b/lang/python23-pth/patches/patch-am new file mode 100644 index 00000000000..f268a4e040b --- /dev/null +++ b/lang/python23-pth/patches/patch-am @@ -0,0 +1,26 @@ +$NetBSD: patch-am,v 1.1 2003/09/14 14:04:32 recht Exp $ + +--- Include/py_curses.h.orig 2003-09-14 13:55:07.000000000 +0200 ++++ Include/py_curses.h 2003-09-14 14:10:49.000000000 +0200 +@@ -39,6 +39,21 @@ + #endif + #endif + ++#ifdef __NetBSD__ ++/* ++** On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards ++** against multiple definition of wchar_t and wint_t. ++*/ ++#ifdef _XOPEN_SOURCE_EXTENDED ++#ifndef _WCHAR_T ++#define _WCHAR_T ++#endif ++#ifndef _WINT_T ++#define _WINT_T ++#endif ++#endif ++#endif ++ + #ifdef HAVE_NCURSES_H + #include <ncurses.h> + #else diff --git a/lang/python23/Makefile b/lang/python23/Makefile index a06d4b81b64..893a6b14304 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2003/09/10 00:11:03 recht Exp $ +# $NetBSD: Makefile,v 1.7 2003/09/14 14:04:31 recht Exp $ # DISTNAME= Python-2.3 PKGNAME= python23-2.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ftp://ftp.python.org/pub/python/2.3/ EXTRACT_SUFX= .tgz diff --git a/lang/python23/distinfo b/lang/python23/distinfo index b68b26695d7..9a8193a506c 100644 --- a/lang/python23/distinfo +++ b/lang/python23/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2003/09/10 00:11:03 recht Exp $ +$NetBSD: distinfo,v 1.7 2003/09/14 14:04:31 recht Exp $ SHA1 (Python-2.3.tgz) = ce5fbde09be17ea5dddd4baa62d2b90e06e7e5c1 Size (Python-2.3.tgz) = 8436880 bytes @@ -7,5 +7,6 @@ SHA1 (patch-ae) = ff045dc1b42ce8a4fe5e64fde72469e1be8dab28 SHA1 (patch-ai) = 75d30db64343afcf2f0bcfe8e73dc9948acb237e SHA1 (patch-aj) = 1e3ce4072e90cb7be6d0a5539ec213b56518dcc7 SHA1 (patch-al) = 5614ef46970b5eea2bfdcfc64d1018aa0f4a6e85 +SHA1 (patch-am) = 20235b2febbc2811ca5f9b54958a4064722431ed SHA1 (patch-bb) = 1390c5f0bcd75f5f3f1b9949921b555e1021954f SHA1 (patch-bc) = 0a83a90aea8a1414b43fa3506912ab09aafbc3c0 diff --git a/lang/python23/patches/patch-am b/lang/python23/patches/patch-am new file mode 100644 index 00000000000..ea98e493948 --- /dev/null +++ b/lang/python23/patches/patch-am @@ -0,0 +1,26 @@ +$NetBSD: patch-am,v 1.1 2003/09/14 14:04:31 recht Exp $ + +--- Include/py_curses.h.orig 2003-09-14 13:55:07.000000000 +0200 ++++ Include/py_curses.h 2003-09-14 14:10:49.000000000 +0200 +@@ -39,6 +39,21 @@ + #endif + #endif + ++#ifdef __NetBSD__ ++/* ++** On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards ++** against multiple definition of wchar_t and wint_t. ++*/ ++#ifdef _XOPEN_SOURCE_EXTENDED ++#ifndef _WCHAR_T ++#define _WCHAR_T ++#endif ++#ifndef _WINT_T ++#define _WINT_T ++#endif ++#endif ++#endif ++ + #ifdef HAVE_NCURSES_H + #include <ncurses.h> + #else |