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

[phw at macports.org]

Revision: 88810
          http://trac.macports.org/changeset/88810
Author:   phw at macports.org
Date:     2012-01-12 06:52:34 -0800 (Thu, 12 Jan 2012)
Log Message:
-----------
port update:py-sip

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-01-12 12:05:50 UTC (rev 88809)
+++ trunk/dports/python/py-sip/Portfile	2012-01-12 14:52:34 UTC (rev 88810)
@@ -5,10 +5,10 @@
 PortGroup           python 1.0
 
 name                py-sip
-version             4.12.4
-revision            2
-python.versions     24 25 26 27 31
-# must default to version 24
+version             4.13.1
+revision            0
+python.versions     24 25 26 27 31 32
+python.default_version 24
 categories          python devel
 maintainers         nomaintainer
 license             {GPL-2 GPL-3 PSF}
@@ -33,9 +33,10 @@
         http://www.gtlib.gatech.edu/pub/gentoo/distfiles/
 
     distname            sip-${version}
-    checksums           rmd160  174150da3513e2e240bd443551af0dfc765dac27 \
-                        sha256  768c1f0ae7ccdc2a75cb4ca6dfd22a46832e06b3c96b1f0e8d3e955cbec047b3
 
+    checksums           rmd160  39b0dd321ea8f39af656c3f764440cbd5727467d \
+                        sha256  ee8b2465dbe756608326cc9a2cbcd8b98773743bdc59984ed082bddf19a0b226
+
     patchfiles          patch-siputils.py.diff
 
     use_configure       yes

Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-siputils.py.diff	2012-01-12 12:05:50 UTC (rev 88809)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff	2012-01-12 14:52:34 UTC (rev 88810)
@@ -1,20 +1,21 @@
---- siputils.py.orig	2010-09-03 03:26:37.000000000 +1000
-+++ siputils.py	2010-10-31 02:55:12.000000000 +1100
-@@ -1415,8 +1415,8 @@
+--- siputils.py.orig	2012-01-12 15:29:07.000000000 +0100
++++ siputils.py	2012-01-12 15:34:31.000000000 +0100
+@@ -1462,8 +1462,8 @@
              # 'real_prefix' exists if virtualenv is being used.
              dl = getattr(sys, 'real_prefix', sys.exec_prefix).split(os.sep)
  
 -            if "Python.framework" not in dl:
 -                error("SIP requires Python to be built as a framework")
-+            #if "Python.framework" not in dl:
-+            #    error("SIP requires Python to be built as a framework")
++#            if "Python.framework" not in dl:
++#                error("SIP requires Python to be built as a framework")
  
              self.LFLAGS.append("-undefined dynamic_lookup")
  
-@@ -2319,18 +2319,54 @@
+@@ -2360,6 +2360,42 @@
                  lhs = line[:assstart].strip()
                  rhs = line[assend + 1:].strip()
  
++
 +#                print "lhs is", lhs
 +#                print "rhs is", rhs
 +
@@ -48,22 +49,8 @@
 +                        if orig_rhs is not None:
 +                            rhs = rhs[:s_pre_s] + orig_rhs
 +#                            print "new rhs is", rhs
++
++
                  # Remove the escapes for any quotes.
                  rhs = rhs.replace(r'\"', '"').replace(r"\'", "'")
--
-                 if adding and rhs != "":
-                     orig_rhs = raw.get(lhs)
-                     if orig_rhs is not None:
-                         rhs = orig_rhs + " " + rhs
-+#                        print "new rhs is", rhs
  
-                 raw[lhs] = rhs
-+#                print "added lhs = ", lhs, ", rhs = ", rhs
- 
-         line = f.readline()
- 
-+#    print "raw is", raw
-+
-     # Go through the raw dictionary extracting the macros we need and
-     # resolving any macro expansions.  First of all, make sure every macro has
-     # a value.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120112/ba998526/attachment.html>