View | Details | Raw Unified | Return to bug 192511 | Differences between
and this patch

Collapse All | Expand All

(-)lang/python27/Makefile (-2 / +5 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	python27
3
PORTNAME=	python27
4
PORTVERSION=	2.7.9
4
PORTVERSION=	2.7.10
5
PORTREVISION=	1
6
CATEGORIES=	lang python ipv6
5
CATEGORIES=	lang python ipv6
7
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
6
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
8
DISTNAME=	Python-${PORTVERSION}
7
DISTNAME=	Python-${PORTVERSION}
Lines 104-109 Link Here
104
PLIST_SUB+=	NO_NIS=""
103
PLIST_SUB+=	NO_NIS=""
105
.endif
104
.endif
106
105
106
.if defined(WITH_OPENSSL_PORT)
107
CONFIGURE_ARGS+=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
108
.endif
109
107
post-patch:
110
post-patch:
108
	@${REINPLACE_CMD} -e \
111
	@${REINPLACE_CMD} -e \
109
		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
112
		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
(-)lang/python27/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (python/Python-2.7.9.tar.xz) = 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916
1
SHA256 (python/Python-2.7.10.tar.xz) = 1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0
2
SIZE (python/Python-2.7.9.tar.xz) = 12164712
2
SIZE (python/Python-2.7.10.tar.xz) = 12250696
(-)lang/python27/files/patch-Doc__library__fcntl.rst (-3 / +3 lines)
Lines 1-6 Link Here
1
--- ./Doc/library/fcntl.rst.orig	2014-07-03 21:53:41.473098625 +1000
1
--- Doc/library/fcntl.rst.orig	2015-05-23 16:08:55 UTC
2
+++ ./Doc/library/fcntl.rst	2014-07-03 21:54:04.342833056 +1000
2
+++ Doc/library/fcntl.rst
3
@@ -50,7 +50,6 @@
3
@@ -50,7 +50,6 @@ The module defines the following functio
4
    operations are typically defined in the library module :mod:`termios` and the
4
    operations are typically defined in the library module :mod:`termios` and the
5
    argument handling is even more complicated.
5
    argument handling is even more complicated.
6
 
6
 
(-)lang/python27/files/patch-Lib__distutils__unixccompiler.py (-3 / +3 lines)
Lines 2-10 Link Here
2
# Issue ID: http://bugs.python.org/issue20767
2
# Issue ID: http://bugs.python.org/issue20767
3
# Submitted by: antoine
3
# Submitted by: antoine
4
4
5
--- ./Lib/distutils/unixccompiler.py.orig      2013-11-10 07:36:40.000000000 +0000
5
--- Lib/distutils/unixccompiler.py.orig	2015-05-23 16:09:02 UTC
6
+++ ./Lib/distutils/unixccompiler.py   2014-02-19 15:41:48.000000000 +0000
6
+++ Lib/distutils/unixccompiler.py
7
@@ -228,6 +228,8 @@
7
@@ -228,6 +228,8 @@ class UnixCCompiler(CCompiler):
8
         if sys.platform[:6] == "darwin":
8
         if sys.platform[:6] == "darwin":
9
             # MacOSX's linker doesn't understand the -R flag at all
9
             # MacOSX's linker doesn't understand the -R flag at all
10
             return "-L" + dir
10
             return "-L" + dir
(-)lang/python27/files/patch-Lib_distutils_command_build_scripts.py (-3 / +3 lines)
Lines 3-11 Link Here
3
# installation.
3
# installation.
4
# Submitted by: mva
4
# Submitted by: mva
5
5
6
--- Lib/distutils/command/build_scripts.py.orig	2014-07-26 11:52:20.000000000 +0200
6
--- Lib/distutils/command/build_scripts.py.orig	2015-05-23 16:09:01 UTC
7
+++ Lib/distutils/command/build_scripts.py	2014-07-26 11:52:56.000000000 +0200
7
+++ Lib/distutils/command/build_scripts.py
8
@@ -126,6 +126,9 @@
8
@@ -126,6 +126,9 @@ class build_scripts (Command):
9
                                  file, oldmode, newmode)
