>Number:         29879
>Category:       pkg
>Synopsis:       update for database/lbdb, make package determinist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Apr 04 13:03:00 +0000 2005
>Originator:     Antoine Reilles
>Release:        NetBSD 3.99.3
>Organization:
	
>Environment:
	
	
System: NetBSD arcelot.loria.fr 3.99.3 NetBSD 3.99.3 (GENERIC) #0: Sun Apr 3 19:12:29 CEST 2005 tonio@arcelot.loria.fr:/usr/obj/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
This patch should make the build of database/lbdb deterministic
Previously, the configure script was too smart, and detected the presence of
mail/abook, or pgp. This broke the bulk build, and is not very desirable.

I disabled with patch-ab the features needing a new dependancy, except for
gnupg (well, it is about personal choice), because querying the keyring is a
nice feature.
So this patch adds a dependancy to security/gnupg, and makes the configure
script to ignore undesirable modules.
It is easy to change one of such disables feature into a dependancy, in order to keep things determinist
>How-To-Repeat:
make install in database/lbdb after installing or not databases/abook. The
installed files are not the same in those cases
>Fix:
A patch, maybe it needs to bump PKGREVISION too


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	25 Mar 2005 21:39:11 -0000	1.1.1.1
+++ Makefile	4 Apr 2005 12:53:13 -0000
@@ -1,28 +1,29 @@
 # $NetBSD: Makefile,v 1.1.1.1 2005/03/25 21:39:11 kim Exp $
 
-DISTNAME=		${PKGNAME:S/-/_/}
-PKGNAME=		lbdb-0.29
-CATEGORIES=		databases
-MASTER_SITES=		http://www.spinnaker.de/debian/
-
-MAINTAINER=		reilles@loria.fr
-HOMEPAGE=		http://www.spinnaker.de/lbdb/
-COMMENT=		The little brother's database
-
-DEPENDS+=		p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
-
-GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
-USE_PERL5=		yes
-USE_PKGINSTALL=		yes
-
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/libexec/lbdb/
-CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFDIR}
-
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-
-EGDIR=			${PREFIX}/share/examples/lbdb
-CONF_FILES+=		${EGDIR}/lbdb.rc ${PKG_SYSCONFDIR}/lbdb.rc
-CONF_FILES+=		${EGDIR}/lbdb_ldap.rc ${PKG_SYSCONFDIR}/lbdb_ldap.rc
+DISTNAME=     ${PKGNAME:S/-/_/}
+PKGNAME=      lbdb-0.29
+CATEGORIES=   databases
+MASTER_SITES= http://www.spinnaker.de/debian/
+
+MAINTAINER=   reilles@loria.fr
+HOMEPAGE=     http://www.spinnaker.de/lbdb/
+COMMENT=      The little brother's database
+
+DEPENDS+=     p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
+DEPENDS+=     gnupg>=1.4:../../security/gnupg
+
+GNU_CONFIGURE=    yes
+USE_GNU_TOOLS+=   make
+USE_PERL5=        yes
+USE_PKGINSTALL=   yes
+
+CONFIGURE_ARGS+=  --libdir=${PREFIX}/libexec/lbdb/
+CONFIGURE_ARGS+=  --sysconfdir=${PKG_SYSCONFDIR}
+
+WRKSRC=     ${WRKDIR}/${PKGNAME_NOREV}
+
+EGDIR=      ${PREFIX}/share/examples/lbdb
+CONF_FILES+=    ${EGDIR}/lbdb.rc ${PKG_SYSCONFDIR}/lbdb.rc
+CONF_FILES+=    ${EGDIR}/lbdb_ldap.rc ${PKG_SYSCONFDIR}/lbdb_ldap.rc
 
 .include "../../mk/bsd.pkg.mk"
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	4 Apr 2005 12:53:13 -0000
@@ -7,11 +7,9 @@
 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
 libexec/lbdb/m_inmail
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	4 Apr 2005 12:53:13 -0000
@@ -4,3 +4,4 @@
 RMD160 (lbdb_0.29.tar.gz) = b5574ad13ead6b49fc7fe12472707f42046e38e3
 Size (lbdb_0.29.tar.gz) = 85590 bytes
 SHA1 (patch-aa) = 00b2f69f30637938e9142c17c334e633878a0526
+SHA1 (patch-ab) = 384fd57208a0d707b9f9882cc15843e6928eb1d2
--- /dev/null	2005-04-04 14:50:32.000000000 +0200
+++ patches/patch-ab	2005-04-04 14:50:06.000000000 +0200
@@ -0,0 +1,65 @@
+--- configure.orig	2004-02-23 12:39:54.000000000 +0100
++++ configure	2005-04-04 14:50:02.000000000 +0200
+@@ -1288,7 +1288,7 @@
+   ;;
+ esac
+ fi
+-TAC="$ac_cv_path_TAC"
++TAC="NONE"
+ if test -n "$TAC"; then
+   echo "$ac_t""$TAC" 1>&6
+ else
+@@ -1474,7 +1474,7 @@
+   ;;
+ esac
+ fi
+-ABOOK="$ac_cv_path_ABOOK"
++ABOOK="no"
+ if test -n "$ABOOK"; then
+   echo "$ac_t""$ABOOK" 1>&6
+ else
+@@ -1638,7 +1638,7 @@
+   ;;
+ esac
+ fi
+-GETENT="$ac_cv_path_GETENT"
++GETENT="no"
+ if test -n "$GETENT"; then
+   echo "$ac_t""$GETENT" 1>&6
+ else
+@@ -1720,7 +1720,7 @@
+   ;;
+ esac
+ fi
+-PGPK="$ac_cv_path_PGPK"
++PGPK="no"
+ if test -n "$PGPK"; then
+   echo "$ac_t""$PGPK" 1>&6
+ else
+@@ -1761,7 +1761,7 @@
+   ;;
+ esac
+ fi
+-PGP="$ac_cv_path_PGP"
++PGP="no"
+ if test -n "$PGP"; then
+   echo "$ac_t""$PGP" 1>&6
+ else
+@@ -1847,7 +1847,7 @@
+   ;;
+ esac
+ fi
+-XCODEBUILD="$ac_cv_path_XCODEBUILD"
++XCODEBUILD="no"
+ if test -n "$XCODEBUILD"; then
+   echo "$ac_t""$XCODEBUILD" 1>&6
+ else
+@@ -1929,7 +1929,7 @@
+   ;;
+ esac
+ fi
+-EVOLUTION_ADDRESSBOOK_EXPORT="$ac_cv_path_EVOLUTION_ADDRESSBOOK_EXPORT"
++EVOLUTION_ADDRESSBOOK_EXPORT="no"
+ if test -n "$EVOLUTION_ADDRESSBOOK_EXPORT"; then
+   echo "$ac_t""$EVOLUTION_ADDRESSBOOK_EXPORT" 1>&6
+ else

>Unformatted: