Ticket #17328: cyrus-sasl2.diff

files/patch-utils_Makefile.in.diff

@@ +1 @@
+--- utils/Makefile.in.orig      2009-05-07 08:25:01.000000000 -0600
++++ utils/Makefile.in   2009-06-11 01:18:26.000000000 -0600
+@@ -121,7 +121,7 @@
+ JAVA_FALSE = @JAVA_FALSE@
+ JAVA_INCLUDES = @JAVA_INCLUDES@
+ JAVA_TRUE = @JAVA_TRUE@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = -L../lib/.libs @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@

Portfile

@@ -26 +26 @@
 depends_lib             port:openssl \
                                 port:zlib
 
+patchfiles              patch-utils_Makefile.in.diff
+
 default_variants        +kerberos
 
 configure.args \
@@ -60 +62 @@
 #autoreconf.args -fvi
 #autoreconf.env ACLOCAL="aclocal -I${worksrcpath}/cmulocal -I${worksrcpath}/config"
 
-pre-configure {
-    if {[file exists ${prefix}/lib/libsasl2.dylib]} {
-        ui_error "cyrus-sasl2 will not build when another version is active."
-        ui_error "Please deactivate or uninstall cyrus-sasl2, and then install"
-        ui_error "the new version with `sudo port install cyrus-sasl2`."
-        error "cyrus-sasl2 upgrade failed"
-    }
-}
-
 destroot.keepdirs \
     ${destroot}${prefix}/var/state/saslauthd \
     ${destroot}${prefix}/var/pwcheck