[110026] trunk/dports/python/py-pyqwt/Portfile

[michaelld at macports.org]

Revision: 110026
          https://trac.macports.org/changeset/110026
Author:   michaelld at macports.org
Date:     2013-08-24 18:20:22 -0700 (Sat, 24 Aug 2013)
Log Message:
-----------
py*-pyqwt:
* remove reinplace to fix issue with SIP 4.15.0, since SIP is now at 4.15.1 which fixes the issue;
* combine multiple exact reinplaces into one;
* rev bump for changes.

Modified Paths:
--------------
    trunk/dports/python/py-pyqwt/Portfile

Modified: trunk/dports/python/py-pyqwt/Portfile
===================================================================
--- trunk/dports/python/py-pyqwt/Portfile	2013-08-25 01:17:45 UTC (rev 110025)
+++ trunk/dports/python/py-pyqwt/Portfile	2013-08-25 01:20:22 UTC (rev 110026)
@@ -6,7 +6,7 @@
 
 name                py-pyqwt
 version             5.2.0
-revision            6
+revision            7
 
 platforms           macosx
 categories-append   devel
@@ -59,12 +59,12 @@
 
         # fix compiler
 
-        reinplace "s at CC = .*@CC = ${configure.cc}@" ${worksrcpath}/qwt5qt4/Makefile
-        reinplace "s at CXX = .*@CXX = ${configure.cxx}@" ${worksrcpath}/qwt5qt4/Makefile
-        reinplace "s at LINK = .*@LINK = ${configure.cxx}@" ${worksrcpath}/qwt5qt4/Makefile
-        reinplace "s at CC = .*@CC = ${configure.cc}@" ${worksrcpath}/iqt5qt4/Makefile
-        reinplace "s at CXX = .*@CXX = ${configure.cxx}@" ${worksrcpath}/iqt5qt4/Makefile
-        reinplace "s at LINK = .*@LINK = ${configure.cxx}@" ${worksrcpath}/iqt5qt4/Makefile
+        reinplace "s at CC = .*@CC = ${configure.cc}@" \
+            ${worksrcpath}/qwt5qt4/Makefile ${worksrcpath}/iqt5qt4/Makefile
+        reinplace "s at CXX = .*@CXX = ${configure.cxx}@" \
+            ${worksrcpath}/qwt5qt4/Makefile ${worksrcpath}/iqt5qt4/Makefile
+        reinplace "s at LINK = .*@LINK = ${configure.cxx}@" \
+            ${worksrcpath}/qwt5qt4/Makefile ${worksrcpath}/iqt5qt4/Makefile
 
         # if not universal, try removing all arch flags from the
         # Makefiles.  If Python is installed as +universal, these will
@@ -75,22 +75,6 @@
             reinplace "s at -arch \[^ \]*@@g" ${worksrcpath}/qwt5qt4/Makefile
             reinplace "s at -arch \[^ \]*@@g" ${worksrcpath}/iqt5qt4/Makefile
         }
-
-        # fix issue with sip 4.15.0_0 which generates extra interface
-        # code for a hidden overloaded virtual function.
-
-        reinplace "s@\\(.*void.*move.const\\)@#if 0\\
-\\1 at 1" ${worksrcpath}/qwt5qt4/sipQwtQwtPlotZoomer.cpp
-
-        reinplace "s@\\(.*void.*move.const\\)@#if 0\\
-\\1 at 1" ${worksrcpath}/tmp-qwt5qt4/sipQwtQwtPlotZoomer.cpp
-
-        reinplace "s@\\(.*void.*append.const\\)@#endif\\
-\\1 at 1" ${worksrcpath}/qwt5qt4/sipQwtQwtPlotZoomer.cpp
-
-        reinplace "s@\\(.*void.*append.const\\)@#endif\\
-\\1 at 1" ${worksrcpath}/tmp-qwt5qt4/sipQwtQwtPlotZoomer.cpp
-
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130824/514b4566/attachment-0001.html>