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

[michaelld at macports.org]

Revision: 103721
          https://trac.macports.org/changeset/103721
Author:   michaelld at macports.org
Date:     2013-03-05 09:57:07 -0800 (Tue, 05 Mar 2013)
Log Message:
-----------
py*-sip : upgrade to 4.14.4.

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

Modified: trunk/dports/python/py-sip/Portfile
===================================================================
--- trunk/dports/python/py-sip/Portfile	2013-03-05 17:32:09 UTC (rev 103720)
+++ trunk/dports/python/py-sip/Portfile	2013-03-05 17:57:07 UTC (rev 103721)
@@ -5,8 +5,7 @@
 PortGroup           python 1.0
 
 name                py-sip
-version             4.14.3
-revision            1
+version             4.14.4
 python.versions     24 25 26 27 31 32 33
 python.default_version 24
 categories-append   devel
@@ -31,8 +30,9 @@
 
     distname            sip-${version}
 
-    checksums           rmd160  fd5b11da6c6652bf701961d24b9e6fb255bdb676 \
-                        sha256  a84fcaf0e400a45496fe70f0cf1adc7eddf0788ade44a4567d51db8bf1ff5770
+    checksums           rmd160  c5e19b64eee03d7f33891fa1f5171e484f98f6e2 \
+                        sha256  325f5933e8bac94e04c29a800f872073f8fcd20260477dca7039f45fb4935eb3
+
     patchfiles          patch-siputils.py.diff \
                         patch-specs_macx-g++.diff \
                         patch-configure.py.diff

Modified: trunk/dports/python/py-sip/files/patch-configure.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-configure.py.diff	2013-03-05 17:32:09 UTC (rev 103720)
+++ trunk/dports/python/py-sip/files/patch-configure.py.diff	2013-03-05 17:57:07 UTC (rev 103721)
@@ -1,6 +1,6 @@
---- configure.py.orig	2013-02-25 12:33:22.000000000 -0500
-+++ configure.py	2013-02-25 12:37:50.000000000 -0500
-@@ -531,7 +531,6 @@
+--- configure.py.orig	2013-03-01 16:12:44.000000000 -0500
++++ configure.py	2013-03-05 10:54:48.000000000 -0500
+@@ -541,7 +541,6 @@
          raise
      except:
          sys.stderr.write(

Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-siputils.py.diff	2013-03-05 17:32:09 UTC (rev 103720)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff	2013-03-05 17:57:07 UTC (rev 103721)
@@ -1,5 +1,5 @@
---- siputils.py.orig	2013-02-25 12:32:21.000000000 -0500
-+++ siputils.py	2013-02-25 12:35:49.000000000 -0500
+--- siputils.py.orig	2013-02-03 08:14:08.000000000 -0500
++++ siputils.py	2013-03-05 10:54:47.000000000 -0500
 @@ -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
@@ -26,7 +26,7 @@
              if qt_version >= 0x040000:
                  # Try and read QT_LIBINFIX from qconfig.pri.
                  qconfig = os.path.join(mkspecs, "qconfig.pri")
-@@ -724,7 +734,7 @@
+@@ -748,7 +758,7 @@
                          if mod == "QAxContainer":
                              incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
                          elif self._is_framework(mod):
@@ -35,16 +35,16 @@
  
                              if mod == "QtAssistant" and qt_version < 0x040202:
                                  mod = "QtAssistantClient"
-@@ -810,7 +820,7 @@
+@@ -834,7 +844,7 @@
      def _is_framework(self, mod):
          """Return true if the given Qt module is a framework.
          """
 -        return (self.config.qt_framework and (self.config.qt_version >= 0x040200 or mod != "QtAssistant"))
 +        return (self.config.qt_framework and (self.config.qt_version >= 0x040200 or mod != "QtAssistant") and (mod != "phonon"))
  
-     def _qt4_module_to_lib(self, mname):
-         """Return the name of the Qt4 library corresponding to a module.
-@@ -929,7 +939,7 @@
+     def _qt_module_to_lib(self, mname):
+         """Return the name of the Qt library corresponding to a module.
+@@ -962,7 +972,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:
@@ -53,7 +53,7 @@
          else:
              prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
  
-@@ -1520,8 +1530,8 @@
+@@ -1553,8 +1563,8 @@
              # Note that I can't remember why we need a framework build.
              dl = get_python_inc().split(os.sep)
  
@@ -64,7 +64,7 @@
  
              self.LFLAGS.append("-undefined dynamic_lookup")
  
-@@ -2427,6 +2437,40 @@
+@@ -2464,6 +2474,40 @@
                  lhs = line[:assstart].strip()
                  rhs = line[assend + 1:].strip()
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130305/0d51acd9/attachment.html>