Index: lang/python27/Makefile
===================================================================
--- lang/python27/Makefile
+++ lang/python27/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	python27
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -31,22 +31,22 @@
 CPE_PRODUCT=	${CPE_VENDOR}
 
 CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ENV+=		ac_cv_opt_olimit_ok=no OPT=""				# Null out OPT to respect user CFLAGS and remove optimizations
+CONFIGURE_ENV+=		ac_cv_opt_olimit_ok=no OPT="" ac_cv_posix_semaphores_enabled=yes
 
-INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
+INSTALL_TARGET=		altinstall # Don't want cloberring of unprefixed files
 
 TEST_TARGET=		buildbottest
 TEST_ARGS=		TESTOPTS=-j${MAKE_JOBS_NUMBER}
 
-MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
-MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
+MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"	# Strip shared library
+MAKE_JOBS_UNSAFE=	yes				# Parser/pgen build bug. See Issue: 200622, 201974
 
 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
 
-OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC SEM THREADS
-OPTIONS_DEFAULT=	LIBFFI PYMALLOC SEM THREADS UCS4
+OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS
+OPTIONS_DEFAULT=	LIBFFI PYMALLOC THREADS UCS4
 OPTIONS_SINGLE=		UNICODE
 OPTIONS_SINGLE_UNICODE=	UCS2 UCS4
 OPTIONS_SUB=		yes
@@ -72,9 +72,6 @@
 
 PYMALLOC_CONFIGURE_WITH=	pymalloc
 
-SEM_CONFIGURE_ENV=	ac_cv_posix_semaphores_enabled=yes
-SEM_CONFIGURE_ENV_OFF=	ac_cv_posix_semaphores_enabled=no
-
 THREADS_CONFIGURE_WITH=	threads
 THREADS_LDFLAGS=	-lpthread
 
Index: lang/python27/files/extra-patch-setup.py
===================================================================
--- lang/python27/files/extra-patch-setup.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Description: SEM option patch. If SEM is enabled, enable the build properly
-# Not upstreamed
-
---- setup.py.orig	2013-04-07 11:07:43.000000000 +0400
-+++ setup.py	2013-04-07 11:16:36.000000000 +0400
-@@ -1551,10 +1551,22 @@
-             macros = dict()
-             libraries = []
- 
--        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'):
-+        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)
--            macros = dict()
-+            macros = dict(                  # FreeBSD 4-6
-+                HAVE_SEM_OPEN=0,
-+                HAVE_SEM_TIMEDWAIT=0,
-+                HAVE_FD_TRANSFER=1,
-+                )
-+            libraries = []
-+
-+        elif host_platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'):
-+            macros = dict(                  # FreeBSD 7+
-+                HAVE_SEM_OPEN=1,
-+                HAVE_SEM_TIMEDWAIT=1,
-+                HAVE_FD_TRANSFER=1,
-+                )
-             libraries = []
- 
-         elif host_platform.startswith('openbsd'):