Index: lang/python27/Makefile
===================================================================
diff -u -N -rb64e334dba434b7783cc6448c42d55e7f5839279 -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/Makefile	(.../Makefile)	(revision b64e334dba434b7783cc6448c42d55e7f5839279)
+++ lang/python27/Makefile	(.../Makefile)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -1,275 +1,124 @@
 # $MidnightBSD$
 
 PORTNAME=	python27
-PORTVERSION=	2.7.8
-PORTREVISION=	1
+PORTVERSION=	2.7.10
+PORTREVISION=	0
 CATEGORIES=	lang python ipv6
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
-DISTFILES=	${PYTHON_DISTFILE}
+MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
+DISTNAME=	Python-${PORTVERSION}
+DIST_SUBDIR=	python
 
 MAINTAINER=	ports@MidnightBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	python
 
-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 midnightbsd" ac_cv_opt_olimit_ok=no
+USES=		cpe ncurses pkgconfig readline tar:xz
+CONFIGURE_ENV=	SVNVERSION="echo midnightbsd"
 CONFIGURE_TARGET= --build=${ARCH}-portbld-midnightbsd${OSREL} \
-		  --host=${ARCH}-portbld-midnightbsd${OSREL}
-MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
+		  --host=${ARCH}-portbld-midnightbsd${OSREL} \
+		  --target=${ARCH}-portbld-midnightbsd${OSREL}
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	altinstall
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	python
 CPE_PRODUCT=	${CPE_VENDOR}
 CPE_VERSION=	${PORTVERSION}
 
-USE_PYTHON=	yes
-USES=		cpe ncurses readline tar:xz
-PYTHON_VERSION=	python2.7
-PYTHON_NO_DEPENDS=	yes
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ENV+=		ac_cv_opt_olimit_ok=no OPT=""				# Null out OPT to respect user CFLAGS and remove optimizations
 
-SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
-PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE?=${PKGDIR}/pkg-plist
-PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PYMAJOR=${PYTHON_MAJOR_VER} \
-		PYVER_WITHPAT=${PORTVERSION:S/.c/c/} \
-		PORTVERSION=${PORTVERSION}
+INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
+#MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
+MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
+MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
 
-EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-DATADIR=	${PREFIX}/share/${PYTHON_VERSION}
+PLIST_SUB=		ABI=${ABIFLAGS} \
+			PORTVERSION=${PORTVERSION} \
+			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
-PLATFORMS=	plat-freebsd4 plat-freebsd5 plat-freebsd6 \
-		plat-freebsd7 
-#plat-midnightbsd0
+OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI PYMALLOC SEM THREADS
+OPTIONS_DEFAULT=	IPV6 LIBFFI PYMALLOC SEM THREADS UCS4
+OPTIONS_SINGLE=		UNICODE
+OPTIONS_SINGLE_UNICODE=	UCS2 UCS4
+OPTIONS_SUB=		yes
 
-BIN_SCRIPTS=	2to3 idle pydoc smtpd.py
-BIN_FILES=	python python-shared python-config python-shared-config \
-		${BIN_SCRIPTS}
-BINLINKS_SUB=	-e 's,smtpd,smtpd${PYTHON_VER},' \
-		-e 's,2to3,2to3-${PYTHON_VER},' \
-		-e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
+LIBFFI_DESC=	Use libffi from ports instead of bundled version
+UCS2_DESC=	Enable UCS2 Unicode Strings
+UCS4_DESC=	Enable UCS4 Unicode Strings
+PYMALLOC_DESC=	Enable specialized mallocs
 
-OPTIONS=	THREADS "Enable thread support" on \
-		SEM "Use POSIX semaphores (experimental)" off \
-		PTH "Use GNU Pth for threading/multiprocessing" off \
-		UCS4 "Use UCS4 for unicode support" on \
-		PYMALLOC "Use python's internal malloc" on \
-		IPV6 "Enable IPv6 support" on \
-		FPECTL "Enable floating point exception handling" off
+DEBUG_CONFIGURE_WITH=	pydebug
+IPV6_CONFIGURE_ENABLE=	ipv6
+LIBFFI_CONFIGURE_ON=	--with-system-ffi
+LIBFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 
-.include <bsd.port.pre.mk>
+# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
+# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
+# Upstream Issue: http://bugs.python.org/issue6299
+USES+=		gettext
+CPPFLAGS+=		-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lintl
 
-CONFIGURE_ARGS+=	--with-system-ffi
-LIB_DEPENDS+=	ffi:${PORTSDIR}/devel/libffi
+PYMALLOC_CONFIGURE_WITH=	pymalloc
 
-SEM_MSG=	"@comment "
+SEM_CONFIGURE_ENV=	ac_cv_posix_semaphores_enabled=yes
+SEM_CONFIGURE_ENV_OFF=	ac_cv_posix_semaphores_enabled=no
 
-SUB_FILES=	pkg-message
-SUB_LIST=	SEM=${SEM_MSG}
+THREADS_CONFIGURE_WITH=	threads
+THREADS_LDFLAGS=	-lpthread
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-MLINKS=		${PYTHON_VERSION}.1 python.1
-PLIST_SUB+=	IF_DEFAULT=""
-.else
-PLIST_SUB+=	IF_DEFAULT="@comment "
-.endif
+UCS2_CONFIGURE_ON=	--enable-unicode=ucs2
+UCS4_CONFIGURE_ON=	--enable-unicode=ucs4
 
-.if !defined(WITHOUT_THREADS)
-PLIST_SUB+=	THREADS=""
-.if defined(WITH_PTH)
-BROKEN=			does not build with PTH enabled
-CONFIGURE_ARGS+=	--with-pth
-EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-configure-pth
-LIB_DEPENDS+=		pth:${PORTSDIR}/devel/pth
-_PTH_CPPFLAGS=		"-I${LOCALBASE}/include/pth"
-_PTH_LDFLAGS=		"-L${LOCALBASE}/lib/pth"
-CPPFLAGS:=		${_PTH_CPPFLAGS} ${CPPFLAGS}
-LDFLAGS+=		${_PTH_LDFLAGS}
-.else # !defined(WITH_PTH)
-CONFIGURE_ARGS+=	--with-threads
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		${PTHREAD_LIBS}
-.endif # defined(WITH_PTH)
-.else # defined(WITHOUT_THREADS)
-PLIST_SUB+=	THREADS="@comment "
-CONFIGURE_ARGS+=	--without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
-.endif # !defined(WITHOUT_THREADS)
+.include <bsd.mport.options.mk>
 
