summaryrefslogtreecommitdiff
path: root/lang/python24
diff options
context:
space:
mode:
Diffstat (limited to 'lang/python24')
-rw-r--r--lang/python24/Makefile11
-rw-r--r--lang/python24/PLIST.common10
-rw-r--r--lang/python24/distinfo29
-rw-r--r--lang/python24/patches/patch-ab13
-rw-r--r--lang/python24/patches/patch-ac8
-rw-r--r--lang/python24/patches/patch-ae6
-rw-r--r--lang/python24/patches/patch-af23
-rw-r--r--lang/python24/patches/patch-ah22
-rw-r--r--lang/python24/patches/patch-ak8
-rw-r--r--lang/python24/patches/patch-al46
-rw-r--r--lang/python24/patches/patch-am33
-rw-r--r--lang/python24/patches/patch-ao12
-rw-r--r--lang/python24/patches/patch-ap8
-rw-r--r--lang/python24/patches/patch-ar17
14 files changed, 144 insertions, 102 deletions
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 1f1eb1b1177..7e5b0d2692d 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.30 2007/04/22 20:12:43 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2007/06/08 14:16:15 wiz Exp $
#
-DISTNAME= Python-2.4.3
-PKGNAME= python24-2.4.3
-PKGREVISION= 3
+DISTNAME= Python-2.4.4
+PKGNAME= python24-2.4.4
CATEGORIES= lang python
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.4.3/ \
- http://www.python.org/ftp/python/2.4.3/
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.4.4/ \
+ http://www.python.org/ftp/python/2.4.4/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= recht@NetBSD.org
diff --git a/lang/python24/PLIST.common b/lang/python24/PLIST.common
index 108f28c61c6..4f99fff2e5d 100644
--- a/lang/python24/PLIST.common
+++ b/lang/python24/PLIST.common
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST.common,v 1.7 2006/11/03 07:15:41 joerg Exp $
+@comment $NetBSD: PLIST.common,v 1.8 2007/06/08 14:16:15 wiz Exp $
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
bin/smtpd${PY_VER_SUFFIX}.py
include/python${PY_VER_SUFFIX}/Python.h
+include/python${PY_VER_SUFFIX}/Python-ast.h
include/python${PY_VER_SUFFIX}/abstract.h
include/python${PY_VER_SUFFIX}/bitset.h
include/python${PY_VER_SUFFIX}/boolobject.h
@@ -239,6 +240,9 @@ lib/python${PY_VER_SUFFIX}/bsddb/test/test_lock.pyo
lib/python${PY_VER_SUFFIX}/bsddb/test/test_misc.py
lib/python${PY_VER_SUFFIX}/bsddb/test/test_misc.pyc
lib/python${PY_VER_SUFFIX}/bsddb/test/test_misc.pyo
+lib/python${PY_VER_SUFFIX}/bsddb/test/test_pickle.py
+lib/python${PY_VER_SUFFIX}/bsddb/test/test_pickle.pyc
+lib/python${PY_VER_SUFFIX}/bsddb/test/test_pickle.pyo
lib/python${PY_VER_SUFFIX}/bsddb/test/test_queue.py
lib/python${PY_VER_SUFFIX}/bsddb/test/test_queue.pyc
lib/python${PY_VER_SUFFIX}/bsddb/test/test_queue.pyo
@@ -1817,6 +1821,7 @@ lib/python${PY_VER_SUFFIX}/test/sample_doctest.pyo
lib/python${PY_VER_SUFFIX}/test/seq_tests.py
lib/python${PY_VER_SUFFIX}/test/seq_tests.pyc
lib/python${PY_VER_SUFFIX}/test/seq_tests.pyo
+lib/python${PY_VER_SUFFIX}/test/sgml_input.html
lib/python${PY_VER_SUFFIX}/test/sortperf.py
lib/python${PY_VER_SUFFIX}/test/sortperf.pyc
lib/python${PY_VER_SUFFIX}/test/sortperf.pyo
@@ -2726,6 +2731,9 @@ lib/python${PY_VER_SUFFIX}/test/testtar.tar
lib/python${PY_VER_SUFFIX}/test/tf_inherit_check.py
lib/python${PY_VER_SUFFIX}/test/tf_inherit_check.pyc
lib/python${PY_VER_SUFFIX}/test/tf_inherit_check.pyo
+lib/python${PY_VER_SUFFIX}/test/threaded_import_hangers.py
+lib/python${PY_VER_SUFFIX}/test/threaded_import_hangers.pyc
+lib/python${PY_VER_SUFFIX}/test/threaded_import_hangers.pyo
lib/python${PY_VER_SUFFIX}/test/tokenize_tests.txt
lib/python${PY_VER_SUFFIX}/test/xmltests.py
lib/python${PY_VER_SUFFIX}/test/xmltests.pyc
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 710332a7af3..a2eb0864d16 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,22 +1,23 @@
-$NetBSD: distinfo,v 1.23 2006/12/27 20:49:04 joerg Exp $
+$NetBSD: distinfo,v 1.24 2007/06/08 14:16:15 wiz Exp $
-SHA1 (Python-2.4.3.tar.bz2) = d6b81e1aec0045b5acff99676f2abe303da1b384
-RMD160 (Python-2.4.3.tar.bz2) = c86247554975e6c44f91d05e44e68e280d5244dc
-Size (Python-2.4.3.tar.bz2) = 8005915 bytes
+SHA1 (Python-2.4.4.tar.bz2) = 9e0971f93df8acbd947378d0d16a32fcc8897ba2
+RMD160 (Python-2.4.4.tar.bz2) = 4c7b5b70178fe69881b62201ef0bab55037d8708
+Size (Python-2.4.4.tar.bz2) = 8158073 bytes
SHA1 (patch-aa) = 310309e6778fd809b7758efa8db7333ed498e5e5
-SHA1 (patch-ab) = 5402e5b8f0c8e919fdf5c2c4baab0423eb74ada5
-SHA1 (patch-ac) = 97d2dcbc93986dc13d7866025269ae5f15827a24
+SHA1 (patch-ab) = 98b94620baf5d9d5e8681529297124c2d07a901b
+SHA1 (patch-ac) = 4a7a83c9a7bb26254d17907fe15f895276910364
SHA1 (patch-ad) = 44a13d3f9814d471f266ab641024ad74be046ec1
-SHA1 (patch-ae) = ccf62e62129f6f09bf46bb026bfb03d131a3aa1a
-SHA1 (patch-af) = 640a4dab8a96744ade37b3f3a5b0e7b0efabbe59
+SHA1 (patch-ae) = 7e00d719044fa0f205692392d9ebe87146715206
+SHA1 (patch-af) = f468e8c172fc5aaae1bf843898a30c00ec753537
SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
-SHA1 (patch-ah) = 8d56adee024b29e5d538a9fcd1994e38eb2b33c1
+SHA1 (patch-ah) = 154b40eec926a6dcc968c635467807766d1cfaa3
SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
-SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = bc5afee33587598e369799db2a15cbcace90f68b
-SHA1 (patch-am) = a8be9e5d3558c27e38d4323601335ad3bcde1f85
+SHA1 (patch-ak) = 4c6708eb29757179e6855d8fbe78cab92c5a18d5
+SHA1 (patch-al) = 10acea9003d856d2663a4b5bbecbd801eca8c0c8
+SHA1 (patch-am) = 0a240e711ecbdc5c736637e7a9f6446b40960a0d
SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
-SHA1 (patch-ao) = 0e8564ec8157fb5c48c801294213c66ae89a55a1
-SHA1 (patch-ap) = 477adb465ef7ba2d0458cbaec74cd2841dcdea14
+SHA1 (patch-ao) = 1ef48142acd8b591b11013b46048d9145f235843
+SHA1 (patch-ap) = 467f4493291e1a07fd65b092863dc1a8e3832f80
SHA1 (patch-aq) = 10f1964892763e0d1b2345bd053d7929dd4b317e
+SHA1 (patch-ar) = f132998e3e81f3093f9bddf32fe6dcb40fcfa76f
diff --git a/lang/python24/patches/patch-ab b/lang/python24/patches/patch-ab
index e69aa55285d..0d2ab49eb6a 100644
--- a/lang/python24/patches/patch-ab
+++ b/lang/python24/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
+$NetBSD: patch-ab,v 1.2 2007/06/08 14:16:15 wiz Exp $
---- Lib/distutils/command/build_ext.py.orig Sun Dec 5 22:03:11 2004
-+++ Lib/distutils/command/build_ext.py Sun Dec 5 22:03:25 2004
-@@ -485,7 +485,17 @@
+--- 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)
@@ -14,9 +14,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
+ # 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
index a73defdb059..5f5e2bdfca6 100644
--- a/lang/python24/patches/patch-ac
+++ b/lang/python24/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
+$NetBSD: patch-ac,v 1.2 2007/06/08 14:16:16 wiz Exp $
---- Lib/distutils/command/build_scripts.py.orig Sun Dec 5 22:05:11 2004
-+++ Lib/distutils/command/build_scripts.py Sun Dec 5 22:05:34 2004
-@@ -104,7 +104,7 @@
+--- 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"),
diff --git a/lang/python24/patches/patch-ae b/lang/python24/patches/patch-ae
index 3b844fb41c5..ba3058d0eb2 100644
--- a/lang/python24/patches/patch-ae
+++ b/lang/python24/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2006/04/12 20:21:48 drochner Exp $
+$NetBSD: patch-ae,v 1.5 2007/06/08 14:16:16 wiz Exp $
---- Lib/test/test_fcntl.py.orig 2006-02-20 11:32:05.000000000 +0100
+--- 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'):
@@ -10,4 +10,4 @@ $NetBSD: patch-ae,v 1.4 2006/04/12 20:21:48 drochner Exp $
+if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', 'Darwin1.2', 'darwin',
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
'bsdos2', 'bsdos3', 'bsdos4',
- 'openbsd', 'openbsd2', 'openbsd3'):
+ 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
diff --git a/lang/python24/patches/patch-af b/lang/python24/patches/patch-af
index 8863713d67c..cbc5f27e2ef 100644
--- a/lang/python24/patches/patch-af
+++ b/lang/python24/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
+$NetBSD: patch-af,v 1.8 2007/06/08 14:16:16 wiz Exp $
---- Makefile.pre.in.orig 2006-03-13 13:08:41.000000000 +0000
+--- Makefile.pre.in.orig 2006-10-08 17:41:25.000000000 +0000
+++ Makefile.pre.in
@@ -30,6 +30,7 @@ VPATH= @srcdir@
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
SGI_ABI= @SGI_ABI@
-@@ -153,7 +154,6 @@ LIBC= @LIBC@
+@@ -157,7 +158,6 @@ LIBC= @LIBC@
SYSLIBS= $(LIBM) $(LIBC)
SHLIBS= @SHLIBS@
@@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
THREADOBJ= @THREADOBJ@
DLINCLDIR= @DLINCLDIR@
DYNLOADFILE= @DYNLOADFILE@
-@@ -308,10 +308,10 @@ LIBRARY_OBJS= \
+@@ -312,10 +312,10 @@ LIBRARY_OBJS= \
all: $(BUILDPYTHON) oldsharedmods sharedmods
# Build the interpreter
@@ -41,7 +41,7 @@ $NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
platform: $(BUILDPYTHON)
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -351,14 +351,18 @@ $(LIBRARY): $(LIBRARY_OBJS)
+@@ -355,14 +355,17 @@ $(LIBRARY): $(LIBRARY_OBJS)
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
@@ -54,16 +54,15 @@ $NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
fi
libpython$(VERSION).sl: $(LIBRARY_OBJS)
-- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+- $(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
-@@ -437,8 +441,8 @@ Modules/getpath.o: $(srcdir)/Modules/get
+@@ -450,8 +453,8 @@ Modules/getpath.o: $(srcdir)/Modules/get
-DVPATH='"$(VPATH)"' \
-o $@ $(srcdir)/Modules/getpath.c
@@ -74,7 +73,7 @@ $NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-@@ -520,7 +524,7 @@ PYTHON_HEADERS= \
+@@ -533,7 +536,7 @@ PYTHON_HEADERS= \
Include/weakrefobject.h \
pyconfig.h
@@ -83,7 +82,7 @@ $NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
######################################################################
-@@ -629,7 +633,12 @@ altbininstall: $(BUILDPYTHON)
+@@ -655,7 +658,12 @@ altbininstall: $(BUILDPYTHON)
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
fi \
fi; \
@@ -97,7 +96,7 @@ $NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
fi
# Install the manual page
-@@ -747,7 +756,7 @@ $(srcdir)/Lib/$(PLATDIR):
+@@ -773,7 +781,7 @@ $(srcdir)/Lib/$(PLATDIR):
export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
export EXE; EXE="$(BUILDEXE)"; \
@@ -106,7 +105,7 @@ $NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
# Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -792,7 +801,7 @@ libainstall: all
+@@ -818,7 +826,7 @@ libainstall: all
fi; \
fi
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
diff --git a/lang/python24/patches/patch-ah b/lang/python24/patches/patch-ah
index b5e5f3e7fbd..90ab726d296 100644
--- a/lang/python24/patches/patch-ah
+++ b/lang/python24/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht Exp $
+$NetBSD: patch-ah,v 1.3 2007/06/08 14:16:16 wiz Exp $
---- Modules/_cursesmodule.c.orig 2005-06-15 20:48:16.000000000 +0200
-+++ Modules/_cursesmodule.c 2005-10-01 22:25:32.000000000 +0200
-@@ -317,17 +317,9 @@
+--- 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)")
@@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht 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")
-@@ -788,11 +780,7 @@
+@@ -788,11 +780,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
} else if (rtn<=255)
return Py_BuildValue("c", rtn);
else
@@ -32,7 +32,7 @@ $NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht Exp $
}
static PyObject *
-@@ -1950,7 +1938,6 @@
+@@ -1953,7 +1941,6 @@ PyCurses_IntrFlush(PyObject *self, PyObj
return PyCursesCheckERR(intrflush(NULL,ch), "intrflush");
}
@@ -40,7 +40,7 @@ $NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht Exp $
static PyObject *
PyCurses_KeyName(PyObject *self, PyObject *args)
{
-@@ -1969,7 +1956,6 @@
+@@ -1972,7 +1959,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
return PyString_FromString((knp == NULL) ? "" : (char *)knp);
}
@@ -48,7 +48,7 @@ $NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht Exp $
static PyObject *
PyCurses_KillChar(PyObject *self)
-@@ -2414,9 +2400,7 @@
+@@ -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},
@@ -58,7 +58,7 @@ $NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht Exp $
{"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
{"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
{"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2515,9 +2499,7 @@
+@@ -2526,9 +2510,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.2 2005/10/01 21:12:05 recht Exp $
SetDictInt("A_PROTECT", A_PROTECT);
SetDictInt("A_CHARTEXT", A_CHARTEXT);
SetDictInt("A_COLOR", A_COLOR);
-@@ -2589,7 +2571,6 @@
+@@ -2600,7 +2582,6 @@ init_curses(void)
int key;
char *key_n;
char *key_n2;
@@ -76,7 +76,7 @@ $NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht Exp $
for (key=KEY_MIN;key < KEY_MAX; key++) {
key_n = (char *)keyname(key);
if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2613,7 +2594,6 @@
+@@ -2628,7 +2609,6 @@ init_curses(void)
if (key_n2 != key_n)
free(key_n2);
}
diff --git a/lang/python24/patches/patch-ak b/lang/python24/patches/patch-ak
index 0b937941046..04b0a4092d0 100644
--- a/lang/python24/patches/patch-ak
+++ b/lang/python24/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
+$NetBSD: patch-ak,v 1.2 2007/06/08 14:16:16 wiz Exp $
---- Modules/posixmodule.c.orig Wed Oct 13 17:30:56 2004
+--- Modules/posixmodule.c.orig 2006-10-09 19:29:06.000000000 +0000
+++ Modules/posixmodule.c
-@@ -298,7 +298,7 @@ extern int lstat(const char *, struct st
+@@ -314,7 +314,7 @@ extern int lstat(const char *, struct st
#endif
/* Return a dictionary corresponding to the POSIX environment table */
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
/* On Darwin/MacOSX a shared library or framework has no access to
** environ directly, we must obtain it with _NSGetEnviron().
*/
-@@ -316,7 +316,7 @@ convertenviron(void)
+@@ -332,7 +332,7 @@ convertenviron(void)
d = PyDict_New();
if (d == NULL)
return NULL;
diff --git a/lang/python24/patches/patch-al b/lang/python24/patches/patch-al
index 58fbeaa165b..c0a481b1c72 100644
--- a/lang/python24/patches/patch-al
+++ b/lang/python24/patches/patch-al
@@ -1,17 +1,17 @@
-$NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
+$NetBSD: patch-al,v 1.12 2007/06/08 14:16:16 wiz Exp $
---- configure.orig 2006-02-17 08:39:55.000000000 +0000
+--- configure.orig 2006-10-17 16:03:36.000000000 +0000
+++ configure
@@ -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 PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_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 PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX MAINCC 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 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.
-@@ -859,7 +859,9 @@ Optional Packages:
+@@ -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
@@ -22,16 +22,16 @@ $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
--with-suffix=.exe set executable suffix
--with-pydebug build with Py_DEBUG defined
--with-libs='lib1 ...' link against additional libs
-@@ -1482,6 +1484,8 @@ case $ac_sys_system/$ac_sys_release in
+@@ -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.[012345678])
+ 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)
-@@ -1676,258 +1680,6 @@ fi;
+@@ -1746,258 +1750,6 @@ fi;
echo "$as_me:$LINENO: result: $without_gcc" >&5
echo "${ECHO_T}$without_gcc" >&6
@@ -290,7 +290,7 @@ $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
# 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
-@@ -2758,117 +2510,473 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -2828,117 +2580,473 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
'extern "C" void exit (int);' \
'void exit (int);'
do
@@ -840,7 +840,7 @@ $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
# checks for UNIX variants that set C preprocessor variables
ac_ext=c
-@@ -3271,22 +3379,7 @@ echo "$as_me:$LINENO: checking LINKCC" >
+@@ -3341,22 +3449,7 @@ echo "$as_me:$LINENO: checking LINKCC" >
echo $ECHO_N "checking LINKCC... $ECHO_C" >&6
if test -z "$LINKCC"
then
@@ -864,7 +864,7 @@ $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
case $ac_sys_system in
AIX*)
exp_extra="\"\""
-@@ -3413,15 +3506,10 @@ _ACEOF
+@@ -3483,15 +3576,10 @@ _ACEOF
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
@@ -881,7 +881,7 @@ $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-@@ -3837,7 +3925,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
+@@ -3907,7 +3995,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
;;
# is there any other compiler on Darwin besides gcc?
Darwin*)
@@ -892,10 +892,10 @@ $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
+ else
+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
+ fi
- ;;
- esac
- ;;
-@@ -10373,12 +10466,12 @@ then
+ 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
@@ -909,17 +909,17 @@ $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
- Linux*|GNU*) LDSHARED='$(CC) -shared';;
+ Linux*|GNU*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";;
BSD/OS*/4*) LDSHARED="gcc -shared";;
- OpenBSD*|FreeBSD*)
+ FreeBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -10388,6 +10481,7 @@ then
- LDSHARED="ld -Bshareable ${LDFLAGS}"
+@@ -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'
-@@ -10421,6 +10515,7 @@ then
+@@ -10534,6 +10628,7 @@ then
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
@@ -927,7 +927,7 @@ $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
-@@ -10478,6 +10573,7 @@ then
+@@ -10591,6 +10686,7 @@ then
then
LINKFORSHARED="-Wl,--export-dynamic"
fi;;
@@ -935,10 +935,10 @@ $NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -21203,15 +21299,15 @@ s,@SGI_ABI@,$SGI_ABI,;t t
- s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
+@@ -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
diff --git a/lang/python24/patches/patch-am b/lang/python24/patches/patch-am
index 330bda371e1..0da65dc38b1 100644
--- a/lang/python24/patches/patch-am
+++ b/lang/python24/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.3 2006/04/12 20:21:48 drochner Exp $
+$NetBSD: patch-am,v 1.4 2007/06/08 14:16:16 wiz Exp $
---- setup.py.orig 2006-03-23 20:07:46.000000000 +0100
+--- setup.py.orig 2006-10-08 17:41:25.000000000 +0000
+++ setup.py
@@ -15,7 +15,7 @@ from distutils.command.install import in
from distutils.command.install_lib import install_lib
@@ -30,7 +30,7 @@ $NetBSD: patch-am,v 1.3 2006/04/12 20:21:48 drochner Exp $
# Add paths to popular package managers on OS X/darwin
if sys.platform == "darwin":
-@@ -456,9 +462,7 @@ class PyBuildExt(build_ext):
+@@ -485,9 +491,7 @@ class PyBuildExt(build_ext):
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
@@ -41,7 +41,7 @@ $NetBSD: patch-am,v 1.3 2006/04/12 20:21:48 drochner Exp $
)
if ssl_incs is not None:
krb5_h = find_file('krb5.h', inc_dirs,
-@@ -466,9 +470,7 @@ class PyBuildExt(build_ext):
+@@ -495,9 +499,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -52,7 +52,7 @@ $NetBSD: patch-am,v 1.3 2006/04/12 20:21:48 drochner Exp $
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -486,151 +488,52 @@ class PyBuildExt(build_ext):
+@@ -515,168 +517,51 @@ class PyBuildExt(build_ext):
# similar functionality (but slower of course) implemented in Python.
# Sleepycat Berkeley DB interface. http://www.sleepycat.com
@@ -95,8 +95,25 @@ $NetBSD: patch-am,v 1.3 2006/04/12 20:21:48 drochner Exp $
- 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:
@@ -244,7 +261,7 @@ $NetBSD: patch-am,v 1.3 2006/04/12 20:21:48 drochner Exp $
# The standard Unix dbm module:
if platform not in ['cygwin']:
-@@ -643,6 +546,13 @@ class PyBuildExt(build_ext):
+@@ -689,6 +574,13 @@ class PyBuildExt(build_ext):
exts.append( Extension('dbm', ['dbmmodule.c'],
define_macros=[('HAVE_NDBM_H',None)],
libraries = ndbm_libs ) )
@@ -258,7 +275,7 @@ $NetBSD: patch-am,v 1.3 2006/04/12 20:21:48 drochner Exp $
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'],
-@@ -1186,8 +1096,8 @@ def main():
+@@ -1224,8 +1116,8 @@ def main():
ext_modules=[Extension('struct', ['structmodule.c'])],
# Scripts to install
diff --git a/lang/python24/patches/patch-ao b/lang/python24/patches/patch-ao
index d8fb9624e8f..e228481c37f 100644
--- a/lang/python24/patches/patch-ao
+++ b/lang/python24/patches/patch-ao
@@ -1,11 +1,11 @@
-$NetBSD: patch-ao,v 1.1 2006/04/13 02:26:54 joerg Exp $
+$NetBSD: patch-ao,v 1.2 2007/06/08 14:16:16 wiz Exp $
---- Lib/distutils/util.py.orig 2004-07-18 06:16:08.000000000 +0000
+--- Lib/distutils/util.py.orig 2006-10-08 17:41:25.000000000 +0000
+++ Lib/distutils/util.py
-@@ -66,6 +66,8 @@ def get_platform ():
- m = rel_re.match(release)
- if m:
- release = m.group()
+@@ -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]
diff --git a/lang/python24/patches/patch-ap b/lang/python24/patches/patch-ap
index c3ba93de1fb..dc06ff36c9c 100644
--- a/lang/python24/patches/patch-ap
+++ b/lang/python24/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1 2006/06/20 13:29:01 tron Exp $
+$NetBSD: patch-ap,v 1.2 2007/06/08 14:16:17 wiz Exp $
---- Modules/socketmodule.c.orig 2006-02-20 09:42:37.000000000 +0000
-+++ Modules/socketmodule.c 2006-06-20 14:23:33.000000000 +0100
-@@ -341,7 +341,8 @@
+--- 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
diff --git a/lang/python24/patches/patch-ar b/lang/python24/patches/patch-ar
new file mode 100644
index 00000000000..1ce54284cac
--- /dev/null
+++ b/lang/python24/patches/patch-ar
@@ -0,0 +1,17 @@
+$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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 17:03:10 +0000