Ticket #29901: patch-Portfile.2.diff

Portfile

@@ -28 +28 @@
 
 worksrcdir      sendmail-${version}
 
+set arch_flags "${configure.cc_archflags}"
+post-patch {
+    file copy ${worksrcpath}/devtools/OS/Darwin.10.x \
+        ${worksrcpath}/devtools/Site/site.config.m4
+    reinplace "s|-DDARWIN=100000|-DDARWIN=${os.major}0000|" \
+        ${worksrcpath}/devtools/Site/site.config.m4
+    if [variant_isset universal] {
+    reinplace "s|\${Extra_CC_Flags}|${arch_flags}|" \
+        ${worksrcpath}/devtools/Site/site.config.m4
+    }
+}
+
 use_configure   no
 
-platform darwin 10 {
-                        pre-build {
-                                file copy ${worksrcpath}/devtools/OS/Darwin.9.x \
-                                        ${worksrcpath}/devtools/Site/site.config.m4
-                        }
-                        
-                }
-        
-
 build   {
                 system "cd ${worksrcpath}/${name} && \
                         ./Build -O ${worksrcpath}/macports"
@@ -46 +49 @@
                 close [open ${worksrcpath}/include/sm_os.h a]
 
                 system "cd ${worksrcpath}/macports/*/${name} && \
-                        ${configure.compiler} ${configure.cflags} \
+                        ${configure.compiler} ${configure.cflags} ${arch_flags}\
                         -fno-common -DNOT_SENDMAIL -Dsm_snprintf=snprintf \
                         -D_THREAD_SAFE -DBIND_8_COMPAT -DXP_MT \
                         -I${worksrcpath}/include \
@@ -61 +64 @@
 
                 set objects [join ${x} " "]
 
-                system "${configure.compiler} ${configure.cflags} -dynamiclib \
+                system "${configure.compiler} ${configure.cflags} ${arch_flags} -dynamiclib \
                         -install_name ${prefix}/lib/${name}.dylib \
                         -compatibility_version ${major_version} \
                         -current_version ${version} \
@@ -75 +78 @@
                                 "${destroot}${prefix}/include/"
                         file delete "${destroot}${prefix}/include/${name}/milter.h"
                 }
+
+variant universal {
+    set arch_flags "${configure.universal_cflags}"
+}