--Apple-Mail-1-545481416
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed

Hi,

I worked a little more on the databases/lbdb package, and adapted it  
to use options.mk
It had some problems of PLIST and dependancies, the configure script  
being too smart.
I hope this update make the package more predictible (if not  
totally), but i'm not sure i use options the right way, so, if you  
have comments, feel free.

Best regards,
antoine



--Apple-Mail-1-545481416
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="lbdb-0.30.diff"
Content-Disposition: attachment;
	filename=lbdb-0.30.diff

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	22 May 2005 20:07:45 -0000	1.2
+++ Makefile	5 Jul 2005 17:57:54 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2005/05/22 20:07:45 jlam Exp $
 
 DISTNAME=		${PKGNAME:S/-/_/}
-PKGNAME=		lbdb-0.29
+PKGNAME=		lbdb-0.30
 CATEGORIES=		databases
 MASTER_SITES=		http://www.spinnaker.de/debian/
 
@@ -13,11 +13,18 @@
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-USE_PERL5=		yes
+USE_TOOLS+=   perl
 USE_PKGINSTALL=		yes
 
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/libexec/lbdb/
 CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=  --enable-lbdb_dotlock
+CONFIGURE_ARGS+=  --without-getent
+CONFIGURE_ARGS+=  --without-evolution-addressbook-export
+CONFIGURE_ARGS+=  --without-pgp
+CONFIGURE_ARGS+=  --without-pgpk
+
+.include "options.mk"
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST	25 Mar 2005 21:39:11 -0000	1.1.1.1
+++ PLIST	5 Jul 2005 17:57:54 -0000
@@ -7,13 +7,12 @@
 libexec/lbdb/lbdb-munge
 libexec/lbdb/lbdb_bbdb_query.el
 libexec/lbdb/lbdb_lib
-libexec/lbdb/m_abook
 libexec/lbdb/m_bbdb
 libexec/lbdb/m_fido
 libexec/lbdb/m_finger
-libexec/lbdb/m_getent
 libexec/lbdb/m_gnomecard
-libexec/lbdb/m_gpg
+${WITHGPG}libexec/lbdb/m_gpg
+${WITHABOOK}libexec/lbdb/m_abook
 libexec/lbdb/m_inmail
 libexec/lbdb/m_ldap
 libexec/lbdb/m_muttalias
@@ -28,6 +27,8 @@
 libexec/lbdb/palm_lsaddr
 libexec/lbdb/qpto8bit
 libexec/lbdb/tac
+${OSXADDRESSBOOK}libexec/lbdb/ABQuery
+${OSXADDRESSBOOK}libexec/lbdb/m_osx_addressbook
 man/man1/lbdb-fetchaddr.1
 man/man1/lbdb_dotlock.1
 man/man1/lbdbq.1
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo	25 Mar 2005 21:39:11 -0000	1.1.1.1
+++ distinfo	5 Jul 2005 17:57:54 -0000
@@ -1,6 +1,7 @@
 $NetBSD: distinfo,v 1.1.1.1 2005/03/25 21:39:11 kim Exp $
 
-SHA1 (lbdb_0.29.tar.gz) = 60f34b7867908450d34a75b5e09f3f7f89b9f8e9
-RMD160 (lbdb_0.29.tar.gz) = b5574ad13ead6b49fc7fe12472707f42046e38e3
-Size (lbdb_0.29.tar.gz) = 85590 bytes
-SHA1 (patch-aa) = 00b2f69f30637938e9142c17c334e633878a0526
+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) = 1a3218252c353c45e85d75278f824eca6c6811b3
+SHA1 (patch-ab) = 9fda85f934b41be45239c1c4083e6592caa01d00
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa	25 Mar 2005 21:39:11 -0000	1.1.1.1
+++ patches/patch-aa	5 Jul 2005 17:57:54 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-aa,v 1.1.1.1 2005/03/25 21:39:11 kim Exp $
 
---- Makefile.in.orig	2004-01-18 07:58:43.000000000 -0500
-+++ Makefile.in	2005-03-25 16:25:39.000000000 -0500
+--- Makefile.in.orig	2004-01-18 12:58:43.000000000 +0000
++++ Makefile.in	2005-07-05 17:40:54.000000000 +0100
 @@ -38,6 +38,7 @@
  libdir=@libdir@
  mandir=@mandir@
--- /dev/null	2005-07-05 18:57:26.000000000 +0100
+++ patches/patch-ab	2005-07-05 17:47:09.000000000 +0100
@@ -0,0 +1,29 @@
+$NetBSD$
+
+--- configure.orig	2005-04-30 20:23:23.000000000 +0100
++++ configure	2005-07-05 17:46:06.000000000 +0100
+@@ -4604,6 +4604,12 @@
+ 
+ fi
+ 
++# Check whether --with-osx-addressbook or --without-osx-addressbook was given.
++if test "${with_osx_addressbook+set}" = set; then
++  withval="$with_osx_addressbook"
++
++fi;
++    if test x$withval = xyes; then
+ # m_osx_addressbook requires xcode (10.3) or projectbuilder (<10.3)
+ # Extract the first word of "xcodebuild", so it can be a program name with args.
+ set dummy xcodebuild; ac_word=$2
+@@ -4694,6 +4700,11 @@
+ 
+ 	fi
+ fi
++else
++  PBXBUILD="no"
++  XCODEBUILD="no"
++fi
++withval=""
+ 
+ MODULES_SH=""
+ for i in $MODULES ; do
--- /dev/null	2005-07-05 18:57:26.000000000 +0100
+++ options.mk	2005-07-05 18:44:43.000000000 +0100
@@ -0,0 +1,32 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.lbdb
+PKG_SUPPORTED_OPTIONS=	osx_addressbook gnupg abook
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mosx_addressbook)
+CONFIGURE_ARGS+=	--with-osx-addressbook
+PLIST_SUBST+= OSXADDRESSBOOK=""
+.else
+CONFIGURE_ARGS+=	--without-osx-addressbook
+PLIST_SUBST+= OSXADDRESSBOOK="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnupg)
+DEPENDS=gnupg-[0-9]*:../../security/gnupg
+CONFIGURE_ARGS+=	--with-gpg
+PLIST_SUBST+= WITHGPG=""
+.else
+CONFIGURE_ARGS+=	--without-gpg
+PLIST_SUBST+= WITHGPG="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mabook)
+DEPENDS=abook-[0-9]*:../../databases/abook
+CONFIGURE_ARGS+=	--with-abook
+PLIST_SUBST+= WITHABOOK=""
+.else
+CONFIGURE_ARGS+=	--without-abook
+PLIST_SUBST+= WITHABOOK="@comment "
+.endif

--Apple-Mail-1-545481416--