svn commit: r439351 - in branches/2017Q2/lang: python27 python27/files python33 python34 python35 python36
Jason Unovitch
junovitch at FreeBSD.org
Tue Apr 25 02:13:36 UTC 2017
Author: junovitch
Date: Tue Apr 25 02:13:34 2017
New Revision: 439351
URL: https://svnweb.freebsd.org/changeset/ports/439351
Log:
MFH: r438530 r439261
- Fix shebang
Thanks to: amdmi3
- Remove SEM option by making it always avalible
Since FreeBSD 8.x EOL in 2015-08-01 the option doesn't have any value beyond
footshooting[1]. sem_open() and sem_init(pshared=1) always work FreeBSD 9.0
or later after base r201546.
[1] https://lists.freebsd.org/pipermail/freebsd-ports/2017-April/108116.html
PR: 218641
Reported by: jbeich
Exp-run: antoine
Differential Revision: https://reviews.freebsd.org/D10446
Approved by: ports-secteam (with hat)
Deleted:
branches/2017Q2/lang/python27/files/extra-patch-setup.py
Modified:
branches/2017Q2/lang/python27/Makefile
branches/2017Q2/lang/python27/files/patch-setup.py
branches/2017Q2/lang/python33/Makefile
branches/2017Q2/lang/python34/Makefile
branches/2017Q2/lang/python35/Makefile
branches/2017Q2/lang/python36/Makefile
Directory Properties:
branches/2017Q2/ (props changed)
Modified: branches/2017Q2/lang/python27/Makefile
==============================================================================
--- branches/2017Q2/lang/python27/Makefile Tue Apr 25 02:01:14 2017 (r439350)
+++ branches/2017Q2/lang/python27/Makefile Tue Apr 25 02:13:34 2017 (r439351)
@@ -2,7 +2,7 @@
PORTNAME= python27
PORTVERSION= ${PYTHON_PORTVERSION}
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
DISTNAME= Python-${PORTVERSION}
@@ -13,10 +13,17 @@ COMMENT= Interpreted object-oriented pro
LICENSE= PSFL
-USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
+SHEBANG_FILES= Lib/lib2to3/pgen2/*.py Lib/lib2to3/tests/*.py Lib/lib2to3/tests/data/*.py \
+ Lib/idlelib/*.py Lib/encodings/*.py Lib/test/*.py Lib/UserString.py \
+ Lib/base64.py Lib/cProfile.py Lib/keyword.py Lib/mimify.py Lib/pdb.py \
+ Lib/platform.py Lib/profile.py Lib/pydoc.py Lib/quopri.py Lib/smtpd.py \
+ Lib/smtplib.py Lib/symbol.py Lib/tabnanny.py Lib/timeit.py Lib/trace.py \
+ Lib/uu.py Lib/webbrowser.py
CPE_VENDOR= python
CPE_PRODUCT= ${CPE_VENDOR}
@@ -36,8 +43,8 @@ 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
@@ -63,9 +70,6 @@ NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_te
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
@@ -109,13 +113,11 @@ PLIST_SUB+= NO_NIS=""
.endif
post-patch:
+ ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \
+ ${WRKSRC}/Lib/cgi.py
@${REINPLACE_CMD} -e \
's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
${PATCH_WRKSRC}/Lib/pydoc.py
-.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
.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \
Modified: branches/2017Q2/lang/python27/files/patch-setup.py
==============================================================================
--- branches/2017Q2/lang/python27/files/patch-setup.py Tue Apr 25 02:01:14 2017 (r439350)
+++ branches/2017Q2/lang/python27/files/patch-setup.py Tue Apr 25 02:13:34 2017 (r439351)
@@ -5,8 +5,8 @@
# Description: ossaudiodev detection fix backport
---- setup.py.orig 2014-06-30 04:05:48.000000000 +0200
-+++ setup.py 2014-07-26 14:51:29.000000000 +0200
+--- setup.py.orig 2017-04-22 03:42:03 UTC
++++ setup.py
@@ -15,6 +15,7 @@ from distutils.core import Extension, se
from distutils.command.build_ext import build_ext
from distutils.command.install import install
@@ -24,7 +24,7 @@
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1214,7 +1215,7 @@ class PyBuildExt(build_ext):
+@@ -1234,7 +1235,7 @@ class PyBuildExt(build_ext):
sysroot = macosx_sdk_root()
f = os.path.join(sysroot, f[1:])
@@ -33,16 +33,7 @@
data = open(f).read()
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
if m is not None:
-@@ -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', 'freebsd10', 'freebsd11'):
- # FreeBSD's P1003.1b semaphore support is very experimental
- # and has many known problems. (as of June 2008)
- macros = dict()
-@@ -1604,9 +1605,10 @@ class PyBuildExt(build_ext):
+@@ -1624,9 +1625,10 @@ class PyBuildExt(build_ext):
else:
missing.append('linuxaudiodev')
@@ -56,7 +47,7 @@
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
missing.append('ossaudiodev')
-@@ -2178,6 +2180,22 @@ class PyBuildInstallLib(install_lib):
+@@ -2200,6 +2202,22 @@ class PyBuildInstallLib(install_lib):
def is_chmod_supported(self):
return hasattr(os, 'chmod')
@@ -79,7 +70,7 @@
SUMMARY = """
Python is an interpreted, interactive, object-oriented programming
language. It is often compared to Tcl, Perl, Scheme or Java.
-@@ -2223,7 +2241,9 @@ def main():
+@@ -2245,7 +2263,9 @@ def main():
platforms = ["Many"],
# Build info
@@ -90,7 +81,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.
-@@ -2231,8 +2251,7 @@ def main():
+@@ -2253,8 +2273,7 @@ def main():
# Scripts to install
scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
Modified: branches/2017Q2/lang/python33/Makefile
==============================================================================
--- branches/2017Q2/lang/python33/Makefile Tue Apr 25 02:01:14 2017 (r439350)
+++ branches/2017Q2/lang/python33/Makefile Tue Apr 25 02:13:34 2017 (r439351)
@@ -2,7 +2,7 @@
PORTNAME= python33
PORTVERSION= ${PYTHON_PORTVERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
DISTNAME= Python-${PORTVERSION}
@@ -16,10 +16,12 @@ LICENSE= PSFL
DEPRECATED= No longer receives bug fixes, only security updates. Please update to Python 3.5
EXPIRATION_DATE= 2017-09-01
-USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
+SHEBANG_FILES= Lib/lib2to3/tests/data/*.py Lib/encodings/*.py
CPE_VENDOR= python
CPE_PRODUCT= ${CPE_VENDOR}
@@ -106,6 +108,8 @@ PLIST_SUB+= NO_NIS=""
.endif
post-patch:
+ ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \
+ ${WRKSRC}/Lib/cgi.py
.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \
${WRKSRC}/setup.py
Modified: branches/2017Q2/lang/python34/Makefile
==============================================================================
--- branches/2017Q2/lang/python34/Makefile Tue Apr 25 02:01:14 2017 (r439350)
+++ branches/2017Q2/lang/python34/Makefile Tue Apr 25 02:13:34 2017 (r439351)
@@ -3,6 +3,7 @@
PORTNAME= python34
PORTVERSION= ${PYTHON_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
DISTNAME= Python-${PORTVERSION}
@@ -13,10 +14,12 @@ COMMENT= Interpreted object-oriented pro
LICENSE= PSFL
-USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
+SHEBANG_FILES= Lib/lib2to3/tests/data/*.py Lib/encodings/*.py
CPE_VENDOR= python
CPE_PRODUCT= ${CPE_VENDOR}
@@ -114,6 +117,10 @@ DISABLED_EXTENSIONS+= nis
PLIST_SUB+= NO_NIS=""
.endif
+post-patch:
+ ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \
+ ${WRKSRC}/Lib/cgi.py
+
post-install:
.if ! ${PORT_OPTIONS:MDEBUG}
${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: http://bugs.python.org/issue17975
Modified: branches/2017Q2/lang/python35/Makefile
==============================================================================
--- branches/2017Q2/lang/python35/Makefile Tue Apr 25 02:01:14 2017 (r439350)
+++ branches/2017Q2/lang/python35/Makefile Tue Apr 25 02:13:34 2017 (r439351)
@@ -3,6 +3,7 @@
PORTNAME= python
DISTVERSION= ${PYTHON_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
@@ -14,10 +15,12 @@ COMMENT= Interpreted object-oriented pro
LICENSE= PSFL
-USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
+SHEBANG_FILES= Lib/lib2to3/tests/data/*.py Lib/encodings/*.py
CPE_VENDOR= python
CPE_PRODUCT= ${CPE_VENDOR}
@@ -122,6 +125,10 @@ DISABLED_EXTENSIONS+= nis
PLIST_SUB+= NO_NIS=""
.endif
+post-patch:
+ ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \
+ ${WRKSRC}/Lib/cgi.py
+
post-install:
.if ! ${PORT_OPTIONS:MDEBUG}
${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: http://bugs.python.org/issue17975
Modified: branches/2017Q2/lang/python36/Makefile
==============================================================================
--- branches/2017Q2/lang/python36/Makefile Tue Apr 25 02:01:14 2017 (r439350)
+++ branches/2017Q2/lang/python36/Makefile Tue Apr 25 02:13:34 2017 (r439351)
@@ -3,6 +3,7 @@
PORTNAME= python
PORTVERSION= ${PYTHON_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
@@ -14,10 +15,12 @@ COMMENT= Interpreted object-oriented pro
LICENSE= PSFL
-USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
+SHEBANG_FILES= Lib/lib2to3/tests/data/*.py Lib/encodings/*.py
CPE_VENDOR= python
CPE_PRODUCT= ${CPE_VENDOR}
@@ -118,6 +121,10 @@ DISABLED_EXTENSIONS+= nis
PLIST_SUB+= NO_NIS=""
.endif
+post-patch:
+ ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \
+ ${WRKSRC}/Lib/cgi.py
+
post-install:
.if ! ${PORT_OPTIONS:MDEBUG}
${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: http://bugs.python.org/issue17975
More information about the svn-ports-branches
mailing list