[79776] trunk/dports/mail/libmilter/Portfile

[dluke at macports.org]

Revision: 79776
          http://trac.macports.org/changeset/79776
Author:   dluke at macports.org
Date:     2011-06-25 06:57:17 -0700 (Sat, 25 Jun 2011)
Log Message:
-----------
- Fix universal build (#29901 - thanks to pixilla)
- whitespace cleanup

Modified Paths:
--------------
    trunk/dports/mail/libmilter/Portfile

Modified: trunk/dports/mail/libmilter/Portfile
===================================================================
--- trunk/dports/mail/libmilter/Portfile	2011-06-25 12:22:40 UTC (rev 79775)
+++ trunk/dports/mail/libmilter/Portfile	2011-06-25 13:57:17 UTC (rev 79776)
@@ -1,14 +1,13 @@
 # $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 \
 			are being processed by the Mail Transfer Agent (MTA), \
@@ -18,9 +17,9 @@
 			configured and composed in an end-user's MTA \
 			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 \
 		sha1	86dd2a8ad5eac892cd02cf67792a25efccacc100 \
@@ -28,17 +27,20 @@
 
 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,22 +48,22 @@
 		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 \
 			-I${worksrcpath}/sendmail -c *.c"
 		
 		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} \
 			-current_version ${version} \
@@ -75,3 +77,7 @@
 				"${destroot}${prefix}/include/"
 			file delete "${destroot}${prefix}/include/${name}/milter.h"
 		}
+
+variant universal {
+	set arch_flags "${configure.universal_cflags}"
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110625/42e2cd3d/attachment.html>