diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2004-07-08 15:53:45 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2004-07-08 15:53:45 +0000 |
| commit | 95340a84dc81dbf3fe8377e5a7d185b82ca5ea65 (patch) | |
| tree | 0ddef3879cda667274ea8c93c7af429c924ee74b | |
| parent | update to 3.00: (diff) | |
- Update to 2.4a1, the first alpha release of Python 2.4.
- Provide USE_PYTHON_BUILD and USE_PYTHON_RUN to allow explicit
dependencies. [1]
- Provide PYDISTUTILS_CONFIGUREARGS and run ${PYSETUP} config on
'do-configure' targets. [2]
Reviewed by: eik [1]
Submitted by: Mike Brown <mike@skew.org>
Notes
Notes:
svn path=/head/; revision=113222
43 files changed, 659 insertions, 268 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index f3feafcbc518..7a4a251044f9 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -93,7 +93,7 @@ Python_Include_MAINTAINER= perky@FreeBSD.org # the distutils are in the base distribution. # # PYNUMERIC: Dependency line for the numeric extension. Py-Numeric-17 -# is the last release that works with Python versions older +# is the last release that works with Python versions older # than 1.6. # # PYXML: Dependency line for the XML extension. As of Python-2.0, @@ -101,7 +101,11 @@ Python_Include_MAINTAINER= perky@FreeBSD.org # # USE_PYTHON_PREFIX: Says that the port installs in ${PYTHONBASE}. # -# USE_PYDISTUTILS: Use distutils as do-build and do-install target. +# USE_PYDISTUTILS: Use distutils as do-configure, do-build and do-install +# targets. +# +# PYDISTUTILS_CONFIGUREARGS: Arguments to config with distutils. +# default: <empty> # # PYDISTUTILS_BUILDARGS: Arguments to build with distutils. # default: <empty> @@ -132,6 +136,19 @@ _PYTHON_VERSION!= ${_PYTHON_CMD} -c \ || ${ECHO_CMD} ${_PYTHON_PORTBRANCH} .endif # defined(PYTHON_VERSION) +.if !defined(USE_PYTHON) +.if defined(USE_PYTHON_BUILD) +USE_PYTHON= ${USE_PYTHON_BUILD} +.elif defined(USE_PYTHON_RUN) +USE_PYTHON= ${USE_PYTHON_RUN} +.else +USE_PYTHON= any +.endif # defined(USE_PYTHON_BUILD) +.else +USE_PYTHON_BUILD= yes +USE_PYTHON_RUN= yes +.endif # !defined(USE_PYTHON) + # Validate Python version whether it meets USE_PYTHON version restriction. _PYTHON_VERSION_CHECK!= ${ECHO_CMD} "${USE_PYTHON}" | \ ${SED} 's/^\([1-9]\.[0-9]\)$$/\1-\1/' @@ -185,7 +202,7 @@ PYTHON_PORTVERSION= ${_PYTHON_PORTVERSION} # Python-2.4 .if ${PYTHON_VERSION} == "python2.4" -PYTHON_PORTVERSION?=2.4.a0.20040311 +PYTHON_PORTVERSION?=2.4.a1 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel PYTHON_REL= 240 PYTHON_SUFFIX= 24 @@ -231,16 +248,16 @@ check-makevars:: @${FALSE} .endif -.if 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_MASTER_SITES= ${MASTER_SITE_PYTHON} +.if defined(PYTHON_REL) && ${PYTHON_REL} == 240 +PYTHON_MASTER_SITE_SUBDIR= ftp/python/2.4 +PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION:S/2.4./2.4/}.tar.gz +PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION:S/2.4./2.4/} +.else 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} +.endif # defined(PYTHON_REL) && ${PYTHON_REL} == 240 PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION} PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION} @@ -254,6 +271,7 @@ PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};} PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};} PYSETUP?= setup.py +PYDISTUTILS_CONFIGUREARGS?= PYDISTUTILS_BUILDARGS?= PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX} @@ -278,8 +296,12 @@ PYEXPAT= ${PYTHON_LIBDIR}/lib-dynload/pyexpat.so:${PYTHON_PORTSDIR} PYTHON_NO_DEPENDS?= NO .if ${PYTHON_NO_DEPENDS} == "NO" +.if defined(USE_PYTHON_BUILD) BUILD_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} +.endif +.if defined(USE_PYTHON_RUN) RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} +.endif .endif # ${PYTHON_NO_DEPENDS} == "NO" .if defined(USE_ZOPE) @@ -316,6 +338,11 @@ Python_Post_Include= bsd.python.mk # py-distutils support .if defined(USE_PYDISTUTILS) +.if !target(do-configure) +do-configure: + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} config ${PYDISTUTILS_CONFIGUREARGS}) +.endif + .if !target(do-build) do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} build ${PYDISTUTILS_BUILDARGS}) diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 8c2b27bc134d..a9c98c31e232 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20040311 +PORTVERSION= 2.4.a1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -115,6 +115,8 @@ post-extract: ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py post-patch: ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ @@ -170,7 +172,7 @@ post-install: @# additional files installing by ports ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${PREFIX}/bin + ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo index bc902a0cc5f7..6a4e5b2dc5df 100644 --- a/lang/python-devel/distinfo +++ b/lang/python-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4.a0.20040311.tgz) = 5619b787ce62a1ebac3c973179d36670 -SIZE (python/Python-2.4.a0.20040311.tgz) = 8512702 +MD5 (python/Python-2.4a1.tar.gz) = 7a69d4e7289e5b16ed205fdfddaf0492 +SIZE (python/Python-2.4a1.tar.gz) = 9024737 diff --git a/lang/python-devel/files/patch-Lib-test-test_socket.py b/lang/python-devel/files/patch-Lib-test-test_socket.py new file mode 100644 index 000000000000..33b9fb389f54 --- /dev/null +++ b/lang/python-devel/files/patch-Lib-test-test_socket.py @@ -0,0 +1,11 @@ +--- Lib/test/test_socket.py.orig Fri Jul 9 00:27:03 2004 ++++ Lib/test/test_socket.py Fri Jul 9 00:27:11 2004 +@@ -289,7 +289,7 @@ + # Find one service that exists, then check all the related interfaces. + # I've ordered this by protocols that have both a tcp and udp + # protocol, at least for modern Linuxes. +- for service in ('echo', 'daytime', 'domain'): ++ for service in ('daytime', 'domain'): + try: + port = socket.getservbyname(service, 'tcp') + break diff --git a/lang/python-devel/files/patch-Makefile.pre.in b/lang/python-devel/files/patch-Makefile.pre.in deleted file mode 100644 index e2353b942195..000000000000 --- a/lang/python-devel/files/patch-Makefile.pre.in +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.pre.in.orig Sat Sep 20 19:50:48 2003 -+++ Makefile.pre.in Sat Nov 15 22:34:55 2003 -@@ -714,11 +714,11 @@ - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python-devel/files/patch-setup.py b/lang/python-devel/files/patch-setup.py index acf4e60dc734..003d0a4ae1fd 100644 --- a/lang/python-devel/files/patch-setup.py +++ b/lang/python-devel/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Wed Oct 22 00:41:15 2003 -+++ setup.py Thu Oct 30 06:21:21 2003 +--- setup.py.orig Sun Jun 27 07:29:42 2004 ++++ setup.py Thu Jul 8 23:55:04 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -770,7 +770,7 @@ +@@ -778,7 +778,7 @@ # Linux-specific modules exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) @@ -18,11 +18,12 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) if platform == 'sunos5': -@@ -1140,7 +1140,7 @@ +@@ -1160,8 +1160,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Lib/smtpd.py'] + scripts = [] ) diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist index 89a833084ebb..fb801f3ec8c1 100644 --- a/lang/python-devel/pkg-plist +++ b/lang/python-devel/pkg-plist @@ -2,6 +2,7 @@ bin/idle%%PYVER%% bin/pydoc%%PYVER%% bin/python%%PYVER%% bin/python-shared%%PYVER%% +bin/smtpd%%PYVER%%.py include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h @@ -25,6 +26,7 @@ include/%%PYTHON_VERSION%%/fileobject.h include/%%PYTHON_VERSION%%/floatobject.h include/%%PYTHON_VERSION%%/frameobject.h include/%%PYTHON_VERSION%%/funcobject.h +include/%%PYTHON_VERSION%%/genobject.h include/%%PYTHON_VERSION%%/graminit.h include/%%PYTHON_VERSION%%/grammar.h include/%%PYTHON_VERSION%%/import.h @@ -58,6 +60,7 @@ include/%%PYTHON_VERSION%%/pymactoolbox.h include/%%PYTHON_VERSION%%/pymem.h include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h +include/%%PYTHON_VERSION%%/pystrtod.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h include/%%PYTHON_VERSION%%/rangeobject.h @@ -68,6 +71,7 @@ include/%%PYTHON_VERSION%%/structmember.h include/%%PYTHON_VERSION%%/structseq.h include/%%PYTHON_VERSION%%/symtable.h include/%%PYTHON_VERSION%%/sysmodule.h +include/%%PYTHON_VERSION%%/timefuncs.h include/%%PYTHON_VERSION%%/token.h include/%%PYTHON_VERSION%%/traceback.h include/%%PYTHON_VERSION%%/tupleobject.h @@ -131,6 +135,12 @@ lib/%%PYTHON_VERSION%%/UserList.pyo lib/%%PYTHON_VERSION%%/UserString.py lib/%%PYTHON_VERSION%%/UserString.pyc lib/%%PYTHON_VERSION%%/UserString.pyo +lib/%%PYTHON_VERSION%%/_LWPCookieJar.py +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyc +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyo +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.py +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyc +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyo lib/%%PYTHON_VERSION%%/__future__.py lib/%%PYTHON_VERSION%%/__future__.pyc lib/%%PYTHON_VERSION%%/__future__.pyo @@ -316,6 +326,9 @@ lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.so lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o +lib/%%PYTHON_VERSION%%/cookielib.py +lib/%%PYTHON_VERSION%%/cookielib.pyc +lib/%%PYTHON_VERSION%%/cookielib.pyo lib/%%PYTHON_VERSION%%/copy.py lib/%%PYTHON_VERSION%%/copy.pyc lib/%%PYTHON_VERSION%%/copy.pyo @@ -346,6 +359,9 @@ lib/%%PYTHON_VERSION%%/curses/wrapper.pyo lib/%%PYTHON_VERSION%%/dbhash.py lib/%%PYTHON_VERSION%%/dbhash.pyc lib/%%PYTHON_VERSION%%/dbhash.pyo +lib/%%PYTHON_VERSION%%/decimal.py +lib/%%PYTHON_VERSION%%/decimal.pyc +lib/%%PYTHON_VERSION%%/decimal.pyo lib/%%PYTHON_VERSION%%/difflib.py lib/%%PYTHON_VERSION%%/difflib.pyc lib/%%PYTHON_VERSION%%/difflib.pyo @@ -401,6 +417,9 @@ lib/%%PYTHON_VERSION%%/distutils/command/build_py.pyo lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.py lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyc lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.py +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyc +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyo lib/%%PYTHON_VERSION%%/distutils/command/clean.py lib/%%PYTHON_VERSION%%/distutils/command/clean.pyc lib/%%PYTHON_VERSION%%/distutils/command/clean.pyo @@ -515,6 +534,9 @@ lib/%%PYTHON_VERSION%%/email/Encoders.pyo lib/%%PYTHON_VERSION%%/email/Errors.py lib/%%PYTHON_VERSION%%/email/Errors.pyc lib/%%PYTHON_VERSION%%/email/Errors.pyo +lib/%%PYTHON_VERSION%%/email/FeedParser.py +lib/%%PYTHON_VERSION%%/email/FeedParser.pyc +lib/%%PYTHON_VERSION%%/email/FeedParser.pyo lib/%%PYTHON_VERSION%%/email/Generator.py lib/%%PYTHON_VERSION%%/email/Generator.pyc lib/%%PYTHON_VERSION%%/email/Generator.pyo @@ -557,12 +579,6 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo lib/%%PYTHON_VERSION%%/email/__init__.py lib/%%PYTHON_VERSION%%/email/__init__.pyc lib/%%PYTHON_VERSION%%/email/__init__.pyo -lib/%%PYTHON_VERSION%%/email/_compat21.py -lib/%%PYTHON_VERSION%%/email/_compat21.pyc -lib/%%PYTHON_VERSION%%/email/_compat21.pyo -lib/%%PYTHON_VERSION%%/email/_compat22.py -lib/%%PYTHON_VERSION%%/email/_compat22.pyc -lib/%%PYTHON_VERSION%%/email/_compat22.pyo lib/%%PYTHON_VERSION%%/email/_parseaddr.py lib/%%PYTHON_VERSION%%/email/_parseaddr.pyc lib/%%PYTHON_VERSION%%/email/_parseaddr.pyo @@ -589,6 +605,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_09.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_10.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_11.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_12.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_12a.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_13.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt @@ -612,6 +629,11 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_32.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_33.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_34.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_35.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_36.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_37.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_38.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -870,6 +892,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/palmos.py lib/%%PYTHON_VERSION%%/encodings/palmos.pyc lib/%%PYTHON_VERSION%%/encodings/palmos.pyo +lib/%%PYTHON_VERSION%%/encodings/ptcp154.py +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyc +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyo lib/%%PYTHON_VERSION%%/encodings/punycode.py lib/%%PYTHON_VERSION%%/encodings/punycode.pyc lib/%%PYTHON_VERSION%%/encodings/punycode.pyo @@ -957,6 +982,9 @@ lib/%%PYTHON_VERSION%%/gopherlib.pyo lib/%%PYTHON_VERSION%%/gzip.py lib/%%PYTHON_VERSION%%/gzip.pyc lib/%%PYTHON_VERSION%%/gzip.pyo +lib/%%PYTHON_VERSION%%/heapq.py +lib/%%PYTHON_VERSION%%/heapq.pyc +lib/%%PYTHON_VERSION%%/heapq.pyo lib/%%PYTHON_VERSION%%/hmac.py lib/%%PYTHON_VERSION%%/hmac.pyc lib/%%PYTHON_VERSION%%/hmac.pyo @@ -998,6 +1026,9 @@ lib/%%PYTHON_VERSION%%/idlelib/ChangeLog lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.py lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyc lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyo +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.py +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyc +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyo lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.py lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyc lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyo @@ -1207,6 +1238,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_shift_jisx0213.so lib/%%PYTHON_VERSION%%/lib-dynload/_csv.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so +lib/%%PYTHON_VERSION%%/lib-dynload/_heapq.so lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so lib/%%PYTHON_VERSION%%/lib-dynload/_multibytecodec.so @@ -1230,7 +1262,6 @@ 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 -lib/%%PYTHON_VERSION%%/lib-dynload/heapq.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so lib/%%PYTHON_VERSION%%/lib-dynload/itertools.so lib/%%PYTHON_VERSION%%/lib-dynload/math.so @@ -1240,7 +1271,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/nis.so lib/%%PYTHON_VERSION%%/lib-dynload/operator.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so -lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so @@ -1498,9 +1528,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/pre.py -lib/%%PYTHON_VERSION%%/pre.pyc -lib/%%PYTHON_VERSION%%/pre.pyo lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc @@ -1658,6 +1685,7 @@ lib/%%PYTHON_VERSION%%/test/badsyntax_future7.py lib/%%PYTHON_VERSION%%/test/badsyntax_future8.py lib/%%PYTHON_VERSION%%/test/badsyntax_future9.py lib/%%PYTHON_VERSION%%/test/badsyntax_nocaret.py +lib/%%PYTHON_VERSION%%/test/cfgparser.1 lib/%%PYTHON_VERSION%%/test/cjkencodings_test.py lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyc lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyo @@ -1668,10 +1696,12 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo +lib/%%PYTHON_VERSION%%/test/mapping_tests.py +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyc +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyo lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter lib/%%PYTHON_VERSION%%/test/output/test_asynchat lib/%%PYTHON_VERSION%%/test/output/test_augassign -lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_coercion @@ -1893,6 +1923,9 @@ lib/%%PYTHON_VERSION%%/test/test_codeop.pyo lib/%%PYTHON_VERSION%%/test/test_coercion.py lib/%%PYTHON_VERSION%%/test/test_coercion.pyc lib/%%PYTHON_VERSION%%/test/test_coercion.pyo +lib/%%PYTHON_VERSION%%/test/test_colorsys.py +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyc +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyo lib/%%PYTHON_VERSION%%/test/test_commands.py lib/%%PYTHON_VERSION%%/test/test_commands.pyc lib/%%PYTHON_VERSION%%/test/test_commands.pyo @@ -1911,6 +1944,9 @@ lib/%%PYTHON_VERSION%%/test/test_contains.pyo lib/%%PYTHON_VERSION%%/test/test_cookie.py lib/%%PYTHON_VERSION%%/test/test_cookie.pyc lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_cookielib.py +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyc +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyo lib/%%PYTHON_VERSION%%/test/test_copy.py lib/%%PYTHON_VERSION%%/test/test_copy.pyc lib/%%PYTHON_VERSION%%/test/test_copy.pyo @@ -1935,6 +1971,9 @@ lib/%%PYTHON_VERSION%%/test/test_datetime.pyo lib/%%PYTHON_VERSION%%/test/test_dbm.py lib/%%PYTHON_VERSION%%/test/test_dbm.pyc lib/%%PYTHON_VERSION%%/test/test_dbm.pyo +lib/%%PYTHON_VERSION%%/test/test_decimal.py +lib/%%PYTHON_VERSION%%/test/test_decimal.pyc +lib/%%PYTHON_VERSION%%/test/test_decimal.pyo lib/%%PYTHON_VERSION%%/test/test_deque.py lib/%%PYTHON_VERSION%%/test/test_deque.pyc lib/%%PYTHON_VERSION%%/test/test_deque.pyo @@ -1953,6 +1992,9 @@ lib/%%PYTHON_VERSION%%/test/test_dircache.pyo lib/%%PYTHON_VERSION%%/test/test_dis.py lib/%%PYTHON_VERSION%%/test/test_dis.pyc lib/%%PYTHON_VERSION%%/test/test_dis.pyo +lib/%%PYTHON_VERSION%%/test/test_distutils.py +lib/%%PYTHON_VERSION%%/test/test_distutils.pyc +lib/%%PYTHON_VERSION%%/test/test_distutils.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo @@ -2043,6 +2085,9 @@ lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo lib/%%PYTHON_VERSION%%/test/test_generators.py lib/%%PYTHON_VERSION%%/test/test_generators.pyc lib/%%PYTHON_VERSION%%/test/test_generators.pyo +lib/%%PYTHON_VERSION%%/test/test_genexps.py +lib/%%PYTHON_VERSION%%/test/test_genexps.pyc +lib/%%PYTHON_VERSION%%/test/test_genexps.pyo lib/%%PYTHON_VERSION%%/test/test_getargs.py lib/%%PYTHON_VERSION%%/test/test_getargs.pyc lib/%%PYTHON_VERSION%%/test/test_getargs.pyo @@ -2127,6 +2172,9 @@ lib/%%PYTHON_VERSION%%/test/test_isinstance.pyo lib/%%PYTHON_VERSION%%/test/test_iter.py lib/%%PYTHON_VERSION%%/test/test_iter.pyc lib/%%PYTHON_VERSION%%/test/test_iter.pyo +lib/%%PYTHON_VERSION%%/test/test_iterlen.py +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyc +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyo lib/%%PYTHON_VERSION%%/test/test_itertools.py lib/%%PYTHON_VERSION%%/test/test_itertools.pyc lib/%%PYTHON_VERSION%%/test/test_itertools.pyo @@ -2382,6 +2430,9 @@ lib/%%PYTHON_VERSION%%/test/test_shutil.pyo lib/%%PYTHON_VERSION%%/test/test_signal.py lib/%%PYTHON_VERSION%%/test/test_signal.pyc lib/%%PYTHON_VERSION%%/test/test_signal.pyo +lib/%%PYTHON_VERSION%%/test/test_site.py +lib/%%PYTHON_VERSION%%/test/test_site.pyc +lib/%%PYTHON_VERSION%%/test/test_site.pyo lib/%%PYTHON_VERSION%%/test/test_slice.py lib/%%PYTHON_VERSION%%/test/test_slice.pyc lib/%%PYTHON_VERSION%%/test/test_slice.pyo @@ -2562,6 +2613,9 @@ lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyo lib/%%PYTHON_VERSION%%/test/test_xpickle.py lib/%%PYTHON_VERSION%%/test/test_xpickle.pyc lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo +lib/%%PYTHON_VERSION%%/test/test_xrange.py +lib/%%PYTHON_VERSION%%/test/test_xrange.pyc +lib/%%PYTHON_VERSION%%/test/test_xrange.pyo lib/%%PYTHON_VERSION%%/test/test_xreadline.py lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 8c2b27bc134d..a9c98c31e232 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20040311 +PORTVERSION= 2.4.a1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -115,6 +115,8 @@ post-extract: ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py post-patch: ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ @@ -170,7 +172,7 @@ post-install: @# additional files installing by ports ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${PREFIX}/bin + ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python25/distinfo b/lang/python25/distinfo index bc902a0cc5f7..6a4e5b2dc5df 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4.a0.20040311.tgz) = 5619b787ce62a1ebac3c973179d36670 -SIZE (python/Python-2.4.a0.20040311.tgz) = 8512702 +MD5 (python/Python-2.4a1.tar.gz) = 7a69d4e7289e5b16ed205fdfddaf0492 +SIZE (python/Python-2.4a1.tar.gz) = 9024737 diff --git a/lang/python25/files/patch-Lib-test-test_socket.py b/lang/python25/files/patch-Lib-test-test_socket.py new file mode 100644 index 000000000000..33b9fb389f54 --- /dev/null +++ b/lang/python25/files/patch-Lib-test-test_socket.py @@ -0,0 +1,11 @@ +--- Lib/test/test_socket.py.orig Fri Jul 9 00:27:03 2004 ++++ Lib/test/test_socket.py Fri Jul 9 00:27:11 2004 +@@ -289,7 +289,7 @@ + # Find one service that exists, then check all the related interfaces. + # I've ordered this by protocols that have both a tcp and udp + # protocol, at least for modern Linuxes. +- for service in ('echo', 'daytime', 'domain'): ++ for service in ('daytime', 'domain'): + try: + port = socket.getservbyname(service, 'tcp') + break diff --git a/lang/python25/files/patch-Makefile.pre.in b/lang/python25/files/patch-Makefile.pre.in deleted file mode 100644 index e2353b942195..000000000000 --- a/lang/python25/files/patch-Makefile.pre.in +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.pre.in.orig Sat Sep 20 19:50:48 2003 -+++ Makefile.pre.in Sat Nov 15 22:34:55 2003 -@@ -714,11 +714,11 @@ - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python25/files/patch-setup.py b/lang/python25/files/patch-setup.py index acf4e60dc734..003d0a4ae1fd 100644 --- a/lang/python25/files/patch-setup.py +++ b/lang/python25/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Wed Oct 22 00:41:15 2003 -+++ setup.py Thu Oct 30 06:21:21 2003 +--- setup.py.orig Sun Jun 27 07:29:42 2004 ++++ setup.py Thu Jul 8 23:55:04 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -770,7 +770,7 @@ +@@ -778,7 +778,7 @@ # Linux-specific modules exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) @@ -18,11 +18,12 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) if platform == 'sunos5': -@@ -1140,7 +1140,7 @@ +@@ -1160,8 +1160,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Lib/smtpd.py'] + scripts = [] ) diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index 89a833084ebb..fb801f3ec8c1 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -2,6 +2,7 @@ bin/idle%%PYVER%% bin/pydoc%%PYVER%% bin/python%%PYVER%% bin/python-shared%%PYVER%% +bin/smtpd%%PYVER%%.py include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h @@ -25,6 +26,7 @@ include/%%PYTHON_VERSION%%/fileobject.h include/%%PYTHON_VERSION%%/floatobject.h include/%%PYTHON_VERSION%%/frameobject.h include/%%PYTHON_VERSION%%/funcobject.h +include/%%PYTHON_VERSION%%/genobject.h include/%%PYTHON_VERSION%%/graminit.h include/%%PYTHON_VERSION%%/grammar.h include/%%PYTHON_VERSION%%/import.h @@ -58,6 +60,7 @@ include/%%PYTHON_VERSION%%/pymactoolbox.h include/%%PYTHON_VERSION%%/pymem.h include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h +include/%%PYTHON_VERSION%%/pystrtod.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h include/%%PYTHON_VERSION%%/rangeobject.h @@ -68,6 +71,7 @@ include/%%PYTHON_VERSION%%/structmember.h include/%%PYTHON_VERSION%%/structseq.h include/%%PYTHON_VERSION%%/symtable.h include/%%PYTHON_VERSION%%/sysmodule.h +include/%%PYTHON_VERSION%%/timefuncs.h include/%%PYTHON_VERSION%%/token.h include/%%PYTHON_VERSION%%/traceback.h include/%%PYTHON_VERSION%%/tupleobject.h @@ -131,6 +135,12 @@ lib/%%PYTHON_VERSION%%/UserList.pyo lib/%%PYTHON_VERSION%%/UserString.py lib/%%PYTHON_VERSION%%/UserString.pyc lib/%%PYTHON_VERSION%%/UserString.pyo +lib/%%PYTHON_VERSION%%/_LWPCookieJar.py +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyc +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyo +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.py +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyc +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyo lib/%%PYTHON_VERSION%%/__future__.py lib/%%PYTHON_VERSION%%/__future__.pyc lib/%%PYTHON_VERSION%%/__future__.pyo @@ -316,6 +326,9 @@ lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.so lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o +lib/%%PYTHON_VERSION%%/cookielib.py +lib/%%PYTHON_VERSION%%/cookielib.pyc +lib/%%PYTHON_VERSION%%/cookielib.pyo lib/%%PYTHON_VERSION%%/copy.py lib/%%PYTHON_VERSION%%/copy.pyc lib/%%PYTHON_VERSION%%/copy.pyo @@ -346,6 +359,9 @@ lib/%%PYTHON_VERSION%%/curses/wrapper.pyo lib/%%PYTHON_VERSION%%/dbhash.py lib/%%PYTHON_VERSION%%/dbhash.pyc lib/%%PYTHON_VERSION%%/dbhash.pyo +lib/%%PYTHON_VERSION%%/decimal.py +lib/%%PYTHON_VERSION%%/decimal.pyc +lib/%%PYTHON_VERSION%%/decimal.pyo lib/%%PYTHON_VERSION%%/difflib.py lib/%%PYTHON_VERSION%%/difflib.pyc lib/%%PYTHON_VERSION%%/difflib.pyo @@ -401,6 +417,9 @@ lib/%%PYTHON_VERSION%%/distutils/command/build_py.pyo lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.py lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyc lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.py +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyc +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyo lib/%%PYTHON_VERSION%%/distutils/command/clean.py lib/%%PYTHON_VERSION%%/distutils/command/clean.pyc lib/%%PYTHON_VERSION%%/distutils/command/clean.pyo @@ -515,6 +534,9 @@ lib/%%PYTHON_VERSION%%/email/Encoders.pyo lib/%%PYTHON_VERSION%%/email/Errors.py lib/%%PYTHON_VERSION%%/email/Errors.pyc lib/%%PYTHON_VERSION%%/email/Errors.pyo +lib/%%PYTHON_VERSION%%/email/FeedParser.py +lib/%%PYTHON_VERSION%%/email/FeedParser.pyc +lib/%%PYTHON_VERSION%%/email/FeedParser.pyo lib/%%PYTHON_VERSION%%/email/Generator.py lib/%%PYTHON_VERSION%%/email/Generator.pyc lib/%%PYTHON_VERSION%%/email/Generator.pyo @@ -557,12 +579,6 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo lib/%%PYTHON_VERSION%%/email/__init__.py lib/%%PYTHON_VERSION%%/email/__init__.pyc lib/%%PYTHON_VERSION%%/email/__init__.pyo -lib/%%PYTHON_VERSION%%/email/_compat21.py -lib/%%PYTHON_VERSION%%/email/_compat21.pyc -lib/%%PYTHON_VERSION%%/email/_compat21.pyo -lib/%%PYTHON_VERSION%%/email/_compat22.py -lib/%%PYTHON_VERSION%%/email/_compat22.pyc -lib/%%PYTHON_VERSION%%/email/_compat22.pyo lib/%%PYTHON_VERSION%%/email/_parseaddr.py lib/%%PYTHON_VERSION%%/email/_parseaddr.pyc lib/%%PYTHON_VERSION%%/email/_parseaddr.pyo @@ -589,6 +605,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_09.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_10.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_11.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_12.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_12a.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_13.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt @@ -612,6 +629,11 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_32.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_33.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_34.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_35.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_36.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_37.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_38.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -870,6 +892,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/palmos.py lib/%%PYTHON_VERSION%%/encodings/palmos.pyc lib/%%PYTHON_VERSION%%/encodings/palmos.pyo +lib/%%PYTHON_VERSION%%/encodings/ptcp154.py +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyc +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyo lib/%%PYTHON_VERSION%%/encodings/punycode.py lib/%%PYTHON_VERSION%%/encodings/punycode.pyc lib/%%PYTHON_VERSION%%/encodings/punycode.pyo @@ -957,6 +982,9 @@ lib/%%PYTHON_VERSION%%/gopherlib.pyo lib/%%PYTHON_VERSION%%/gzip.py lib/%%PYTHON_VERSION%%/gzip.pyc lib/%%PYTHON_VERSION%%/gzip.pyo +lib/%%PYTHON_VERSION%%/heapq.py +lib/%%PYTHON_VERSION%%/heapq.pyc +lib/%%PYTHON_VERSION%%/heapq.pyo lib/%%PYTHON_VERSION%%/hmac.py lib/%%PYTHON_VERSION%%/hmac.pyc lib/%%PYTHON_VERSION%%/hmac.pyo @@ -998,6 +1026,9 @@ lib/%%PYTHON_VERSION%%/idlelib/ChangeLog lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.py lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyc lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyo +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.py +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyc +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyo lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.py lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyc lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyo @@ -1207,6 +1238,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_shift_jisx0213.so lib/%%PYTHON_VERSION%%/lib-dynload/_csv.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so +lib/%%PYTHON_VERSION%%/lib-dynload/_heapq.so lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so lib/%%PYTHON_VERSION%%/lib-dynload/_multibytecodec.so @@ -1230,7 +1262,6 @@ 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 -lib/%%PYTHON_VERSION%%/lib-dynload/heapq.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so lib/%%PYTHON_VERSION%%/lib-dynload/itertools.so lib/%%PYTHON_VERSION%%/lib-dynload/math.so @@ -1240,7 +1271,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/nis.so lib/%%PYTHON_VERSION%%/lib-dynload/operator.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so -lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so @@ -1498,9 +1528,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/pre.py -lib/%%PYTHON_VERSION%%/pre.pyc -lib/%%PYTHON_VERSION%%/pre.pyo lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc @@ -1658,6 +1685,7 @@ lib/%%PYTHON_VERSION%%/test/badsyntax_future7.py lib/%%PYTHON_VERSION%%/test/badsyntax_future8.py lib/%%PYTHON_VERSION%%/test/badsyntax_future9.py lib/%%PYTHON_VERSION%%/test/badsyntax_nocaret.py +lib/%%PYTHON_VERSION%%/test/cfgparser.1 lib/%%PYTHON_VERSION%%/test/cjkencodings_test.py lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyc lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyo @@ -1668,10 +1696,12 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo +lib/%%PYTHON_VERSION%%/test/mapping_tests.py +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyc +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyo lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter lib/%%PYTHON_VERSION%%/test/output/test_asynchat lib/%%PYTHON_VERSION%%/test/output/test_augassign -lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_coercion @@ -1893,6 +1923,9 @@ lib/%%PYTHON_VERSION%%/test/test_codeop.pyo lib/%%PYTHON_VERSION%%/test/test_coercion.py lib/%%PYTHON_VERSION%%/test/test_coercion.pyc lib/%%PYTHON_VERSION%%/test/test_coercion.pyo +lib/%%PYTHON_VERSION%%/test/test_colorsys.py +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyc +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyo lib/%%PYTHON_VERSION%%/test/test_commands.py lib/%%PYTHON_VERSION%%/test/test_commands.pyc lib/%%PYTHON_VERSION%%/test/test_commands.pyo @@ -1911,6 +1944,9 @@ lib/%%PYTHON_VERSION%%/test/test_contains.pyo lib/%%PYTHON_VERSION%%/test/test_cookie.py lib/%%PYTHON_VERSION%%/test/test_cookie.pyc lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_cookielib.py +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyc +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyo lib/%%PYTHON_VERSION%%/test/test_copy.py lib/%%PYTHON_VERSION%%/test/test_copy.pyc lib/%%PYTHON_VERSION%%/test/test_copy.pyo @@ -1935,6 +1971,9 @@ lib/%%PYTHON_VERSION%%/test/test_datetime.pyo lib/%%PYTHON_VERSION%%/test/test_dbm.py lib/%%PYTHON_VERSION%%/test/test_dbm.pyc lib/%%PYTHON_VERSION%%/test/test_dbm.pyo +lib/%%PYTHON_VERSION%%/test/test_decimal.py +lib/%%PYTHON_VERSION%%/test/test_decimal.pyc +lib/%%PYTHON_VERSION%%/test/test_decimal.pyo lib/%%PYTHON_VERSION%%/test/test_deque.py lib/%%PYTHON_VERSION%%/test/test_deque.pyc lib/%%PYTHON_VERSION%%/test/test_deque.pyo @@ -1953,6 +1992,9 @@ lib/%%PYTHON_VERSION%%/test/test_dircache.pyo lib/%%PYTHON_VERSION%%/test/test_dis.py lib/%%PYTHON_VERSION%%/test/test_dis.pyc lib/%%PYTHON_VERSION%%/test/test_dis.pyo +lib/%%PYTHON_VERSION%%/test/test_distutils.py +lib/%%PYTHON_VERSION%%/test/test_distutils.pyc +lib/%%PYTHON_VERSION%%/test/test_distutils.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo @@ -2043,6 +2085,9 @@ lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo lib/%%PYTHON_VERSION%%/test/test_generators.py lib/%%PYTHON_VERSION%%/test/test_generators.pyc lib/%%PYTHON_VERSION%%/test/test_generators.pyo +lib/%%PYTHON_VERSION%%/test/test_genexps.py +lib/%%PYTHON_VERSION%%/test/test_genexps.pyc +lib/%%PYTHON_VERSION%%/test/test_genexps.pyo lib/%%PYTHON_VERSION%%/test/test_getargs.py lib/%%PYTHON_VERSION%%/test/test_getargs.pyc lib/%%PYTHON_VERSION%%/test/test_getargs.pyo @@ -2127,6 +2172,9 @@ lib/%%PYTHON_VERSION%%/test/test_isinstance.pyo lib/%%PYTHON_VERSION%%/test/test_iter.py lib/%%PYTHON_VERSION%%/test/test_iter.pyc lib/%%PYTHON_VERSION%%/test/test_iter.pyo +lib/%%PYTHON_VERSION%%/test/test_iterlen.py +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyc +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyo lib/%%PYTHON_VERSION%%/test/test_itertools.py lib/%%PYTHON_VERSION%%/test/test_itertools.pyc lib/%%PYTHON_VERSION%%/test/test_itertools.pyo @@ -2382,6 +2430,9 @@ lib/%%PYTHON_VERSION%%/test/test_shutil.pyo lib/%%PYTHON_VERSION%%/test/test_signal.py lib/%%PYTHON_VERSION%%/test/test_signal.pyc lib/%%PYTHON_VERSION%%/test/test_signal.pyo +lib/%%PYTHON_VERSION%%/test/test_site.py +lib/%%PYTHON_VERSION%%/test/test_site.pyc +lib/%%PYTHON_VERSION%%/test/test_site.pyo lib/%%PYTHON_VERSION%%/test/test_slice.py lib/%%PYTHON_VERSION%%/test/test_slice.pyc lib/%%PYTHON_VERSION%%/test/test_slice.pyo @@ -2562,6 +2613,9 @@ lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyo lib/%%PYTHON_VERSION%%/test/test_xpickle.py lib/%%PYTHON_VERSION%%/test/test_xpickle.pyc lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo +lib/%%PYTHON_VERSION%%/test/test_xrange.py +lib/%%PYTHON_VERSION%%/test/test_xrange.pyc +lib/%%PYTHON_VERSION%%/test/test_xrange.pyo lib/%%PYTHON_VERSION%%/test/test_xreadline.py lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 8c2b27bc134d..a9c98c31e232 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20040311 +PORTVERSION= 2.4.a1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -115,6 +115,8 @@ post-extract: ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py post-patch: ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ @@ -170,7 +172,7 @@ post-install: @# additional files installing by ports ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${PREFIX}/bin + ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python26/distinfo b/lang/python26/distinfo index bc902a0cc5f7..6a4e5b2dc5df 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4.a0.20040311.tgz) = 5619b787ce62a1ebac3c973179d36670 -SIZE (python/Python-2.4.a0.20040311.tgz) = 8512702 +MD5 (python/Python-2.4a1.tar.gz) = 7a69d4e7289e5b16ed205fdfddaf0492 +SIZE (python/Python-2.4a1.tar.gz) = 9024737 diff --git a/lang/python26/files/patch-Lib-test-test_socket.py b/lang/python26/files/patch-Lib-test-test_socket.py new file mode 100644 index 000000000000..33b9fb389f54 --- /dev/null +++ b/lang/python26/files/patch-Lib-test-test_socket.py @@ -0,0 +1,11 @@ +--- Lib/test/test_socket.py.orig Fri Jul 9 00:27:03 2004 ++++ Lib/test/test_socket.py Fri Jul 9 00:27:11 2004 +@@ -289,7 +289,7 @@ + # Find one service that exists, then check all the related interfaces. + # I've ordered this by protocols that have both a tcp and udp + # protocol, at least for modern Linuxes. +- for service in ('echo', 'daytime', 'domain'): ++ for service in ('daytime', 'domain'): + try: + port = socket.getservbyname(service, 'tcp') + break diff --git a/lang/python26/files/patch-Makefile.pre.in b/lang/python26/files/patch-Makefile.pre.in deleted file mode 100644 index e2353b942195..000000000000 --- a/lang/python26/files/patch-Makefile.pre.in +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.pre.in.orig Sat Sep 20 19:50:48 2003 -+++ Makefile.pre.in Sat Nov 15 22:34:55 2003 -@@ -714,11 +714,11 @@ - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py index acf4e60dc734..003d0a4ae1fd 100644 --- a/lang/python26/files/patch-setup.py +++ b/lang/python26/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Wed Oct 22 00:41:15 2003 -+++ setup.py Thu Oct 30 06:21:21 2003 +--- setup.py.orig Sun Jun 27 07:29:42 2004 ++++ setup.py Thu Jul 8 23:55:04 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -770,7 +770,7 @@ +@@ -778,7 +778,7 @@ # Linux-specific modules exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) @@ -18,11 +18,12 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) if platform == 'sunos5': -@@ -1140,7 +1140,7 @@ +@@ -1160,8 +1160,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Lib/smtpd.py'] + scripts = [] ) diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index 89a833084ebb..fb801f3ec8c1 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -2,6 +2,7 @@ bin/idle%%PYVER%% bin/pydoc%%PYVER%% bin/python%%PYVER%% bin/python-shared%%PYVER%% +bin/smtpd%%PYVER%%.py include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h @@ -25,6 +26,7 @@ include/%%PYTHON_VERSION%%/fileobject.h include/%%PYTHON_VERSION%%/floatobject.h include/%%PYTHON_VERSION%%/frameobject.h include/%%PYTHON_VERSION%%/funcobject.h +include/%%PYTHON_VERSION%%/genobject.h include/%%PYTHON_VERSION%%/graminit.h include/%%PYTHON_VERSION%%/grammar.h include/%%PYTHON_VERSION%%/import.h @@ -58,6 +60,7 @@ include/%%PYTHON_VERSION%%/pymactoolbox.h include/%%PYTHON_VERSION%%/pymem.h include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h +include/%%PYTHON_VERSION%%/pystrtod.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h include/%%PYTHON_VERSION%%/rangeobject.h @@ -68,6 +71,7 @@ include/%%PYTHON_VERSION%%/structmember.h include/%%PYTHON_VERSION%%/structseq.h include/%%PYTHON_VERSION%%/symtable.h include/%%PYTHON_VERSION%%/sysmodule.h +include/%%PYTHON_VERSION%%/timefuncs.h include/%%PYTHON_VERSION%%/token.h include/%%PYTHON_VERSION%%/traceback.h include/%%PYTHON_VERSION%%/tupleobject.h @@ -131,6 +135,12 @@ lib/%%PYTHON_VERSION%%/UserList.pyo lib/%%PYTHON_VERSION%%/UserString.py lib/%%PYTHON_VERSION%%/UserString.pyc lib/%%PYTHON_VERSION%%/UserString.pyo +lib/%%PYTHON_VERSION%%/_LWPCookieJar.py +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyc +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyo +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.py +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyc +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyo lib/%%PYTHON_VERSION%%/__future__.py lib/%%PYTHON_VERSION%%/__future__.pyc lib/%%PYTHON_VERSION%%/__future__.pyo @@ -316,6 +326,9 @@ lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.so lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o +lib/%%PYTHON_VERSION%%/cookielib.py +lib/%%PYTHON_VERSION%%/cookielib.pyc +lib/%%PYTHON_VERSION%%/cookielib.pyo lib/%%PYTHON_VERSION%%/copy.py lib/%%PYTHON_VERSION%%/copy.pyc lib/%%PYTHON_VERSION%%/copy.pyo @@ -346,6 +359,9 @@ lib/%%PYTHON_VERSION%%/curses/wrapper.pyo lib/%%PYTHON_VERSION%%/dbhash.py lib/%%PYTHON_VERSION%%/dbhash.pyc lib/%%PYTHON_VERSION%%/dbhash.pyo +lib/%%PYTHON_VERSION%%/decimal.py +lib/%%PYTHON_VERSION%%/decimal.pyc +lib/%%PYTHON_VERSION%%/decimal.pyo lib/%%PYTHON_VERSION%%/difflib.py lib/%%PYTHON_VERSION%%/difflib.pyc lib/%%PYTHON_VERSION%%/difflib.pyo @@ -401,6 +417,9 @@ lib/%%PYTHON_VERSION%%/distutils/command/build_py.pyo lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.py lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyc lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.py +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyc +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyo lib/%%PYTHON_VERSION%%/distutils/command/clean.py lib/%%PYTHON_VERSION%%/distutils/command/clean.pyc lib/%%PYTHON_VERSION%%/distutils/command/clean.pyo @@ -515,6 +534,9 @@ lib/%%PYTHON_VERSION%%/email/Encoders.pyo lib/%%PYTHON_VERSION%%/email/Errors.py lib/%%PYTHON_VERSION%%/email/Errors.pyc lib/%%PYTHON_VERSION%%/email/Errors.pyo +lib/%%PYTHON_VERSION%%/email/FeedParser.py +lib/%%PYTHON_VERSION%%/email/FeedParser.pyc +lib/%%PYTHON_VERSION%%/email/FeedParser.pyo lib/%%PYTHON_VERSION%%/email/Generator.py lib/%%PYTHON_VERSION%%/email/Generator.pyc lib/%%PYTHON_VERSION%%/email/Generator.pyo @@ -557,12 +579,6 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo lib/%%PYTHON_VERSION%%/email/__init__.py lib/%%PYTHON_VERSION%%/email/__init__.pyc lib/%%PYTHON_VERSION%%/email/__init__.pyo -lib/%%PYTHON_VERSION%%/email/_compat21.py -lib/%%PYTHON_VERSION%%/email/_compat21.pyc -lib/%%PYTHON_VERSION%%/email/_compat21.pyo -lib/%%PYTHON_VERSION%%/email/_compat22.py -lib/%%PYTHON_VERSION%%/email/_compat22.pyc -lib/%%PYTHON_VERSION%%/email/_compat22.pyo lib/%%PYTHON_VERSION%%/email/_parseaddr.py lib/%%PYTHON_VERSION%%/email/_parseaddr.pyc lib/%%PYTHON_VERSION%%/email/_parseaddr.pyo @@ -589,6 +605,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_09.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_10.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_11.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_12.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_12a.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_13.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt @@ -612,6 +629,11 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_32.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_33.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_34.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_35.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_36.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_37.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_38.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -870,6 +892,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/palmos.py lib/%%PYTHON_VERSION%%/encodings/palmos.pyc lib/%%PYTHON_VERSION%%/encodings/palmos.pyo +lib/%%PYTHON_VERSION%%/encodings/ptcp154.py +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyc +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyo lib/%%PYTHON_VERSION%%/encodings/punycode.py lib/%%PYTHON_VERSION%%/encodings/punycode.pyc lib/%%PYTHON_VERSION%%/encodings/punycode.pyo @@ -957,6 +982,9 @@ lib/%%PYTHON_VERSION%%/gopherlib.pyo lib/%%PYTHON_VERSION%%/gzip.py lib/%%PYTHON_VERSION%%/gzip.pyc lib/%%PYTHON_VERSION%%/gzip.pyo +lib/%%PYTHON_VERSION%%/heapq.py +lib/%%PYTHON_VERSION%%/heapq.pyc +lib/%%PYTHON_VERSION%%/heapq.pyo lib/%%PYTHON_VERSION%%/hmac.py lib/%%PYTHON_VERSION%%/hmac.pyc lib/%%PYTHON_VERSION%%/hmac.pyo @@ -998,6 +1026,9 @@ lib/%%PYTHON_VERSION%%/idlelib/ChangeLog lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.py lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyc lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyo +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.py +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyc +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyo lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.py lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyc lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyo @@ -1207,6 +1238,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_shift_jisx0213.so lib/%%PYTHON_VERSION%%/lib-dynload/_csv.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so +lib/%%PYTHON_VERSION%%/lib-dynload/_heapq.so lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so lib/%%PYTHON_VERSION%%/lib-dynload/_multibytecodec.so @@ -1230,7 +1262,6 @@ 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 -lib/%%PYTHON_VERSION%%/lib-dynload/heapq.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so lib/%%PYTHON_VERSION%%/lib-dynload/itertools.so lib/%%PYTHON_VERSION%%/lib-dynload/math.so @@ -1240,7 +1271,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/nis.so lib/%%PYTHON_VERSION%%/lib-dynload/operator.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so -lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so @@ -1498,9 +1528,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/pre.py -lib/%%PYTHON_VERSION%%/pre.pyc -lib/%%PYTHON_VERSION%%/pre.pyo lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc @@ -1658,6 +1685,7 @@ lib/%%PYTHON_VERSION%%/test/badsyntax_future7.py lib/%%PYTHON_VERSION%%/test/badsyntax_future8.py lib/%%PYTHON_VERSION%%/test/badsyntax_future9.py lib/%%PYTHON_VERSION%%/test/badsyntax_nocaret.py +lib/%%PYTHON_VERSION%%/test/cfgparser.1 lib/%%PYTHON_VERSION%%/test/cjkencodings_test.py lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyc lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyo @@ -1668,10 +1696,12 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo +lib/%%PYTHON_VERSION%%/test/mapping_tests.py +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyc +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyo lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter lib/%%PYTHON_VERSION%%/test/output/test_asynchat lib/%%PYTHON_VERSION%%/test/output/test_augassign -lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_coercion @@ -1893,6 +1923,9 @@ lib/%%PYTHON_VERSION%%/test/test_codeop.pyo lib/%%PYTHON_VERSION%%/test/test_coercion.py lib/%%PYTHON_VERSION%%/test/test_coercion.pyc lib/%%PYTHON_VERSION%%/test/test_coercion.pyo +lib/%%PYTHON_VERSION%%/test/test_colorsys.py +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyc +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyo lib/%%PYTHON_VERSION%%/test/test_commands.py lib/%%PYTHON_VERSION%%/test/test_commands.pyc lib/%%PYTHON_VERSION%%/test/test_commands.pyo @@ -1911,6 +1944,9 @@ lib/%%PYTHON_VERSION%%/test/test_contains.pyo lib/%%PYTHON_VERSION%%/test/test_cookie.py lib/%%PYTHON_VERSION%%/test/test_cookie.pyc lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_cookielib.py +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyc +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyo lib/%%PYTHON_VERSION%%/test/test_copy.py lib/%%PYTHON_VERSION%%/test/test_copy.pyc lib/%%PYTHON_VERSION%%/test/test_copy.pyo @@ -1935,6 +1971,9 @@ lib/%%PYTHON_VERSION%%/test/test_datetime.pyo lib/%%PYTHON_VERSION%%/test/test_dbm.py lib/%%PYTHON_VERSION%%/test/test_dbm.pyc lib/%%PYTHON_VERSION%%/test/test_dbm.pyo +lib/%%PYTHON_VERSION%%/test/test_decimal.py +lib/%%PYTHON_VERSION%%/test/test_decimal.pyc +lib/%%PYTHON_VERSION%%/test/test_decimal.pyo lib/%%PYTHON_VERSION%%/test/test_deque.py lib/%%PYTHON_VERSION%%/test/test_deque.pyc lib/%%PYTHON_VERSION%%/test/test_deque.pyo @@ -1953,6 +1992,9 @@ lib/%%PYTHON_VERSION%%/test/test_dircache.pyo lib/%%PYTHON_VERSION%%/test/test_dis.py lib/%%PYTHON_VERSION%%/test/test_dis.pyc lib/%%PYTHON_VERSION%%/test/test_dis.pyo +lib/%%PYTHON_VERSION%%/test/test_distutils.py +lib/%%PYTHON_VERSION%%/test/test_distutils.pyc +lib/%%PYTHON_VERSION%%/test/test_distutils.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo @@ -2043,6 +2085,9 @@ lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo lib/%%PYTHON_VERSION%%/test/test_generators.py lib/%%PYTHON_VERSION%%/test/test_generators.pyc lib/%%PYTHON_VERSION%%/test/test_generators.pyo +lib/%%PYTHON_VERSION%%/test/test_genexps.py +lib/%%PYTHON_VERSION%%/test/test_genexps.pyc +lib/%%PYTHON_VERSION%%/test/test_genexps.pyo lib/%%PYTHON_VERSION%%/test/test_getargs.py lib/%%PYTHON_VERSION%%/test/test_getargs.pyc lib/%%PYTHON_VERSION%%/test/test_getargs.pyo @@ -2127,6 +2172,9 @@ lib/%%PYTHON_VERSION%%/test/test_isinstance.pyo lib/%%PYTHON_VERSION%%/test/test_iter.py lib/%%PYTHON_VERSION%%/test/test_iter.pyc lib/%%PYTHON_VERSION%%/test/test_iter.pyo +lib/%%PYTHON_VERSION%%/test/test_iterlen.py +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyc +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyo lib/%%PYTHON_VERSION%%/test/test_itertools.py lib/%%PYTHON_VERSION%%/test/test_itertools.pyc lib/%%PYTHON_VERSION%%/test/test_itertools.pyo @@ -2382,6 +2430,9 @@ lib/%%PYTHON_VERSION%%/test/test_shutil.pyo lib/%%PYTHON_VERSION%%/test/test_signal.py lib/%%PYTHON_VERSION%%/test/test_signal.pyc lib/%%PYTHON_VERSION%%/test/test_signal.pyo +lib/%%PYTHON_VERSION%%/test/test_site.py +lib/%%PYTHON_VERSION%%/test/test_site.pyc +lib/%%PYTHON_VERSION%%/test/test_site.pyo lib/%%PYTHON_VERSION%%/test/test_slice.py lib/%%PYTHON_VERSION%%/test/test_slice.pyc lib/%%PYTHON_VERSION%%/test/test_slice.pyo @@ -2562,6 +2613,9 @@ lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyo lib/%%PYTHON_VERSION%%/test/test_xpickle.py lib/%%PYTHON_VERSION%%/test/test_xpickle.pyc lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo +lib/%%PYTHON_VERSION%%/test/test_xrange.py +lib/%%PYTHON_VERSION%%/test/test_xrange.pyc +lib/%%PYTHON_VERSION%%/test/test_xrange.pyo lib/%%PYTHON_VERSION%%/test/test_xreadline.py lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 8c2b27bc134d..a9c98c31e232 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20040311 +PORTVERSION= 2.4.a1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -115,6 +115,8 @@ post-extract: ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py post-patch: ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ @@ -170,7 +172,7 @@ post-install: @# additional files installing by ports ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${PREFIX}/bin + ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python27/distinfo b/lang/python27/distinfo index bc902a0cc5f7..6a4e5b2dc5df 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4.a0.20040311.tgz) = 5619b787ce62a1ebac3c973179d36670 -SIZE (python/Python-2.4.a0.20040311.tgz) = 8512702 +MD5 (python/Python-2.4a1.tar.gz) = 7a69d4e7289e5b16ed205fdfddaf0492 +SIZE (python/Python-2.4a1.tar.gz) = 9024737 diff --git a/lang/python27/files/patch-Lib-test-test_socket.py b/lang/python27/files/patch-Lib-test-test_socket.py new file mode 100644 index 000000000000..33b9fb389f54 --- /dev/null +++ b/lang/python27/files/patch-Lib-test-test_socket.py @@ -0,0 +1,11 @@ +--- Lib/test/test_socket.py.orig Fri Jul 9 00:27:03 2004 ++++ Lib/test/test_socket.py Fri Jul 9 00:27:11 2004 +@@ -289,7 +289,7 @@ + # Find one service that exists, then check all the related interfaces. + # I've ordered this by protocols that have both a tcp and udp + # protocol, at least for modern Linuxes. +- for service in ('echo', 'daytime', 'domain'): ++ for service in ('daytime', 'domain'): + try: + port = socket.getservbyname(service, 'tcp') + break diff --git a/lang/python27/files/patch-Makefile.pre.in b/lang/python27/files/patch-Makefile.pre.in deleted file mode 100644 index e2353b942195..000000000000 --- a/lang/python27/files/patch-Makefile.pre.in +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.pre.in.orig Sat Sep 20 19:50:48 2003 -+++ Makefile.pre.in Sat Nov 15 22:34:55 2003 -@@ -714,11 +714,11 @@ - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py index acf4e60dc734..003d0a4ae1fd 100644 --- a/lang/python27/files/patch-setup.py +++ b/lang/python27/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Wed Oct 22 00:41:15 2003 -+++ setup.py Thu Oct 30 06:21:21 2003 +--- setup.py.orig Sun Jun 27 07:29:42 2004 ++++ setup.py Thu Jul 8 23:55:04 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -770,7 +770,7 @@ +@@ -778,7 +778,7 @@ # Linux-specific modules exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) @@ -18,11 +18,12 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) if platform == 'sunos5': -@@ -1140,7 +1140,7 @@ +@@ -1160,8 +1160,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Lib/smtpd.py'] + scripts = [] ) diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index 89a833084ebb..fb801f3ec8c1 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -2,6 +2,7 @@ bin/idle%%PYVER%% bin/pydoc%%PYVER%% bin/python%%PYVER%% bin/python-shared%%PYVER%% +bin/smtpd%%PYVER%%.py include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h @@ -25,6 +26,7 @@ include/%%PYTHON_VERSION%%/fileobject.h include/%%PYTHON_VERSION%%/floatobject.h include/%%PYTHON_VERSION%%/frameobject.h include/%%PYTHON_VERSION%%/funcobject.h +include/%%PYTHON_VERSION%%/genobject.h include/%%PYTHON_VERSION%%/graminit.h include/%%PYTHON_VERSION%%/grammar.h include/%%PYTHON_VERSION%%/import.h @@ -58,6 +60,7 @@ include/%%PYTHON_VERSION%%/pymactoolbox.h include/%%PYTHON_VERSION%%/pymem.h include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h +include/%%PYTHON_VERSION%%/pystrtod.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h include/%%PYTHON_VERSION%%/rangeobject.h @@ -68,6 +71,7 @@ include/%%PYTHON_VERSION%%/structmember.h include/%%PYTHON_VERSION%%/structseq.h include/%%PYTHON_VERSION%%/symtable.h include/%%PYTHON_VERSION%%/sysmodule.h +include/%%PYTHON_VERSION%%/timefuncs.h include/%%PYTHON_VERSION%%/token.h include/%%PYTHON_VERSION%%/traceback.h include/%%PYTHON_VERSION%%/tupleobject.h @@ -131,6 +135,12 @@ lib/%%PYTHON_VERSION%%/UserList.pyo lib/%%PYTHON_VERSION%%/UserString.py lib/%%PYTHON_VERSION%%/UserString.pyc lib/%%PYTHON_VERSION%%/UserString.pyo +lib/%%PYTHON_VERSION%%/_LWPCookieJar.py +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyc +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyo +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.py +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyc +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyo lib/%%PYTHON_VERSION%%/__future__.py lib/%%PYTHON_VERSION%%/__future__.pyc lib/%%PYTHON_VERSION%%/__future__.pyo @@ -316,6 +326,9 @@ lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.so lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o +lib/%%PYTHON_VERSION%%/cookielib.py +lib/%%PYTHON_VERSION%%/cookielib.pyc +lib/%%PYTHON_VERSION%%/cookielib.pyo lib/%%PYTHON_VERSION%%/copy.py lib/%%PYTHON_VERSION%%/copy.pyc lib/%%PYTHON_VERSION%%/copy.pyo @@ -346,6 +359,9 @@ lib/%%PYTHON_VERSION%%/curses/wrapper.pyo lib/%%PYTHON_VERSION%%/dbhash.py lib/%%PYTHON_VERSION%%/dbhash.pyc lib/%%PYTHON_VERSION%%/dbhash.pyo +lib/%%PYTHON_VERSION%%/decimal.py +lib/%%PYTHON_VERSION%%/decimal.pyc +lib/%%PYTHON_VERSION%%/decimal.pyo lib/%%PYTHON_VERSION%%/difflib.py lib/%%PYTHON_VERSION%%/difflib.pyc lib/%%PYTHON_VERSION%%/difflib.pyo @@ -401,6 +417,9 @@ lib/%%PYTHON_VERSION%%/distutils/command/build_py.pyo lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.py lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyc lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.py +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyc +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyo lib/%%PYTHON_VERSION%%/distutils/command/clean.py lib/%%PYTHON_VERSION%%/distutils/command/clean.pyc lib/%%PYTHON_VERSION%%/distutils/command/clean.pyo @@ -515,6 +534,9 @@ lib/%%PYTHON_VERSION%%/email/Encoders.pyo lib/%%PYTHON_VERSION%%/email/Errors.py lib/%%PYTHON_VERSION%%/email/Errors.pyc lib/%%PYTHON_VERSION%%/email/Errors.pyo +lib/%%PYTHON_VERSION%%/email/FeedParser.py +lib/%%PYTHON_VERSION%%/email/FeedParser.pyc +lib/%%PYTHON_VERSION%%/email/FeedParser.pyo lib/%%PYTHON_VERSION%%/email/Generator.py lib/%%PYTHON_VERSION%%/email/Generator.pyc lib/%%PYTHON_VERSION%%/email/Generator.pyo @@ -557,12 +579,6 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo lib/%%PYTHON_VERSION%%/email/__init__.py lib/%%PYTHON_VERSION%%/email/__init__.pyc lib/%%PYTHON_VERSION%%/email/__init__.pyo -lib/%%PYTHON_VERSION%%/email/_compat21.py -lib/%%PYTHON_VERSION%%/email/_compat21.pyc -lib/%%PYTHON_VERSION%%/email/_compat21.pyo -lib/%%PYTHON_VERSION%%/email/_compat22.py -lib/%%PYTHON_VERSION%%/email/_compat22.pyc -lib/%%PYTHON_VERSION%%/email/_compat22.pyo lib/%%PYTHON_VERSION%%/email/_parseaddr.py lib/%%PYTHON_VERSION%%/email/_parseaddr.pyc lib/%%PYTHON_VERSION%%/email/_parseaddr.pyo @@ -589,6 +605,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_09.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_10.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_11.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_12.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_12a.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_13.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt @@ -612,6 +629,11 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_32.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_33.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_34.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_35.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_36.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_37.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_38.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -870,6 +892,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/palmos.py lib/%%PYTHON_VERSION%%/encodings/palmos.pyc lib/%%PYTHON_VERSION%%/encodings/palmos.pyo +lib/%%PYTHON_VERSION%%/encodings/ptcp154.py +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyc +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyo lib/%%PYTHON_VERSION%%/encodings/punycode.py lib/%%PYTHON_VERSION%%/encodings/punycode.pyc lib/%%PYTHON_VERSION%%/encodings/punycode.pyo @@ -957,6 +982,9 @@ lib/%%PYTHON_VERSION%%/gopherlib.pyo lib/%%PYTHON_VERSION%%/gzip.py lib/%%PYTHON_VERSION%%/gzip.pyc lib/%%PYTHON_VERSION%%/gzip.pyo +lib/%%PYTHON_VERSION%%/heapq.py +lib/%%PYTHON_VERSION%%/heapq.pyc +lib/%%PYTHON_VERSION%%/heapq.pyo lib/%%PYTHON_VERSION%%/hmac.py lib/%%PYTHON_VERSION%%/hmac.pyc lib/%%PYTHON_VERSION%%/hmac.pyo @@ -998,6 +1026,9 @@ lib/%%PYTHON_VERSION%%/idlelib/ChangeLog lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.py lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyc lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyo +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.py +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyc +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyo lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.py lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyc lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyo @@ -1207,6 +1238,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_shift_jisx0213.so lib/%%PYTHON_VERSION%%/lib-dynload/_csv.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so +lib/%%PYTHON_VERSION%%/lib-dynload/_heapq.so lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so lib/%%PYTHON_VERSION%%/lib-dynload/_multibytecodec.so @@ -1230,7 +1262,6 @@ 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 -lib/%%PYTHON_VERSION%%/lib-dynload/heapq.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so lib/%%PYTHON_VERSION%%/lib-dynload/itertools.so lib/%%PYTHON_VERSION%%/lib-dynload/math.so @@ -1240,7 +1271,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/nis.so lib/%%PYTHON_VERSION%%/lib-dynload/operator.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so -lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so @@ -1498,9 +1528,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/pre.py -lib/%%PYTHON_VERSION%%/pre.pyc -lib/%%PYTHON_VERSION%%/pre.pyo lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc @@ -1658,6 +1685,7 @@ lib/%%PYTHON_VERSION%%/test/badsyntax_future7.py lib/%%PYTHON_VERSION%%/test/badsyntax_future8.py lib/%%PYTHON_VERSION%%/test/badsyntax_future9.py lib/%%PYTHON_VERSION%%/test/badsyntax_nocaret.py +lib/%%PYTHON_VERSION%%/test/cfgparser.1 lib/%%PYTHON_VERSION%%/test/cjkencodings_test.py lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyc lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyo @@ -1668,10 +1696,12 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo +lib/%%PYTHON_VERSION%%/test/mapping_tests.py +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyc +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyo lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter lib/%%PYTHON_VERSION%%/test/output/test_asynchat lib/%%PYTHON_VERSION%%/test/output/test_augassign -lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_coercion @@ -1893,6 +1923,9 @@ lib/%%PYTHON_VERSION%%/test/test_codeop.pyo lib/%%PYTHON_VERSION%%/test/test_coercion.py lib/%%PYTHON_VERSION%%/test/test_coercion.pyc lib/%%PYTHON_VERSION%%/test/test_coercion.pyo +lib/%%PYTHON_VERSION%%/test/test_colorsys.py +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyc +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyo lib/%%PYTHON_VERSION%%/test/test_commands.py lib/%%PYTHON_VERSION%%/test/test_commands.pyc lib/%%PYTHON_VERSION%%/test/test_commands.pyo @@ -1911,6 +1944,9 @@ lib/%%PYTHON_VERSION%%/test/test_contains.pyo lib/%%PYTHON_VERSION%%/test/test_cookie.py lib/%%PYTHON_VERSION%%/test/test_cookie.pyc lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_cookielib.py +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyc +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyo lib/%%PYTHON_VERSION%%/test/test_copy.py lib/%%PYTHON_VERSION%%/test/test_copy.pyc lib/%%PYTHON_VERSION%%/test/test_copy.pyo @@ -1935,6 +1971,9 @@ lib/%%PYTHON_VERSION%%/test/test_datetime.pyo lib/%%PYTHON_VERSION%%/test/test_dbm.py lib/%%PYTHON_VERSION%%/test/test_dbm.pyc lib/%%PYTHON_VERSION%%/test/test_dbm.pyo +lib/%%PYTHON_VERSION%%/test/test_decimal.py +lib/%%PYTHON_VERSION%%/test/test_decimal.pyc +lib/%%PYTHON_VERSION%%/test/test_decimal.pyo lib/%%PYTHON_VERSION%%/test/test_deque.py lib/%%PYTHON_VERSION%%/test/test_deque.pyc lib/%%PYTHON_VERSION%%/test/test_deque.pyo @@ -1953,6 +1992,9 @@ lib/%%PYTHON_VERSION%%/test/test_dircache.pyo lib/%%PYTHON_VERSION%%/test/test_dis.py lib/%%PYTHON_VERSION%%/test/test_dis.pyc lib/%%PYTHON_VERSION%%/test/test_dis.pyo +lib/%%PYTHON_VERSION%%/test/test_distutils.py +lib/%%PYTHON_VERSION%%/test/test_distutils.pyc +lib/%%PYTHON_VERSION%%/test/test_distutils.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo @@ -2043,6 +2085,9 @@ lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo lib/%%PYTHON_VERSION%%/test/test_generators.py lib/%%PYTHON_VERSION%%/test/test_generators.pyc lib/%%PYTHON_VERSION%%/test/test_generators.pyo +lib/%%PYTHON_VERSION%%/test/test_genexps.py +lib/%%PYTHON_VERSION%%/test/test_genexps.pyc +lib/%%PYTHON_VERSION%%/test/test_genexps.pyo lib/%%PYTHON_VERSION%%/test/test_getargs.py lib/%%PYTHON_VERSION%%/test/test_getargs.pyc lib/%%PYTHON_VERSION%%/test/test_getargs.pyo @@ -2127,6 +2172,9 @@ lib/%%PYTHON_VERSION%%/test/test_isinstance.pyo lib/%%PYTHON_VERSION%%/test/test_iter.py lib/%%PYTHON_VERSION%%/test/test_iter.pyc lib/%%PYTHON_VERSION%%/test/test_iter.pyo +lib/%%PYTHON_VERSION%%/test/test_iterlen.py +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyc +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyo lib/%%PYTHON_VERSION%%/test/test_itertools.py lib/%%PYTHON_VERSION%%/test/test_itertools.pyc lib/%%PYTHON_VERSION%%/test/test_itertools.pyo @@ -2382,6 +2430,9 @@ lib/%%PYTHON_VERSION%%/test/test_shutil.pyo lib/%%PYTHON_VERSION%%/test/test_signal.py lib/%%PYTHON_VERSION%%/test/test_signal.pyc lib/%%PYTHON_VERSION%%/test/test_signal.pyo +lib/%%PYTHON_VERSION%%/test/test_site.py +lib/%%PYTHON_VERSION%%/test/test_site.pyc +lib/%%PYTHON_VERSION%%/test/test_site.pyo lib/%%PYTHON_VERSION%%/test/test_slice.py lib/%%PYTHON_VERSION%%/test/test_slice.pyc lib/%%PYTHON_VERSION%%/test/test_slice.pyo @@ -2562,6 +2613,9 @@ lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyo lib/%%PYTHON_VERSION%%/test/test_xpickle.py lib/%%PYTHON_VERSION%%/test/test_xpickle.pyc lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo +lib/%%PYTHON_VERSION%%/test/test_xrange.py +lib/%%PYTHON_VERSION%%/test/test_xrange.pyc +lib/%%PYTHON_VERSION%%/test/test_xrange.pyo lib/%%PYTHON_VERSION%%/test/test_xreadline.py lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 8c2b27bc134d..a9c98c31e232 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20040311 +PORTVERSION= 2.4.a1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -115,6 +115,8 @@ post-extract: ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py post-patch: ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ @@ -170,7 +172,7 @@ post-install: @# additional files installing by ports ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${PREFIX}/bin + ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python30/distinfo b/lang/python30/distinfo index bc902a0cc5f7..6a4e5b2dc5df 100644 --- a/lang/python30/distinfo +++ b/lang/python30/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4.a0.20040311.tgz) = 5619b787ce62a1ebac3c973179d36670 -SIZE (python/Python-2.4.a0.20040311.tgz) = 8512702 +MD5 (python/Python-2.4a1.tar.gz) = 7a69d4e7289e5b16ed205fdfddaf0492 +SIZE (python/Python-2.4a1.tar.gz) = 9024737 diff --git a/lang/python30/files/patch-Lib-test-test_socket.py b/lang/python30/files/patch-Lib-test-test_socket.py new file mode 100644 index 000000000000..33b9fb389f54 --- /dev/null +++ b/lang/python30/files/patch-Lib-test-test_socket.py @@ -0,0 +1,11 @@ +--- Lib/test/test_socket.py.orig Fri Jul 9 00:27:03 2004 ++++ Lib/test/test_socket.py Fri Jul 9 00:27:11 2004 +@@ -289,7 +289,7 @@ + # Find one service that exists, then check all the related interfaces. + # I've ordered this by protocols that have both a tcp and udp + # protocol, at least for modern Linuxes. +- for service in ('echo', 'daytime', 'domain'): ++ for service in ('daytime', 'domain'): + try: + port = socket.getservbyname(service, 'tcp') + break diff --git a/lang/python30/files/patch-Makefile.pre.in b/lang/python30/files/patch-Makefile.pre.in deleted file mode 100644 index e2353b942195..000000000000 --- a/lang/python30/files/patch-Makefile.pre.in +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.pre.in.orig Sat Sep 20 19:50:48 2003 -+++ Makefile.pre.in Sat Nov 15 22:34:55 2003 -@@ -714,11 +714,11 @@ - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python30/files/patch-setup.py b/lang/python30/files/patch-setup.py index acf4e60dc734..003d0a4ae1fd 100644 --- a/lang/python30/files/patch-setup.py +++ b/lang/python30/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Wed Oct 22 00:41:15 2003 -+++ setup.py Thu Oct 30 06:21:21 2003 +--- setup.py.orig Sun Jun 27 07:29:42 2004 ++++ setup.py Thu Jul 8 23:55:04 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -770,7 +770,7 @@ +@@ -778,7 +778,7 @@ # Linux-specific modules exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) @@ -18,11 +18,12 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) if platform == 'sunos5': -@@ -1140,7 +1140,7 @@ +@@ -1160,8 +1160,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Lib/smtpd.py'] + scripts = [] ) diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index 89a833084ebb..fb801f3ec8c1 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -2,6 +2,7 @@ bin/idle%%PYVER%% bin/pydoc%%PYVER%% bin/python%%PYVER%% bin/python-shared%%PYVER%% +bin/smtpd%%PYVER%%.py include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h @@ -25,6 +26,7 @@ include/%%PYTHON_VERSION%%/fileobject.h include/%%PYTHON_VERSION%%/floatobject.h include/%%PYTHON_VERSION%%/frameobject.h include/%%PYTHON_VERSION%%/funcobject.h +include/%%PYTHON_VERSION%%/genobject.h include/%%PYTHON_VERSION%%/graminit.h include/%%PYTHON_VERSION%%/grammar.h include/%%PYTHON_VERSION%%/import.h @@ -58,6 +60,7 @@ include/%%PYTHON_VERSION%%/pymactoolbox.h include/%%PYTHON_VERSION%%/pymem.h include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h +include/%%PYTHON_VERSION%%/pystrtod.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h include/%%PYTHON_VERSION%%/rangeobject.h @@ -68,6 +71,7 @@ include/%%PYTHON_VERSION%%/structmember.h include/%%PYTHON_VERSION%%/structseq.h include/%%PYTHON_VERSION%%/symtable.h include/%%PYTHON_VERSION%%/sysmodule.h +include/%%PYTHON_VERSION%%/timefuncs.h include/%%PYTHON_VERSION%%/token.h include/%%PYTHON_VERSION%%/traceback.h include/%%PYTHON_VERSION%%/tupleobject.h @@ -131,6 +135,12 @@ lib/%%PYTHON_VERSION%%/UserList.pyo lib/%%PYTHON_VERSION%%/UserString.py lib/%%PYTHON_VERSION%%/UserString.pyc lib/%%PYTHON_VERSION%%/UserString.pyo +lib/%%PYTHON_VERSION%%/_LWPCookieJar.py +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyc +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyo +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.py +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyc +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyo lib/%%PYTHON_VERSION%%/__future__.py lib/%%PYTHON_VERSION%%/__future__.pyc lib/%%PYTHON_VERSION%%/__future__.pyo @@ -316,6 +326,9 @@ lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.so lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o +lib/%%PYTHON_VERSION%%/cookielib.py +lib/%%PYTHON_VERSION%%/cookielib.pyc +lib/%%PYTHON_VERSION%%/cookielib.pyo lib/%%PYTHON_VERSION%%/copy.py lib/%%PYTHON_VERSION%%/copy.pyc lib/%%PYTHON_VERSION%%/copy.pyo @@ -346,6 +359,9 @@ lib/%%PYTHON_VERSION%%/curses/wrapper.pyo lib/%%PYTHON_VERSION%%/dbhash.py lib/%%PYTHON_VERSION%%/dbhash.pyc lib/%%PYTHON_VERSION%%/dbhash.pyo +lib/%%PYTHON_VERSION%%/decimal.py +lib/%%PYTHON_VERSION%%/decimal.pyc +lib/%%PYTHON_VERSION%%/decimal.pyo lib/%%PYTHON_VERSION%%/difflib.py lib/%%PYTHON_VERSION%%/difflib.pyc lib/%%PYTHON_VERSION%%/difflib.pyo @@ -401,6 +417,9 @@ lib/%%PYTHON_VERSION%%/distutils/command/build_py.pyo lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.py lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyc lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.py +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyc +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyo lib/%%PYTHON_VERSION%%/distutils/command/clean.py lib/%%PYTHON_VERSION%%/distutils/command/clean.pyc lib/%%PYTHON_VERSION%%/distutils/command/clean.pyo @@ -515,6 +534,9 @@ lib/%%PYTHON_VERSION%%/email/Encoders.pyo lib/%%PYTHON_VERSION%%/email/Errors.py lib/%%PYTHON_VERSION%%/email/Errors.pyc lib/%%PYTHON_VERSION%%/email/Errors.pyo +lib/%%PYTHON_VERSION%%/email/FeedParser.py +lib/%%PYTHON_VERSION%%/email/FeedParser.pyc +lib/%%PYTHON_VERSION%%/email/FeedParser.pyo lib/%%PYTHON_VERSION%%/email/Generator.py lib/%%PYTHON_VERSION%%/email/Generator.pyc lib/%%PYTHON_VERSION%%/email/Generator.pyo @@ -557,12 +579,6 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo lib/%%PYTHON_VERSION%%/email/__init__.py lib/%%PYTHON_VERSION%%/email/__init__.pyc lib/%%PYTHON_VERSION%%/email/__init__.pyo -lib/%%PYTHON_VERSION%%/email/_compat21.py -lib/%%PYTHON_VERSION%%/email/_compat21.pyc -lib/%%PYTHON_VERSION%%/email/_compat21.pyo -lib/%%PYTHON_VERSION%%/email/_compat22.py -lib/%%PYTHON_VERSION%%/email/_compat22.pyc -lib/%%PYTHON_VERSION%%/email/_compat22.pyo lib/%%PYTHON_VERSION%%/email/_parseaddr.py lib/%%PYTHON_VERSION%%/email/_parseaddr.pyc lib/%%PYTHON_VERSION%%/email/_parseaddr.pyo @@ -589,6 +605,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_09.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_10.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_11.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_12.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_12a.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_13.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt @@ -612,6 +629,11 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_32.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_33.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_34.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_35.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_36.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_37.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_38.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -870,6 +892,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/palmos.py lib/%%PYTHON_VERSION%%/encodings/palmos.pyc lib/%%PYTHON_VERSION%%/encodings/palmos.pyo +lib/%%PYTHON_VERSION%%/encodings/ptcp154.py +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyc +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyo lib/%%PYTHON_VERSION%%/encodings/punycode.py lib/%%PYTHON_VERSION%%/encodings/punycode.pyc lib/%%PYTHON_VERSION%%/encodings/punycode.pyo @@ -957,6 +982,9 @@ lib/%%PYTHON_VERSION%%/gopherlib.pyo lib/%%PYTHON_VERSION%%/gzip.py lib/%%PYTHON_VERSION%%/gzip.pyc lib/%%PYTHON_VERSION%%/gzip.pyo +lib/%%PYTHON_VERSION%%/heapq.py +lib/%%PYTHON_VERSION%%/heapq.pyc +lib/%%PYTHON_VERSION%%/heapq.pyo lib/%%PYTHON_VERSION%%/hmac.py lib/%%PYTHON_VERSION%%/hmac.pyc lib/%%PYTHON_VERSION%%/hmac.pyo @@ -998,6 +1026,9 @@ lib/%%PYTHON_VERSION%%/idlelib/ChangeLog lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.py lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyc lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyo +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.py +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyc +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyo lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.py lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyc lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyo @@ -1207,6 +1238,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_shift_jisx0213.so lib/%%PYTHON_VERSION%%/lib-dynload/_csv.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so +lib/%%PYTHON_VERSION%%/lib-dynload/_heapq.so lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so lib/%%PYTHON_VERSION%%/lib-dynload/_multibytecodec.so @@ -1230,7 +1262,6 @@ 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 -lib/%%PYTHON_VERSION%%/lib-dynload/heapq.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so lib/%%PYTHON_VERSION%%/lib-dynload/itertools.so lib/%%PYTHON_VERSION%%/lib-dynload/math.so @@ -1240,7 +1271,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/nis.so lib/%%PYTHON_VERSION%%/lib-dynload/operator.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so -lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so @@ -1498,9 +1528,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/pre.py -lib/%%PYTHON_VERSION%%/pre.pyc -lib/%%PYTHON_VERSION%%/pre.pyo lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc @@ -1658,6 +1685,7 @@ lib/%%PYTHON_VERSION%%/test/badsyntax_future7.py lib/%%PYTHON_VERSION%%/test/badsyntax_future8.py lib/%%PYTHON_VERSION%%/test/badsyntax_future9.py lib/%%PYTHON_VERSION%%/test/badsyntax_nocaret.py +lib/%%PYTHON_VERSION%%/test/cfgparser.1 lib/%%PYTHON_VERSION%%/test/cjkencodings_test.py lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyc lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyo @@ -1668,10 +1696,12 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo +lib/%%PYTHON_VERSION%%/test/mapping_tests.py +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyc +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyo lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter lib/%%PYTHON_VERSION%%/test/output/test_asynchat lib/%%PYTHON_VERSION%%/test/output/test_augassign -lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_coercion @@ -1893,6 +1923,9 @@ lib/%%PYTHON_VERSION%%/test/test_codeop.pyo lib/%%PYTHON_VERSION%%/test/test_coercion.py lib/%%PYTHON_VERSION%%/test/test_coercion.pyc lib/%%PYTHON_VERSION%%/test/test_coercion.pyo +lib/%%PYTHON_VERSION%%/test/test_colorsys.py +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyc +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyo lib/%%PYTHON_VERSION%%/test/test_commands.py lib/%%PYTHON_VERSION%%/test/test_commands.pyc lib/%%PYTHON_VERSION%%/test/test_commands.pyo @@ -1911,6 +1944,9 @@ lib/%%PYTHON_VERSION%%/test/test_contains.pyo lib/%%PYTHON_VERSION%%/test/test_cookie.py lib/%%PYTHON_VERSION%%/test/test_cookie.pyc lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_cookielib.py +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyc +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyo lib/%%PYTHON_VERSION%%/test/test_copy.py lib/%%PYTHON_VERSION%%/test/test_copy.pyc lib/%%PYTHON_VERSION%%/test/test_copy.pyo @@ -1935,6 +1971,9 @@ lib/%%PYTHON_VERSION%%/test/test_datetime.pyo lib/%%PYTHON_VERSION%%/test/test_dbm.py lib/%%PYTHON_VERSION%%/test/test_dbm.pyc lib/%%PYTHON_VERSION%%/test/test_dbm.pyo +lib/%%PYTHON_VERSION%%/test/test_decimal.py +lib/%%PYTHON_VERSION%%/test/test_decimal.pyc +lib/%%PYTHON_VERSION%%/test/test_decimal.pyo lib/%%PYTHON_VERSION%%/test/test_deque.py lib/%%PYTHON_VERSION%%/test/test_deque.pyc lib/%%PYTHON_VERSION%%/test/test_deque.pyo @@ -1953,6 +1992,9 @@ lib/%%PYTHON_VERSION%%/test/test_dircache.pyo lib/%%PYTHON_VERSION%%/test/test_dis.py lib/%%PYTHON_VERSION%%/test/test_dis.pyc lib/%%PYTHON_VERSION%%/test/test_dis.pyo +lib/%%PYTHON_VERSION%%/test/test_distutils.py +lib/%%PYTHON_VERSION%%/test/test_distutils.pyc +lib/%%PYTHON_VERSION%%/test/test_distutils.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo @@ -2043,6 +2085,9 @@ lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo lib/%%PYTHON_VERSION%%/test/test_generators.py lib/%%PYTHON_VERSION%%/test/test_generators.pyc lib/%%PYTHON_VERSION%%/test/test_generators.pyo +lib/%%PYTHON_VERSION%%/test/test_genexps.py +lib/%%PYTHON_VERSION%%/test/test_genexps.pyc +lib/%%PYTHON_VERSION%%/test/test_genexps.pyo lib/%%PYTHON_VERSION%%/test/test_getargs.py lib/%%PYTHON_VERSION%%/test/test_getargs.pyc lib/%%PYTHON_VERSION%%/test/test_getargs.pyo @@ -2127,6 +2172,9 @@ lib/%%PYTHON_VERSION%%/test/test_isinstance.pyo lib/%%PYTHON_VERSION%%/test/test_iter.py lib/%%PYTHON_VERSION%%/test/test_iter.pyc lib/%%PYTHON_VERSION%%/test/test_iter.pyo +lib/%%PYTHON_VERSION%%/test/test_iterlen.py +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyc +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyo lib/%%PYTHON_VERSION%%/test/test_itertools.py lib/%%PYTHON_VERSION%%/test/test_itertools.pyc lib/%%PYTHON_VERSION%%/test/test_itertools.pyo @@ -2382,6 +2430,9 @@ lib/%%PYTHON_VERSION%%/test/test_shutil.pyo lib/%%PYTHON_VERSION%%/test/test_signal.py lib/%%PYTHON_VERSION%%/test/test_signal.pyc lib/%%PYTHON_VERSION%%/test/test_signal.pyo +lib/%%PYTHON_VERSION%%/test/test_site.py +lib/%%PYTHON_VERSION%%/test/test_site.pyc +lib/%%PYTHON_VERSION%%/test/test_site.pyo lib/%%PYTHON_VERSION%%/test/test_slice.py lib/%%PYTHON_VERSION%%/test/test_slice.pyc lib/%%PYTHON_VERSION%%/test/test_slice.pyo @@ -2562,6 +2613,9 @@ lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyo lib/%%PYTHON_VERSION%%/test/test_xpickle.py lib/%%PYTHON_VERSION%%/test/test_xpickle.pyc lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo +lib/%%PYTHON_VERSION%%/test/test_xrange.py +lib/%%PYTHON_VERSION%%/test/test_xrange.pyc +lib/%%PYTHON_VERSION%%/test/test_xrange.pyo lib/%%PYTHON_VERSION%%/test/test_xreadline.py lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 8c2b27bc134d..a9c98c31e232 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20040311 +PORTVERSION= 2.4.a1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -115,6 +115,8 @@ post-extract: ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py post-patch: ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ @@ -170,7 +172,7 @@ post-install: @# additional files installing by ports ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${PREFIX}/bin + ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python31/distinfo b/lang/python31/distinfo index bc902a0cc5f7..6a4e5b2dc5df 100644 --- a/lang/python31/distinfo +++ b/lang/python31/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4.a0.20040311.tgz) = 5619b787ce62a1ebac3c973179d36670 -SIZE (python/Python-2.4.a0.20040311.tgz) = 8512702 +MD5 (python/Python-2.4a1.tar.gz) = 7a69d4e7289e5b16ed205fdfddaf0492 +SIZE (python/Python-2.4a1.tar.gz) = 9024737 diff --git a/lang/python31/files/patch-Lib-test-test_socket.py b/lang/python31/files/patch-Lib-test-test_socket.py new file mode 100644 index 000000000000..33b9fb389f54 --- /dev/null +++ b/lang/python31/files/patch-Lib-test-test_socket.py @@ -0,0 +1,11 @@ +--- Lib/test/test_socket.py.orig Fri Jul 9 00:27:03 2004 ++++ Lib/test/test_socket.py Fri Jul 9 00:27:11 2004 +@@ -289,7 +289,7 @@ + # Find one service that exists, then check all the related interfaces. + # I've ordered this by protocols that have both a tcp and udp + # protocol, at least for modern Linuxes. +- for service in ('echo', 'daytime', 'domain'): ++ for service in ('daytime', 'domain'): + try: + port = socket.getservbyname(service, 'tcp') + break diff --git a/lang/python31/files/patch-Makefile.pre.in b/lang/python31/files/patch-Makefile.pre.in deleted file mode 100644 index e2353b942195..000000000000 --- a/lang/python31/files/patch-Makefile.pre.in +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.pre.in.orig Sat Sep 20 19:50:48 2003 -+++ Makefile.pre.in Sat Nov 15 22:34:55 2003 -@@ -714,11 +714,11 @@ - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py index acf4e60dc734..003d0a4ae1fd 100644 --- a/lang/python31/files/patch-setup.py +++ b/lang/python31/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Wed Oct 22 00:41:15 2003 -+++ setup.py Thu Oct 30 06:21:21 2003 +--- setup.py.orig Sun Jun 27 07:29:42 2004 ++++ setup.py Thu Jul 8 23:55:04 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -770,7 +770,7 @@ +@@ -778,7 +778,7 @@ # Linux-specific modules exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) @@ -18,11 +18,12 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) if platform == 'sunos5': -@@ -1140,7 +1140,7 @@ +@@ -1160,8 +1160,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Lib/smtpd.py'] + scripts = [] ) diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index 89a833084ebb..fb801f3ec8c1 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -2,6 +2,7 @@ bin/idle%%PYVER%% bin/pydoc%%PYVER%% bin/python%%PYVER%% bin/python-shared%%PYVER%% +bin/smtpd%%PYVER%%.py include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h @@ -25,6 +26,7 @@ include/%%PYTHON_VERSION%%/fileobject.h include/%%PYTHON_VERSION%%/floatobject.h include/%%PYTHON_VERSION%%/frameobject.h include/%%PYTHON_VERSION%%/funcobject.h +include/%%PYTHON_VERSION%%/genobject.h include/%%PYTHON_VERSION%%/graminit.h include/%%PYTHON_VERSION%%/grammar.h include/%%PYTHON_VERSION%%/import.h @@ -58,6 +60,7 @@ include/%%PYTHON_VERSION%%/pymactoolbox.h include/%%PYTHON_VERSION%%/pymem.h include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h +include/%%PYTHON_VERSION%%/pystrtod.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h include/%%PYTHON_VERSION%%/rangeobject.h @@ -68,6 +71,7 @@ include/%%PYTHON_VERSION%%/structmember.h include/%%PYTHON_VERSION%%/structseq.h include/%%PYTHON_VERSION%%/symtable.h include/%%PYTHON_VERSION%%/sysmodule.h +include/%%PYTHON_VERSION%%/timefuncs.h include/%%PYTHON_VERSION%%/token.h include/%%PYTHON_VERSION%%/traceback.h include/%%PYTHON_VERSION%%/tupleobject.h @@ -131,6 +135,12 @@ lib/%%PYTHON_VERSION%%/UserList.pyo lib/%%PYTHON_VERSION%%/UserString.py lib/%%PYTHON_VERSION%%/UserString.pyc lib/%%PYTHON_VERSION%%/UserString.pyo +lib/%%PYTHON_VERSION%%/_LWPCookieJar.py +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyc +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyo +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.py +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyc +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyo lib/%%PYTHON_VERSION%%/__future__.py lib/%%PYTHON_VERSION%%/__future__.pyc lib/%%PYTHON_VERSION%%/__future__.pyo @@ -316,6 +326,9 @@ lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.so lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o +lib/%%PYTHON_VERSION%%/cookielib.py +lib/%%PYTHON_VERSION%%/cookielib.pyc +lib/%%PYTHON_VERSION%%/cookielib.pyo lib/%%PYTHON_VERSION%%/copy.py lib/%%PYTHON_VERSION%%/copy.pyc lib/%%PYTHON_VERSION%%/copy.pyo @@ -346,6 +359,9 @@ lib/%%PYTHON_VERSION%%/curses/wrapper.pyo lib/%%PYTHON_VERSION%%/dbhash.py lib/%%PYTHON_VERSION%%/dbhash.pyc lib/%%PYTHON_VERSION%%/dbhash.pyo +lib/%%PYTHON_VERSION%%/decimal.py +lib/%%PYTHON_VERSION%%/decimal.pyc +lib/%%PYTHON_VERSION%%/decimal.pyo lib/%%PYTHON_VERSION%%/difflib.py lib/%%PYTHON_VERSION%%/difflib.pyc lib/%%PYTHON_VERSION%%/difflib.pyo @@ -401,6 +417,9 @@ lib/%%PYTHON_VERSION%%/distutils/command/build_py.pyo lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.py lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyc lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.py +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyc +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyo lib/%%PYTHON_VERSION%%/distutils/command/clean.py lib/%%PYTHON_VERSION%%/distutils/command/clean.pyc lib/%%PYTHON_VERSION%%/distutils/command/clean.pyo @@ -515,6 +534,9 @@ lib/%%PYTHON_VERSION%%/email/Encoders.pyo lib/%%PYTHON_VERSION%%/email/Errors.py lib/%%PYTHON_VERSION%%/email/Errors.pyc lib/%%PYTHON_VERSION%%/email/Errors.pyo +lib/%%PYTHON_VERSION%%/email/FeedParser.py +lib/%%PYTHON_VERSION%%/email/FeedParser.pyc +lib/%%PYTHON_VERSION%%/email/FeedParser.pyo lib/%%PYTHON_VERSION%%/email/Generator.py lib/%%PYTHON_VERSION%%/email/Generator.pyc lib/%%PYTHON_VERSION%%/email/Generator.pyo @@ -557,12 +579,6 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo lib/%%PYTHON_VERSION%%/email/__init__.py lib/%%PYTHON_VERSION%%/email/__init__.pyc lib/%%PYTHON_VERSION%%/email/__init__.pyo -lib/%%PYTHON_VERSION%%/email/_compat21.py -lib/%%PYTHON_VERSION%%/email/_compat21.pyc -lib/%%PYTHON_VERSION%%/email/_compat21.pyo -lib/%%PYTHON_VERSION%%/email/_compat22.py -lib/%%PYTHON_VERSION%%/email/_compat22.pyc -lib/%%PYTHON_VERSION%%/email/_compat22.pyo lib/%%PYTHON_VERSION%%/email/_parseaddr.py lib/%%PYTHON_VERSION%%/email/_parseaddr.pyc lib/%%PYTHON_VERSION%%/email/_parseaddr.pyo @@ -589,6 +605,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_09.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_10.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_11.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_12.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_12a.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_13.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt @@ -612,6 +629,11 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_32.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_33.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_34.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_35.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_36.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_37.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_38.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -870,6 +892,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/palmos.py lib/%%PYTHON_VERSION%%/encodings/palmos.pyc lib/%%PYTHON_VERSION%%/encodings/palmos.pyo +lib/%%PYTHON_VERSION%%/encodings/ptcp154.py +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyc +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyo lib/%%PYTHON_VERSION%%/encodings/punycode.py lib/%%PYTHON_VERSION%%/encodings/punycode.pyc lib/%%PYTHON_VERSION%%/encodings/punycode.pyo @@ -957,6 +982,9 @@ lib/%%PYTHON_VERSION%%/gopherlib.pyo lib/%%PYTHON_VERSION%%/gzip.py lib/%%PYTHON_VERSION%%/gzip.pyc lib/%%PYTHON_VERSION%%/gzip.pyo +lib/%%PYTHON_VERSION%%/heapq.py +lib/%%PYTHON_VERSION%%/heapq.pyc +lib/%%PYTHON_VERSION%%/heapq.pyo lib/%%PYTHON_VERSION%%/hmac.py lib/%%PYTHON_VERSION%%/hmac.pyc lib/%%PYTHON_VERSION%%/hmac.pyo @@ -998,6 +1026,9 @@ lib/%%PYTHON_VERSION%%/idlelib/ChangeLog lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.py lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyc lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyo +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.py +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyc +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyo lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.py lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyc lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyo @@ -1207,6 +1238,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_shift_jisx0213.so lib/%%PYTHON_VERSION%%/lib-dynload/_csv.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so +lib/%%PYTHON_VERSION%%/lib-dynload/_heapq.so lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so lib/%%PYTHON_VERSION%%/lib-dynload/_multibytecodec.so @@ -1230,7 +1262,6 @@ 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 -lib/%%PYTHON_VERSION%%/lib-dynload/heapq.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so lib/%%PYTHON_VERSION%%/lib-dynload/itertools.so lib/%%PYTHON_VERSION%%/lib-dynload/math.so @@ -1240,7 +1271,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/nis.so lib/%%PYTHON_VERSION%%/lib-dynload/operator.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so -lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so @@ -1498,9 +1528,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/pre.py -lib/%%PYTHON_VERSION%%/pre.pyc -lib/%%PYTHON_VERSION%%/pre.pyo lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc @@ -1658,6 +1685,7 @@ lib/%%PYTHON_VERSION%%/test/badsyntax_future7.py lib/%%PYTHON_VERSION%%/test/badsyntax_future8.py lib/%%PYTHON_VERSION%%/test/badsyntax_future9.py lib/%%PYTHON_VERSION%%/test/badsyntax_nocaret.py +lib/%%PYTHON_VERSION%%/test/cfgparser.1 lib/%%PYTHON_VERSION%%/test/cjkencodings_test.py lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyc lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyo @@ -1668,10 +1696,12 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo +lib/%%PYTHON_VERSION%%/test/mapping_tests.py +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyc +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyo lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter lib/%%PYTHON_VERSION%%/test/output/test_asynchat lib/%%PYTHON_VERSION%%/test/output/test_augassign -lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_coercion @@ -1893,6 +1923,9 @@ lib/%%PYTHON_VERSION%%/test/test_codeop.pyo lib/%%PYTHON_VERSION%%/test/test_coercion.py lib/%%PYTHON_VERSION%%/test/test_coercion.pyc lib/%%PYTHON_VERSION%%/test/test_coercion.pyo +lib/%%PYTHON_VERSION%%/test/test_colorsys.py +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyc +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyo lib/%%PYTHON_VERSION%%/test/test_commands.py lib/%%PYTHON_VERSION%%/test/test_commands.pyc lib/%%PYTHON_VERSION%%/test/test_commands.pyo @@ -1911,6 +1944,9 @@ lib/%%PYTHON_VERSION%%/test/test_contains.pyo lib/%%PYTHON_VERSION%%/test/test_cookie.py lib/%%PYTHON_VERSION%%/test/test_cookie.pyc lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_cookielib.py +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyc +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyo lib/%%PYTHON_VERSION%%/test/test_copy.py lib/%%PYTHON_VERSION%%/test/test_copy.pyc lib/%%PYTHON_VERSION%%/test/test_copy.pyo @@ -1935,6 +1971,9 @@ lib/%%PYTHON_VERSION%%/test/test_datetime.pyo lib/%%PYTHON_VERSION%%/test/test_dbm.py lib/%%PYTHON_VERSION%%/test/test_dbm.pyc lib/%%PYTHON_VERSION%%/test/test_dbm.pyo +lib/%%PYTHON_VERSION%%/test/test_decimal.py +lib/%%PYTHON_VERSION%%/test/test_decimal.pyc +lib/%%PYTHON_VERSION%%/test/test_decimal.pyo lib/%%PYTHON_VERSION%%/test/test_deque.py lib/%%PYTHON_VERSION%%/test/test_deque.pyc lib/%%PYTHON_VERSION%%/test/test_deque.pyo @@ -1953,6 +1992,9 @@ lib/%%PYTHON_VERSION%%/test/test_dircache.pyo lib/%%PYTHON_VERSION%%/test/test_dis.py lib/%%PYTHON_VERSION%%/test/test_dis.pyc lib/%%PYTHON_VERSION%%/test/test_dis.pyo +lib/%%PYTHON_VERSION%%/test/test_distutils.py +lib/%%PYTHON_VERSION%%/test/test_distutils.pyc +lib/%%PYTHON_VERSION%%/test/test_distutils.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo @@ -2043,6 +2085,9 @@ lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo lib/%%PYTHON_VERSION%%/test/test_generators.py lib/%%PYTHON_VERSION%%/test/test_generators.pyc lib/%%PYTHON_VERSION%%/test/test_generators.pyo +lib/%%PYTHON_VERSION%%/test/test_genexps.py +lib/%%PYTHON_VERSION%%/test/test_genexps.pyc +lib/%%PYTHON_VERSION%%/test/test_genexps.pyo lib/%%PYTHON_VERSION%%/test/test_getargs.py lib/%%PYTHON_VERSION%%/test/test_getargs.pyc lib/%%PYTHON_VERSION%%/test/test_getargs.pyo @@ -2127,6 +2172,9 @@ lib/%%PYTHON_VERSION%%/test/test_isinstance.pyo lib/%%PYTHON_VERSION%%/test/test_iter.py lib/%%PYTHON_VERSION%%/test/test_iter.pyc lib/%%PYTHON_VERSION%%/test/test_iter.pyo +lib/%%PYTHON_VERSION%%/test/test_iterlen.py +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyc +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyo lib/%%PYTHON_VERSION%%/test/test_itertools.py lib/%%PYTHON_VERSION%%/test/test_itertools.pyc lib/%%PYTHON_VERSION%%/test/test_itertools.pyo @@ -2382,6 +2430,9 @@ lib/%%PYTHON_VERSION%%/test/test_shutil.pyo lib/%%PYTHON_VERSION%%/test/test_signal.py lib/%%PYTHON_VERSION%%/test/test_signal.pyc lib/%%PYTHON_VERSION%%/test/test_signal.pyo +lib/%%PYTHON_VERSION%%/test/test_site.py +lib/%%PYTHON_VERSION%%/test/test_site.pyc +lib/%%PYTHON_VERSION%%/test/test_site.pyo lib/%%PYTHON_VERSION%%/test/test_slice.py lib/%%PYTHON_VERSION%%/test/test_slice.pyc lib/%%PYTHON_VERSION%%/test/test_slice.pyo @@ -2562,6 +2613,9 @@ lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyo lib/%%PYTHON_VERSION%%/test/test_xpickle.py lib/%%PYTHON_VERSION%%/test/test_xpickle.pyc lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo +lib/%%PYTHON_VERSION%%/test/test_xrange.py +lib/%%PYTHON_VERSION%%/test/test_xrange.pyc +lib/%%PYTHON_VERSION%%/test/test_xrange.pyo lib/%%PYTHON_VERSION%%/test/test_xreadline.py lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 8c2b27bc134d..a9c98c31e232 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a0.20040311 +PORTVERSION= 2.4.a1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -115,6 +115,8 @@ post-extract: ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py post-patch: ${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \ @@ -170,7 +172,7 @@ post-install: @# additional files installing by ports ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${PREFIX}/bin + ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python32/distinfo b/lang/python32/distinfo index bc902a0cc5f7..6a4e5b2dc5df 100644 --- a/lang/python32/distinfo +++ b/lang/python32/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4.a0.20040311.tgz) = 5619b787ce62a1ebac3c973179d36670 -SIZE (python/Python-2.4.a0.20040311.tgz) = 8512702 +MD5 (python/Python-2.4a1.tar.gz) = 7a69d4e7289e5b16ed205fdfddaf0492 +SIZE (python/Python-2.4a1.tar.gz) = 9024737 diff --git a/lang/python32/files/patch-Lib-test-test_socket.py b/lang/python32/files/patch-Lib-test-test_socket.py new file mode 100644 index 000000000000..33b9fb389f54 --- /dev/null +++ b/lang/python32/files/patch-Lib-test-test_socket.py @@ -0,0 +1,11 @@ +--- Lib/test/test_socket.py.orig Fri Jul 9 00:27:03 2004 ++++ Lib/test/test_socket.py Fri Jul 9 00:27:11 2004 +@@ -289,7 +289,7 @@ + # Find one service that exists, then check all the related interfaces. + # I've ordered this by protocols that have both a tcp and udp + # protocol, at least for modern Linuxes. +- for service in ('echo', 'daytime', 'domain'): ++ for service in ('daytime', 'domain'): + try: + port = socket.getservbyname(service, 'tcp') + break diff --git a/lang/python32/files/patch-Makefile.pre.in b/lang/python32/files/patch-Makefile.pre.in deleted file mode 100644 index e2353b942195..000000000000 --- a/lang/python32/files/patch-Makefile.pre.in +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.pre.in.orig Sat Sep 20 19:50:48 2003 -+++ Makefile.pre.in Sat Nov 15 22:34:55 2003 -@@ -714,11 +714,11 @@ - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py index acf4e60dc734..003d0a4ae1fd 100644 --- a/lang/python32/files/patch-setup.py +++ b/lang/python32/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Wed Oct 22 00:41:15 2003 -+++ setup.py Thu Oct 30 06:21:21 2003 +--- setup.py.orig Sun Jun 27 07:29:42 2004 ++++ setup.py Thu Jul 8 23:55:04 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,7 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -770,7 +770,7 @@ +@@ -778,7 +778,7 @@ # Linux-specific modules exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) @@ -18,11 +18,12 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) if platform == 'sunos5': -@@ -1140,7 +1140,7 @@ +@@ -1160,8 +1160,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Lib/smtpd.py'] + scripts = [] ) diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index 89a833084ebb..fb801f3ec8c1 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -2,6 +2,7 @@ bin/idle%%PYVER%% bin/pydoc%%PYVER%% bin/python%%PYVER%% bin/python-shared%%PYVER%% +bin/smtpd%%PYVER%%.py include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h @@ -25,6 +26,7 @@ include/%%PYTHON_VERSION%%/fileobject.h include/%%PYTHON_VERSION%%/floatobject.h include/%%PYTHON_VERSION%%/frameobject.h include/%%PYTHON_VERSION%%/funcobject.h +include/%%PYTHON_VERSION%%/genobject.h include/%%PYTHON_VERSION%%/graminit.h include/%%PYTHON_VERSION%%/grammar.h include/%%PYTHON_VERSION%%/import.h @@ -58,6 +60,7 @@ include/%%PYTHON_VERSION%%/pymactoolbox.h include/%%PYTHON_VERSION%%/pymem.h include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h +include/%%PYTHON_VERSION%%/pystrtod.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h include/%%PYTHON_VERSION%%/rangeobject.h @@ -68,6 +71,7 @@ include/%%PYTHON_VERSION%%/structmember.h include/%%PYTHON_VERSION%%/structseq.h include/%%PYTHON_VERSION%%/symtable.h include/%%PYTHON_VERSION%%/sysmodule.h +include/%%PYTHON_VERSION%%/timefuncs.h include/%%PYTHON_VERSION%%/token.h include/%%PYTHON_VERSION%%/traceback.h include/%%PYTHON_VERSION%%/tupleobject.h @@ -131,6 +135,12 @@ lib/%%PYTHON_VERSION%%/UserList.pyo lib/%%PYTHON_VERSION%%/UserString.py lib/%%PYTHON_VERSION%%/UserString.pyc lib/%%PYTHON_VERSION%%/UserString.pyo +lib/%%PYTHON_VERSION%%/_LWPCookieJar.py +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyc +lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyo +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.py +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyc +lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyo lib/%%PYTHON_VERSION%%/__future__.py lib/%%PYTHON_VERSION%%/__future__.pyc lib/%%PYTHON_VERSION%%/__future__.pyo @@ -316,6 +326,9 @@ lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.so lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o +lib/%%PYTHON_VERSION%%/cookielib.py +lib/%%PYTHON_VERSION%%/cookielib.pyc +lib/%%PYTHON_VERSION%%/cookielib.pyo lib/%%PYTHON_VERSION%%/copy.py lib/%%PYTHON_VERSION%%/copy.pyc lib/%%PYTHON_VERSION%%/copy.pyo @@ -346,6 +359,9 @@ lib/%%PYTHON_VERSION%%/curses/wrapper.pyo lib/%%PYTHON_VERSION%%/dbhash.py lib/%%PYTHON_VERSION%%/dbhash.pyc lib/%%PYTHON_VERSION%%/dbhash.pyo +lib/%%PYTHON_VERSION%%/decimal.py +lib/%%PYTHON_VERSION%%/decimal.pyc +lib/%%PYTHON_VERSION%%/decimal.pyo lib/%%PYTHON_VERSION%%/difflib.py lib/%%PYTHON_VERSION%%/difflib.pyc lib/%%PYTHON_VERSION%%/difflib.pyo @@ -401,6 +417,9 @@ lib/%%PYTHON_VERSION%%/distutils/command/build_py.pyo lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.py lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyc lib/%%PYTHON_VERSION%%/distutils/command/build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.py +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyc +lib/%%PYTHON_VERSION%%/distutils/command/checkdep.pyo lib/%%PYTHON_VERSION%%/distutils/command/clean.py lib/%%PYTHON_VERSION%%/distutils/command/clean.pyc lib/%%PYTHON_VERSION%%/distutils/command/clean.pyo @@ -515,6 +534,9 @@ lib/%%PYTHON_VERSION%%/email/Encoders.pyo lib/%%PYTHON_VERSION%%/email/Errors.py lib/%%PYTHON_VERSION%%/email/Errors.pyc lib/%%PYTHON_VERSION%%/email/Errors.pyo +lib/%%PYTHON_VERSION%%/email/FeedParser.py +lib/%%PYTHON_VERSION%%/email/FeedParser.pyc +lib/%%PYTHON_VERSION%%/email/FeedParser.pyo lib/%%PYTHON_VERSION%%/email/Generator.py lib/%%PYTHON_VERSION%%/email/Generator.pyc lib/%%PYTHON_VERSION%%/email/Generator.pyo @@ -557,12 +579,6 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo lib/%%PYTHON_VERSION%%/email/__init__.py lib/%%PYTHON_VERSION%%/email/__init__.pyc lib/%%PYTHON_VERSION%%/email/__init__.pyo -lib/%%PYTHON_VERSION%%/email/_compat21.py -lib/%%PYTHON_VERSION%%/email/_compat21.pyc -lib/%%PYTHON_VERSION%%/email/_compat21.pyo -lib/%%PYTHON_VERSION%%/email/_compat22.py -lib/%%PYTHON_VERSION%%/email/_compat22.pyc -lib/%%PYTHON_VERSION%%/email/_compat22.pyo lib/%%PYTHON_VERSION%%/email/_parseaddr.py lib/%%PYTHON_VERSION%%/email/_parseaddr.pyc lib/%%PYTHON_VERSION%%/email/_parseaddr.pyo @@ -589,6 +605,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_09.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_10.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_11.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_12.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_12a.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_13.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt @@ -612,6 +629,11 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_32.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_33.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_34.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_35.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_36.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_37.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_38.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -870,6 +892,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/palmos.py lib/%%PYTHON_VERSION%%/encodings/palmos.pyc lib/%%PYTHON_VERSION%%/encodings/palmos.pyo +lib/%%PYTHON_VERSION%%/encodings/ptcp154.py +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyc +lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyo lib/%%PYTHON_VERSION%%/encodings/punycode.py lib/%%PYTHON_VERSION%%/encodings/punycode.pyc lib/%%PYTHON_VERSION%%/encodings/punycode.pyo @@ -957,6 +982,9 @@ lib/%%PYTHON_VERSION%%/gopherlib.pyo lib/%%PYTHON_VERSION%%/gzip.py lib/%%PYTHON_VERSION%%/gzip.pyc lib/%%PYTHON_VERSION%%/gzip.pyo +lib/%%PYTHON_VERSION%%/heapq.py +lib/%%PYTHON_VERSION%%/heapq.pyc +lib/%%PYTHON_VERSION%%/heapq.pyo lib/%%PYTHON_VERSION%%/hmac.py lib/%%PYTHON_VERSION%%/hmac.pyc lib/%%PYTHON_VERSION%%/hmac.pyo @@ -998,6 +1026,9 @@ lib/%%PYTHON_VERSION%%/idlelib/ChangeLog lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.py lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyc lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyo +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.py +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyc +lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyo lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.py lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyc lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyo @@ -1207,6 +1238,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_shift_jisx0213.so lib/%%PYTHON_VERSION%%/lib-dynload/_csv.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so +lib/%%PYTHON_VERSION%%/lib-dynload/_heapq.so lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so lib/%%PYTHON_VERSION%%/lib-dynload/_multibytecodec.so @@ -1230,7 +1262,6 @@ 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 -lib/%%PYTHON_VERSION%%/lib-dynload/heapq.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so lib/%%PYTHON_VERSION%%/lib-dynload/itertools.so lib/%%PYTHON_VERSION%%/lib-dynload/math.so @@ -1240,7 +1271,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/nis.so lib/%%PYTHON_VERSION%%/lib-dynload/operator.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so -lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so @@ -1498,9 +1528,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/pre.py -lib/%%PYTHON_VERSION%%/pre.pyc -lib/%%PYTHON_VERSION%%/pre.pyo lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc @@ -1658,6 +1685,7 @@ lib/%%PYTHON_VERSION%%/test/badsyntax_future7.py lib/%%PYTHON_VERSION%%/test/badsyntax_future8.py lib/%%PYTHON_VERSION%%/test/badsyntax_future9.py lib/%%PYTHON_VERSION%%/test/badsyntax_nocaret.py +lib/%%PYTHON_VERSION%%/test/cfgparser.1 lib/%%PYTHON_VERSION%%/test/cjkencodings_test.py lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyc lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyo @@ -1668,10 +1696,12 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo +lib/%%PYTHON_VERSION%%/test/mapping_tests.py +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyc +lib/%%PYTHON_VERSION%%/test/mapping_tests.pyo lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter lib/%%PYTHON_VERSION%%/test/output/test_asynchat lib/%%PYTHON_VERSION%%/test/output/test_augassign -lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_coercion @@ -1893,6 +1923,9 @@ lib/%%PYTHON_VERSION%%/test/test_codeop.pyo lib/%%PYTHON_VERSION%%/test/test_coercion.py lib/%%PYTHON_VERSION%%/test/test_coercion.pyc lib/%%PYTHON_VERSION%%/test/test_coercion.pyo +lib/%%PYTHON_VERSION%%/test/test_colorsys.py +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyc +lib/%%PYTHON_VERSION%%/test/test_colorsys.pyo lib/%%PYTHON_VERSION%%/test/test_commands.py lib/%%PYTHON_VERSION%%/test/test_commands.pyc lib/%%PYTHON_VERSION%%/test/test_commands.pyo @@ -1911,6 +1944,9 @@ lib/%%PYTHON_VERSION%%/test/test_contains.pyo lib/%%PYTHON_VERSION%%/test/test_cookie.py lib/%%PYTHON_VERSION%%/test/test_cookie.pyc lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_cookielib.py +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyc +lib/%%PYTHON_VERSION%%/test/test_cookielib.pyo lib/%%PYTHON_VERSION%%/test/test_copy.py lib/%%PYTHON_VERSION%%/test/test_copy.pyc lib/%%PYTHON_VERSION%%/test/test_copy.pyo @@ -1935,6 +1971,9 @@ lib/%%PYTHON_VERSION%%/test/test_datetime.pyo lib/%%PYTHON_VERSION%%/test/test_dbm.py lib/%%PYTHON_VERSION%%/test/test_dbm.pyc lib/%%PYTHON_VERSION%%/test/test_dbm.pyo +lib/%%PYTHON_VERSION%%/test/test_decimal.py +lib/%%PYTHON_VERSION%%/test/test_decimal.pyc +lib/%%PYTHON_VERSION%%/test/test_decimal.pyo lib/%%PYTHON_VERSION%%/test/test_deque.py lib/%%PYTHON_VERSION%%/test/test_deque.pyc lib/%%PYTHON_VERSION%%/test/test_deque.pyo @@ -1953,6 +1992,9 @@ lib/%%PYTHON_VERSION%%/test/test_dircache.pyo lib/%%PYTHON_VERSION%%/test/test_dis.py lib/%%PYTHON_VERSION%%/test/test_dis.pyc lib/%%PYTHON_VERSION%%/test/test_dis.pyo +lib/%%PYTHON_VERSION%%/test/test_distutils.py +lib/%%PYTHON_VERSION%%/test/test_distutils.pyc +lib/%%PYTHON_VERSION%%/test/test_distutils.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo @@ -2043,6 +2085,9 @@ lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo lib/%%PYTHON_VERSION%%/test/test_generators.py lib/%%PYTHON_VERSION%%/test/test_generators.pyc lib/%%PYTHON_VERSION%%/test/test_generators.pyo +lib/%%PYTHON_VERSION%%/test/test_genexps.py +lib/%%PYTHON_VERSION%%/test/test_genexps.pyc +lib/%%PYTHON_VERSION%%/test/test_genexps.pyo lib/%%PYTHON_VERSION%%/test/test_getargs.py lib/%%PYTHON_VERSION%%/test/test_getargs.pyc lib/%%PYTHON_VERSION%%/test/test_getargs.pyo @@ -2127,6 +2172,9 @@ lib/%%PYTHON_VERSION%%/test/test_isinstance.pyo lib/%%PYTHON_VERSION%%/test/test_iter.py lib/%%PYTHON_VERSION%%/test/test_iter.pyc lib/%%PYTHON_VERSION%%/test/test_iter.pyo +lib/%%PYTHON_VERSION%%/test/test_iterlen.py +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyc +lib/%%PYTHON_VERSION%%/test/test_iterlen.pyo lib/%%PYTHON_VERSION%%/test/test_itertools.py lib/%%PYTHON_VERSION%%/test/test_itertools.pyc lib/%%PYTHON_VERSION%%/test/test_itertools.pyo @@ -2382,6 +2430,9 @@ lib/%%PYTHON_VERSION%%/test/test_shutil.pyo lib/%%PYTHON_VERSION%%/test/test_signal.py lib/%%PYTHON_VERSION%%/test/test_signal.pyc lib/%%PYTHON_VERSION%%/test/test_signal.pyo +lib/%%PYTHON_VERSION%%/test/test_site.py +lib/%%PYTHON_VERSION%%/test/test_site.pyc +lib/%%PYTHON_VERSION%%/test/test_site.pyo lib/%%PYTHON_VERSION%%/test/test_slice.py lib/%%PYTHON_VERSION%%/test/test_slice.pyc lib/%%PYTHON_VERSION%%/test/test_slice.pyo @@ -2562,6 +2613,9 @@ lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyo lib/%%PYTHON_VERSION%%/test/test_xpickle.py lib/%%PYTHON_VERSION%%/test/test_xpickle.pyc lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo +lib/%%PYTHON_VERSION%%/test/test_xrange.py +lib/%%PYTHON_VERSION%%/test/test_xrange.pyc +lib/%%PYTHON_VERSION%%/test/test_xrange.pyo lib/%%PYTHON_VERSION%%/test/test_xreadline.py lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo |