Use libtool port instead of included version to avoid objformat a.out botch

15 files changed, 37 insertions, 1 deletions

diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index f8428dec32e6..a302a006ef2d 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BeeCrypt is an open source cryptography library
 
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/bioapi/Makefile b/security/bioapi/Makefile
index b28eddbbc039..a46d1e439f8b 100644
--- a/security/bioapi/Makefile
+++ b/security/bioapi/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://www.qrivy.net/~michael/blua/bioapi/ \
 MAINTAINER=	fli@shapeshifter.se
 COMMENT=	BioAPI library implementation
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 # Problems reported with higher optimization levels
diff --git a/security/borzoi/Makefile b/security/borzoi/Makefile
index be699392bad3..26d688b734ef 100644
--- a/security/borzoi/Makefile
+++ b/security/borzoi/Makefile
@@ -18,6 +18,7 @@ COMMENT=	An Elliptic Curve Cryptography Library
 BUILD_DEPENDS=	${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
 RUN_DEPENDS=	${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile
index b4b58eba71cc..cc034c22a1b7 100644
--- a/security/cryptplug/Makefile
+++ b/security/cryptplug/Makefile
@@ -18,6 +18,7 @@ COMMENT=	A collection of plug-ins to cryptographic engines
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgpgme03.so.9:${PORTSDIR}/security/gpgme03 \
 		gpg-agent:${PORTSDIR}/security/gnupg
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile
index 32b9efdb6cbc..e91f447c73ff 100644
--- a/security/cyrus-sasl2-ldapdb/Makefile
+++ b/security/cyrus-sasl2-ldapdb/Makefile
@@ -28,6 +28,7 @@ INSTALL_WRKSRC=	${WRKDIR}/${DISTNAME}/plugins
 
 INSTALLS_SHLIB=	yes
 
+USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index bc3355da0830..aed3c81b7be5 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -19,6 +19,7 @@ COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
 LATEST_LINK=	${PORTNAME}2
 
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}2
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index 5213d1efc70a..b8d2e4c3c555 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -7,39 +7,51 @@ include/sasl/saslplug.h
 include/sasl/saslutil.h
 @dirrm include/sasl
 lib/libsasl2.a
+lib/libsasl2.la
 lib/libsasl2.so
 lib/libsasl2.so.2
 lib/sasl2/libanonymous.a
+lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
 lib/sasl2/libanonymous.so.2
 %%CRAM%%lib/sasl2/libcrammd5.a
+%%CRAM%%lib/sasl2/libcrammd5.la
 %%CRAM%%lib/sasl2/libcrammd5.so
 %%CRAM%%lib/sasl2/libcrammd5.so.2
 %%DIGEST%%lib/sasl2/libdigestmd5.a
+%%DIGEST%%lib/sasl2/libdigestmd5.la
 %%DIGEST%%lib/sasl2/libdigestmd5.so
 %%DIGEST%%lib/sasl2/libdigestmd5.so.2
 %%GSSAPI%%lib/sasl2/libgssapiv2.a
+%%GSSAPI%%lib/sasl2/libgssapiv2.la
 %%GSSAPI%%lib/sasl2/libgssapiv2.so
 %%GSSAPI%%lib/sasl2/libgssapiv2.so.2
 %%EBONES%%lib/sasl2/libkerberos4.a
+%%EBONES%%lib/sasl2/libkerberos4.la
 %%EBONES%%lib/sasl2/libkerberos4.so
 %%EBONES%%lib/sasl2/libkerberos4.so.2
 %%LOGIN%%lib/sasl2/liblogin.a
+%%LOGIN%%lib/sasl2/liblogin.la
 %%LOGIN%%lib/sasl2/liblogin.so
 %%LOGIN%%lib/sasl2/liblogin.so.2
 %%SQL%%lib/sasl2/libsql.a
+%%SQL%%lib/sasl2/libsql.la
 %%SQL%%lib/sasl2/libsql.so
 %%SQL%%lib/sasl2/libsql.so.2
 %%NTLM%%lib/sasl2/libntlm.a
+%%NTLM%%lib/sasl2/libntlm.la
 %%NTLM%%lib/sasl2/libntlm.so
 %%NTLM%%lib/sasl2/libntlm.so.2
 %%OTP%%lib/sasl2/libotp.a
+%%OTP%%lib/sasl2/libotp.la
 %%OTP%%lib/sasl2/libotp.so
 %%OTP%%lib/sasl2/libotp.so.2
 %%PLAIN%%lib/sasl2/libplain.a
+%%PLAIN%%lib/sasl2/libplain.la
 %%PLAIN%%lib/sasl2/libplain.so
 %%PLAIN%%lib/sasl2/libplain.so.2
 lib/sasl2/libsasldb.a
+lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.2
 sbin/pluginviewer
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index bfbf1d00008c..6c9511c39fd9 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -26,6 +26,7 @@ OPTIONS+=	LDAP	 "Use OpenLDAP as the KDC backend"		off
 OPTIONS+=	CRACKLIB "Use CrackLib for password quality checking"	off
 OPTIONS+=	X11	 "Build X11 utilies"				off
 
+USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index 4868a65f6957..d9018f97c8ff 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -59,41 +59,52 @@ include/rtbl.h
 include/sl.h
 include/ss/ss.h
 include/xdbm.h
-info/dir
 lib/libasn1.a
+lib/libasn1.la
 lib/libasn1.so
 lib/libasn1.so.7
 lib/libeditline.a
+lib/libeditline.la
 lib/libeditline.so
 lib/libeditline.so.0
 lib/libgssapi.a
+lib/libgssapi.la
 lib/libgssapi.so
 lib/libgssapi.so.4
 lib/libhdb.a
+lib/libhdb.la
 lib/libhdb.so
 lib/libhdb.so.8
 lib/libkadm5clnt.a
+lib/libkadm5clnt.la
 lib/libkadm5clnt.so
 lib/libkadm5clnt.so.6
 lib/libkadm5srv.a
+lib/libkadm5srv.la
 lib/libkadm5srv.so
 lib/libkadm5srv.so.7
 lib/libkafs.a
+lib/libkafs.la
 lib/libkafs.so
 lib/libkafs.so.4
 lib/libkrb5.a
+lib/libkrb5.la
 lib/libkrb5.so
 lib/libkrb5.so.21
 lib/libotp.a
+lib/libotp.la
 lib/libotp.so
 lib/libotp.so.1
 lib/libroken.a
+lib/libroken.la
 lib/libroken.so
 lib/libroken.so.17
 lib/libsl.a
+lib/libsl.la
 lib/libsl.so
 lib/libsl.so.1
 lib/libss.a
+lib/libss.la
 lib/libss.so
 lib/libss.so.1
 libexec/ftpd
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 8ff067ecc0e9..a864a70b7a0c 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -23,6 +23,7 @@ USE_RC_SUBR=	racoon.sh
 USE_OPENSSL=	yes
 USE_BZIP2=	yes
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index cb71867155c1..2eb4197b24fe 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Common error values for all GnuPG components
 
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index c5cd9c9ecce2..400cb1810ec1 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Library for encapsulating/safekeeping data in encrypted/compressed form
 LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt \
 		mhash.2:${PORTSDIR}/security/mhash
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/security/libident/Makefile b/security/libident/Makefile
index 745fda6de806..bb2f39c9b8e1 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.remlab.net/files/libident/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small library to interface the ident protocol server (rfc1413)
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnometarget lthack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index ce68105fcbc5..396f3ba289c1 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME:S/lib//}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-cipher cryptographic library (used in PHP)
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-static
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 44d6943ac776..f3b053e90b08 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	SSL encryption wrapper for standard network daemons
 
+USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	YES
 USE_RC_SUBR=	YES