diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2003-10-29 21:31:13 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2003-10-29 21:31:13 +0000 |
| commit | 040577c1f708795f24bc28e7ccae630dacc0e76b (patch) | |
| tree | 79cc960dfc84613c3f0efb0fb08fe4297a2575ca | |
| parent | bb6e31ee1e16c35661406a863f580e866708bb66 (diff) | |
| download | ports-040577c1f708795f24bc28e7ccae630dacc0e76b.tar.gz ports-040577c1f708795f24bc28e7ccae630dacc0e76b.zip | |
Notes
56 files changed, 531 insertions, 290 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index 0742cbe1bfd7..a5be4451278e 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -31,7 +31,12 @@ Python_Include_MAINTAINER= perky@FreeBSD.org # are built from sources contained in the Python # distribution. # -# PYTHON_SITE_SUBDIR: The ${MASTER_SITE_SUBDIR} for your python version. +# PYTHON_MASTER_SITES: The ${MASTER_SITES} for your python version. (You must +# use this instead of ${MASTER_SITE_PYTHON} to support +# python-devel port.) +# +# PYTHON_MASTER_SITE_SUBDIR: The ${MASTER_SITE_SUBDIR} for your python +# version. # # PYTHON_INCLUDEDIR: Location of the Python include files. # default: ${PYTHONBASE}/include/${PYTHON_VERSION} @@ -111,7 +116,7 @@ _PYTHON_PORTBRANCH= 2.3 _PYTHON_ALLBRANCHES= 2.3 2.2 2.1 2.0 1.5 2.4 # preferred first .if defined(USE_ZOPE) -PYTHON_VERSION= python2.2 +PYTHON_VERSION= python2.1 .endif .if defined(PYTHON_VERSION) @@ -177,13 +182,13 @@ PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print sys.prefix') \ 2> /dev/null || echo ${LOCALBASE} _PYTHON_PORTVERSION!= (${PYTHON_CMD} -c 'import string, sys; \ print string.split(sys.version)[0]') 2> /dev/null || ${TRUE} -.if !empty(_PYTHON_PORTVERSION) +.if !defined(PYTHON_NO_DEPENDS) && !empty(_PYTHON_PORTVERSION) PYTHON_PORTVERSION= ${_PYTHON_PORTVERSION} .endif # Python-2.4 .if ${PYTHON_VERSION} == "python2.4" -PYTHON_PORTVERSION?=2.4.a0-20030801 +PYTHON_PORTVERSION?=2.4.a0.20031022 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel PYTHON_REL= 240 PYTHON_SUFFIX= 24 @@ -258,13 +263,19 @@ PYTHON_SUFFIX!= ${PYTHON_CMD} -c 'import sys; h = "%x" % sys.hexversion; \ .endif .if defined(PYTHON_REL) && ${PYTHON_REL} < 160 -PYTHON_DISTFILE= py152.tgz -PYTHON_SITE_SUBDIR= ftp/python/src +PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON} +PYTHON_MASTER_SITE_SUBDIR= ftp/python/src +PYTHON_DISTFILE= py152.tgz +.elif defined(PYTHON_REL) && ${PYTHON_REL} >= 240 +PYTHON_MASTER_SITES= ${MASTER_SITE_LOCAL} +PYTHON_MASTER_SITE_SUBDIR= perky +PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz .else -PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz -PYTHON_SITE_SUBDIR= ftp/python/${PYTHON_PORTVERSION} -.endif -PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION} +PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON} +PYTHON_MASTER_SITE_SUBDIR= ftp/python/${PYTHON_PORTVERSION} +PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz +.endif # defined(PYTHON_REL) && ${PYTHON_REL} < 160 +PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION} PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION} PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION} diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index ef6e13150801..8fe819da604f 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -5,18 +5,17 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20030801 -PORTREVISION= 1 +PORTVERSION= 2.4.a0.20031022 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= perky -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -24,6 +23,7 @@ INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes +USE_REINPLACE= yes PYTHON_VERSION= python2.4 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -35,6 +35,11 @@ LATEST_LINK= ${PYTHON_VERSION:S/.//} .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} +.if !defined(WANT_HUGE_STACK_SIZE) +CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 +.else +CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 +.endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads @@ -47,6 +52,10 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif +.if defined(WITHOUT_PYMALLOC) +CONFIGURE_ARGS+= --without-pymalloc +.endif + .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes @@ -57,7 +66,6 @@ PLIST_SUB+= SHARED_ONLY="@comment " DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -CFLAGS+= -D__BSD_VISIBLE # see python/configure.in rev 1.409 .include <bsd.port.pre.mk> @@ -66,6 +74,14 @@ PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif +.if ${ARCH} == amd64 +CFLAGS+= -fPIC +.endif +.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha +PLIST_SUB+= 32BIT_ONLY="@comment " +.else +PLIST_SUB+= 32BIT_ONLY="" +.endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses @@ -102,6 +118,10 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 +post-patch: + ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ + ${WRKSRC}/Include/patchlevel.h + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo index 583d7ca077de..d6c272147706 100644 --- a/lang/python-devel/distinfo +++ b/lang/python-devel/distinfo @@ -1 +1 @@ -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python-devel/files/patch-Modules-Setup.dist b/lang/python-devel/files/patch-Modules-Setup.dist deleted file mode 100644 index 74b1ef29f224..000000000000 --- a/lang/python-devel/files/patch-Modules-Setup.dist +++ /dev/null @@ -1,12 +0,0 @@ ---- Modules/Setup.dist Thu Aug 8 15:52:42 2002 -+++ Modules/Setup.dist.new Thu Nov 21 10:40:05 2002 -@@ -356,8 +356,7 @@ - # it is a highly experimental and dangerous device for calling - # *arbitrary* C functions in *arbitrary* shared libraries: - --#dl dlmodule.c -- -+dl dlmodule.c - - # Modules that provide persistent dictionary-like semantics. You will - # probably want to arrange for at least one of them to be available on diff --git a/lang/python-devel/files/patch-configure b/lang/python-devel/files/patch-configure index c17e753795a5..6ee47894e12f 100644 --- a/lang/python-devel/files/patch-configure +++ b/lang/python-devel/files/patch-configure @@ -1,15 +1,24 @@ ---- configure.orig Sun Jul 13 18:46:13 2003 -+++ configure Sat Jul 19 15:21:09 2003 -@@ -3288,6 +3288,12 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; +--- configure.orig Sat Oct 4 13:27:50 2003 ++++ configure Sat Oct 4 13:29:05 2003 +@@ -1321,7 +1321,7 @@ + VERSION=2.3 + + +-SOVERSION=1.0 ++SOVERSION=1 + + # The later defininition of _XOPEN_SOURCE disables certain features + # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). +@@ -3594,6 +3594,12 @@ + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -+ INSTSONAME="$LDLIBRARY" -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; hp*|HP*) - LDLIBRARY='libpython$(VERSION).sl' - BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' diff --git a/lang/python-devel/files/patch-setup.py b/lang/python-devel/files/patch-setup.py index 63779f7d0fe0..d83025329ce0 100644 --- a/lang/python-devel/files/patch-setup.py +++ b/lang/python-devel/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Thu Jul 10 21:48:39 2003 -+++ setup.py Sat Jul 19 16:27:04 2003 +--- setup.py.orig Wed Oct 22 00:41:15 2003 ++++ setup.py Thu Oct 30 06:21:21 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,16 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -1128,7 +1128,7 @@ +@@ -770,7 +770,7 @@ + # Linux-specific modules + exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + +- if platform in ('linux2', 'freebsd4'): ++ if platform in ('linux2', 'freebsd4', 'freebsd5'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + + if platform == 'sunos5': +@@ -1140,7 +1140,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist index e80918c71206..6d00ab24f61c 100644 --- a/lang/python-devel/pkg-plist +++ b/lang/python-devel/pkg-plist @@ -73,6 +73,7 @@ include/%%PYTHON_VERSION%%/ucnhash.h include/%%PYTHON_VERSION%%/unicodeobject.h include/%%PYTHON_VERSION%%/weakrefobject.h %%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so +%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo @@ -628,6 +629,9 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo lib/%%PYTHON_VERSION%%/encodings/base64_codec.py lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo lib/%%PYTHON_VERSION%%/encodings/charmap.py lib/%%PYTHON_VERSION%%/encodings/charmap.pyc lib/%%PYTHON_VERSION%%/encodings/charmap.pyo @@ -1070,7 +1074,6 @@ lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyc lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyo lib/%%PYTHON_VERSION%%/idlelib/extend.txt lib/%%PYTHON_VERSION%%/idlelib/help.txt -lib/%%PYTHON_VERSION%%/idlelib/idle lib/%%PYTHON_VERSION%%/idlelib/idle.bat lib/%%PYTHON_VERSION%%/idlelib/idle.py lib/%%PYTHON_VERSION%%/idlelib/idle.pyc @@ -1136,6 +1139,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so +%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so lib/%%PYTHON_VERSION%%/lib-dynload/grp.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so @@ -1152,6 +1156,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so @@ -1583,7 +1588,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_httplib lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_logging -lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 lib/%%PYTHON_VERSION%%/test/output/test_mmap @@ -1656,6 +1660,9 @@ lib/%%PYTHON_VERSION%%/test/test___all__.pyo lib/%%PYTHON_VERSION%%/test/test___future__.py lib/%%PYTHON_VERSION%%/test/test___future__.pyc lib/%%PYTHON_VERSION%%/test/test___future__.pyo +lib/%%PYTHON_VERSION%%/test/test__locale.py +lib/%%PYTHON_VERSION%%/test/test__locale.pyc +lib/%%PYTHON_VERSION%%/test/test__locale.pyo lib/%%PYTHON_VERSION%%/test/test_aepack.py lib/%%PYTHON_VERSION%%/test/test_aepack.pyc lib/%%PYTHON_VERSION%%/test/test_aepack.pyo diff --git a/lang/python/Makefile b/lang/python/Makefile index 48881c64f3e8..c97da86f9ad7 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -9,15 +9,15 @@ PORTNAME= python PORTVERSION= 2.3.2 PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_PYTHON} -MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR} -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" diff --git a/lang/python/distinfo b/lang/python/distinfo index a4a8c4eaa046..25fd4c89b8c9 100644 --- a/lang/python/distinfo +++ b/lang/python/distinfo @@ -13,4 +13,4 @@ MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229 MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8 MD5 (python/Python-2.3.1.tgz) = a3dcbe1c7f173c8e3c7cce28495016ae MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479 -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist index 47710b7b4b3a..c4ba04eae369 100644 --- a/lang/python/pkg-plist +++ b/lang/python/pkg-plist @@ -966,7 +966,6 @@ lib/%%PYTHON_VERSION%%/idlelib/Icons/folder.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/idle.icns lib/%%PYTHON_VERSION%%/idlelib/Icons/minusnode.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/openfolder.gif -%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/idlelib/Icons/plusnode.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/python.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/tk.gif @@ -1158,6 +1157,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so diff --git a/lang/python15/Makefile b/lang/python15/Makefile index 6df1403efbeb..bad067e115e2 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -9,16 +9,15 @@ PORTNAME= python PORTVERSION= 1.5.2 PORTREVISION= 3 CATEGORIES= lang python -MASTER_SITES= ${MASTER_SITE_PYTHON} -MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR} -DISTNAME= py${PORTVERSION:S/.//g} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT= An interpreted object-oriented programming language DIST_SUBDIR= python -WRKSRC= ${WRKDIR}/Python-${PORTVERSION} +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" diff --git a/lang/python20/Makefile b/lang/python20/Makefile index e4afb9e23f91..29b48e1517ce 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -9,15 +9,15 @@ PORTNAME= python PORTVERSION= 2.0.1 PORTREVISION= 2 CATEGORIES= lang python -MASTER_SITES= ${MASTER_SITE_PYTHON} -MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR} -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" diff --git a/lang/python21/Makefile b/lang/python21/Makefile index 60e0864d72ef..88377f549783 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -9,15 +9,15 @@ PORTNAME= python PORTVERSION= 2.1.3 PORTREVISION= 5 CATEGORIES= lang python -MASTER_SITES= ${MASTER_SITE_PYTHON} -MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR} -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" diff --git a/lang/python22/Makefile b/lang/python22/Makefile index 92b363941c14..f9bedc3e511c 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -9,15 +9,15 @@ PORTNAME= python PORTVERSION= 2.2.3 PORTREVISION= 3 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_PYTHON} -MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR} -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 48881c64f3e8..c97da86f9ad7 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -9,15 +9,15 @@ PORTNAME= python PORTVERSION= 2.3.2 PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_PYTHON} -MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR} -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" diff --git a/lang/python23/distinfo b/lang/python23/distinfo index a4a8c4eaa046..25fd4c89b8c9 100644 --- a/lang/python23/distinfo +++ b/lang/python23/distinfo @@ -13,4 +13,4 @@ MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229 MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8 MD5 (python/Python-2.3.1.tgz) = a3dcbe1c7f173c8e3c7cce28495016ae MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479 -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist index 47710b7b4b3a..c4ba04eae369 100644 --- a/lang/python23/pkg-plist +++ b/lang/python23/pkg-plist @@ -966,7 +966,6 @@ lib/%%PYTHON_VERSION%%/idlelib/Icons/folder.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/idle.icns lib/%%PYTHON_VERSION%%/idlelib/Icons/minusnode.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/openfolder.gif -%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/idlelib/Icons/plusnode.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/python.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/tk.gif @@ -1158,6 +1157,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 48881c64f3e8..c97da86f9ad7 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -9,15 +9,15 @@ PORTNAME= python PORTVERSION= 2.3.2 PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_PYTHON} -MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR} -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" diff --git a/lang/python24/distinfo b/lang/python24/distinfo index a4a8c4eaa046..25fd4c89b8c9 100644 --- a/lang/python24/distinfo +++ b/lang/python24/distinfo @@ -13,4 +13,4 @@ MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229 MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8 MD5 (python/Python-2.3.1.tgz) = a3dcbe1c7f173c8e3c7cce28495016ae MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479 -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist index 47710b7b4b3a..c4ba04eae369 100644 --- a/lang/python24/pkg-plist +++ b/lang/python24/pkg-plist @@ -966,7 +966,6 @@ lib/%%PYTHON_VERSION%%/idlelib/Icons/folder.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/idle.icns lib/%%PYTHON_VERSION%%/idlelib/Icons/minusnode.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/openfolder.gif -%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/idlelib/Icons/plusnode.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/python.gif lib/%%PYTHON_VERSION%%/idlelib/Icons/tk.gif @@ -1158,6 +1157,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so diff --git a/lang/python25/Makefile b/lang/python25/Makefile index ef6e13150801..8fe819da604f 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -5,18 +5,17 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20030801 -PORTREVISION= 1 +PORTVERSION= 2.4.a0.20031022 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= perky -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -24,6 +23,7 @@ INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes +USE_REINPLACE= yes PYTHON_VERSION= python2.4 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -35,6 +35,11 @@ LATEST_LINK= ${PYTHON_VERSION:S/.//} .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} +.if !defined(WANT_HUGE_STACK_SIZE) +CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 +.else +CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 +.endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads @@ -47,6 +52,10 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif +.if defined(WITHOUT_PYMALLOC) +CONFIGURE_ARGS+= --without-pymalloc +.endif + .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes @@ -57,7 +66,6 @@ PLIST_SUB+= SHARED_ONLY="@comment " DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -CFLAGS+= -D__BSD_VISIBLE # see python/configure.in rev 1.409 .include <bsd.port.pre.mk> @@ -66,6 +74,14 @@ PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif +.if ${ARCH} == amd64 +CFLAGS+= -fPIC +.endif +.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha +PLIST_SUB+= 32BIT_ONLY="@comment " +.else +PLIST_SUB+= 32BIT_ONLY="" +.endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses @@ -102,6 +118,10 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 +post-patch: + ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ + ${WRKSRC}/Include/patchlevel.h + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} diff --git a/lang/python25/distinfo b/lang/python25/distinfo index 583d7ca077de..d6c272147706 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1 +1 @@ -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python25/files/patch-Modules-Setup.dist b/lang/python25/files/patch-Modules-Setup.dist deleted file mode 100644 index 74b1ef29f224..000000000000 --- a/lang/python25/files/patch-Modules-Setup.dist +++ /dev/null @@ -1,12 +0,0 @@ ---- Modules/Setup.dist Thu Aug 8 15:52:42 2002 -+++ Modules/Setup.dist.new Thu Nov 21 10:40:05 2002 -@@ -356,8 +356,7 @@ - # it is a highly experimental and dangerous device for calling - # *arbitrary* C functions in *arbitrary* shared libraries: - --#dl dlmodule.c -- -+dl dlmodule.c - - # Modules that provide persistent dictionary-like semantics. You will - # probably want to arrange for at least one of them to be available on diff --git a/lang/python25/files/patch-configure b/lang/python25/files/patch-configure index c17e753795a5..6ee47894e12f 100644 --- a/lang/python25/files/patch-configure +++ b/lang/python25/files/patch-configure @@ -1,15 +1,24 @@ ---- configure.orig Sun Jul 13 18:46:13 2003 -+++ configure Sat Jul 19 15:21:09 2003 -@@ -3288,6 +3288,12 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; +--- configure.orig Sat Oct 4 13:27:50 2003 ++++ configure Sat Oct 4 13:29:05 2003 +@@ -1321,7 +1321,7 @@ + VERSION=2.3 + + +-SOVERSION=1.0 ++SOVERSION=1 + + # The later defininition of _XOPEN_SOURCE disables certain features + # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). +@@ -3594,6 +3594,12 @@ + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -+ INSTSONAME="$LDLIBRARY" -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; hp*|HP*) - LDLIBRARY='libpython$(VERSION).sl' - BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' diff --git a/lang/python25/files/patch-setup.py b/lang/python25/files/patch-setup.py index 63779f7d0fe0..d83025329ce0 100644 --- a/lang/python25/files/patch-setup.py +++ b/lang/python25/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Thu Jul 10 21:48:39 2003 -+++ setup.py Sat Jul 19 16:27:04 2003 +--- setup.py.orig Wed Oct 22 00:41:15 2003 ++++ setup.py Thu Oct 30 06:21:21 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,16 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -1128,7 +1128,7 @@ +@@ -770,7 +770,7 @@ + # Linux-specific modules + exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + +- if platform in ('linux2', 'freebsd4'): ++ if platform in ('linux2', 'freebsd4', 'freebsd5'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + + if platform == 'sunos5': +@@ -1140,7 +1140,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index e80918c71206..6d00ab24f61c 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -73,6 +73,7 @@ include/%%PYTHON_VERSION%%/ucnhash.h include/%%PYTHON_VERSION%%/unicodeobject.h include/%%PYTHON_VERSION%%/weakrefobject.h %%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so +%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo @@ -628,6 +629,9 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo lib/%%PYTHON_VERSION%%/encodings/base64_codec.py lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo lib/%%PYTHON_VERSION%%/encodings/charmap.py lib/%%PYTHON_VERSION%%/encodings/charmap.pyc lib/%%PYTHON_VERSION%%/encodings/charmap.pyo @@ -1070,7 +1074,6 @@ lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyc lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyo lib/%%PYTHON_VERSION%%/idlelib/extend.txt lib/%%PYTHON_VERSION%%/idlelib/help.txt -lib/%%PYTHON_VERSION%%/idlelib/idle lib/%%PYTHON_VERSION%%/idlelib/idle.bat lib/%%PYTHON_VERSION%%/idlelib/idle.py lib/%%PYTHON_VERSION%%/idlelib/idle.pyc @@ -1136,6 +1139,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so +%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so lib/%%PYTHON_VERSION%%/lib-dynload/grp.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so @@ -1152,6 +1156,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so @@ -1583,7 +1588,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_httplib lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_logging -lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 lib/%%PYTHON_VERSION%%/test/output/test_mmap @@ -1656,6 +1660,9 @@ lib/%%PYTHON_VERSION%%/test/test___all__.pyo lib/%%PYTHON_VERSION%%/test/test___future__.py lib/%%PYTHON_VERSION%%/test/test___future__.pyc lib/%%PYTHON_VERSION%%/test/test___future__.pyo +lib/%%PYTHON_VERSION%%/test/test__locale.py +lib/%%PYTHON_VERSION%%/test/test__locale.pyc +lib/%%PYTHON_VERSION%%/test/test__locale.pyo lib/%%PYTHON_VERSION%%/test/test_aepack.py lib/%%PYTHON_VERSION%%/test/test_aepack.pyc lib/%%PYTHON_VERSION%%/test/test_aepack.pyo diff --git a/lang/python26/Makefile b/lang/python26/Makefile index ef6e13150801..8fe819da604f 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -5,18 +5,17 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20030801 -PORTREVISION= 1 +PORTVERSION= 2.4.a0.20031022 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= perky -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -24,6 +23,7 @@ INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes +USE_REINPLACE= yes PYTHON_VERSION= python2.4 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -35,6 +35,11 @@ LATEST_LINK= ${PYTHON_VERSION:S/.//} .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} +.if !defined(WANT_HUGE_STACK_SIZE) +CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 +.else +CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 +.endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads @@ -47,6 +52,10 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif +.if defined(WITHOUT_PYMALLOC) +CONFIGURE_ARGS+= --without-pymalloc +.endif + .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes @@ -57,7 +66,6 @@ PLIST_SUB+= SHARED_ONLY="@comment " DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -CFLAGS+= -D__BSD_VISIBLE # see python/configure.in rev 1.409 .include <bsd.port.pre.mk> @@ -66,6 +74,14 @@ PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif +.if ${ARCH} == amd64 +CFLAGS+= -fPIC +.endif +.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha +PLIST_SUB+= 32BIT_ONLY="@comment " +.else +PLIST_SUB+= 32BIT_ONLY="" +.endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses @@ -102,6 +118,10 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 +post-patch: + ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ + ${WRKSRC}/Include/patchlevel.h + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 583d7ca077de..d6c272147706 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1 +1 @@ -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python26/files/patch-Modules-Setup.dist b/lang/python26/files/patch-Modules-Setup.dist deleted file mode 100644 index 74b1ef29f224..000000000000 --- a/lang/python26/files/patch-Modules-Setup.dist +++ /dev/null @@ -1,12 +0,0 @@ ---- Modules/Setup.dist Thu Aug 8 15:52:42 2002 -+++ Modules/Setup.dist.new Thu Nov 21 10:40:05 2002 -@@ -356,8 +356,7 @@ - # it is a highly experimental and dangerous device for calling - # *arbitrary* C functions in *arbitrary* shared libraries: - --#dl dlmodule.c -- -+dl dlmodule.c - - # Modules that provide persistent dictionary-like semantics. You will - # probably want to arrange for at least one of them to be available on diff --git a/lang/python26/files/patch-configure b/lang/python26/files/patch-configure index c17e753795a5..6ee47894e12f 100644 --- a/lang/python26/files/patch-configure +++ b/lang/python26/files/patch-configure @@ -1,15 +1,24 @@ ---- configure.orig Sun Jul 13 18:46:13 2003 -+++ configure Sat Jul 19 15:21:09 2003 -@@ -3288,6 +3288,12 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; +--- configure.orig Sat Oct 4 13:27:50 2003 ++++ configure Sat Oct 4 13:29:05 2003 +@@ -1321,7 +1321,7 @@ + VERSION=2.3 + + +-SOVERSION=1.0 ++SOVERSION=1 + + # The later defininition of _XOPEN_SOURCE disables certain features + # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). +@@ -3594,6 +3594,12 @@ + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -+ INSTSONAME="$LDLIBRARY" -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; hp*|HP*) - LDLIBRARY='libpython$(VERSION).sl' - BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py index 63779f7d0fe0..d83025329ce0 100644 --- a/lang/python26/files/patch-setup.py +++ b/lang/python26/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Thu Jul 10 21:48:39 2003 -+++ setup.py Sat Jul 19 16:27:04 2003 +--- setup.py.orig Wed Oct 22 00:41:15 2003 ++++ setup.py Thu Oct 30 06:21:21 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,16 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -1128,7 +1128,7 @@ +@@ -770,7 +770,7 @@ + # Linux-specific modules + exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + +- if platform in ('linux2', 'freebsd4'): ++ if platform in ('linux2', 'freebsd4', 'freebsd5'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + + if platform == 'sunos5': +@@ -1140,7 +1140,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index e80918c71206..6d00ab24f61c 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -73,6 +73,7 @@ include/%%PYTHON_VERSION%%/ucnhash.h include/%%PYTHON_VERSION%%/unicodeobject.h include/%%PYTHON_VERSION%%/weakrefobject.h %%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so +%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo @@ -628,6 +629,9 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo lib/%%PYTHON_VERSION%%/encodings/base64_codec.py lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo lib/%%PYTHON_VERSION%%/encodings/charmap.py lib/%%PYTHON_VERSION%%/encodings/charmap.pyc lib/%%PYTHON_VERSION%%/encodings/charmap.pyo @@ -1070,7 +1074,6 @@ lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyc lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyo lib/%%PYTHON_VERSION%%/idlelib/extend.txt lib/%%PYTHON_VERSION%%/idlelib/help.txt -lib/%%PYTHON_VERSION%%/idlelib/idle lib/%%PYTHON_VERSION%%/idlelib/idle.bat lib/%%PYTHON_VERSION%%/idlelib/idle.py lib/%%PYTHON_VERSION%%/idlelib/idle.pyc @@ -1136,6 +1139,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so +%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so lib/%%PYTHON_VERSION%%/lib-dynload/grp.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so @@ -1152,6 +1156,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so @@ -1583,7 +1588,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_httplib lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_logging -lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 lib/%%PYTHON_VERSION%%/test/output/test_mmap @@ -1656,6 +1660,9 @@ lib/%%PYTHON_VERSION%%/test/test___all__.pyo lib/%%PYTHON_VERSION%%/test/test___future__.py lib/%%PYTHON_VERSION%%/test/test___future__.pyc lib/%%PYTHON_VERSION%%/test/test___future__.pyo +lib/%%PYTHON_VERSION%%/test/test__locale.py +lib/%%PYTHON_VERSION%%/test/test__locale.pyc +lib/%%PYTHON_VERSION%%/test/test__locale.pyo lib/%%PYTHON_VERSION%%/test/test_aepack.py lib/%%PYTHON_VERSION%%/test/test_aepack.pyc lib/%%PYTHON_VERSION%%/test/test_aepack.pyo diff --git a/lang/python27/Makefile b/lang/python27/Makefile index ef6e13150801..8fe819da604f 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -5,18 +5,17 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20030801 -PORTREVISION= 1 +PORTVERSION= 2.4.a0.20031022 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= perky -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -24,6 +23,7 @@ INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes +USE_REINPLACE= yes PYTHON_VERSION= python2.4 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -35,6 +35,11 @@ LATEST_LINK= ${PYTHON_VERSION:S/.//} .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} +.if !defined(WANT_HUGE_STACK_SIZE) +CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 +.else +CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 +.endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads @@ -47,6 +52,10 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif +.if defined(WITHOUT_PYMALLOC) +CONFIGURE_ARGS+= --without-pymalloc +.endif + .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes @@ -57,7 +66,6 @@ PLIST_SUB+= SHARED_ONLY="@comment " DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -CFLAGS+= -D__BSD_VISIBLE # see python/configure.in rev 1.409 .include <bsd.port.pre.mk> @@ -66,6 +74,14 @@ PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif +.if ${ARCH} == amd64 +CFLAGS+= -fPIC +.endif +.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha +PLIST_SUB+= 32BIT_ONLY="@comment " +.else +PLIST_SUB+= 32BIT_ONLY="" +.endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses @@ -102,6 +118,10 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 +post-patch: + ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ + ${WRKSRC}/Include/patchlevel.h + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 583d7ca077de..d6c272147706 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1 +1 @@ -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python27/files/patch-Modules-Setup.dist b/lang/python27/files/patch-Modules-Setup.dist deleted file mode 100644 index 74b1ef29f224..000000000000 --- a/lang/python27/files/patch-Modules-Setup.dist +++ /dev/null @@ -1,12 +0,0 @@ ---- Modules/Setup.dist Thu Aug 8 15:52:42 2002 -+++ Modules/Setup.dist.new Thu Nov 21 10:40:05 2002 -@@ -356,8 +356,7 @@ - # it is a highly experimental and dangerous device for calling - # *arbitrary* C functions in *arbitrary* shared libraries: - --#dl dlmodule.c -- -+dl dlmodule.c - - # Modules that provide persistent dictionary-like semantics. You will - # probably want to arrange for at least one of them to be available on diff --git a/lang/python27/files/patch-configure b/lang/python27/files/patch-configure index c17e753795a5..6ee47894e12f 100644 --- a/lang/python27/files/patch-configure +++ b/lang/python27/files/patch-configure @@ -1,15 +1,24 @@ ---- configure.orig Sun Jul 13 18:46:13 2003 -+++ configure Sat Jul 19 15:21:09 2003 -@@ -3288,6 +3288,12 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; +--- configure.orig Sat Oct 4 13:27:50 2003 ++++ configure Sat Oct 4 13:29:05 2003 +@@ -1321,7 +1321,7 @@ + VERSION=2.3 + + +-SOVERSION=1.0 ++SOVERSION=1 + + # The later defininition of _XOPEN_SOURCE disables certain features + # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). +@@ -3594,6 +3594,12 @@ + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -+ INSTSONAME="$LDLIBRARY" -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; hp*|HP*) - LDLIBRARY='libpython$(VERSION).sl' - BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py index 63779f7d0fe0..d83025329ce0 100644 --- a/lang/python27/files/patch-setup.py +++ b/lang/python27/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Thu Jul 10 21:48:39 2003 -+++ setup.py Sat Jul 19 16:27:04 2003 +--- setup.py.orig Wed Oct 22 00:41:15 2003 ++++ setup.py Thu Oct 30 06:21:21 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,16 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -1128,7 +1128,7 @@ +@@ -770,7 +770,7 @@ + # Linux-specific modules + exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + +- if platform in ('linux2', 'freebsd4'): ++ if platform in ('linux2', 'freebsd4', 'freebsd5'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + + if platform == 'sunos5': +@@ -1140,7 +1140,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index e80918c71206..6d00ab24f61c 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -73,6 +73,7 @@ include/%%PYTHON_VERSION%%/ucnhash.h include/%%PYTHON_VERSION%%/unicodeobject.h include/%%PYTHON_VERSION%%/weakrefobject.h %%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so +%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo @@ -628,6 +629,9 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo lib/%%PYTHON_VERSION%%/encodings/base64_codec.py lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo lib/%%PYTHON_VERSION%%/encodings/charmap.py lib/%%PYTHON_VERSION%%/encodings/charmap.pyc lib/%%PYTHON_VERSION%%/encodings/charmap.pyo @@ -1070,7 +1074,6 @@ lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyc lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyo lib/%%PYTHON_VERSION%%/idlelib/extend.txt lib/%%PYTHON_VERSION%%/idlelib/help.txt -lib/%%PYTHON_VERSION%%/idlelib/idle lib/%%PYTHON_VERSION%%/idlelib/idle.bat lib/%%PYTHON_VERSION%%/idlelib/idle.py lib/%%PYTHON_VERSION%%/idlelib/idle.pyc @@ -1136,6 +1139,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so +%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so lib/%%PYTHON_VERSION%%/lib-dynload/grp.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so @@ -1152,6 +1156,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so @@ -1583,7 +1588,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_httplib lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_logging -lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 lib/%%PYTHON_VERSION%%/test/output/test_mmap @@ -1656,6 +1660,9 @@ lib/%%PYTHON_VERSION%%/test/test___all__.pyo lib/%%PYTHON_VERSION%%/test/test___future__.py lib/%%PYTHON_VERSION%%/test/test___future__.pyc lib/%%PYTHON_VERSION%%/test/test___future__.pyo +lib/%%PYTHON_VERSION%%/test/test__locale.py +lib/%%PYTHON_VERSION%%/test/test__locale.pyc +lib/%%PYTHON_VERSION%%/test/test__locale.pyo lib/%%PYTHON_VERSION%%/test/test_aepack.py lib/%%PYTHON_VERSION%%/test/test_aepack.pyc lib/%%PYTHON_VERSION%%/test/test_aepack.pyo diff --git a/lang/python30/Makefile b/lang/python30/Makefile index ef6e13150801..8fe819da604f 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -5,18 +5,17 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20030801 -PORTREVISION= 1 +PORTVERSION= 2.4.a0.20031022 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= perky -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -24,6 +23,7 @@ INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes +USE_REINPLACE= yes PYTHON_VERSION= python2.4 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -35,6 +35,11 @@ LATEST_LINK= ${PYTHON_VERSION:S/.//} .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} +.if !defined(WANT_HUGE_STACK_SIZE) +CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 +.else +CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 +.endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads @@ -47,6 +52,10 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif +.if defined(WITHOUT_PYMALLOC) +CONFIGURE_ARGS+= --without-pymalloc +.endif + .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes @@ -57,7 +66,6 @@ PLIST_SUB+= SHARED_ONLY="@comment " DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -CFLAGS+= -D__BSD_VISIBLE # see python/configure.in rev 1.409 .include <bsd.port.pre.mk> @@ -66,6 +74,14 @@ PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif +.if ${ARCH} == amd64 +CFLAGS+= -fPIC +.endif +.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha +PLIST_SUB+= 32BIT_ONLY="@comment " +.else +PLIST_SUB+= 32BIT_ONLY="" +.endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses @@ -102,6 +118,10 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 +post-patch: + ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ + ${WRKSRC}/Include/patchlevel.h + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} diff --git a/lang/python30/distinfo b/lang/python30/distinfo index 583d7ca077de..d6c272147706 100644 --- a/lang/python30/distinfo +++ b/lang/python30/distinfo @@ -1 +1 @@ -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python30/files/patch-Modules-Setup.dist b/lang/python30/files/patch-Modules-Setup.dist deleted file mode 100644 index 74b1ef29f224..000000000000 --- a/lang/python30/files/patch-Modules-Setup.dist +++ /dev/null @@ -1,12 +0,0 @@ ---- Modules/Setup.dist Thu Aug 8 15:52:42 2002 -+++ Modules/Setup.dist.new Thu Nov 21 10:40:05 2002 -@@ -356,8 +356,7 @@ - # it is a highly experimental and dangerous device for calling - # *arbitrary* C functions in *arbitrary* shared libraries: - --#dl dlmodule.c -- -+dl dlmodule.c - - # Modules that provide persistent dictionary-like semantics. You will - # probably want to arrange for at least one of them to be available on diff --git a/lang/python30/files/patch-configure b/lang/python30/files/patch-configure index c17e753795a5..6ee47894e12f 100644 --- a/lang/python30/files/patch-configure +++ b/lang/python30/files/patch-configure @@ -1,15 +1,24 @@ ---- configure.orig Sun Jul 13 18:46:13 2003 -+++ configure Sat Jul 19 15:21:09 2003 -@@ -3288,6 +3288,12 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; +--- configure.orig Sat Oct 4 13:27:50 2003 ++++ configure Sat Oct 4 13:29:05 2003 +@@ -1321,7 +1321,7 @@ + VERSION=2.3 + + +-SOVERSION=1.0 ++SOVERSION=1 + + # The later defininition of _XOPEN_SOURCE disables certain features + # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). +@@ -3594,6 +3594,12 @@ + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -+ INSTSONAME="$LDLIBRARY" -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; hp*|HP*) - LDLIBRARY='libpython$(VERSION).sl' - BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' diff --git a/lang/python30/files/patch-setup.py b/lang/python30/files/patch-setup.py index 63779f7d0fe0..d83025329ce0 100644 --- a/lang/python30/files/patch-setup.py +++ b/lang/python30/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Thu Jul 10 21:48:39 2003 -+++ setup.py Sat Jul 19 16:27:04 2003 +--- setup.py.orig Wed Oct 22 00:41:15 2003 ++++ setup.py Thu Oct 30 06:21:21 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,16 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -1128,7 +1128,7 @@ +@@ -770,7 +770,7 @@ + # Linux-specific modules + exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + +- if platform in ('linux2', 'freebsd4'): ++ if platform in ('linux2', 'freebsd4', 'freebsd5'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + + if platform == 'sunos5': +@@ -1140,7 +1140,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index e80918c71206..6d00ab24f61c 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -73,6 +73,7 @@ include/%%PYTHON_VERSION%%/ucnhash.h include/%%PYTHON_VERSION%%/unicodeobject.h include/%%PYTHON_VERSION%%/weakrefobject.h %%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so +%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo @@ -628,6 +629,9 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo lib/%%PYTHON_VERSION%%/encodings/base64_codec.py lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo lib/%%PYTHON_VERSION%%/encodings/charmap.py lib/%%PYTHON_VERSION%%/encodings/charmap.pyc lib/%%PYTHON_VERSION%%/encodings/charmap.pyo @@ -1070,7 +1074,6 @@ lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyc lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyo lib/%%PYTHON_VERSION%%/idlelib/extend.txt lib/%%PYTHON_VERSION%%/idlelib/help.txt -lib/%%PYTHON_VERSION%%/idlelib/idle lib/%%PYTHON_VERSION%%/idlelib/idle.bat lib/%%PYTHON_VERSION%%/idlelib/idle.py lib/%%PYTHON_VERSION%%/idlelib/idle.pyc @@ -1136,6 +1139,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so +%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so lib/%%PYTHON_VERSION%%/lib-dynload/grp.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so @@ -1152,6 +1156,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so @@ -1583,7 +1588,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_httplib lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_logging -lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 lib/%%PYTHON_VERSION%%/test/output/test_mmap @@ -1656,6 +1660,9 @@ lib/%%PYTHON_VERSION%%/test/test___all__.pyo lib/%%PYTHON_VERSION%%/test/test___future__.py lib/%%PYTHON_VERSION%%/test/test___future__.pyc lib/%%PYTHON_VERSION%%/test/test___future__.pyo +lib/%%PYTHON_VERSION%%/test/test__locale.py +lib/%%PYTHON_VERSION%%/test/test__locale.pyc +lib/%%PYTHON_VERSION%%/test/test__locale.pyo lib/%%PYTHON_VERSION%%/test/test_aepack.py lib/%%PYTHON_VERSION%%/test/test_aepack.pyc lib/%%PYTHON_VERSION%%/test/test_aepack.pyo diff --git a/lang/python31/Makefile b/lang/python31/Makefile index ef6e13150801..8fe819da604f 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -5,18 +5,17 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20030801 -PORTREVISION= 1 +PORTVERSION= 2.4.a0.20031022 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= perky -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -24,6 +23,7 @@ INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes +USE_REINPLACE= yes PYTHON_VERSION= python2.4 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -35,6 +35,11 @@ LATEST_LINK= ${PYTHON_VERSION:S/.//} .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} +.if !defined(WANT_HUGE_STACK_SIZE) +CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 +.else +CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 +.endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads @@ -47,6 +52,10 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif +.if defined(WITHOUT_PYMALLOC) +CONFIGURE_ARGS+= --without-pymalloc +.endif + .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes @@ -57,7 +66,6 @@ PLIST_SUB+= SHARED_ONLY="@comment " DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -CFLAGS+= -D__BSD_VISIBLE # see python/configure.in rev 1.409 .include <bsd.port.pre.mk> @@ -66,6 +74,14 @@ PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif +.if ${ARCH} == amd64 +CFLAGS+= -fPIC +.endif +.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha +PLIST_SUB+= 32BIT_ONLY="@comment " +.else +PLIST_SUB+= 32BIT_ONLY="" +.endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses @@ -102,6 +118,10 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 +post-patch: + ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ + ${WRKSRC}/Include/patchlevel.h + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} diff --git a/lang/python31/distinfo b/lang/python31/distinfo index 583d7ca077de..d6c272147706 100644 --- a/lang/python31/distinfo +++ b/lang/python31/distinfo @@ -1 +1 @@ -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python31/files/patch-Modules-Setup.dist b/lang/python31/files/patch-Modules-Setup.dist deleted file mode 100644 index 74b1ef29f224..000000000000 --- a/lang/python31/files/patch-Modules-Setup.dist +++ /dev/null @@ -1,12 +0,0 @@ ---- Modules/Setup.dist Thu Aug 8 15:52:42 2002 -+++ Modules/Setup.dist.new Thu Nov 21 10:40:05 2002 -@@ -356,8 +356,7 @@ - # it is a highly experimental and dangerous device for calling - # *arbitrary* C functions in *arbitrary* shared libraries: - --#dl dlmodule.c -- -+dl dlmodule.c - - # Modules that provide persistent dictionary-like semantics. You will - # probably want to arrange for at least one of them to be available on diff --git a/lang/python31/files/patch-configure b/lang/python31/files/patch-configure index c17e753795a5..6ee47894e12f 100644 --- a/lang/python31/files/patch-configure +++ b/lang/python31/files/patch-configure @@ -1,15 +1,24 @@ ---- configure.orig Sun Jul 13 18:46:13 2003 -+++ configure Sat Jul 19 15:21:09 2003 -@@ -3288,6 +3288,12 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; +--- configure.orig Sat Oct 4 13:27:50 2003 ++++ configure Sat Oct 4 13:29:05 2003 +@@ -1321,7 +1321,7 @@ + VERSION=2.3 + + +-SOVERSION=1.0 ++SOVERSION=1 + + # The later defininition of _XOPEN_SOURCE disables certain features + # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). +@@ -3594,6 +3594,12 @@ + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -+ INSTSONAME="$LDLIBRARY" -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; hp*|HP*) - LDLIBRARY='libpython$(VERSION).sl' - BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py index 63779f7d0fe0..d83025329ce0 100644 --- a/lang/python31/files/patch-setup.py +++ b/lang/python31/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Thu Jul 10 21:48:39 2003 -+++ setup.py Sat Jul 19 16:27:04 2003 +--- setup.py.orig Wed Oct 22 00:41:15 2003 ++++ setup.py Thu Oct 30 06:21:21 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,16 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -1128,7 +1128,7 @@ +@@ -770,7 +770,7 @@ + # Linux-specific modules + exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + +- if platform in ('linux2', 'freebsd4'): ++ if platform in ('linux2', 'freebsd4', 'freebsd5'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + + if platform == 'sunos5': +@@ -1140,7 +1140,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index e80918c71206..6d00ab24f61c 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -73,6 +73,7 @@ include/%%PYTHON_VERSION%%/ucnhash.h include/%%PYTHON_VERSION%%/unicodeobject.h include/%%PYTHON_VERSION%%/weakrefobject.h %%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so +%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo @@ -628,6 +629,9 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo lib/%%PYTHON_VERSION%%/encodings/base64_codec.py lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo lib/%%PYTHON_VERSION%%/encodings/charmap.py lib/%%PYTHON_VERSION%%/encodings/charmap.pyc lib/%%PYTHON_VERSION%%/encodings/charmap.pyo @@ -1070,7 +1074,6 @@ lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyc lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyo lib/%%PYTHON_VERSION%%/idlelib/extend.txt lib/%%PYTHON_VERSION%%/idlelib/help.txt -lib/%%PYTHON_VERSION%%/idlelib/idle lib/%%PYTHON_VERSION%%/idlelib/idle.bat lib/%%PYTHON_VERSION%%/idlelib/idle.py lib/%%PYTHON_VERSION%%/idlelib/idle.pyc @@ -1136,6 +1139,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so +%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so lib/%%PYTHON_VERSION%%/lib-dynload/grp.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so @@ -1152,6 +1156,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so @@ -1583,7 +1588,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_httplib lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_logging -lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 lib/%%PYTHON_VERSION%%/test/output/test_mmap @@ -1656,6 +1660,9 @@ lib/%%PYTHON_VERSION%%/test/test___all__.pyo lib/%%PYTHON_VERSION%%/test/test___future__.py lib/%%PYTHON_VERSION%%/test/test___future__.pyc lib/%%PYTHON_VERSION%%/test/test___future__.pyo +lib/%%PYTHON_VERSION%%/test/test__locale.py +lib/%%PYTHON_VERSION%%/test/test__locale.pyc +lib/%%PYTHON_VERSION%%/test/test__locale.pyo lib/%%PYTHON_VERSION%%/test/test_aepack.py lib/%%PYTHON_VERSION%%/test/test_aepack.pyc lib/%%PYTHON_VERSION%%/test/test_aepack.pyo diff --git a/lang/python32/Makefile b/lang/python32/Makefile index ef6e13150801..8fe819da604f 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -5,18 +5,17 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20030801 -PORTREVISION= 1 +PORTVERSION= 2.4.a0.20031022 CATEGORIES= lang python ipv6 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= perky -DISTNAME= Python-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -24,6 +23,7 @@ INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes +USE_REINPLACE= yes PYTHON_VERSION= python2.4 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -35,6 +35,11 @@ LATEST_LINK= ${PYTHON_VERSION:S/.//} .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} +.if !defined(WANT_HUGE_STACK_SIZE) +CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 +.else +CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 +.endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads @@ -47,6 +52,10 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif +.if defined(WITHOUT_PYMALLOC) +CONFIGURE_ARGS+= --without-pymalloc +.endif + .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes @@ -57,7 +66,6 @@ PLIST_SUB+= SHARED_ONLY="@comment " DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -CFLAGS+= -D__BSD_VISIBLE # see python/configure.in rev 1.409 .include <bsd.port.pre.mk> @@ -66,6 +74,14 @@ PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif +.if ${ARCH} == amd64 +CFLAGS+= -fPIC +.endif +.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha +PLIST_SUB+= 32BIT_ONLY="@comment " +.else +PLIST_SUB+= 32BIT_ONLY="" +.endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses @@ -102,6 +118,10 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 +post-patch: + ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ + ${WRKSRC}/Include/patchlevel.h + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} diff --git a/lang/python32/distinfo b/lang/python32/distinfo index 583d7ca077de..d6c272147706 100644 --- a/lang/python32/distinfo +++ b/lang/python32/distinfo @@ -1 +1 @@ -MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16 +MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 diff --git a/lang/python32/files/patch-Modules-Setup.dist b/lang/python32/files/patch-Modules-Setup.dist deleted file mode 100644 index 74b1ef29f224..000000000000 --- a/lang/python32/files/patch-Modules-Setup.dist +++ /dev/null @@ -1,12 +0,0 @@ ---- Modules/Setup.dist Thu Aug 8 15:52:42 2002 -+++ Modules/Setup.dist.new Thu Nov 21 10:40:05 2002 -@@ -356,8 +356,7 @@ - # it is a highly experimental and dangerous device for calling - # *arbitrary* C functions in *arbitrary* shared libraries: - --#dl dlmodule.c -- -+dl dlmodule.c - - # Modules that provide persistent dictionary-like semantics. You will - # probably want to arrange for at least one of them to be available on diff --git a/lang/python32/files/patch-configure b/lang/python32/files/patch-configure index c17e753795a5..6ee47894e12f 100644 --- a/lang/python32/files/patch-configure +++ b/lang/python32/files/patch-configure @@ -1,15 +1,24 @@ ---- configure.orig Sun Jul 13 18:46:13 2003 -+++ configure Sat Jul 19 15:21:09 2003 -@@ -3288,6 +3288,12 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; +--- configure.orig Sat Oct 4 13:27:50 2003 ++++ configure Sat Oct 4 13:29:05 2003 +@@ -1321,7 +1321,7 @@ + VERSION=2.3 + + +-SOVERSION=1.0 ++SOVERSION=1 + + # The later defininition of _XOPEN_SOURCE disables certain features + # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). +@@ -3594,6 +3594,12 @@ + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -+ INSTSONAME="$LDLIBRARY" -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; hp*|HP*) - LDLIBRARY='libpython$(VERSION).sl' - BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py index 63779f7d0fe0..d83025329ce0 100644 --- a/lang/python32/files/patch-setup.py +++ b/lang/python32/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Thu Jul 10 21:48:39 2003 -+++ setup.py Sat Jul 19 16:27:04 2003 +--- setup.py.orig Wed Oct 22 00:41:15 2003 ++++ setup.py Thu Oct 30 06:21:21 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,16 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -1128,7 +1128,7 @@ +@@ -770,7 +770,7 @@ + # Linux-specific modules + exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + +- if platform in ('linux2', 'freebsd4'): ++ if platform in ('linux2', 'freebsd4', 'freebsd5'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + + if platform == 'sunos5': +@@ -1140,7 +1140,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index e80918c71206..6d00ab24f61c 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -73,6 +73,7 @@ include/%%PYTHON_VERSION%%/ucnhash.h include/%%PYTHON_VERSION%%/unicodeobject.h include/%%PYTHON_VERSION%%/weakrefobject.h %%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so +%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo @@ -628,6 +629,9 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo lib/%%PYTHON_VERSION%%/encodings/base64_codec.py lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc +lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo lib/%%PYTHON_VERSION%%/encodings/charmap.py lib/%%PYTHON_VERSION%%/encodings/charmap.pyc lib/%%PYTHON_VERSION%%/encodings/charmap.pyo @@ -1070,7 +1074,6 @@ lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyc lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyo lib/%%PYTHON_VERSION%%/idlelib/extend.txt lib/%%PYTHON_VERSION%%/idlelib/help.txt -lib/%%PYTHON_VERSION%%/idlelib/idle lib/%%PYTHON_VERSION%%/idlelib/idle.bat lib/%%PYTHON_VERSION%%/idlelib/idle.py lib/%%PYTHON_VERSION%%/idlelib/idle.pyc @@ -1136,6 +1139,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so +%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so lib/%%PYTHON_VERSION%%/lib-dynload/grp.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so @@ -1152,6 +1156,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so +%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so @@ -1583,7 +1588,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_httplib lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_logging -lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 lib/%%PYTHON_VERSION%%/test/output/test_mmap @@ -1656,6 +1660,9 @@ lib/%%PYTHON_VERSION%%/test/test___all__.pyo lib/%%PYTHON_VERSION%%/test/test___future__.py lib/%%PYTHON_VERSION%%/test/test___future__.pyc lib/%%PYTHON_VERSION%%/test/test___future__.pyo +lib/%%PYTHON_VERSION%%/test/test__locale.py +lib/%%PYTHON_VERSION%%/test/test__locale.pyc +lib/%%PYTHON_VERSION%%/test/test__locale.pyo lib/%%PYTHON_VERSION%%/test/test_aepack.py lib/%%PYTHON_VERSION%%/test/test_aepack.pyc lib/%%PYTHON_VERSION%%/test/test_aepack.pyo |