[47143] trunk/dports/math

[ram at macports.org]

Revision: 47143
          http://trac.macports.org/changeset/47143
Author:   ram at macports.org
Date:     2009-02-22 10:17:16 -0800 (Sun, 22 Feb 2009)
Log Message:
-----------
fftw-3/fftw-3-single: use muniversal PortGroup

Modified Paths:
--------------
    trunk/dports/math/fftw-3/Portfile
    trunk/dports/math/fftw-3-single/Portfile

Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile	2009-02-22 18:17:07 UTC (rev 47142)
+++ trunk/dports/math/fftw-3/Portfile	2009-02-22 18:17:16 UTC (rev 47143)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       muniversal 1.0
 
 name            fftw-3
 version         3.2.1
@@ -70,70 +71,6 @@
     configure.args-delete --disable-fortran
 }
 
-if {![info exists universal_archs]} {
-    set universal_archs {i386 x86_64 ppc ppc64}
-}
-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 {
-		foreach arch ${universal_archs} {
-			set my_arch_flag "-arch ${arch}"
-			set my_cflags "${configure.cflags} -isysroot ${sysroot} ${my_arch_flag}"
-			set my_ldflags "${configure.ldflags} ${my_arch_flag}"
-			system "cd ${workpath}/${arch} && CFLAGS=\"${my_cflags}\" CXXFLAGS=\"${my_cflags}\" LDFLAGS=\"${my_ldflags}\" ${configure.cmd} ${configure.pre_args} ${configure.args}"
-		}
-	}
-
-	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 {libfftw3.3.dylib libfftw3.a} {
-			set output_lib ${destroot}${prefix}/lib/${lib}
-			set lipo_args {}
-			foreach arch ${universal_archs} {
-				lappend lipo_args -arch ${arch} ${workpath}/${arch}/.libs/${lib}
-			}
-			lappend lipo_args -create -output ${output_lib}
-			delete ${output_lib}
-			system "lipo ${lipo_args}"
-		}
-
-		foreach lib {libfftw3_threads.3.dylib libfftw3_threads.a} {
-			set output_lib ${destroot}${prefix}/lib/${lib}
-			set lipo_args {}
-			foreach arch ${universal_archs} {
-				lappend lipo_args -arch ${arch} ${workpath}/${arch}/threads/.libs/${lib}
-			}
-			lappend lipo_args -create -output ${output_lib}
-			delete ${output_lib}
-			system "lipo ${lipo_args}"
-		}
-	}
-}
-
 livecheck.check regex
 livecheck.url   ${homepage}
 livecheck.regex {FFTW (\d+(?:\.\d+)*) is the latest}

Modified: trunk/dports/math/fftw-3-single/Portfile
===================================================================
--- trunk/dports/math/fftw-3-single/Portfile	2009-02-22 18:17:07 UTC (rev 47142)
+++ trunk/dports/math/fftw-3-single/Portfile	2009-02-22 18:17:16 UTC (rev 47143)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       muniversal 1.0
 
 name            fftw-3-single
 version         3.2.1
@@ -82,70 +83,6 @@
     configure.args-delete --disable-fortran
 }
 
-if {![info exists universal_archs]} {
-    set universal_archs {i386 x86_64 ppc ppc64}
-}
-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 {
-		foreach arch ${universal_archs} {
-			set my_arch_flag "-arch ${arch}"
-			set my_cflags "${configure.cflags} -isysroot ${sysroot} ${my_arch_flag}"
-			set my_ldflags "${configure.ldflags} ${my_arch_flag}"
-			system "cd ${workpath}/${arch} && CFLAGS=\"${my_cflags}\" CXXFLAGS=\"${my_cflags}\" LDFLAGS=\"${my_ldflags}\" ${configure.cmd} ${configure.pre_args} ${configure.args}"
-		}
-	}
-
-	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 {libfftw3f.3.dylib libfftw3f.a} {
-			set output_lib ${destroot}${prefix}/lib/${lib}
-			set lipo_args {}
-			foreach arch ${universal_archs} {
-				lappend lipo_args -arch ${arch} ${workpath}/${arch}/.libs/${lib}
-			}
-			lappend lipo_args -create -output ${output_lib}
-			delete ${output_lib}
-			system "lipo ${lipo_args}"
-		}
-
-		foreach lib {libfftw3f_threads.3.dylib libfftw3f_threads.a} {
-			set output_lib ${destroot}${prefix}/lib/${lib}
-			set lipo_args {}
-			foreach arch ${universal_archs} {
-				lappend lipo_args -arch ${arch} ${workpath}/${arch}/threads/.libs/${lib}
-			}
-			lappend lipo_args -create -output ${output_lib}
-			delete ${output_lib}
-			system "lipo ${lipo_args}"
-		}
-	}
-}
-
 post-destroot {
   file delete ${destroot}${prefix}/include/fftw3.f
   file delete ${destroot}${prefix}/include/fftw3.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090222/871e0b96/attachment.html>