[90285] trunk/dports/python/py-readline

singingwolfboy at macports.org singingwolfboy at macports.org
Wed Feb 29 08:26:11 PST 2012


Revision: 90285
          http://trac.macports.org/changeset/90285
Author:   singingwolfboy at macports.org
Date:     2012-02-29 08:26:08 -0800 (Wed, 29 Feb 2012)
Log Message:
-----------
py-readline: update to 6.2.2

Modified Paths:
--------------
    trunk/dports/python/py-readline/Portfile
    trunk/dports/python/py-readline/files/build.sh.patch
    trunk/dports/python/py-readline/files/setup.py.patch

Modified: trunk/dports/python/py-readline/Portfile
===================================================================
--- trunk/dports/python/py-readline/Portfile	2012-02-29 15:54:02 UTC (rev 90284)
+++ trunk/dports/python/py-readline/Portfile	2012-02-29 16:26:08 UTC (rev 90285)
@@ -4,7 +4,7 @@
 PortGroup python 1.0
 
 name			py-readline
-version			6.2.1
+version			6.2.2
 platforms		darwin
 license			GPL-3+ PSF
 maintainers		nomaintainer
@@ -14,8 +14,8 @@
 homepage		http://www.python.org/
 master_sites	http://pypi.python.org/packages/source/r/readline/
 distname		readline-${version}
-checksums		md5 9604527863378512247fcaf938100797 \
-			sha256 2e789683f826e45e1580dddf814af6db0e00038e15ac641a36c365bf3f48ff5d
+checksums       md5     ad9d4a5a3af37d31daf36ea917b08c77 \
+                sha256  b9d30e8928530791944ab40c76aebcd4c8a7d6bc8cda05f3b521446fa3782b6d
 
 python.versions	24 25 26 27 31 32
 

Modified: trunk/dports/python/py-readline/files/build.sh.patch
===================================================================
--- trunk/dports/python/py-readline/files/build.sh.patch	2012-02-29 15:54:02 UTC (rev 90284)
+++ trunk/dports/python/py-readline/files/build.sh.patch	2012-02-29 16:26:08 UTC (rev 90285)
@@ -1,32 +1,39 @@
---- rl/build.sh.orig	2011-09-01 17:50:34.000000000 +1000
-+++ rl/build.sh	2011-11-07 14:02:32.000000000 +1100
-@@ -1,32 +1,6 @@
+--- rl/build.sh.orig	2012-02-29 10:57:06.000000000 -0500
++++ rl/build.sh	2012-02-29 10:57:42.000000000 -0500
+@@ -1,39 +1,6 @@
  #! /bin/bash
  set -e
  
--# If we are on Mac OS X, look for the latest SDK and do a universal build
+-# If we are on Mac OS X, do a universal build
 -if [ `uname` == "Darwin" ]; then
