[45970] trunk/dports/graphics/cairo/Portfile

[ryandesign at macports.org]

Revision: 45970
          http://trac.macports.org/changeset/45970
Author:   ryandesign at macports.org
Date:     2009-01-25 23:09:26 -0800 (Sun, 25 Jan 2009)
Log Message:
-----------
cairo: use muniversal portgroup for universal build; see #15570

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

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2009-01-26 06:52:09 UTC (rev 45969)
+++ trunk/dports/graphics/cairo/Portfile	2009-01-26 07:09:26 UTC (rev 45970)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               muniversal 1.0
 
 name                    cairo
 set my_name             cairo
@@ -52,8 +53,6 @@
     }
 }
 
-# The +universal variant is written in such a way that the port's global
-# configure.args must not be empty!
 configure.args \
     --disable-glitz \
     --disable-quartz \
@@ -139,63 +138,6 @@
     }
 }
 
-if {![info exists universal_archs]} {
-    set universal_archs {i386 ppc}
-}
-set first_arch [lindex ${universal_archs} 0]
-
-set my_worksrcpaths ${worksrcpath}
-
-variant universal {
-    set my_worksrcpaths {}
-    foreach arch ${universal_archs} {
-        lappend my_worksrcpaths ${workpath}/${arch}
-    }
-
-    post-patch {
-        foreach arch ${universal_archs} {
-            if {[string equal ${arch} ${first_arch}]} {
-                move ${worksrcpath} ${workpath}/${first_arch}
-            } else {
-                copy ${workpath}/${first_arch} ${workpath}/${arch}
-            }
-        }
-    }
-    
-    configure {
-        # Save configure.universal_archs because we modify it before each
-        # invocation of Configure.
-        set tmp_universal_archs ${configure.universal_archs}
-        foreach arch ${universal_archs} {
-            # We configure for one arch at a time.
-            configure.universal_archs ${arch}
-            system "cd ${workpath}/${arch} && CPPFLAGS=\"${configure.cppflags} ${configure.universal_cppflags}\" CFLAGS=\"${configure.cflags} ${configure.universal_cflags}\" CXXFLAGS=\"${configure.cflags} ${configure.universal_cxxflags}\" LDFLAGS=\"${configure.ldflags} ${configure.universal_ldflags}\" ${configure.cmd} ${configure.pre_args} ${configure.args} ${configure.universal_args}"
-        }
-        # Restore configure.universal_archs.
-        configure.universal_archs $tmp_universal_archs
-    }
-    
-    build {
-        foreach arch ${universal_archs} {
-            system "cd ${workpath}/${arch} && ${build.cmd} ${build.pre_args}"
-        }
-    }
-    
-    destroot {
-        system "cd ${workpath}/${first_arch} && ${destroot.cmd} ${destroot.pre_args} ${destroot.post_args}"
-        foreach lib [list [file readlink ${workpath}/${first_arch}/src/.libs/libcairo.dylib] libcairo.a] {
-            set output_lib ${destroot}${prefix}/lib/${lib}
-            set lipo_args {}
-            foreach arch ${universal_archs} {
-                lappend lipo_args -arch ${arch} ${workpath}/${arch}/src/.libs/${lib}
-            }
-            lappend lipo_args -create -output ${output_lib}
-            delete ${output_lib}
-            system "lipo ${lipo_args}"
-        }
-    }
-}
-
 test.run                yes
 test.target             check
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090125/334ff9fe/attachment-0001.html>