--- Portfile.orig	2009-09-05 19:57:47.000000000 -0700
+++ Portfile	2009-09-07 01:38:29.000000000 -0700
@@ -54,6 +54,15 @@
 configure.cppflags
 configure.ldflags
 
+################################################################################
+# We do not want flags of any kind -- QT is smart enough to set up its own.    #
+################################################################################
+
+configure.universal_cflags
+configure.universal_cppflags
+configure.universal_cxxflags
+configure.universal_ldflags
+
 set dirname qt4-mac
 set qt_dir ${prefix}/libexec/${dirname}
 
@@ -78,7 +87,8 @@
     -system-sqlite                                        \
     -openssl-linked                                       \
     -dbus-linked                                          \
-    -L${prefix}/lib
+    -L${prefix}/lib                                       \
+    -arch            \"${build_arch}\"
 
 lappend cpath        ${prefix}/include
 lappend library_path ${prefix}/lib
@@ -114,7 +124,7 @@
 
     lappend cpath        ${prefix}/include/mysql5/mysql
     lappend library_path ${prefix}/lib/mysql5/mysql
-    
+
     configure.args-delete -no-sql-mysql
 }
 
@@ -224,13 +234,8 @@
 
 variant universal {
     configure.universal_args-delete --disable-dependency-tracking
-    foreach arch ${universal_archs} {
-        if { ${arch}=="i386" } {
-            configure.args-append -arch x86
-        } else {
-            configure.args-append -arch ${arch}
-        }
-    }
+    configure.args-delete -arch            \"${build_arch}\"
+    configure.args-append -arch            \"${universal_archs}\"
     if {[info exists universal_sysroot]} {
         configure.args-append -sdk ${universal_sysroot}
     }