From 942e95aef5dc20f38c0b27fec1eafc22900bc6b0 Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Sun, 30 Sep 2001 11:49:48 +0000
Subject: [PATCH] do not always apply db3 patches. reenable separate build

---
 security/cyrus-sasl/Makefile                  |  7 +++++-
 security/cyrus-sasl/files/patch-db            | 23 +++++++++++++++++++
 .../patches/patch-lib_db_berkeley_c           | 11 ---------
 .../patches/patch-utils_sasldblistusers_c     | 11 ---------
 4 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 security/cyrus-sasl/files/patch-db
 delete mode 100644 security/cyrus-sasl/patches/patch-lib_db_berkeley_c
 delete mode 100644 security/cyrus-sasl/patches/patch-utils_sasldblistusers_c

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 3722d52d02f..77791ffd0ae 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/09/30 11:41:23 jakob Exp $
+# $OpenBSD: Makefile,v 1.13 2001/09/30 11:49:48 jakob Exp $
 
 COMMENT=	"RFC 2222 SASL (Simple Authentication and Security Layer)"
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_FTP=	yes
 PERMIT_DISTFILES_CDROM=	yes
 PERMIT_DISTFILES_FTP=	yes
 
+SEPARATE_BUILD=		concurrent
+
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		LDFLAGS='${LDFLAGS}'
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
@@ -38,6 +40,9 @@ LIB_DEPENDS+=		db::databases/db
 CFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-dblib=berkeley
+
+post-patch:
+	(cd ${WRKSRC}; patch < ${FILESDIR}/patch-db)
 .else
 CONFIGURE_ARGS+=	--with-dblib=ndbm
 .endif
diff --git a/security/cyrus-sasl/files/patch-db b/security/cyrus-sasl/files/patch-db
new file mode 100644
index 00000000000..b113987f0b3
--- /dev/null
+++ b/security/cyrus-sasl/files/patch-db
@@ -0,0 +1,23 @@
+--- lib/db_berkeley.c.orig	Thu Sep 13 00:45:05 2001
++++ lib/db_berkeley.c	Thu Sep 13 00:45:15 2001
+@@ -44,7 +44,7 @@
+  */
+ 
+ #include <config.h>
+-#include <db.h>
++#include <db3.h>
+ #include <sys/stat.h>
+ #include <stdlib.h>
+ #include <assert.h>
+
+--- utils/sasldblistusers.c.orig	Thu Sep 13 00:48:36 2001
++++ utils/sasldblistusers.c	Thu Sep 13 00:48:47 2001
+@@ -163,7 +163,7 @@
+ #else /* SASL_NDBM */
+ #ifdef SASL_BERKELEYDB
+ 
+-#include <db.h>
++#include <db3.h>
+ /*
+  * Open the database
+  *
diff --git a/security/cyrus-sasl/patches/patch-lib_db_berkeley_c b/security/cyrus-sasl/patches/patch-lib_db_berkeley_c
deleted file mode 100644
index 1ab3de28e4b..00000000000
--- a/security/cyrus-sasl/patches/patch-lib_db_berkeley_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/db_berkeley.c.orig	Thu Sep 13 00:45:05 2001
-+++ lib/db_berkeley.c	Thu Sep 13 00:45:15 2001
-@@ -44,7 +44,7 @@
-  */
- 
- #include <config.h>
--#include <db.h>
-+#include <db3.h>
- #include <sys/stat.h>
- #include <stdlib.h>
- #include <assert.h>
diff --git a/security/cyrus-sasl/patches/patch-utils_sasldblistusers_c b/security/cyrus-sasl/patches/patch-utils_sasldblistusers_c
deleted file mode 100644
index c72c66aa4eb..00000000000
--- a/security/cyrus-sasl/patches/patch-utils_sasldblistusers_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/sasldblistusers.c.orig	Thu Sep 13 00:48:36 2001
-+++ utils/sasldblistusers.c	Thu Sep 13 00:48:47 2001
-@@ -163,7 +163,7 @@
- #else /* SASL_NDBM */
- #ifdef SASL_BERKELEYDB
- 
--#include <db.h>
-+#include <db3.h>
- /*
-  * Open the database
-  *