Fix a subtle configure problem where, if gdbm libraries are present on the

system at build time, they are silently chosen in preference to the
standard system db ver1 code.  This tends to break a multitude of things
that expect the user* databases to be in db1 format.

Discovered whilst hunting down a really wierd operational bug with exim
using the imappw entry for SMTP AUTH.

Add an explicit WITH_GDBM knob to turn on the use of gdbm files, since the
code is present in the source, but default to off, forcing the use of
system libraries

Submitted by:	ade
Approved by:	maintainer timeout

mail/courier-imap/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	courier-imap
 PORTVERSION=	2.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -47,6 +47,7 @@ CONFIGURE_ENV=	CFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 # WITH_FAM:			Build in fam support for IDLE command
 # WITH_DRAC:			Build in DRAC support
 # WITH_TRASHQUOTA:		Include deleted mails in the quota
+# WITH_GDBM:			Use gdbm files instead of bdb
 #
 
 CONFDIR?=	${PREFIX}/etc/${PORTNAME}
@@ -79,6 +80,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--disable-root-check \
 		--with-locking-method=fcntl
 
+# Without explicitly mentioning this, if gdbm libraries are present,
+# they are silently picked up and used by courier-imap in place of
+# the standard db (v1) files.
+#
+.if defined(WITH_GDBM)
+LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
+CONFIGURE_ARGS+=	--with-db=gdbm
+.else
+CONFIGURE_ARGS+=	--with-db=db
+.endif
+
 .if !defined(WITH_VPOPMAIL)
 CONFIGURE_ARGS+=--without-authvchkpw
 PLIST_SUB+=	VPOPMAILFLAG="@comment "