Fix sasl-config script so that "sasl-config --libs" returns the full list

of libraries and linker flags needed to link against libsasl.  Bump
PKGREVISION and bump the BUILDLINK_DEPENDS as packages will be needing to
use a version of cyrus-sasl with a correct sasl-config.

5 files changed, 15 insertions, 15 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index c098c7f4504..0c5c2e3d94f 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2002/10/07 19:16:46 seb Exp $
+# $NetBSD: Makefile,v 1.36 2002/10/21 06:03:41 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.27
 SVR4_PKGNAME=		csasl
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 			ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
diff --git a/security/cyrus-sasl/buildlink2.mk b/security/cyrus-sasl/buildlink2.mk
index 38459f4ecad..5a3d693f2c5 100644
--- a/security/cyrus-sasl/buildlink2.mk
+++ b/security/cyrus-sasl/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:50 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/10/21 06:03:41 jlam Exp $
 
 .if !defined(CYRUS_SASL_BUILDLINK2_MK)
 CYRUS_SASL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			cyrus-sasl
-BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=1.5.24nb2
+BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=1.5.27nb3
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.cyrus-sasl=cyrus-sasl
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index cb80f7fe671..be3ec8530bc 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/10/07 19:16:46 seb Exp $
+$NetBSD: distinfo,v 1.10 2002/10/21 06:03:42 jlam Exp $
 
 SHA1 (cyrus-sasl-1.5.27.tar.gz) = eedaec8355219b61e64236e3a5d9845d3af5a13d
 Size (cyrus-sasl-1.5.27.tar.gz) = 528252 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = 82359390958c020348e7e7ebc39315da552d34c7
 SHA1 (patch-ac) = b5f99dd4789c19e36c29bbc3fbf47c556e32876e
 SHA1 (patch-ad) = faa888873c16c3c322e110a6f90380748b138942
 SHA1 (patch-ae) = b9f4295f80a64defe0381bce7def7b462bf5d196
-SHA1 (patch-af) = 3910389c08f72aaea6c964dbb846843fc57889df
+SHA1 (patch-af) = 05ba0da5932f8674d63f70b6a0ba6d6d4b0d29c3
 SHA1 (patch-ag) = 9eed2d94c7c5546bcecf041c53f53fd51486c221
 SHA1 (patch-ah) = 84bb1809f9d1914746ca02de3ffc55149c28dd75
 SHA1 (patch-ai) = 55ade1200d2c5b8f20b4c1775d6c3b7d3b8ef278
@@ -15,7 +15,7 @@ SHA1 (patch-aj) = 386ebb6e33c93bed497b438b397e903200eb4549
 SHA1 (patch-ak) = c65c4b2f9082e8beedcedca140410f31f9599b76
 SHA1 (patch-al) = c54b721c7cc69c1050600633d982e8a05d91e283
 SHA1 (patch-am) = 95f01aad91729992d4189da87970e7d7d9cd4ceb
-SHA1 (patch-an) = 933c350c55361d71c0c3273efaf0b7804edf2eea
+SHA1 (patch-an) = 308593d234b6d422749ebc409fd489d518c2a482
 SHA1 (patch-ao) = 63048c5d49a3e5dcc1065149864e567ef3cabb0e
 SHA1 (patch-ap) = 074396e63f20f6457a7f95e29bb3c8c4e7b166ef
 SHA1 (patch-aq) = d15cbbcc501a56407fb4cdfc08ef71bfb961f0a4
diff --git a/security/cyrus-sasl/patches/patch-af b/security/cyrus-sasl/patches/patch-af
index 14abe036488..aa4b548e81d 100644
--- a/security/cyrus-sasl/patches/patch-af
+++ b/security/cyrus-sasl/patches/patch-af
@@ -1,19 +1,19 @@
-$NetBSD: patch-af,v 1.1 2000/12/10 09:43:37 jlam Exp $
+$NetBSD: patch-af,v 1.2 2002/10/21 06:03:42 jlam Exp $
 
---- plugins/Makefile.am.orig	Thu Jul 20 22:25:51 2000
+--- plugins/Makefile.am.orig	Sat Mar 10 00:56:43 2001
 +++ plugins/Makefile.am
-@@ -66,6 +66,10 @@
+@@ -66,6 +66,10 @@ sasldir = $(prefix)/lib/sasl
  sasl_LTLIBRARIES = @SASL_MECHS@
  EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la libscrammd5.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la
  
 +bin_SCRIPTS = sasl-config
 +sasl_config_CFLAGS = $(CPPFLAGS)
-+sasl_config_LIBS = $(libplain_la_LIBADD) $(libkerberos4_la_LIBADD) $(libgssapiv2_la_LIBADD) $(libdigestmd5_la_LIBADD) $(liblogin_la_LIBADD) $(libsrp_la_LIBADD)
++sasl_config_LIBS = -lsasl $(libplain_la_LIBADD) $(libkerberos4_la_LIBADD) $(libgssapiv2_la_LIBADD)
 +
  libplain_la_SOURCES = plain.c
  libplain_la_LDFLAGS = -version-info $(plain_version)
  libplain_la_LIBADD = $(PLAIN_LIBS)
-@@ -102,3 +106,10 @@
+@@ -102,3 +106,10 @@ libsrp_la_LIBADD = $(SRP_LIBS)
  # libx509_la_SOURCES = x509.c
  # libx509_la_LDFLAGS = -version-info $(x509_version)
  # libx509_la_LIBADD = $(X509_LIBS)
diff --git a/security/cyrus-sasl/patches/patch-an b/security/cyrus-sasl/patches/patch-an
index 369ed32d101..561101b8709 100644
--- a/security/cyrus-sasl/patches/patch-an
+++ b/security/cyrus-sasl/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1 2002/09/07 07:37:42 jlam Exp $
+$NetBSD: patch-an,v 1.2 2002/10/21 06:03:42 jlam Exp $
 
---- plugins/Makefile.in.orig	Fri Sep  6 10:59:39 2002
+--- plugins/Makefile.in.orig	Fri Mar 23 20:48:13 2001
 +++ plugins/Makefile.in
 @@ -143,6 +143,7 @@ SASL_KRB_LIB = @SASL_KRB_LIB@
  SASL_MECHS = @SASL_MECHS@
@@ -16,7 +16,7 @@ $NetBSD: patch-an,v 1.1 2002/09/07 07:37:42 jlam Exp $
  
 +bin_SCRIPTS = sasl-config
 +sasl_config_CFLAGS = $(CPPFLAGS)
-+sasl_config_LIBS = $(libplain_la_LIBADD) $(libkerberos4_la_LIBADD) $(libgssapiv2_la_LIBADD) $(libdigestmd5_la_LIBADD) $(liblogin_la_LIBADD) $(libsrp_la_LIBADD)
++sasl_config_LIBS = -lsasl $(libplain_la_LIBADD) $(libkerberos4_la_LIBADD) $(libgssapiv2_la_LIBADD)
 +
  libplain_la_SOURCES = plain.c
  libplain_la_LDFLAGS = -version-info $(plain_version)