- Update to python 2.5.4 and python 2.6.1

Reviewed by:	perky | lwhsu
Tested with:	exp-run via pav

3 files changed, 23 insertions, 14 deletions

diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 90e72cfdafd0..1b4ebca281aa 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python26
-PORTVERSION=	2.6
+PORTVERSION=	2.6.1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -83,11 +83,11 @@ CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 .endif # !defined(WITHOUT_THREADS)
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
-CONFIGURE_ARGS+=	--enable-unicode=ucs4
+CONFIGURE_ARGS-=	--enable-unicode=ucs4
 .endif
 
 .if defined(WITHOUT_PYMALLOC)
-CONFIGURE_ARGS+=        --without-pymalloc
+CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
 .if ${ARCH} == i386
@@ -96,12 +96,12 @@ PLIST_SUB+=	X86_ONLY=""
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
-PLIST_SUB+=     32BIT_ONLY="@comment "
+PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
-PLIST_SUB+=     32BIT_ONLY=""
+PLIST_SUB+=	32BIT_ONLY=""
 .endif
 .if ${ARCH} == sparc64
-CFLAGS+=        -DPYTHON_DEFAULT_RECURSION_LIMIT=900
+CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 .if !exists(/usr/bin/ypcat) # the world with NO_NIS
@@ -111,13 +111,13 @@ PLIST_SUB+=	NO_NIS=""
 .endif
 
 .if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if defined(WITH_FPECTL)
-CONFIGURE_ARGS+= --with-fpectl
+CONFIGURE_ARGS+=	--with-fpectl
 .endif
 
 pre-patch:
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index c6556fb0d8f8..9873696d2db4 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.6.tgz) = d16d29a77db2cd3af882a591f431a403
-SHA256 (python/Python-2.6.tgz) = 7c2f21a968a737a59ed0729f4b1dc154dc3aa183c20be96055186fe43c6742d0
-SIZE (python/Python-2.6.tgz) = 13023860
+MD5 (python/Python-2.6.1.tgz) = 52b3d421f42bacfdcaf55f56c0ff9be4
+SHA256 (python/Python-2.6.1.tgz) = fb65e93678e1327e3e8559cc56e1e00ed8c07162b21287a3502677892c5c515c
+SIZE (python/Python-2.6.1.tgz) = 13046455
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index ca708124af99..d671d39276de 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -685,9 +685,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/json/tool.py
 %%PYTHON_LIBDIR%%/keyword.py
 %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.0.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.1.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.0.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.1.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/__init__.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py
@@ -699,6 +699,12 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_dict.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_except.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_exec.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyc
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyc
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyo
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyo
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_execfile.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_filter.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_funcattrs.py
@@ -995,6 +1001,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/cjkencodings_test.py
 %%PYTHON_LIBDIR%%/test/cmath_testcases.txt
 %%PYTHON_LIBDIR%%/test/curses_tests.py
+%%PYTHON_LIBDIR%%/test/test_future5.py
+%%PYTHON_LIBDIR%%/test/test_future5.pyc
+%%PYTHON_LIBDIR%%/test/test_future5.pyo
 %%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest