[95467] trunk/dports/devel

[blair at macports.org]

Revision: 95467
          https://trac.macports.org/changeset/95467
Author:   blair at macports.org
Date:     2012-07-13 12:02:37 -0700 (Fri, 13 Jul 2012)
Log Message:
-----------
ice{,33}-python*: replace mulitple reinplace calls with a single call.

Modified Paths:
--------------
    trunk/dports/devel/ice-python24/Portfile
    trunk/dports/devel/ice-python25/Portfile
    trunk/dports/devel/ice-python26/Portfile
    trunk/dports/devel/ice-python27/Portfile
    trunk/dports/devel/ice33-python25/Portfile
    trunk/dports/devel/ice33-python26/Portfile

Modified: trunk/dports/devel/ice-python24/Portfile
===================================================================
--- trunk/dports/devel/ice-python24/Portfile	2012-07-13 18:58:20 UTC (rev 95466)
+++ trunk/dports/devel/ice-python24/Portfile	2012-07-13 19:02:37 UTC (rev 95467)
@@ -49,8 +49,9 @@
 
     # Prevent name conflicts between libICE.* from xorg-libice and
     # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
-    reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules
-    reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules.Darwin
+    reinplace "s/-lIce /-lZeroCIce /" \
+        ${build.dir}/config/Make.rules \
+        ${build.dir}/config/Make.rules.Darwin
 }
 
 use_configure   no

Modified: trunk/dports/devel/ice-python25/Portfile
===================================================================
--- trunk/dports/devel/ice-python25/Portfile	2012-07-13 18:58:20 UTC (rev 95466)
+++ trunk/dports/devel/ice-python25/Portfile	2012-07-13 19:02:37 UTC (rev 95467)
@@ -50,8 +50,9 @@
 
     # Prevent name conflicts between libICE.* from xorg-libice and
     # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
-    reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules
-    reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules.Darwin
+    reinplace "s/-lIce /-lZeroCIce /" \
+        ${build.dir}/config/Make.rules \
+        ${build.dir}/config/Make.rules.Darwin
 }
 
 use_configure   no

Modified: trunk/dports/devel/ice-python26/Portfile
===================================================================
--- trunk/dports/devel/ice-python26/Portfile	2012-07-13 18:58:20 UTC (rev 95466)
+++ trunk/dports/devel/ice-python26/Portfile	2012-07-13 19:02:37 UTC (rev 95467)
@@ -50,8 +50,9 @@
 
     # Prevent name conflicts between libICE.* from xorg-libice and
     # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
-    reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules
-    reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules.Darwin
+    reinplace "s/-lIce /-lZeroCIce /" \
+        ${build.dir}/config/Make.rules \
+        ${build.dir}/config/Make.rules.Darwin
 }
 
 use_configure   no

Modified: trunk/dports/devel/ice-python27/Portfile
===================================================================
--- trunk/dports/devel/ice-python27/Portfile	2012-07-13 18:58:20 UTC (rev 95466)
+++ trunk/dports/devel/ice-python27/Portfile	2012-07-13 19:02:37 UTC (rev 95467)
@@ -50,8 +50,9 @@
 
     # Prevent name conflicts between libICE.* from xorg-libice and
     # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
-    reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules
-    reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules.Darwin
+    reinplace "s/-lIce /-lZeroCIce /" \
+        ${build.dir}/config/Make.rules \
+        ${build.dir}/config/Make.rules.Darwin
 }
 
 use_configure   no

Modified: trunk/dports/devel/ice33-python25/Portfile
===================================================================
--- trunk/dports/devel/ice33-python25/Portfile	2012-07-13 18:58:20 UTC (rev 95466)
+++ trunk/dports/devel/ice33-python25/Portfile	2012-07-13 19:02:37 UTC (rev 95467)
@@ -52,8 +52,7 @@
     # Prevent name conflicts between libICE.* from xorg-libice and
     # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
     reinplace "s/-lIce /-lZeroCIce /" \
-        ${workpath}/Ice-${version}/py/config/Make.rules
-    reinplace "s/-lIce /-lZeroCIce /" \
+        ${workpath}/Ice-${version}/py/config/Make.rules \
         ${workpath}/Ice-${version}/py/config/Make.rules.Darwin
 }
 

Modified: trunk/dports/devel/ice33-python26/Portfile
===================================================================
--- trunk/dports/devel/ice33-python26/Portfile	2012-07-13 18:58:20 UTC (rev 95466)
+++ trunk/dports/devel/ice33-python26/Portfile	2012-07-13 19:02:37 UTC (rev 95467)
@@ -52,8 +52,7 @@
     # Prevent name conflicts between libICE.* from xorg-libice and
     # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
     reinplace "s/-lIce /-lZeroCIce /" \
-        ${workpath}/Ice-${version}/py/config/Make.rules
-    reinplace "s/-lIce /-lZeroCIce /" \
+        ${workpath}/Ice-${version}/py/config/Make.rules \
         ${workpath}/Ice-${version}/py/config/Make.rules.Darwin
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120713/b199a5a6/attachment.html>