3 files changed, 43 insertions, 25 deletions

diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index e97fbac0eb7d..2f7c395b0830 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -5,16 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.5.a0.20050129
-PORTREVISION=	1
+PORTVERSION=	2.5.a0.20050728
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
 DISTFILES=	${PYTHON_DISTFILE}
 
-PATCH_SITES=	http://www.python.org/security/PSF-2005-001/
-PATCHFILES=	patch.txt
-
 MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language
 
@@ -22,7 +18,6 @@ DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 MAKE_ENV=	VPATH="${WRKSRC}"
 INSTALLS_SHLIB=	yes
@@ -44,7 +39,8 @@ OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
 		PYMALLOC "Use python's internal malloc" on \
-		IPV6 "Enable IPv6 support" on
+		IPV6 "Enable IPv6 support" on \
+		FPECTL "Enable floating point exception handling" off
 
 .include <bsd.port.pre.mk>
 
@@ -98,14 +94,18 @@ CONFIGURE_ARGS+= --enable-ipv6
 CONFIGURE_ARGS+= --disable-ipv6
 .endif
 
-.if ${OSVERSION} >= 600000
-PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
+.if defined(WITH_FPECTL)
+CONFIGURE_ARGS+= --with-fpectl
+.endif
+
+.if ${OSVERSION} >= 700000
+PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6
+.elif ${OSVERSION} >= 600000
+PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7
 .elif ${OSVERSION} >= 500000
-PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd6
-.elif ${OSVERSION} >= 400000
-PLATFORMS=plat-freebsd3 plat-freebsd5 plat-freebsd6
+PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7
 .else
-PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6
+PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7
 .endif
 
 post-extract:
@@ -123,8 +123,6 @@ pre-patch:
 	${REINPLACE_CMD} -e \
 		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
 		${WRKSRC}/Lib/site.py
-	${MKDIR} ${WRKSRC}/Lib/plat-freebsd6
-	${CP} ${WRKSRC}/Lib/plat-freebsd5/regen ${WRKSRC}/Lib/plat-freebsd6/
 
 post-configure:
 	@# prepare a subdir for shared build
diff --git a/lang/python30/distinfo b/lang/python30/distinfo
index 03e493904480..3ae73b7d56d2 100644
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@@ -1,4 +1,2 @@
-MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6
-SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299
-MD5 (python/patch.txt) = bdebb9c747dea1eada73ee7dbb6ac838
-SIZE (python/patch.txt) = 4427
+MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3
+SIZE (python/Python-2.5.a0.20050728.tgz) = 9280478
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index f687ce816284..e021d97679a8 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -210,6 +210,9 @@ lib/%%PYTHON_VERSION%%/bsddb/test/test_associate.pyo
 lib/%%PYTHON_VERSION%%/bsddb/test/test_basics.py
 lib/%%PYTHON_VERSION%%/bsddb/test/test_basics.pyc
 lib/%%PYTHON_VERSION%%/bsddb/test/test_basics.pyo
+lib/%%PYTHON_VERSION%%/bsddb/test/test_compare.py
+lib/%%PYTHON_VERSION%%/bsddb/test/test_compare.pyc
+lib/%%PYTHON_VERSION%%/bsddb/test/test_compare.pyo
 lib/%%PYTHON_VERSION%%/bsddb/test/test_compat.py
 lib/%%PYTHON_VERSION%%/bsddb/test/test_compat.pyc
 lib/%%PYTHON_VERSION%%/bsddb/test/test_compat.pyo
@@ -442,6 +445,9 @@ lib/%%PYTHON_VERSION%%/distutils/command/register.pyo
 lib/%%PYTHON_VERSION%%/distutils/command/sdist.py
 lib/%%PYTHON_VERSION%%/distutils/command/sdist.pyc
 lib/%%PYTHON_VERSION%%/distutils/command/sdist.pyo
