Make this compile, install and deinstall cleanly under IRIX and IRIX64

version 6.5 by backporting some patches from Python 2.4 and leaving out
some broken modules.

This partially addresses PR pkg/28373, too, though fixes particular to
older Irix versions still need to be tested and added.

3 files changed, 74 insertions, 0 deletions

diff --git a/lang/python23/patches/patch-cc b/lang/python23/patches/patch-cc
new file mode 100644
index 00000000000..96cb43e489c
--- /dev/null
+++ b/lang/python23/patches/patch-cc
@@ -0,0 +1,44 @@
+$NetBSD: patch-cc,v 1.1 2004/11/24 20:45:10 jschauma Exp $
+
+--- Modules/socketmodule.c.orig	Mon Nov 22 22:59:27 2004
++++ Modules/socketmodule.c	Mon Nov 22 23:06:49 2004
+@@ -192,8 +192,18 @@
+ 
+ /* XXX Using _SGIAPI is the wrong thing, 
+    but I don't know what the right thing is. */
++#undef _SGIAPI /* to avoid warning */
+ #define _SGIAPI 1
+ 
++#undef _XOPEN_SOURCE
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#ifdef _SS_ALIGNSIZE
++#define HAVE_GETADDRINFO 1
++#define HAVE_GETNAMEINFO 1
++#endif
++
+ #define HAVE_INET_PTON
+ #include <netdb.h>
+ #endif
+@@ -259,7 +269,19 @@
+ # define O_NONBLOCK O_NDELAY
+ #endif
+ 
+-#include "addrinfo.h"
++/* include Python's addrinfo.h unless it causes trouble */
++#if defined(__sgi) && _COMPILER_VERSION>700 && defined(_SS_ALIGNSIZE)
++/* Do not include addinfo.h on some newer IRIX versions.
++* _SS_ALIGNSIZE is defined in sys/socket.h by 6.5.21,
++* for example, but not by 6.5.10.
++*/
++#elif defined(_MSC_VER) && _MSC_VER>1200
++/* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
++* EAI_* constants are defined in (the already included) ws2tcpip.h.
++*/
++#else
++#  include "addrinfo.h"
++#endif
+ 
+ #ifndef HAVE_INET_PTON
+ int inet_pton(int af, const char *src, void *dst);
diff --git a/lang/python23/patches/patch-cd b/lang/python23/patches/patch-cd
new file mode 100644
index 00000000000..5cea7a8e886
--- /dev/null
+++ b/lang/python23/patches/patch-cd
@@ -0,0 +1,15 @@
+$NetBSD: patch-cd,v 1.1 2004/11/24 20:45:10 jschauma Exp $
+
+--- Modules/_ssl.c.orig	Mon Nov 22 23:18:39 2004
++++ Modules/_ssl.c	Mon Nov 22 23:17:23 2004
+@@ -7,6 +7,10 @@
+ 
+ */
+ 
++#ifdef __sgi
++#include <sys/types.h>
++#endif
++
+ #include "Python.h"
+ enum py_ssl_error {
+ 	/* these mirror ssl.h */
diff --git a/lang/python23/patches/patch-ce b/lang/python23/patches/patch-ce
new file mode 100644
index 00000000000..1ffc18cdb7e
--- /dev/null
+++ b/lang/python23/patches/patch-ce
@@ -0,0 +1,15 @@
+$NetBSD: patch-ce,v 1.1 2004/11/24 20:45:10 jschauma Exp $
+
+--- Modules/bsddbmodule.c	Tue Nov 23 09:41:44 2004
++++ Modules/bsddbmodule.c	Tue Nov 23 09:43:27 2004
+@@ -13,6 +13,10 @@
+    www.nightmare.com/software.html
+ */
+ 
++#if defined(__sgi) && _COMPILER_VERSION>700 && !_SGIAPI
++#define _BSD_TYPES
++#endif
++
+ #include "Python.h"
+ #ifdef WITH_THREAD
+ #include "pythread.h"