From a99be8b6ed5626cc7b97f8d3b2a79b17ec1ce318 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Tue, 18 May 2010 16:38:53 +0000
Subject: update to 3.2.3 changes: -bugfixes -translation updates

---
 databases/gramps3/Makefile         |  4 ++--
 databases/gramps3/PLIST            |  2 +-
 databases/gramps3/distinfo         | 14 ++++++--------
 databases/gramps3/patches/patch-aa |  2 +-
 databases/gramps3/patches/patch-ab |  2 +-
 databases/gramps3/patches/patch-ac | 18 +++++-------------
 databases/gramps3/patches/patch-ad |  2 +-
 databases/gramps3/patches/patch-ae |  2 +-
 databases/gramps3/patches/patch-an |  6 +++---
 databases/gramps3/patches/patch-ao | 13 -------------
 databases/gramps3/patches/patch-ap | 13 -------------
 11 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 100644 databases/gramps3/patches/patch-ao
 delete mode 100644 databases/gramps3/patches/patch-ap

(limited to 'databases/gramps3')

diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile
index a9aca58dbe9..af03e4291f6 100644
--- a/databases/gramps3/Makefile
+++ b/databases/gramps3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/05/04 11:04:59 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2010/05/18 16:38:53 drochner Exp $
 #
 
-DISTNAME=		gramps-3.2.1
+DISTNAME=		gramps-3.2.3
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
 
diff --git a/databases/gramps3/PLIST b/databases/gramps3/PLIST
index 3cad42069bf..513c9987227 100644
--- a/databases/gramps3/PLIST
+++ b/databases/gramps3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/05/04 11:04:59 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/05/18 16:38:53 drochner Exp $
 bin/gramps
 man/fr/man1/gramps.1
 man/man1/gramps.1
diff --git a/databases/gramps3/distinfo b/databases/gramps3/distinfo
index 7b7466e40a3..754b17f8080 100644
--- a/databases/gramps3/distinfo
+++ b/databases/gramps3/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2010/05/04 11:04:59 drochner Exp $
+$NetBSD: distinfo,v 1.8 2010/05/18 16:38:53 drochner Exp $
 
-SHA1 (gramps-3.2.1.tar.gz) = 3dee19907ac2da7245ccb8e15e9b3c1e124fd53f
-RMD160 (gramps-3.2.1.tar.gz) = 1641c19212dbba1b7d3292c04e1f47b3e6fa3b4c
-Size (gramps-3.2.1.tar.gz) = 7196866 bytes
+SHA1 (gramps-3.2.3.tar.gz) = 156622b7a51189fb2c105e29ff33978d4c165be4
+RMD160 (gramps-3.2.3.tar.gz) = b0a9c7a3065c6ed24a2f5b7e548fe5bcf2c1927c
+Size (gramps-3.2.3.tar.gz) = 7234196 bytes
 SHA1 (patch-aa) = 7de4ac7901f647b910833881ed4825e49773ac69
 SHA1 (patch-ab) = a70c9ee5706e6028230492e87946de5fc0514e21
-SHA1 (patch-ac) = 4d5661d1c2e8453fb71b29a4d971024713041ae0
+SHA1 (patch-ac) = 982702e3c36246da35e0f016f696d52f3af37f24
 SHA1 (patch-ad) = 1e1059359b07d5a63d96d1d0528969c23cea0691
 SHA1 (patch-ae) = 933d5ca25274d76bb5e0826df5fe2661352f450f
 SHA1 (patch-ag) = 41a74f38b33d05bf3c42fae1b4bc836df963972e
@@ -15,6 +15,4 @@ SHA1 (patch-aj) = 6f6be0045e94b7f95200a389dbff591e5006315c
 SHA1 (patch-ak) = 6920c334b14a4d7b2ce46910978e9c10f35a9507
 SHA1 (patch-al) = 9c0c39c6ecf20d0066ff4b887a3248ced34178a4
 SHA1 (patch-am) = 3a39556ea040ee98ffd274f8daa8bc0af62b0909
-SHA1 (patch-an) = 8718d828677431367916e9d079e23fee415662f2
-SHA1 (patch-ao) = 6206c59e6527c754595d868336bb9a35e5777f41
-SHA1 (patch-ap) = c0aafa9abf4ddabd5be8a9c6bc4cb60bbd3c8fcb
+SHA1 (patch-an) = 1f6f0625c206d2f4a8420d985a8608d444a82597
diff --git a/databases/gramps3/patches/patch-aa b/databases/gramps3/patches/patch-aa
index b8840c5c30b..be571b13b42 100644
--- a/databases/gramps3/patches/patch-aa
+++ b/databases/gramps3/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2010/05/04 11:05:00 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2010/05/18 16:38:53 drochner Exp $
 
 --- src/gui/editors/editfamily.py.orig	2010-03-15 07:21:30.000000000 +0000
 +++ src/gui/editors/editfamily.py
diff --git a/databases/gramps3/patches/patch-ab b/databases/gramps3/patches/patch-ab
index 0ee37486cef..952130f8b4c 100644
--- a/databases/gramps3/patches/patch-ab
+++ b/databases/gramps3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2010/05/04 11:05:00 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2010/05/18 16:38:53 drochner Exp $
 
 --- src/cli/clidbman.py.orig	2010-03-15 07:21:31.000000000 +0000
 +++ src/cli/clidbman.py
