lang/python27: Update to 2.7.6

- Update to 2.7.6
- Update pkg-plist
- Temporarily override OPT:Olimit using CONFIGURE_ENV (ports/182952) [1]
- Replace patch: extra-patch-configure-pth with CONFIGURE_ENV instead
- Remove patch: patch-Modules-_ctypes-libffi_fficonfig.py.in [2]
- QA: Clean up and group related USE_*, WRKSRC and CONFIGURE entries
- QA: Whitespace alignment

Changes: 2.7.6 - November 10, 2013

http://www.python.org/download/releases/2.7.6/

[1] Python removed OPT:Olimit in 3.2+, requested backport or
    alternative upstream patch: http://bugs.python.org/issue877121
[2] Upstreamed: http://bugs.python.org/issue18178

PR:		ports/182952
PR:		ports/156759
Reviewed by:	antoine, mva

5 files changed, 33 insertions, 32 deletions

diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 237c73bb0063..9fc4fd8717e3 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python27
-PORTVERSION=	2.7.5
-PORTREVISION=	4
+PORTVERSION=	2.7.6
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -13,22 +12,24 @@ MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}/portbld.static
-PATCH_WRKSRC=	${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../configure # must be relative
-CONFIGURE_ENV=	SVNVERSION="echo freebsd"
+CONFIGURE_ENV=	SVNVERSION="echo freebsd" ac_cv_opt_olimit_ok=no
 MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
-USE_LDCONFIG=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
+USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_XZ=		yes
-PYTHON_VERSION=	python2.7
+
+PYTHON_VERSION=		python2.7
 PYTHON_NO_DEPENDS=	yes
 
+WRKSRC=		${PYTHON_WRKSRC}/portbld.static
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
+PATCH_WRKSRC=	${PYTHON_WRKSRC}
+
 PLIST=		${WRKDIR}/PLIST
 PLIST_TEMPLATE?=${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
@@ -87,7 +88,7 @@ SUB_LIST=	SEM=${SEM_MSG}
 PLIST_SUB+=	THREADS=""
 .if ${PORT_OPTIONS:MPTH}
 CONFIGURE_ARGS+=	--with-pth --with-system-ffi
-EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-configure-pth
+CONFIGURE_ENV+=		ac_cv_pthread=no
 LIB_DEPENDS+=		pth:${PORTSDIR}/devel/pth \
 			ffi:${PORTSDIR}/devel/libffi
 _PTH_CPPFLAGS=		"-I${LOCALBASE}/include/pth"
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 53a8a3ee6887..116c40a75d08 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/Python-2.7.5.tar.xz) = f33c4cab167dc69e10962e1cebf1c0768e2d0e8575648130c20e6bda84551db1
-SIZE (python/Python-2.7.5.tar.xz) = 10252148
+SHA256 (python/Python-2.7.6.tar.xz) = 1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1
+SIZE (python/Python-2.7.6.tar.xz) = 10431288
diff --git a/lang/python27/files/extra-patch-configure-pth b/lang/python27/files/extra-patch-configure-pth
deleted file mode 100644
index 58e5fc73179d..000000000000
--- a/lang/python27/files/extra-patch-configure-pth
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	2010-08-15 16:47:39.627297328 +0800
-+++ configure	2010-08-15 16:50:31.353013856 +0800
-@@ -5880,6 +5880,9 @@
- CC="$ac_save_cc"
- fi
- 
-+# XXX Explicitly disable system pthread libraries.
-+ac_cv_pthread=no
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread" >&5
- $as_echo "$ac_cv_pthread" >&6; }
- fi
diff --git a/lang/python27/files/patch-Modules-_ctypes-libffi_fficonfig.py.in b/lang/python27/files/patch-Modules-_ctypes-libffi_fficonfig.py.in
deleted file mode 100644
index a2675bb94dfa..000000000000
--- a/lang/python27/files/patch-Modules-_ctypes-libffi_fficonfig.py.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Modules/_ctypes/libffi/fficonfig.py.in.orig	2013-05-12 07:32:49.000000000 +0400
-+++ ./Modules/_ctypes/libffi/fficonfig.py.in	2013-06-05 10:36:24.000000000 +0400
-@@ -1,7 +1,6 @@
- ffi_sources = """
- src/prep_cif.c
- src/closures.c
--src/dlmalloc.c
- """.split()
- 
- ffi_platforms = {
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index cc6a8ec78c34..0c538f3eb889 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -812,6 +812,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%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/false_encoding.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/bad_order.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/myfixes/__init__.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/myfixes/fix_explicit.py
@@ -1061,6 +1062,20 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/185test.db
 %%PYTHON_LIBDIR%%/test/Sine-1000Hz-300ms.aif
 %%PYTHON_LIBDIR%%/test/__init__.py
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm24.aiff
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm24.wav
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm16.aiff
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm16.au
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm16.wav
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm32.aiff
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm32.au
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm32.wav
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm8.aiff
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm8.au
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-pcm8.wav
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-ulaw.aifc
+%%PYTHON_LIBDIR%%/test/audiodata/pluck-ulaw.au
+%%PYTHON_LIBDIR%%/test/audiotests.py
 %%PYTHON_LIBDIR%%/test/audiotest.au
 %%PYTHON_LIBDIR%%/test/autotest.py
 %%PYTHON_LIBDIR%%/test/bad_coding.py
@@ -1275,6 +1290,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/mapping_tests.py
 %%PYTHON_LIBDIR%%/test/math_testcases.txt
 %%PYTHON_LIBDIR%%/test/mp_fork_bomb.py
+%%PYTHON_LIBDIR%%/test/nullbytecert.pem
 %%PYTHON_LIBDIR%%/test/nullcert.pem
 %%PYTHON_LIBDIR%%/test/outstanding_bugs.py
 %%PYTHON_LIBDIR%%/test/pickletester.py
@@ -1478,6 +1494,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_htmlparser.py
 %%PYTHON_LIBDIR%%/test/test_httplib.py
 %%PYTHON_LIBDIR%%/test/test_httpservers.py
+%%PYTHON_LIBDIR%%/test/test_idle.py
 %%PYTHON_LIBDIR%%/test/test_imageop.py
 %%PYTHON_LIBDIR%%/test/test_imaplib.py
 %%PYTHON_LIBDIR%%/test/test_imgfile.py
@@ -1510,6 +1527,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_macos.py
 %%PYTHON_LIBDIR%%/test/test_macostools.py
 %%PYTHON_LIBDIR%%/test/test_macpath.py
+%%PYTHON_LIBDIR%%/test/test_macurl2path.py
 %%PYTHON_LIBDIR%%/test/test_mailbox.py
 %%PYTHON_LIBDIR%%/test/test_marshal.py
 %%PYTHON_LIBDIR%%/test/test_math.py
@@ -1533,6 +1551,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_netrc.py
 %%PYTHON_LIBDIR%%/test/test_new.py
 %%PYTHON_LIBDIR%%/test/test_nis.py
+%%PYTHON_LIBDIR%%/test/test_nntplib.py
 %%PYTHON_LIBDIR%%/test/test_normalization.py
 %%PYTHON_LIBDIR%%/test/test_ntpath.py
 %%PYTHON_LIBDIR%%/test/test_old_mailbox.py
@@ -1613,6 +1632,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_sqlite.py
 %%PYTHON_LIBDIR%%/test/test_ssl.py
 %%PYTHON_LIBDIR%%/test/test_startfile.py
+%%PYTHON_LIBDIR%%/test/test_stat.py
 %%PYTHON_LIBDIR%%/test/test_str.py
 %%PYTHON_LIBDIR%%/test/test_strftime.py
 %%PYTHON_LIBDIR%%/test/test_string.py
@@ -1624,6 +1644,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_structmembers.py
 %%PYTHON_LIBDIR%%/test/test_structseq.py
 %%PYTHON_LIBDIR%%/test/test_subprocess.py
+%%PYTHON_LIBDIR%%/test/test_sunau.py
 %%PYTHON_LIBDIR%%/test/test_sunaudiodev.py
 %%PYTHON_LIBDIR%%/test/test_sundry.py
 %%PYTHON_LIBDIR%%/test/test_support.py
@@ -2367,6 +2388,7 @@ lib/libpython2.7.a
 @dirrm %%PYTHON_LIBDIR%%/wsgiref
 @dirrm %%PYTHON_LIBDIR%%/unittest/test
 @dirrm %%PYTHON_LIBDIR%%/unittest
+@dirrm %%PYTHON_LIBDIR%%/test/audiodata
 @dirrm %%PYTHON_LIBDIR%%/test/cjkencodings
 @dirrm %%PYTHON_LIBDIR%%/test/data
 @dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata