Update databases/lbdb to 0.31

Changelog:
  * m_pine: Double-quote parens. Thanks to Stefan M<C3><A4>tje for reporting this
    bug and sending a patch.
  * Apply patch by Brendan Cully to follow the Apple build system changes
    used to build ABQuery module.
  * Add m_vcf module for querying vcard files provided by Brendan Cully.
  * Add authentication (bind_dn, bind_password) to mutt_ldap_query. Based
    on an idea of Jan-Benedict Glaw (Closes: #324655, #286163).
  * Update FSF address in nearly all files.
  * Upgrade to standards-version 3.6.2 (no changes).

For now, make sure the m_vcf module is not built. It depends on libvformat,
which is not yet in pkgsrc

4 files changed, 29 insertions, 28 deletions

diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index e93d58906b6..db00f1e2f8b 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/11/08 01:32:56 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/12 17:43:42 tonio Exp $
 
-DISTNAME=		lbdb_0.30
+DISTNAME=		lbdb_0.31
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=	2
 CATEGORIES=		databases
 MASTER_SITES=		http://www.spinnaker.de/debian/
 
diff --git a/databases/lbdb/distinfo b/databases/lbdb/distinfo
index 9395f42fc45..f6972c3c730 100644
--- a/databases/lbdb/distinfo
+++ b/databases/lbdb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/09/10 11:26:47 tonio Exp $
+$NetBSD: distinfo,v 1.5 2005/11/12 17:43:42 tonio Exp $
 
-SHA1 (lbdb_0.30.tar.gz) = d137c11857ea23e9689e0f93d876ec107a7b8467
-RMD160 (lbdb_0.30.tar.gz) = 289c2a9395523bac08bc36510894b14fb3b18057
-Size (lbdb_0.30.tar.gz) = 104620 bytes
-SHA1 (patch-aa) = 22fe204b0a72e6565fd20e812be1ca84550689b3
-SHA1 (patch-ab) = d7f28838c8501f0c9631be949b3dbc8141170ec4
+SHA1 (lbdb_0.31.tar.gz) = 90cc0e0a9a8c4bfe5c9b8a42034b26d1c292b90f
+RMD160 (lbdb_0.31.tar.gz) = f17ac7300c79ff1986c4d0a3e997a712123dcd53
+Size (lbdb_0.31.tar.gz) = 106983 bytes
+SHA1 (patch-aa) = c74a4d95037e9d5e5cc0742e5f05ef80a35db5e6
+SHA1 (patch-ab) = 5ffaf498bc54f3cfb3ba7bebb84a3c8fcb93b79f
diff --git a/databases/lbdb/patches/patch-aa b/databases/lbdb/patches/patch-aa
index 5b853d3222c..b25677f0e57 100644
--- a/databases/lbdb/patches/patch-aa
+++ b/databases/lbdb/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/09/04 14:53:15 tonio Exp $
+$NetBSD: patch-aa,v 1.4 2005/11/12 17:43:42 tonio Exp $
 
---- Makefile.in.orig	2004-01-18 13:58:43.000000000 +0100
+--- Makefile.in.orig	2005-10-29 16:48:08.000000000 +0200
 +++ Makefile.in
-@@ -38,6 +38,7 @@ srcdir=@srcdir@
+@@ -39,6 +39,7 @@ srcdir=@srcdir@
  libdir=@libdir@
  mandir=@mandir@
  sysconfdir=@sysconfdir@
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.3 2005/09/04 14:53:15 tonio Exp $
  
  ALL=lbdbq lbdb_lib lbdb-fetchaddr lbdb-munge fetchaddr qpto8bit munge \
  	munge-keeporder	nodelist2lbdb palm_lsaddr mutt_ldap_query lbdbq.man \
-@@ -49,7 +50,7 @@ all: Makefile $(ALL)
+@@ -50,7 +51,7 @@ all: Makefile $(ALL)
  install: all
  	$(srcdir)/mkinstalldirs $(install_prefix)$(bindir)
  	$(srcdir)/mkinstalldirs $(install_prefix)$(libdir)
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.3 2005/09/04 14:53:15 tonio Exp $
  	$(srcdir)/mkinstalldirs $(install_prefix)$(mandir)
  	$(srcdir)/mkinstalldirs $(install_prefix)$(mandir)/man1
  	$(INSTALL) -m 755 fetchaddr $(install_prefix)$(libdir)
-@@ -70,7 +71,7 @@ install: all
+@@ -71,7 +72,7 @@ install: all
  		$(INSTALL) -m 644 mutt_ldap_query.man \
  			$(install_prefix)$(mandir)/man1/mutt_ldap_query.1; \
  		$(INSTALL) -m 644 lbdb_ldap.rc \
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.3 2005/09/04 14:53:15 tonio Exp $
  	fi
  	if [ "$(XCODEBUILD)" != "no" -o "$(PBXBUILD)" != "no" ]; then \
  		$(INSTALL) -m 755 ABQuery/sym/ABQuery $(install_prefix)$(libdir); \
-@@ -81,7 +82,7 @@ install: all
+@@ -85,7 +86,7 @@ install: all
  	$(INSTALL) -m 644 lbdbq.man $(install_prefix)$(mandir)/man1/lbdbq.1
  	$(INSTALL) -m 644 lbdb-fetchaddr.man \
  		$(install_prefix)$(mandir)/man1/lbdb-fetchaddr.1
@@ -37,12 +37,3 @@ $NetBSD: patch-aa,v 1.3 2005/09/04 14:53:15 tonio Exp $
  	if [ "$(DOTLOCK_TARGET)" != "" ]; then \
  		$(INSTALL) -m 755 lbdb_dotlock $(install_prefix)$(bindir); \
  		$(INSTALL) -m 644 dotlock.man \
-@@ -145,7 +146,7 @@ ABQuery/sym/ABQuery: ABQuery/pbxbuild.sh
- 
- ABQuery/pbxbuild.sh:
- 	if [ "$(XCODEBUILD)" != "no" ]; then \
--		(cd ABQuery; xcodebuild -buildstyle Deployment; printf '#!/bin/sh\nmkdir ABQuery/sym; cp ABQuery/build/ABQuery ABQuery/sym\n' > pbxbuild.sh; chmod a+x pbxbuild.sh) \
-+		(cd ABQuery; xcodebuild -buildstyle Deployment; printf '#!/bin/sh\nmkdir ABQuery/sym; if test -d ABQuery/build/Deployment; then cp ABQuery/build/Deployment/ABQuery ABQuery/sym; else cp ABQuery/build/ABQuery ABQuery/sym; fi\n' > pbxbuild.sh; chmod a+x pbxbuild.sh) \
- 	else \
- 		(cd ABQuery; pbxbuild -buildstyle Deployment export) \
- 	fi
diff --git a/databases/lbdb/patches/patch-ab b/databases/lbdb/patches/patch-ab
index b2e706848a2..0df44f0dba3 100644
--- a/databases/lbdb/patches/patch-ab
+++ b/databases/lbdb/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2005/09/10 11:26:47 tonio Exp $
+$NetBSD: patch-ab,v 1.3 2005/11/12 17:43:42 tonio Exp $
 
---- configure.orig	2005-04-30 21:23:23.000000000 +0200
+--- configure.orig	2005-10-29 14:49:48.000000000 +0200
 +++ configure
 @@ -3294,18 +3294,7 @@ if test "x$AWK" != "xNONE" ; then
  	AWK="$AWK"
@@ -45,5 +45,16 @@ $NetBSD: patch-ab,v 1.2 2005/09/10 11:26:47 tonio Exp $
 +fi
 +withval=""
  
- MODULES_SH=""
- for i in $MODULES ; do
+ VFORMAT="no"
+ if test "${ac_cv_header_vf_iface_h+set}" = set; then
+@@ -4899,8 +4899,8 @@ echo "$as_me:$LINENO: result: $ac_cv_lib
+ echo "${ECHO_T}$ac_cv_lib_vformat_vf_read_file" >&6
+ if test $ac_cv_lib_vformat_vf_read_file = yes; then
+ 
+-    MODULES="$MODULES m_vcf"
+-    VFORMAT="yes"
++#    MODULES="$MODULES m_vcf"
++#    VFORMAT="yes"
+ 
+ fi
+