* Use LIBTOOL_OVERRIDE instead of LTCONFIG_OVERRIDE.

* Use ${SHLIBTOOL} to build the shared plugins so we don't get the useless
  lib<plugin>.a file.

7 files changed, 22 insertions, 16 deletions

diff --git a/security/cy2-login/PLIST b/security/cy2-login/PLIST
index df8b9e98f0b..144be9502fe 100644
--- a/security/cy2-login/PLIST
+++ b/security/cy2-login/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/08/19 15:52:03 jmc Exp $
-lib/sasl2/liblogin.a
+@comment $NetBSD: PLIST,v 1.4 2003/09/13 19:08:53 jlam Exp $
 lib/sasl2/liblogin.la
 lib/sasl2/liblogin.so
 lib/sasl2/liblogin.so.2
diff --git a/security/cy2-ntlm/PLIST b/security/cy2-ntlm/PLIST
index d411f258f47..14fb44bdba2 100644
--- a/security/cy2-ntlm/PLIST
+++ b/security/cy2-ntlm/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/08/19 15:52:30 jmc Exp $
-lib/sasl2/libntlm.a
+@comment $NetBSD: PLIST,v 1.4 2003/09/13 19:08:54 jlam Exp $
 lib/sasl2/libntlm.la
 lib/sasl2/libntlm.so
 lib/sasl2/libntlm.so.2
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 13258fb8fd9..3e658221bd0 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2003/08/16 09:06:41 recht Exp $
+# $NetBSD: Makefile.common,v 1.6 2003/09/13 19:08:50 jlam Exp $
 #
 # This Makefile fragment should be included _below_ and SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
@@ -23,7 +23,8 @@ USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+MAKE_ENV+=		SHLIBTOOL="${PKGSHLIBTOOL}"
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/cyrus-sasl2/PLIST.krb5 b/security/cyrus-sasl2/PLIST.krb5
index 8211b507010..ab9995fb6e1 100644
--- a/security/cyrus-sasl2/PLIST.krb5
+++ b/security/cyrus-sasl2/PLIST.krb5
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST.krb5,v 1.6 2003/08/16 09:06:41 recht Exp $
-lib/sasl2/libgssapiv2.a
+@comment $NetBSD: PLIST.krb5,v 1.7 2003/09/13 19:08:51 jlam Exp $
 lib/sasl2/libgssapiv2.la
 lib/sasl2/libgssapiv2.so
 lib/sasl2/libgssapiv2.so.2
diff --git a/security/cyrus-sasl2/PLIST.plugins b/security/cyrus-sasl2/PLIST.plugins
index db3bbe18507..1e6aaa771bb 100644
--- a/security/cyrus-sasl2/PLIST.plugins
+++ b/security/cyrus-sasl2/PLIST.plugins
@@ -1,30 +1,24 @@
-@comment $NetBSD: PLIST.plugins,v 1.5 2003/08/16 09:06:41 recht Exp $
-lib/sasl2/libanonymous.a
+@comment $NetBSD: PLIST.plugins,v 1.6 2003/09/13 19:08:51 jlam Exp $
 lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
 lib/sasl2/libanonymous.so.2
 lib/sasl2/libanonymous.so.2.15
-lib/sasl2/libcrammd5.a
 lib/sasl2/libcrammd5.la
 lib/sasl2/libcrammd5.so
 lib/sasl2/libcrammd5.so.2
 lib/sasl2/libcrammd5.so.2.15
-lib/sasl2/libdigestmd5.a
 lib/sasl2/libdigestmd5.la
 lib/sasl2/libdigestmd5.so
 lib/sasl2/libdigestmd5.so.2
 lib/sasl2/libdigestmd5.so.2.15
-lib/sasl2/libotp.a
 lib/sasl2/libotp.la
 lib/sasl2/libotp.so
 lib/sasl2/libotp.so.2
 lib/sasl2/libotp.so.2.15
-lib/sasl2/libplain.a
 lib/sasl2/libplain.la
 lib/sasl2/libplain.so
 lib/sasl2/libplain.so.2
 lib/sasl2/libplain.so.2.15
-lib/sasl2/libsasldb.a
 lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.2
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index e68b9a9c59a..8f4e2aee884 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2003/08/16 09:06:41 recht Exp $
+$NetBSD: distinfo,v 1.8 2003/09/13 19:08:52 jlam Exp $
 
 SHA1 (cyrus-sasl-2.1.15.tar.gz) = 747101ffec482ca566f00a9d34124ec8e79f6589
 Size (cyrus-sasl-2.1.15.tar.gz) = 1390131 bytes
 SHA1 (patch-aa) = f5a772976839388078a26f287844ba35bdf1a3b7
+SHA1 (patch-ab) = 711dd3d73da611bb5679bc8415e96517bf239778
 SHA1 (patch-ad) = 808255d61cb9340fc500a12f74a91d9c8dceda4c
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
 SHA1 (patch-af) = 2b4dc8b7871ee17101f618aaa955826d1c161954
diff --git a/security/cyrus-sasl2/patches/patch-ab b/security/cyrus-sasl2/patches/patch-ab
new file mode 100644
index 00000000000..e35eff89879
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2003/09/13 19:08:53 jlam Exp $
+
+--- plugins/Makefile.in.orig	Sat Sep 13 14:38:42 2003
++++ plugins/Makefile.in	Sat Sep 13 14:43:04 2003
+@@ -147,7 +147,7 @@
+ LIBSSL_INC_FLAGS = @LIBSSL_INC_FLAGS@
+ LIBSSL_LIB_DIR = @LIBSSL_LIB_DIR@
+ LIBSSL_LIB_FLAGS = @LIBSSL_LIB_FLAGS@
+-LIBTOOL = @LIBTOOL@
++LIBTOOL = $(SHLIBTOOL)
+ LIB_CRYPT = @LIB_CRYPT@
+ LIB_DES = @LIB_DES@
+ LIB_DYN_SASL = @LIB_DYN_SASL@