9
                                  file, oldmode, newmode)
10
                         os.chmod(file, newmode)
10
                         os.chmod(file, newmode)
11
 
11
 
(-)lang/python27/files/patch-Lib_distutils_command_build_scripts.py (-17 lines)
Lines 1-17 Link Here
1
# Description: A non-invasive partial backport of the Python3 distutils behaviour.
2
# This allows Python's scripts to be properly suffixed (similar to Python 3.x) on
3
# installation.
4
# Submitted by: mva
5
6
--- Lib/distutils/command/build_scripts.py.orig	2014-07-26 11:52:20.000000000 +0200
7
+++ Lib/distutils/command/build_scripts.py	2014-07-26 11:52:56.000000000 +0200
8
@@ -126,6 +126,9 @@
9
                                  file, oldmode, newmode)
10
                         os.chmod(file, newmode)
11
 
12
+        # XXX should we modify self.outfiles?
13
+        return outfiles
14
+
15
     # copy_scripts ()
16
 
17
 # class build_scripts
(-)lang/python27/files/patch-Makefile.pre.in (-6 / +6 lines)
Lines 1-12 Link Here
1
# Description: Link scripts in the same way Python3 does
1
# Description: Link scripts in the same way Python3 does
2
# Submitted by: mva
2
# Submitted by: mva
3
3
4
--- Makefile.pre.in.orig	2014-06-30 04:05:39.000000000 +0200
4
--- Makefile.pre.in.orig	2015-05-23 16:09:16 UTC
5
+++ Makefile.pre.in	2014-07-26 11:09:46.000000000 +0200
5
+++ Makefile.pre.in
6
@@ -868,6 +868,12 @@
6
@@ -900,6 +900,12 @@ bininstall:	altbininstall
7
	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
7
 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
8
	-rm -f $(DESTDIR)$(LIBPC)/python.pc
8
 	-rm -f $(DESTDIR)$(LIBPC)/python.pc
9
	(cd $(DESTDIR)$(LIBPC); $(LN) -s python2.pc python.pc)
9
 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python2.pc python.pc)
10
+	-rm -f $(DESTDIR)$(BINDIR)/idle
10
+	-rm -f $(DESTDIR)$(BINDIR)/idle
11
+	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle2)
11
+	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle2)
12
+	-rm -f $(DESTDIR)$(BINDIR)/pydoc
12
+	-rm -f $(DESTDIR)$(BINDIR)/pydoc
(-)lang/python27/files/patch-Modules-_ctypes-libffi-configure (-3 / +3 lines)
Lines 1-6 Link Here
1
--- Modules/_ctypes/libffi/configure.orig	2014-12-16 08:10:12.000000000 +0100
1
--- Modules/_ctypes/libffi/configure.orig	2015-05-23 16:09:17 UTC
2
+++ Modules/_ctypes/libffi/configure	2014-12-16 08:10:40.000000000 +0100
2
+++ Modules/_ctypes/libffi/configure
3
@@ -7526,7 +7526,7 @@
3
@@ -7526,7 +7526,7 @@ mips64*-*linux*)
4
   rm -rf conftest*
4
   rm -rf conftest*
5
   ;;
5
   ;;
6
 
6
 
(-)lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c (-3 / +3 lines)
Lines 3-10 Link Here
3
# PR: ports/149167 ports/184517
3
# PR: ports/149167 ports/184517
4
# Patch by: cognet@ (to be upstreamed @ LLVM)
4
# Patch by: cognet@ (to be upstreamed @ LLVM)
5
5
6
--- ./Modules/_ctypes/libffi/src/arm/ffi.c.orig	2013-11-10 18:36:41.000000000 +1100
6
--- Modules/_ctypes/libffi/src/arm/ffi.c.orig	2015-05-23 16:09:17 UTC
7
+++ ./Modules/_ctypes/libffi/src/arm/ffi.c	2013-12-03 18:05:51.461078888 +1100
7
+++ Modules/_ctypes/libffi/src/arm/ffi.c
8
@@ -33,6 +33,11 @@
8
@@ -33,6 +33,11 @@
9
 
