[pkgsrc/trunk]: pkgsrc/databases/gramps2 -deal with an incompatible change in...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1f0c824675c
branches:  trunk
changeset: 547525:a1f0c824675c
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Sep 18 16:56:55 2008 +0000

description:
-deal with an incompatible change in py-bsddb3-4.7.2
-remove py-xml bl3, this is not needed afaict
-pull in desktop-file-utils/bl3 because we install a .desktop file
bump PKGREVISION

diffstat:

 databases/gramps2/Makefile         |   6 +++---
 databases/gramps2/distinfo         |   4 ++--
 databases/gramps2/patches/patch-ab |  15 ++++++++++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r a1bb5fed5d1e -r a1f0c824675c databases/gramps2/Makefile
--- a/databases/gramps2/Makefile        Thu Sep 18 16:54:22 2008 +0000
+++ b/databases/gramps2/Makefile        Thu Sep 18 16:56:55 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2008/09/06 20:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2008/09/18 16:56:55 drochner Exp $
 #
 
 DISTNAME=              gramps-2.2.10
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gramps/}
 
@@ -31,7 +31,6 @@
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../databases/py-bsddb3/buildlink3.mk"
 .include "../../graphics/py-imaging/buildlink3.mk"
-.include "../../textproc/py-xml/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../x11/py-gnome2/buildlink3.mk"
 .include "../../lang/python/application.mk"
@@ -39,4 +38,5 @@
 .include "../../devel/GConf/schemas.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a1bb5fed5d1e -r a1f0c824675c databases/gramps2/distinfo
--- a/databases/gramps2/distinfo        Thu Sep 18 16:54:22 2008 +0000
+++ b/databases/gramps2/distinfo        Thu Sep 18 16:56:55 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2008/02/01 21:07:49 drochner Exp $
+$NetBSD: distinfo,v 1.14 2008/09/18 16:56:55 drochner Exp $
 
 SHA1 (gramps-2.2.10.tar.gz) = e05691b31d81235b23aea78600d388e351b1a39e
 RMD160 (gramps-2.2.10.tar.gz) = 90e9a04e4842972a319cf90c3cdbb171a05edd3c
 Size (gramps-2.2.10.tar.gz) = 17230239 bytes
-SHA1 (patch-ab) = 8d7e10d52a492d59c9b44b27ef8e60c79003a03c
+SHA1 (patch-ab) = eca39fc175ec109b86ccc0884e315621c52fc026
 SHA1 (patch-ad) = e0f0a5dd36845f3a1547797c2dbcfde2f2edb524
 SHA1 (patch-ae) = 919424703a3fb170d964bf256ee7ccd13efb43a1
 SHA1 (patch-af) = fe3c6d044e5fcf46f4919636df29130097dc9483
diff -r a1bb5fed5d1e -r a1f0c824675c databases/gramps2/patches/patch-ab
--- a/databases/gramps2/patches/patch-ab        Thu Sep 18 16:54:22 2008 +0000
+++ b/databases/gramps2/patches/patch-ab        Thu Sep 18 16:56:55 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2007/02/01 17:56:11 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2008/09/18 16:56:55 drochner Exp $
 
---- src/GrampsDb/_GrampsBSDDB.py.orig  2007-01-31 21:10:04.000000000 +0100
-+++ src/GrampsDb/_GrampsBSDDB.py
+--- ./src/GrampsDb/_GrampsBSDDB.py.orig        2008-01-02 17:04:53.000000000 +0100
++++ ./src/GrampsDb/_GrampsBSDDB.py
 @@ -35,7 +35,7 @@ import shutil
  import re
  import time
@@ -11,3 +11,12 @@
  import logging
  log = logging.getLogger(".GrampsDb")
  
+@@ -337,7 +337,7 @@ class GrampsBSDDB(GrampsDbBase,UpdateCal
+             # These env settings are only needed for Txn environment
+             self.env.set_lk_max_locks(25000)
+             self.env.set_lk_max_objects(25000)
+-            self.env.set_flags(db.DB_LOG_AUTOREMOVE,1)  # clean up unused logs
++            self.env.set_flags(db.DB_LOG_AUTO_REMOVE,1)  # clean up unused logs
+ 
+             # The DB_PRIVATE flag must go if we ever move to multi-user setup
+             env_flags = db.DB_CREATE|db.DB_PRIVATE|\