do not always apply db3 patches. reenable separate build
This commit is contained in:
parent
21c46b38a2
commit
942e95aef5
@ -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
|
||||
|
23
security/cyrus-sasl/files/patch-db
Normal file
23
security/cyrus-sasl/files/patch-db
Normal file
@ -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
|
||||
*
|
@ -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>
|
@ -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
|
||||
*
|
Loading…
Reference in New Issue
Block a user