9
 
10
 #include <stdlib.h>
10
 #include <stdlib.h>
Lines 17-23 Link Here
17
 /* Forward declares. */
17
 /* Forward declares. */
18
 static int vfp_type_p (ffi_type *);
18
 static int vfp_type_p (ffi_type *);
19
 static void layout_vfp_args (ffi_cif *);
19
 static void layout_vfp_args (ffi_cif *);
20
@@ -582,6 +587,16 @@
20
@@ -751,6 +756,16 @@ ffi_closure_free (void *ptr)
21
 
21
 
22
 #else
22
 #else
23
 
23
 
(-)lang/python27/files/patch-Modules__fcntlmodule.c (-6 / +6 lines)
Lines 1-6 Link Here
1
--- ./Modules/fcntlmodule.c.orig	2014-07-03 21:57:10.429953240 +1000
1
--- Modules/fcntlmodule.c.orig	2015-05-23 16:09:20 UTC
2
+++ ./Modules/fcntlmodule.c	2014-07-03 21:59:36.517210444 +1000
2
+++ Modules/fcntlmodule.c
3
@@ -98,20 +98,15 @@
3
@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *ar
4
 {
4
 {
5
 #define IOCTL_BUFSZ 1024
5
 #define IOCTL_BUFSZ 1024
6
     int fd;
6
     int fd;
Lines 24-30 Link Here
24
     int arg;
24
     int arg;
25
     int ret;
25
     int ret;
26
     char *str;
26
     char *str;
27
@@ -119,7 +114,7 @@
27
@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
28
     int mutate_arg = 1;
28
     int mutate_arg = 1;
29
     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
29
     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
30
 
30
 
Lines 33-39 Link Here
33
                          conv_descriptor, &fd, &code,
33
                          conv_descriptor, &fd, &code,
34
                          &str, &len, &mutate_arg)) {
34
                          &str, &len, &mutate_arg)) {
35
         char *arg;
35
         char *arg;
36
@@ -170,7 +165,7 @@
36
@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
37
     }
37
     }
38
 
38
 
39
     PyErr_Clear();
39
     PyErr_Clear();
