Index: ../security/cyrus-sasl2/Portfile
===================================================================
--- ../security/cyrus-sasl2/Portfile	(revision 49527)
+++ ../security/cyrus-sasl2/Portfile	(working copy)
@@ -4,6 +4,7 @@
 
 name			cyrus-sasl2
 version			2.1.22
+revision		1
 categories		security net
 maintainers		jmpp landonf
 description		SASL is an authentication library.
@@ -44,8 +45,6 @@
 
 use_parallel_build  yes
 
-universal_variant no
-
 # This is a start towards universal... lib/Makefile.am and sasldb/Makefile.am need to be updated to not do blind ar-fu
 #depends_build \
 #	port:autoconf \
@@ -100,6 +99,16 @@
 
 variant static description "Build static library" { configure.args-append --enable-static }
 
+variant universal {
+    post-configure {
+        reinplace "s|^\\(archive_cmds\=\"\\\\\$CC\\)|\\1 \
+        -Wl,-syslibroot,$sysroot ${configure.universal_ldflags} \
+        -mmacosx-version-min=10.4 |g" ${worksrcpath}/libtool
+        # Only if compiling using 10.4 SDK on 10.5. Need to find proper fix
+         reinplace "s|#include <gssapi.h>|#include <gssapi/gssapi.h>|" ${worksrcpath}/plugins/gssapi.c
+    }   
+}
+
 livecheck.check regex
 livecheck.url   http://ftp.andrew.cmu.edu/pub/cyrus-mail/
 livecheck.regex {cyrus-sasl-(\d+(?:\.\d+)*)}