diff --git a/databases/gramps3/patches/patch-ac b/databases/gramps3/patches/patch-ac
index 606ded5c846..435bb378260 100644
--- a/databases/gramps3/patches/patch-ac
+++ b/databases/gramps3/patches/patch-ac
@@ -1,22 +1,14 @@
-$NetBSD: patch-ac,v 1.2 2010/05/04 11:05:00 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2010/05/18 16:38:53 drochner Exp $
 
---- src/GrampsLogger/_ErrorReportAssistant.py.orig	2010-03-15 07:21:07.000000000 +0000
+--- src/GrampsLogger/_ErrorReportAssistant.py.orig	2010-05-17 05:30:59.000000000 +0000
 +++ src/GrampsLogger/_ErrorReportAssistant.py
-@@ -5,7 +5,7 @@ import gtk
+@@ -5,7 +5,8 @@ import gtk
  import pygtk
  import gobject
  import cairo
 -import sys, os,bsddb
-+import sys, os,bsddb3
++import sys, os
++import bsddb3 as bsddb
  
  
  class ErrorReportAssistant(object):
-@@ -119,7 +119,7 @@ class ErrorReportAssistant(object):
-                "gobject version: %s\n"\
-                "cairo version  : %s"\
-                % (str(sys.version).replace('\n',''),
--                  str(bsddb.__version__),
-+                  str(bsddb3.__version__),
-                   str(const.VERSION),
-                   os.environ.get('LANG',''),
-                   operatingsystem,
diff --git a/databases/gramps3/patches/patch-ad b/databases/gramps3/patches/patch-ad
index 9050421db8b..79cc638c754 100644
--- a/databases/gramps3/patches/patch-ad
+++ b/databases/gramps3/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2010/05/04 11:05:00 drochner Exp $
+$NetBSD: patch-ad,v 1.3 2010/05/18 16:38:53 drochner Exp $
 
 --- src/gen/db/write.py.orig	2010-03-18 15:38:37.000000000 +0000
 +++ src/gen/db/write.py
diff --git a/databases/gramps3/patches/patch-ae b/databases/gramps3/patches/patch-ae
index 40da3d26c59..8fb5b8c2efb 100644
--- a/databases/gramps3/patches/patch-ae
+++ b/databases/gramps3/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2010/05/04 11:05:00 drochner Exp $
+$NetBSD: patch-ae,v 1.5 2010/05/18 16:38:53 drochner Exp $
 
 --- src/gen/db/read.py.orig	2010-03-18 15:39:23.000000000 +0000
 +++ src/gen/db/read.py
diff --git a/databases/gramps3/patches/patch-an b/databases/gramps3/patches/patch-an
index 9ae2bb4acd7..6aafe9e8e63 100644
--- a/databases/gramps3/patches/patch-an
+++ b/databases/gramps3/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.1 2010/05/04 11:05:00 drochner Exp $
+$NetBSD: patch-an,v 1.2 2010/05/18 16:38:53 drochner Exp $
 
---- src/GrampsAboutDialog.py.orig	2010-03-15 07:21:34.000000000 +0000
+--- src/GrampsAboutDialog.py.orig	2010-05-17 05:31:23.000000000 +0000
 +++ src/GrampsAboutDialog.py
 @@ -30,7 +30,7 @@
  from gen.ggettext import gettext as _
  import os
  import sys
 -import bsddb
-+import bsddb3
++import bsddb3 as bsddb
  
  ##import logging
  ##_LOG = logging.getLogger(".GrampsAboutDialog")
diff --git a/databases/gramps3/patches/patch-ao b/databases/gramps3/patches/patch-ao
deleted file mode 100644
index 3fde173269e..00000000000
--- a/databases/gramps3/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2010/05/04 11:05:00 drochner Exp $
-
---- src/plugins/webreport/NarrativeWeb.py.orig	2010-04-22 07:18:53.000000000 +0000
-+++ src/plugins/webreport/NarrativeWeb.py
-@@ -37,6 +37,8 @@ Narrative Web Page generator.
- # python modules
- #
- #------------------------------------------------------------------------
-+# for Python-2.5
-+from __future__ import with_statement
- import gc
- import os
- import sys
diff --git a/databases/gramps3/patches/patch-ap b/databases/gramps3/patches/patch-ap
deleted file mode 100644
index 254fef72391..00000000000
--- a/databases/gramps3/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2010/05/04 11:05:00 drochner Exp $
-
---- src/plugins/webreport/WebCal.py.orig	2010-04-22 07:18:53.000000000 +0000
-+++ src/plugins/webreport/WebCal.py
-@@ -30,6 +30,8 @@ Web Calendar generator.
- #------------------------------------------------------------------------
- # python modules
- #------------------------------------------------------------------------
-+# for Python-2.5
-+from __future__ import with_statement
- import os, codecs, shutil, re
- import datetime, calendar
- from gen.ggettext import sgettext as _
-- 
cgit v1.2.3