update python26 to 2.6.5 and python31 to 3.1.2

Martin Wilke miwi at FreeBSD.org
Tue Mar 30 03:41:04 UTC 2010 

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

go ahead

On Tue, Mar 30, 2010 at 11:39:06AM +0800, wen heping wrote:
> Hi,
> 
>    I attached the patch which update python26 to 2.6.5 and
> python31 to 3.1.2, it could all build well on tinderbox and native
> system. But I did not test all of the py-* ports. I have tested only
> some of it and found no problem.
> 
> 
> Regards,
> wen

> --- Mk/bsd.python.mk.orig	2010-03-29 21:07:13.000000000 +0800
> +++ Mk/bsd.python.mk	2010-03-29 21:07:13.000000000 +0800
> @@ -371,17 +371,17 @@
>  
>  # Python-3.1
>  .if ${PYTHON_VERSION} == "python3.1"
> -PYTHON_PORTVERSION?=3.1.1
> +PYTHON_PORTVERSION?=3.1.2
>  PYTHON_PORTSDIR=	${PORTSDIR}/lang/python31
> -PYTHON_REL=			311
> +PYTHON_REL=			312
>  PYTHON_SUFFIX=		31
>  PYTHON_VER=			3.1
>  
>  # Python-2.6
>  .elif ${PYTHON_VERSION} == "python2.6"
> -PYTHON_PORTVERSION?=2.6.4
> +PYTHON_PORTVERSION?=2.6.5
>  PYTHON_PORTSDIR=	${PORTSDIR}/lang/python26
> -PYTHON_REL=			264
> +PYTHON_REL=			265
>  PYTHON_SUFFIX=		26
>  PYTHON_VER=			2.6
>  
> --- lang/python26/Makefile.orig	2010-03-29 21:08:44.000000000 +0800
> +++ lang/python26/Makefile	2010-03-29 21:09:11.000000000 +0800
> @@ -5,7 +5,7 @@
>  # $FreeBSD: ports/lang/python26/Makefile,v 1.165 2009/11/26 22:21:19 miwi Exp $
>  
>  PORTNAME=	python26
> -PORTVERSION=	2.6.4
> +PORTVERSION=	2.6.5
>  CATEGORIES=	lang python ipv6
>  MASTER_SITES=	${PYTHON_MASTER_SITES}
>  MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
> --- lang/python26/distinfo.orig	2010-03-29 21:08:53.000000000 +0800
> +++ lang/python26/distinfo	2010-03-29 21:12:47.000000000 +0800
> @@ -1,3 +1,3 @@
> -MD5 (python/Python-2.6.4.tgz) = 17dcac33e4f3adb69a57c2607b6de246
> -SHA256 (python/Python-2.6.4.tgz) = 1a25a47506e4165704cfe2b07c0a064b0b5762a2d18b8fbdad5af688aeacd252
> -SIZE (python/Python-2.6.4.tgz) = 13322131
> +MD5 (python/Python-2.6.5.tgz) = cd04b5b9383b6c1fccdaa991af762cf4
> +SHA256 (python/Python-2.6.5.tgz) = b331dafdce3361834fee783795d4f68ae7cf7d379e9137c2d8e8531cea615ede
> +SIZE (python/Python-2.6.5.tgz) = 13209175
> --- lang/python26/pkg-plist.orig	2010-03-29 21:09:02.000000000 +0800
> +++ lang/python26/pkg-plist	2010-03-30 08:14:10.000000000 +0800
> @@ -350,12 +350,15 @@
>  %%PYTHON_LIBDIR%%/distutils/tests/test_filelist.py
>  %%PYTHON_LIBDIR%%/distutils/tests/test_dist.py
>  %%PYTHON_LIBDIR%%/distutils/tests/test_install.py
> +%%PYTHON_LIBDIR%%/distutils/tests/test_install_lib.py
>  %%PYTHON_LIBDIR%%/distutils/tests/test_install_scripts.py
>  %%PYTHON_LIBDIR%%/distutils/tests/test_msvc9compiler.py
>  %%PYTHON_LIBDIR%%/distutils/tests/test_sysconfig.py
>  %%PYTHON_LIBDIR%%/distutils/tests/test_sdist.py
>  %%PYTHON_LIBDIR%%/distutils/tests/test_register.py
> +%%PYTHON_LIBDIR%%/distutils/tests/test_unixccompiler.py
>  %%PYTHON_LIBDIR%%/distutils/tests/test_upload.py
> +%%PYTHON_LIBDIR%%/distutils/tests/test_util.py
>  %%PYTHON_LIBDIR%%/distutils/tests/test_versionpredicate.py
>  %%PYTHON_LIBDIR%%/distutils/text_file.py
>  %%PYTHON_LIBDIR%%/distutils/unixccompiler.py
> @@ -436,6 +439,8 @@
>  %%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_codecs_renamed.py
> @@ -692,9 +697,9 @@
>  %%PYTHON_LIBDIR%%/json/tool.py
>  %%PYTHON_LIBDIR%%/keyword.py
>  %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt
> -%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.4.final.0.pickle
> +%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.5.final.0.pickle
>  %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt
> -%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.4.final.0.pickle
> +%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.5.final.0.pickle
>  %%PYTHON_LIBDIR%%/lib2to3/__init__.py
>  %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py
>  %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py
> @@ -730,6 +735,7 @@
>  %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_next.py
>  %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_nonzero.py
>  %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_numliterals.py
> +%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_operator.py
>  %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_paren.py
>  %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_print.py
>  %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_raise.py
> @@ -767,6 +773,7 @@
>  %%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
> @@ -1166,6 +1173,7 @@
>  %%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
> @@ -1458,6 +1466,7 @@
>  %%PYTHON_LIBDIR%%/test/test_quopri.py
>  %%PYTHON_LIBDIR%%/test/test_random.py
>  %%PYTHON_LIBDIR%%/test/test_re.py
> +%%PYTHON_LIBDIR%%/test/test_readline.py
>  %%PYTHON_LIBDIR%%/test/test_repr.py
>  %%PYTHON_LIBDIR%%/test/test_resource.py
>  %%PYTHON_LIBDIR%%/test/test_rfc822.py
> --- lang/python31/Makefile.orig	2010-03-22 15:16:52.000000000 +0800
> +++ lang/python31/Makefile	2010-03-30 11:31:26.000000000 +0800
> @@ -5,8 +5,7 @@
>  # $FreeBSD: ports/lang/python31/Makefile,v 1.165 2009/11/26 12:46:32 miwi Exp $
>  
>  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-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
> --- lang/python31/distinfo.orig	2010-03-22 15:17:00.000000000 +0800
> +++ lang/python31/distinfo	2010-03-29 21:08:04.000000000 +0800
> @@ -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
> --- lang/python31/pkg-plist.orig	2010-03-22 15:17:09.000000000 +0800
> +++ lang/python31/pkg-plist	2010-03-30 10:38:15.000000000 +0800
> @@ -402,6 +402,8 @@
>  %%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 @@
>  %%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 @@
>  %%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 @@
>  %%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 @@
>  %%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 @@
>  %%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 @@
>  %%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 @@
>  %%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 @@
>  %%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 @@
>  @dirrm %%PYTHON_LIBDIR%%/xml
>  @dirrm %%PYTHON_LIBDIR%%/wsgiref
>  @dirrm %%PYTHON_LIBDIR%%/urllib
> + at dirrm %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter
> + at dirrm %%PYTHON_LIBDIR%%/tkinter/test/test_ttk
> + at dirrm %%PYTHON_LIBDIR%%/tkinter/test
>  @dirrm %%PYTHON_LIBDIR%%/tkinter
>  @dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata
>  @dirrm %%PYTHON_LIBDIR%%/test


- -- 

                      \ || /
                     ( * * )
+-----------------oOO--(_)--OOo-------------------------+
|  PGP    : 0xB1E6FCE9  |				|
|  Skype  : splash_111  |  Mail   : miwi(at)FreeBSD.org |
+-----------------------+-------------------------------+
|	Mess with the Best, Die like the Rest!		|
+-----------------------+-------------------------------+
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (FreeBSD)

iEYEARECAAYFAkuxcs0ACgkQdLJIhLHm/OnCGwCgkm/F25npZVyLb/OPPVTnUpwl
qrMAnjS4ppMMxCqpWuyTclg4S2Eb7sNQ
=3mYd
-----END PGP SIGNATURE-----

More information about the freebsd-python mailing list