NetBSD Problem Report #29879
From tonio@arcelot.loria.fr Mon Apr 4 13:02:14 2005
Return-Path: <tonio@arcelot.loria.fr>
Received: from arcelot.loria.fr (arcelot.loria.fr [152.81.9.88])
by narn.netbsd.org (Postfix) with ESMTP id C113963B11F
for <gnats-bugs@gnats.NetBSD.org>; Mon, 4 Apr 2005 13:02:13 +0000 (UTC)
Message-Id: <200504041300.j34D0FQj015358@arcelot.loria.fr>
Date: Mon, 4 Apr 2005 15:00:15 +0200 (CEST)
From: reilles@loria.fr
Reply-To: reilles@loria.fr
To: gnats-bugs@netbsd.org
Cc: kim@netbsd.org, wiz@netbsd.org
Subject: lbdb update, make things deterministic
X-Send-Pr-Version: 3.95
>Number: 29879
>Category: pkg
>Synopsis: update for database/lbdb, make package determinist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: sketch
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Mon Apr 04 13:03:00 +0000 2005
>Closed-Date: Tue Aug 30 16:21:34 +0000 2005
>Last-Modified: Tue Aug 30 16:21:34 +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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: pkg-manager->sketch
Responsible-Changed-By: wiz@netbsd.org
Responsible-Changed-When: Tue, 05 Apr 2005 12:38:40 +0000
Responsible-Changed-Why:
sketch agreed to handle this one (thanks!)
From: Antoine Reilles <Antoine.Reilles@loria.fr>
To: gnats-bugs@netbsd.org
Cc: sketch@netbsd.org
Subject: Re: pkg/29879 (was making lbdb deterministic) update lbdb to 0.30
Date: Thu, 30 Jun 2005 22:03:07 +0200
--Apple-Mail-1-120667203
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
delsp=yes;
format=flowed
Hi,
Here a patch to update the lbdb package to 0.30, and also fix the
problems with bulk build
regards,
antoine
--Apple-Mail-1-120667203
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 30 Jun 2005 19:57:47 -0000
@@ -1,28 +1,28 @@
# $NetBSD: Makefile,v 1.2 2005/05/22 20:07:45 jlam 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_TOOLS+= gmake
-USE_PERL5= yes
-USE_PKGINSTALL= yes
+DISTNAME= ${PKGNAME:S/-/_/}
+PKGNAME= lbdb-0.30
+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_TOOLS+= gmake
+USE_PERL5= yes
+USE_PKGINSTALL= yes
-CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/lbdb/
+CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/lbdb/
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+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
+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 30 Jun 2005 19:57:47 -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 30 Jun 2005 19:57:47 -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) = 9575cd97dc5d6021686c6847f43e6bb715f05c21
+SHA1 (patch-ab) = ebc1e89a938259929a89d37864cfcd134e24dd9b
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 30 Jun 2005 19:57:47 -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 2005-06-30 21:35:33.000000000 +0200
++++ Makefile.in 2005-06-30 21:38:11.000000000 +0200
@@ -38,6 +38,7 @@
libdir=@libdir@
mandir=@mandir@
--- /dev/null 2005-06-30 21:53:06.000000000 +0200
+++ patches/patch-ab 2005-06-30 21:52:26.000000000 +0200
@@ -0,0 +1,103 @@
+$NetBSD$
+
+--- configure.orig 2005-04-30 21:23:23.000000000 +0200
++++ configure 2005-06-30 21:51:59.000000000 +0200
+@@ -3338,7 +3338,7 @@
+ ;;
+ esac
+ fi
+-TAC=$ac_cv_path_TAC
++TAC="NONE"
+
+ if test -n "$TAC"; then
+ echo "$as_me:$LINENO: result: $TAC" >&5
+@@ -3622,7 +3622,7 @@
+ ;;
+ esac
+ fi
+-ABOOK=$ac_cv_path_ABOOK
++ABOOK="no"
+
+ if test -n "$ABOOK"; then
+ echo "$as_me:$LINENO: result: $ABOOK" >&5
+@@ -3671,7 +3671,7 @@
+ ;;
+ esac
+ fi
+-ABOOK=$ac_cv_path_ABOOK
++ABOOK="no"
+
+ if test -n "$ABOOK"; then
+ echo "$as_me:$LINENO: result: $ABOOK" >&5
+@@ -4054,7 +4054,7 @@
+ ;;
+ esac
+ fi
+-GETENT=$ac_cv_path_GETENT
++GETENT="no"
+
+ if test -n "$GETENT"; then
+ echo "$as_me:$LINENO: result: $GETENT" >&5
+@@ -4103,7 +4103,7 @@
+ ;;
+ esac
+ fi
+-GETENT=$ac_cv_path_GETENT
++GETENT="no"
+
+ if test -n "$GETENT"; then
+ echo "$as_me:$LINENO: result: $GETENT" >&5
+@@ -4270,7 +4270,7 @@
+ ;;
+ esac
+ fi
+-PGPK=$ac_cv_path_PGPK
++PGPK="no"
+
+ if test -n "$PGPK"; then
+ echo "$as_me:$LINENO: result: $PGPK" >&5
+@@ -4378,7 +4378,7 @@
+ ;;
+ esac
+ fi
+-PGP=$ac_cv_path_PGP
++PGP="no"
+
+ if test -n "$PGP"; then
+ echo "$as_me:$LINENO: result: $PGP" >&5
+@@ -4427,7 +4427,7 @@
+ ;;
+ esac
+ fi
+-PGP=$ac_cv_path_PGP
++PGP="no"
+
+ if test -n "$PGP"; then
+ echo "$as_me:$LINENO: result: $PGP" >&5
+@@ -4486,7 +4486,7 @@
+ ;;
+ esac
+ fi
+-EVOLUTION_ADDRESSBOOK_EXPORT=$ac_cv_path_EVOLUTION_ADDRESSBOOK_EXPORT
++EVOLUTION_ADDRESSBOOK_EXPORT="no"
+
+ if test -n "$EVOLUTION_ADDRESSBOOK_EXPORT"; then
+ echo "$as_me:$LINENO: result: $EVOLUTION_ADDRESSBOOK_EXPORT" >&5
+@@ -4535,7 +4535,7 @@
+ ;;
+ esac
+ fi
+-EVOLUTION_ADDRESSBOOK_EXPORT=$ac_cv_path_EVOLUTION_ADDRESSBOOK_EXPORT
++EVOLUTION_ADDRESSBOOK_EXPORT="no"
+
+ if test -n "$EVOLUTION_ADDRESSBOOK_EXPORT"; then
+ echo "$as_me:$LINENO: result: $EVOLUTION_ADDRESSBOOK_EXPORT" >&5
+@@ -4635,7 +4635,7 @@
+ ;;
+ esac
+ fi
+-XCODEBUILD=$ac_cv_path_XCODEBUILD
++XCODEBUILD="no"
+
+ if test -n "$XCODEBUILD"; then
+ echo "$as_me:$LINENO: result: $XCODEBUILD" >&5
--Apple-Mail-1-120667203--
From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@netbsd.org
Cc: Antoine.Reilles@loria.fr
Subject: Re: pkg/29879 (was making lbdb deterministic) update lbdb to 0.30
Date: Thu, 30 Jun 2005 13:42:19 -0700 (PDT)
On Thu, 30 Jun 2005, Antoine Reilles wrote:
> -MAINTAINER= reilles@loria.fr
> -HOMEPAGE= http://www.spinnaker.de/lbdb/
> -COMMENT= The little brother's database
...
> +MAINTAINER= reilles@loria.fr
> +HOMEPAGE= http://www.spinnaker.de/lbdb/
> +COMMENT= The little brother's database
It may be easier to provide a diff that doesn't include any formatting
changes (like spacing or tabs), so it can easier reviewed for real
changes.
Jeremy C. Reed
BSD News, BSD tutorials, BSD links
http://www.bsdnewsletter.com/
From: Antoine Reilles <Antoine.Reilles@loria.fr>
To: Jeremy C.Reed <reed@reedmedia.net>
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/29879 (was making lbdb deterministic) update lbdb to 0.30
Date: Thu, 30 Jun 2005 23:24:56 +0200
--Apple-Mail-3-125576293
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
delsp=yes;
format=flowed
>
> It may be easier to provide a diff that doesn't include any formatting
> changes (like spacing or tabs), so it can easier reviewed for real
> changes.
Woops, i was too fast replying. One reason i planned to update to
0.30 was that the updated configure script has options to deactivate
the build of modules, something that was missing with previous versions.
Here an updated patch, without the formatting problem, which uses that.
I will attack the use of options for the package when i get more
time, to learn how this works
best regards
antoine
--Apple-Mail-3-125576293
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 30 Jun 2005 21:20:17 -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/
@@ -18,6 +18,11 @@
CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/lbdb/
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --without-getent
+CONFIGURE_ARGS+= --without-abook
+CONFIGURE_ARGS+= --without-evolution-addressbook-export
+CONFIGURE_ARGS+= --without-pgp
+CONFIGURE_ARGS+= --without-pgpk
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 30 Jun 2005 21:20:17 -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 30 Jun 2005 21:20:17 -0000
@@ -1,6 +1,6 @@
$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) = 9575cd97dc5d6021686c6847f43e6bb715f05c21
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 30 Jun 2005 21:20:17 -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 2005-06-30 21:35:33.000000000 +0200
++++ Makefile.in 2005-06-30 21:38:11.000000000 +0200
@@ -38,6 +38,7 @@
libdir=@libdir@
mandir=@mandir@
--Apple-Mail-3-125576293
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
--Apple-Mail-3-125576293--
From: Antoine Reilles <Antoine.Reilles@loria.fr>
To: "Jeremy C. Reed" <reed@reedmedia.net>
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/29879 (was making lbdb deterministic) update lbdb to 0.30
Date: Thu, 30 Jun 2005 23:11:11 +0200
On Jun 30, 2005, at 10:42 PM, Jeremy C. Reed wrote:
> It may be easier to provide a diff that doesn't include any formatting
> changes (like spacing or tabs), so it can easier reviewed for real
> changes.
Oh, yes, you are totally right. I have local diff for this package
for way too long, and i forgot that at some point i did a ":retab"
It can be really annoying here, since i only bumped the version
number, and modified the patches
I whould love to let this package use options to let the user choose
the modules he want or not, but i haven't found an elegant way to
disable features, except by patching the configure script
From: Antoine Reilles <Antoine.Reilles@loria.fr>
To: tech-pkg@netbsd.org, gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/29879: lbdb update, and use of options to make determinist
Date: Tue, 5 Jul 2005 19:03:22 +0100
--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--
From: Antoine Reilles <Antoine.Reilles@loria.fr>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/29879: lbdb update, make things deterministic
Date: Tue, 9 Aug 2005 10:59:22 +0200
--Apple-Mail-1--758125429
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
delsp=yes;
format=flowed
Hi,
I adapted the lbdb package to use options to activate dependancies
against gnupg or abook, and allow to build the osx-addressbook plugin
under macosx
Also, this is for lbdb 0.30
Best regards,
antoine
--Apple-Mail-1--758125429
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.3
diff -u -r1.3 Makefile
--- Makefile 16 Jul 2005 01:19:08 -0000 1.3
+++ Makefile 9 Aug 2005 08:54:50 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:08 jlam Exp $
DISTNAME= ${PKGNAME:S/-/_/}
-PKGNAME= lbdb-0.29
+PKGNAME= lbdb-0.30
CATEGORIES= databases
MASTER_SITES= http://www.spinnaker.de/debian/
@@ -17,6 +17,13 @@
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 9 Aug 2005 08:54:50 -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 9 Aug 2005 08:54:50 -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 9 Aug 2005 08:54:50 -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-08-09 10:54:16.000000000 +0200
+++ patches/patch-ab 2005-08-09 10:34:14.000000000 +0200
@@ -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-08-09 10:54:16.000000000 +0200
+++ options.mk 2005-08-09 10:41:33.000000000 +0200
@@ -0,0 +1,33 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.lbdb
+PKG_SUPPORTED_OPTIONS= osx_addressbook gnupg abook
+PKG_SUGGESTED_OPTIONS= 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--758125429--
From: Antoine Reilles <tonio@netbsd.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: PR/29879 CVS commit: pkgsrc/databases/lbdb
Date: Tue, 30 Aug 2005 16:14:53 +0000 (UTC)
Module Name: pkgsrc
Committed By: tonio
Date: Tue Aug 30 16:14:53 UTC 2005
Modified Files:
pkgsrc/databases/lbdb: Makefile PLIST distinfo
pkgsrc/databases/lbdb/patches: patch-aa
Added Files:
pkgsrc/databases/lbdb: options.mk
pkgsrc/databases/lbdb/patches: patch-ab
Log Message:
Update databases/lbdb to 0.30
Make it use the option framework, to enable/disable abook and gnupg plugins and
dependancies
fix PR 29879, applying the appended patch
approved by cube@
To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 pkgsrc/databases/lbdb/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/databases/lbdb/PLIST \
pkgsrc/databases/lbdb/distinfo
cvs rdiff -r0 -r1.1 pkgsrc/databases/lbdb/options.mk
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/databases/lbdb/patches/patch-aa
cvs rdiff -r0 -r1.1 pkgsrc/databases/lbdb/patches/patch-ab
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: tonio@netbsd.org
State-Changed-When: Tue, 30 Aug 2005 16:21:34 +0000
State-Changed-Why:
Patch applied, thanks for your help
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.