4 files changed, 13 insertions, 48 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 251c55fedfd1..1ea47d78945c 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-sasl
 PORTVERSION=	2.1.26
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
@@ -13,7 +13,7 @@ COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libtool perl5
+USES=		libtool:keepla pathfix perl5
 USE_PERL5=	patch
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
diff --git a/security/cyrus-sasl2/files/patch-Makefile.in b/security/cyrus-sasl2/files/patch-Makefile.in
deleted file mode 100644
index 5d134c9ac94a..000000000000
--- a/security/cyrus-sasl2/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Makefile.in
-diff -u Makefile.in.orig Makefile.in
---- Makefile.in.orig	2012-11-07 04:21:39.000000000 +0900
-+++ Makefile.in	2012-11-21 02:47:44.864249361 +0900
-@@ -357,7 +357,7 @@
- EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT \
-     libsasl2.pc.in
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libsasl2.pc
- framedir = /Library/Frameworks/SASL2.framework
- all: config.h
diff --git a/security/cyrus-sasl2/files/patch-config::ltmain.sh b/security/cyrus-sasl2/files/patch-config::ltmain.sh
deleted file mode 100644
index 0471b82685ca..000000000000
--- a/security/cyrus-sasl2/files/patch-config::ltmain.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: config/ltmain.sh
-diff -u config/ltmain.sh.orig config/ltmain.sh
---- config/ltmain.sh.orig	Wed Jul  2 22:29:00 2003
-+++ config/ltmain.sh	Wed Jul 16 02:57:20 2003
-@@ -1901,7 +1901,7 @@
- 		deplib_matches=`eval \\$echo \"$library_names_spec\"`
- 		set dummy $deplib_matches
- 		deplib_match=$2
--		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		if test `expr "X$ldd_output" : "X.*$deplib_match"` -ne 0 ; then
- 		  newdeplibs="$newdeplibs $i"
- 		else
- 		  droppeddeps=yes
-@@ -1931,7 +1931,7 @@
- 		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
- 		  set dummy $deplib_matches
- 		  deplib_match=$2
--		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		  if test `expr "X$ldd_output" : "X.*$deplib_match"` -ne 0 ; then
- 		    newdeplibs="$newdeplibs $i"
- 		  else
- 		    droppeddeps=yes
-@@ -3396,8 +3396,8 @@
- 	# Install the pseudo-library for information purposes.
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	#$show "$install_prog $instname $destdir/$name"
-+	#$run eval "$install_prog $instname $destdir/$name" || exit $?
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index 7f7f9163ee71..aacb8c802920 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -7,46 +7,57 @@ include/sasl/saslplug.h
 include/sasl/saslutil.h
 @dirrm include/sasl
 lib/libsasl2.a
+lib/libsasl2.la
 lib/libsasl2.so
 lib/libsasl2.so.3
 lib/libsasl2.so.3.0.0
 lib/sasl2/libanonymous.a
+lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
 lib/sasl2/libanonymous.so.3
 lib/sasl2/libanonymous.so.3.0.0
 %%CRAM%%lib/sasl2/libcrammd5.a
+%%CRAM%%lib/sasl2/libcrammd5.la
 %%CRAM%%lib/sasl2/libcrammd5.so
 %%CRAM%%lib/sasl2/libcrammd5.so.3
 %%CRAM%%lib/sasl2/libcrammd5.so.3.0.0
 %%DIGEST%%lib/sasl2/libdigestmd5.a
+%%DIGEST%%lib/sasl2/libdigestmd5.la
 %%DIGEST%%lib/sasl2/libdigestmd5.so
 %%DIGEST%%lib/sasl2/libdigestmd5.so.3
 %%DIGEST%%lib/sasl2/libdigestmd5.so.3.0.0
 %%LOGIN%%lib/sasl2/liblogin.a
+%%LOGIN%%lib/sasl2/liblogin.la
 %%LOGIN%%lib/sasl2/liblogin.so
 %%LOGIN%%lib/sasl2/liblogin.so.3
 %%LOGIN%%lib/sasl2/liblogin.so.3.0.0
 %%SCRAM%%lib/sasl2/libscram.a
+%%SCRAM%%lib/sasl2/libscram.la
 %%SCRAM%%lib/sasl2/libscram.so
 %%SCRAM%%lib/sasl2/libscram.so.3
 %%SCRAM%%lib/sasl2/libscram.so.3.0.0
 %%SQL%%lib/sasl2/libsql.a
+%%SQL%%lib/sasl2/libsql.la
 %%SQL%%lib/sasl2/libsql.so
 %%SQL%%lib/sasl2/libsql.so.3
 %%SQL%%lib/sasl2/libsql.so.3.0.0
 %%NTLM%%lib/sasl2/libntlm.a
+%%NTLM%%lib/sasl2/libntlm.la
 %%NTLM%%lib/sasl2/libntlm.so
 %%NTLM%%lib/sasl2/libntlm.so.3
 %%NTLM%%lib/sasl2/libntlm.so.3.0.0
 %%OTP%%lib/sasl2/libotp.a
+%%OTP%%lib/sasl2/libotp.la
 %%OTP%%lib/sasl2/libotp.so
 %%OTP%%lib/sasl2/libotp.so.3
 %%OTP%%lib/sasl2/libotp.so.3.0.0
 %%PLAIN%%lib/sasl2/libplain.a
+%%PLAIN%%lib/sasl2/libplain.la
 %%PLAIN%%lib/sasl2/libplain.so
 %%PLAIN%%lib/sasl2/libplain.so.3
 %%PLAIN%%lib/sasl2/libplain.so.3.0.0
 lib/sasl2/libsasldb.a
+lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.3
 lib/sasl2/libsasldb.so.3.0.0