Changeset 113224


Ignore:
Timestamp:
Nov 12, 2013, 8:57:39 PM (6 years ago)
Author:
jwa@…
Message:

python27: version bump to 2.7.6

Location:
trunk/dports/lang/python27
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/python27/Portfile

    r108762 r113224  
    88epoch               2
    99# Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
    10 version             2.7.5
    11 revision            1
     10version             2.7.6
    1211
    1312set major           [lindex [split $version .] 0]
     
    2928use_xz                          yes
    3029
    31 checksums           md5 5eea8462f69ab1369d32f9c4cd6272ab \
    32                     rmd160 baa7ad7d82cb4dc0a70b6a7aded43b7b78b0067e \
    33                     sha256 f33c4cab167dc69e10962e1cebf1c0768e2d0e8575648130c20e6bda84551db1
     30checksums           rmd160  8efc73a01a466d8fa16c5c1734c89be79c2c538a \
     31                    sha256  1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1
    3432
    3533patchfiles          patch-Makefile.pre.in.diff \
     
    5149depends_run         port:python_select
    5250
     51# disable-ipv6 for now, getaddrinfo-function missing
    5352configure.args      --enable-framework=${frameworks_dir} \
    5453                    --enable-ipv6
     
    7372    reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \
    7473        ${worksrcpath}/Mac/PythonLauncher/Makefile.in
     74}
     75
     76post-configure {
     77    reinplace "s;/* #undef PY_FORMAT_LONG_LONG */;#define PY_FORMAT_LONG_LONG \"ll\";" pyconfig.h
    7578}
    7679
  • trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff

    r106224 r113224  
    1 --- Makefile.pre.in.orig        2013-05-12 13:32:49.000000000 +1000
    2 +++ Makefile.pre.in     2013-05-20 03:10:14.000000000 +1000
    3 @@ -456,7 +456,7 @@
    4             *) quiet="";; \
     1--- Makefile.pre.in.orig        2013-11-11 10:06:36.000000000 +0200
     2+++ Makefile.pre.in     2013-11-11 10:08:02.000000000 +0200
     3@@ -461,7 +461,7 @@
    54        esac; \
    65        $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
     6                _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
    77-               $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
    8 +               $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet --no-user-cfg build
     8+               $(PYTHON_FOR_BUILD) $(srcdir)/setup.py --no-user-cfg $$quiet build
    99 
    1010 # Build static library
    1111 # avoid long command lines, same as LIBRARY_OBJS
    12 @@ -1133,7 +1133,7 @@
     12@@ -1138,7 +1138,7 @@
    1313 # Install the dynamically loadable modules
    1414 # This goes into $(exec_prefix)
     
    1919                --install-scripts=$(BINDIR) \
    2020                --install-platlib=$(DESTSHARED) \
    21 @@ -1207,7 +1207,7 @@
     21@@ -1212,7 +1212,7 @@
    2222 # This installs a few of the useful scripts in Tools/scripts
    2323 scriptsinstall:
  • trunk/dports/lang/python27/files/patch-libedit.diff

    r106224 r113224  
    158158 #ifdef HAVE_RL_COMPLETION_MATCHES
    159159 #define completion_matches(x, y) \
    160 @@ -562,14 +561,13 @@ get_history_item(PyObject *self, PyObjec
    161           * difference.
    162           */
    163          int length = _py_get_history_length();
    164 -        idx --;
    165  
    166          /*
    167           * Apple's readline emulation crashes when
    168           * the index is out of range, therefore
    169           * test for that and fail gracefully.
    170           */
    171 -        if (idx < 0 || idx >= length) {
    172 +        if (idx < 1 || idx > length) {
    173              Py_RETURN_NONE;
    174          }
    175      }
    176 @@ -1088,15 +1086,6 @@ call_readline(FILE *sys_stdin, FILE *sys
    177          const char *line;
    178          int length = _py_get_history_length();
    179          if (length > 0)
    180 -#ifdef __APPLE__
    181 -            if (using_libedit_emulation) {
    182 -                /*
    183 -                 * Libedit's emulation uses 0-based indexes,
    184 -                 * the real readline uses 1-based indexes.
    185 -                 */
    186 -                line = history_get(length - 1)->line;
    187 -            } else
    188 -#endif /* __APPLE__ */
    189              line = history_get(length)->line;
    190          else
    191              line = "";
  • trunk/dports/lang/python27/files/patch-setup.py.diff

    r106224 r113224  
    1 --- setup.py.orig       2013-05-12 13:32:54.000000000 +1000
    2 +++ setup.py    2013-05-20 03:33:30.000000000 +1000
    3 @@ -436,9 +436,6 @@
     1--- setup.py.orig       2013-11-12 12:57:03.000000000 +0200
     2+++ setup.py    2013-11-12 13:03:25.000000000 +0200
     3@@ -436,10 +436,6 @@
    44             os.unlink(tmpfile)
    55 
    66     def detect_modules(self):
    77-        # Ensure that /usr/local is always used
    8 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
    9 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
    10          self.add_gcc_paths()
     8-        if not cross_compiling:
     9-            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
     10-            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
     11         if cross_compiling:
     12             self.add_gcc_paths()
    1113         self.add_multiarch_paths()
    12  
    13 @@ -782,10 +779,7 @@
     14@@ -784,10 +780,7 @@
    1415                                depends=['socketmodule.h'],
    1516                                libraries=math_libs) )
     
    2324                              search_for_ssl_incs_in
    2425                              )
    25 @@ -795,9 +789,7 @@
     26@@ -797,9 +790,7 @@
    2627             if krb5_h:
    2728                 ssl_incs += krb5_h
     
    3435         if (ssl_incs is not None and
    3536             ssl_libs is not None):
    36 @@ -918,34 +910,7 @@
     37@@ -920,34 +911,7 @@
    3738 
    3839         # construct a list of paths to look for the header file in on
     
    7071         if cross_compiling:
    7172             db_inc_paths = []
    72 @@ -1091,13 +1056,7 @@
    73          # We hunt for #define SQLITE_VERSION "n.n.n"
    74          # We need to find >= sqlite version 3.0.8
    75          sqlite_incdir = sqlite_libdir = None
    76 -        sqlite_inc_paths = [ '/usr/include',
    77 -                             '/usr/include/sqlite',
    78 -                             '/usr/include/sqlite3',
    79 -                             '/usr/local/include',
    80 -                             '/usr/local/include/sqlite',
    81 -                             '/usr/local/include/sqlite3',
    82 -                           ]
    83 +        sqlite_inc_paths = []
    84          if cross_compiling:
    85              sqlite_inc_paths = []
    86          MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
    87 @@ -1769,7 +1728,6 @@
    88          # For 8.4a2, the X11 headers are not included. Rather than include a
    89          # complicated search, this is a hard-coded path. It could bail out
    90          # if X11 libs are not found...
    91 -        include_dirs.append('/usr/X11R6/include')
    92          frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
    93  
    94          # All existing framework builds of Tcl/Tk don't support 64-bit
    95 @@ -1807,13 +1765,6 @@
    96      def detect_tkinter(self, inc_dirs, lib_dirs):
    97          # The _tkinter module.
    98  
    99 -        # Rather than complicate the code below, detecting and building
    100 -        # AquaTk is a separate method. Only one Tkinter will be built on
    101 -        # Darwin - either AquaTk, if it is found, or X11 based Tk.
    102 -        if (host_platform == 'darwin' and
    103 -            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
    104 -            return
    105 -
    106          # Assume we haven't found any of the libraries or include files
    107          # The versions with dots are used on Unix, and the versions without
    108          # dots on Windows, for detection by cygwin.
    109 @@ -1862,17 +1813,6 @@
    110          if host_platform == 'sunos5':
    111              include_dirs.append('/usr/openwin/include')
    112              added_lib_dirs.append('/usr/openwin/lib')
    113 -        elif os.path.exists('/usr/X11R6/include'):
    114 -            include_dirs.append('/usr/X11R6/include')
    115 -            added_lib_dirs.append('/usr/X11R6/lib64')
    116 -            added_lib_dirs.append('/usr/X11R6/lib')
    117 -        elif os.path.exists('/usr/X11R5/include'):
    118 -            include_dirs.append('/usr/X11R5/include')
    119 -            added_lib_dirs.append('/usr/X11R5/lib')
    120 -        else:
    121 -            # Assume default location for X11
    122 -            include_dirs.append('/usr/X11/include')
    123 -            added_lib_dirs.append('/usr/X11/lib')
    124  
    125          # If Cygwin, then verify that X is installed before proceeding
    126          if host_platform == 'cygwin':
Note: See TracChangeset for help on using the changeset viewer.