Ticket #21222: Portfile.diff

Portfile

@@ -43 +43 @@
                         patch-Mac-PythonLauncher-Makefile.in.diff \
                         patch-Mac-Tools-Doc-setup.py.diff \
                         patch-readlinefix.diff \
-                        patch-64bit.diff
+                        patch-64bit.diff \
+                        patch-universal-flags.diff
 
 depends_lib             port:gettext port:zlib port:openssl port:tk \
                         port:sqlite3 port:db46 port:ncurses port:gdbm \
@@ -130 +131 @@
    post-patch {
       set universal_arch_flags {}
       set arch_run_32bit {}
+      set archtype 0
       foreach arch ${universal_archs} {
          lappend universal_arch_flags -arch ${arch}
          if { ${arch}=="i386" || ${arch}=="ppc" } {
             lappend arch_run_32bit -${arch}
+            set archtype [expr ${archtype} | 32] 
+         } else {
+            set archtype [expr ${archtype} | 64]
          }
       }
-      reinplace \
-         "s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \
-         ${worksrcpath}/configure
+      
       if {${os.major} >= 9} {
          reinplace \
-            "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
-            ${worksrcpath}/configure
+          "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
+          ${worksrcpath}/configure
       }
+
+      if {${archtype} == 32} {
+         # Pure 32-bit build
+         configure.args-append '--with-universal-archs="32 bit"'
+      } else {
+         # 64-bit or mixed build
+         if {${archtype} == 64} {
+            configure.args-append '--with-universal-archs="64 bit"'
+         } else {
+            configure.args-append '--with-universal-archs="all"'
+         }
+         configure.args-append '--disable-toolbox-glue'
+           system "cd ${worksrcpath} && patch < ${filespath}/patch-Makefileprein.diff"
+      }
+   
+      configure.args-append \
+         --with-universal-arch-flags="${universal_arch_flags}"
    }
+
    if {${macosx_version} == "10.4" && ${os.arch} == "powerpc"} {
       configure.args-append   --enable-universalsdk=${developer_dir}/SDKs/MacOSX10.4u.sdk
    } else {
-      configure.args-append   --enable-universalsdk=/
+         configure.args-append   --enable-universalsdk=/
    }
 }