+lib/%%PYTHON_VERSION%%/distutils/command/upload.py
+lib/%%PYTHON_VERSION%%/distutils/command/upload.pyc
+lib/%%PYTHON_VERSION%%/distutils/command/upload.pyo
 lib/%%PYTHON_VERSION%%/distutils/command/wininst-6.exe
 lib/%%PYTHON_VERSION%%/distutils/command/wininst-7.1.exe
 lib/%%PYTHON_VERSION%%/distutils/core.py
@@ -516,6 +522,9 @@ lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo
 lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py
 lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc
 lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo
+lib/%%PYTHON_VERSION%%/distutils/tests/test_versionpredicate.py
+lib/%%PYTHON_VERSION%%/distutils/tests/test_versionpredicate.pyc
+lib/%%PYTHON_VERSION%%/distutils/tests/test_versionpredicate.pyo
 lib/%%PYTHON_VERSION%%/distutils/text_file.py
 lib/%%PYTHON_VERSION%%/distutils/text_file.pyc
 lib/%%PYTHON_VERSION%%/distutils/text_file.pyo
@@ -528,6 +537,9 @@ lib/%%PYTHON_VERSION%%/distutils/util.pyo
 lib/%%PYTHON_VERSION%%/distutils/version.py
 lib/%%PYTHON_VERSION%%/distutils/version.pyc
 lib/%%PYTHON_VERSION%%/distutils/version.pyo
+lib/%%PYTHON_VERSION%%/distutils/versionpredicate.py
+lib/%%PYTHON_VERSION%%/distutils/versionpredicate.pyc
+lib/%%PYTHON_VERSION%%/distutils/versionpredicate.pyo
 lib/%%PYTHON_VERSION%%/doctest.py
 lib/%%PYTHON_VERSION%%/doctest.pyc
 lib/%%PYTHON_VERSION%%/doctest.pyo
@@ -1285,6 +1297,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 %%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
+lib/%%PYTHON_VERSION%%/lib-dynload/functional.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/itertools.so
@@ -1525,10 +1538,6 @@ lib/%%PYTHON_VERSION%%/pipes.pyo
 lib/%%PYTHON_VERSION%%/pkgutil.py
 lib/%%PYTHON_VERSION%%/pkgutil.pyc
 lib/%%PYTHON_VERSION%%/pkgutil.pyo
-lib/%%PYTHON_VERSION%%/plat-freebsd3/IN.py
-lib/%%PYTHON_VERSION%%/plat-freebsd3/IN.pyc
-lib/%%PYTHON_VERSION%%/plat-freebsd3/IN.pyo
-lib/%%PYTHON_VERSION%%/plat-freebsd3/regen
 lib/%%PYTHON_VERSION%%/plat-freebsd4/IN.py
 lib/%%PYTHON_VERSION%%/plat-freebsd4/IN.pyc
 lib/%%PYTHON_VERSION%%/plat-freebsd4/IN.pyo
@@ -1541,6 +1550,10 @@ lib/%%PYTHON_VERSION%%/plat-freebsd6/IN.py
 lib/%%PYTHON_VERSION%%/plat-freebsd6/IN.pyc
 lib/%%PYTHON_VERSION%%/plat-freebsd6/IN.pyo
 lib/%%PYTHON_VERSION%%/plat-freebsd6/regen
+lib/%%PYTHON_VERSION%%/plat-freebsd7/IN.py
+lib/%%PYTHON_VERSION%%/plat-freebsd7/IN.pyc
+lib/%%PYTHON_VERSION%%/plat-freebsd7/IN.pyo
+lib/%%PYTHON_VERSION%%/plat-freebsd7/regen
 lib/%%PYTHON_VERSION%%/platform.py
 lib/%%PYTHON_VERSION%%/platform.pyc
 lib/%%PYTHON_VERSION%%/platform.pyo
@@ -1769,7 +1782,6 @@ 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_cgi
 lib/%%PYTHON_VERSION%%/test/output/test_class
@@ -1810,6 +1822,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile
 lib/%%PYTHON_VERSION%%/test/output/test_tokenize
 lib/%%PYTHON_VERSION%%/test/output/test_types
 lib/%%PYTHON_VERSION%%/test/output/test_winreg
+lib/%%PYTHON_VERSION%%/test/output/test_xdrlib
 lib/%%PYTHON_VERSION%%/test/output/xmltests
 lib/%%PYTHON_VERSION%%/test/pickletester.py
 lib/%%PYTHON_VERSION%%/test/pickletester.pyc
@@ -2138,6 +2151,9 @@ lib/%%PYTHON_VERSION%%/test/test_filecmp.pyo
 lib/%%PYTHON_VERSION%%/test/test_fileinput.py
 lib/%%PYTHON_VERSION%%/test/test_fileinput.pyc
 lib/%%PYTHON_VERSION%%/test/test_fileinput.pyo
+lib/%%PYTHON_VERSION%%/test/test_float.py
+lib/%%PYTHON_VERSION%%/test/test_float.pyc
+lib/%%PYTHON_VERSION%%/test/test_float.pyo
 lib/%%PYTHON_VERSION%%/test/test_fnmatch.py
 lib/%%PYTHON_VERSION%%/test/test_fnmatch.pyc
 lib/%%PYTHON_VERSION%%/test/test_fnmatch.pyo
@@ -2156,6 +2172,9 @@ lib/%%PYTHON_VERSION%%/test/test_frozen.pyo
 lib/%%PYTHON_VERSION%%/test/test_funcattrs.py
 lib/%%PYTHON_VERSION%%/test/test_funcattrs.pyc
 lib/%%PYTHON_VERSION%%/test/test_funcattrs.pyo
+lib/%%PYTHON_VERSION%%/test/test_functional.py
+lib/%%PYTHON_VERSION%%/test/test_functional.pyc
+lib/%%PYTHON_VERSION%%/test/test_functional.pyo
 lib/%%PYTHON_VERSION%%/test/test_future.py
 lib/%%PYTHON_VERSION%%/test/test_future.pyc
 lib/%%PYTHON_VERSION%%/test/test_future.pyo
@@ -2714,6 +2733,9 @@ lib/%%PYTHON_VERSION%%/test/test_winreg.pyo
 lib/%%PYTHON_VERSION%%/test/test_winsound.py
 lib/%%PYTHON_VERSION%%/test/test_winsound.pyc
 lib/%%PYTHON_VERSION%%/test/test_winsound.pyo
+lib/%%PYTHON_VERSION%%/test/test_xdrlib.py
+lib/%%PYTHON_VERSION%%/test/test_xdrlib.pyc
+lib/%%PYTHON_VERSION%%/test/test_xdrlib.pyo
 lib/%%PYTHON_VERSION%%/test/test_xmllib.py
 lib/%%PYTHON_VERSION%%/test/test_xmllib.pyc
 lib/%%PYTHON_VERSION%%/test/test_xmllib.pyo
@@ -3377,10 +3399,10 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo
 @dirrm lib/%%PYTHON_VERSION%%/test/decimaltestdata
 @dirrm lib/%%PYTHON_VERSION%%/test
 @dirrm lib/%%PYTHON_VERSION%%/site-packages
+@dirrm lib/%%PYTHON_VERSION%%/plat-freebsd7
 @dirrm lib/%%PYTHON_VERSION%%/plat-freebsd6
 @dirrm lib/%%PYTHON_VERSION%%/plat-freebsd5
 @dirrm lib/%%PYTHON_VERSION%%/plat-freebsd4
-@dirrm lib/%%PYTHON_VERSION%%/plat-freebsd3
 @dirrm lib/%%PYTHON_VERSION%%/logging
 @dirrm lib/%%PYTHON_VERSION%%/lib-tk
 @dirrm lib/%%PYTHON_VERSION%%/lib-old