[151001] trunk/dports/lang/python35/files
mojca at macports.org
mojca at macports.org
Fri Aug 5 06:59:53 PDT 2016
Revision: 151001
https://trac.macports.org/changeset/151001
Author: mojca at macports.org
Date: 2016-08-05 06:59:53 -0700 (Fri, 05 Aug 2016)
Log Message:
-----------
python35: fix line numbers and fuzz in patchfiles
Modified Paths:
--------------
trunk/dports/lang/python35/files/omit-local-site-packages.patch
trunk/dports/lang/python35/files/patch-Lib-cgi.py.diff
trunk/dports/lang/python35/files/patch-Lib-ctypes-macholib-dyld.py.diff
trunk/dports/lang/python35/files/patch-configure.diff
trunk/dports/lang/python35/files/patch-libedit.diff
trunk/dports/lang/python35/files/patch-setup.py-disabled_modules.diff
trunk/dports/lang/python35/files/patch-setup.py.diff
trunk/dports/lang/python35/files/patch-xcode4bug.diff
Modified: trunk/dports/lang/python35/files/omit-local-site-packages.patch
===================================================================
--- trunk/dports/lang/python35/files/omit-local-site-packages.patch 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/omit-local-site-packages.patch 2016-08-05 13:59:53 UTC (rev 151001)
@@ -1,8 +1,6 @@
-Index: Lib/site.py
-===================================================================
--- Lib/site.py.orig
+++ Lib/site.py
-@@ -311,15 +311,6 @@ def getsitepackages(prefixes=None):
+@@ -309,15 +309,6 @@ def getsitepackages(prefixes=None):
else:
sitepackages.append(prefix)
sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
Modified: trunk/dports/lang/python35/files/patch-Lib-cgi.py.diff
===================================================================
--- trunk/dports/lang/python35/files/patch-Lib-cgi.py.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-Lib-cgi.py.diff 2016-08-05 13:59:53 UTC (rev 151001)
@@ -1,5 +1,5 @@
---- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200
-+++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200
+--- Lib/cgi.py.orig
++++ Lib/cgi.py
@@ -1,13 +1,6 @@
-#! /usr/local/bin/python
+#! @@PREFIX@@/bin/python3.2
Modified: trunk/dports/lang/python35/files/patch-Lib-ctypes-macholib-dyld.py.diff
===================================================================
--- trunk/dports/lang/python35/files/patch-Lib-ctypes-macholib-dyld.py.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-Lib-ctypes-macholib-dyld.py.diff 2016-08-05 13:59:53 UTC (rev 151001)
@@ -1,11 +1,11 @@
---- 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 @@
+--- 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"),
- "/usr/local/lib",
-+ "@@PREFIX@@/lib",
++ "/opt/local/lib",
"/lib",
"/usr/lib",
]
Modified: trunk/dports/lang/python35/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/python35/files/patch-configure.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-configure.diff 2016-08-05 13:59:53 UTC (rev 151001)
@@ -1,6 +1,6 @@
---- configure.orig 2012-08-13 17:08:58.000000000 +0300
-+++ configure 2012-08-13 17:11:07.000000000 +0300
-@@ -3145,6 +3145,8 @@
+--- configure.orig
++++ configure
+@@ -3250,6 +3250,8 @@
;;
esac
Modified: trunk/dports/lang/python35/files/patch-libedit.diff
===================================================================
--- trunk/dports/lang/python35/files/patch-libedit.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-libedit.diff 2016-08-05 13:59:53 UTC (rev 151001)
@@ -1,6 +1,6 @@
---- configure.orig 2013-10-23 21:50:49.000000000 +0300
-+++ configure 2013-10-23 22:03:14.000000000 +0300
-@@ -13882,9 +13882,9 @@
+--- configure.orig
++++ configure
+@@ -14760,9 +14762,9 @@ py_cv_lib_readline=no
$as_echo_n "checking how to link readline libs... " >&6; }
for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
if test -z "$py_libtermcap"; then
@@ -12,7 +12,7 @@
fi
LIBS="$READLINE_LIBS $LIBS_no_readline"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13928,13 +13928,13 @@
+@@ -14806,13 +14808,13 @@ $as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
fi
# check for readline 2.1
@@ -29,7 +29,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13974,7 +13974,7 @@
+@@ -14852,7 +14854,7 @@ fi
# check for readline 2.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -38,7 +38,7 @@
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
-@@ -13987,7 +13987,7 @@
+@@ -14865,7 +14867,7 @@ if test $have_readline = yes
then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -47,7 +47,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -14000,7 +14000,7 @@
+@@ -14878,7 +14880,7 @@ rm -f conftest*
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -56,7 +56,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -14014,13 +14014,13 @@
+@@ -14892,13 +14894,13 @@ rm -f conftest*
fi
# check for readline 4.0
@@ -73,7 +73,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -14058,13 +14058,13 @@
+@@ -14936,13 +14938,13 @@ fi
# also in 4.0
@@ -90,7 +90,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -14102,13 +14102,13 @@
+@@ -15024,13 +15026,13 @@ fi
# check for readline 4.2
@@ -107,7 +107,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -14148,7 +14148,7 @@
+@@ -15070,7 +15072,7 @@ fi
# also in readline 4.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -116,7 +116,7 @@
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
-@@ -14161,7 +14161,7 @@
+@@ -15083,7 +15085,7 @@ if test $have_readline = yes
then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -125,10 +125,10 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
---- setup.py.orig 2013-10-23 21:50:56.000000000 +0300
-+++ setup.py 2013-10-23 22:06:11.000000000 +0300
-@@ -646,7 +646,7 @@
- exts.append( Extension('audioop', ['audioop.c']) )
+--- setup.py.orig
++++ setup.py
+@@ -708,7 +708,7 @@ class PyBuildExt(build_ext):
+ libraries=math_libs) )
# readline
- do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
@@ -136,7 +136,7 @@
readline_termcap_library = ""
curses_library = ""
# Cannot use os.popen here in py3k.
-@@ -710,7 +710,7 @@
+@@ -774,7 +774,7 @@ class PyBuildExt(build_ext):
else:
readline_extra_link_args = ()
@@ -145,8 +145,8 @@
if readline_termcap_library:
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
---- Modules/readline.c.orig 2013-10-23 21:51:09.000000000 +0300
-+++ Modules/readline.c 2013-10-23 22:10:09.000000000 +0300
+--- Modules/readline.c.orig
++++ Modules/readline.c
@@ -29,8 +29,7 @@
/* GNU readline definitions */
Modified: trunk/dports/lang/python35/files/patch-setup.py-disabled_modules.diff
===================================================================
--- trunk/dports/lang/python35/files/patch-setup.py-disabled_modules.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-setup.py-disabled_modules.diff 2016-08-05 13:59:53 UTC (rev 151001)
@@ -1,11 +1,11 @@
---- setup.py.orig 2011-07-09 16:58:56.000000000 +1000
-+++ setup.py 2011-07-13 20:50:12.000000000 +1000
-@@ -21,7 +21,7 @@
- COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
+--- setup.py.orig
++++ setup.py
+@@ -44,7 +44,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.
-disabled_module_list = []
+disabled_module_list = ["_tkinter", "_gdbm"]
- # File which contains the directory for shared mods (for sys.path fixup
- # when running from the build dir, see Modules/getpath.c)
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (after any relative
Modified: trunk/dports/lang/python35/files/patch-setup.py.diff
===================================================================
--- trunk/dports/lang/python35/files/patch-setup.py.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-setup.py.diff 2016-08-05 13:59:53 UTC (rev 151001)
@@ -1,6 +1,6 @@
---- setup.py.orig 2012-08-13 17:01:43.000000000 +0300
-+++ setup.py 2012-08-13 17:06:17.000000000 +0300
-@@ -1576,7 +1576,7 @@
+--- setup.py.orig
++++ setup.py
+@@ -1695,7 +1695,7 @@ class PyBuildExt(build_ext):
# For 8.4a2, the X11 headers are not included. Rather than include a
# complicated search, this is a hard-coded path. It could bail out
# if X11 libs are not found...
@@ -9,9 +9,9 @@
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1621,13 +1621,6 @@
- def detect_tkinter(self, inc_dirs, lib_dirs):
- # The _tkinter module.
+@@ -1746,13 +1746,6 @@ class PyBuildExt(build_ext):
+ if self.detect_tkinter_explicitly():
+ return
- # Rather than complicate the code below, detecting and building
- # AquaTk is a separate method. Only one Tkinter will be built on
@@ -23,7 +23,7 @@
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
-@@ -1676,17 +1669,17 @@
+@@ -1801,17 +1794,17 @@ class PyBuildExt(build_ext):
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
Modified: trunk/dports/lang/python35/files/patch-xcode4bug.diff
===================================================================
--- trunk/dports/lang/python35/files/patch-xcode4bug.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-xcode4bug.diff 2016-08-05 13:59:53 UTC (rev 151001)
@@ -6,7 +6,7 @@
--- configure.orig
+++ configure
-@@ -16238,6 +16240,24 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -16240,6 +16242,24 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
volatile int val = 1;
int main() {
__atomic_load_n(&val, __ATOMIC_SEQ_CST);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160805/7ee50b96/attachment-0001.html>
More information about the macports-changes
mailing list