21 files changed, 154 insertions, 70 deletions

diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 5fe7a8741968..01f4de5cccf4 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.5.b3
+PORTVERSION=	2.5.c2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -32,13 +32,18 @@ PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PYVER_WITHPAT=${PORTVERSION:S/.b/b/}
+		PYVER_WITHPAT=${PORTVERSION:S/.c/c/}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
 
-PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_EXCLUDE=	'nis.so$$'
+.else
+PLIST_EXCLUDE=	'^$$' # nothing
+.endif
 
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -143,6 +148,10 @@ pre-patch:
 	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
 		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
 
+.if defined(WITH_FPECTL) && ${ARCH} == i386
+	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+.endif
+
 post-configure:
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
 	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
@@ -170,9 +179,9 @@ pre-su-install:
 .endfor
 
 pre-install:
-	${AWK} '{ print $$0; }						\
-	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
-	${PLIST_TEMPLATE} > ${PLIST}
+	${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
+	${AWK} '{ print $$0; } \
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	> ${PLIST}
 
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
 	([ -f ${WRKSRC}/.without_own_sha ] && \
diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo
index c416d7e4f4b8..2beba3ff399a 100644
--- a/lang/python-devel/distinfo
+++ b/lang/python-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5b3.tgz) = fb00a933b84cbc938802278d59e858f6
-SHA256 (python/Python-2.5b3.tgz) = 04879950d9f0a82f702b75ac37f2f2ed7828235eeebc297564297cd36c6ac811
-SIZE (python/Python-2.5b3.tgz) = 10998345
+MD5 (python/Python-2.5c2.tgz) = 32b56940c90844eba605d5d2dad683d2
+SHA256 (python/Python-2.5c2.tgz) = d11d9fbab8db33f3f0862de51bbd1ff36b67f9cf29874c6481be26a33c36a503
+SIZE (python/Python-2.5c2.tgz) = 11021626
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index 09d311a734fc..6526f34bc484 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -202,6 +202,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_anon.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_array_in_pointer.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_arrays.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_as_parameter.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_bitfields.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_buffers.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_byteswap.py
@@ -914,6 +915,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
+%%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sortperf.py
 %%PYTHON_LIBDIR%%/test/string_tests.py
 %%PYTHON_LIBDIR%%/test/test.xml
@@ -935,6 +937,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_augassign.py
 %%PYTHON_LIBDIR%%/test/test_base64.py
 %%PYTHON_LIBDIR%%/test/test_bastion.py
+%%PYTHON_LIBDIR%%/test/test_bigaddrspace.py
 %%PYTHON_LIBDIR%%/test/test_bigmem.py
 %%PYTHON_LIBDIR%%/test/test_binascii.py
 %%PYTHON_LIBDIR%%/test/test_binhex.py
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 5fe7a8741968..01f4de5cccf4 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.5.b3
+PORTVERSION=	2.5.c2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -32,13 +32,18 @@ PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PYVER_WITHPAT=${PORTVERSION:S/.b/b/}
+		PYVER_WITHPAT=${PORTVERSION:S/.c/c/}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
 
-PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_EXCLUDE=	'nis.so$$'
+.else
+PLIST_EXCLUDE=	'^$$' # nothing
+.endif
 
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -143,6 +148,10 @@ pre-patch:
 	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
 		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
 
+.if defined(WITH_FPECTL) && ${ARCH} == i386
+	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+.endif
+
 post-configure:
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
 	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
@@ -170,9 +179,9 @@ pre-su-install:
 .endfor
 
 pre-install:
-	${AWK} '{ print $$0; }						\
-	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
-	${PLIST_TEMPLATE} > ${PLIST}
+	${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
+	${AWK} '{ print $$0; } \
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	> ${PLIST}
 
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
 	([ -f ${WRKSRC}/.without_own_sha ] && \
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index c416d7e4f4b8..2beba3ff399a 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5b3.tgz) = fb00a933b84cbc938802278d59e858f6
-SHA256 (python/Python-2.5b3.tgz) = 04879950d9f0a82f702b75ac37f2f2ed7828235eeebc297564297cd36c6ac811
-SIZE (python/Python-2.5b3.tgz) = 10998345
+MD5 (python/Python-2.5c2.tgz) = 32b56940c90844eba605d5d2dad683d2
+SHA256 (python/Python-2.5c2.tgz) = d11d9fbab8db33f3f0862de51bbd1ff36b67f9cf29874c6481be26a33c36a503
+SIZE (python/Python-2.5c2.tgz) = 11021626
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 09d311a734fc..6526f34bc484 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -202,6 +202,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_anon.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_array_in_pointer.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_arrays.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_as_parameter.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_bitfields.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_buffers.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_byteswap.py
@@ -914,6 +915,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
+%%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sortperf.py
 %%PYTHON_LIBDIR%%/test/string_tests.py
 %%PYTHON_LIBDIR%%/test/test.xml
@@ -935,6 +937,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_augassign.py
 %%PYTHON_LIBDIR%%/test/test_base64.py
 %%PYTHON_LIBDIR%%/test/test_bastion.py
+%%PYTHON_LIBDIR%%/test/test_bigaddrspace.py
 %%PYTHON_LIBDIR%%/test/test_bigmem.py
 %%PYTHON_LIBDIR%%/test/test_binascii.py
 %%PYTHON_LIBDIR%%/test/test_binhex.py
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 5fe7a8741968..01f4de5cccf4 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.5.b3
+PORTVERSION=	2.5.c2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -32,13 +32,18 @@ PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PYVER_WITHPAT=${PORTVERSION:S/.b/b/}
+		PYVER_WITHPAT=${PORTVERSION:S/.c/c/}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
 
-PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_EXCLUDE=	'nis.so$$'
+.else
+PLIST_EXCLUDE=	'^$$' # nothing
+.endif
 
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -143,6 +148,10 @@ pre-patch:
 	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
 		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
 
+.if defined(WITH_FPECTL) && ${ARCH} == i386
+	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+.endif
+
 post-configure:
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
 	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
@@ -170,9 +179,9 @@ pre-su-install:
 .endfor
 
 pre-install:
-	${AWK} '{ print $$0; }						\
-	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
-	${PLIST_TEMPLATE} > ${PLIST}
+	${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
+	${AWK} '{ print $$0; } \
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	> ${PLIST}
 
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
 	([ -f ${WRKSRC}/.without_own_sha ] && \
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index c416d7e4f4b8..2beba3ff399a 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5b3.tgz) = fb00a933b84cbc938802278d59e858f6
-SHA256 (python/Python-2.5b3.tgz) = 04879950d9f0a82f702b75ac37f2f2ed7828235eeebc297564297cd36c6ac811
-SIZE (python/Python-2.5b3.tgz) = 10998345
+MD5 (python/Python-2.5c2.tgz) = 32b56940c90844eba605d5d2dad683d2
+SHA256 (python/Python-2.5c2.tgz) = d11d9fbab8db33f3f0862de51bbd1ff36b67f9cf29874c6481be26a33c36a503
+SIZE (python/Python-2.5c2.tgz) = 11021626
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 09d311a734fc..6526f34bc484 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -202,6 +202,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_anon.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_array_in_pointer.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_arrays.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_as_parameter.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_bitfields.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_buffers.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_byteswap.py
@@ -914,6 +915,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
+%%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sortperf.py
 %%PYTHON_LIBDIR%%/test/string_tests.py
 %%PYTHON_LIBDIR%%/test/test.xml
@@ -935,6 +937,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_augassign.py
 %%PYTHON_LIBDIR%%/test/test_base64.py
 %%PYTHON_LIBDIR%%/test/test_bastion.py
+%%PYTHON_LIBDIR%%/test/test_bigaddrspace.py
 %%PYTHON_LIBDIR%%/test/test_bigmem.py
 %%PYTHON_LIBDIR%%/test/test_binascii.py
 %%PYTHON_LIBDIR%%/test/test_binhex.py
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 5fe7a8741968..01f4de5cccf4 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.5.b3
+PORTVERSION=	2.5.c2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -32,13 +32,18 @@ PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PYVER_WITHPAT=${PORTVERSION:S/.b/b/}
+		PYVER_WITHPAT=${PORTVERSION:S/.c/c/}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
 
-PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_EXCLUDE=	'nis.so$$'
+.else
+PLIST_EXCLUDE=	'^$$' # nothing
+.endif
 
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -143,6 +148,10 @@ pre-patch:
 	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
 		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
 
+.if defined(WITH_FPECTL) && ${ARCH} == i386
+	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+.endif
+
 post-configure:
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
 	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
@@ -170,9 +179,9 @@ pre-su-install:
 .endfor
 
 pre-install:
-	${AWK} '{ print $$0; }						\
-	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
-	${PLIST_TEMPLATE} > ${PLIST}
+	${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
+	${AWK} '{ print $$0; } \
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	> ${PLIST}
 
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
 	([ -f ${WRKSRC}/.without_own_sha ] && \
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index c416d7e4f4b8..2beba3ff399a 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5b3.tgz) = fb00a933b84cbc938802278d59e858f6
-SHA256 (python/Python-2.5b3.tgz) = 04879950d9f0a82f702b75ac37f2f2ed7828235eeebc297564297cd36c6ac811
-SIZE (python/Python-2.5b3.tgz) = 10998345
+MD5 (python/Python-2.5c2.tgz) = 32b56940c90844eba605d5d2dad683d2
+SHA256 (python/Python-2.5c2.tgz) = d11d9fbab8db33f3f0862de51bbd1ff36b67f9cf29874c6481be26a33c36a503
+SIZE (python/Python-2.5c2.tgz) = 11021626
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 09d311a734fc..6526f34bc484 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -202,6 +202,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_anon.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_array_in_pointer.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_arrays.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_as_parameter.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_bitfields.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_buffers.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_byteswap.py
@@ -914,6 +915,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
+%%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sortperf.py
 %%PYTHON_LIBDIR%%/test/string_tests.py
 %%PYTHON_LIBDIR%%/test/test.xml
@@ -935,6 +937,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_augassign.py
 %%PYTHON_LIBDIR%%/test/test_base64.py
 %%PYTHON_LIBDIR%%/test/test_bastion.py
+%%PYTHON_LIBDIR%%/test/test_bigaddrspace.py
 %%PYTHON_LIBDIR%%/test/test_bigmem.py
 %%PYTHON_LIBDIR%%/test/test_binascii.py
 %%PYTHON_LIBDIR%%/test/test_binhex.py
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 5fe7a8741968..01f4de5cccf4 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.5.b3
+PORTVERSION=	2.5.c2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -32,13 +32,18 @@ PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PYVER_WITHPAT=${PORTVERSION:S/.b/b/}
+		PYVER_WITHPAT=${PORTVERSION:S/.c/c/}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
 
-PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_EXCLUDE=	'nis.so$$'
+.else
+PLIST_EXCLUDE=	'^$$' # nothing
+.endif
 
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -143,6 +148,10 @@ pre-patch:
 	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
 		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
 
+.if defined(WITH_FPECTL) && ${ARCH} == i386
+	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+.endif
+
 post-configure:
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
 	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
@@ -170,9 +179,9 @@ pre-su-install:
 .endfor
 
 pre-install:
-	${AWK} '{ print $$0; }						\
-	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
-	${PLIST_TEMPLATE} > ${PLIST}
+	${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
+	${AWK} '{ print $$0; } \
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	> ${PLIST}
 
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
 	([ -f ${WRKSRC}/.without_own_sha ] && \
diff --git a/lang/python30/distinfo b/lang/python30/distinfo
index c416d7e4f4b8..2beba3ff399a 100644
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5b3.tgz) = fb00a933b84cbc938802278d59e858f6
-SHA256 (python/Python-2.5b3.tgz) = 04879950d9f0a82f702b75ac37f2f2ed7828235eeebc297564297cd36c6ac811
-SIZE (python/Python-2.5b3.tgz) = 10998345
+MD5 (python/Python-2.5c2.tgz) = 32b56940c90844eba605d5d2dad683d2
+SHA256 (python/Python-2.5c2.tgz) = d11d9fbab8db33f3f0862de51bbd1ff36b67f9cf29874c6481be26a33c36a503
+SIZE (python/Python-2.5c2.tgz) = 11021626
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index 09d311a734fc..6526f34bc484 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -202,6 +202,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_anon.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_array_in_pointer.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_arrays.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_as_parameter.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_bitfields.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_buffers.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_byteswap.py
@@ -914,6 +915,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
+%%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sortperf.py
 %%PYTHON_LIBDIR%%/test/string_tests.py
 %%PYTHON_LIBDIR%%/test/test.xml
@@ -935,6 +937,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_augassign.py
 %%PYTHON_LIBDIR%%/test/test_base64.py
 %%PYTHON_LIBDIR%%/test/test_bastion.py
+%%PYTHON_LIBDIR%%/test/test_bigaddrspace.py
 %%PYTHON_LIBDIR%%/test/test_bigmem.py
 %%PYTHON_LIBDIR%%/test/test_binascii.py
 %%PYTHON_LIBDIR%%/test/test_binhex.py
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 5fe7a8741968..01f4de5cccf4 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.5.b3
+PORTVERSION=	2.5.c2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -32,13 +32,18 @@ PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PYVER_WITHPAT=${PORTVERSION:S/.b/b/}
+		PYVER_WITHPAT=${PORTVERSION:S/.c/c/}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
 
-PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_EXCLUDE=	'nis.so$$'
+.else
+PLIST_EXCLUDE=	'^$$' # nothing
+.endif
 
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -143,6 +148,10 @@ pre-patch:
 	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
 		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
 
+.if defined(WITH_FPECTL) && ${ARCH} == i386
+	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+.endif
+
 post-configure:
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
 	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
@@ -170,9 +179,9 @@ pre-su-install:
 .endfor
 
 pre-install:
-	${AWK} '{ print $$0; }						\
-	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
-	${PLIST_TEMPLATE} > ${PLIST}
+	${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
+	${AWK} '{ print $$0; } \
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	> ${PLIST}
 
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
 	([ -f ${WRKSRC}/.without_own_sha ] && \
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index c416d7e4f4b8..2beba3ff399a 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5b3.tgz) = fb00a933b84cbc938802278d59e858f6
-SHA256 (python/Python-2.5b3.tgz) = 04879950d9f0a82f702b75ac37f2f2ed7828235eeebc297564297cd36c6ac811
-SIZE (python/Python-2.5b3.tgz) = 10998345
+MD5 (python/Python-2.5c2.tgz) = 32b56940c90844eba605d5d2dad683d2
+SHA256 (python/Python-2.5c2.tgz) = d11d9fbab8db33f3f0862de51bbd1ff36b67f9cf29874c6481be26a33c36a503
+SIZE (python/Python-2.5c2.tgz) = 11021626
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 09d311a734fc..6526f34bc484 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -202,6 +202,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_anon.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_array_in_pointer.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_arrays.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_as_parameter.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_bitfields.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_buffers.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_byteswap.py
@@ -914,6 +915,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
+%%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sortperf.py
 %%PYTHON_LIBDIR%%/test/string_tests.py
 %%PYTHON_LIBDIR%%/test/test.xml
@@ -935,6 +937,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_augassign.py
 %%PYTHON_LIBDIR%%/test/test_base64.py
 %%PYTHON_LIBDIR%%/test/test_bastion.py
+%%PYTHON_LIBDIR%%/test/test_bigaddrspace.py
 %%PYTHON_LIBDIR%%/test/test_bigmem.py
 %%PYTHON_LIBDIR%%/test/test_binascii.py
 %%PYTHON_LIBDIR%%/test/test_binhex.py
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 5fe7a8741968..01f4de5cccf4 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.5.b3
+PORTVERSION=	2.5.c2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -32,13 +32,18 @@ PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PYVER_WITHPAT=${PORTVERSION:S/.b/b/}
+		PYVER_WITHPAT=${PORTVERSION:S/.c/c/}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
 
-PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_EXCLUDE=	'nis.so$$'
+.else
+PLIST_EXCLUDE=	'^$$' # nothing
+.endif
 
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -143,6 +148,10 @@ pre-patch:
 	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
 		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
 
+.if defined(WITH_FPECTL) && ${ARCH} == i386
+	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+.endif
+
 post-configure:
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
 	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
@@ -170,9 +179,9 @@ pre-su-install:
 .endfor
 
 pre-install:
-	${AWK} '{ print $$0; }						\
-	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
-	${PLIST_TEMPLATE} > ${PLIST}
+	${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
+	${AWK} '{ print $$0; } \
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	> ${PLIST}
 
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
 	([ -f ${WRKSRC}/.without_own_sha ] && \
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index c416d7e4f4b8..2beba3ff399a 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5b3.tgz) = fb00a933b84cbc938802278d59e858f6
-SHA256 (python/Python-2.5b3.tgz) = 04879950d9f0a82f702b75ac37f2f2ed7828235eeebc297564297cd36c6ac811
-SIZE (python/Python-2.5b3.tgz) = 10998345
+MD5 (python/Python-2.5c2.tgz) = 32b56940c90844eba605d5d2dad683d2
+SHA256 (python/Python-2.5c2.tgz) = d11d9fbab8db33f3f0862de51bbd1ff36b67f9cf29874c6481be26a33c36a503
+SIZE (python/Python-2.5c2.tgz) = 11021626
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 09d311a734fc..6526f34bc484 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -202,6 +202,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_anon.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_array_in_pointer.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_arrays.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_as_parameter.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_bitfields.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_buffers.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_byteswap.py
@@ -914,6 +915,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
+%%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sortperf.py
 %%PYTHON_LIBDIR%%/test/string_tests.py
 %%PYTHON_LIBDIR%%/test/test.xml
@@ -935,6 +937,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_augassign.py
 %%PYTHON_LIBDIR%%/test/test_base64.py
 %%PYTHON_LIBDIR%%/test/test_bastion.py
+%%PYTHON_LIBDIR%%/test/test_bigaddrspace.py
 %%PYTHON_LIBDIR%%/test/test_bigmem.py
 %%PYTHON_LIBDIR%%/test/test_binascii.py
 %%PYTHON_LIBDIR%%/test/test_binhex.py