- Update lang/python26 to 2.6.5

- Update lang/python31 to 3.1.2

Reviewed by:	miwi@, lwhsu@

3 files changed, 30 insertions, 10 deletions

diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 2a2ce320690b..3c5989272d41 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python31
-PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTVERSION=	3.1.2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -171,7 +170,7 @@ pre-su-install:
 pre-install:
 	${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
 	/LIBDIR.*\.py$$/ && \
-	!/bad_coding|badsyntax|site-packages|py2_test_grammar|crlf|different_encoding/ \
+	!/bad_coding|badsyntax|site-packages|py2_test_grammar|crlf|different_encoding|tests\/data/ \
 	{ print $$0 "o"; print $$0 "c"; }' > ${PLIST}
 
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index 15b56d19969d..aec70c21ed7c 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-3.1.1.tgz) = f1317dbb2398374d6691edd5bff1b91d
-SHA256 (python/Python-3.1.1.tgz) = 5d85d7bff11c4db44920af99f64f4227c816f897f6bfa9dd8a2611165ca5f0a1
-SIZE (python/Python-3.1.1.tgz) = 11525876
+MD5 (python/Python-3.1.2.tgz) = 08d01c468989d1f2cc560c23f8e6a7ea
+SHA256 (python/Python-3.1.2.tgz) = dffbc0561a161a4a576c6059e6990a9859a0be16ba9b5736eabe4abbb2700d1c
+SIZE (python/Python-3.1.2.tgz) = 11661773
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 4333cc8585b5..325f9e99cad5 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -402,6 +402,8 @@ libdata/pkgconfig/python-3.1.pc
 %%PYTHON_LIBDIR%%/email/test/data/msg_42.txt
 %%PYTHON_LIBDIR%%/email/test/data/msg_43.txt
 %%PYTHON_LIBDIR%%/email/test/data/msg_44.txt
+%%PYTHON_LIBDIR%%/email/test/data/msg_45.txt
+%%PYTHON_LIBDIR%%/email/test/data/msg_46.txt
 %%PYTHON_LIBDIR%%/email/test/test_email.py
 %%PYTHON_LIBDIR%%/email/test/test_email_codecs.py
 %%PYTHON_LIBDIR%%/email/test/test_email_torture.py
@@ -745,9 +747,9 @@ libdata/pkgconfig/python-3.1.pc
 %%PYTHON_LIBDIR%%/lib-dynload/unicodedata.so
 %%PYTHON_LIBDIR%%/lib-dynload/zlib.so
 %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/Grammar3.1.1.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/Grammar3.1.2.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar3.1.1.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar3.1.2.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/__init__.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py
@@ -818,6 +820,7 @@ libdata/pkgconfig/python-3.1.pc
 %%PYTHON_LIBDIR%%/lib2to3/refactor.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/__init__.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/data/README
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/bom.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/data/crlf.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/data/different_encoding.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/bad_order.py
@@ -836,6 +839,7 @@ libdata/pkgconfig/python-3.1.pc
 %%PYTHON_LIBDIR%%/lib2to3/tests/support.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/test_all_fixers.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/test_fixers.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/test_main.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/test_parser.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/test_pytree.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/test_refactor.py
@@ -1133,6 +1137,7 @@ libdata/pkgconfig/python-3.1.pc
 %%PYTHON_LIBDIR%%/test/inspect_fodder2.py
 %%PYTHON_LIBDIR%%/test/keycert.pem
 %%PYTHON_LIBDIR%%/test/list_tests.py
+%%PYTHON_LIBDIR%%/test/lock_tests.py
 %%PYTHON_LIBDIR%%/test/mapping_tests.py
 %%PYTHON_LIBDIR%%/test/nullcert.pem
 %%PYTHON_LIBDIR%%/test/outstanding_bugs.py
@@ -1430,6 +1435,7 @@ libdata/pkgconfig/python-3.1.pc
 %%PYTHON_LIBDIR%%/test/test_stringprep.py
 %%PYTHON_LIBDIR%%/test/test_strlit.py
 %%PYTHON_LIBDIR%%/test/test_strptime.py
+%%PYTHON_LIBDIR%%/test/test_strtod.py
 %%PYTHON_LIBDIR%%/test/test_struct.py
 %%PYTHON_LIBDIR%%/test/test_structmembers.py
 %%PYTHON_LIBDIR%%/test/test_structseq.py
@@ -1532,6 +1538,18 @@ libdata/pkgconfig/python-3.1.pc
 %%PYTHON_LIBDIR%%/tkinter/messagebox.py
 %%PYTHON_LIBDIR%%/tkinter/scrolledtext.py
 %%PYTHON_LIBDIR%%/tkinter/simpledialog.py
+%%PYTHON_LIBDIR%%/tkinter/test/README
+%%PYTHON_LIBDIR%%/tkinter/test/__init__.py
+%%PYTHON_LIBDIR%%/tkinter/test/runtktests.py
+%%PYTHON_LIBDIR%%/tkinter/test/support.py
+%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__init__.py
+%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_loadtk.py
+%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_text.py
+%%PYTHON_LIBDIR%%/tkinter/test/test_ttk/__init__.py
+%%PYTHON_LIBDIR%%/tkinter/test/test_ttk/test_extensions.py
+%%PYTHON_LIBDIR%%/tkinter/test/test_ttk/test_functions.py
+%%PYTHON_LIBDIR%%/tkinter/test/test_ttk/test_style.py
+%%PYTHON_LIBDIR%%/tkinter/test/test_ttk/test_widgets.py
 %%PYTHON_LIBDIR%%/tkinter/tix.py
 %%PYTHON_LIBDIR%%/tkinter/ttk.py
 %%PYTHON_LIBDIR%%/token.py
@@ -1681,12 +1699,11 @@ libdata/pkgconfig/python-3.1.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/fact.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/find-uname.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/from.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/ftpstats.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/lpwatch.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/makedir.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/markov.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/mboxconvert.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/mkrcs.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/morse.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/newslist.doc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/newslist.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/pi.py
@@ -2018,6 +2035,7 @@ libdata/pkgconfig/python-3.1.pc
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/dutree.doc
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/dutree.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/eptags.py
+%%PORTDATA%%%%DATADIR%%/Tools/scripts/find_recursionlimit.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/finddiv.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/findlinksto.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/findnocoding.py
@@ -2152,6 +2170,9 @@ libdata/pkgconfig/python-3.1.pc
 @dirrm %%PYTHON_LIBDIR%%/xml
 @dirrm %%PYTHON_LIBDIR%%/wsgiref
 @dirrm %%PYTHON_LIBDIR%%/urllib
+@dirrm %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter
+@dirrm %%PYTHON_LIBDIR%%/tkinter/test/test_ttk
+@dirrm %%PYTHON_LIBDIR%%/tkinter/test
 @dirrm %%PYTHON_LIBDIR%%/tkinter
 @dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata
 @dirrm %%PYTHON_LIBDIR%%/test