summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/python24-pth/Makefile8
-rw-r--r--lang/python24/Makefile9
-rw-r--r--lang/python24/distinfo17
-rw-r--r--lang/python24/patches/patch-ae13
-rw-r--r--lang/python24/patches/patch-af4
-rw-r--r--lang/python24/patches/patch-ah22
-rw-r--r--lang/python24/patches/patch-al26
-rw-r--r--lang/python24/patches/patch-an18
8 files changed, 46 insertions, 71 deletions
diff --git a/lang/python24-pth/Makefile b/lang/python24-pth/Makefile
index 690a2c8db7a..3174068ab76 100644
--- a/lang/python24-pth/Makefile
+++ b/lang/python24-pth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/07/03 19:48:22 recht Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/01 21:12:05 recht Exp $
#
-DISTNAME= Python-2.4.1
-PKGNAME= python24-pth-2.4.1
+DISTNAME= Python-2.4.2
+PKGNAME= python24-pth-2.4.2
CATEGORIES= lang python
MASTER_SITES= # empty
DISTFILES= # empty
@@ -11,7 +11,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.python.org/
COMMENT= Interpreted, interactive, object-oriented programming language
-DEPENDS+= python24>=2.4:../../lang/python24
+DEPENDS+= python24>=2.4.2:../../lang/python24
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 330a95b9047..6582a2c8f60 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2005/09/01 13:14:35 darcy Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/01 21:12:05 recht Exp $
#
-DISTNAME= Python-2.4.1
-PKGNAME= python24-2.4.1
-PKGREVISION= 3
+DISTNAME= Python-2.4.2
+PKGNAME= python24-2.4.2
CATEGORIES= lang python
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.4.1/
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.4.2/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= recht@NetBSD.org
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 8a9bf68d498..71145704b3f 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.13 2005/08/31 12:13:02 darcy Exp $
+$NetBSD: distinfo,v 1.14 2005/10/01 21:12:05 recht Exp $
-SHA1 (Python-2.4.1.tar.bz2) = a4b58cf31359198dbb123b789440bcaf9052d198
-RMD160 (Python-2.4.1.tar.bz2) = 8c682c9af21666cc6b8eaa08f8719eed231ab3ad
-Size (Python-2.4.1.tar.bz2) = 7847025 bytes
+SHA1 (Python-2.4.2.tar.bz2) = a1f1c466fb4a06f612faac75dbaa8bc81e609c2e
+RMD160 (Python-2.4.2.tar.bz2) = c511d2b76b5394742d285e71570a2bcd3c1fa871
+Size (Python-2.4.2.tar.bz2) = 7853169 bytes
SHA1 (patch-aa) = 310309e6778fd809b7758efa8db7333ed498e5e5
SHA1 (patch-ab) = 5402e5b8f0c8e919fdf5c2c4baab0423eb74ada5
SHA1 (patch-ac) = 97d2dcbc93986dc13d7866025269ae5f15827a24
SHA1 (patch-ad) = 0fa1c66fa0ad9ce345c44b13fd3897975837c72e
-SHA1 (patch-ae) = b220db11ed4db2ef6ec34be8a10bd054660a3138
-SHA1 (patch-af) = 849efb1de808d9f8cd100252a209c707fa6ba34b
+SHA1 (patch-ae) = e5dfe40afe9b1e4354a273f4ce76340f1440e1ee
+SHA1 (patch-af) = 485eaa5cc5bd0f9f1cda1815fa6d7a068bd0820c
SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
-SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8
+SHA1 (patch-ah) = 8d56adee024b29e5d538a9fcd1994e38eb2b33c1
SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = 258a60e97ce6c9fcfa5b6321fad1db270f1f99ad
+SHA1 (patch-al) = 5aa766853c353a9ceae4513dc896a1d13a548c6c
SHA1 (patch-am) = 9ce50340d76e8612384f94d4b03414d3f38e35d3
-SHA1 (patch-an) = 6bbcc9c973e40a1cd3d07fdb99c9fb599c47a610
diff --git a/lang/python24/patches/patch-ae b/lang/python24/patches/patch-ae
index 92cefa19783..b5f0b9e68a9 100644
--- a/lang/python24/patches/patch-ae
+++ b/lang/python24/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2005/07/29 13:27:27 drochner Exp $
+$NetBSD: patch-ae,v 1.3 2005/10/01 21:12:05 recht Exp $
---- Lib/test/test_fcntl.py.orig Wed Aug 18 17:13:41 2004
-+++ Lib/test/test_fcntl.py
-@@ -20,11 +20,11 @@ else:
+--- Lib/test/test_fcntl.py.orig 2005-04-04 17:28:18.000000000 +0200
++++ Lib/test/test_fcntl.py 2005-10-01 22:24:49.000000000 +0200
+@@ -20,7 +20,7 @@
if sys.platform.startswith('atheos'):
start_len = "qq"
@@ -11,8 +11,3 @@ $NetBSD: patch-ae,v 1.2 2005/07/29 13:27:27 drochner Exp $
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
'bsdos2', 'bsdos3', 'bsdos4',
'openbsd', 'openbsd2', 'openbsd3'):
-- lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0)
-+ lockdata = struct.pack('qqihh', 0, 0, 0, fcntl.F_WRLCK, 0)
- elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
- lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
- elif sys.platform in ['os2emx']:
diff --git a/lang/python24/patches/patch-af b/lang/python24/patches/patch-af
index 94d5f1c4120..80d5c1f2932 100644
--- a/lang/python24/patches/patch-af
+++ b/lang/python24/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2005/08/19 05:22:04 grant Exp $
+$NetBSD: patch-af,v 1.4 2005/10/01 21:12:05 recht Exp $
--- Makefile.pre.in.orig 2005-03-29 09:23:01.000000000 +1000
+++ Makefile.pre.in
@@ -36,7 +36,7 @@ $NetBSD: patch-af,v 1.3 2005/08/19 05:22:04 grant Exp $
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
-+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.1 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
++ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.2 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(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
diff --git a/lang/python24/patches/patch-ah b/lang/python24/patches/patch-ah
index 02db0d0637d..b5e5f3e7fbd 100644
--- a/lang/python24/patches/patch-ah
+++ b/lang/python24/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
+$NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht Exp $
---- Modules/_cursesmodule.c.orig Wed Aug 4 16:33:28 2004
-+++ Modules/_cursesmodule.c
-@@ -313,17 +313,9 @@ Window_OneArgNoReturnFunction(wattroff,
+--- 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 @@
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.1.1.1 2004/12/05 23:27:51 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")
-@@ -784,11 +776,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
+@@ -788,11 +780,7 @@
} else if (rtn<=255)
return Py_BuildValue("c", rtn);
else
@@ -32,7 +32,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
}
static PyObject *
-@@ -1946,7 +1934,6 @@ PyCurses_IntrFlush(PyObject *self, PyObj
+@@ -1950,7 +1938,6 @@
return PyCursesCheckERR(intrflush(NULL,ch), "intrflush");
}
@@ -40,7 +40,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
static PyObject *
PyCurses_KeyName(PyObject *self, PyObject *args)
{
-@@ -1965,7 +1952,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
+@@ -1969,7 +1956,6 @@
return PyString_FromString((knp == NULL) ? "" : (char *)knp);
}
@@ -48,7 +48,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
static PyObject *
PyCurses_KillChar(PyObject *self)
-@@ -2410,9 +2396,7 @@ static PyMethodDef PyCurses_methods[] =
+@@ -2414,9 +2400,7 @@
{"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.1.1.1 2004/12/05 23:27:51 recht Exp $
{"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
{"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
{"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2511,9 +2495,7 @@ init_curses(void)
+@@ -2515,9 +2499,7 @@
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 2004/12/05 23:27:51 recht Exp $
SetDictInt("A_PROTECT", A_PROTECT);
SetDictInt("A_CHARTEXT", A_CHARTEXT);
SetDictInt("A_COLOR", A_COLOR);
-@@ -2585,7 +2567,6 @@ init_curses(void)
+@@ -2589,7 +2571,6 @@
int key;
char *key_n;
char *key_n2;
@@ -76,7 +76,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2004/12/05 23:27:51 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)
-@@ -2609,7 +2590,6 @@ init_curses(void)
+@@ -2613,7 +2594,6 @@
if (key_n2 != key_n)
free(key_n2);
}
diff --git a/lang/python24/patches/patch-al b/lang/python24/patches/patch-al
index adc3a4d620f..be5899779ce 100644
--- a/lang/python24/patches/patch-al
+++ b/lang/python24/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
+$NetBSD: patch-al,v 1.8 2005/10/01 21:12:05 recht Exp $
---- configure.orig 2005-03-29 01:23:02.000000000 +0200
-+++ configure 2005-05-09 21:14:53.000000000 +0200
+--- configure.orig 2005-08-07 23:08:42.000000000 +0200
++++ configure 2005-10-01 22:26:48.000000000 +0200
@@ -1482,6 +1482,8 @@
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
OpenBSD/2.* | OpenBSD/3.[0123456])
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
# of union __?sigval. Reported by Stuart Bishop.
SunOS/5.6)
-@@ -3402,7 +3404,7 @@
+@@ -3404,7 +3406,7 @@
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
@@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3826,7 +3828,12 @@
+@@ -3828,7 +3830,12 @@
;;
# is there any other compiler on Darwin besides gcc?
Darwin*)
@@ -34,7 +34,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
;;
esac
;;
-@@ -10186,7 +10193,10 @@
+@@ -10188,7 +10195,10 @@
case "$enable_toolbox_glue" in
yes)
extra_machdep_objs="Python/mactoolboxglue.o"
@@ -46,7 +46,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
cat >>confdefs.h <<\_ACEOF
#define USE_TOOLBOX_OBJECT_GLUE 1
-@@ -10332,7 +10342,7 @@
+@@ -10334,7 +10344,7 @@
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework. Ignore undefined symbols, assuming they come from Python
@@ -55,7 +55,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
fi ;;
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -10342,8 +10352,8 @@
+@@ -10344,8 +10354,8 @@
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -66,7 +66,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -10362,12 +10372,12 @@
+@@ -10364,12 +10374,12 @@
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -82,7 +82,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
BSD/OS*/4*) LDSHARED="gcc -shared";;
OpenBSD*|FreeBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -10376,7 +10386,8 @@
+@@ -10378,7 +10388,8 @@
else
LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;;
@@ -92,7 +92,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then LDSHARED='$(CC) -shared'
-@@ -10408,7 +10419,9 @@
+@@ -10410,7 +10421,9 @@
fi;;
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
@@ -103,7 +103,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
-@@ -10461,11 +10474,12 @@
+@@ -10463,11 +10476,12 @@
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -117,7 +117,7 @@ $NetBSD: patch-al,v 1.7 2005/08/31 12:13:02 darcy Exp $
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -14335,6 +14349,7 @@
+@@ -14337,6 +14351,7 @@
/* end confdefs.h. */
#include "confdefs.h"
diff --git a/lang/python24/patches/patch-an b/lang/python24/patches/patch-an
deleted file mode 100644
index ca408ff071b..00000000000
--- a/lang/python24/patches/patch-an
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-an,v 1.5 2005/08/23 20:55:46 darcy Exp $
-
---- Lib/weakref.py.orig 2004-08-31 07:38:12.000000000 -0400
-+++ Lib/weakref.py
-@@ -43,12 +43,12 @@ class WeakValueDictionary(UserDict.UserD
- # way in).
-
- def __init__(self, *args, **kw):
-- UserDict.UserDict.__init__(self, *args, **kw)
- def remove(wr, selfref=ref(self)):
- self = selfref()
- if self is not None:
- del self.data[wr.key]
- self._remove = remove
-+ UserDict.UserDict.__init__(self, *args, **kw)
-
- def __getitem__(self, key):
- o = self.data[key]()
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-08 18:23:36 +0000