3 files changed, 125 insertions, 10 deletions

diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 05c2793052f5..6f2d003cc20d 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python25
-PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTVERSION=	2.5.2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index 9a63d62ef45b..855d2a1ab8b5 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1
-SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8
-SIZE (python/Python-2.5.1.tgz) = 11060830
+MD5 (python/Python-2.5.2.tgz) = 3f7ca8aa86c6bd275426d63b46e07992
+SHA256 (python/Python-2.5.2.tgz) = 834afe8a88adaf623b05ac5dd6700dd5bb5d0d5553fc74ad529359a3496e4ae3
+SIZE (python/Python-2.5.2.tgz) = 11583114
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 580b8cfa52b4..cb588a191a8e 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -217,6 +217,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_cast.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_cfuncs.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_checkretval.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_delattr.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_errcheck.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_find.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_funcptr.py
@@ -661,7 +662,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/lib-dynload/array.so
 %%PYTHON_LIBDIR%%/lib-dynload/audioop.so
 %%PYTHON_LIBDIR%%/lib-dynload/binascii.so
-%%PYTHON_LIBDIR%%/lib-dynload/bsddb185.so
 %%PYTHON_LIBDIR%%/lib-dynload/bz2.so
 %%PYTHON_LIBDIR%%/lib-dynload/cPickle.so
 %%PYTHON_LIBDIR%%/lib-dynload/cStringIO.so
@@ -835,34 +835,147 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/cjkencodings_test.py
 %%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/base.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/clamp.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/class.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/compare.decTest
-%%PYTHON_LIBDIR%%/test/decimaltestdata/decimal128.decTest
-%%PYTHON_LIBDIR%%/test/decimaltestdata/decimal32.decTest
-%%PYTHON_LIBDIR%%/test/decimaltestdata/decimal64.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/comparetotal.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/comparetotmag.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/copy.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/copyabs.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/copynegate.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/copysign.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddAbs.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddAdd.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddAnd.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddBase.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddCanonical.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddClass.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddCompare.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddCompareSig.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddCompareTotal.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddCompareTotalMag.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddCopy.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddCopyAbs.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddCopyNegate.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddCopySign.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddDivide.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddDivideInt.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddEncode.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddFMA.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddInvert.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddLogB.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddMax.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddMaxMag.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddMin.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddMinMag.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddMinus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddMultiply.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddNextMinus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddNextPlus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddNextToward.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddOr.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddPlus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddQuantize.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddReduce.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddRemainder.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddRemainderNear.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddRotate.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddSameQuantum.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddScaleB.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddShift.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddSubtract.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddToIntegral.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ddXor.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/decDouble.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/decQuad.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/decSingle.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/divide.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/divideint.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqAbs.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqAdd.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqAnd.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqBase.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqCanonical.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqClass.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqCompare.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqCompareSig.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqCompareTotal.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqCompareTotalMag.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqCopy.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqCopyAbs.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqCopyNegate.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqCopySign.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqDivide.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqDivideInt.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqEncode.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqFMA.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqInvert.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqLogB.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqMax.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqMaxMag.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqMin.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqMinMag.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqMinus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqMultiply.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqNextMinus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqNextPlus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqNextToward.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqOr.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqPlus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqQuantize.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqReduce.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqRemainder.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqRemainderNear.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqRotate.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqSameQuantum.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqScaleB.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqShift.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqSubtract.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqToIntegral.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dqXor.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dsBase.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/dsEncode.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/exp.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/extra.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/fma.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/inexact.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/invert.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/ln.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/log10.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/logb.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/max.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/maxmag.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/min.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/minmag.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/minus.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/multiply.decTest
-%%PYTHON_LIBDIR%%/test/decimaltestdata/normalize.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/nextminus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/nextplus.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/nexttoward.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/or.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/plus.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/power.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/powersqrt.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/quantize.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/randomBound32.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/randoms.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/reduce.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/remainder.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/remainderNear.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/rescale.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/rotate.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/rounding.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/samequantum.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/scaleb.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/shift.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/squareroot.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/subtract.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/testall.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/tointegral.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/tointegralx.decTest
+%%PYTHON_LIBDIR%%/test/decimaltestdata/xor.decTest
 %%PYTHON_LIBDIR%%/test/doctest_aliases.py
 %%PYTHON_LIBDIR%%/test/double_const.py
 %%PYTHON_LIBDIR%%/test/empty.vbs
@@ -1231,6 +1344,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_unpack.py
 %%PYTHON_LIBDIR%%/test/test_urllib.py
 %%PYTHON_LIBDIR%%/test/test_urllib2.py
+%%PYTHON_LIBDIR%%/test/test_urllib2_localnet.py
 %%PYTHON_LIBDIR%%/test/test_urllib2net.py
 %%PYTHON_LIBDIR%%/test/test_urllibnet.py
 %%PYTHON_LIBDIR%%/test/test_urlparse.py
@@ -1591,8 +1705,10 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/Makefile
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/build.bat
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/buildmsi.bat
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/clean.bat
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/external.bat
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/getchm.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/kill_python.bat
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/kill_python.c
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/kill_python.mak