update to 2.2.8

changes: bugbixes

6 files changed, 32 insertions, 23 deletions

diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 6f4dc8b93b5..2e844cbf29a 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2007/06/15 17:13:05 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2007/06/15 18:05:09 drochner Exp $
 #
 
-DISTNAME=		gramps-2.2.6
-PKGREVISION=		2
+DISTNAME=		gramps-2.2.8
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
 
diff --git a/databases/gramps2/PLIST b/databases/gramps2/PLIST
index 1e635dca472..bd079e8abb0 100644
--- a/databases/gramps2/PLIST
+++ b/databases/gramps2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/02/01 17:56:11 drochner Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/06/15 18:05:09 drochner Exp $
 bin/gramps
 man/fr/man1/gramps.1
 man/man1/gramps.1
@@ -105,6 +105,9 @@ share/gramps/DateHandler/_Date_fr.pyo
 share/gramps/DateHandler/_Date_lt.py
 share/gramps/DateHandler/_Date_lt.pyc
 share/gramps/DateHandler/_Date_lt.pyo
+share/gramps/DateHandler/_Date_nb.py
+share/gramps/DateHandler/_Date_nb.pyc
+share/gramps/DateHandler/_Date_nb.pyo
 share/gramps/DateHandler/_Date_nl.py
 share/gramps/DateHandler/_Date_nl.pyc
 share/gramps/DateHandler/_Date_nl.pyo
@@ -1334,12 +1337,6 @@ share/gramps/data/main5.css
 share/gramps/data/main6.css
 share/gramps/data/papersize.xml
 share/gramps/data/system_filters.xml
-share/gramps/data/templates/blue_edge.tpkg
-share/gramps/data/templates/marble.tpkg
-share/gramps/data/templates/pink_marble.tpkg
-share/gramps/data/templates/sepia.tpkg
-share/gramps/data/templates/sky_border.tpkg
-share/gramps/data/templates/templates.xml
 share/gramps/data/tips.xml
 share/gramps/docgen/AsciiDoc.py
 share/gramps/docgen/AsciiDoc.pyc
@@ -1662,7 +1659,6 @@ share/pixmaps/gramps.png
 @dirrm share/gramps/glade
 @dirrm share/gramps/example
 @dirrm share/gramps/docgen
-@dirrm share/gramps/data/templates
 @dirrm share/gramps/data
 @dirrm share/gramps/Selectors
 @dirrm share/gramps/ReportBase
diff --git a/databases/gramps2/distinfo b/databases/gramps2/distinfo
index 2b430f84167..5605863ca15 100644
--- a/databases/gramps2/distinfo
+++ b/databases/gramps2/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.10 2007/02/01 17:56:11 drochner Exp $
+$NetBSD: distinfo,v 1.11 2007/06/15 18:05:09 drochner Exp $
 
-SHA1 (gramps-2.2.6.tar.gz) = a1de424dcd17a69c3004e0e50721e3cd09dc5424
-RMD160 (gramps-2.2.6.tar.gz) = 8815552b467601da8ce163f9a22f63a669018d94
-Size (gramps-2.2.6.tar.gz) = 14155647 bytes
+SHA1 (gramps-2.2.8.tar.gz) = 7deac0a3f51883a91bec4d67020f2eabf5f4ec7e
+RMD160 (gramps-2.2.8.tar.gz) = 9527e27612a329edaf9706c5800dd325a9be2ec8
+Size (gramps-2.2.8.tar.gz) = 16942280 bytes
 SHA1 (patch-ab) = 8d7e10d52a492d59c9b44b27ef8e60c79003a03c
-SHA1 (patch-ad) = 37651e0f78f4f24f6a15ea49103015271b4b593b
+SHA1 (patch-ad) = e0f0a5dd36845f3a1547797c2dbcfde2f2edb524
 SHA1 (patch-ae) = 919424703a3fb170d964bf256ee7ccd13efb43a1
 SHA1 (patch-af) = fe3c6d044e5fcf46f4919636df29130097dc9483
 SHA1 (patch-ag) = 841ff2d4c2baf8ab1f2755cd7a307e758a78d80c
-SHA1 (patch-ah) = 4c07795b8570e5f7dd12613b10465f6e57857356
+SHA1 (patch-ah) = 706ccaa63bbaf63c42bf0d49486dba38527370ed
 SHA1 (patch-ai) = 526ae897ad3a11b712bf7149bf7dfe6a16234520
+SHA1 (patch-aj) = 20faa024fbfdebda3d819f175516d722f93ec257
diff --git a/databases/gramps2/patches/patch-ad b/databases/gramps2/patches/patch-ad
index 0b74b2e2102..ab025ca5d83 100644
--- a/databases/gramps2/patches/patch-ad
+++ b/databases/gramps2/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2007/02/01 17:56:11 drochner Exp $
+$NetBSD: patch-ad,v 1.4 2007/06/15 18:05:09 drochner Exp $
 
---- src/GrampsDb/_ReadGedcom.py.orig	2007-01-31 21:14:07.000000000 +0100
+--- src/GrampsDb/_ReadGedcom.py.orig	2007-04-21 06:30:14.000000000 +0200
 +++ src/GrampsDb/_ReadGedcom.py
 @@ -31,7 +31,7 @@ import os
  import re
@@ -10,4 +10,4 @@ $NetBSD: patch-ad,v 1.3 2007/02/01 17:56:11 drochner Exp $
 +from bsddb3 import db
  from gettext import gettext as _
  
- # and module sets for earlier pythons
+ #------------------------------------------------------------------------
diff --git a/databases/gramps2/patches/patch-ah b/databases/gramps2/patches/patch-ah
index 1893a66461f..8ecad1ff912 100644
--- a/databases/gramps2/patches/patch-ah
+++ b/databases/gramps2/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1 2007/02/01 17:56:11 drochner Exp $
+$NetBSD: patch-ah,v 1.2 2007/06/15 18:05:09 drochner Exp $
 
---- src/GrampsDb/_GrampsDbBase.py.orig	2007-01-31 21:12:34.000000000 +0100
+--- src/GrampsDb/_GrampsDbBase.py.orig	2007-04-07 06:12:19.000000000 +0200
 +++ src/GrampsDb/_GrampsDbBase.py
 @@ -39,7 +39,7 @@ import random
  import locale
@@ -10,4 +10,4 @@ $NetBSD: patch-ah,v 1.1 2007/02/01 17:56:11 drochner Exp $
 +from bsddb3 import db
  from gettext import gettext as _
  
- try:
+ import logging
diff --git a/databases/gramps2/patches/patch-aj b/databases/gramps2/patches/patch-aj
new file mode 100644
index 00000000000..dfeda3de2ce
--- /dev/null
+++ b/databases/gramps2/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2007/06/15 18:05:10 drochner Exp $
+
+--- src/Editors/_EditFamily.py.orig	2007-06-15 19:14:18.000000000 +0200
++++ src/Editors/_EditFamily.py
+@@ -31,7 +31,7 @@ Family Editor dialog
+ #-------------------------------------------------------------------------
+ from gettext import gettext as _
+ import cPickle as pickle
+-from bsddb import db
++from bsddb3 import db
+ 
+ #-------------------------------------------------------------------------
+ #