[112456] trunk/dports/lang/python34
jwa at macports.org
jwa at macports.org
Wed Oct 23 12:27:20 PDT 2013
Revision: 112456
https://trac.macports.org/changeset/112456
Author: jwa at macports.org
Date: 2013-10-23 12:27:20 -0700 (Wed, 23 Oct 2013)
Log Message:
-----------
python34: version bump to 3.4.0a4, the last alpha
Modified Paths:
--------------
trunk/dports/lang/python34/Portfile
trunk/dports/lang/python34/files/patch-libedit.diff
Modified: trunk/dports/lang/python34/Portfile
===================================================================
--- trunk/dports/lang/python34/Portfile 2013-10-23 18:08:02 UTC (rev 112455)
+++ trunk/dports/lang/python34/Portfile 2013-10-23 19:27:20 UTC (rev 112456)
@@ -7,8 +7,8 @@
name python34
# Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
-version 3.4.0a1
-epoch 20130806
+version 3.4.0a4
+epoch 20131020
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
@@ -29,8 +29,8 @@
use_xz yes
-checksums rmd160 45381ef97fa1a812bd4b217f17d527e64bbf2731 \
- sha256 9b1a1ef0abbce33bd84e750624ae3a733179530f5e41d6213faea10a17b48fdf
+checksums rmd160 20d105639c23869b7abab051f70e300a237ec1ca \
+ sha256 882c08c6482473bc947133a070485bce64bbc43ca27c7008cd293561faf2d193
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
Modified: trunk/dports/lang/python34/files/patch-libedit.diff
===================================================================
--- trunk/dports/lang/python34/files/patch-libedit.diff 2013-10-23 18:08:02 UTC (rev 112455)
+++ trunk/dports/lang/python34/files/patch-libedit.diff 2013-10-23 19:27:20 UTC (rev 112456)
@@ -1,6 +1,6 @@
---- configure.orig 2012-08-13 17:14:16.000000000 +0300
-+++ configure 2012-08-13 17:21:44.000000000 +0300
-@@ -13725,9 +13725,9 @@
+--- configure.orig 2013-10-23 21:50:49.000000000 +0300
++++ configure 2013-10-23 22:03:14.000000000 +0300
+@@ -13882,9 +13882,9 @@
$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
-@@ -13771,13 +13771,13 @@
+@@ -13928,13 +13928,13 @@
fi
# check for readline 2.1
@@ -29,7 +29,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13817,7 +13817,7 @@
+@@ -13974,7 +13974,7 @@
# 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
-@@ -13830,7 +13830,7 @@
+@@ -13987,7 +13987,7 @@
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 |
-@@ -13843,7 +13843,7 @@
+@@ -14000,7 +14000,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -56,7 +56,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -13857,13 +13857,13 @@
+@@ -14014,13 +14014,13 @@
fi
# check for readline 4.0
@@ -73,7 +73,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13901,13 +13901,13 @@
+@@ -14058,13 +14058,13 @@
# also in 4.0
@@ -90,7 +90,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13945,13 +13945,13 @@
+@@ -14102,13 +14102,13 @@
# check for readline 4.2
@@ -107,7 +107,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13991,7 +13991,7 @@
+@@ -14148,7 +14148,7 @@
# 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
-@@ -14004,7 +14004,7 @@
+@@ -14161,7 +14161,7 @@
then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -125,9 +125,9 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
---- setup.py.orig 2012-08-13 17:24:39.000000000 +0300
-+++ setup.py 2012-08-13 17:25:59.000000000 +0300
-@@ -659,7 +659,7 @@
+--- 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']) )
# readline
@@ -136,7 +136,7 @@
readline_termcap_library = ""
curses_library = ""
# Cannot use os.popen here in py3k.
-@@ -723,7 +723,7 @@
+@@ -710,7 +710,7 @@
else:
readline_extra_link_args = ()
@@ -145,9 +145,9 @@
if readline_termcap_library:
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
---- Modules/readline.c.orig 2012-08-13 17:27:11.000000000 +0300
-+++ Modules/readline.c 2012-08-13 17:30:18.000000000 +0300
-@@ -28,8 +28,7 @@
+--- Modules/readline.c.orig 2013-10-23 21:51:09.000000000 +0300
++++ Modules/readline.c 2013-10-23 22:10:09.000000000 +0300
+@@ -29,8 +29,7 @@
/* GNU readline definitions */
#undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
@@ -157,43 +157,3 @@
#ifdef HAVE_RL_COMPLETION_MATCHES
#define completion_matches(x, y) \
-@@ -574,14 +573,13 @@
- * 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;
- }
- }
-@@ -1002,7 +1000,6 @@
- PyEval_SaveThread();
- #endif
- if (s < 0) {
-- rl_free_line_state();
- rl_cleanup_after_signal();
- rl_callback_handler_remove();
- *signal = 1;
-@@ -1101,15 +1098,6 @@
- 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 = (const char *)history_get(length - 1)->line;
-- } else
--#endif /* __APPLE__ */
- line = (const char *)history_get(length)->line;
- else
- line = "";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131023/3ef79797/attachment.html>
More information about the macports-changes
mailing list