pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Update to Python 2.3.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/954e0748afe2
branches: trunk
changeset: 464423:954e0748afe2
user: recht <recht%pkgsrc.org@localhost>
date: Mon Dec 08 21:13:56 2003 +0000
description:
Update to Python 2.3.2
Changes in Python:
Quite a few fixes.. See NEWS for details.
Changes in the pkg:
- add FreeBSD patches from the FreeBSD port
- add fix for a fatal bug in type's GC handling causes segfaults
(via FreeBSD port)
see http://cvs.sourceforge.net/viewcvs.py/python/python/dist/src/Misc/NEWS?r1=1.831.4.75&r2=1.831.4.76&diff_format=u
- always build the db 1.85 module (on all platforms)
diffstat:
lang/python/srcdist.mk | 8 +-
lang/python23-pth/Makefile | 72 +++++++++--
lang/python23-pth/PLIST.Linux | 4 +-
lang/python23-pth/PLIST.NetBSD | 3 +-
lang/python23-pth/PLIST.common | 13 +-
lang/python23-pth/distinfo | 31 ++--
lang/python23-pth/patches/patch-aa | 88 +------------
lang/python23-pth/patches/patch-ab | 26 ++++
lang/python23-pth/patches/patch-ac | 13 ++
lang/python23-pth/patches/patch-ad | 23 +++
lang/python23-pth/patches/patch-ae | 34 +---
lang/python23-pth/patches/patch-af | 13 ++
lang/python23-pth/patches/patch-ag | 223 +++++++++++++++++++++++++++++++++++-
lang/python23-pth/patches/patch-ah | 31 +++-
lang/python23-pth/patches/patch-ai | 39 +++---
lang/python23-pth/patches/patch-aj | 209 ++++++++++++++++++++++++++++++++-
lang/python23-pth/patches/patch-ak | 74 ++++++++++-
lang/python23-pth/patches/patch-al | 67 ++++------
lang/python23-pth/patches/patch-am | 143 +++++++++++++++++++---
lang/python23-pth/patches/patch-ba | 32 -----
lang/python23-pth/patches/patch-bb | 13 --
lang/python23-pth/patches/patch-bc | 21 ---
lang/python23/Makefile | 74 +++++++++---
lang/python23/PLIST.Linux | 8 +-
lang/python23/PLIST.NetBSD | 7 +-
lang/python23/PLIST.common | 17 ++-
lang/python23/PLIST.common_end | 2 +-
lang/python23/distinfo | 26 ++-
lang/python23/patches/patch-aa | 81 -------------
lang/python23/patches/patch-ab | 26 ++++
lang/python23/patches/patch-ac | 13 ++
lang/python23/patches/patch-ad | 23 +++
lang/python23/patches/patch-ae | 34 +---
lang/python23/patches/patch-af | 13 ++
lang/python23/patches/patch-ag | 216 +++++++++++++++++++++++++++++++++++
lang/python23/patches/patch-ah | 22 +++
lang/python23/patches/patch-ai | 39 +++---
lang/python23/patches/patch-aj | 209 ++++++++++++++++++++++++++++++++-
lang/python23/patches/patch-ak | 68 +++++++++++
lang/python23/patches/patch-al | 62 +++-------
lang/python23/patches/patch-am | 143 +++++++++++++++++++---
lang/python23/patches/patch-bb | 13 --
lang/python23/patches/patch-bc | 21 ---
43 files changed, 1675 insertions(+), 622 deletions(-)
diffs (truncated from 2699 to 300 lines):
diff -r 4c3fa4ef9e13 -r 954e0748afe2 lang/python/srcdist.mk
--- a/lang/python/srcdist.mk Mon Dec 08 20:25:51 2003 +0000
+++ b/lang/python/srcdist.mk Mon Dec 08 21:13:56 2003 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: srcdist.mk,v 1.8 2003/08/04 08:15:47 drochner Exp $
+# $NetBSD: srcdist.mk,v 1.9 2003/12/08 21:13:56 recht Exp $
.include "../../lang/python/pyversion.mk"
.if ${_PYTHON_VERSION} == "23" || ${_PYTHON_VERSION} == "23pth"
-DISTNAME= Python-2.3
+DISTNAME= Python-2.3.2
EXTRACT_SUFX= .tgz
DISTINFO_FILE= ${.CURDIR}/../../lang/python23/distinfo
PATCHDIR= ${.CURDIR}/../../lang/python23/patches
-PYSUBDIR= Python-2.3
+PYSUBDIR= Python-2.3.2
WRKSRC= ${WRKDIR}/${PYSUBDIR}
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.3/
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.2/
.elif ${_PYTHON_VERSION} == "22" || ${_PYTHON_VERSION} == "22pth"
diff -r 4c3fa4ef9e13 -r 954e0748afe2 lang/python23-pth/Makefile
--- a/lang/python23-pth/Makefile Mon Dec 08 20:25:51 2003 +0000
+++ b/lang/python23-pth/Makefile Mon Dec 08 21:13:56 2003 +0000
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.10 2003/11/17 00:11:43 recht Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/08 21:13:56 recht Exp $
#
-DISTNAME= Python-2.3
-PKGNAME= python23-pth-2.3
-PKGREVISION= 3
+DISTNAME= Python-2.3.2
+PKGNAME= python23-pth-2.3.2
CATEGORIES= lang
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.3/
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.2/
EXTRACT_SUFX= .tgz
MAINTAINER= recht%NetBSD.org@localhost
HOMEPAGE= http://www.python.org/
COMMENT= Interpreted, interactive, object-oriented programming language
-USE_BUILDLINK2= YES
-GNU_CONFIGURE= YES
-
+USE_DB185= yes
+USE_BUILDLINK2= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= OPT="${CFLAGS}"
+UNLIMIT_RESOURCES+= stacksize
PTHREAD_OPTS= require
.include "../../mk/pthread.buildlink2.mk"
@@ -25,15 +25,11 @@
.endif
INSTALL_TARGET= altinstall
+TEST_TARGET= test
post-extract:
${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc2p3
-# XXX should be done by the Python install process
-post-install:
- ${LN} -s ${PREFIX}/lib/libpython2p3.so.1.0 \
- ${PREFIX}/lib/libpython2p3.so
-
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
@@ -41,10 +37,11 @@
.endif
.if ${OPSYS} == "Darwin" || ${OPSYS} == "IRIX"
-PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}
+PY_PLATNAME=${LOWER_OPSYS}
.else
-PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
+PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
.endif
+PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME}
# the dl module isn't built for 64 bit archs and Darwin
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \
@@ -55,12 +52,53 @@
PLIST_SUBST+= DLMODULE=
.endif
-.if ${OPSYS} != "NetBSD"
+X86_SUBST= "@comment "
+OSSAUDIODEV_SUBST= "@comment "
+.if ${MACHINE_ARCH} == "i386"
+# activate X86_ONLY modules
+X86_SUBST=
+# ossaudiodev is only available on x86 for the following platforms
+.if ${PY_PLATNAME} == "linux2" || ${PY_PLATNAME} == "freebsd4" \
+ || ${PY_PLATNAME} == "freebsd5"
+OSSAUDIODEV_SUBST=
+.endif
+.endif
+PLIST_SUBST+= X86_ONLY=${X86_SUBST}
+PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST}
+
+# ensure that the bsddb185 module is build on all platforms
.include "../../databases/db/buildlink2.mk"
-CPPFLAGS+= -I${BUILDLINK_PREFIX.db}/include/db2
+
+SUBST_CLASSES+= setup
+SUBST_MESSAGE.setup= "Fixing paths for db 1.85."
+SUBST_STAGE.setup= post-patch
+SUBST_FILES.setup= setup.py
+SUBST_SED.setup= -e 's,%%DB185_H%%,${DB185_H},g'
+SUBST_SED.setup+= -e 's,%%DB185_INCS%%,${DB185_INCS},g'
+SUBST_SED.setup+= -e 's,%%DB185_LIBS%%,${DB185_LIBS},g'
+SUBST_SED.setup+= -e 's,%%DB185_LIBDIR%%,${DB185_LIBDIR},g'
+
+DB185_LIBDIR= ${BUILDLINK_PREFIX.db}/lib
+
+.if !empty(BUILDLINK_CPPFLAGS.db)
+LDFLAGS+= ${BUILDLINK_LDFLAGS.db}
+DBINCDIR= ${BUILDLINK_CPPFLAGS.db:S/-I//}
+DB185_INCS= ${DBINCDIR}
+DB185_LIBS= ${BUILDLINK_LIBS.db:S/-l//}
+
+.if ${_NEED_DB2} == "YES"
+DB185_H= ${DBINCDIR}/db_185.h
+.else
+DB185_H= ${DBINCDIR}/db.h
+.endif
+.else
+DB185_H= /usr/include/db.h
+DB185_INCS= /usr/include
+DB185_LIBS=
.endif
.include "../../archivers/bzip2/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 4c3fa4ef9e13 -r 954e0748afe2 lang/python23-pth/PLIST.Linux
--- a/lang/python23-pth/PLIST.Linux Mon Dec 08 20:25:51 2003 +0000
+++ b/lang/python23-pth/PLIST.Linux Mon Dec 08 21:13:56 2003 +0000
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2003/08/18 20:57:14 recht Exp $
-lib/python2p3/lib-dynload/_bsddb.so
+@comment $NetBSD: PLIST.Linux,v 1.2 2003/12/08 21:13:56 recht Exp $
lib/python2p3/lib-dynload/${LOWER_OPSYS}audiodev.so
-lib/python2p3/lib-dynload/ossaudiodev.so
lib/python2p3/plat-${LOWER_OPSYS}2/CDROM.py
lib/python2p3/plat-${LOWER_OPSYS}2/CDROM.pyc
lib/python2p3/plat-${LOWER_OPSYS}2/CDROM.pyo
diff -r 4c3fa4ef9e13 -r 954e0748afe2 lang/python23-pth/PLIST.NetBSD
--- a/lang/python23-pth/PLIST.NetBSD Mon Dec 08 20:25:51 2003 +0000
+++ b/lang/python23-pth/PLIST.NetBSD Mon Dec 08 21:13:56 2003 +0000
@@ -1,2 +1,1 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2003/08/18 20:57:14 recht Exp $
-lib/python2p3/lib-dynload/bsddb185.so
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2003/12/08 21:13:56 recht Exp $
diff -r 4c3fa4ef9e13 -r 954e0748afe2 lang/python23-pth/PLIST.common
--- a/lang/python23-pth/PLIST.common Mon Dec 08 20:25:51 2003 +0000
+++ b/lang/python23-pth/PLIST.common Mon Dec 08 21:13:56 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2003/11/17 00:11:43 recht Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2003/12/08 21:13:56 recht Exp $
bin/pydoc2p3
bin/python2p3
include/python2p3/Python.h
@@ -1125,7 +1125,9 @@
lib/python2p3/lib-dynload/_testcapi.so
lib/python2p3/lib-dynload/_weakref.so
lib/python2p3/lib-dynload/array.so
+${X86_ONLY}lib/python2p3/lib-dynload/audioop.so
lib/python2p3/lib-dynload/binascii.so
+lib/python2p3/lib-dynload/bsddb185.so
lib/python2p3/lib-dynload/bz2.so
lib/python2p3/lib-dynload/cPickle.so
lib/python2p3/lib-dynload/cStringIO.so
@@ -1136,6 +1138,7 @@
${DLMODULE}lib/python2p3/lib-dynload/dl.so
lib/python2p3/lib-dynload/fcntl.so
lib/python2p3/lib-dynload/grp.so
+${X86_ONLY}lib/python2p3/lib-dynload/imageop.so
lib/python2p3/lib-dynload/itertools.so
lib/python2p3/lib-dynload/math.so
lib/python2p3/lib-dynload/md5.so
@@ -1147,6 +1150,8 @@
lib/python2p3/lib-dynload/pwd.so
lib/python2p3/lib-dynload/regex.so
lib/python2p3/lib-dynload/resource.so
+${X86_ONLY}lib/python2p3/lib-dynload/rgbimg.so
+${OSSAUDIODEV}lib/python2p3/lib-dynload/ossaudiodev.so
lib/python2p3/lib-dynload/rotor.so
lib/python2p3/lib-dynload/select.so
lib/python2p3/lib-dynload/sha.so
@@ -1361,13 +1366,13 @@
lib/python2p3/pipes.py
lib/python2p3/pipes.pyc
lib/python2p3/pipes.pyo
+lib/python2p3/pkgutil.py
+lib/python2p3/pkgutil.pyc
+lib/python2p3/pkgutil.pyo
lib/python2p3/plat-${PY_PLATNAME}/IN.py
lib/python2p3/plat-${PY_PLATNAME}/IN.pyc
lib/python2p3/plat-${PY_PLATNAME}/IN.pyo
lib/python2p3/plat-${PY_PLATNAME}/regen
-lib/python2p3/pkgutil.py
-lib/python2p3/pkgutil.pyc
-lib/python2p3/pkgutil.pyo
lib/python2p3/platform.py
lib/python2p3/platform.pyc
lib/python2p3/platform.pyo
diff -r 4c3fa4ef9e13 -r 954e0748afe2 lang/python23-pth/distinfo
--- a/lang/python23-pth/distinfo Mon Dec 08 20:25:51 2003 +0000
+++ b/lang/python23-pth/distinfo Mon Dec 08 21:13:56 2003 +0000
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.7 2003/09/14 14:04:32 recht Exp $
+$NetBSD: distinfo,v 1.8 2003/12/08 21:13:56 recht Exp $
-SHA1 (Python-2.3.tgz) = ce5fbde09be17ea5dddd4baa62d2b90e06e7e5c1
-Size (Python-2.3.tgz) = 8436880 bytes
-SHA1 (patch-aa) = c00652fd038a881c1bb07f871d820b93651ddc54
-SHA1 (patch-ae) = ff045dc1b42ce8a4fe5e64fde72469e1be8dab28
-SHA1 (patch-ag) = c11f521d3bd3172289b67224ad4b07d861d8fe18
-SHA1 (patch-ah) = 9bc1b5bf1ee0e76fc19bd582299bf70ee3a10535
-SHA1 (patch-ai) = 75d30db64343afcf2f0bcfe8e73dc9948acb237e
-SHA1 (patch-aj) = e2291bde6a59fc0441bc7c87c0946b7f5601aa5c
-SHA1 (patch-ak) = 341e7dd750e46463f6174676e06fd3a847efd311
-SHA1 (patch-al) = 5614ef46970b5eea2bfdcfc64d1018aa0f4a6e85
-SHA1 (patch-am) = 20235b2febbc2811ca5f9b54958a4064722431ed
-SHA1 (patch-ba) = 9be4490e38c895dfc5041af1889ca7ab1c6d8bd9
-SHA1 (patch-bb) = 1390c5f0bcd75f5f3f1b9949921b555e1021954f
-SHA1 (patch-bc) = 0a83a90aea8a1414b43fa3506912ab09aafbc3c0
+SHA1 (Python-2.3.2.tgz) = 2176d1c42802ea2f9d430f23f1d578e00336c6aa
+Size (Python-2.3.2.tgz) = 8459427 bytes
+SHA1 (patch-aa) = 7c27e64068185a767bd1371851c33952711de854
+SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
+SHA1 (patch-ac) = 30c16b3770fed3324a38c18426d9d7758e8db889
+SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
+SHA1 (patch-ae) = 544af90b9b7c5eb5cbad0ba0cefa3d9496b5efe3
+SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14
+SHA1 (patch-ag) = e2bf14e5858b4273148f1feaf46d5fbb325640a9
+SHA1 (patch-ah) = 6e44407c89edcee59b1f674783544884e96cf101
+SHA1 (patch-ai) = 6299b36119927e87a9a1ea7ef1859ec5f833d0b1
+SHA1 (patch-aj) = 91c1679f8109922c30e4d25fe6f99c856dc6e3d5
+SHA1 (patch-ak) = cabeb3d84102bd8be8c109986f7afb8fc147cd5a
+SHA1 (patch-al) = 1f4353aa56de3bf426c8424bf7b24bbe35e388d4
+SHA1 (patch-am) = 066fc423e4d75ad0d62759b4af2a40f798dfaebf
diff -r 4c3fa4ef9e13 -r 954e0748afe2 lang/python23-pth/patches/patch-aa
--- a/lang/python23-pth/patches/patch-aa Mon Dec 08 20:25:51 2003 +0000
+++ b/lang/python23-pth/patches/patch-aa Mon Dec 08 21:13:56 2003 +0000
@@ -1,81 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/08/18 20:57:14 recht Exp $
+$NetBSD: patch-aa,v 1.3 2003/12/08 21:13:56 recht Exp $
---- setup.py.orig 2003-07-10 14:48:39.000000000 +0200
-+++ setup.py 2003-08-18 21:19:14.000000000 +0200
-@@ -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 = ["_curses", "_curses_panel", "_tkinter", "gdbm", "mpz", "pyexpat", "readline"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -240,9 +240,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)
-
- # fink installs lots of goodies in /sw/... - make sure we
- # check there
-@@ -396,13 +402,13 @@
- # These represent audio samples or images as strings:
+--- Include/patchlevel.h.orig 2003-10-01 08:47:48.000000000 +0200
++++ Include/patchlevel.h
+@@ -26,7 +26,7 @@
+ #define PY_RELEASE_SERIAL 0
- # Disabled on 64-bit platforms
-- if sys.maxint != 9223372036854775807L:
-+# if sys.maxint != 9223372036854775807L:
Home |
Main Index |
Thread Index |
Old Index