Update cyrus-sasl2 to 2.1.15nb2. Changes from version 2.1.15nb1 are

splitting out the saslauthd daemon into a separate package,
security/cyrus-saslauthd.  This allows the saslauthd daemon to
support additional database backends for plaintext authentication
without adding unrelated dependencies to the cyrus-sasl2 package.

3 files changed, 13 insertions, 61 deletions

diff --git a/security/cyrus-sasl2/patches/patch-ag b/security/cyrus-sasl2/patches/patch-ag
deleted file mode 100644
index 56b7dd6dc76..00000000000
--- a/security/cyrus-sasl2/patches/patch-ag
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2003/11/21 13:41:58 jlam Exp $
-
---- saslauthd/Makefile.am.orig	Fri Mar 28 11:59:23 2003
-+++ saslauthd/Makefile.am	Fri Nov 21 05:32:39 2003
-@@ -24,17 +24,17 @@
- saslcache_DEPENDENCIES = @COMPAT_OBJ@
- saslcache_LDADD = @COMPAT_OBJ@
- 
--EXTRA_DIST	= saslauthd.8 saslauthd.mdoc config include \
-+EXTRA_DIST	= saslauthd.0 saslauthd.mdoc config include \
- 		  getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
- INCLUDES	= -I$(top_srcdir)/include -I../include
- DEFS            = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
- 
- 
--dist-hook: saslauthd.8
-+dist-hook: saslauthd.0
- 
--saslauthd.8: saslauthd.mdoc
--	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
-+saslauthd.0: saslauthd.mdoc
-+	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.0
- 
--install-data-local: saslauthd.8
-+install-data-local: saslauthd.0
- 	$(mkinstalldirs) $(DESTDIR)$(mandir)/cat8
--	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8
-+	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.0
diff --git a/security/cyrus-sasl2/patches/patch-ak b/security/cyrus-sasl2/patches/patch-ak
deleted file mode 100644
index 848cb8b56de..00000000000
--- a/security/cyrus-sasl2/patches/patch-ak
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/11/21 13:41:58 jlam Exp $
-
---- saslauthd/Makefile.in.orig	Fri Nov 21 05:24:06 2003
-+++ saslauthd/Makefile.in	Fri Nov 21 05:33:09 2003
-@@ -126,7 +126,7 @@
- saslcache_DEPENDENCIES = @COMPAT_OBJ@
- saslcache_LDADD = @COMPAT_OBJ@
- 
--EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include 		  getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
-+EXTRA_DIST = saslauthd.0 saslauthd.mdoc config include 		  getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
- 
- INCLUDES = -I$(top_srcdir)/include -I../include
- DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
-@@ -423,14 +423,14 @@
- maintainer-clean
- 
- 
--dist-hook: saslauthd.8
-+dist-hook: saslauthd.0
- 
--saslauthd.8: saslauthd.mdoc
--	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
-+saslauthd.0: saslauthd.mdoc
-+	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.0
- 
--install-data-local: saslauthd.8
-+install-data-local: saslauthd.0
- 	$(mkinstalldirs) $(DESTDIR)$(mandir)/cat8
--	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8
-+	$(INSTALL_DATA) $(srcdir)/saslauthd.0 $(DESTDIR)$(mandir)/cat8/saslauthd.0
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/security/cyrus-sasl2/patches/patch-al b/security/cyrus-sasl2/patches/patch-al
new file mode 100644
index 00000000000..1988f112f10
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2004/01/09 19:37:48 jlam Exp $
+
+--- Makefile.in.orig	Tue Jul 15 11:42:28 2003
++++ Makefile.in
+@@ -199,7 +199,7 @@ plugindir = @plugindir@
+ @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx
+ @MACOSX_FALSE@INSTALLOSX = 
+ 
+-SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
++SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV)
+ EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505
+ 
+ framedir = /Library/Frameworks/SASL2.framework