[pkgsrc/trunk]: pkgsrc/security * Use LIBTOOL_OVERRIDE instead of LTCONFIG_OV...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc3e83e1254c
branches:  trunk
changeset: 461293:cc3e83e1254c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 13 19:08:50 2003 +0000

description:
* 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.

diffstat:

 security/cy2-login/PLIST              |   3 +--
 security/cy2-ntlm/PLIST               |   3 +--
 security/cyrus-sasl2/Makefile.common  |   5 +++--
 security/cyrus-sasl2/PLIST.krb5       |   3 +--
 security/cyrus-sasl2/PLIST.plugins    |   8 +-------
 security/cyrus-sasl2/distinfo         |   3 ++-
 security/cyrus-sasl2/patches/patch-ab |  13 +++++++++++++
 7 files changed, 22 insertions(+), 16 deletions(-)

diffs (115 lines):

diff -r 3acfbb96d861 -r cc3e83e1254c security/cy2-login/PLIST
--- a/security/cy2-login/PLIST  Sat Sep 13 18:32:08 2003 +0000
+++ b/security/cy2-login/PLIST  Sat Sep 13 19:08:50 2003 +0000
@@ -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 -r 3acfbb96d861 -r cc3e83e1254c security/cy2-ntlm/PLIST
--- a/security/cy2-ntlm/PLIST   Sat Sep 13 18:32:08 2003 +0000
+++ b/security/cy2-ntlm/PLIST   Sat Sep 13 19:08:50 2003 +0000
@@ -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 -r 3acfbb96d861 -r cc3e83e1254c security/cyrus-sasl2/Makefile.common
--- a/security/cyrus-sasl2/Makefile.common      Sat Sep 13 18:32:08 2003 +0000
+++ b/security/cyrus-sasl2/Makefile.common      Sat Sep 13 19:08:50 2003 +0000
@@ -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_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 -r 3acfbb96d861 -r cc3e83e1254c security/cyrus-sasl2/PLIST.krb5
--- a/security/cyrus-sasl2/PLIST.krb5   Sat Sep 13 18:32:08 2003 +0000
+++ b/security/cyrus-sasl2/PLIST.krb5   Sat Sep 13 19:08:50 2003 +0000
@@ -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 -r 3acfbb96d861 -r cc3e83e1254c security/cyrus-sasl2/PLIST.plugins
--- a/security/cyrus-sasl2/PLIST.plugins        Sat Sep 13 18:32:08 2003 +0000
+++ b/security/cyrus-sasl2/PLIST.plugins        Sat Sep 13 19:08:50 2003 +0000
@@ -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 -r 3acfbb96d861 -r cc3e83e1254c security/cyrus-sasl2/distinfo
--- a/security/cyrus-sasl2/distinfo     Sat Sep 13 18:32:08 2003 +0000
+++ b/security/cyrus-sasl2/distinfo     Sat Sep 13 19:08:50 2003 +0000
@@ -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 -r 3acfbb96d861 -r cc3e83e1254c security/cyrus-sasl2/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/cyrus-sasl2/patches/patch-ab     Sat Sep 13 19:08:50 2003 +0000
@@ -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@