--  LATEST_SDK=''
--  for sdk_dir in /Developer/SDKs/*; do
--    LATEST_SDK=$sdk_dir
--  done
--  if [[ $LATEST_SDK == /Developer/SDKs/MacOSX10.4u.sdk ]]; then
--    # Check if we have an old gcc on Mac OS 10.4 (from XCode < 2.4) which did not support x86_64
--    gcc -arch x86_64 -v
--    if [ $? -eq 0 ]; then
--      export CFLAGS='-arch i386 -arch ppc -arch x86_64 -arch ppc64'
--      export LDFLAGS='-arch i386 -arch ppc -arch x86_64 -arch ppc64'
+-  # On older versions of Mac OS X, look for the latest SDK
+-  if [ -d /Developer ]; then
+-    LATEST_SDK=''
+-    for sdk_dir in /Developer/SDKs/*; do
+-      LATEST_SDK=$sdk_dir
+-    done
+-    if [[ $LATEST_SDK == /Developer/SDKs/MacOSX10.4u.sdk ]]; then
+-      # Check if we have an old gcc on Mac OS 10.4 (from XCode < 2.4) which did not support x86_64
+-      gcc -arch x86_64 -v
+-      if [ $? -eq 0 ]; then
+-        export CFLAGS='-arch i386 -arch ppc -arch x86_64 -arch ppc64'
+-        export LDFLAGS='-arch i386 -arch ppc -arch x86_64 -arch ppc64'
+-      else
+-        export CFLAGS='-arch i386 -arch ppc -arch ppc64'
+-        export LDFLAGS='-arch i386 -arch ppc -arch ppc64'
+-      fi
+-    elif [[ $LATEST_SDK == /Developer/SDKs/MacOSX10.5.sdk ]]; then
+-      export CFLAGS='-isysroot '${LATEST_SDK}' -arch i386 -arch ppc -arch x86_64 -arch ppc64'
+-      export LDFLAGS='-syslibroot,'${LATEST_SDK}' -arch i386 -arch ppc -arch x86_64 -arch ppc64'
 -    else
--      export CFLAGS='-arch i386 -arch ppc -arch ppc64'
--      export LDFLAGS='-arch i386 -arch ppc -arch ppc64'
+-      # Starting with 10.6 (Snow Leopard), only Intel architecture is supported
+-      export CFLAGS='-isysroot '${LATEST_SDK}' -arch i386 -arch x86_64'
+-      export LDFLAGS='-syslibroot,'${LATEST_SDK}' -arch i386 -arch x86_64'
 -    fi
--  elif [[ $LATEST_SDK == /Developer/SDKs/MacOSX10.5.sdk ]]; then
--    export CFLAGS='-isysroot '${LATEST_SDK}' -arch i386 -arch ppc -arch x86_64 -arch ppc64'
--    export LDFLAGS='-syslibroot,'${LATEST_SDK}' -arch i386 -arch ppc -arch x86_64 -arch ppc64'
 -  else
--    # Starting with 10.6 (Snow Leopard), only Intel architecture is supported
--    export CFLAGS='-isysroot '${LATEST_SDK}' -arch i386 -arch x86_64'
--    export LDFLAGS='-syslibroot,'${LATEST_SDK}' -arch i386 -arch x86_64'
+-    # Starting with 10.7 (Lion) and Xcode 4.3, the SDK is inside the Xcode.app - ignore it
+-    export CFLAGS='-arch i386 -arch x86_64'
+-    export LDFLAGS='-arch i386 -arch x86_64'
 -  fi
 -fi
 -

Modified: trunk/dports/python/py-readline/files/setup.py.patch
===================================================================
--- trunk/dports/python/py-readline/files/setup.py.patch	2012-02-29 15:54:02 UTC (rev 90284)
+++ trunk/dports/python/py-readline/files/setup.py.patch	2012-02-29 16:26:08 UTC (rev 90285)
@@ -1,6 +1,6 @@
---- setup.py.orig	2011-09-01 18:09:18.000000000 +1000
-+++ setup.py	2011-11-07 14:47:36.000000000 +1100
-@@ -30,18 +30,6 @@
+--- setup.py.orig	2012-02-29 10:59:12.000000000 -0500
++++ setup.py	2012-02-29 11:00:23.000000000 -0500
+@@ -30,21 +30,6 @@
      'Topic :: Software Development :: Libraries :: Python Modules',
  ]
  
@@ -12,14 +12,17 @@
 -    osx_version = platform.split('-')[1]
 -    if osx_version == '10.5':
 -        UNIVERSAL = '-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386 -arch ppc -arch x86_64 -arch ppc64'
--    elif osx_version > '10.5':
+-    elif osx_version == '10.6':
 -        # Starting with 10.6 (Snow Leopard), only Intel architecture is supported
--        UNIVERSAL = '-isysroot /Developer/SDKs/MacOSX%s.sdk -arch i386 -arch x86_64' % (osx_version,)
+-        UNIVERSAL = '-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64'
+-    elif osx_version > '10.6':
+-        # Starting with 10.7 (Lion) and Xcode 4.3, the developer sysroot is inside the Xcode.app - ignore it
+-        UNIVERSAL = '-arch i386 -arch x86_64'
 -
  # Since we have the latest readline (post 4.2), enable all readline functionality
  # These macros can be found in pyconfig.h.in in the main directory of the Python tarball
  DEFINE_MACROS = [
-@@ -88,6 +76,7 @@
+@@ -91,6 +76,7 @@
      maintainer_email="ludwig.schwardt at gmail.com; github at srid.name",
      url="http://github.com/ludwigschwardt/python-readline",
      license="GNU GPL",
@@ -27,7 +30,7 @@
      platforms=['MacOS X', 'Posix'],
      include_package_data=True,
      ext_modules=[
-@@ -95,8 +84,7 @@
+@@ -98,8 +84,7 @@
                    sources=["Modules/%s.x/readline.c" % (sys.version_info[0],)],
                    include_dirs=['.'],
                    define_macros=DEFINE_MACROS,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120229/ea0f9524/attachment.html>


More information about the macports-changes mailing list