Lines 42-48 Link Here
42
                          conv_descriptor, &fd, &code, &str, &len)) {
42
                          conv_descriptor, &fd, &code, &str, &len)) {
43
         if (len > IOCTL_BUFSZ) {
43
         if (len > IOCTL_BUFSZ) {
44
             PyErr_SetString(PyExc_ValueError,
44
             PyErr_SetString(PyExc_ValueError,
45
@@ -192,7 +187,7 @@
45
@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
46
     PyErr_Clear();
46
     PyErr_Clear();
47
     arg = 0;
47
     arg = 0;
48
     if (!PyArg_ParseTuple(args,
48
     if (!PyArg_ParseTuple(args,
(-)lang/python27/files/patch-setup.py (-10 / +10 lines)
Lines 5-13 Link Here
5
5
6
# Description: ossaudiodev detection fix backport
6
# Description: ossaudiodev detection fix backport
7
7
8
--- setup.py.orig	2014-06-30 04:05:48.000000000 +0200
8
--- setup.py.orig	2015-05-23 16:09:25 UTC
9
+++ setup.py	2014-07-26 14:51:29.000000000 +0200
9
+++ setup.py
10
@@ -15,6 +15,7 @@
10
@@ -15,6 +15,7 @@ from distutils.core import Extension, se
11
 from distutils.command.build_ext import build_ext
11
 from distutils.command.build_ext import build_ext
12
 from distutils.command.install import install
12
 from distutils.command.install import install
13
 from distutils.command.install_lib import install_lib
13
 from distutils.command.install_lib import install_lib
Lines 15-21 Link Here
15
 from distutils.spawn import find_executable
15
 from distutils.spawn import find_executable
16
 
16
 
17
 cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
17
 cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
18
@@ -33,7 +34,7 @@
18
@@ -33,7 +34,7 @@ host_platform = get_platform()
19
 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
19
 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
20
 
20
 
21
 # This global variable is used to hold the list of modules to be disabled.
21
 # This global variable is used to hold the list of modules to be disabled.
Lines 24-30 Link Here
24
 
24
 
25
 def add_dir_to_list(dirlist, dir):
25
 def add_dir_to_list(dirlist, dir):
26
     """Add the directory 'dir' to the list 'dirlist' (at the front) if
26
     """Add the directory 'dir' to the list 'dirlist' (at the front) if
27
@@ -1212,7 +1213,7 @@
27
@@ -1214,7 +1215,7 @@ class PyBuildExt(build_ext):
28
                 sysroot = macosx_sdk_root()
28
                 sysroot = macosx_sdk_root()
29
                 f = os.path.join(sysroot, f[1:])
29
                 f = os.path.join(sysroot, f[1:])
30
 
30
 
Lines 33-39 Link Here
33
             data = open(f).read()
33
             data = open(f).read()
34
             m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
34
             m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
35
             if m is not None:
35
             if m is not None:
36
@@ -1551,7 +1552,7 @@
36
@@ -1553,7 +1554,7 @@ class PyBuildExt(build_ext):
37
             macros = dict()
37
             macros = dict()
38
             libraries = []
38
             libraries = []
39
 
39
 
Lines 42-48 Link Here
42
             # FreeBSD's P1003.1b semaphore support is very experimental
42
             # FreeBSD's P1003.1b semaphore support is very experimental
43
             # and has many known problems. (as of June 2008)
43
             # and has many known problems. (as of June 2008)
44
             macros = dict()
44
             macros = dict()
45
@@ -1602,9 +1603,10 @@
45
@@ -1604,9 +1605,10 @@ class PyBuildExt(build_ext):
46
         else:
46
         else:
47
             missing.append('linuxaudiodev')
47
             missing.append('linuxaudiodev')
48
 
48
 
Lines 56-62 Link Here
56
             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
56
             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
57
         else:
57
         else:
58
             missing.append('ossaudiodev')
58
             missing.append('ossaudiodev')
59
@@ -2176,6 +2178,22 @@
59
@@ -2178,6 +2180,22 @@ class PyBuildInstallLib(install_lib):
60
     def is_chmod_supported(self):
60
     def is_chmod_supported(self):
61
         return hasattr(os, 'chmod')
61
         return hasattr(os, 'chmod')
62
 
62
 
Lines 79-85 Link Here
79
 SUMMARY = """
79
 SUMMARY = """
80
 Python is an interpreted, interactive, object-oriented programming
80
 Python is an interpreted, interactive, object-oriented programming
81
 language. It is often compared to Tcl, Perl, Scheme or Java.
81
 language. It is often compared to Tcl, Perl, Scheme or Java.
82
@@ -2221,7 +2239,9 @@
82
@@ -2223,7 +2241,9 @@ def main():
83
           platforms = ["Many"],
83
           platforms = ["Many"],
84
 
84
 
85
           # Build info
85
           # Build info
Lines 90-96 Link Here
90
                       'install_lib':PyBuildInstallLib},
90
                       'install_lib':PyBuildInstallLib},
91
           # The struct module is defined here, because build_ext won't be
91
           # The struct module is defined here, because build_ext won't be
92
           # called unless there's at least one extension module defined.
92
           # called unless there's at least one extension module defined.
93
@@ -2229,8 +2249,7 @@
93
@@ -2231,8 +2251,7 @@ def main():
94
 
94
 
95
           # Scripts to install
95
           # Scripts to install
96
           scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
96
           scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
(-)lang/python27/pkg-plist (-6 / +9 lines)
Lines 1436-1443 Link Here
1436
lib/python2.7/ensurepip/__main__.py
1436
lib/python2.7/ensurepip/__main__.py
1437
lib/python2.7/ensurepip/__main__.pyc
1437
lib/python2.7/ensurepip/__main__.pyc
1438
lib/python2.7/ensurepip/__main__.pyo
1438
lib/python2.7/ensurepip/__main__.pyo
1439
lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
1439
lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
1440
lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
1440
lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
1441
lib/python2.7/ensurepip/_uninstall.py
1441
lib/python2.7/ensurepip/_uninstall.py
1442
lib/python2.7/ensurepip/_uninstall.pyc
1442
lib/python2.7/ensurepip/_uninstall.pyc
1443
lib/python2.7/ensurepip/_uninstall.pyo
1443
lib/python2.7/ensurepip/_uninstall.pyo
Lines 1782-1790 Link Here
1782
lib/python2.7/idlelib/tabbedpages.py
1782
lib/python2.7/idlelib/tabbedpages.py
1783
lib/python2.7/idlelib/tabbedpages.pyo
1783
lib/python2.7/idlelib/tabbedpages.pyo
1784
lib/python2.7/idlelib/tabbedpages.pyc
1784
lib/python2.7/idlelib/tabbedpages.pyc
1785
lib/python2.7/idlelib/testcode.py
1785
lib/python2.7/idlelib/idle_test/test_io.py
1786
lib/python2.7/idlelib/testcode.pyo
1786
lib/python2.7/idlelib/idle_test/test_io.pyo
1787
lib/python2.7/idlelib/testcode.pyc
1787
lib/python2.7/idlelib/idle_test/test_io.pyc
1788
lib/python2.7/idlelib/textView.py
1788
lib/python2.7/idlelib/textView.py
1789
lib/python2.7/idlelib/textView.pyo
1789
lib/python2.7/idlelib/textView.pyo
1790
lib/python2.7/idlelib/textView.pyc
1790
lib/python2.7/idlelib/textView.pyc
Lines 2907-2913 Link Here
2907
lib/python2.7/test/decimaltestdata/tointegral.decTest
2907
lib/python2.7/test/decimaltestdata/tointegral.decTest
2908
lib/python2.7/test/decimaltestdata/tointegralx.decTest
2908
lib/python2.7/test/decimaltestdata/tointegralx.decTest
2909
lib/python2.7/test/decimaltestdata/xor.decTest
2909
lib/python2.7/test/decimaltestdata/xor.decTest
2910
lib/python2.7/test/dh512.pem
2910
lib/python2.7/test/dh1024.pem
2911
lib/python2.7/test/doctest_aliases.py
2911
lib/python2.7/test/doctest_aliases.py
2912
lib/python2.7/test/doctest_aliases.pyo
2912
lib/python2.7/test/doctest_aliases.pyo
2913
lib/python2.7/test/doctest_aliases.pyc
2913
lib/python2.7/test/doctest_aliases.pyc
Lines 4090-4095 Link Here
4090
lib/python2.7/test/test_time.py
4090
lib/python2.7/test/test_time.py
4091
lib/python2.7/test/test_time.pyo
4091
lib/python2.7/test/test_time.pyo
4092
lib/python2.7/test/test_time.pyc
4092
lib/python2.7/test/test_time.pyc
4093
lib/python2.7/test/test_timeit.py
4094
lib/python2.7/test/test_timeit.pyo
4095
lib/python2.7/test/test_timeit.pyc
4093
lib/python2.7/test/test_timeout.py
4096
lib/python2.7/test/test_timeout.py
4094
lib/python2.7/test/test_timeout.pyo
4097
lib/python2.7/test/test_timeout.pyo
4095
lib/python2.7/test/test_timeout.pyc
4098
lib/python2.7/test/test_timeout.pyc

Return to bug 192511