[152946] trunk/dports/lang/python27/files
larryv at macports.org
larryv at macports.org
Tue Sep 20 22:00:26 PDT 2016
Revision: 152946
https://trac.macports.org/changeset/152946
Author: larryv at macports.org
Date: 2016-09-20 22:00:25 -0700 (Tue, 20 Sep 2016)
Log Message:
-----------
python27: Refresh patches
Modified Paths:
--------------
trunk/dports/lang/python27/files/patch-Include-pyport.h.diff
trunk/dports/lang/python27/files/patch-Lib-cgi.py.diff
trunk/dports/lang/python27/files/patch-Lib-ctypes-macholib-dyld.py.diff
trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff
trunk/dports/lang/python27/files/patch-configure.diff
trunk/dports/lang/python27/files/patch-libedit.diff
trunk/dports/lang/python27/files/patch-setup.py.diff
Modified: trunk/dports/lang/python27/files/patch-Include-pyport.h.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Include-pyport.h.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-Include-pyport.h.diff 2016-09-21 05:00:25 UTC (rev 152946)
@@ -1,6 +1,8 @@
---- Include/pyport.h.orig 2014-06-29 21:05:24.000000000 -0500
-+++ Include/pyport.h 2014-07-11 13:36:52.000000000 -0500
-@@ -713,6 +713,12 @@
+Index: Include/pyport.h
+===================================================================
+--- Include/pyport.h.orig
++++ Include/pyport.h
+@@ -713,6 +713,12 @@ extern int fdatasync(int);
#endif
#ifdef _PY_PORT_CTYPE_UTF8_ISSUE
@@ -13,7 +15,7 @@
#include <ctype.h>
#include <wctype.h>
#undef isalnum
-@@ -730,6 +736,7 @@
+@@ -730,6 +736,7 @@ extern int fdatasync(int);
#undef toupper
#define toupper(c) towupper(btowc(c))
#endif
Modified: trunk/dports/lang/python27/files/patch-Lib-cgi.py.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Lib-cgi.py.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-Lib-cgi.py.diff 2016-09-21 05:00:25 UTC (rev 152946)
@@ -1,5 +1,7 @@
---- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200
-+++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200
+Index: Lib/cgi.py
+===================================================================
+--- Lib/cgi.py.orig
++++ Lib/cgi.py
@@ -1,13 +1,6 @@
-#! /usr/local/bin/python
+#! @@PREFIX@@/bin/python2.7
Modified: trunk/dports/lang/python27/files/patch-Lib-ctypes-macholib-dyld.py.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Lib-ctypes-macholib-dyld.py.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-Lib-ctypes-macholib-dyld.py.diff 2016-09-21 05:00:25 UTC (rev 152946)
@@ -1,6 +1,8 @@
---- Lib/ctypes/macholib/dyld.py.orig 2008-02-21 11:52:20.000000000 -0700
-+++ Lib/ctypes/macholib/dyld.py 2009-10-11 02:42:21.000000000 -0600
-@@ -26,7 +26,7 @@
+Index: Lib/ctypes/macholib/dyld.py
+===================================================================
+--- Lib/ctypes/macholib/dyld.py.orig
++++ Lib/ctypes/macholib/dyld.py
+@@ -23,7 +23,7 @@ DEFAULT_FRAMEWORK_FALLBACK = [
DEFAULT_LIBRARY_FALLBACK = [
os.path.expanduser("~/lib"),
Modified: trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff 2016-09-21 05:00:25 UTC (rev 152946)
@@ -1,6 +1,8 @@
---- Makefile.pre.in.orig 2013-11-11 10:06:36.000000000 +0200
-+++ Makefile.pre.in 2013-11-11 10:08:02.000000000 +0200
-@@ -461,7 +461,7 @@
+Index: Makefile.pre.in
+===================================================================
+--- Makefile.pre.in.orig
++++ Makefile.pre.in
+@@ -546,7 +546,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -9,7 +11,7 @@
# Build static library
# avoid long command lines, same as LIBRARY_OBJS
-@@ -1138,7 +1138,7 @@
+@@ -1265,7 +1265,7 @@ libainstall: all python-config
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -18,7 +20,7 @@
--prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
-@@ -1212,7 +1212,7 @@
+@@ -1339,7 +1339,7 @@ frameworkinstallextras:
# This installs a few of the useful scripts in Tools/scripts
scriptsinstall:
SRCDIR=$(srcdir) $(RUNSHARED) \
Modified: trunk/dports/lang/python27/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-configure.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-configure.diff 2016-09-21 05:00:25 UTC (rev 152946)
@@ -1,6 +1,8 @@
---- configure.orig 2010-11-01 12:47:19.000000000 +1100
-+++ configure 2011-05-14 01:51:04.000000000 +1000
-@@ -2914,6 +2914,8 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -3149,6 +3149,8 @@ if test "${enable_framework+set}" = set;
;;
esac
Modified: trunk/dports/lang/python27/files/patch-libedit.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-libedit.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-libedit.diff 2016-09-21 05:00:25 UTC (rev 152946)
@@ -1,6 +1,8 @@
---- configure.orig 2013-05-20 03:42:25.000000000 +1000
-+++ configure 2013-05-20 03:49:42.000000000 +1000
-@@ -13447,9 +13447,9 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -13756,9 +13756,9 @@ py_cv_lib_readline=no
$as_echo_n "checking how to link readline libs... " >&6; }
for py_libtermcap in "" ncursesw ncurses curses termcap; do
if test -z "$py_libtermcap"; then
@@ -12,7 +14,7 @@
fi
LIBS="$READLINE_LIBS $LIBS_no_readline"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13493,13 +13493,13 @@
+@@ -13802,13 +13802,13 @@ $as_echo "#define HAVE_LIBREADLINE 1" >>
fi
# check for readline 2.1
@@ -29,7 +31,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13539,7 +13539,7 @@
+@@ -13848,7 +13848,7 @@ fi
# check for readline 2.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -38,7 +40,7 @@
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
-@@ -13552,7 +13552,7 @@
+@@ -13861,7 +13861,7 @@ if test $have_readline = yes
then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -47,7 +49,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -13565,7 +13565,7 @@
+@@ -13874,7 +13874,7 @@ rm -f conftest*
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -56,7 +58,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -13579,13 +13579,13 @@
+@@ -13888,13 +13888,13 @@ rm -f conftest*
fi
# check for readline 4.0
@@ -73,7 +75,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13623,13 +13623,13 @@
+@@ -13932,13 +13932,13 @@ fi
# also in 4.0
@@ -90,7 +92,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13667,13 +13667,13 @@
+@@ -14020,13 +14020,13 @@ fi
# check for readline 4.2
@@ -107,7 +109,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13713,7 +13713,7 @@
+@@ -14066,7 +14066,7 @@ fi
# also in readline 4.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -116,7 +118,7 @@
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
-@@ -13726,7 +13726,7 @@
+@@ -14079,7 +14079,7 @@ if test $have_readline = yes
then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -125,9 +127,11 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
---- setup.py.orig 2013-05-20 03:42:24.000000000 +1000
-+++ setup.py 2013-05-20 03:52:00.000000000 +1000
-@@ -696,7 +696,7 @@
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -719,7 +719,7 @@ class PyBuildExt(build_ext):
missing.extend(['imageop'])
# readline
@@ -136,7 +140,7 @@
readline_termcap_library = ""
curses_library = ""
# Determine if readline is already linked against curses or tinfo.
-@@ -747,7 +747,7 @@
+@@ -772,7 +772,7 @@ class PyBuildExt(build_ext):
else:
readline_extra_link_args = ()
@@ -145,8 +149,10 @@
if readline_termcap_library:
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
---- Modules/readline.c.orig 2013-05-12 13:32:51.000000000 +1000
-+++ Modules/readline.c 2013-05-20 03:59:17.000000000 +1000
+Index: Modules/readline.c
+===================================================================
+--- Modules/readline.c.orig
++++ Modules/readline.c
@@ -28,8 +28,7 @@
/* GNU readline definitions */
Modified: trunk/dports/lang/python27/files/patch-setup.py.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-setup.py.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-setup.py.diff 2016-09-21 05:00:25 UTC (rev 152946)
@@ -1,6 +1,8 @@
---- setup.py.orig 2013-11-12 12:57:03.000000000 +0200
-+++ setup.py 2013-11-12 13:03:25.000000000 +0200
-@@ -436,10 +436,6 @@
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -454,10 +454,6 @@ class PyBuildExt(build_ext):
os.unlink(tmpfile)
def detect_modules(self):
@@ -11,7 +13,7 @@
if cross_compiling:
self.add_gcc_paths()
self.add_multiarch_paths()
-@@ -784,10 +780,7 @@
+@@ -808,10 +804,7 @@ class PyBuildExt(build_ext):
depends=['socketmodule.h'],
libraries=math_libs) )
# Detect SSL support for the socket module (via _ssl)
@@ -23,7 +25,7 @@
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
search_for_ssl_incs_in
)
-@@ -797,9 +790,7 @@
+@@ -821,9 +814,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -34,7 +36,7 @@
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -920,34 +911,7 @@
+@@ -944,34 +935,7 @@ class PyBuildExt(build_ext):
# construct a list of paths to look for the header file in on
# top of the normal inc_dirs.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160920/1eb82011/attachment.html>
More information about the macports-changes
mailing list