[145851] trunk/dports/lang/python27/Portfile

[eborisch at macports.org]

Revision: 145851
          https://trac.macports.org/changeset/145851
Author:   eborisch at macports.org
Date:     2016-02-18 21:37:21 -0800 (Thu, 18 Feb 2016)
Log Message:
-----------
python27: See ticket #48807. Moving to readline until interaction with libedit is resolved.

Modified Paths:
--------------
    trunk/dports/lang/python27/Portfile

Modified: trunk/dports/lang/python27/Portfile
===================================================================
--- trunk/dports/lang/python27/Portfile	2016-02-19 05:07:52 UTC (rev 145850)
+++ trunk/dports/lang/python27/Portfile	2016-02-19 05:37:21 UTC (rev 145851)
@@ -8,6 +8,7 @@
 epoch               2
 # Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
 version             2.7.11
+revision            1
 
 set major           [lindex [split $version .] 0]
 set branch          [join [lrange [split ${version} .] 0 1] .]
@@ -36,7 +37,6 @@
                     patch-Lib-cgi.py.diff \
                     patch-Lib-ctypes-macholib-dyld.py.diff \
                     patch-configure.diff \
-                    patch-libedit.diff \
                     patch-Include-pyport.h.diff \
                     omit-local-site-packages.patch
 
@@ -47,7 +47,8 @@
                     port:db48 \
                     port:ncurses \
                     port:bzip2 \
-                    port:libedit
+                    port:libedit \
+                    port:readline
 depends_run         port:python_select \
                     port:python2_select
 
@@ -133,11 +134,18 @@
 }
 
 variant readline description {Use readline instead of libedit} {
-    patchfiles-delete       patch-libedit.diff
-    depends_lib-append      port:readline
+# Building with readline by default for now. See:
+# https://trac.macports.org/ticket/48807
+#    patchfiles-delete       patch-libedit.diff
+#    depends_lib-append      port:readline
     depends_lib-delete      port:libedit
 }
 
+variant libedit description {Use libedit instead of readline} {
+    patchfiles-append       patch-libedit.diff
+    depends_lib-delete      port:readline
+}
+
 variant universal {
     # This patch will need updating when 2.7.6 is released, as ARCH_RUN_32BIT
     # will once again be used for something. See ticket #39270.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160218/b0e9eb42/attachment.html>