[52930] trunk/dports/security/cyrus-sasl2

[jmr at macports.org]

Revision: 52930
          http://trac.macports.org/changeset/52930
Author:   jmr at macports.org
Date:     2009-06-25 15:48:07 -0700 (Thu, 25 Jun 2009)
Log Message:
-----------
cyrus-sasl2: fix for failures when building with another version installed (#17328)

Modified Paths:
--------------
    trunk/dports/security/cyrus-sasl2/Portfile

Added Paths:
-----------
    trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff

Modified: trunk/dports/security/cyrus-sasl2/Portfile
===================================================================
--- trunk/dports/security/cyrus-sasl2/Portfile	2009-06-25 22:45:49 UTC (rev 52929)
+++ trunk/dports/security/cyrus-sasl2/Portfile	2009-06-25 22:48:07 UTC (rev 52930)
@@ -26,6 +26,8 @@
 depends_lib		port:openssl \
 				port:zlib
 
+patchfiles		patch-utils_Makefile.in.diff
+
 default_variants	+kerberos
 
 patchfiles		patch-config_ltconfig
@@ -62,15 +64,6 @@
 #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

Added: trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff	                        (rev 0)
+++ trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff	2009-06-25 22:48:07 UTC (rev 52930)
@@ -0,0 +1,11 @@
+--- 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@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090625/785fedfd/attachment.html>