Ticket #39635: muniversal-botan-patch.diff

Portfile

@@ -1 +1 @@
 # $Id: Portfile 106660 2013-06-03 20:52:10Z raimue@macports.org $
 
 PortSystem 1.0
+PortGroup muniversal 1.0
 
 name                botan
 version             1.10.5
@@ -34 +35 @@
 
 platform darwin { configure.args-append --os=darwin }
 
+if {![variant_isset universal]} {
 if {[info exists build_arch] && ${os.platform} == "darwin"} {
     if {(${build_arch} == "i386")} {
         configure.args-append --cpu=ia32
@@ -51 +53 @@
 } else {
     build.args CXX="${configure.cxx}"
 }
+} else {
+    # botan way of setting cpu type in build phase
+    array set merger_configure_args {
+        ppc     --cpu=ppc
+        i386    --cpu=ia32
+        ppc64   --cpu=ppc64
+        x86_64  --cpu=amd64
+    }
+
+    # the arch flag is lost in the build phase, so put it back
+    foreach arch ${configure.universal_archs} {
+        lappend merger_build_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
+    }
+}
 
-universal_variant   no
+# configure.py rejects this argument
+configure.universal_args-delete --disable-dependency-tracking
 
 livecheck.regex     "(?i)<title>botan (1.*.*)</title>"