Changeset 79776

Timestamp:

06/25/11 06:57:17 (4 years ago)

Author:

dluke@…

Message:

• Fix universal build (#29901 - thanks to pixilla)
• whitespace cleanup

File:

• trunk/dports/mail/libmilter/Portfile (modified) (6 diffs)

trunk/dports/mail/libmilter/Portfile

@@ -1 +1 @@
 # $Id$
-
 PortSystem 1.0
 
-name                    libmilter
+name                    libmilter
 set major_version       8.14
-version                 ${major_version}.5
-categories              mail
-maintainers             geeklair.net:dluke
+version                 ${major_version}.5
+categories              mail
+maintainers             geeklair.net:dluke
 platforms               darwin
-description             libmilter library from Sendmail
+description             libmilter library from Sendmail
 long_description        Sendmail's Content Management API (milter) provides \
                         third-party programs to access mail messages as they \
@@ -19 +18 @@
                         configuration file
 
-homepage        http://www.sendmail.org/doc/sendmail-current/libmilter/docs/
-master_sites    ftp://ftp.sendmail.org/pub/sendmail/
-distname        sendmail.${version}
+homepage                http://www.sendmail.org/doc/sendmail-current/libmilter/docs/
+master_sites            ftp://ftp.sendmail.org/pub/sendmail/
+distname                sendmail.${version}
 
 checksums       md5     02ccfc331cc81ed00ec8bb5ecfc69018 \
@@ -29 +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   {
@@ -47 +49 @@
 
                 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 \
@@ -54 +56 @@
                 
                 set x {}
-                fs-traverse object ${worksrcpath}/macports {
-                        if {[file isfile ${object}] && [regexp ".o$" ${object}]} {
-                                lappend x ${object}
-                        }
-                }
+                fs-traverse object ${worksrcpath}/macports {
+                        if {[file isfile ${object}] && [regexp ".o$" ${object}]} {
+                                lappend x ${object}
+                        }
+                }
 
                 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} \
@@ -76 +78 @@
                         file delete "${destroot}${prefix}/include/${name}/milter.h"
                 }
+
+variant universal {
+        set arch_flags "${configure.universal_cflags}"
+}