summaryrefslogtreecommitdiff
path: root/lang/python24/patches
diff options
context:
space:
mode:
Diffstat (limited to 'lang/python24/patches')
-rw-r--r--lang/python24/patches/patch-aa26
-rw-r--r--lang/python24/patches/patch-ab23
-rw-r--r--lang/python24/patches/patch-ac13
-rw-r--r--lang/python24/patches/patch-ad31
-rw-r--r--lang/python24/patches/patch-ae13
-rw-r--r--lang/python24/patches/patch-af116
-rw-r--r--lang/python24/patches/patch-ag17
-rw-r--r--lang/python24/patches/patch-ah86
-rw-r--r--lang/python24/patches/patch-ai15
-rw-r--r--lang/python24/patches/patch-aj15
-rw-r--r--lang/python24/patches/patch-ak22
-rw-r--r--lang/python24/patches/patch-al982
-rw-r--r--lang/python24/patches/patch-am328
-rw-r--r--lang/python24/patches/patch-an12
-rw-r--r--lang/python24/patches/patch-ao13
-rw-r--r--lang/python24/patches/patch-ap14
-rw-r--r--lang/python24/patches/patch-aq22
-rw-r--r--lang/python24/patches/patch-ar17
-rw-r--r--lang/python24/patches/patch-at18
-rw-r--r--lang/python24/patches/patch-pyconfig.h.in14
20 files changed, 0 insertions, 1797 deletions
diff --git a/lang/python24/patches/patch-aa b/lang/python24/patches/patch-aa
deleted file mode 100644
index e93a6a1490d..00000000000
--- a/lang/python24/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
-
---- Include/py_curses.h.orig Sun Jun 29 17:46:21 2003
-+++ Include/py_curses.h
-@@ -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/python24/patches/patch-ab b/lang/python24/patches/patch-ab
deleted file mode 100644
index 0d2ab49eb6a..00000000000
--- a/lang/python24/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/06/08 14:16:15 wiz Exp $
-
---- Lib/distutils/command/build_ext.py.orig 2004-11-10 22:23:15.000000000 +0000
-+++ Lib/distutils/command/build_ext.py
-@@ -485,8 +485,18 @@ class build_ext (Command):
- # that go into the mix.
- if ext.extra_objects:
- objects.extend(ext.extra_objects)
-+
-+ # Two possible sources for extra linker arguments:
-+ # - 'extra_link_args' in Extension object
-+ # - LDFLAGS environment variable
-+ # The environment variable should take precedence, and
-+ # any sensible compiler will give precedence to later
-+ # command line args. Hence we combine them in order:
- extra_args = ext.extra_link_args or []
-
-+ if os.environ.has_key('LDFLAGS'):
-+ extra_args.extend(string.split(os.environ['LDFLAGS']))
-+
- # Detect target language, if not provided
- language = ext.language or self.compiler.detect_language(sources)
-
diff --git a/lang/python24/patches/patch-ac b/lang/python24/patches/patch-ac
deleted file mode 100644
index 5f5e2bdfca6..00000000000
--- a/lang/python24/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/06/08 14:16:16 wiz Exp $
-
---- Lib/distutils/command/build_scripts.py.orig 2004-11-10 22:23:15.000000000 +0000
-+++ Lib/distutils/command/build_scripts.py
-@@ -104,7 +104,7 @@ class build_scripts (Command):
- outf.write("#!%s%s\n" %
- (os.path.join(
- sysconfig.get_config_var("BINDIR"),
-- "python" + sysconfig.get_config_var("EXE")),
-+ "python%s" % sys.version[:3] + sysconfig.get_config_var("EXE")),
- post_interp))
- outf.writelines(f.readlines())
- outf.close()
diff --git a/lang/python24/patches/patch-ad b/lang/python24/patches/patch-ad
deleted file mode 100644
index 112442919b1..00000000000
--- a/lang/python24/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/04/12 20:21:48 drochner Exp $
-
---- Lib/posixfile.py.orig Wed Aug 18 17:13:40 2004
-+++ Lib/posixfile.py
-@@ -183,10 +183,11 @@ class _posixfile_:
- # additions for AIX by Vladimir.Marangozov@imag.fr
- import sys, os
- if sys.platform in ('netbsd1',
-+ 'netbsd2', 'netbsd3',
- 'openbsd2',
- 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
- 'freebsd6', 'bsdos2', 'bsdos3', 'bsdos4'):
-- flock = struct.pack('lxxxxlxxxxlhh', \
-+ flock = struct.pack('qqihh', \
- l_start, l_len, os.getpid(), l_type, l_whence)
- elif sys.platform in ['aix3', 'aix4']:
- flock = struct.pack('hhlllii', \
-@@ -199,11 +200,12 @@ class _posixfile_:
-
- if '?' in how:
- if sys.platform in ('netbsd1',
-+ 'netbsd2', 'netbsd3',
- 'openbsd2',
- 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
- 'bsdos2', 'bsdos3', 'bsdos4'):
- l_start, l_len, l_pid, l_type, l_whence = \
-- struct.unpack('lxxxxlxxxxlhh', flock)
-+ struct.unpack('qqihh', flock)
- elif sys.platform in ['aix3', 'aix4']:
- l_type, l_whence, l_start, l_len, l_sysid, l_pid, l_vfs = \
- struct.unpack('hhlllii', flock)
diff --git a/lang/python24/patches/patch-ae b/lang/python24/patches/patch-ae
deleted file mode 100644
index ba3058d0eb2..00000000000
--- a/lang/python24/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2007/06/08 14:16:16 wiz Exp $
-
---- Lib/test/test_fcntl.py.orig 2006-10-03 13:08:57.000000000 +0000
-+++ Lib/test/test_fcntl.py
-@@ -20,7 +20,7 @@ else:
- if sys.platform.startswith('atheos'):
- start_len = "qq"
-
--if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2', 'darwin',
-+if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', 'Darwin1.2', 'darwin',
- 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
- 'bsdos2', 'bsdos3', 'bsdos4',
- 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
diff --git a/lang/python24/patches/patch-af b/lang/python24/patches/patch-af
deleted file mode 100644
index cbc5f27e2ef..00000000000
--- a/lang/python24/patches/patch-af
+++ /dev/null
@@ -1,116 +0,0 @@
-$NetBSD: patch-af,v 1.8 2007/06/08 14:16:16 wiz Exp $
-
---- Makefile.pre.in.orig 2006-10-08 17:41:25.000000000 +0000
-+++ Makefile.pre.in
-@@ -30,6 +30,7 @@ VPATH= @srcdir@
-
- CC= @CC@
- CXX= @CXX@
-+MAINCC= @MAINCC@
- LINKCC= @LINKCC@
- AR= @AR@
- RANLIB= @RANLIB@
-@@ -56,7 +57,7 @@ MAKESETUP= $(srcdir)/Modules/makese
- OPT= @OPT@
- BASECFLAGS= @BASECFLAGS@
- CFLAGS= $(BASECFLAGS) $(OPT)
--CPPFLAGS= -I. -I$(srcdir)/Include
-+CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir)/Include
- LDFLAGS= @LDFLAGS@
- LDLAST= @LDLAST@
- SGI_ABI= @SGI_ABI@
-@@ -157,7 +158,6 @@ LIBC= @LIBC@
- SYSLIBS= $(LIBM) $(LIBC)
- SHLIBS= @SHLIBS@
-
--MAINOBJ= @MAINOBJ@
- THREADOBJ= @THREADOBJ@
- DLINCLDIR= @DLINCLDIR@
- DYNLOADFILE= @DYNLOADFILE@
-@@ -312,10 +312,10 @@ LIBRARY_OBJS= \
- all: $(BUILDPYTHON) oldsharedmods sharedmods
-
- # Build the interpreter
--$(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
-+$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
- $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
-- Modules/$(MAINOBJ) \
-- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-+ Modules/python.o \
-+ $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
-
- platform: $(BUILDPYTHON)
- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -355,14 +355,17 @@ $(LIBRARY): $(LIBRARY_OBJS)
-
- libpython$(VERSION).so: $(LIBRARY_OBJS)
- if test $(INSTSONAME) != $(LDLIBRARY); then \
-- $(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
-+ $(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
- $(LN) -f $(INSTSONAME) $@; \
- else\
-- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
-+ $(LDSHARED) -o $@ $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
- fi
-
- libpython$(VERSION).sl: $(LIBRARY_OBJS)
-- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
-+ $(LDSHARED) -o $@ $(LDFLAGS) $(LIBRARY_OBJS) $(LIBC) $(LIBM)
-+
-+libpython2.4.2.dylib: $(LIBRARY_OBJS)
-+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.2 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
-
- # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
- # minimal framework (not including the Lib directory and such) in the current
-@@ -450,8 +453,8 @@ Modules/getpath.o: $(srcdir)/Modules/get
- -DVPATH='"$(VPATH)"' \
- -o $@ $(srcdir)/Modules/getpath.c
-
--Modules/ccpython.o: $(srcdir)/Modules/ccpython.cc
-- $(CXX) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/ccpython.cc
-+Modules/python.o: $(srcdir)/Modules/python.c
-+ $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
-
-
- $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-@@ -533,7 +536,7 @@ PYTHON_HEADERS= \
- Include/weakrefobject.h \
- pyconfig.h
-
--$(LIBRARY_OBJS) $(MODOBJS) Modules/$(MAINOBJ): $(PYTHON_HEADERS)
-+$(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
-
-
- ######################################################################
-@@ -655,7 +658,12 @@ altbininstall: $(BUILDPYTHON)
- (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
- fi \
- fi; \
-- else true; \
-+ else \
-+ if test -f libpython2.4.2.dylib; then \
-+ $(INSTALL_SHARED) libpython2.4.2.dylib $(DESTDIR)$(LIBDIR)/libpython2.4.2.dylib; \
-+ else \
-+ true; \
-+ fi \
- fi
-
- # Install the manual page
-@@ -773,7 +781,7 @@ $(srcdir)/Lib/$(PLATDIR):
- export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
- export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
- export EXE; EXE="$(BUILDEXE)"; \
-- cd $(srcdir)/Lib/$(PLATDIR); ./regen
-+ cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
-
- # Install the include files
- INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -818,7 +826,7 @@ libainstall: all
- fi; \
- fi
- $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
-- $(INSTALL_DATA) Modules/$(MAINOBJ) $(DESTDIR)$(LIBPL)/$(MAINOBJ)
-+ $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
- $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
- $(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
- $(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
diff --git a/lang/python24/patches/patch-ag b/lang/python24/patches/patch-ag
deleted file mode 100644
index f54e5242546..00000000000
--- a/lang/python24/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
-
---- Misc/setuid-prog.c.orig Thu Sep 10 22:18:09 1998
-+++ Misc/setuid-prog.c
-@@ -70,6 +70,12 @@
- #define environ _environ
- #endif
-
-+#if defined(__APPLE__)
-+# include <sys/time.h>
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#endif /* __APPLE__ */
-+
- /* don't change def_IFS */
- char def_IFS[] = "IFS= \t\n";
- /* you may want to change def_PATH, but you should really change it in */
diff --git a/lang/python24/patches/patch-ah b/lang/python24/patches/patch-ah
deleted file mode 100644
index 90ab726d296..00000000000
--- a/lang/python24/patches/patch-ah
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2007/06/08 14:16:16 wiz Exp $
-
---- Modules/_cursesmodule.c.orig 2006-09-27 19:17:32.000000000 +0000
-+++ Modules/_cursesmodule.c
-@@ -317,17 +317,9 @@ Window_OneArgNoReturnFunction(wattroff,
- Window_OneArgNoReturnFunction(wattrset, attr_t, "l;attr")
- Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
--#if defined(__NetBSD__)
--Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
--#else
- Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
--#endif
- Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
--#if defined(__NetBSD__)
--Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
--#else
- Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
--#endif
- Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-@@ -788,11 +780,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
- } else if (rtn<=255)
- return Py_BuildValue("c", rtn);
- else
--#if defined(__NetBSD__)
-- return PyString_FromString(unctrl(rtn));
--#else
- return PyString_FromString((char *)keyname(rtn));
--#endif
- }
-
- static PyObject *
-@@ -1953,7 +1941,6 @@ PyCurses_IntrFlush(PyObject *self, PyObj
- return PyCursesCheckERR(intrflush(NULL,ch), "intrflush");
- }
-
--#if !defined(__NetBSD__)
- static PyObject *
- PyCurses_KeyName(PyObject *self, PyObject *args)
- {
-@@ -1972,7 +1959,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
-
- return PyString_FromString((knp == NULL) ? "" : (char *)knp);
- }
--#endif
-
- static PyObject *
- PyCurses_KillChar(PyObject *self)
-@@ -2421,9 +2407,7 @@ static PyMethodDef PyCurses_methods[] =
- {"initscr", (PyCFunction)PyCurses_InitScr, METH_NOARGS},
- {"intrflush", (PyCFunction)PyCurses_IntrFlush, METH_VARARGS},
- {"isendwin", (PyCFunction)PyCurses_isendwin, METH_NOARGS},
--#if !defined(__NetBSD__)
- {"keyname", (PyCFunction)PyCurses_KeyName, METH_VARARGS},
--#endif
- {"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
- {"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
- {"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2526,9 +2510,7 @@ init_curses(void)
- SetDictInt("A_DIM", A_DIM);
- SetDictInt("A_BOLD", A_BOLD);
- SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
--#if !defined(__NetBSD__)
- SetDictInt("A_INVIS", A_INVIS);
--#endif
- SetDictInt("A_PROTECT", A_PROTECT);
- SetDictInt("A_CHARTEXT", A_CHARTEXT);
- SetDictInt("A_COLOR", A_COLOR);
-@@ -2600,7 +2582,6 @@ init_curses(void)
- int key;
- char *key_n;
- char *key_n2;
--#if !defined(__NetBSD__)
- for (key=KEY_MIN;key < KEY_MAX; key++) {
- key_n = (char *)keyname(key);
- if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2628,7 +2609,6 @@ init_curses(void)
- if (key_n2 != key_n)
- free(key_n2);
- }
--#endif
- SetDictInt("KEY_MIN", KEY_MIN);
- SetDictInt("KEY_MAX", KEY_MAX);
- }
diff --git a/lang/python24/patches/patch-ai b/lang/python24/patches/patch-ai
deleted file mode 100644
index e2e0f2eba92..00000000000
--- a/lang/python24/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
-
---- Modules/_ssl.c.orig Wed Aug 4 16:59:00 2004
-+++ Modules/_ssl.c
-@@ -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/python24/patches/patch-aj b/lang/python24/patches/patch-aj
deleted file mode 100644
index 11ae841882e..00000000000
--- a/lang/python24/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
-
---- Modules/bsddbmodule.c.orig Tue May 6 22:38:52 2003
-+++ Modules/bsddbmodule.c
-@@ -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"
diff --git a/lang/python24/patches/patch-ak b/lang/python24/patches/patch-ak
deleted file mode 100644
index 04b0a4092d0..00000000000
--- a/lang/python24/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2007/06/08 14:16:16 wiz Exp $
-
---- Modules/posixmodule.c.orig 2006-10-09 19:29:06.000000000 +0000
-+++ Modules/posixmodule.c
-@@ -314,7 +314,7 @@ extern int lstat(const char *, struct st
- #endif
-
- /* Return a dictionary corresponding to the POSIX environment table */
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- /* On Darwin/MacOSX a shared library or framework has no access to
- ** environ directly, we must obtain it with _NSGetEnviron().
- */
-@@ -332,7 +332,7 @@ convertenviron(void)
- d = PyDict_New();
- if (d == NULL)
- return NULL;
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- if (environ == NULL)
- environ = *_NSGetEnviron();
- #endif
diff --git a/lang/python24/patches/patch-al b/lang/python24/patches/patch-al
deleted file mode 100644
index 4e67cb17ff1..00000000000
--- a/lang/python24/patches/patch-al
+++ /dev/null
@@ -1,982 +0,0 @@
-$NetBSD: patch-al,v 1.13 2011/09/14 17:00:20 hans Exp $
-
---- configure.orig 2006-10-17 18:03:36.000000000 +0200
-+++ configure 2011-09-07 15:37:19.069940155 +0200
-@@ -312,7 +312,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CXX MAINCC EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -861,7 +861,9 @@ Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --without-gcc never use gcc
-- --with-cxx=<compiler> enable C++ support
-+ --with-cxx-main=<compiler>
-+ compile main() and link python executable with C++
-+ compiler
- --with-suffix=.exe set executable suffix
- --with-pydebug build with Py_DEBUG defined
- --with-libs='lib1 ...' link against additional libs
-@@ -1548,6 +1550,8 @@ case $ac_sys_system/$ac_sys_release in
- # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
- OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0])
- define_xopen_source=no;;
-+ NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6[A-S])
-+ define_xopen_source=no;;
- # On Solaris 2.6, sys/wait.h is inconsistent in the usage
- # of union __?sigval. Reported by Stuart Bishop.
- SunOS/5.6)
-@@ -1591,10 +1595,10 @@ if test $define_xopen_source = yes
- then
- # On Solaris w/ g++ it appears that _XOPEN_SOURCE has to be
- # defined precisely as g++ defines it
-- # Furthermore, on Solaris 10, XPG6 requires the use of a C99
-+ # Furthermore, on Solaris >=10, XPG6 requires the use of a C99
- # compiler
- case $ac_sys_system/$ac_sys_release in
-- SunOS/5.8|SunOS/5.9|SunOS/5.10)
-+ SunOS/5.8|SunOS/5.9|SunOS/5.10|SunOS/5.11)
-
- cat >>confdefs.h <<\_ACEOF
- #define _XOPEN_SOURCE 500
-@@ -1614,10 +1618,10 @@ _ACEOF
- # definition of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else
- # several APIs are not declared. Since this is also needed in some
- # cases for HP-UX, we define it globally.
-- # except for Solaris 10, where it must not be defined,
-+ # except for Solaris >=10, where it must not be defined,
- # as it implies XPG4.2
- case $ac_sys_system/$ac_sys_release in
-- SunOS/5.10)
-+ SunOS/5.10|SunOS/5.11)
- ;;
- *)
-
-@@ -1746,258 +1750,6 @@ fi;
- echo "$as_me:$LINENO: result: $without_gcc" >&5
- echo "${ECHO_T}$without_gcc" >&6
-
--
--
--MAINOBJ=python.o
--echo "$as_me:$LINENO: checking for --with-cxx=<compiler>" >&5
--echo $ECHO_N "checking for --with-cxx=<compiler>... $ECHO_C" >&6
--
--# Check whether --with-cxx or --without-cxx was given.
--if test "${with_cxx+set}" = set; then
-- withval="$with_cxx"
--
-- check_cxx=no
-- case $withval in
-- no) CXX=
-- with_cxx=no;;
-- *) CXX=$withval
-- MAINOBJ=ccpython.o
-- with_cxx=$withval;;
-- esac
--else
--
-- with_cxx=no
-- check_cxx=yes
--
--fi;
--echo "$as_me:$LINENO: result: $with_cxx" >&5
--echo "${ECHO_T}$with_cxx" >&6
--
--if test "$with_cxx" = "yes"
--then
-- { { echo "$as_me:$LINENO: error: must supply a compiler when using --with-cxx" >&5
--echo "$as_me: error: must supply a compiler when using --with-cxx" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--
--
--
--if test "$check_cxx" = "yes"
--then
-- for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CXX+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$CXX"; then
-- ac_cv_prog_CXX="$CXX" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_CXX="$ac_prog"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
--fi
--fi
--CXX=$ac_cv_prog_CXX
--if test -n "$CXX"; then
-- echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
-- test -n "$CXX" && break
--done
--test -n "$CXX" || CXX="notfound"
--
-- if test "$CXX" = "notfound"
-- then
-- CXX=
-- else
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
--# Try to create an executable without -o first, disregard a.out.
--# It will help us diagnose broken compilers, and finding out an intuition
--# of exeext.
--echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
--echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
--ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-- (eval $ac_link_default) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- # Find the output, starting from the most likely. This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
--do
-- test -f "$ac_file" || continue
-- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-- ;;
-- conftest.$ac_ext )
-- # This is the source file.
-- ;;
-- [ab].out )
-- # We found the default executable, but exeext='' is most
-- # certainly right.
-- break;;
-- *.* )
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool,
-- # but it would be cool to find out if it's true. Does anybody
-- # maintain Libtool? --akim.
-- export ac_cv_exeext
-- break;;
-- * )
-- break;;
-- esac
--done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ compiler cannot create executables
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
--fi
--
--ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
--
--# Check the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
--echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6
--# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
-- if { ac_try='./$ac_file'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- cross_compiling=no
-- else
-- if test "$cross_compiling" = maybe; then
-- cross_compiling=yes
-- else
-- { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run C++ compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- fi
--fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
--ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
--
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- # If both `conftest.exe' and `conftest' are `present' (well, observable)
--# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
--# work properly (i.e., refer to `conftest.exe'), while it won't with
--# `rm'.
--for ac_file in conftest.exe conftest conftest.*; do
-- test -f "$ac_file" || continue
-- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
-- break;;
-- * ) break;;
-- esac
--done
--else
-- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
--
--rm -f conftest.$ac_ext
--EXEEXT=$ac_cv_exeext
--ac_exeext=$EXEEXT
--
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--
-- fi
--fi
--
- # If the user switches compilers, we can't believe the cache
- if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
- then
-@@ -2828,117 +2580,473 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 'extern "C" void exit (int);' \
- 'void exit (int);'
- do
-- cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+rm -f conftest*
-+if test -n "$ac_declaration"; then
-+ echo '#ifdef __cplusplus' >>confdefs.h
-+ echo $ac_declaration >>confdefs.h
-+ echo '#endif' >>confdefs.h
-+fi
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for --with-cxx-main=<compiler>" >&5
-+echo $ECHO_N "checking for --with-cxx-main=<compiler>... $ECHO_C" >&6
-+
-+# Check whether --with-cxx_main or --without-cxx_main was given.
-+if test "${with_cxx_main+set}" = set; then
-+ withval="$with_cxx_main"
-+
-+
-+ case $withval in
-+ no) with_cxx_main=no
-+ MAINCC='$(CC)';;
-+ yes) with_cxx_main=yes
-+ MAINCC='$(CXX)';;
-+ *) with_cxx_main=yes
-+ MAINCC=$withval
-+ if test -z "$CXX"
-+ then
-+ CXX=$withval
-+ fi;;
-+ esac
-+else
-+
-+ with_cxx_main=no
-+ MAINCC='$(CC)'
-+
-+fi;
-+echo "$as_me:$LINENO: result: $with_cxx_main" >&5
-+echo "${ECHO_T}$with_cxx_main" >&6
-+
-+preset_cxx="$CXX"
-+if test -z "$CXX"
-+then
-+ tracevar="$CC"
-+ case "$CC" in
-+ gcc) # Extract the first word of "g++", so it can be a program name with args.
-+set dummy g++; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $CXX in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_CXX="$CXX" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in notfound
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_path_CXX" && ac_cv_path_CXX="g++"
-+ ;;
-+esac
-+fi
-+CXX=$ac_cv_path_CXX
-+
-+if test -n "$CXX"; then
-+ echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+ ;;
-+ cc) # Extract the first word of "c++", so it can be a program name with args.
-+set dummy c++; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $CXX in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_CXX="$CXX" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in notfound
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_path_CXX" && ac_cv_path_CXX="c++"
-+ ;;
-+esac
-+fi
-+CXX=$ac_cv_path_CXX
-+
-+if test -n "$CXX"; then
-+ echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+ ;;
-+ esac
-+ if test "$CXX" = "notfound"
-+ then
-+ CXX=""
-+ fi
-+fi
-+if test -z "$CXX"
-+then
-+ for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CXX"; then
-+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_CXX="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
-+ echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ test -n "$CXX" && break
-+done
-+test -n "$CXX" || CXX="notfound"
-+
-+ if test "$CXX" = "notfound"
-+ then
-+ CXX=""
-+ fi
-+fi
-+if test "$CXX"
-+then
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--$ac_declaration
--#include <stdlib.h>
-+
- int
- main ()
- {
--exit (42);
-+
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+# Try to create an executable without -o first, disregard a.out.
-+# It will help us diagnose broken compilers, and finding out an intuition
-+# of exeext.
-+echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-+echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
-+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-+ (eval $ac_link_default) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
-+ (exit $ac_status); }; then
-+ # Find the output, starting from the most likely. This scheme is
-+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-+# resort.
-+
-+# Be careful to initialize this variable, since it used to be cached.
-+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-+ac_cv_exeext=
-+# b.out is created by i960 compilers.
-+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-+ ;;
-+ conftest.$ac_ext )
-+ # This is the source file.
-+ ;;
-+ [ab].out )
-+ # We found the default executable, but exeext='' is most
-+ # certainly right.
-+ break;;
-+ *.* )
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ # FIXME: I believe we export ac_cv_exeext for Libtool,
-+ # but it would be cool to find out if it's true. Does anybody
-+ # maintain Libtool? --akim.
-+ export ac_cv_exeext
-+ break;;
-+ * )
-+ break;;
-+ esac
-+done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--continue
-+{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C++ compiler cannot create executables
-+See \`config.log' for more details." >&2;}
-+ { (exit 77); exit 77; }; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+
-+ac_exeext=$ac_cv_exeext
-+echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6
-+
-+# Check the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-+echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6
-+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-+# If not cross compiling, check that we can run a simple program.
-+if test "$cross_compiling" != yes; then
-+ if { ac_try='./$ac_file'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+ cross_compiling=no
-+ else
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run C++ compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ fi
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+ac_clean_files=$ac_clean_files_save
-+# Check the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-+echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6
-+
-+echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
-+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ export ac_cv_exeext
-+ break;;
-+ * ) break;;
-+ esac
- done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
-+else
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+rm -f conftest$ac_cv_exeext
-+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6
-
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_ext=c
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+
-+ ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-+
-+fi
-+if test "$preset_cxx" != "$CXX"
-+then
-+ { echo "$as_me:$LINENO: WARNING:
-+
-+ By default, distutils will build C++ extension modules with \"$CXX\".
-+ If this is not intended, then set CXX on the configure command line.
-+ " >&5
-+echo "$as_me: WARNING:
-+
-+ By default, distutils will build C++ extension modules with \"$CXX\".
-+ If this is not intended, then set CXX on the configure command line.
-+ " >&2;}
-+fi
-+
-+
- # checks for UNIX variants that set C preprocessor variables
-
- ac_ext=c
-@@ -3341,22 +3449,7 @@ echo "$as_me:$LINENO: checking LINKCC" >
- echo $ECHO_N "checking LINKCC... $ECHO_C" >&6
- if test -z "$LINKCC"
- then
-- if test -z "$CXX"; then
-- LINKCC="\$(PURIFY) \$(CC)"
-- else
-- echo 'extern "C" void foo();int main(){foo();}' > conftest_a.cc
-- $CXX -c conftest_a.cc # 2>&5
-- echo 'void foo(){}' > conftest_b.$ac_ext
-- $CC -c conftest_b.$ac_ext # 2>&5
-- if $CC -o conftest$ac_exeext conftest_a.$ac_objext conftest_b.$ac_objext 2>&5 \
-- && test -s conftest$ac_exeext && ./conftest$ac_exeext
-- then
-- LINKCC="\$(PURIFY) \$(CC)"
-- else
-- LINKCC="\$(PURIFY) \$(CXX)"
-- fi
-- rm -fr conftest*
-- fi
-+ LINKCC='$(PURIFY) $(MAINCC)'
- case $ac_sys_system in
- AIX*)
- exp_extra="\"\""
-@@ -3483,15 +3576,10 @@ _ACEOF
- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- INSTSONAME="$LDLIBRARY".$SOVERSION
- ;;
-- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
-+ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*)
- LDLIBRARY='libpython$(VERSION).so'
- BLDLIBRARY='-L. -lpython$(VERSION)'
- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-- case $ac_sys_system in
-- FreeBSD*)
-- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
-- ;;
-- esac
- INSTSONAME="$LDLIBRARY".$SOVERSION
- ;;
- hp*|HP*)
-@@ -3907,7 +3995,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
- ;;
- # is there any other compiler on Darwin besides gcc?
- Darwin*)
-- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
-+ if [[ `/usr/bin/arch` = 'ppc' ]]
-+ then
-+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
-+ else
-+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
-+ fi
- if test "${enable_universalsdk}"; then
- BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
- fi
-@@ -10472,12 +10565,12 @@ then
- LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- else
- # No framework, use the Python app as bundle-loader
-- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
-- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
-+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
-+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- fi
- fi
- ;;
-- Linux*|GNU*) LDSHARED='$(CC) -shared';;
-+ Linux*|GNU*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";;
- BSD/OS*/4*) LDSHARED="gcc -shared";;
- FreeBSD*)
- if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -10501,6 +10594,7 @@ then
- esac
- fi;;
- NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
-+ Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack
- OpenUNIX*|UnixWare*)
- if test "$GCC" = "yes"
- then LDSHARED='$(CC) -shared'
-@@ -10534,6 +10628,7 @@ then
- Linux*|GNU*) CCSHARED="-fPIC";;
- BSD/OS*/4*) CCSHARED="-fpic";;
- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
-+ Interix*) CCSHARED="";;
- OpenUNIX*|UnixWare*)
- if test "$GCC" = "yes"
- then CCSHARED="-fPIC"
-@@ -10591,6 +10686,7 @@ then
- then
- LINKFORSHARED="-Wl,--export-dynamic"
- fi;;
-+ Interix*) LINKFORSHARED="-Wl,-E";;
- SunOS/5*) case $CC in
- *gcc*)
- if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -21328,15 +21424,15 @@ s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
- s,@EXTRAMACHDEPPATH@,$EXTRAMACHDEPPATH,;t t
- s,@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@,$CONFIGURE_MACOSX_DEPLOYMENT_TARGET,;t t
- s,@EXPORT_MACOSX_DEPLOYMENT_TARGET@,$EXPORT_MACOSX_DEPLOYMENT_TARGET,;t t
--s,@CXX@,$CXX,;t t
--s,@MAINOBJ@,$MAINOBJ,;t t
--s,@EXEEXT@,$EXEEXT,;t t
- s,@CC@,$CC,;t t
- s,@CFLAGS@,$CFLAGS,;t t
- s,@LDFLAGS@,$LDFLAGS,;t t
- s,@CPPFLAGS@,$CPPFLAGS,;t t
- s,@ac_ct_CC@,$ac_ct_CC,;t t
-+s,@EXEEXT@,$EXEEXT,;t t
- s,@OBJEXT@,$OBJEXT,;t t
-+s,@CXX@,$CXX,;t t
-+s,@MAINCC@,$MAINCC,;t t
- s,@CPP@,$CPP,;t t
- s,@EGREP@,$EGREP,;t t
- s,@BUILDEXEEXT@,$BUILDEXEEXT,;t t
diff --git a/lang/python24/patches/patch-am b/lang/python24/patches/patch-am
deleted file mode 100644
index 91c16861898..00000000000
--- a/lang/python24/patches/patch-am
+++ /dev/null
@@ -1,328 +0,0 @@
-$NetBSD: patch-am,v 1.9 2011/11/08 07:30:08 sbd Exp $
-
---- setup.py.orig 2006-10-08 17:41:25.000000000 +0000
-+++ setup.py
-@@ -15,7 +15,7 @@
- from distutils.command.install_lib import install_lib
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_tkinter", "gdbm", "pyexpat", "readline"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -239,9 +239,15 @@
- return sys.platform
-
- def detect_modules(self):
-- # Ensure that /usr/local is always used
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+ # Add the buildlink directories for pkgsrc
-+ if os.environ.has_key('BUILDLINK_DIR'):
-+ dir = os.environ['BUILDLINK_DIR']
-+ libdir = dir + '/lib'
-+ incdir = dir + '/include'
-+ if libdir not in self.compiler.library_dirs:
-+ self.compiler.library_dirs.insert(0, libdir)
-+ if incdir not in self.compiler.include_dirs:
-+ self.compiler.include_dirs.insert(0, incdir)
-
- # Add paths to popular package managers on OS X/darwin
- if sys.platform == "darwin":
-@@ -485,9 +491,7 @@
- depends = ['socketmodule.h']) )
- # Detect SSL support for the socket module (via _ssl)
- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-- ['/usr/local/ssl/include',
-- '/usr/contrib/ssl/include/'
-- ]
-+ []
- )
- if ssl_incs is not None:
- krb5_h = find_file('krb5.h', inc_dirs,
-@@ -495,9 +499,7 @@
- if krb5_h:
- ssl_incs += krb5_h
- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-- ['/usr/local/ssl/lib',
-- '/usr/contrib/ssl/lib/'
-- ] )
-+ [] )
-
- if (ssl_incs is not None and
- ssl_libs is not None):
-@@ -515,172 +517,79 @@
- # similar functionality (but slower of course) implemented in Python.
-
- # Sleepycat Berkeley DB interface. http://www.sleepycat.com
-- #
-- # This requires the Sleepycat DB code. The earliest supported version
-- # of that library is 3.2, the latest supported version is 4.4. A list
-- # of available releases can be found at
-- #
-- # http://www.sleepycat.com/update/index.html
--
-- max_db_ver = (4, 4)
-- min_db_ver = (3, 2)
-- db_setup_debug = False # verbose debug prints from this script?
--
-- # construct a list of paths to look for the header file in on
-- # top of the normal inc_dirs.
-- db_inc_paths = [
-- '/usr/include/db4',
-- '/usr/local/include/db4',
-- '/opt/sfw/include/db4',
-- '/sw/include/db4',
-- '/usr/include/db3',
-- '/usr/local/include/db3',
-- '/opt/sfw/include/db3',
-- '/sw/include/db3',
-- ]
-- # 4.x minor number specific paths
-- for x in (0,1,2,3,4):
-- db_inc_paths.append('/usr/include/db4%d' % x)
-- db_inc_paths.append('/usr/include/db4.%d' % x)
-- db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
-- db_inc_paths.append('/usr/local/include/db4%d' % x)
-- db_inc_paths.append('/pkg/db-4.%d/include' % x)
-- db_inc_paths.append('/opt/db-4.%d/include' % x)
-- # 3.x minor number specific paths
-- for x in (2,3):
-- db_inc_paths.append('/usr/include/db3%d' % x)
-- db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
-- db_inc_paths.append('/usr/local/include/db3%d' % x)
-- db_inc_paths.append('/pkg/db-3.%d/include' % x)
-- db_inc_paths.append('/opt/db-3.%d/include' % x)
--
-- # Add some common subdirectories for Sleepycat DB to the list,
-- # based on the standard include directories. This way DB3/4 gets
-- # picked up when it is installed in a non-standard prefix and
-- # the user has added that prefix into inc_dirs.
-- std_variants = []
-- for dn in inc_dirs:
-- std_variants.append(os.path.join(dn, 'db3'))
-- std_variants.append(os.path.join(dn, 'db4'))
-- for x in (0,1,2,3,4):
-- std_variants.append(os.path.join(dn, "db4%d"%x))
-- std_variants.append(os.path.join(dn, "db4.%d"%x))
-- for x in (2,3):
-- std_variants.append(os.path.join(dn, "db3%d"%x))
-- std_variants.append(os.path.join(dn, "db3.%d"%x))
--
-- db_inc_paths = std_variants + db_inc_paths
--
-- db_ver_inc_map = {}
--
-- class db_found(Exception): pass
-+ class Notfound(Exception): pass
- try:
- # See whether there is a Sleepycat header in the standard
- # search path.
-- for d in inc_dirs + db_inc_paths:
-- f = os.path.join(d, "db.h")
-- if db_setup_debug: print "db: looking for db.h in", f
-- if os.path.exists(f):
-- f = open(f).read()
-- m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
-- if m:
-- db_major = int(m.group(1))
-- m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
-- db_minor = int(m.group(1))
-- db_ver = (db_major, db_minor)
--
-- if ( (not db_ver_inc_map.has_key(db_ver)) and
-- (db_ver <= max_db_ver and db_ver >= min_db_ver) ):
-- # save the include directory with the db.h version
-- # (first occurrance only)
-- db_ver_inc_map[db_ver] = d
-- print "db.h: found", db_ver, "in", d
-- else:
-- # we already found a header for this library version
-- if db_setup_debug: print "db.h: ignoring", d
-- else:
-- # ignore this header, it didn't contain a version number
-- if db_setup_debug: print "db.h: unsupported version", db_ver, "in", d
--
-- db_found_vers = db_ver_inc_map.keys()
-- db_found_vers.sort()
--
-- while db_found_vers:
-- db_ver = db_found_vers.pop()
-- db_incdir = db_ver_inc_map[db_ver]
--
-- # check lib directories parallel to the location of the header
-- db_dirs_to_check = [
-- os.path.join(db_incdir, '..', 'lib64'),
-- os.path.join(db_incdir, '..', 'lib'),
-- os.path.join(db_incdir, '..', '..', 'lib64'),
-- os.path.join(db_incdir, '..', '..', 'lib'),
-- ]
-- db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
--
-- # Look for a version specific db-X.Y before an ambiguoius dbX
-- # XXX should we -ever- look for a dbX name? Do any
-- # systems really not name their library by version and
-- # symlink to more general names?
-- for dblib in (('db-%d.%d' % db_ver),
-- ('db%d%d' % db_ver),
-- ('db%d' % db_ver[0])):
-- dblib_file = self.compiler.find_library_file(
-- db_dirs_to_check + lib_dirs, dblib )
-- if dblib_file:
-- dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
-- raise db_found
-- else:
-- if db_setup_debug: print "db lib: ", dblib, "not found"
--
-- except db_found:
-- print "db lib: using", db_ver, dblib
-- if db_setup_debug: print "db: lib dir", dblib_dir, "inc dir", db_incdir
-- db_incs = [db_incdir]
-- dblibs = [dblib]
-- # We add the runtime_library_dirs argument because the
-- # BerkeleyDB lib we're linking against often isn't in the
-- # system dynamic library search path. This is usually
-- # correct and most trouble free, but may cause problems in
-- # some unusual system configurations (e.g. the directory
-- # is on an NFS server that goes away).
-- exts.append(Extension('_bsddb', ['_bsddb.c'],
-- library_dirs=dblib_dir,
-- runtime_library_dirs=dblib_dir,
-- include_dirs=db_incs,
-- libraries=dblibs))
-- else:
-- if db_setup_debug: print "db: no appropriate library found"
-- db_incs = None
-- dblibs = []
-+ bdb_type = os.environ['PY_BDB_TYPE']
-+ db_incs = [os.environ['PY_BDB_INCDIRS']]
- dblib_dir = None
-+ dblibs = None
-
--
-- # Look for Berkeley db 1.85. Note that it is built as a different
-- # module name so it can be included even when later versions are
-- # available. A very restrictive search is performed to avoid
-- # accidentally building this module with a later version of the
-- # underlying db library. May BSD-ish Unixes incorporate db 1.85
-- # symbols into libc and place the include file in /usr/include.
-- f = "/usr/include/db.h"
-- if os.path.exists(f):
-- data = open(f).read()
-- m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-- if m is not None:
-- # bingo - old version used hash file format version 2
-- ### XXX this should be fixed to not be platform-dependent
-- ### but I don't have direct access to an osf1 platform and
-- ### seemed to be muffing the search somehow
-- libraries = platform == "osf1" and ['db'] or None
-- if libraries is not None:
-- exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-- libraries=libraries))
-- else:
-- exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-+ # check if need to use the db_185.h compat header
-+ bsddb185_define_macros=[]
-+ if bdb_type == "db2" or bdb_type == "db3" or bdb_type == "db4":
-+ bsddb185_define_macros=[('HAVE_DB_185_H',1)]
-+ dblib_dir = [os.environ['PY_BDB_LIBDIRS']]
-+ else:
-+ # check if db_incs/db.h really is db 1.85
-+ f = "%s/db.h" % db_incs[0]
-+ if os.path.exists(f):
-+ data = open(f).read()
-+ m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-+ if m is None:
-+ # check for 1.85 compat header
-+ if os.path.exists("%s/db_185.h" % db_incs[0]):
-+ bsddb185_define_macros=[('HAVE_DB_185_H',1)]
-+ else:
-+ raise NotFound
-+ try:
-+ bltransform = os.environ['PY_BDB_TRANSFORM']
-+ m = re.search(r"l:db:(db.)\s*", bltransform)
-+ if m is not None and m.group(1) is not None:
-+ dblibs = [m.group(1)]
-+ except:
-+ pass
-+
-+ # build the bsddb185 extension module
-+ exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-+ library_dirs=dblib_dir,
-+ runtime_library_dirs=dblib_dir,
-+ include_dirs=db_incs,
-+ define_macros=bsddb185_define_macros,
-+ libraries=dblibs))
-+ except:
-+ db_incs = None
-+ dblibs = []
-+ dblib_dir = None
-
- # The standard Unix dbm module:
- if platform not in ['cygwin']:
-- if find_file("ndbm.h", inc_dirs, []) is not None:
-+
-+ ## Top half based on find_file
-+ def find_ndbm_h(dirs):
-+ ret = None
-+ if sys.platform == 'darwin':
-+ sysroot = macosx_sdk_root()
-+ for dir in dirs:
-+ f = os.path.join(dir, 'ndbm.h')
-+ if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-+ f = os.path.join(sysroot, dir[1:], 'ndbm.h')
-+ if not os.path.exists(f): continue
-+
-+ ret = 'True'
-+ input = text_file.TextFile(f)
-+ while 1:
-+ line = input.readline()
-+ if not line: break
-+ if re.search('This file is part of GDBM', line):
-+ ret = None
-+ break
-+ input.close()
-+ break
-+ return ret
-+
-+ if find_ndbm_h(inc_dirs) is not None:
- # Some systems have -lndbm, others don't
- if self.compiler.find_library_file(lib_dirs, 'ndbm'):
- ndbm_libs = ['ndbm']
-@@ -689,13 +598,17 @@
- exts.append( Extension('dbm', ['dbmmodule.c'],
- define_macros=[('HAVE_NDBM_H',None)],
- libraries = ndbm_libs ) )
-- elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
-- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
-- exts.append( Extension('dbm', ['dbmmodule.c'],
-- define_macros=[('HAVE_GDBM_NDBM_H',None)],
-- libraries = ['gdbm'] ) )
-- elif db_incs is not None:
-- exts.append( Extension('dbm', ['dbmmodule.c'],
-+
-+ if not module_enabled(exts, 'dbm'):
-+ if find_file("ndbm.h", db_incs, []) is not None:
-+ exts.append( Extension('dbm', ['dbmmodule.c'],
-+ library_dirs=dblib_dir,
-+ runtime_library_dirs=dblib_dir,
-+ include_dirs=db_incs,
-+ define_macros=[('HAVE_NDBM_H',None)],
-+ libraries=dblibs))
-+ elif db_incs is not None:
-+ exts.append( Extension('dbm', ['dbmmodule.c'],
- library_dirs=dblib_dir,
- runtime_library_dirs=dblib_dir,
- include_dirs=db_incs,
-@@ -1224,8 +1137,8 @@
- ext_modules=[Extension('struct', ['structmodule.c'])],
-
- # Scripts to install
-- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-- 'Lib/smtpd.py']
-+ scripts = ['Tools/scripts/pydoc2.4',
-+ 'Lib/smtpd2.4.py']
- )
-
- # --install-platlib
diff --git a/lang/python24/patches/patch-an b/lang/python24/patches/patch-an
deleted file mode 100644
index 35933d76773..00000000000
--- a/lang/python24/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.7 2005/11/16 19:18:59 joerg Exp $
-
---- Modules/makesetup.orig 2002-03-29 19:00:18.000000000 +0100
-+++ Modules/makesetup
-@@ -164,6 +164,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
- -rpath) libs="$libs $arg"; skip=libs;;
- --rpath) libs="$libs $arg"; skip=libs;;
- -[A-Zl]*) libs="$libs $arg";;
-+ -pthread) libs="$libs $arg";;
- *.a) libs="$libs $arg";;
- *.so) libs="$libs $arg";;
- *.sl) libs="$libs $arg";;
diff --git a/lang/python24/patches/patch-ao b/lang/python24/patches/patch-ao
deleted file mode 100644
index e228481c37f..00000000000
--- a/lang/python24/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2007/06/08 14:16:16 wiz Exp $
-
---- Lib/distutils/util.py.orig 2006-10-08 17:41:25.000000000 +0000
-+++ Lib/distutils/util.py
-@@ -116,6 +116,8 @@ def get_platform ():
- elif machine in ('PowerPC', 'Power_Macintosh'):
- # Pick a sane name for the PPC architecture
- machine = 'ppc'
-+ elif osname[:9] == "dragonfly":
-+ release = string.split(release, "-")[0]
-
- return "%s-%s-%s" % (osname, release, machine)
-
diff --git a/lang/python24/patches/patch-ap b/lang/python24/patches/patch-ap
deleted file mode 100644
index 047a00224c5..00000000000
--- a/lang/python24/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2008/02/22 13:03:25 joerg Exp $
-
---- Modules/socketmodule.c.orig 2006-10-10 16:20:41.000000000 +0000
-+++ Modules/socketmodule.c
-@@ -355,7 +355,8 @@ const char *inet_ntop(int af, const void
- #define SEGMENT_SIZE 65535
- #endif
-
--#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)
-+#if (defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)) && \
-+ !defined(__NetBSD__) && !defined(__DragonFly__)
- #define USE_BLUETOOTH 1
- #if defined(__FreeBSD__)
- #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
diff --git a/lang/python24/patches/patch-aq b/lang/python24/patches/patch-aq
deleted file mode 100644
index ce4da0e2bc5..00000000000
--- a/lang/python24/patches/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2011/04/23 08:53:53 obache Exp $
-
---- Tools/faqwiz/move-faqwiz.sh.orig 2008-11-30 13:33:28.000000000 +0000
-+++ Tools/faqwiz/move-faqwiz.sh
-@@ -9,7 +9,7 @@
- # blackjesus:~> ./move-faqwiz.sh 2\.1 3\.2
- # Moving FAQ question 02.001 to 03.002
-
--if [ x$2 = x ]; then
-+if [ $# -ne 2 ]; then
- echo "Need 2 args: original_version final_version."
- exit 2
- fi
-@@ -31,7 +31,7 @@ cut_n_pad $2 2 suffix2
- if which tempfile >/dev/null; then
- tmpfile=$(tempfile -d .)
- elif [ -n "$RANDOM" ]; then
-- tmpfile=tmp$RANDOM.tmp
-+ tmpfile=tmp-$$-$RANDOM.tmp
- else
- tmpfile=tmp$$.tmp
- fi
diff --git a/lang/python24/patches/patch-ar b/lang/python24/patches/patch-ar
deleted file mode 100644
index 1ce54284cac..00000000000
--- a/lang/python24/patches/patch-ar
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2007/06/08 14:16:17 wiz Exp $
-
---- Mac/BuildScript/scripts/postflight.patch-profile.orig 2006-10-08 18:20:10.000000000 +0000
-+++ Mac/BuildScript/scripts/postflight.patch-profile
-@@ -36,10 +36,10 @@ esac
- # Now ensure that our bin directory is on $P and before /usr/bin at that
- for elem in `echo $P | tr ':' ' '`
- do
-- if [ "${elem}" == "${PYTHON_ROOT}/bin" ]; then
-+ if [ "${elem}" = "${PYTHON_ROOT}/bin" ]; then
- echo "All right, you're a python lover already"
- exit 0
-- elif [ "${elem}" == "/usr/bin" ]; then
-+ elif [ "${elem}" = "/usr/bin" ]; then
- break
- fi
- done
diff --git a/lang/python24/patches/patch-at b/lang/python24/patches/patch-at
deleted file mode 100644
index 4a459014a1d..00000000000
--- a/lang/python24/patches/patch-at
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-at,v 1.1 2007/07/17 21:08:53 joerg Exp $
-
---- Modules/mmapmodule.c.orig 2007-07-15 00:02:23.000000000 +0200
-+++ Modules/mmapmodule.c
-@@ -434,10 +434,12 @@ mmap_resize_method(mmap_object *self,
-
- #ifdef MREMAP_MAYMOVE
- newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
-+#elif defined(__NetBSD__)
-+ newmap = mremap(self->data, self->size, self->data, new_size, 0);
- #else
- newmap = mremap(self->data, self->size, new_size, 0);
- #endif
-- if (newmap == (void *)-1)
-+ if (newmap == MAP_FAILED)
- {
- PyErr_SetFromErrno(mmap_module_error);
- return NULL;
diff --git a/lang/python24/patches/patch-pyconfig.h.in b/lang/python24/patches/patch-pyconfig.h.in
deleted file mode 100644
index 9169d6ed7f7..00000000000
--- a/lang/python24/patches/patch-pyconfig.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-pyconfig.h.in,v 1.1 2011/12/16 17:04:17 hans Exp $
-
---- pyconfig.h.in.orig 2009-10-27 13:30:12.000000000 +0100
-+++ pyconfig.h.in 2011-11-13 14:37:13.053045656 +0100
-@@ -1036,7 +1036,9 @@
- #undef _REENTRANT
-
- /* Define to the level of X/Open that your system supports */
-+#if !defined(__sun) || (defined(__sun) && !defined(_XOPEN_SOURCE))
- #undef _XOPEN_SOURCE
-+#endif
-
- /* Define to activate Unix95-and-earlier features */
- #undef _XOPEN_SOURCE_EXTENDED
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 05:32:09 +0000