[97951] trunk/dports/python/py-sip

[michaelld at macports.org]

Revision: 97951
          http://trac.macports.org//changeset/97951
Author:   michaelld at macports.org
Date:     2012-09-20 12:48:26 -0700 (Thu, 20 Sep 2012)
Log Message:
-----------
py-sip : upgrade to 4.13.3_0.

Modified Paths:
--------------
    trunk/dports/python/py-sip/Portfile
    trunk/dports/python/py-sip/files/patch-siputils.py.diff

Modified: trunk/dports/python/py-sip/Portfile
===================================================================
--- trunk/dports/python/py-sip/Portfile	2012-09-20 19:39:52 UTC (rev 97950)
+++ trunk/dports/python/py-sip/Portfile	2012-09-20 19:48:26 UTC (rev 97951)
@@ -5,8 +5,7 @@
 PortGroup           python 1.0
 
 name                py-sip
-version             4.13.2
-revision            3
+version             4.13.3
 python.versions     24 25 26 27 31 32
 python.default_version 24
 categories          python devel
@@ -34,8 +33,9 @@
 
     distname            sip-${version}
 
-    checksums           rmd160  24a8e7c4bd36382594ea3f11317eb0f10e4e56ea \
-                        sha256  4bc3f5353c75918e1c8499ec1474e7b3392c30513ea6d7a6334f88b88271eebf
+    checksums           rmd160  f7aed342017ee598b967f311ae9d0a0a799570c4 \
+                        sha256  ec295f71ef339c5b98db5650865f2c6c1200c4085b7a3f33f284111e1f534ac1
+
     patchfiles          patch-siputils.py.diff \
                         patch-specs_macx-g++.diff
 

Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-siputils.py.diff	2012-09-20 19:39:52 UTC (rev 97950)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff	2012-09-20 19:48:26 UTC (rev 97951)
@@ -1,5 +1,5 @@
---- siputils.py.orig	2012-09-03 21:19:45.000000000 -0400
-+++ siputils.py	2012-09-03 21:21:17.000000000 -0400
+--- siputils.py.orig	2012-09-05 10:09:24.000000000 -0400
++++ siputils.py	2012-09-05 12:00:52.000000000 -0400
 @@ -297,7 +297,7 @@
              # These require special handling as they are (potentially) a set of
              # space separated values rather than a single value that might
@@ -9,7 +9,7 @@
                  val = val.split()
  
              # We also want to treat lists of libraries in the same way so that
-@@ -601,6 +601,10 @@
+@@ -605,6 +605,10 @@
              libdir.extend(libdir_qt)
              rpaths.extend(libdir_qt)
  
@@ -17,19 +17,19 @@
 +            libdir.extend(frameworkdir_qt)
 +            rpaths.extend(frameworkdir_qt)
 +
-             if self.config.qt_version >= 0x040000:
+             if qt_version >= 0x040000:
                  # Try and read QT_LIBINFIX from qconfig.pri.
                  qconfig = os.path.join(mkspecs, "qconfig.pri")
-@@ -715,7 +719,7 @@
-                             if mod == "QtAssistant" and self.config.qt_version < 0x040202:
+@@ -719,7 +723,7 @@
+                             if mod == "QtAssistant" and qt_version < 0x040202:
                                  mod = "QtAssistantClient"
  
--                            incdir.append(os.path.join(libdir_qt[0], mod + ".framework", "Headers"))
-+                            incdir.append(os.path.join(frameworkdir_qt[0], mod + ".framework", "Headers"))
-                         else:
-                             incdir.append(os.path.join(qtincdir[0], mod))
+-                            incdir.append(os.path.join(libdir_qt[0],
++                            incdir.append(os.path.join(frameworkdir_qt[0],
+                                     mod + ".framework", "Headers"))
  
-@@ -771,7 +775,7 @@
+                             if qt_version >= 0x050000 and mod == "QtGui":
+@@ -788,7 +792,7 @@
      def _is_framework(self, mod):
          """Return true if the given Qt module is a framework.
          """
@@ -38,7 +38,7 @@
  
      def _qt4_module_to_lib(self, mname):
          """Return the name of the Qt4 library corresponding to a module.
-@@ -883,7 +887,7 @@
+@@ -900,7 +904,7 @@
          if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
              prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
          elif sys.platform == "darwin" and framework:
@@ -47,7 +47,7 @@
          else:
              prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
  
-@@ -1462,8 +1466,8 @@
+@@ -1485,8 +1489,8 @@
              # 'real_prefix' exists if virtualenv is being used.
              dl = getattr(sys, 'real_prefix', sys.exec_prefix).split(os.sep)
  
@@ -58,11 +58,10 @@
  
              self.LFLAGS.append("-undefined dynamic_lookup")
  
-@@ -2360,6 +2364,42 @@
+@@ -2383,6 +2387,40 @@
                  lhs = line[:assstart].strip()
                  rhs = line[assend + 1:].strip()
  
-+
 +#                print "lhs is", lhs
 +#                print "rhs is", rhs
 +
@@ -97,7 +96,6 @@
 +                            rhs = rhs[:s_pre_s] + orig_rhs
 +#                            print "new rhs is", rhs
 +
-+
                  # Remove the escapes for any quotes.
                  rhs = rhs.replace(r'\"', '"').replace(r"\'", "'")
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120920/11956cbb/attachment.html>