[113224] trunk/dports/lang/python27
jwa at macports.org
jwa at macports.org
Tue Nov 12 12:57:39 PST 2013
Revision: 113224
https://trac.macports.org/changeset/113224
Author: jwa at macports.org
Date: 2013-11-12 12:57:39 -0800 (Tue, 12 Nov 2013)
Log Message:
-----------
python27: version bump to 2.7.6
Modified Paths:
--------------
trunk/dports/lang/python27/Portfile
trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff
trunk/dports/lang/python27/files/patch-libedit.diff
trunk/dports/lang/python27/files/patch-setup.py.diff
Modified: trunk/dports/lang/python27/Portfile
===================================================================
--- trunk/dports/lang/python27/Portfile 2013-11-12 20:50:57 UTC (rev 113223)
+++ trunk/dports/lang/python27/Portfile 2013-11-12 20:57:39 UTC (rev 113224)
@@ -7,8 +7,7 @@
name python27
epoch 2
# Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
-version 2.7.5
-revision 1
+version 2.7.6
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
@@ -28,9 +27,8 @@
distname Python-${version}
use_xz yes
-checksums md5 5eea8462f69ab1369d32f9c4cd6272ab \
- rmd160 baa7ad7d82cb4dc0a70b6a7aded43b7b78b0067e \
- sha256 f33c4cab167dc69e10962e1cebf1c0768e2d0e8575648130c20e6bda84551db1
+checksums rmd160 8efc73a01a466d8fa16c5c1734c89be79c2c538a \
+ sha256 1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1
patchfiles patch-Makefile.pre.in.diff \
patch-setup.py.diff \
@@ -50,6 +48,7 @@
port:libedit
depends_run port:python_select
+# disable-ipv6 for now, getaddrinfo-function missing
configure.args --enable-framework=${frameworks_dir} \
--enable-ipv6
@@ -74,6 +73,10 @@
${worksrcpath}/Mac/PythonLauncher/Makefile.in
}
+post-configure {
+ reinplace "s;/* #undef PY_FORMAT_LONG_LONG */;#define PY_FORMAT_LONG_LONG \"ll\";" pyconfig.h
+}
+
build.target all
test.run yes
Modified: trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff 2013-11-12 20:50:57 UTC (rev 113223)
+++ trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff 2013-11-12 20:57:39 UTC (rev 113224)
@@ -1,15 +1,15 @@
---- Makefile.pre.in.orig 2013-05-12 13:32:49.000000000 +1000
-+++ Makefile.pre.in 2013-05-20 03:10:14.000000000 +1000
-@@ -456,7 +456,7 @@
- *) quiet="";; \
+--- 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 @@
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet --no-user-cfg build
++ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py --no-user-cfg $$quiet build
# Build static library
# avoid long command lines, same as LIBRARY_OBJS
-@@ -1133,7 +1133,7 @@
+@@ -1138,7 +1138,7 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -18,7 +18,7 @@
--prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
-@@ -1207,7 +1207,7 @@
+@@ -1212,7 +1212,7 @@
# This installs a few of the useful scripts in Tools/scripts
scriptsinstall:
SRCDIR=$(srcdir) $(RUNSHARED) \
Modified: trunk/dports/lang/python27/files/patch-libedit.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-libedit.diff 2013-11-12 20:50:57 UTC (rev 113223)
+++ trunk/dports/lang/python27/files/patch-libedit.diff 2013-11-12 20:57:39 UTC (rev 113224)
@@ -157,35 +157,3 @@
#ifdef HAVE_RL_COMPLETION_MATCHES
#define completion_matches(x, y) \
-@@ -562,14 +561,13 @@ get_history_item(PyObject *self, PyObjec
- * difference.
- */
- int length = _py_get_history_length();
-- idx --;
-
- /*
- * Apple's readline emulation crashes when
- * the index is out of range, therefore
- * test for that and fail gracefully.
- */
-- if (idx < 0 || idx >= length) {
-+ if (idx < 1 || idx > length) {
- Py_RETURN_NONE;
- }
- }
-@@ -1088,15 +1086,6 @@ call_readline(FILE *sys_stdin, FILE *sys
- const char *line;
- int length = _py_get_history_length();
- if (length > 0)
--#ifdef __APPLE__
-- if (using_libedit_emulation) {
-- /*
-- * Libedit's emulation uses 0-based indexes,
-- * the real readline uses 1-based indexes.
-- */
-- line = history_get(length - 1)->line;
-- } else
--#endif /* __APPLE__ */
- line = history_get(length)->line;
- else
- line = "";
Modified: trunk/dports/lang/python27/files/patch-setup.py.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-setup.py.diff 2013-11-12 20:50:57 UTC (rev 113223)
+++ trunk/dports/lang/python27/files/patch-setup.py.diff 2013-11-12 20:57:39 UTC (rev 113224)
@@ -1,16 +1,17 @@
---- setup.py.orig 2013-05-12 13:32:54.000000000 +1000
-+++ setup.py 2013-05-20 03:33:30.000000000 +1000
-@@ -436,9 +436,6 @@
+--- 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 @@
os.unlink(tmpfile)
def detect_modules(self):
- # Ensure that /usr/local is always used
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- self.add_gcc_paths()
+- if not cross_compiling:
+- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ if cross_compiling:
+ self.add_gcc_paths()
self.add_multiarch_paths()
-
-@@ -782,10 +779,7 @@
+@@ -784,10 +780,7 @@
depends=['socketmodule.h'],
libraries=math_libs) )
# Detect SSL support for the socket module (via _ssl)
@@ -22,7 +23,7 @@
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
search_for_ssl_incs_in
)
-@@ -795,9 +789,7 @@
+@@ -797,9 +790,7 @@
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -33,7 +34,7 @@
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -918,34 +910,7 @@
+@@ -920,34 +911,7 @@
# construct a list of paths to look for the header file in on
# top of the normal inc_dirs.
@@ -69,58 +70,3 @@
if cross_compiling:
db_inc_paths = []
-@@ -1091,13 +1056,7 @@
- # We hunt for #define SQLITE_VERSION "n.n.n"
- # We need to find >= sqlite version 3.0.8
- sqlite_incdir = sqlite_libdir = None
-- sqlite_inc_paths = [ '/usr/include',
-- '/usr/include/sqlite',
-- '/usr/include/sqlite3',
-- '/usr/local/include',
-- '/usr/local/include/sqlite',
-- '/usr/local/include/sqlite3',
-- ]
-+ sqlite_inc_paths = []
- if cross_compiling:
- sqlite_inc_paths = []
- MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
-@@ -1769,7 +1728,6 @@
- # 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...
-- include_dirs.append('/usr/X11R6/include')
- frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-
- # All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1807,13 +1765,6 @@
- def detect_tkinter(self, inc_dirs, lib_dirs):
- # The _tkinter module.
-
-- # Rather than complicate the code below, detecting and building
-- # AquaTk is a separate method. Only one Tkinter will be built on
-- # Darwin - either AquaTk, if it is found, or X11 based Tk.
-- if (host_platform == 'darwin' and
-- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-- return
--
- # 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.
-@@ -1862,17 +1813,6 @@
- if host_platform == 'sunos5':
- include_dirs.append('/usr/openwin/include')
- added_lib_dirs.append('/usr/openwin/lib')
-- elif os.path.exists('/usr/X11R6/include'):
-- include_dirs.append('/usr/X11R6/include')
-- added_lib_dirs.append('/usr/X11R6/lib64')
-- added_lib_dirs.append('/usr/X11R6/lib')
-- elif os.path.exists('/usr/X11R5/include'):
-- include_dirs.append('/usr/X11R5/include')
-- added_lib_dirs.append('/usr/X11R5/lib')
-- else:
-- # Assume default location for X11
-- include_dirs.append('/usr/X11/include')
-- added_lib_dirs.append('/usr/X11/lib')
-
- # If Cygwin, then verify that X is installed before proceeding
- if host_platform == 'cygwin':
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131112/0786aeef/attachment-0001.html>
More information about the macports-changes
mailing list