-.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
-CONFIGURE_ARGS+=	--enable-unicode=ucs4
+# http://bugs.python.org/issue22521
+# http://bugs.python.org/issue23042
+.if !${PORT_OPTIONS:MLIBFFI} && ${ARCH} == i386
+BROKEN=	You must use libffi from ports on i386. Enable the LIBFFI option
 .endif
 
-.if defined(WITHOUT_PYMALLOC)
-CONFIGURE_ARGS+=	--without-pymalloc
-.endif
-
 .if ${ARCH} == i386
 PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
-PLIST_SUB+=     32BIT_ONLY="@comment "
+
+.if ${ARCH} == amd64
+PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
 PLIST_SUB+=	32BIT_ONLY=""
 .endif
-.if ${ARCH} == sparc64
-CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
-.endif
 
-# See http://bugs.freebsd.org/115940
-.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS) # the world with NO_NIS
+.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 PLIST_SUB+=	NO_NIS="@comment "
-WITHOUT_NIS?=	detected
 .else
 PLIST_SUB+=	NO_NIS=""
 .endif
 
-.if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if defined(WITH_FPECTL)
-CONFIGURE_ARGS+=	--with-fpectl
-.endif
-
-pre-patch:
-	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
-		${PATCH_WRKSRC}/Lib/plat-midnightbsd0
-	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
-	${LN} ${PATCH_WRKSRC}/Lib/smtpd.py ${PATCH_WRKSRC}/Tools/scripts/
-.for script in ${BIN_SCRIPTS}
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${PATCH_WRKSRC}/Tools/scripts/${script} \
-		> ${WRKDIR}/`${ECHO_CMD} ${script} | ${SED} -E ${BINLINKS_SUB}`
-.endfor
-	${REINPLACE_CMD} -e \
+post-patch:
+	${CP} -r ${WRKSRC}/Lib/plat-freebsd8 \
+		${WRKSRC}/Lib/plat-midnightbsd0
+	@${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${PATCH_WRKSRC}/Lib/pydoc.py
-	${REINPLACE_CMD} -e \
-		's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \
-		${PATCH_WRKSRC}/Lib/site.py
-	${REINPLACE_CMD} -e \
-		's|^	\(..ASDLGEN.*\)$$|	${TRUE}|g; \
-		s|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${PATCH_WRKSRC}/Makefile.pre.in
-
-	${REINPLACE_CMD} -e \
-		's|*\(..INSTALL_SCRIPT.*\)python-config$$|#port \1|' \
-		${PATCH_WRKSRC}/Makefile.pre.in
-
-	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \
-		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-config
-	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
-		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
-
-.if defined(WITH_FPECTL) && ${ARCH} == i386
-	${MKDIR} ${WRKSRC}/Modules
-	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+.if ${PORT_OPTIONS:MSEM}
+	@# do not use SEM_EXTRA_PATCHES here, since patch-setup.py overlaps with this one
+	cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-setup.py
 .endif
 
-post-patch:
-.if defined(WITH_SEM)
-.if ${OSVERSION} >= 4000
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-setup.py
+.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
+	@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \
+		${WRKSRC}/setup.py
 .endif
-.endif
-.if defined(WITHOUT_NIS)
-	${REINPLACE_CMD} -e \
-	    's/disabled_module_list =[^]]*/&, "nis"/' \
-		${PATCH_WRKSRC}/setup.py
-.endif
 
-post-configure:
-	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
-	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
-	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
-		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
-		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
-		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
-		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
-		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
-		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
-
-pre-build:
-	cd ${SHARED_WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
-	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
-	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
-
-pre-install:
-.for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
-.for file in IN.py regen
-	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHONPREFIX_LIBDIR}/${platform}/
-.endfor
-.endfor
-	${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
-	/LIBDIR.*\.py$$/ && \
-	!/\/bad|tests\/data/ \
-	{ print $$0 "o"; print $$0 "c"; }'      > ${PLIST}
-
-	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
-	([ -f ${WRKSRC}/.without_own_sha ] && \
-		${GREP} -v 'lib-dynload/_sha' ${PLIST} > ${PLIST}.tmp && \
-		${CAT} ${PLIST}.tmp > ${PLIST}) || ${TRUE}
-
 post-install:
-	@# install config providers
-	${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config ${PREFIX}/bin
+	for i in ${PREFIX}/lib/python2.7/lib-dynload/*.so; do \
+		${STRIP_CMD} $$i; done						# Strip shared extensions
 
-	@# shared version of executable and library
-	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
-		${PREFIX}/lib
-	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
-		lib${PYTHON_VERSION}.so
-	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so python2.7/config/lib${PYTHON_VERSION}.so
-	${INSTALL_PROGRAM} \
-		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
-		${PREFIX}/bin
+regression-test: build
+	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
 
-	@# additional files installing by ports
-.for script in ${BIN_SCRIPTS}
-	${INSTALL_SCRIPT} \
-		${WRKDIR}/`${ECHO_CMD} ${script} | ${SED} -E ${BINLINKS_SUB}` \
-		${PREFIX}/bin
-.endfor
-	@${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
-		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
-
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-	for f in ${BIN_FILES}; do \
-		TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
-		cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \
-	done
-.endif
-
-.if !defined(NOPORTDATA)
-	@${MKDIR} ${DATADIR}
-	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
-		(cd ${DATADIR}; ${TAR} --no-same-owner -xf -)
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
-		(cd ${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -)
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: lang/python27/distinfo
===================================================================
diff -u -N -rb64e334dba434b7783cc6448c42d55e7f5839279 -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/distinfo	(.../distinfo)	(revision b64e334dba434b7783cc6448c42d55e7f5839279)
+++ lang/python27/distinfo	(.../distinfo)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -1,2 +1,2 @@
-SHA256 (python/Python-2.7.8.tar.xz) = edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a
-SIZE (python/Python-2.7.8.tar.xz) = 10525244
+SHA256 (python/Python-2.7.10.tar.xz) = 1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0
+SIZE (python/Python-2.7.10.tar.xz) = 12250696
Index: lang/python27/files/extra-patch-setup.py
===================================================================
diff -u -N -rb64e334dba434b7783cc6448c42d55e7f5839279 -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/files/extra-patch-setup.py	(.../extra-patch-setup.py)	(revision b64e334dba434b7783cc6448c42d55e7f5839279)
+++ lang/python27/files/extra-patch-setup.py	(.../extra-patch-setup.py)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -7,7 +7,7 @@
              macros = dict()
              libraries = []
  
--        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'):
+-        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11', 'midnightbsd0'):
 +        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6'):
              # FreeBSD's P1003.1b semaphore support is very experimental
              # and has many known problems. (as of June 2008)
Index: lang/python27/files/patch-Doc__library__fcntl.rst
===================================================================
diff -u -N -rb64e334dba434b7783cc6448c42d55e7f5839279 -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/files/patch-Doc__library__fcntl.rst	(.../patch-Doc__library__fcntl.rst)	(revision b64e334dba434b7783cc6448c42d55e7f5839279)
+++ lang/python27/files/patch-Doc__library__fcntl.rst	(.../patch-Doc__library__fcntl.rst)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -1,6 +1,6 @@
 --- ./Doc/library/fcntl.rst.orig	2014-07-03 21:53:41.473098625 +1000
 +++ ./Doc/library/fcntl.rst	2014-07-03 21:54:04.342833056 +1000
-@@ -50,7 +50,6 @@
+@@ -50,7 +50,6 @@ The module defines the following functio
     operations are typically defined in the library module :mod:`termios` and the
     argument handling is even more complicated.
  
Index: lang/python27/files/patch-Lib__distutils__unixccompiler.py
===================================================================
diff -u -N -r672b5264891f66d65e3aedea4178a7f0eed08db5 -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/files/patch-Lib__distutils__unixccompiler.py	(.../patch-Lib__distutils__unixccompiler.py)	(revision 672b5264891f66d65e3aedea4178a7f0eed08db5)
+++ lang/python27/files/patch-Lib__distutils__unixccompiler.py	(.../patch-Lib__distutils__unixccompiler.py)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -1,10 +1,14 @@
+# Description: Some python extensions can't be compiled with clang 3.4
+# Issue ID: http://bugs.python.org/issue20767
+# Submitted by: antoine
+
 --- ./Lib/distutils/unixccompiler.py.orig      2013-11-10 07:36:40.000000000 +0000
 +++ ./Lib/distutils/unixccompiler.py   2014-02-19 15:41:48.000000000 +0000
-@@ -228,6 +228,8 @@
+@@ -228,6 +228,8 @@ class UnixCCompiler(CCompiler):
          if sys.platform[:6] == "darwin":
              # MacOSX's linker doesn't understand the -R flag at all
              return "-L" + dir
-+        elif sys.platform[:7] == "freebsd":
++        elif sys.platform[:7] == "midnightbsd":
 +            return "-Wl,-rpath=" + dir
          elif sys.platform[:5] == "hp-ux":
              if self._is_gcc(compiler):
Index: lang/python27/files/patch-Lib_distutils_command_build__scripts.py
===================================================================
diff -u -N
--- lang/python27/files/patch-Lib_distutils_command_build__scripts.py	(revision 0)
+++ lang/python27/files/patch-Lib_distutils_command_build__scripts.py	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -0,0 +1,17 @@
+# Description: A non-invasive partial backport of the Python3 distutils behaviour.
+# This allows Python's scripts to be properly suffixed (similar to Python 3.x) on
+# installation.
+# Submitted by: mva
+
+--- Lib/distutils/command/build_scripts.py.orig	2014-07-26 09:52:20.000000000 UTC
++++ Lib/distutils/command/build_scripts.py	2014-07-26 09:52:56.000000000 UTC
+@@ -126,6 +126,9 @@ class build_scripts (Command):
+                                  file, oldmode, newmode)
+                         os.chmod(file, newmode)
+ 
++        # XXX should we modify self.outfiles?
++        return outfiles
++
+     # copy_scripts ()
+ 
+ # class build_scripts
Index: lang/python27/files/patch-Lib_distutils_command_build_scripts.py
===================================================================
diff -u -N
--- lang/python27/files/patch-Lib_distutils_command_build_scripts.py	(revision b64e334dba434b7783cc6448c42d55e7f5839279)
+++ lang/python27/files/patch-Lib_distutils_command_build_scripts.py	(revision 0)
@@ -1,17 +0,0 @@
-# Description: A non-invasive partial backport of the Python3 distutils behaviour.
-# This allows Python's scripts to be properly suffixed (similar to Python 3.x) on
-# installation.
-# Submitted by: mva
-
---- Lib/distutils/command/build_scripts.py.orig	2014-07-26 11:52:20.000000000 +0200
-+++ Lib/distutils/command/build_scripts.py	2014-07-26 11:52:56.000000000 +0200
-@@ -126,6 +126,9 @@
-                                  file, oldmode, newmode)
-                         os.chmod(file, newmode)
- 
-+        # XXX should we modify self.outfiles?
-+        return outfiles
-+
-     # copy_scripts ()
- 
- # class build_scripts
Index: lang/python27/files/patch-Makefile.pre.in
===================================================================
diff -u -N -r672b5264891f66d65e3aedea4178a7f0eed08db5 -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/files/patch-Makefile.pre.in	(.../patch-Makefile.pre.in)	(revision 672b5264891f66d65e3aedea4178a7f0eed08db5)
+++ lang/python27/files/patch-Makefile.pre.in	(.../patch-Makefile.pre.in)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -1,39 +1,18 @@
---- ./Makefile.pre.in.orig	2013-11-10 07:36:41.000000000 +0000
-+++ ./Makefile.pre.in	2014-04-04 09:16:00.000000000 +0000
-@@ -285,9 +285,9 @@
+# Description: Link scripts in the same way Python3 does
+# Submitted by: mva
+
+--- Makefile.pre.in.orig	2014-06-30 04:05:39.000000000 +0200
++++ Makefile.pre.in	2014-07-26 11:09:46.000000000 +0200 
+@@ -900,6 +900,12 @@ bininstall:	altbininstall
+ 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
+ 	-rm -f $(DESTDIR)$(LIBPC)/python.pc
+ 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python2.pc python.pc)
++	-rm -f $(DESTDIR)$(BINDIR)/idle
++	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle2)
++	-rm -f $(DESTDIR)$(BINDIR)/pydoc
++	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc2)
++	-rm -f $(DESTDIR)$(BINDIR)/2to3
++	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
  
- ##########################################################################
- # AST
--AST_H_DIR=	Include
-+AST_H_DIR=	$(srcdir)/Include
- AST_H=		$(AST_H_DIR)/Python-ast.h
--AST_C_DIR=	Python
-+AST_C_DIR=	$(srcdir)/Python
- AST_C=		$(AST_C_DIR)/Python-ast.c
- AST_ASDL=	$(srcdir)/Parser/Python.asdl
- 
-@@ -1006,12 +1006,12 @@
- 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
- 	fi
- 	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
-+		$(PYTHON_FOR_BUILD) -B -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- 		$(DESTDIR)$(LIBDEST)
- 	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
-+		$(PYTHON_FOR_BUILD) -B -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- 		$(DESTDIR)$(LIBDEST)
-@@ -1089,8 +1089,8 @@
- 			if test "$(SO)" = .dll; then \
- 				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
- 			else \
-+				$(RANLIB) $(LIBRARY) ; \
- 				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
- 			fi; \
- 		else \
- 			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
+ # Install the interpreter with $(VERSION) affixed
+ # This goes into $(exec_prefix)
Index: lang/python27/files/patch-Modules-_ctypes-libffi-configure
===================================================================
diff -u -N -r607c97edebb478c98889629a93ffe8068f94b69e -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/files/patch-Modules-_ctypes-libffi-configure	(.../patch-Modules-_ctypes-libffi-configure)	(revision 607c97edebb478c98889629a93ffe8068f94b69e)
+++ lang/python27/files/patch-Modules-_ctypes-libffi-configure	(.../patch-Modules-_ctypes-libffi-configure)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -1,22 +1,11 @@
---- Modules/_ctypes/libffi/configure.orig	2010-03-19 19:59:20.000000000 +0100
-+++ Modules/_ctypes/libffi/configure	2011-03-06 09:20:16.000000000 +0100
-@@ -6289,7 +6289,7 @@
+--- Modules/_ctypes/libffi/configure.orig	2014-12-16 08:10:12.000000000 +0100
++++ Modules/_ctypes/libffi/configure	2014-12-16 08:10:40.000000000 +0100
+@@ -7526,7 +7526,7 @@ mips64*-*linux*)
    rm -rf conftest*
    ;;
  
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
++amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -11275,6 +11275,9 @@
-   powerpc-*-freebsd*)
- 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
- 	;;
-+  powerpc64-*-freebsd*)
-+	TARGET=POWERPC; TARGETDIR=powerpc
-+	;;
-   powerpc*-*-rtems*)
- 	TARGET=POWERPC; TARGETDIR=powerpc
- 	;;
-
+   # Find out what ABI is being produced by ac_compile, and set linker
+   # options accordingly.  Note that the listed cases only cover the
Index: lang/python27/files/patch-Modules___ssl.c
===================================================================
diff -u -N
--- lang/python27/files/patch-Modules___ssl.c	(revision 0)
+++ lang/python27/files/patch-Modules___ssl.c	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -0,0 +1,23 @@
+# Since LibreSSL 2.2.0 there is a define OPENSSL_NO_EGD
+# Upstreamed Issue http://bugs.python.org/24557
+
+--- Modules/_ssl.c.orig	2015-05-23 16:09:19 UTC
++++ Modules/_ssl.c
+@@ -3380,7 +3380,7 @@ using the ssl() function.");
+ #endif /* HAVE_OPENSSL_RAND */
+ 
+ 
+-#ifdef HAVE_RAND_EGD
++#ifndef OPENSSL_NO_EGD
+ 
+ static PyObject *
+ PySSL_RAND_egd(PyObject *self, PyObject *arg)
+@@ -3804,7 +3804,7 @@ static PyMethodDef PySSL_methods[] = {
+     {"RAND_status",         (PyCFunction)PySSL_RAND_status, METH_NOARGS,
+      PySSL_RAND_status_doc},
+ #endif
+-#ifdef HAVE_RAND_EGD
++#ifndef OPENSSL_NO_EGD
+     {"RAND_egd",            PySSL_RAND_egd, METH_VARARGS,
+      PySSL_RAND_egd_doc},
+ #endif
Index: lang/python27/files/patch-Modules__fcntlmodule.c
===================================================================
diff -u -N -rb64e334dba434b7783cc6448c42d55e7f5839279 -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/files/patch-Modules__fcntlmodule.c	(.../patch-Modules__fcntlmodule.c)	(revision b64e334dba434b7783cc6448c42d55e7f5839279)
+++ lang/python27/files/patch-Modules__fcntlmodule.c	(.../patch-Modules__fcntlmodule.c)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -1,6 +1,6 @@
 --- ./Modules/fcntlmodule.c.orig	2014-07-03 21:57:10.429953240 +1000
 +++ ./Modules/fcntlmodule.c	2014-07-03 21:59:36.517210444 +1000
-@@ -98,20 +98,15 @@
+@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *ar
  {
  #define IOCTL_BUFSZ 1024
      int fd;
@@ -24,7 +24,7 @@
      int arg;
      int ret;
      char *str;
-@@ -119,7 +114,7 @@
+@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
      int mutate_arg = 1;
      char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
  
@@ -33,7 +33,7 @@
                           conv_descriptor, &fd, &code,
                           &str, &len, &mutate_arg)) {
          char *arg;
-@@ -170,7 +165,7 @@
+@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
      }
  
      PyErr_Clear();
@@ -42,7 +42,7 @@
                           conv_descriptor, &fd, &code, &str, &len)) {
          if (len > IOCTL_BUFSZ) {
              PyErr_SetString(PyExc_ValueError,
-@@ -192,7 +187,7 @@
+@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
      PyErr_Clear();
      arg = 0;
      if (!PyArg_ParseTuple(args,
Index: lang/python27/files/patch-issue21166
===================================================================
diff -u -N
--- lang/python27/files/patch-issue21166	(revision b64e334dba434b7783cc6448c42d55e7f5839279)
+++ lang/python27/files/patch-issue21166	(revision 0)
@@ -1,74 +0,0 @@
-# HG changeset patch
-# User Ned Deily <nad@acm.org>
-# Date 1408739459 25200
-# Node ID edb6b282469ea0e8f819d0310afb2937b59dd6b9
-# Parent  727fd4ead3fd854e900ed89362714ad1f7434e5a
-Issue #21166: Prevent possible segfaults and other random failures of
-python --generate-posix-vars in pybuilddir.txt build target by ensuring
-that pybuilddir.txt is always regenerated when configure is run and
-that the newly built skeleton python does not inadvertently import
-modules from previously installed instances.
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -447,8 +447,18 @@ platform: $(BUILDPYTHON) pybuilddir.txt
- # Create build directory and generate the sysconfig build-time data there.
- # pybuilddir.txt contains the name of the build dir and is used for
- # sys.path fixup -- see Modules/getpath.c.
-+# Since this step runs before shared modules are built, try to avoid bootstrap
-+# problems by creating a dummy pybuildstr.txt just to allow interpreter
-+# initialization to succeed.  It will be overwritten by generate-posix-vars
-+# or removed in case of failure.
- pybuilddir.txt: $(BUILDPYTHON)
--		$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
-+	@echo "none" > ./pybuilddir.txt
-+	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\
-+	if test $$? -ne 0 ; then \
-+		echo "generate-posix-vars failed" ; \
-+		rm -f ./pybuilddir.txt ; \
-+		exit 1 ; \
-+	fi
- 
- # Build the shared modules
- # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-diff --git a/Misc/NEWS b/Misc/NEWS
---- Misc/NEWS
-+++ Misc/NEWS
-@@ -120,6 +120,9 @@ Build
- - Issue #15759: "make suspicious", "make linkcheck" and "make doctest" in Doc/
-   now display special message when and only when there are failures.
- 
-+- Issue #21166: Prevent possible segfaults and other random failures of
-+  python --generate-posix-vars in pybuilddir.txt build target.
-+
- Windows
- -------
- 
-diff --git a/configure b/configure
---- configure
-+++ configure
-@@ -2857,6 +2857,9 @@ case $host_os in *\ *) host_os=`echo "$h
- 
- 
- 
-+# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
-+rm -f pybuilddir.txt
-+
- if test "$cross_compiling" = yes; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5
- $as_echo_n "checking for python interpreter for cross build... " >&6; }
-diff --git a/configure.ac b/configure.ac
---- configure.ac
-+++ configure.ac
-@@ -16,6 +16,9 @@ AC_CANONICAL_HOST
- AC_SUBST(build)
- AC_SUBST(host)
- 
-+# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
-+rm -f pybuilddir.txt
-+
- if test "$cross_compiling" = yes; then
-     AC_MSG_CHECKING([for python interpreter for cross build])
-     if test -z "$PYTHON_FOR_BUILD"; then
-
Index: lang/python27/files/patch-pr192365
===================================================================
diff -u -N
--- lang/python27/files/patch-pr192365	(revision 0)
+++ lang/python27/files/patch-pr192365	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -0,0 +1,58 @@
+# Description: do not define __BSD_VISIBLE/_XOPEN_SOURCE/_POSIX_C_SOURCE
+# in include/python2.7/pyconfig.h
+# Submitted by: antoine
+
+--- configure.orig	2014-09-06 14:42:50 UTC
++++ configure
+@@ -2919,13 +2919,6 @@
+ 
+ 
+ # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
+-# them.
+-
+-$as_echo "#define __BSD_VISIBLE 1" >>confdefs.h
+-
+-
+-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+ # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
+ 
+ $as_echo "#define _BSD_TYPES 1" >>confdefs.h
+@@ -3293,9 +3286,8 @@
+   # but used in struct sockaddr.sa_family. Reported by Tim Rice.
+   SCO_SV/3.2)
+     define_xopen_source=no;;
+-  # On FreeBSD 4, the math functions C89 does not cover are never defined
+-  # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
+-  FreeBSD/4.*)
++  # On FreeBSD,  defining _XOPEN_SOURCE to 600 requests a strict environment.
++  MidnightBSD/*)
+     define_xopen_source=no;;
+   # On MacOS X 10.2, a bug in ncurses.h means that it craps out if
+   # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
+--- configure.ac.orig	2014-09-06 14:42:50 UTC
++++ configure.ac
+@@ -88,11 +88,6 @@
+ AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features])
+ 
+ # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
+-# them.
+-AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features])
+-
+-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+ # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
+ AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int])
+ 
+@@ -426,9 +421,8 @@
+   # but used in struct sockaddr.sa_family. Reported by Tim Rice.
+   SCO_SV/3.2)
+     define_xopen_source=no;;
+-  # On FreeBSD 4, the math functions C89 does not cover are never defined
+-  # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
+-  FreeBSD/4.*)
++  # On FreeBSD,  defining _XOPEN_SOURCE to 600 requests a strict environment.
++  MidnightBSD/*)
+     define_xopen_source=no;;
+   # On MacOS X 10.2, a bug in ncurses.h means that it craps out if 
+   # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
Index: lang/python27/files/patch-setup.py
===================================================================
diff -u -N -rb64e334dba434b7783cc6448c42d55e7f5839279 -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/files/patch-setup.py	(.../patch-setup.py)	(revision b64e334dba434b7783cc6448c42d55e7f5839279)
+++ lang/python27/files/patch-setup.py	(.../patch-setup.py)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -7,15 +7,15 @@
 
 --- setup.py.orig	2014-06-30 04:05:48.000000000 +0200
 +++ setup.py	2014-07-26 14:51:29.000000000 +0200
-@@ -15,6 +15,7 @@
+@@ -15,6 +15,7 @@ from distutils.core import Extension, se
  from distutils.command.build_ext import build_ext
  from distutils.command.install import install
  from distutils.command.install_lib import install_lib
 +from distutils.command.build_scripts import build_scripts
  from distutils.spawn import find_executable
  
  cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
-@@ -33,7 +34,7 @@
+@@ -33,7 +34,7 @@ host_platform = get_platform()
  COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
  
  # This global variable is used to hold the list of modules to be disabled.
@@ -24,7 +24,7 @@
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1212,7 +1213,7 @@
+@@ -1214,7 +1215,7 @@ class PyBuildExt(build_ext):
                  sysroot = macosx_sdk_root()
                  f = os.path.join(sysroot, f[1:])
  
@@ -33,16 +33,16 @@
              data = open(f).read()
              m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
              if m is not None:
-@@ -1551,7 +1552,7 @@
+@@ -1553,7 +1554,7 @@ class PyBuildExt(build_ext):
              macros = dict()
              libraries = []
  
 -        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'midnightbsd0'):
++        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11', 'midnightbsd0'):
              # FreeBSD's P1003.1b semaphore support is very experimental
              # and has many known problems. (as of June 2008)
              macros = dict()
-@@ -1602,9 +1603,10 @@
+@@ -1604,9 +1605,10 @@ class PyBuildExt(build_ext):
          else:
              missing.append('linuxaudiodev')
  
@@ -52,11 +52,11 @@
 +# Initial backport of http://hg.python.org/cpython/rev/50f1922bc1d5
 +
 +        if any(sys.platform.startswith(prefix)
-+               for prefix in ("linux", "freebsd", "midnightbsd")):
++               for prefix in ("linux", "freebsd", "midnightbsd", "gnukfreebsd")):
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
          else:
              missing.append('ossaudiodev')
-@@ -2176,6 +2178,22 @@
+@@ -2178,6 +2180,22 @@ class PyBuildInstallLib(install_lib):
      def is_chmod_supported(self):
          return hasattr(os, 'chmod')
  
@@ -79,7 +79,7 @@
  SUMMARY = """
  Python is an interpreted, interactive, object-oriented programming
  language. It is often compared to Tcl, Perl, Scheme or Java.
-@@ -2221,7 +2239,9 @@
+@@ -2223,7 +2241,9 @@ def main():
            platforms = ["Many"],
  
            # Build info
@@ -90,7 +90,7 @@
                        'install_lib':PyBuildInstallLib},
            # The struct module is defined here, because build_ext won't be
            # called unless there's at least one extension module defined.
-@@ -2229,8 +2249,7 @@
+@@ -2231,8 +2251,7 @@ def main():
  
            # Scripts to install
            scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
Index: lang/python27/files/pkg-message.in
===================================================================
diff -u -N
--- lang/python27/files/pkg-message.in	(revision 672b5264891f66d65e3aedea4178a7f0eed08db5)
+++ lang/python27/files/pkg-message.in	(revision 0)
@@ -1,18 +0,0 @@
-====
-Note that some of the standard modules are provided as separate
-ports since they require extra dependencies:
-
-bsddb           databases/py-bsddb
-gdbm            databases/py-gdbm
-sqlite3         databases/py-sqlite3
-tkinter         x11-toolkits/py-tkinter
-
-Install them as needed.
-====
-%%SEM%%--------------------------------------------------------
-%%SEM%%This package was built with the experimental POSIX
-%%SEM%%semaphore support. Please ensure that the kernel on the
-%%SEM%%system where you deploy this package is either compiled
-%%SEM%%with 'options P1003_1B_SEMAPHORES', or has the sem.ko
-%%SEM%%kernel module loaded.
-%%SEM%%--------------------------------------------------------
Index: lang/python27/pkg-plist
===================================================================
diff -u -N -r0a035d1eb8851821aa75eefa1d2d46339bc9e3b2 -r80594c1819312ebe49ef50d13750169c36291042
--- lang/python27/pkg-plist	(.../pkg-plist)	(revision 0a035d1eb8851821aa75eefa1d2d46339bc9e3b2)
+++ lang/python27/pkg-plist	(.../pkg-plist)	(revision 80594c1819312ebe49ef50d13750169c36291042)
@@ -1430,6 +1430,17 @@
 lib/python2.7/encodings/zlib_codec.py
 lib/python2.7/encodings/zlib_codec.pyo
 lib/python2.7/encodings/zlib_codec.pyc
+lib/python2.7/ensurepip/__init__.py
+lib/python2.7/ensurepip/__init__.pyc
+lib/python2.7/ensurepip/__init__.pyo
+lib/python2.7/ensurepip/__main__.py
+lib/python2.7/ensurepip/__main__.pyc
+lib/python2.7/ensurepip/__main__.pyo
+lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_uninstall.py
+lib/python2.7/ensurepip/_uninstall.pyc
+lib/python2.7/ensurepip/_uninstall.pyo
 lib/python2.7/filecmp.py
 lib/python2.7/filecmp.pyo
 lib/python2.7/filecmp.pyc
@@ -1708,6 +1719,9 @@
 lib/python2.7/idlelib/idle_test/test_config_name.py
 lib/python2.7/idlelib/idle_test/test_config_name.pyo
 lib/python2.7/idlelib/idle_test/test_config_name.pyc
+lib/python2.7/idlelib/idle_test/test_configdialog.py
+lib/python2.7/idlelib/idle_test/test_configdialog.pyc
+lib/python2.7/idlelib/idle_test/test_configdialog.pyo
 lib/python2.7/idlelib/idle_test/test_delegator.py
 lib/python2.7/idlelib/idle_test/test_delegator.pyo
 lib/python2.7/idlelib/idle_test/test_delegator.pyc
@@ -1732,6 +1746,9 @@
 lib/python2.7/idlelib/idle_test/test_rstrip.py
 lib/python2.7/idlelib/idle_test/test_rstrip.pyo
 lib/python2.7/idlelib/idle_test/test_rstrip.pyc
+lib/python2.7/idlelib/idle_test/test_searchdialogbase.py
+lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyc
+lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyo
 lib/python2.7/idlelib/idle_test/test_searchengine.py
 lib/python2.7/idlelib/idle_test/test_searchengine.pyo
 lib/python2.7/idlelib/idle_test/test_searchengine.pyc
@@ -1744,6 +1761,9 @@
 lib/python2.7/idlelib/idle_test/test_warning.py
 lib/python2.7/idlelib/idle_test/test_warning.pyo
 lib/python2.7/idlelib/idle_test/test_warning.pyc
+lib/python2.7/idlelib/idle_test/test_widgetredir.py
+lib/python2.7/idlelib/idle_test/test_widgetredir.pyc
+lib/python2.7/idlelib/idle_test/test_widgetredir.pyo
 lib/python2.7/idlelib/idlever.py
 lib/python2.7/idlelib/idlever.pyo
 lib/python2.7/idlelib/idlever.pyc
@@ -1762,9 +1782,9 @@
 lib/python2.7/idlelib/tabbedpages.py
 lib/python2.7/idlelib/tabbedpages.pyo
 lib/python2.7/idlelib/tabbedpages.pyc
-lib/python2.7/idlelib/testcode.py
-lib/python2.7/idlelib/testcode.pyo
-lib/python2.7/idlelib/testcode.pyc
+lib/python2.7/idlelib/idle_test/test_io.py
+lib/python2.7/idlelib/idle_test/test_io.pyo
+lib/python2.7/idlelib/idle_test/test_io.pyc
 lib/python2.7/idlelib/textView.py
 lib/python2.7/idlelib/textView.pyo
 lib/python2.7/idlelib/textView.pyc
@@ -1889,6 +1909,9 @@
 lib/python2.7/lib2to3/fixes/fix_apply.py
 lib/python2.7/lib2to3/fixes/fix_apply.pyo
 lib/python2.7/lib2to3/fixes/fix_apply.pyc
+lib/python2.7/lib2to3/fixes/fix_asserts.py
+lib/python2.7/lib2to3/fixes/fix_asserts.pyc
+lib/python2.7/lib2to3/fixes/fix_asserts.pyo
 lib/python2.7/lib2to3/fixes/fix_basestring.py
 lib/python2.7/lib2to3/fixes/fix_basestring.pyo
 lib/python2.7/lib2to3/fixes/fix_basestring.pyc
@@ -2151,9 +2174,13 @@
 lib/python2.7/lib-dynload/_json.so
 lib/python2.7/lib-dynload/_locale.so
 lib/python2.7/lib-dynload/_lsprof.so
+%%DEBUG%%lib/python2.7/lib-dynload/_md5.so
 lib/python2.7/lib-dynload/_multibytecodec.so
 %%THREADS%%lib/python2.7/lib-dynload/_multiprocessing.so
 lib/python2.7/lib-dynload/_random.so
+%%DEBUG%%lib/python2.7/lib-dynload/_sha.so
+%%DEBUG%%lib/python2.7/lib-dynload/_sha256.so
+%%DEBUG%%lib/python2.7/lib-dynload/_sha512.so
 lib/python2.7/lib-dynload/_socket.so
 lib/python2.7/lib-dynload/_ssl.so
 lib/python2.7/lib-dynload/_struct.so
@@ -2231,6 +2258,9 @@
 lib/python2.7/lib-tk/test/test_tkinter/__init__.py
 lib/python2.7/lib-tk/test/test_tkinter/__init__.pyo
 lib/python2.7/lib-tk/test/test_tkinter/__init__.pyc
+lib/python2.7/lib-tk/test/test_tkinter/test_font.py
+lib/python2.7/lib-tk/test/test_tkinter/test_font.pyc
+lib/python2.7/lib-tk/test/test_tkinter/test_font.pyo
 lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py
 lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyo
 lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyc
@@ -2653,6 +2683,9 @@
 lib/python2.7/test/__init__.py
 lib/python2.7/test/__init__.pyo
 lib/python2.7/test/__init__.pyc
+lib/python2.7/test/_mock_backport.py
+lib/python2.7/test/_mock_backport.pyc
+lib/python2.7/test/_mock_backport.pyo
 lib/python2.7/test/audiodata/pluck-pcm24.aiff
 lib/python2.7/test/audiodata/pluck-pcm24.wav
 lib/python2.7/test/audiodata/pluck-pcm16.aiff
@@ -2689,6 +2722,10 @@
 lib/python2.7/test/buffer_tests.py
 lib/python2.7/test/buffer_tests.pyo
 lib/python2.7/test/buffer_tests.pyc
+lib/python2.7/test/capath/4e1295a3.0
+lib/python2.7/test/capath/5ed36f99.0
+lib/python2.7/test/capath/6e88d7b8.0
+lib/python2.7/test/capath/99d0fa06.0
 lib/python2.7/test/cfgparser.1
 lib/python2.7/test/check_soundcard.vbs
 lib/python2.7/test/cmath_testcases.txt
@@ -2870,6 +2907,7 @@
 lib/python2.7/test/decimaltestdata/tointegral.decTest
 lib/python2.7/test/decimaltestdata/tointegralx.decTest
 lib/python2.7/test/decimaltestdata/xor.decTest
+lib/python2.7/test/dh1024.pem
 lib/python2.7/test/doctest_aliases.py
 lib/python2.7/test/doctest_aliases.pyo
 lib/python2.7/test/doctest_aliases.pyc
@@ -2910,12 +2948,19 @@
 lib/python2.7/test/inspect_fodder2.pyo
 lib/python2.7/test/inspect_fodder2.pyc
 lib/python2.7/test/keycert.pem
+lib/python2.7/test/keycert2.pem
+lib/python2.7/test/keycert3.pem
+lib/python2.7/test/keycert4.pem
+lib/python2.7/test/keycert.passwd.pem
 lib/python2.7/test/list_tests.py
 lib/python2.7/test/list_tests.pyo
 lib/python2.7/test/list_tests.pyc
 lib/python2.7/test/lock_tests.py
 lib/python2.7/test/lock_tests.pyo
 lib/python2.7/test/lock_tests.pyc
+lib/python2.7/test/make_ssl_certs.py
+lib/python2.7/test/make_ssl_certs.pyc
+lib/python2.7/test/make_ssl_certs.pyo
 lib/python2.7/test/mapping_tests.py
 lib/python2.7/test/mapping_tests.pyo
 lib/python2.7/test/mapping_tests.pyc
@@ -2934,6 +2979,7 @@
 lib/python2.7/test/profilee.py
 lib/python2.7/test/profilee.pyo
 lib/python2.7/test/profilee.pyc
+lib/python2.7/test/pycacert.pem
 lib/python2.7/test/pyclbr_input.py
 lib/python2.7/test/pyclbr_input.pyo
 lib/python2.7/test/pyclbr_input.pyc
@@ -2961,6 +3007,7 @@
 lib/python2.7/test/reperf.py
 lib/python2.7/test/reperf.pyo
 lib/python2.7/test/reperf.pyc
+lib/python2.7/test/revocation.crl
 lib/python2.7/test/sample_doctest.py
 lib/python2.7/test/sample_doctest.pyo
 lib/python2.7/test/sample_doctest.pyc
@@ -2973,6 +3020,7 @@
 lib/python2.7/test/script_helper.py
 lib/python2.7/test/script_helper.pyo
 lib/python2.7/test/script_helper.pyc
+lib/python2.7/test/selfsigned_pythontestdotnet.pem
 lib/python2.7/test/seq_tests.py
 lib/python2.7/test/seq_tests.pyo
 lib/python2.7/test/seq_tests.pyc
@@ -2981,6 +3029,12 @@
 lib/python2.7/test/sortperf.py
 lib/python2.7/test/sortperf.pyo
 lib/python2.7/test/sortperf.pyc
+lib/python2.7/test/ssl_cert.pem
+lib/python2.7/test/ssl_key.passwd.pem
+lib/python2.7/test/ssl_key.pem
+lib/python2.7/test/ssl_servers.py
+lib/python2.7/test/ssl_servers.pyc
+lib/python2.7/test/ssl_servers.pyo
 lib/python2.7/test/string_tests.py
 lib/python2.7/test/string_tests.pyo
 lib/python2.7/test/string_tests.pyc
@@ -3343,6 +3397,9 @@
 lib/python2.7/test/test_email_renamed.py
 lib/python2.7/test/test_email_renamed.pyo
 lib/python2.7/test/test_email_renamed.pyc
+lib/python2.7/test/test_ensurepip.py
+lib/python2.7/test/test_ensurepip.pyc
+lib/python2.7/test/test_ensurepip.pyo
 lib/python2.7/test/test_enumerate.py
 lib/python2.7/test/test_enumerate.pyo
 lib/python2.7/test/test_enumerate.pyc
@@ -4033,6 +4090,9 @@
 lib/python2.7/test/test_time.py
 lib/python2.7/test/test_time.pyo
 lib/python2.7/test/test_time.pyc
+lib/python2.7/test/test_timeit.py
+lib/python2.7/test/test_timeit.pyo
+lib/python2.7/test/test_timeit.pyc
 lib/python2.7/test/test_timeout.py
 lib/python2.7/test/test_timeout.pyo
 lib/python2.7/test/test_timeout.pyc
@@ -4481,65 +4541,3 @@
 lib/python2.7/zipfile.pyo
 lib/python2.7/zipfile.pyc
 man/man1/python2.7.1.gz
-@dirrm lib/python2.7/xml/sax
-@dirrm lib/python2.7/xml/parsers
-@dirrm lib/python2.7/xml/etree
-@dirrm lib/python2.7/xml/dom
-@dirrm lib/python2.7/xml
-@dirrm lib/python2.7/wsgiref
-@dirrm lib/python2.7/unittest/test
-@dirrm lib/python2.7/unittest
-@dirrm lib/python2.7/test/audiodata
-@dirrm lib/python2.7/test/cjkencodings
-@dirrm lib/python2.7/test/data
-@dirrm lib/python2.7/test/decimaltestdata
-@dirrm lib/python2.7/test/imghdrdata
-@dirrm lib/python2.7/test/subprocessdata
-@dirrm lib/python2.7/test/tracedmodules
-@dirrm lib/python2.7/test/xmltestdata
-@dirrm lib/python2.7/test
-@dirrm lib/python2.7/sqlite3/test
-@dirrm lib/python2.7/sqlite3
-@dirrm lib/python2.7/site-packages
-@dirrm lib/python2.7/pydoc_data
-@dirrm lib/python2.7/plat-freebsd%%OSMAJOR%%
-@dirrm lib/python2.7/multiprocessing/dummy
-@dirrm lib/python2.7/multiprocessing
-@dirrm lib/python2.7/logging
-@dirrm lib/python2.7/lib2to3/tests/data/fixers/myfixes
-@dirrm lib/python2.7/lib2to3/tests/data/fixers
-@dirrm lib/python2.7/lib2to3/tests/data
-@dirrm lib/python2.7/lib2to3/tests
-@dirrm lib/python2.7/lib2to3/pgen2
-@dirrm lib/python2.7/lib2to3/fixes
-@dirrm lib/python2.7/lib2to3
-@dirrm lib/python2.7/lib-tk/test/test_tkinter
-@dirrm lib/python2.7/lib-tk/test/test_ttk
-@dirrm lib/python2.7/lib-tk/test
-@dirrm lib/python2.7/lib-tk
-@dirrm lib/python2.7/lib-dynload
-@dirrm lib/python2.7/importlib
-@dirrm lib/python2.7/json/tests
-@dirrm lib/python2.7/json
-@dirrm lib/python2.7/idlelib/idle_test
-@dirrm lib/python2.7/idlelib/Icons
-@dirrm lib/python2.7/idlelib
-@dirrm lib/python2.7/hotshot
-@dirrm lib/python2.7/encodings
-@dirrm lib/python2.7/email/test/data
-@dirrm lib/python2.7/email/test
-@dirrm lib/python2.7/email/mime
-@dirrm lib/python2.7/email
-@dirrm lib/python2.7/distutils/tests
-@dirrm lib/python2.7/distutils/command
-@dirrm lib/python2.7/distutils
-@dirrm lib/python2.7/curses
-@dirrm lib/python2.7/ctypes/test
-@dirrm lib/python2.7/ctypes/macholib
-@dirrm lib/python2.7/ctypes
-@dirrm lib/python2.7/config
-@dirrm lib/python2.7/compiler
-@dirrm lib/python2.7/bsddb/test
-@dirrm lib/python2.7/bsddb
-@dirrm lib/python2.7
-@dirrm include/python2.7