summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/python26/Makefile7
-rw-r--r--lang/python26/PLIST.common25
-rw-r--r--lang/python26/distinfo17
-rw-r--r--lang/python26/patches/patch-ah32
-rw-r--r--lang/python26/patches/patch-al25
-rw-r--r--lang/python26/patches/patch-am20
-rw-r--r--lang/python26/patches/patch-ao18
-rw-r--r--lang/python26/patches/patch-ar17
8 files changed, 87 insertions, 74 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index e204323b41f..d8c4960d925 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2010/04/18 09:20:25 adam Exp $
+# $NetBSD: Makefile,v 1.23 2010/05/02 14:09:11 wiz Exp $
-DISTNAME= Python-2.6.4
+DISTNAME= Python-2.6.5
PKGNAME= ${DISTNAME:S/Python/python26/}
-PKGREVISION= 4
CATEGORIES= lang python
-MASTER_SITES= http://www.python.org/ftp/python/2.6.4/
+MASTER_SITES= http://www.python.org/ftp/python/2.6.5/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common
index 93bb5f49721..b0ef4bbcd99 100644
--- a/lang/python26/PLIST.common
+++ b/lang/python26/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2010/02/11 21:21:49 tnn Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2010/05/02 14:09:11 wiz Exp $
bin/2to3
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -787,6 +787,9 @@ lib/python${PY_VER_SUFFIX}/distutils/tests/test_filelist.pyo
lib/python${PY_VER_SUFFIX}/distutils/tests/test_install.py
lib/python${PY_VER_SUFFIX}/distutils/tests/test_install.pyc
lib/python${PY_VER_SUFFIX}/distutils/tests/test_install.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_lib.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_lib.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_lib.pyo
lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_scripts.py
lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_scripts.pyc
lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_scripts.pyo
@@ -802,9 +805,15 @@ lib/python${PY_VER_SUFFIX}/distutils/tests/test_sdist.pyo
lib/python${PY_VER_SUFFIX}/distutils/tests/test_sysconfig.py
lib/python${PY_VER_SUFFIX}/distutils/tests/test_sysconfig.pyc
lib/python${PY_VER_SUFFIX}/distutils/tests/test_sysconfig.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_unixccompiler.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_unixccompiler.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_unixccompiler.pyo
lib/python${PY_VER_SUFFIX}/distutils/tests/test_upload.py
lib/python${PY_VER_SUFFIX}/distutils/tests/test_upload.pyc
lib/python${PY_VER_SUFFIX}/distutils/tests/test_upload.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_util.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_util.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_util.pyo
lib/python${PY_VER_SUFFIX}/distutils/tests/test_versionpredicate.py
lib/python${PY_VER_SUFFIX}/distutils/tests/test_versionpredicate.pyc
lib/python${PY_VER_SUFFIX}/distutils/tests/test_versionpredicate.pyo
@@ -951,6 +960,8 @@ lib/python${PY_VER_SUFFIX}/email/test/data/msg_41.txt
lib/python${PY_VER_SUFFIX}/email/test/data/msg_42.txt
lib/python${PY_VER_SUFFIX}/email/test/data/msg_43.txt
lib/python${PY_VER_SUFFIX}/email/test/data/msg_44.txt
+lib/python${PY_VER_SUFFIX}/email/test/data/msg_45.txt
+lib/python${PY_VER_SUFFIX}/email/test/data/msg_46.txt
lib/python${PY_VER_SUFFIX}/email/test/test_email.py
lib/python${PY_VER_SUFFIX}/email/test/test_email.pyc
lib/python${PY_VER_SUFFIX}/email/test/test_email.pyo
@@ -1894,6 +1905,9 @@ lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_nonzero.pyo
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_numliterals.py
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_numliterals.pyc
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_numliterals.pyo
+lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_operator.py
+lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_operator.pyc
+lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_operator.pyo
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_paren.py
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_paren.pyc
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_paren.pyo
@@ -2008,6 +2022,9 @@ lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_all_fixers.pyo
lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_fixers.py
lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_fixers.pyc
lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_fixers.pyo
+lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_main.py
+lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_main.pyc
+lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_main.pyo
lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_parser.py
lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_parser.pyc
lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_parser.pyo
@@ -2576,6 +2593,9 @@ lib/python${PY_VER_SUFFIX}/test/keycert.pem
lib/python${PY_VER_SUFFIX}/test/list_tests.py
lib/python${PY_VER_SUFFIX}/test/list_tests.pyc
lib/python${PY_VER_SUFFIX}/test/list_tests.pyo
+lib/python${PY_VER_SUFFIX}/test/lock_tests.py
+lib/python${PY_VER_SUFFIX}/test/lock_tests.pyc
+lib/python${PY_VER_SUFFIX}/test/lock_tests.pyo
lib/python${PY_VER_SUFFIX}/test/mapping_tests.py
lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyc
lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyo
@@ -3425,6 +3445,9 @@ lib/python${PY_VER_SUFFIX}/test/test_random.pyo
lib/python${PY_VER_SUFFIX}/test/test_re.py
lib/python${PY_VER_SUFFIX}/test/test_re.pyc
lib/python${PY_VER_SUFFIX}/test/test_re.pyo
+lib/python${PY_VER_SUFFIX}/test/test_readline.py
+lib/python${PY_VER_SUFFIX}/test/test_readline.pyc
+lib/python${PY_VER_SUFFIX}/test/test_readline.pyo
lib/python${PY_VER_SUFFIX}/test/test_repr.py
lib/python${PY_VER_SUFFIX}/test/test_repr.pyc
lib/python${PY_VER_SUFFIX}/test/test_repr.pyo
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 1af6db76674..9eacb078297 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.20 2010/02/11 21:09:50 tnn Exp $
+$NetBSD: distinfo,v 1.21 2010/05/02 14:09:11 wiz Exp $
-SHA1 (Python-2.6.4.tar.bz2) = bee572680d1966501247cb2b26e0e51f94d1cd13
-RMD160 (Python-2.6.4.tar.bz2) = fd33853842110fa3636dd296f2f27646fd2b151a
-Size (Python-2.6.4.tar.bz2) = 11249486 bytes
+SHA1 (Python-2.6.5.tar.bz2) = 24c94f5428a8c94c9d0b316e3019fee721fdb5d1
+RMD160 (Python-2.6.5.tar.bz2) = 909c6a13749396f2b19fed51821d3e2577b2833b
+Size (Python-2.6.5.tar.bz2) = 11095581 bytes
SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5
SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
-SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
-SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e
-SHA1 (patch-am) = 6ca7c1c2360e30807d06ecb62b794604d1ad951a
+SHA1 (patch-ah) = f973ac5a82ba5c665d2ec4b0f6130e903b5a5d7c
+SHA1 (patch-al) = d753e00ab65564a08988f7934870716aca9b02a9
+SHA1 (patch-am) = 77f8ca811777d53d7a1972c177e59568dc49651b
SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
-SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
+SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da
-SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072
SHA1 (patch-au) = cf68c1975f60d18bf37262fa41cbfef1585aeb55
SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156
diff --git a/lang/python26/patches/patch-ah b/lang/python26/patches/patch-ah
index 2a020a20df9..cd4bc79d83a 100644
--- a/lang/python26/patches/patch-ah
+++ b/lang/python26/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2010/05/02 14:09:11 wiz Exp $
---- Modules/_cursesmodule.c.orig 2008-01-26 15:03:51.000000000 +0100
+--- Modules/_cursesmodule.c.orig 2010-02-22 17:06:22.000000000 +0000
+++ Modules/_cursesmodule.c
-@@ -314,17 +314,9 @@ Window_NoArg2TupleReturnFunction(getpary
+@@ -317,17 +317,9 @@ Window_NoArg2TupleReturnFunction(getpary
Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
@@ -20,19 +20,19 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
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")
-@@ -827,11 +819,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
- } else if (rtn<=255)
+@@ -886,11 +878,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
return Py_BuildValue("c", rtn);
- else
+ } else {
+ const char *knp;
-#if defined(__NetBSD__)
-- return PyString_FromString(unctrl(rtn));
+- knp = unctrl(rtn);
-#else
- return PyString_FromString((char *)keyname(rtn));
+ knp = keyname(rtn);
-#endif
+ return PyString_FromString((knp == NULL) ? "" : knp);
+ }
}
-
- static PyObject *
-@@ -2039,7 +2027,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
+@@ -2100,7 +2088,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
}
#endif /* HAVE_CURSES_IS_TERM_RESIZED */
@@ -40,7 +40,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
static PyObject *
PyCurses_KeyName(PyObject *self, PyObject *args)
{
-@@ -2058,7 +2045,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
+@@ -2119,7 +2106,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
return PyString_FromString((knp == NULL) ? "" : (char *)knp);
}
@@ -48,7 +48,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
static PyObject *
PyCurses_KillChar(PyObject *self)
-@@ -2603,9 +2589,7 @@ static PyMethodDef PyCurses_methods[] =
+@@ -2664,9 +2650,7 @@ static PyMethodDef PyCurses_methods[] =
#ifdef HAVE_CURSES_IS_TERM_RESIZED
{"is_term_resized", (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
#endif
@@ -58,7 +58,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
{"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
{"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
{"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2714,9 +2698,7 @@ init_curses(void)
+@@ -2775,9 +2759,7 @@ init_curses(void)
SetDictInt("A_DIM", A_DIM);
SetDictInt("A_BOLD", A_BOLD);
SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
@@ -68,7 +68,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
SetDictInt("A_PROTECT", A_PROTECT);
SetDictInt("A_CHARTEXT", A_CHARTEXT);
SetDictInt("A_COLOR", A_COLOR);
-@@ -2788,7 +2770,6 @@ init_curses(void)
+@@ -2849,7 +2831,6 @@ init_curses(void)
int key;
char *key_n;
char *key_n2;
@@ -76,7 +76,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
for (key=KEY_MIN;key < KEY_MAX; key++) {
key_n = (char *)keyname(key);
if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2816,7 +2797,6 @@ init_curses(void)
+@@ -2877,7 +2858,6 @@ init_curses(void)
if (key_n2 != key_n)
free(key_n2);
}
diff --git a/lang/python26/patches/patch-al b/lang/python26/patches/patch-al
index 80b6b310166..5ac6b89baeb 100644
--- a/lang/python26/patches/patch-al
+++ b/lang/python26/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
+$NetBSD: patch-al,v 1.4 2010/05/02 14:09:11 wiz Exp $
---- configure.orig 2009-03-30 17:56:14.000000000 +0000
+--- configure.orig 2010-03-09 21:47:28.000000000 +0000
+++ configure
-@@ -4108,17 +4108,18 @@ _ACEOF
+@@ -4166,17 +4166,18 @@ _ACEOF
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
@@ -27,7 +27,16 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
hp*|HP*)
case `uname -m` in
ia64)
-@@ -13064,8 +13065,8 @@ then
+@@ -4578,7 +4579,7 @@ fi
+ # tweak OPT based on compiler and platform, only if the user didn't set
+ # it on the command line
+
+-if test "${OPT-unset}" == "unset"
++if test "${OPT-unset}" = "unset"
+ then
+ case $GCC in
+ yes)
+@@ -13261,8 +13262,8 @@ then
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -38,7 +47,7 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -13086,12 +13087,12 @@ then
+@@ -13283,12 +13284,12 @@ then
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -54,7 +63,7 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
BSD/OS*/4*) LDSHARED="gcc -shared";;
FreeBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -13115,6 +13116,7 @@ then
+@@ -13312,6 +13313,7 @@ then
esac
fi;;
NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
@@ -62,7 +71,7 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then LDSHARED='$(CC) -shared'
-@@ -13150,6 +13152,7 @@ then
+@@ -13347,6 +13349,7 @@ then
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
@@ -70,7 +79,7 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
-@@ -13207,6 +13210,7 @@ then
+@@ -13404,6 +13407,7 @@ then
then
LINKFORSHARED="-Wl,--export-dynamic"
fi;;
diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am
index 121d25f2c81..fc81ea8c838 100644
--- a/lang/python26/patches/patch-am
+++ b/lang/python26/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.10 2010/02/11 21:09:50 tnn Exp $
+$NetBSD: patch-am,v 1.11 2010/05/02 14:09:12 wiz Exp $
Disabled modules for normal build:
bsdddb
@@ -12,7 +12,7 @@ headers and libraries from the system.
Build the 1.85 compat module all the time against the BDB version of choice.
---- setup.py.orig 2009-10-08 09:48:32.000000000 +0000
+--- setup.py.orig 2010-03-08 07:08:25.000000000 +0000
+++ setup.py
@@ -17,7 +17,7 @@ from distutils.command.install import in
from distutils.command.install_lib import install_lib
@@ -42,7 +42,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -626,9 +632,7 @@ class PyBuildExt(build_ext):
+@@ -629,9 +635,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -53,7 +53,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -738,151 +742,6 @@ class PyBuildExt(build_ext):
+@@ -741,151 +745,6 @@ class PyBuildExt(build_ext):
else:
raise ValueError("unknown major BerkeleyDB version", major)
@@ -133,7 +133,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
- print "being ignored (4.6.x must be >= 4.6.21)"
- continue
-
-- if ( (not db_ver_inc_map.has_key(db_ver)) and
+- if ( (db_ver not in db_ver_inc_map) and
- allow_db_ver(db_ver) ):
- # save the include directory with the db.h version
- # (first occurrence only)
@@ -205,7 +205,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
# The sqlite interface
sqlite_setup_debug = False # verbose debug prints from this script?
-@@ -989,25 +848,12 @@ class PyBuildExt(build_ext):
+@@ -992,25 +851,12 @@ class PyBuildExt(build_ext):
# we do not build this one. Otherwise this build will pick up
# the more recent berkeleydb's db.h file first in the include path
# when attempting to compile and it will fail.
@@ -236,7 +236,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
# The standard Unix dbm module:
if platform not in ['cygwin']:
-@@ -1020,7 +866,7 @@ class PyBuildExt(build_ext):
+@@ -1023,7 +869,7 @@ class PyBuildExt(build_ext):
exts.append( Extension('dbm', ['dbmmodule.c'],
define_macros=[('HAVE_NDBM_H',None)],
libraries = ndbm_libs ) )
@@ -245,7 +245,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
gdbm_libs = ['gdbm']
if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
gdbm_libs.append('gdbm_compat')
-@@ -1036,14 +882,11 @@ class PyBuildExt(build_ext):
+@@ -1039,14 +885,11 @@ class PyBuildExt(build_ext):
libraries = gdbm_libs ) )
else:
missing.append('dbm')
@@ -262,7 +262,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
else:
missing.append('dbm')
-@@ -1300,6 +1143,14 @@ class PyBuildExt(build_ext):
+@@ -1304,6 +1147,14 @@ class PyBuildExt(build_ext):
)
libraries = []
@@ -277,7 +277,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
else: # Linux and other unices
macros = dict(
HAVE_SEM_OPEN=1,
-@@ -1900,9 +1751,9 @@ def main():
+@@ -1909,9 +1760,9 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
diff --git a/lang/python26/patches/patch-ao b/lang/python26/patches/patch-ao
index fd680c9a7d1..9367c9e68bf 100644
--- a/lang/python26/patches/patch-ao
+++ b/lang/python26/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
+$NetBSD: patch-ao,v 1.2 2010/05/02 14:09:12 wiz Exp $
---- Lib/distutils/util.py.orig 2006-05-23 17:54:23.000000000 -0400
+--- Lib/distutils/util.py.orig 2010-01-08 23:27:23.000000000 +0000
+++ Lib/distutils/util.py
-@@ -115,6 +115,8 @@ def get_platform ():
- elif machine in ('PowerPC', 'Power_Macintosh'):
- # Pick a sane name for the PPC architecture.
- machine = 'ppc'
+@@ -87,6 +87,8 @@ def get_platform ():
+ m = rel_re.match(release)
+ if m:
+ release = m.group()
+ elif osname[:9] == "dragonfly":
+ release = string.split(release, "-")[0]
-
- return "%s-%s-%s" % (osname, release, machine)
-
+ elif osname[:6] == "darwin":
+ #
+ # For our purposes, we'll assume that the system version from
diff --git a/lang/python26/patches/patch-ar b/lang/python26/patches/patch-ar
deleted file mode 100644
index 820aa18eed7..00000000000
--- a/lang/python26/patches/patch-ar
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
-
---- Mac/BuildScript/scripts/postflight.patch-profile.orig 2006-10-08 14:19:28.000000000 -0400
-+++ 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-01 20:59:45 +0000