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

[michaelld at macports.org]

Revision: 100393
          https://trac.macports.org/changeset/100393
Author:   michaelld at macports.org
Date:     2012-12-10 10:20:26 -0800 (Mon, 10 Dec 2012)
Log Message:
-----------
py-sip : upgrade to 4.14.2, which is required by PyQt4 4.9.6, which will address some tickets.  Fix master_sites to be just sourceforge.  Fix patchfile for configure.py to reflect their code changes.

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-12-10 18:15:16 UTC (rev 100392)
+++ trunk/dports/python/py-sip/Portfile	2012-12-10 18:20:26 UTC (rev 100393)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-sip
-version             4.14.1
+version             4.14.2
 python.versions     24 25 26 27 31 32 33
 python.default_version 24
 categories          python devel
@@ -25,16 +25,13 @@
 homepage            http://www.riverbankcomputing.co.uk/software/sip/intro
 
 if {$subport != $name} {
-    master_sites \
-        http://www.riverbankcomputing.com/static/Downloads/sip4/ \
-        http://gentoo.mirrors.easynews.com/linux/gentoo/distfiles/ \
-        http://gentoo.osuosl.org/distfiles/ \
-        http://www.gtlib.gatech.edu/pub/gentoo/distfiles/
 
+    master_sites        sourceforge:pyqt
+
     distname            sip-${version}
 
-    checksums           rmd160  08f5e15672ce3bc410b4d39fb7cdf2367f3a47d4 \
-                        sha256  cffd8a61dca229341b88e67f4b453e271c76fdb8b03b6986f82f12760127fad2
+    checksums           rmd160  e820a5fbde74bca4d43471fae9d469d38d5d91bc \
+                        sha256  1a9d3bf26c821f369c175f8e68946b79bc994da4f96e8f5ecff06e6ee7ac0528
     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-12-10 18:15:16 UTC (rev 100392)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff	2012-12-10 18:20:26 UTC (rev 100393)
@@ -1,5 +1,5 @@
---- siputils.py.orig	2012-09-05 10:09:24.000000000 -0400
-+++ siputils.py	2012-09-05 12:00:52.000000000 -0400
+--- siputils.py.orig	2012-12-10 09:50:57.000000000 -0500
++++ siputils.py	2012-12-10 09:56: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
@@ -9,7 +9,7 @@
                  val = val.split()
  
              # We also want to treat lists of libraries in the same way so that
-@@ -605,6 +605,10 @@
+@@ -608,6 +608,10 @@
              libdir.extend(libdir_qt)
              rpaths.extend(libdir_qt)
  
@@ -21,15 +21,15 @@
                  # Try and read QT_LIBINFIX from qconfig.pri.
                  qconfig = os.path.join(mkspecs, "qconfig.pri")
 @@ -719,7 +723,7 @@
+                         if mod == "QAxContainer":
+                             incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
+                         elif self._is_framework(mod):
+-                            idir = libdir_qt[0]
++                            idir = frameworkdir_qt[0]
+ 
                              if mod == "QtAssistant" and qt_version < 0x040202:
                                  mod = "QtAssistantClient"
- 
--                            incdir.append(os.path.join(libdir_qt[0],
-+                            incdir.append(os.path.join(frameworkdir_qt[0],
-                                     mod + ".framework", "Headers"))
- 
-                             if qt_version >= 0x050000 and mod == "QtGui":
-@@ -788,7 +792,7 @@
+@@ -805,7 +809,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.
-@@ -900,7 +904,7 @@
+@@ -919,7 +923,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")
  
-@@ -1485,8 +1489,8 @@
+@@ -1504,8 +1508,8 @@
              # 'real_prefix' exists if virtualenv is being used.
              dl = getattr(sys, 'real_prefix', sys.exec_prefix).split(os.sep)
  
@@ -58,7 +58,7 @@
  
              self.LFLAGS.append("-undefined dynamic_lookup")
  
-@@ -2383,6 +2387,40 @@
+@@ -2411,6 +2415,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/20121210/e2a01e5f/attachment-0001.html>