[70290] trunk/dports/graphics/gd2/Portfile

[ryandesign at macports.org]

Revision: 70290
          http://trac.macports.org/changeset/70290
Author:   ryandesign at macports.org
Date:     2010-08-05 01:19:06 -0700 (Thu, 05 Aug 2010)
Log Message:
-----------
gd2: always remove -arch flags from gdlib-config, and don't destroy the script when building universal; see #25946

Modified Paths:
--------------
    trunk/dports/graphics/gd2/Portfile

Modified: trunk/dports/graphics/gd2/Portfile
===================================================================
--- trunk/dports/graphics/gd2/Portfile	2010-08-05 07:00:01 UTC (rev 70289)
+++ trunk/dports/graphics/gd2/Portfile	2010-08-05 08:19:06 UTC (rev 70290)
@@ -6,7 +6,7 @@
 
 name                        gd2
 version                     2.0.35
-revision                    7
+revision                    8
 categories                  graphics
 maintainers                 ryandesign
 license                     gd
@@ -66,15 +66,19 @@
 
 use_autoreconf              yes
 
-post-build {
+post-configure {
     if {[variant_isset universal]} {
-       foreach arch ${universal_archs_to_use} {
-           reinplace "s| ${configure.universal_ldflags}||" \
-               ${worksrcpath}-${arch}/config/gdlib-config
-           reinplace "s| [muniversal_get_arch_flag ${arch}]||" \
-               ${worksrcpath}-${arch}/config/gdlib-config
-       }
+        set dirs {}
+        foreach arch ${universal_archs_to_use} {
+            lappend dirs ${worksrcpath}-${arch}
+        }
+    } else {
+        set dirs ${worksrcpath}
     }
+    foreach dir ${dirs} {
+        reinplace -E {s|-arch [a-z0-9_]+||g} \
+            ${dir}/config/gdlib-config
+    }
 }
 
 if {![variant_isset no_x11]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100805/679ef817/attachment-0001.html>