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

[raimue at macports.org]

Revision: 112766
          https://trac.macports.org/changeset/112766
Author:   raimue at macports.org
Date:     2013-10-31 03:24:15 -0700 (Thu, 31 Oct 2013)
Log Message:
-----------
security/cyrus-sasl2:
Restore patch to avoid linking against installed libraries of the same port, #17328 and #40885

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	2013-10-31 09:45:51 UTC (rev 112765)
+++ trunk/dports/security/cyrus-sasl2/Portfile	2013-10-31 10:24:15 UTC (rev 112766)
@@ -6,6 +6,7 @@
 
 name                    cyrus-sasl2
 version                 2.1.26
+revision                1
 categories              security net
 platforms               darwin
 # license is BSD plus a fourth (almost redundant) acknowledgement clause
@@ -36,7 +37,8 @@
 
 default_variants        +kerberos
 
-patchfiles              patch-ltconfig_rpath_fallback.diff
+patchfiles              patch-ltconfig_rpath_fallback.diff \
+                        patch-utils_Makefile.in.diff
 
 configure.args          --mandir=${prefix}/share/man \
                         --with-openssl=${prefix} \

Copied: trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff (from rev 112739, 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	2013-10-31 10:24:15 UTC (rev 112766)
@@ -0,0 +1,11 @@
+--- utils/Makefile.in.orig	2011-09-07 08:29:24.000000000 -0500
++++ utils/Makefile.in	2012-06-06 13:28:24.000000000 -0500
+@@ -238,7 +238,7 @@
+ JAVAH = @JAVAH@
+ JAVAROOT = @JAVAROOT@
+ JAVA_INCLUDES = @JAVA_INCLUDES@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = -L../lib/.libs @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@


Property changes on: trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131031/82e7f8dd/attachment.html>