update to 3.3.2

changes: many fixes and improvements, most visibly: the use of py-bsddb3
is now officially supported

18 files changed, 434 insertions, 377 deletions

diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile
index 3c656b4c10d..721f5a84f64 100644
--- a/databases/gramps3/Makefile
+++ b/databases/gramps3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2012/04/08 19:08:46 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2012/06/01 20:28:26 drochner Exp $
 #
 
-DISTNAME=		gramps-3.2.6
-PKGREVISION=		6
+DISTNAME=		gramps-3.3.2
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
 
diff --git a/databases/gramps3/PLIST b/databases/gramps3/PLIST
index be682d28942..e6baf05e520 100644
--- a/databases/gramps3/PLIST
+++ b/databases/gramps3/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2010/11/30 18:31:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/06/01 20:28:26 drochner Exp $
 bin/gramps
+man/cs/man1/gramps.1
 man/fr/man1/gramps.1
 man/man1/gramps.1
 man/nl/man1/gramps.1
@@ -44,6 +45,9 @@ share/gramps/DateHandler/_Date_ca.pyo
 share/gramps/DateHandler/_Date_cs.py
 share/gramps/DateHandler/_Date_cs.pyc
 share/gramps/DateHandler/_Date_cs.pyo
+share/gramps/DateHandler/_Date_da.py
+share/gramps/DateHandler/_Date_da.pyc
+share/gramps/DateHandler/_Date_da.pyo
 share/gramps/DateHandler/_Date_de.py
 share/gramps/DateHandler/_Date_de.pyc
 share/gramps/DateHandler/_Date_de.pyo
@@ -134,9 +138,6 @@ share/gramps/Filters/Rules/Event/_HasGallery.pyo
 share/gramps/Filters/Rules/Event/_HasIdOf.py
 share/gramps/Filters/Rules/Event/_HasIdOf.pyc
 share/gramps/Filters/Rules/Event/_HasIdOf.pyo
-share/gramps/Filters/Rules/Event/_HasMarkerOf.py
-share/gramps/Filters/Rules/Event/_HasMarkerOf.pyc
-share/gramps/Filters/Rules/Event/_HasMarkerOf.pyo
 share/gramps/Filters/Rules/Event/_HasNote.py
 share/gramps/Filters/Rules/Event/_HasNote.pyc
 share/gramps/Filters/Rules/Event/_HasNote.pyo
@@ -161,6 +162,9 @@ share/gramps/Filters/Rules/Event/_MatchesFilter.pyo
 share/gramps/Filters/Rules/Event/_MatchesPersonFilter.py
 share/gramps/Filters/Rules/Event/_MatchesPersonFilter.pyc
 share/gramps/Filters/Rules/Event/_MatchesPersonFilter.pyo
+share/gramps/Filters/Rules/Event/_MatchesSourceConfidence.py
+share/gramps/Filters/Rules/Event/_MatchesSourceConfidence.pyc
+share/gramps/Filters/Rules/Event/_MatchesSourceConfidence.pyo
 share/gramps/Filters/Rules/Event/_MatchesSourceFilter.py
 share/gramps/Filters/Rules/Event/_MatchesSourceFilter.pyc
 share/gramps/Filters/Rules/Event/_MatchesSourceFilter.pyo
@@ -206,9 +210,6 @@ share/gramps/Filters/Rules/Family/_HasIdOf.pyo
 share/gramps/Filters/Rules/Family/_HasLDS.py
 share/gramps/Filters/Rules/Family/_HasLDS.pyc
 share/gramps/Filters/Rules/Family/_HasLDS.pyo
-share/gramps/Filters/Rules/Family/_HasMarkerOf.py
-share/gramps/Filters/Rules/Family/_HasMarkerOf.pyc
-share/gramps/Filters/Rules/Family/_HasMarkerOf.pyo
 share/gramps/Filters/Rules/Family/_HasNote.py
 share/gramps/Filters/Rules/Family/_HasNote.pyc
 share/gramps/Filters/Rules/Family/_HasNote.pyo
@@ -227,12 +228,18 @@ share/gramps/Filters/Rules/Family/_HasRelType.pyo
 share/gramps/Filters/Rules/Family/_HasSource.py
 share/gramps/Filters/Rules/Family/_HasSource.pyc
 share/gramps/Filters/Rules/Family/_HasSource.pyo
+share/gramps/Filters/Rules/Family/_HasTag.py
+share/gramps/Filters/Rules/Family/_HasTag.pyc
+share/gramps/Filters/Rules/Family/_HasTag.pyo
 share/gramps/Filters/Rules/Family/_IsBookmarked.py
 share/gramps/Filters/Rules/Family/_IsBookmarked.pyc
 share/gramps/Filters/Rules/Family/_IsBookmarked.pyo
 share/gramps/Filters/Rules/Family/_MatchesFilter.py
 share/gramps/Filters/Rules/Family/_MatchesFilter.pyc
 share/gramps/Filters/Rules/Family/_MatchesFilter.pyo
+share/gramps/Filters/Rules/Family/_MatchesSourceConfidence.py
+share/gramps/Filters/Rules/Family/_MatchesSourceConfidence.pyc
+share/gramps/Filters/Rules/Family/_MatchesSourceConfidence.pyo
 share/gramps/Filters/Rules/Family/_MemberBase.py
 share/gramps/Filters/Rules/Family/_MemberBase.pyc
 share/gramps/Filters/Rules/Family/_MemberBase.pyo
@@ -290,6 +297,9 @@ share/gramps/Filters/Rules/MediaObject/_HasNoteRegexp.pyo
 share/gramps/Filters/Rules/MediaObject/_HasReferenceCountOf.py
 share/gramps/Filters/Rules/MediaObject/_HasReferenceCountOf.pyc
 share/gramps/Filters/Rules/MediaObject/_HasReferenceCountOf.pyo
+share/gramps/Filters/Rules/MediaObject/_HasTag.py
+share/gramps/Filters/Rules/MediaObject/_HasTag.pyc
+share/gramps/Filters/Rules/MediaObject/_HasTag.pyo
 share/gramps/Filters/Rules/MediaObject/_MatchesFilter.py
 share/gramps/Filters/Rules/MediaObject/_MatchesFilter.pyc
 share/gramps/Filters/Rules/MediaObject/_MatchesFilter.pyo
@@ -311,15 +321,15 @@ share/gramps/Filters/Rules/Note/_ChangedSince.pyo
 share/gramps/Filters/Rules/Note/_HasIdOf.py
 share/gramps/Filters/Rules/Note/_HasIdOf.pyc
 share/gramps/Filters/Rules/Note/_HasIdOf.pyo
-share/gramps/Filters/Rules/Note/_HasMarkerOf.py
-share/gramps/Filters/Rules/Note/_HasMarkerOf.pyc
-share/gramps/Filters/Rules/Note/_HasMarkerOf.pyo
 share/gramps/Filters/Rules/Note/_HasNote.py
 share/gramps/Filters/Rules/Note/_HasNote.pyc
 share/gramps/Filters/Rules/Note/_HasNote.pyo
 share/gramps/Filters/Rules/Note/_HasReferenceCountOf.py
 share/gramps/Filters/Rules/Note/_HasReferenceCountOf.pyc
 share/gramps/Filters/Rules/Note/_HasReferenceCountOf.pyo
+share/gramps/Filters/Rules/Note/_HasTag.py
+share/gramps/Filters/Rules/Note/_HasTag.pyc
+share/gramps/Filters/Rules/Note/_HasTag.pyo
 share/gramps/Filters/Rules/Note/_MatchesFilter.py
 share/gramps/Filters/Rules/Note/_MatchesFilter.pyc
 share/gramps/Filters/Rules/Note/_MatchesFilter.pyo
@@ -356,6 +366,9 @@ share/gramps/Filters/Rules/Person/_FamilyWithIncompleteEvent.pyo
 share/gramps/Filters/Rules/Person/_HasAddress.py
 share/gramps/Filters/Rules/Person/_HasAddress.pyc
 share/gramps/Filters/Rules/Person/_HasAddress.pyo
+share/gramps/Filters/Rules/Person/_HasAlternateName.py
+share/gramps/Filters/Rules/Person/_HasAlternateName.pyc
+share/gramps/Filters/Rules/Person/_HasAlternateName.pyo
 share/gramps/Filters/Rules/Person/_HasAssociation.py
 share/gramps/Filters/Rules/Person/_HasAssociation.pyc
 share/gramps/Filters/Rules/Person/_HasAssociation.pyo
@@ -371,9 +384,6 @@ share/gramps/Filters/Rules/Person/_HasCommonAncestorWith.pyo
 share/gramps/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py
 share/gramps/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.pyc
 share/gramps/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.pyo
-share/gramps/Filters/Rules/Person/_HasCompleteRecord.py
-share/gramps/Filters/Rules/Person/_HasCompleteRecord.pyc
-share/gramps/Filters/Rules/Person/_HasCompleteRecord.pyo
 share/gramps/Filters/Rules/Person/_HasDeath.py
 share/gramps/Filters/Rules/Person/_HasDeath.pyc
 share/gramps/Filters/Rules/Person/_HasDeath.pyo
@@ -395,12 +405,18 @@ share/gramps/Filters/Rules/Person/_HasIdOf.pyo
 share/gramps/Filters/Rules/Person/_HasLDS.py
 share/gramps/Filters/Rules/Person/_HasLDS.pyc
 share/gramps/Filters/Rules/Person/_HasLDS.pyo
-share/gramps/Filters/Rules/Person/_HasMarkerOf.py
-share/gramps/Filters/Rules/Person/_HasMarkerOf.pyc
-share/gramps/Filters/Rules/Person/_HasMarkerOf.pyo
 share/gramps/Filters/Rules/Person/_HasNameOf.py
 share/gramps/Filters/Rules/Person/_HasNameOf.pyc
 share/gramps/Filters/Rules/Person/_HasNameOf.pyo
+share/gramps/Filters/Rules/Person/_HasNameOriginType.py
+share/gramps/Filters/Rules/Person/_HasNameOriginType.pyc
+share/gramps/Filters/Rules/Person/_HasNameOriginType.pyo
+share/gramps/Filters/Rules/Person/_HasNameType.py
+share/gramps/Filters/Rules/Person/_HasNameType.pyc
+share/gramps/Filters/Rules/Person/_HasNameType.pyo
+share/gramps/Filters/Rules/Person/_HasNickname.py
+share/gramps/Filters/Rules/Person/_HasNickname.pyc
+share/gramps/Filters/Rules/Person/_HasNickname.pyo
 share/gramps/Filters/Rules/Person/_HasNote.py
 share/gramps/Filters/Rules/Person/_HasNote.pyc
 share/gramps/Filters/Rules/Person/_HasNote.pyo
@@ -419,6 +435,9 @@ share/gramps/Filters/Rules/Person/_HasSource.pyo
 share/gramps/Filters/Rules/Person/_HasSourceOf.py
 share/gramps/Filters/Rules/Person/_HasSourceOf.pyc
 share/gramps/Filters/Rules/Person/_HasSourceOf.pyo
+share/gramps/Filters/Rules/Person/_HasTag.py
+share/gramps/Filters/Rules/Person/_HasTag.pyc
+share/gramps/Filters/Rules/Person/_HasTag.pyo
 share/gramps/Filters/Rules/Person/_HasTextMatchingRegexpOf.py
 share/gramps/Filters/Rules/Person/_HasTextMatchingRegexpOf.pyc
 share/gramps/Filters/Rules/Person/_HasTextMatchingRegexpOf.pyo
@@ -461,6 +480,9 @@ share/gramps/Filters/Rules/Person/_IsDescendantOf.pyo
 share/gramps/Filters/Rules/Person/_IsDescendantOfFilterMatch.py
 share/gramps/Filters/Rules/Person/_IsDescendantOfFilterMatch.pyc
 share/gramps/Filters/Rules/Person/_IsDescendantOfFilterMatch.pyo
+share/gramps/Filters/Rules/Person/_IsDuplicatedAncestorOf.py
+share/gramps/Filters/Rules/Person/_IsDuplicatedAncestorOf.pyc
+share/gramps/Filters/Rules/Person/_IsDuplicatedAncestorOf.pyo
 share/gramps/Filters/Rules/Person/_IsFemale.py
 share/gramps/Filters/Rules/Person/_IsFemale.pyc
 share/gramps/Filters/Rules/Person/_IsFemale.pyo
@@ -506,6 +528,9 @@ share/gramps/Filters/Rules/Person/_MatchesEventFilter.pyo
 share/gramps/Filters/Rules/Person/_MatchesFilter.py
 share/gramps/Filters/Rules/Person/_MatchesFilter.pyc
 share/gramps/Filters/Rules/Person/_MatchesFilter.pyo
+share/gramps/Filters/Rules/Person/_MatchesSourceConfidence.py
+share/gramps/Filters/Rules/Person/_MatchesSourceConfidence.pyc
+share/gramps/Filters/Rules/Person/_MatchesSourceConfidence.pyo
 share/gramps/Filters/Rules/Person/_MissingParent.py
 share/gramps/Filters/Rules/Person/_MissingParent.pyc
 share/gramps/Filters/Rules/Person/_MissingParent.pyo
@@ -518,6 +543,9 @@ share/gramps/Filters/Rules/Person/_NeverMarried.pyo
 share/gramps/Filters/Rules/Person/_NoBirthdate.py
 share/gramps/Filters/Rules/Person/_NoBirthdate.pyc
 share/gramps/Filters/Rules/Person/_NoBirthdate.pyo
+share/gramps/Filters/Rules/Person/_NoDeathdate.py
+share/gramps/Filters/Rules/Person/_NoDeathdate.pyc
+share/gramps/Filters/Rules/Person/_NoDeathdate.pyo
 share/gramps/Filters/Rules/Person/_PeoplePrivate.py
 share/gramps/Filters/Rules/Person/_PeoplePrivate.pyc
 share/gramps/Filters/Rules/Person/_PeoplePrivate.pyo
@@ -617,6 +645,9 @@ share/gramps/Filters/Rules/Repository/_HasRepo.pyo
 share/gramps/Filters/Rules/Repository/_MatchesFilter.py
 share/gramps/Filters/Rules/Repository/_MatchesFilter.pyc
 share/gramps/Filters/Rules/Repository/_MatchesFilter.pyo
+share/gramps/Filters/Rules/Repository/_MatchesNameSubstringOf.py
+share/gramps/Filters/Rules/Repository/_MatchesNameSubstringOf.pyc
+share/gramps/Filters/Rules/Repository/_MatchesNameSubstringOf.pyo
 share/gramps/Filters/Rules/Repository/_RegExpIdOf.py
 share/gramps/Filters/Rules/Repository/_RegExpIdOf.pyc
 share/gramps/Filters/Rules/Repository/_RegExpIdOf.pyo
@@ -653,12 +684,21 @@ share/gramps/Filters/Rules/Source/_HasReferenceCountOf.pyo
 share/gramps/Filters/Rules/Source/_HasRepository.py
 share/gramps/Filters/Rules/Source/_HasRepository.pyc
 share/gramps/Filters/Rules/Source/_HasRepository.pyo
+share/gramps/Filters/Rules/Source/_HasRepositoryCallNumberRef.py
+share/gramps/Filters/Rules/Source/_HasRepositoryCallNumberRef.pyc
+share/gramps/Filters/Rules/Source/_HasRepositoryCallNumberRef.pyo
 share/gramps/Filters/Rules/Source/_HasSource.py
 share/gramps/Filters/Rules/Source/_HasSource.pyc
 share/gramps/Filters/Rules/Source/_HasSource.pyo
 share/gramps/Filters/Rules/Source/_MatchesFilter.py
 share/gramps/Filters/Rules/Source/_MatchesFilter.pyc
 share/gramps/Filters/Rules/Source/_MatchesFilter.pyo
+share/gramps/Filters/Rules/Source/_MatchesRepositoryFilter.py
+share/gramps/Filters/Rules/Source/_MatchesRepositoryFilter.pyc
+share/gramps/Filters/Rules/Source/_MatchesRepositoryFilter.pyo
+share/gramps/Filters/Rules/Source/_MatchesTitleSubstringOf.py
+share/gramps/Filters/Rules/Source/_MatchesTitleSubstringOf.pyc
+share/gramps/Filters/Rules/Source/_MatchesTitleSubstringOf.pyo
 share/gramps/Filters/Rules/Source/_RegExpIdOf.py
 share/gramps/Filters/Rules/Source/_RegExpIdOf.pyc
 share/gramps/Filters/Rules/Source/_RegExpIdOf.pyo
@@ -689,9 +729,6 @@ share/gramps/Filters/Rules/_HasGrampsId.pyo
 share/gramps/Filters/Rules/_HasLDSBase.py
 share/gramps/Filters/Rules/_HasLDSBase.pyc
 share/gramps/Filters/Rules/_HasLDSBase.pyo
-share/gramps/Filters/Rules/_HasMarkerBase.py
-share/gramps/Filters/Rules/_HasMarkerBase.pyc
-share/gramps/Filters/Rules/_HasMarkerBase.pyo
 share/gramps/Filters/Rules/_HasNoteBase.py
 share/gramps/Filters/Rules/_HasNoteBase.pyc
 share/gramps/Filters/Rules/_HasNoteBase.pyo
@@ -707,6 +744,9 @@ share/gramps/Filters/Rules/_HasReferenceCountBase.pyo
 share/gramps/Filters/Rules/_HasSourceBase.py
 share/gramps/Filters/Rules/_HasSourceBase.pyc
 share/gramps/Filters/Rules/_HasSourceBase.pyo
+share/gramps/Filters/Rules/_HasTagBase.py
+share/gramps/Filters/Rules/_HasTagBase.pyc
+share/gramps/Filters/Rules/_HasTagBase.pyo
 share/gramps/Filters/Rules/_HasTextMatchingRegexpOf.py
 share/gramps/Filters/Rules/_HasTextMatchingRegexpOf.pyc
 share/gramps/Filters/Rules/_HasTextMatchingRegexpOf.pyo
@@ -722,6 +762,9 @@ share/gramps/Filters/Rules/_MatchesEventFilterBase.pyo
 share/gramps/Filters/Rules/_MatchesFilterBase.py
 share/gramps/Filters/Rules/_MatchesFilterBase.pyc
 share/gramps/Filters/Rules/_MatchesFilterBase.pyo
+share/gramps/Filters/Rules/_MatchesSourceConfidenceBase.py
+share/gramps/Filters/Rules/_MatchesSourceConfidenceBase.pyc
+share/gramps/Filters/Rules/_MatchesSourceConfidenceBase.pyo
 share/gramps/Filters/Rules/_MatchesSourceFilterBase.py
 share/gramps/Filters/Rules/_MatchesSourceFilterBase.pyc
 share/gramps/Filters/Rules/_MatchesSourceFilterBase.pyo
@@ -794,9 +837,6 @@ share/gramps/Filters/_SearchFilter.pyo
 share/gramps/Filters/__init__.py
 share/gramps/Filters/__init__.pyc
 share/gramps/Filters/__init__.pyo
-share/gramps/GrampsAboutDialog.py
-share/gramps/GrampsAboutDialog.pyc
-share/gramps/GrampsAboutDialog.pyo
 share/gramps/GrampsDisplay.py
 share/gramps/GrampsDisplay.pyc
 share/gramps/GrampsDisplay.pyo
@@ -833,42 +873,42 @@ share/gramps/ListModel.pyo
 share/gramps/Lru.py
 share/gramps/Lru.pyc
 share/gramps/Lru.pyo
+share/gramps/MacTransUtils.py
+share/gramps/MacTransUtils.pyc
+share/gramps/MacTransUtils.pyo
 share/gramps/ManagedWindow.py
 share/gramps/ManagedWindow.pyc
 share/gramps/ManagedWindow.pyo
-share/gramps/Merge/_MergePerson.py
-share/gramps/Merge/_MergePerson.pyc
-share/gramps/Merge/_MergePerson.pyo
-share/gramps/Merge/_MergePlace.py
-share/gramps/Merge/_MergePlace.pyc
-share/gramps/Merge/_MergePlace.pyo
-share/gramps/Merge/_MergeSource.py
-share/gramps/Merge/_MergeSource.pyc
-share/gramps/Merge/_MergeSource.pyo
 share/gramps/Merge/__init__.py
 share/gramps/Merge/__init__.pyc
 share/gramps/Merge/__init__.pyo
+share/gramps/Merge/mergeevent.py
+share/gramps/Merge/mergeevent.pyc
+share/gramps/Merge/mergeevent.pyo
+share/gramps/Merge/mergefamily.py
+share/gramps/Merge/mergefamily.pyc
+share/gramps/Merge/mergefamily.pyo
+share/gramps/Merge/mergemedia.py
+share/gramps/Merge/mergemedia.pyc
+share/gramps/Merge/mergemedia.pyo
+share/gramps/Merge/mergenote.py
+share/gramps/Merge/mergenote.pyc
+share/gramps/Merge/mergenote.pyo
+share/gramps/Merge/mergeperson.py
+share/gramps/Merge/mergeperson.pyc
+share/gramps/Merge/mergeperson.pyo
+share/gramps/Merge/mergeplace.py
+share/gramps/Merge/mergeplace.pyc
+share/gramps/Merge/mergeplace.pyo
+share/gramps/Merge/mergerepository.py
+share/gramps/Merge/mergerepository.pyc
+share/gramps/Merge/mergerepository.pyo
+share/gramps/Merge/mergesource.py
+share/gramps/Merge/mergesource.pyc
+share/gramps/Merge/mergesource.pyo
 share/gramps/PlaceUtils.py
 share/gramps/PlaceUtils.pyc
 share/gramps/PlaceUtils.pyo
-share/gramps/PluginUtils/_GuiOptions.py
-share/gramps/PluginUtils/_GuiOptions.pyc
-share/gramps/PluginUtils/_GuiOptions.pyo
-share/gramps/PluginUtils/_Options.py
-share/gramps/PluginUtils/_Options.pyc
-share/gramps/PluginUtils/_Options.pyo
-share/gramps/PluginUtils/_PluginDialogs.py
-share/gramps/PluginUtils/_PluginDialogs.pyc
-share/gramps/PluginUtils/_PluginDialogs.pyo
-share/gramps/PluginUtils/_PluginWindows.py
-share/gramps/PluginUtils/_PluginWindows.pyc
-share/gramps/PluginUtils/_PluginWindows.pyo
-share/gramps/PluginUtils/_Tool.py
-share/gramps/PluginUtils/_Tool.pyc
-share/gramps/PluginUtils/_Tool.pyo
-share/gramps/PluginUtils/__init__.py
-share/gramps/PluginUtils/__init__.pyc
-share/gramps/PluginUtils/__init__.pyo
 share/gramps/QuestionDialog.py
 share/gramps/QuestionDialog.pyc
 share/gramps/QuestionDialog.pyo
@@ -884,60 +924,6 @@ share/gramps/Relationship.pyo
 share/gramps/Reorder.py
 share/gramps/Reorder.pyc
 share/gramps/Reorder.pyo
-share/gramps/ReportBase/_Bibliography.py
-share/gramps/ReportBase/_Bibliography.pyc
-share/gramps/ReportBase/_Bibliography.pyo
-share/gramps/ReportBase/_CommandLineReport.py
-share/gramps/ReportBase/_CommandLineReport.pyc
-share/gramps/ReportBase/_CommandLineReport.pyo
-share/gramps/ReportBase/_Constants.py
-share/gramps/ReportBase/_Constants.pyc
-share/gramps/ReportBase/_Constants.pyo
-share/gramps/ReportBase/_DocReportDialog.py
-share/gramps/ReportBase/_DocReportDialog.pyc
-share/gramps/ReportBase/_DocReportDialog.pyo
-share/gramps/ReportBase/_DrawReportDialog.py
-share/gramps/ReportBase/_DrawReportDialog.pyc
-share/gramps/ReportBase/_DrawReportDialog.pyo
-share/gramps/ReportBase/_Endnotes.py
-share/gramps/ReportBase/_Endnotes.pyc
-share/gramps/ReportBase/_Endnotes.pyo
-share/gramps/ReportBase/_FileEntry.py
-share/gramps/ReportBase/_FileEntry.pyc
-share/gramps/ReportBase/_FileEntry.pyo
-share/gramps/ReportBase/_GraphvizReportDialog.py
-share/gramps/ReportBase/_GraphvizReportDialog.pyc
-share/gramps/ReportBase/_GraphvizReportDialog.pyo
-share/gramps/ReportBase/_PaperMenu.py
-share/gramps/ReportBase/_PaperMenu.pyc
-share/gramps/ReportBase/_PaperMenu.pyo
-share/gramps/ReportBase/_Report.py
-share/gramps/ReportBase/_Report.pyc
-share/gramps/ReportBase/_Report.pyo
-share/gramps/ReportBase/_ReportDialog.py
-share/gramps/ReportBase/_ReportDialog.pyc
-share/gramps/ReportBase/_ReportDialog.pyo
-share/gramps/ReportBase/_ReportOptions.py
-share/gramps/ReportBase/_ReportOptions.pyc
-share/gramps/ReportBase/_ReportOptions.pyo
-share/gramps/ReportBase/_ReportUtils.py
-share/gramps/ReportBase/_ReportUtils.pyc
-share/gramps/ReportBase/_ReportUtils.pyo
-share/gramps/ReportBase/_StyleComboBox.py
-share/gramps/ReportBase/_StyleComboBox.pyc
-share/gramps/ReportBase/_StyleComboBox.pyo
-share/gramps/ReportBase/_StyleEditor.py
-share/gramps/ReportBase/_StyleEditor.pyc
-share/gramps/ReportBase/_StyleEditor.pyo
-share/gramps/ReportBase/_TextReportDialog.py
-share/gramps/ReportBase/_TextReportDialog.pyc
-share/gramps/ReportBase/_TextReportDialog.pyo
-share/gramps/ReportBase/_WebReportDialog.py
-share/gramps/ReportBase/_WebReportDialog.pyc
-share/gramps/ReportBase/_WebReportDialog.pyo
-share/gramps/ReportBase/__init__.py
-share/gramps/ReportBase/__init__.pyc
-share/gramps/ReportBase/__init__.pyo
 share/gramps/ScratchPad.py
 share/gramps/ScratchPad.pyc
 share/gramps/ScratchPad.pyo
@@ -959,9 +945,6 @@ share/gramps/Sort.pyo
 share/gramps/Spell.py
 share/gramps/Spell.pyc
 share/gramps/Spell.pyo
-share/gramps/SubstKeywords.py
-share/gramps/SubstKeywords.pyc
-share/gramps/SubstKeywords.pyo
 share/gramps/ThumbNails.py
 share/gramps/ThumbNails.pyc
 share/gramps/ThumbNails.pyo
@@ -998,6 +981,9 @@ share/gramps/cli/clidbman.pyo
 share/gramps/cli/grampscli.py
 share/gramps/cli/grampscli.pyc
 share/gramps/cli/grampscli.pyo
+share/gramps/cli/plug/__init__.py
+share/gramps/cli/plug/__init__.pyc
+share/gramps/cli/plug/__init__.pyo
 share/gramps/config.py
 share/gramps/config.pyc
 share/gramps/config.pyo
@@ -1007,23 +993,7 @@ share/gramps/const.pyo
 share/gramps/constfunc.py
 share/gramps/constfunc.pyc
 share/gramps/constfunc.pyo
-share/gramps/data/GeoView.css
-share/gramps/data/Web_Basic-Ash.css
-share/gramps/data/Web_Basic-Blue.css
-share/gramps/data/Web_Basic-Cypress.css
-share/gramps/data/Web_Basic-Lilac.css
-share/gramps/data/Web_Basic-Peach.css
-share/gramps/data/Web_Basic-Spruce.css
-share/gramps/data/Web_Mainz.css
-share/gramps/data/Web_Navigation-Horizontal.css
-share/gramps/data/Web_Navigation-Vertical.css
-share/gramps/data/Web_Nebraska.css
-share/gramps/data/Web_Print-Default.css
-share/gramps/data/Web_Visually.css
-share/gramps/data/ancestortree.css
 share/gramps/data/authors.xml
-share/gramps/data/behaviour.css
-share/gramps/data/gedcom.xml
 share/gramps/data/lds.xml
 share/gramps/data/papersize.xml
 share/gramps/data/tips.xml
@@ -1127,6 +1097,9 @@ share/gramps/gen/lib/childref.pyo
 share/gramps/gen/lib/childreftype.py
 share/gramps/gen/lib/childreftype.pyc
 share/gramps/gen/lib/childreftype.pyo
+share/gramps/gen/lib/const.py
+share/gramps/gen/lib/const.pyc
+share/gramps/gen/lib/const.pyo
 share/gramps/gen/lib/date.py
 share/gramps/gen/lib/date.pyc
 share/gramps/gen/lib/date.pyo
@@ -1184,6 +1157,9 @@ share/gramps/gen/lib/mediaref.pyo
 share/gramps/gen/lib/name.py
 share/gramps/gen/lib/name.pyc
 share/gramps/gen/lib/name.pyo
+share/gramps/gen/lib/nameorigintype.py
+share/gramps/gen/lib/nameorigintype.pyc
+share/gramps/gen/lib/nameorigintype.pyo
 share/gramps/gen/lib/nametype.py
 share/gramps/gen/lib/nametype.pyc
 share/gramps/gen/lib/nametype.pyo
@@ -1259,6 +1235,21 @@ share/gramps/gen/lib/styledtexttag.pyo
 share/gramps/gen/lib/styledtexttagtype.py
 share/gramps/gen/lib/styledtexttagtype.pyc
 share/gramps/gen/lib/styledtexttagtype.pyo
+share/gramps/gen/lib/surname.py
+share/gramps/gen/lib/surname.pyc
+share/gramps/gen/lib/surname.pyo
+share/gramps/gen/lib/surnamebase.py
+share/gramps/gen/lib/surnamebase.pyc
+share/gramps/gen/lib/surnamebase.pyo
+share/gramps/gen/lib/tableobj.py
+share/gramps/gen/lib/tableobj.pyc
+share/gramps/gen/lib/tableobj.pyo
+share/gramps/gen/lib/tag.py
+share/gramps/gen/lib/tag.pyc
+share/gramps/gen/lib/tag.pyo
+share/gramps/gen/lib/tagbase.py
+share/gramps/gen/lib/tagbase.pyc
+share/gramps/gen/lib/tagbase.pyo
 share/gramps/gen/lib/url.py
 share/gramps/gen/lib/url.pyc
 share/gramps/gen/lib/url.pyo
@@ -1301,6 +1292,9 @@ share/gramps/gen/plug/_import.pyo
 share/gramps/gen/plug/_manager.py
 share/gramps/gen/plug/_manager.pyc
 share/gramps/gen/plug/_manager.pyo
+share/gramps/gen/plug/_options.py
+share/gramps/gen/plug/_options.pyc
+share/gramps/gen/plug/_options.pyo
 share/gramps/gen/plug/_plugin.py
 share/gramps/gen/plug/_plugin.pyc
 share/gramps/gen/plug/_plugin.pyo
@@ -1412,6 +1406,30 @@ share/gramps/gen/plug/menu/_surnamecolor.pyo
 share/gramps/gen/plug/menu/_text.py
 share/gramps/gen/plug/menu/_text.pyc
 share/gramps/gen/plug/menu/_text.pyo
+share/gramps/gen/plug/report/__init__.py
+share/gramps/gen/plug/report/__init__.pyc
+share/gramps/gen/plug/report/__init__.pyo
+share/gramps/gen/plug/report/_bibliography.py
+share/gramps/gen/plug/report/_bibliography.pyc
+share/gramps/gen/plug/report/_bibliography.pyo
+share/gramps/gen/plug/report/_constants.py
+share/gramps/gen/plug/report/_constants.pyc
+share/gramps/gen/plug/report/_constants.pyo
+share/gramps/gen/plug/report/_options.py
+share/gramps/gen/plug/report/_options.pyc
+share/gramps/gen/plug/report/_options.pyo
+share/gramps/gen/plug/report/_paper.py
+share/gramps/gen/plug/report/_paper.pyc
+share/gramps/gen/plug/report/_paper.pyo
+share/gramps/gen/plug/report/_reportbase.py
+share/gramps/gen/plug/report/_reportbase.pyc
+share/gramps/gen/plug/report/_reportbase.pyo
+share/gramps/gen/plug/report/endnotes.py
+share/gramps/gen/plug/report/endnotes.pyc
+share/gramps/gen/plug/report/endnotes.pyo
+share/gramps/gen/plug/report/utils.py
+share/gramps/gen/plug/report/utils.pyc
+share/gramps/gen/plug/report/utils.pyo
 share/gramps/gen/plug/utils.py
 share/gramps/gen/plug/utils.pyc
 share/gramps/gen/plug/utils.pyo
@@ -1433,6 +1451,9 @@ share/gramps/gen/proxy/proxybase.pyo
 share/gramps/gen/proxy/referenced.py
 share/gramps/gen/proxy/referenced.pyc
 share/gramps/gen/proxy/referenced.pyo
+share/gramps/gen/proxy/referencedbyselection.py
+share/gramps/gen/proxy/referencedbyselection.pyc
+share/gramps/gen/proxy/referencedbyselection.pyo
 share/gramps/gen/updatecallback.py
 share/gramps/gen/updatecallback.pyc
 share/gramps/gen/updatecallback.pyo
@@ -1467,6 +1488,7 @@ share/gramps/glade/editevent.glade
 share/gramps/glade/editeventref.glade
 share/gramps/glade/editfamily.glade
 share/gramps/glade/editldsord.glade
+share/gramps/glade/editlink.glade
 share/gramps/glade/editlocation.glade
 share/gramps/glade/editmedia.glade
 share/gramps/glade/editmediaref.glade
@@ -1483,6 +1505,14 @@ share/gramps/glade/editurl.glade
 share/gramps/glade/grampletpane.glade
 share/gramps/glade/gramps.glade
 share/gramps/glade/mergedata.glade
+share/gramps/glade/mergeevent.glade
+share/gramps/glade/mergefamily.glade
+share/gramps/glade/mergemedia.glade
+share/gramps/glade/mergenote.glade
+share/gramps/glade/mergeperson.glade
+share/gramps/glade/mergeplace.glade
+share/gramps/glade/mergerepository.glade
+share/gramps/glade/mergesource.glade
 share/gramps/glade/papermenu.glade
 share/gramps/glade/plugins.glade
 share/gramps/glade/questiondialog.glade
@@ -1491,12 +1521,19 @@ share/gramps/glade/rule.glade
 share/gramps/glade/scratchpad.glade
 share/gramps/glade/styleeditor.glade
 share/gramps/glade/tipofday.glade
+share/gramps/glade/updateaddons.glade
 share/gramps/gramps.py
 share/gramps/gramps.pyc
 share/gramps/gramps.pyo
 share/gramps/gui/__init__.py
 share/gramps/gui/__init__.pyc
 share/gramps/gui/__init__.pyo
+share/gramps/gui/aboutdialog.py
+share/gramps/gui/aboutdialog.pyc
+share/gramps/gui/aboutdialog.pyo
+share/gramps/gui/basesidebar.py
+share/gramps/gui/basesidebar.pyc
+share/gramps/gui/basesidebar.pyo
 share/gramps/gui/columnorder.py
 share/gramps/gui/columnorder.pyc
 share/gramps/gui/columnorder.pyo
@@ -1638,6 +1675,12 @@ share/gramps/gui/editors/displaytabs/sourceembedlist.pyo
 share/gramps/gui/editors/displaytabs/sourcerefmodel.py
 share/gramps/gui/editors/displaytabs/sourcerefmodel.pyc
 share/gramps/gui/editors/displaytabs/sourcerefmodel.pyo
+share/gramps/gui/editors/displaytabs/surnamemodel.py
+share/gramps/gui/editors/displaytabs/surnamemodel.pyc
+share/gramps/gui/editors/displaytabs/surnamemodel.pyo
+share/gramps/gui/editors/displaytabs/surnametab.py
+share/gramps/gui/editors/displaytabs/surnametab.pyc
+share/gramps/gui/editors/displaytabs/surnametab.pyo
 share/gramps/gui/editors/displaytabs/webembedlist.py
 share/gramps/gui/editors/displaytabs/webembedlist.pyc
 share/gramps/gui/editors/displaytabs/webembedlist.pyo
@@ -1665,6 +1708,9 @@ share/gramps/gui/editors/editfamily.pyo
 share/gramps/gui/editors/editldsord.py
 share/gramps/gui/editors/editldsord.pyc
 share/gramps/gui/editors/editldsord.pyo
+share/gramps/gui/editors/editlink.py
+share/gramps/gui/editors/editlink.pyc
+share/gramps/gui/editors/editlink.pyo
 share/gramps/gui/editors/editlocation.py
 share/gramps/gui/editors/editlocation.pyc
 share/gramps/gui/editors/editlocation.pyo
@@ -1719,9 +1765,69 @@ share/gramps/gui/editors/objectentries.pyo
 share/gramps/gui/filtereditor.py
 share/gramps/gui/filtereditor.pyc
 share/gramps/gui/filtereditor.pyo
+share/gramps/gui/grampsbar.py
+share/gramps/gui/grampsbar.pyc
+share/gramps/gui/grampsbar.pyo
 share/gramps/gui/grampsgui.py
 share/gramps/gui/grampsgui.pyc
 share/gramps/gui/grampsgui.pyo
+share/gramps/gui/makefilter.py
+share/gramps/gui/makefilter.pyc
+share/gramps/gui/makefilter.pyo
+share/gramps/gui/navigator.py
+share/gramps/gui/navigator.pyc
+share/gramps/gui/navigator.pyo
+share/gramps/gui/plug/__init__.py
+share/gramps/gui/plug/__init__.pyc
+share/gramps/gui/plug/__init__.pyo
+share/gramps/gui/plug/_dialogs.py
+share/gramps/gui/plug/_dialogs.pyc
+share/gramps/gui/plug/_dialogs.pyo
+share/gramps/gui/plug/_guioptions.py
+share/gramps/gui/plug/_guioptions.pyc
+share/gramps/gui/plug/_guioptions.pyo
+share/gramps/gui/plug/_windows.py
+share/gramps/gui/plug/_windows.pyc
+share/gramps/gui/plug/_windows.pyo
+share/gramps/gui/plug/report/__init__.py
+share/gramps/gui/plug/report/__init__.pyc
+share/gramps/gui/plug/report/__init__.pyo
+share/gramps/gui/plug/report/_docreportdialog.py
+share/gramps/gui/plug/report/_docreportdialog.pyc
+share/gramps/gui/plug/report/_docreportdialog.pyo
+share/gramps/gui/plug/report/_drawreportdialog.py
+share/gramps/gui/plug/report/_drawreportdialog.pyc
+share/gramps/gui/plug/report/_drawreportdialog.pyo
+share/gramps/gui/plug/report/_fileentry.py
+share/gramps/gui/plug/report/_fileentry.pyc
+share/gramps/gui/plug/report/_fileentry.pyo
+share/gramps/gui/plug/report/_graphvizreportdialog.py
+share/gramps/gui/plug/report/_graphvizreportdialog.pyc
+share/gramps/gui/plug/report/_graphvizreportdialog.pyo
+share/gramps/gui/plug/report/_options.py
+share/gramps/gui/plug/report/_options.pyc
+share/gramps/gui/plug/report/_options.pyo
+share/gramps/gui/plug/report/_papermenu.py
+share/gramps/gui/plug/report/_papermenu.pyc
+share/gramps/gui/plug/report/_papermenu.pyo
+share/gramps/gui/plug/report/_reportdialog.py
+share/gramps/gui/plug/report/_reportdialog.pyc
+share/gramps/gui/plug/report/_reportdialog.pyo
+share/gramps/gui/plug/report/_stylecombobox.py
+share/gramps/gui/plug/report/_stylecombobox.pyc
+share/gramps/gui/plug/report/_stylecombobox.pyo
+share/gramps/gui/plug/report/_styleeditor.py
+share/gramps/gui/plug/report/_styleeditor.pyc
+share/gramps/gui/plug/report/_styleeditor.pyo
+share/gramps/gui/plug/report/_textreportdialog.py
+share/gramps/gui/plug/report/_textreportdialog.pyc
+share/gramps/gui/plug/report/_textreportdialog.pyo
+share/gramps/gui/plug/report/_webreportdialog.py
+share/gramps/gui/plug/report/_webreportdialog.pyc
+share/gramps/gui/plug/report/_webreportdialog.pyo
+share/gramps/gui/plug/tool.py
+share/gramps/gui/plug/tool.pyc
+share/gramps/gui/plug/tool.pyo
 share/gramps/gui/pluginmanager.py
 share/gramps/gui/pluginmanager.pyc
 share/gramps/gui/pluginmanager.pyo
@@ -1779,6 +1885,9 @@ share/gramps/gui/views/navigationview.pyo
 share/gramps/gui/views/pageview.py
 share/gramps/gui/views/pageview.pyc
 share/gramps/gui/views/pageview.pyo
+share/gramps/gui/views/tags.py
+share/gramps/gui/views/tags.pyc
+share/gramps/gui/views/tags.pyo
 share/gramps/gui/views/treemodels/__init__.py
 share/gramps/gui/views/treemodels/__init__.pyc
 share/gramps/gui/views/treemodels/__init__.pyo
@@ -1836,6 +1945,12 @@ share/gramps/gui/widgets/menutoolbuttonaction.pyo
 share/gramps/gui/widgets/monitoredwidgets.py
 share/gramps/gui/widgets/monitoredwidgets.pyc
 share/gramps/gui/widgets/monitoredwidgets.pyo
+share/gramps/gui/widgets/multitreeview.py
+share/gramps/gui/widgets/multitreeview.pyc
+share/gramps/gui/widgets/multitreeview.pyo
+share/gramps/gui/widgets/photo.py
+share/gramps/gui/widgets/photo.pyc
+share/gramps/gui/widgets/photo.pyo
 share/gramps/gui/widgets/progressdialog.py
 share/gramps/gui/widgets/progressdialog.pyc
 share/gramps/gui/widgets/progressdialog.pyo
@@ -1854,9 +1969,21 @@ share/gramps/gui/widgets/styledtextbuffer.pyo
 share/gramps/gui/widgets/styledtexteditor.py
 share/gramps/gui/widgets/styledtexteditor.pyc
 share/gramps/gui/widgets/styledtexteditor.pyo
+share/gramps/gui/widgets/tageditor.py
+share/gramps/gui/widgets/tageditor.pyc
+share/gramps/gui/widgets/tageditor.pyo
 share/gramps/gui/widgets/toolcomboentry.py
 share/gramps/gui/widgets/toolcomboentry.pyc
 share/gramps/gui/widgets/toolcomboentry.pyo
+share/gramps/gui/widgets/undoablebuffer.py
+share/gramps/gui/widgets/undoablebuffer.pyc
+share/gramps/gui/widgets/undoablebuffer.pyo
+share/gramps/gui/widgets/undoableentry.py
+share/gramps/gui/widgets/undoableentry.pyc
+share/gramps/gui/widgets/undoableentry.pyo
+share/gramps/gui/widgets/undoablestyledbuffer.py
+share/gramps/gui/widgets/undoablestyledbuffer.pyc
+share/gramps/gui/widgets/undoablestyledbuffer.pyo
 share/gramps/gui/widgets/validatedcomboentry.py
 share/gramps/gui/widgets/validatedcomboentry.pyc
 share/gramps/gui/widgets/validatedcomboentry.pyo
@@ -1892,12 +2019,11 @@ share/gramps/images/16x16/gramps-fanchart.png
 share/gramps/images/16x16/gramps-font-bgcolor.png
 share/gramps/images/16x16/gramps-font-color.png
 share/gramps/images/16x16/gramps-font.png
-share/gramps/images/16x16/gramps-geo-altmap.png
-share/gramps/images/16x16/gramps-geo-mainmap.png
 share/gramps/images/16x16/gramps-geo.png
 share/gramps/images/16x16/gramps-gramplet.png
 share/gramps/images/16x16/gramps-lock.png
 share/gramps/images/16x16/gramps-media.png
+share/gramps/images/16x16/gramps-merge.png
 share/gramps/images/16x16/gramps-notes.png
 share/gramps/images/16x16/gramps-parents-add.png
 share/gramps/images/16x16/gramps-parents-open.png
@@ -1910,6 +2036,8 @@ share/gramps/images/16x16/gramps-reports.png
 share/gramps/images/16x16/gramps-repository.png
 share/gramps/images/16x16/gramps-source.png
 share/gramps/images/16x16/gramps-spouse.png
+share/gramps/images/16x16/gramps-tag-new.png
+share/gramps/images/16x16/gramps-tag.png
 share/gramps/images/16x16/gramps-tools.png
 share/gramps/images/16x16/gramps-tree-group.png
 share/gramps/images/16x16/gramps-tree-list.png
@@ -1946,11 +2074,15 @@ share/gramps/images/22x22/gramps-font-bgcolor.png
 share/gramps/images/22x22/gramps-font-color.png
 share/gramps/images/22x22/gramps-font.png
 share/gramps/images/22x22/gramps-geo-altmap.png
+share/gramps/images/22x22/gramps-geo-birth.png
+share/gramps/images/22x22/gramps-geo-death.png
 share/gramps/images/22x22/gramps-geo-mainmap.png
+share/gramps/images/22x22/gramps-geo-marriage.png
 share/gramps/images/22x22/gramps-geo.png
 share/gramps/images/22x22/gramps-gramplet.png
 share/gramps/images/22x22/gramps-lock.png
 share/gramps/images/22x22/gramps-media.png
+share/gramps/images/22x22/gramps-merge.png
 share/gramps/images/22x22/gramps-notes.png
 share/gramps/images/22x22/gramps-parents-add.png
 share/gramps/images/22x22/gramps-parents-open.png
@@ -1963,6 +2095,8 @@ share/gramps/images/22x22/gramps-reports.png
 share/gramps/images/22x22/gramps-repository.png
 share/gramps/images/22x22/gramps-source.png
 share/gramps/images/22x22/gramps-spouse.png
+share/gramps/images/22x22/gramps-tag-new.png
+share/gramps/images/22x22/gramps-tag.png
 share/gramps/images/22x22/gramps-tools.png
 share/gramps/images/22x22/gramps-tree-group.png
 share/gramps/images/22x22/gramps-tree-list.png
@@ -1999,11 +2133,15 @@ share/gramps/images/48x48/gramps-font-bgcolor.png
 share/gramps/images/48x48/gramps-font-color.png
 share/gramps/images/48x48/gramps-font.png
 share/gramps/images/48x48/gramps-geo-altmap.png
+share/gramps/images/48x48/gramps-geo-birth.png
+share/gramps/images/48x48/gramps-geo-death.png
 share/gramps/images/48x48/gramps-geo-mainmap.png
+share/gramps/images/48x48/gramps-geo-marriage.png
 share/gramps/images/48x48/gramps-geo.png
 share/gramps/images/48x48/gramps-gramplet.png
 share/gramps/images/48x48/gramps-lock.png
 share/gramps/images/48x48/gramps-media.png
+share/gramps/images/48x48/gramps-merge.png
 share/gramps/images/48x48/gramps-notes.png
 share/gramps/images/48x48/gramps-parents-add.png
 share/gramps/images/48x48/gramps-parents-open.png
@@ -2016,6 +2154,8 @@ share/gramps/images/48x48/gramps-reports.png
 share/gramps/images/48x48/gramps-repository.png
 share/gramps/images/48x48/gramps-source.png
 share/gramps/images/48x48/gramps-spouse.png
+share/gramps/images/48x48/gramps-tag-new.png
+share/gramps/images/48x48/gramps-tag.png
 share/gramps/images/48x48/gramps-tools.png
 share/gramps/images/48x48/gramps-tree-group.png
 share/gramps/images/48x48/gramps-tree-list.png
@@ -2028,20 +2168,9 @@ share/gramps/images/48x48/gramps-zoom-fit-width.png
 share/gramps/images/48x48/gramps-zoom-in.png
 share/gramps/images/48x48/gramps-zoom-out.png
 share/gramps/images/48x48/gramps.png
-share/gramps/images/Web_Gender_Female.png
-share/gramps/images/Web_Gender_FemaleFFF.png
-share/gramps/images/Web_Gender_Male.png
-share/gramps/images/Web_Gender_MaleFFF.png
-share/gramps/images/Web_Mainz_Bkgd.png
-share/gramps/images/Web_Mainz_Header.png
-share/gramps/images/Web_Mainz_Mid.png
-share/gramps/images/Web_Mainz_MidLight.png
-share/gramps/images/bad.png
-share/gramps/images/blank.gif
-share/gramps/images/caution.png
 share/gramps/images/document.png
 share/gramps/images/favicon.ico
-share/gramps/images/good.png
+share/gramps/images/favicon2.ico
 share/gramps/images/gramps-export.png
 share/gramps/images/gramps-import.png
 share/gramps/images/gramps-undo-history.png
@@ -2074,11 +2203,15 @@ share/gramps/images/scalable/gramps-font-bgcolor.svg
 share/gramps/images/scalable/gramps-font-color.svg
 share/gramps/images/scalable/gramps-font.svg
 share/gramps/images/scalable/gramps-geo-altmap.svg
+share/gramps/images/scalable/gramps-geo-birth.svg
+share/gramps/images/scalable/gramps-geo-death.svg
 share/gramps/images/scalable/gramps-geo-mainmap.svg
+share/gramps/images/scalable/gramps-geo-marriage.svg
 share/gramps/images/scalable/gramps-geo.svg
 share/gramps/images/scalable/gramps-gramplet.svg
 share/gramps/images/scalable/gramps-lock.svg
 share/gramps/images/scalable/gramps-media.svg
+share/gramps/images/scalable/gramps-merge.svg
 share/gramps/images/scalable/gramps-notes.svg
 share/gramps/images/scalable/gramps-parents-add.svg
 share/gramps/images/scalable/gramps-parents-open.svg
@@ -2091,6 +2224,8 @@ share/gramps/images/scalable/gramps-reports.svg
 share/gramps/images/scalable/gramps-repository.svg
 share/gramps/images/scalable/gramps-source.svg
 share/gramps/images/scalable/gramps-spouse.svg
+share/gramps/images/scalable/gramps-tag-new.svg
+share/gramps/images/scalable/gramps-tag.svg
 share/gramps/images/scalable/gramps-tools.svg
 share/gramps/images/scalable/gramps-tree-group.svg
 share/gramps/images/scalable/gramps-tree-list.svg
@@ -2106,10 +2241,6 @@ share/gramps/images/scalable/gramps.svg
 share/gramps/images/somerights20.gif
 share/gramps/images/splash.jpg
 share/gramps/images/stock_link.png
-share/gramps/images/stock_new-html.png
-share/gramps/images/stock_notes.png
-share/gramps/mapstraction/crosshairs.png
-share/gramps/mapstraction/mapstraction.js
 share/gramps/plugins/BookReport.py
 share/gramps/plugins/BookReport.pyc
 share/gramps/plugins/BookReport.pyo
@@ -2199,38 +2330,72 @@ share/gramps/plugins/export/ExportXml.pyo
 share/gramps/plugins/export/export.gpr.py
 share/gramps/plugins/export/export.gpr.pyc
 share/gramps/plugins/export/export.gpr.pyo
-share/gramps/plugins/export/exportcsv.glade
-share/gramps/plugins/export/exportftree.glade
-share/gramps/plugins/export/exportgeneweb.glade
-share/gramps/plugins/export/exportvcalendar.glade
-share/gramps/plugins/export/exportvcard.glade
 share/gramps/plugins/gramplet/AgeOnDateGramplet.py
 share/gramps/plugins/gramplet/AgeOnDateGramplet.pyc
 share/gramps/plugins/gramplet/AgeOnDateGramplet.pyo
 share/gramps/plugins/gramplet/AgeStats.py
 share/gramps/plugins/gramplet/AgeStats.pyc
 share/gramps/plugins/gramplet/AgeStats.pyo
+share/gramps/plugins/gramplet/Attributes.py
+share/gramps/plugins/gramplet/Attributes.pyc
+share/gramps/plugins/gramplet/Attributes.pyo
 share/gramps/plugins/gramplet/AttributesGramplet.py
 share/gramps/plugins/gramplet/AttributesGramplet.pyc
 share/gramps/plugins/gramplet/AttributesGramplet.pyo
+share/gramps/plugins/gramplet/Backlinks.py
+share/gramps/plugins/gramplet/Backlinks.pyc
+share/gramps/plugins/gramplet/Backlinks.pyo
 share/gramps/plugins/gramplet/CalendarGramplet.py
 share/gramps/plugins/gramplet/CalendarGramplet.pyc
 share/gramps/plugins/gramplet/CalendarGramplet.pyo
+share/gramps/plugins/gramplet/Children.py
+share/gramps/plugins/gramplet/Children.pyc
+share/gramps/plugins/gramplet/Children.pyo
 share/gramps/plugins/gramplet/DescendGramplet.py
 share/gramps/plugins/gramplet/DescendGramplet.pyc
 share/gramps/plugins/gramplet/DescendGramplet.pyo
+share/gramps/plugins/gramplet/EditExifMetadata.py
+share/gramps/plugins/gramplet/EditExifMetadata.pyc
+share/gramps/plugins/gramplet/EditExifMetadata.pyo
+share/gramps/plugins/gramplet/Events.py
+share/gramps/plugins/gramplet/Events.pyc
+share/gramps/plugins/gramplet/Events.pyo
 share/gramps/plugins/gramplet/FanChartGramplet.py
 share/gramps/plugins/gramplet/FanChartGramplet.pyc
 share/gramps/plugins/gramplet/FanChartGramplet.pyo
 share/gramps/plugins/gramplet/FaqGramplet.py
 share/gramps/plugins/gramplet/FaqGramplet.pyc
 share/gramps/plugins/gramplet/FaqGramplet.pyo
+share/gramps/plugins/gramplet/Filter.py
+share/gramps/plugins/gramplet/Filter.pyc
+share/gramps/plugins/gramplet/Filter.pyo
+share/gramps/plugins/gramplet/Gallery.py
+share/gramps/plugins/gramplet/Gallery.pyc
+share/gramps/plugins/gramplet/Gallery.pyo
 share/gramps/plugins/gramplet/GivenNameGramplet.py
 share/gramps/plugins/gramplet/GivenNameGramplet.pyc
 share/gramps/plugins/gramplet/GivenNameGramplet.pyo
+share/gramps/plugins/gramplet/MediaPreview.py
+share/gramps/plugins/gramplet/MediaPreview.pyc
+share/gramps/plugins/gramplet/MediaPreview.pyo
+share/gramps/plugins/gramplet/MetadataViewer.py
+share/gramps/plugins/gramplet/MetadataViewer.pyc
+share/gramps/plugins/gramplet/MetadataViewer.pyo
+share/gramps/plugins/gramplet/Notes.py
+share/gramps/plugins/gramplet/Notes.pyc
+share/gramps/plugins/gramplet/Notes.pyo
 share/gramps/plugins/gramplet/PedigreeGramplet.py
 share/gramps/plugins/gramplet/PedigreeGramplet.pyc
 share/gramps/plugins/gramplet/PedigreeGramplet.pyo
+share/gramps/plugins/gramplet/PersonDetails.py
+share/gramps/plugins/gramplet/PersonDetails.pyc
+share/gramps/plugins/gramplet/PersonDetails.pyo
+share/gramps/plugins/gramplet/PersonResidence.py
+share/gramps/plugins/gramplet/PersonResidence.pyc
+share/gramps/plugins/gramplet/PersonResidence.pyo
+share/gramps/plugins/gramplet/PlaceDetails.py
+share/gramps/plugins/gramplet/PlaceDetails.pyc
+share/gramps/plugins/gramplet/PlaceDetails.pyo
 share/gramps/plugins/gramplet/PluginManagerGramplet.py
 share/gramps/plugins/gramplet/PluginManagerGramplet.pyc
 share/gramps/plugins/gramplet/PluginManagerGramplet.pyo
@@ -2240,9 +2405,15 @@ share/gramps/plugins/gramplet/QuickViewGramplet.pyo
 share/gramps/plugins/gramplet/RelativeGramplet.py
 share/gramps/plugins/gramplet/RelativeGramplet.pyc
 share/gramps/plugins/gramplet/RelativeGramplet.pyo
+share/gramps/plugins/gramplet/RepositoryDetails.py
+share/gramps/plugins/gramplet/RepositoryDetails.pyc
+share/gramps/plugins/gramplet/RepositoryDetails.pyo
 share/gramps/plugins/gramplet/SessionLogGramplet.py
 share/gramps/plugins/gramplet/SessionLogGramplet.pyc
 share/gramps/plugins/gramplet/SessionLogGramplet.pyo
+share/gramps/plugins/gramplet/Sources.py
+share/gramps/plugins/gramplet/Sources.pyc
+share/gramps/plugins/gramplet/Sources.pyo
 share/gramps/plugins/gramplet/StatsGramplet.py
 share/gramps/plugins/gramplet/StatsGramplet.pyc
 share/gramps/plugins/gramplet/StatsGramplet.pyo
@@ -2261,6 +2432,9 @@ share/gramps/plugins/gramplet/WelcomeGramplet.pyo
 share/gramps/plugins/gramplet/WhatsNext.py
 share/gramps/plugins/gramplet/WhatsNext.pyc
 share/gramps/plugins/gramplet/WhatsNext.pyo
+share/gramps/plugins/gramplet/bottombar.gpr.py
+share/gramps/plugins/gramplet/bottombar.gpr.pyc
+share/gramps/plugins/gramplet/bottombar.gpr.pyo
 share/gramps/plugins/gramplet/gramplet.gpr.py
 share/gramps/plugins/gramplet/gramplet.gpr.pyc
 share/gramps/plugins/gramplet/gramplet.gpr.pyo
@@ -2353,9 +2527,27 @@ share/gramps/plugins/lib/libplaceview.pyo
 share/gramps/plugins/lib/libplugins.gpr.py
 share/gramps/plugins/lib/libplugins.gpr.pyc
 share/gramps/plugins/lib/libplugins.gpr.pyo
+share/gramps/plugins/lib/libsubstkeyword.py
+share/gramps/plugins/lib/libsubstkeyword.pyc
+share/gramps/plugins/lib/libsubstkeyword.pyo
 share/gramps/plugins/lib/libtranslate.py
 share/gramps/plugins/lib/libtranslate.pyc
 share/gramps/plugins/lib/libtranslate.pyo
+share/gramps/plugins/lib/libtreebase.py
+share/gramps/plugins/lib/libtreebase.pyc
+share/gramps/plugins/lib/libtreebase.pyo
+share/gramps/plugins/lib/maps/__init__.py
+share/gramps/plugins/lib/maps/__init__.pyc
+share/gramps/plugins/lib/maps/__init__.pyo
+share/gramps/plugins/lib/maps/constants.py
+share/gramps/plugins/lib/maps/constants.pyc
+share/gramps/plugins/lib/maps/constants.pyo
+share/gramps/plugins/lib/maps/geography.py
+share/gramps/plugins/lib/maps/geography.pyc
+share/gramps/plugins/lib/maps/geography.pyo
+share/gramps/plugins/lib/maps/grampsmaps.py
+share/gramps/plugins/lib/maps/grampsmaps.pyc
+share/gramps/plugins/lib/maps/grampsmaps.pyo
 share/gramps/plugins/mapservices/eniroswedenmap.py
 share/gramps/plugins/mapservices/eniroswedenmap.pyc
 share/gramps/plugins/mapservices/eniroswedenmap.pyo
@@ -2377,6 +2569,9 @@ share/gramps/plugins/quickview/AttributeMatch.pyo
 share/gramps/plugins/quickview/FilterByName.py
 share/gramps/plugins/quickview/FilterByName.pyc
 share/gramps/plugins/quickview/FilterByName.pyo
+share/gramps/plugins/quickview/LinkReferences.py
+share/gramps/plugins/quickview/LinkReferences.pyc
+share/gramps/plugins/quickview/LinkReferences.pyo
 share/gramps/plugins/quickview/OnThisDay.py
 share/gramps/plugins/quickview/OnThisDay.pyc
 share/gramps/plugins/quickview/OnThisDay.pyo
@@ -2407,6 +2602,9 @@ share/gramps/plugins/quickview/siblings.pyo
 share/gramps/plugins/records.gpr.py
 share/gramps/plugins/records.gpr.pyc
 share/gramps/plugins/records.gpr.pyo
+share/gramps/plugins/rel/rel_ca.py
+share/gramps/plugins/rel/rel_ca.pyc
+share/gramps/plugins/rel/rel_ca.pyo
 share/gramps/plugins/rel/rel_cs.py
 share/gramps/plugins/rel/rel_cs.pyc
 share/gramps/plugins/rel/rel_cs.pyo
@@ -2461,6 +2659,12 @@ share/gramps/plugins/rel/rel_sv.pyo
 share/gramps/plugins/rel/relplugins.gpr.py
 share/gramps/plugins/rel/relplugins.gpr.pyc
 share/gramps/plugins/rel/relplugins.gpr.pyo
+share/gramps/plugins/sidebar/categorysidebar.py
+share/gramps/plugins/sidebar/categorysidebar.pyc
+share/gramps/plugins/sidebar/categorysidebar.pyo
+share/gramps/plugins/sidebar/sidebar.gpr.py
+share/gramps/plugins/sidebar/sidebar.gpr.pyc
+share/gramps/plugins/sidebar/sidebar.gpr.pyo
 share/gramps/plugins/textreport/AncestorReport.py
 share/gramps/plugins/textreport/AncestorReport.pyc
 share/gramps/plugins/textreport/AncestorReport.pyo
@@ -2491,9 +2695,6 @@ share/gramps/plugins/textreport/IndivComplete.pyo
 share/gramps/plugins/textreport/KinshipReport.py
 share/gramps/plugins/textreport/KinshipReport.pyc
 share/gramps/plugins/textreport/KinshipReport.pyo
-share/gramps/plugins/textreport/MarkerReport.py
-share/gramps/plugins/textreport/MarkerReport.pyc
-share/gramps/plugins/textreport/MarkerReport.pyo
 share/gramps/plugins/textreport/NumberOfAncestorsReport.py
 share/gramps/plugins/textreport/NumberOfAncestorsReport.pyc
 share/gramps/plugins/textreport/NumberOfAncestorsReport.pyo
@@ -2506,6 +2707,9 @@ share/gramps/plugins/textreport/SimpleBookTitle.pyo
 share/gramps/plugins/textreport/Summary.py
 share/gramps/plugins/textreport/Summary.pyc
 share/gramps/plugins/textreport/Summary.pyo
+share/gramps/plugins/textreport/TagReport.py
+share/gramps/plugins/textreport/TagReport.pyc
+share/gramps/plugins/textreport/TagReport.pyo
 share/gramps/plugins/textreport/textplugins.gpr.py
 share/gramps/plugins/textreport/textplugins.gpr.pyc
 share/gramps/plugins/textreport/textplugins.gpr.pyo
@@ -2606,15 +2810,27 @@ share/gramps/plugins/view/fanchartview.gpr.pyo
 share/gramps/plugins/view/fanchartview.py
 share/gramps/plugins/view/fanchartview.pyc
 share/gramps/plugins/view/fanchartview.pyo
-share/gramps/plugins/view/geoview.gpr.py
-share/gramps/plugins/view/geoview.gpr.pyc
-share/gramps/plugins/view/geoview.gpr.pyo
-share/gramps/plugins/view/geoview.py
-share/gramps/plugins/view/geoview.pyc
-share/gramps/plugins/view/geoview.pyo
+share/gramps/plugins/view/geoevents.py
+share/gramps/plugins/view/geoevents.pyc
+share/gramps/plugins/view/geoevents.pyo
+share/gramps/plugins/view/geofamily.py
+share/gramps/plugins/view/geofamily.pyc
+share/gramps/plugins/view/geofamily.pyo
+share/gramps/plugins/view/geography.gpr.py
+share/gramps/plugins/view/geography.gpr.pyc
+share/gramps/plugins/view/geography.gpr.pyo
+share/gramps/plugins/view/geoperson.py
+share/gramps/plugins/view/geoperson.pyc
+share/gramps/plugins/view/geoperson.pyo
+share/gramps/plugins/view/geoplaces.py
+share/gramps/plugins/view/geoplaces.pyc
+share/gramps/plugins/view/geoplaces.pyo
 share/gramps/plugins/view/grampletview.py
 share/gramps/plugins/view/grampletview.pyc
 share/gramps/plugins/view/grampletview.pyo
+share/gramps/plugins/view/htmlrenderer.gpr.py
+share/gramps/plugins/view/htmlrenderer.gpr.pyc
+share/gramps/plugins/view/htmlrenderer.gpr.pyo
 share/gramps/plugins/view/htmlrenderer.py
 share/gramps/plugins/view/htmlrenderer.pyc
 share/gramps/plugins/view/htmlrenderer.pyo
@@ -2663,6 +2879,50 @@ share/gramps/plugins/webreport/WebCal.pyo
 share/gramps/plugins/webreport/webplugins.gpr.py
 share/gramps/plugins/webreport/webplugins.gpr.pyc
 share/gramps/plugins/webreport/webplugins.gpr.pyo
+share/gramps/plugins/webstuff/css/GeoView.css
+share/gramps/plugins/webstuff/css/Web_Basic-Ash.css
+share/gramps/plugins/webstuff/css/Web_Basic-Blue.css
+share/gramps/plugins/webstuff/css/Web_Basic-Cypress.css
+share/gramps/plugins/webstuff/css/Web_Basic-Lilac.css
+share/gramps/plugins/webstuff/css/Web_Basic-Peach.css
+share/gramps/plugins/webstuff/css/Web_Basic-Spruce.css
+share/gramps/plugins/webstuff/css/Web_Mainz.css
+share/gramps/plugins/webstuff/css/Web_Navigation-Horizontal.css
+share/gramps/plugins/webstuff/css/Web_Navigation-Vertical.css
+share/gramps/plugins/webstuff/css/Web_Nebraska.css
+share/gramps/plugins/webstuff/css/Web_Print-Default.css
+share/gramps/plugins/webstuff/css/Web_Visually.css
+share/gramps/plugins/webstuff/css/ancestortree.css
+share/gramps/plugins/webstuff/css/behaviour.css
+share/gramps/plugins/webstuff/css/narrative-maps.css
+share/gramps/plugins/webstuff/images/Web_Gender_Female.png
+share/gramps/plugins/webstuff/images/Web_Gender_Male.png
+share/gramps/plugins/webstuff/images/Web_Mainz_Bkgd.png
+share/gramps/plugins/webstuff/images/Web_Mainz_Header.png
+share/gramps/plugins/webstuff/images/Web_Mainz_Mid.png
+share/gramps/plugins/webstuff/images/Web_Mainz_MidLight.png
+share/gramps/plugins/webstuff/images/blank.gif
+share/gramps/plugins/webstuff/images/crosshairs.png
+share/gramps/plugins/webstuff/images/document.png
+share/gramps/plugins/webstuff/images/favicon.ico
+share/gramps/plugins/webstuff/images/favicon2.ico
+share/gramps/plugins/webstuff/images/gramps-geo-altmap.png
+share/gramps/plugins/webstuff/images/gramps-geo-altmap.svg
+share/gramps/plugins/webstuff/images/gramps-geo-birth.png
+share/gramps/plugins/webstuff/images/gramps-geo-birth.svg
+share/gramps/plugins/webstuff/images/gramps-geo-death.png
+share/gramps/plugins/webstuff/images/gramps-geo-death.svg
+share/gramps/plugins/webstuff/images/gramps-geo-mainmap.png
+share/gramps/plugins/webstuff/images/gramps-geo-mainmap.svg
+share/gramps/plugins/webstuff/images/gramps-geo-marriage.png
+share/gramps/plugins/webstuff/images/gramps-geo-marriage.svg
+share/gramps/plugins/webstuff/images/somerights20.gif
+share/gramps/plugins/webstuff/webstuff.gpr.py
+share/gramps/plugins/webstuff/webstuff.gpr.pyc
+share/gramps/plugins/webstuff/webstuff.gpr.pyo
+share/gramps/plugins/webstuff/webstuff.py
+share/gramps/plugins/webstuff/webstuff.pyc
+share/gramps/plugins/webstuff/webstuff.pyo
 share/gramps/soundex.py
 share/gramps/soundex.pyc
 share/gramps/soundex.pyo
diff --git a/databases/gramps3/distinfo b/databases/gramps3/distinfo
index cb8c6e228fd..06534a3aa69 100644
--- a/databases/gramps3/distinfo
+++ b/databases/gramps3/distinfo
@@ -1,19 +1,6 @@
-$NetBSD: distinfo,v 1.10 2011/06/09 11:54:58 drochner Exp $
+$NetBSD: distinfo,v 1.11 2012/06/01 20:28:26 drochner Exp $
 
-SHA1 (gramps-3.2.6.tar.gz) = 0e3343921400758668158bbfa072b37a702ea1b9
-RMD160 (gramps-3.2.6.tar.gz) = dcea12b7adb86cd4c213eb10afcb1c4649281433
-Size (gramps-3.2.6.tar.gz) = 7340674 bytes
-SHA1 (patch-aa) = 7de4ac7901f647b910833881ed4825e49773ac69
-SHA1 (patch-ab) = a70c9ee5706e6028230492e87946de5fc0514e21
-SHA1 (patch-ac) = 982702e3c36246da35e0f016f696d52f3af37f24
-SHA1 (patch-ad) = 1e1059359b07d5a63d96d1d0528969c23cea0691
-SHA1 (patch-ae) = 933d5ca25274d76bb5e0826df5fe2661352f450f
-SHA1 (patch-ag) = 41a74f38b33d05bf3c42fae1b4bc836df963972e
-SHA1 (patch-ah) = 3b79020f44a313924156a9a3220e9afc95e7be71
-SHA1 (patch-ai) = cf12741a4bfa24465bb1f7dfb98910ca49d23a7f
-SHA1 (patch-aj) = 6f6be0045e94b7f95200a389dbff591e5006315c
-SHA1 (patch-ak) = 6920c334b14a4d7b2ce46910978e9c10f35a9507
-SHA1 (patch-al) = 9c0c39c6ecf20d0066ff4b887a3248ced34178a4
-SHA1 (patch-am) = 3a39556ea040ee98ffd274f8daa8bc0af62b0909
-SHA1 (patch-an) = 1f6f0625c206d2f4a8420d985a8608d444a82597
-SHA1 (patch-ao) = 1fb147c041ba0b21bfa0eb01fbf288c02ec20ce3
+SHA1 (gramps-3.3.2.tar.gz) = ae72c9b5e4ad932635388da392ddcaa22d859f17
+RMD160 (gramps-3.3.2.tar.gz) = b099566314cd3b3733d4d8b3390a16b8f52b6de2
+Size (gramps-3.3.2.tar.gz) = 8860068 bytes
+SHA1 (patch-ba) = 41e2238c2de95272e5996098d16f508b0fea96fb
diff --git a/databases/gramps3/patches/patch-aa b/databases/gramps3/patches/patch-aa
deleted file mode 100644
index be571b13b42..00000000000
--- a/databases/gramps3/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-@@ -26,7 +26,7 @@
- # python modules
- #
- #-------------------------------------------------------------------------
--from bsddb import db as bsddb_db
-+from bsddb3 import db as bsddb_db
- from gen.ggettext import gettext as _
- from DdTargets import DdTargets
- import cPickle as pickle
diff --git a/databases/gramps3/patches/patch-ab b/databases/gramps3/patches/patch-ab
deleted file mode 100644
index 952130f8b4c..00000000000
--- a/databases/gramps3/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-@@ -109,7 +109,7 @@ class CLIDbManager(object):
-         Returns (people_count, version_number) of current DB.
-         Returns ("Unknown", "Unknown") if invalid DB or other error.
-         """
--        from bsddb import dbshelve, db
-+        from bsddb3 import dbshelve, db
-         from gen.db import META, PERSON_TBL
-         env = db.DBEnv()
-         flags = db.DB_CREATE | db.DB_PRIVATE |\
diff --git a/databases/gramps3/patches/patch-ac b/databases/gramps3/patches/patch-ac
deleted file mode 100644
index 435bb378260..00000000000
--- a/databases/gramps3/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/05/18 16:38:53 drochner Exp $
-
---- src/GrampsLogger/_ErrorReportAssistant.py.orig	2010-05-17 05:30:59.000000000 +0000
-+++ src/GrampsLogger/_ErrorReportAssistant.py
-@@ -5,7 +5,8 @@ import gtk
- import pygtk
- import gobject
- import cairo
--import sys, os,bsddb
-+import sys, os
-+import bsddb3 as bsddb
- 
- 
- class ErrorReportAssistant(object):
diff --git a/databases/gramps3/patches/patch-ad b/databases/gramps3/patches/patch-ad
deleted file mode 100644
index 79cc638c754..00000000000
--- a/databases/gramps3/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-@@ -39,7 +39,7 @@ import bisect
- from functools import wraps
- 
- from gen.ggettext import gettext as _
--from bsddb import dbshelve, db
-+from bsddb3 import dbshelve, db
- import logging
- from sys import maxint
- 
diff --git a/databases/gramps3/patches/patch-ae b/databases/gramps3/patches/patch-ae
deleted file mode 100644
index 8fb5b8c2efb..00000000000
--- a/databases/gramps3/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-@@ -35,7 +35,7 @@ import random
- import locale
- import os
- from sys import maxint
--from bsddb import db
-+from bsddb3 import db
- from gen.ggettext import gettext as _
- 
- import logging
diff --git a/databases/gramps3/patches/patch-ag b/databases/gramps3/patches/patch-ag
deleted file mode 100644
index 7f495c84e0a..00000000000
--- a/databases/gramps3/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2010/05/04 11:05:00 drochner Exp $
-
---- src/plugins/import/ImportGrdb.py.orig	2010-03-15 07:21:24.000000000 +0000
-+++ src/plugins/import/ImportGrdb.py
-@@ -36,7 +36,7 @@ import tempfile
- from gen.ggettext import gettext as _
- import cPickle as pickle
- import time
--from bsddb import dbshelve, db
-+from bsddb3 import dbshelve, db
- import logging
- LOG = logging.getLogger(".Db")
- 
diff --git a/databases/gramps3/patches/patch-ah b/databases/gramps3/patches/patch-ah
deleted file mode 100644
index bc23ee956c9..00000000000
--- a/databases/gramps3/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2010/05/04 11:05:00 drochner Exp $
-
---- src/gen/db/cursor.py.orig	2010-03-18 15:40:28.000000000 +0000
-+++ src/gen/db/cursor.py
-@@ -24,7 +24,7 @@
- #
- #-------------------------------------------------------------------------
- from cPickle import dumps, loads
--from bsddb import db
-+from bsddb3 import db
- 
- #-------------------------------------------------------------------------
- #
diff --git a/databases/gramps3/patches/patch-ai b/databases/gramps3/patches/patch-ai
deleted file mode 100644
index ac270524c6e..00000000000
--- a/databases/gramps3/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2010/05/04 11:05:00 drochner Exp $
-
---- src/gen/db/undoredo.py.orig	2010-03-18 15:41:16.000000000 +0000
-+++ src/gen/db/undoredo.py
-@@ -33,7 +33,7 @@ undos and redos.
- from __future__ import with_statement
- import time, os
- import cPickle as pickle
--from bsddb import db
-+from bsddb3 import db
- from gen.ggettext import gettext as _
- 
- #-------------------------------------------------------------------------
diff --git a/databases/gramps3/patches/patch-aj b/databases/gramps3/patches/patch-aj
deleted file mode 100644
index 422b63e04a6..00000000000
--- a/databases/gramps3/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2010/05/04 11:05:00 drochner Exp $
-
---- src/gen/db/txn.py.orig	2010-03-18 15:41:57.000000000 +0000
-+++ src/gen/db/txn.py
-@@ -32,7 +32,7 @@ database.
- #-------------------------------------------------------------------------
- from __future__ import with_statement
- import cPickle as pickle
--from bsddb import dbshelve, db
-+from bsddb3 import dbshelve, db
- import logging
- from collections import defaultdict
- 
diff --git a/databases/gramps3/patches/patch-ak b/databases/gramps3/patches/patch-ak
deleted file mode 100644
index c654bdf4256..00000000000
--- a/databases/gramps3/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2010/05/04 11:05:00 drochner Exp $
-
---- src/plugins/lib/libgrdb.py.orig	2010-03-18 15:42:36.000000000 +0000
-+++ src/plugins/lib/libgrdb.py
-@@ -36,7 +36,7 @@ import random
- import locale
- import os
- from sys import maxint
--from bsddb import db
-+from bsddb3 import db
- from gen.ggettext import gettext as _
- 
- import logging
diff --git a/databases/gramps3/patches/patch-al b/databases/gramps3/patches/patch-al
deleted file mode 100644
index ed9620fd91f..00000000000
--- a/databases/gramps3/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2010/05/04 11:05:00 drochner Exp $
-
---- src/gen/db/dbconst.py.orig	2010-03-15 07:21:14.000000000 +0000
-+++ src/gen/db/dbconst.py
-@@ -63,7 +63,7 @@ DBLOCKS   = 25000           # Maximum nu
- DBOBJECTS = 25000           # Maximum number of simultaneously locked objects
- DBUNDO    = 1000            # Maximum size of undo buffer
- 
--from bsddb.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
-+from bsddb3.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
- DBFLAGS_O = DB_CREATE | DB_AUTO_COMMIT  # Default flags for database open
- DBFLAGS_R = DB_RDONLY                   # Flags to open a database read-only
- DBFLAGS_D = DB_DUP | DB_DUPSORT         # Default flags for duplicate keys
diff --git a/databases/gramps3/patches/patch-am b/databases/gramps3/patches/patch-am
deleted file mode 100644
index 49d5995425b..00000000000
--- a/databases/gramps3/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2010/05/04 11:05:00 drochner Exp $
-
---- src/plugins/tool/Leak.py.orig	2010-03-15 07:21:27.000000000 +0000
-+++ src/plugins/tool/Leak.py
-@@ -31,7 +31,7 @@ Show uncollected objects in a window.
- #
- #------------------------------------------------------------------------
- from gen.ggettext import gettext as _
--from bsddb.db import DBError
-+from bsddb3.db import DBError
- 
- #------------------------------------------------------------------------
- #
diff --git a/databases/gramps3/patches/patch-an b/databases/gramps3/patches/patch-an
deleted file mode 100644
index 6aafe9e8e63..00000000000
--- a/databases/gramps3/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.2 2010/05/18 16:38:53 drochner Exp $
-
---- 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 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 7c3e229f704..00000000000
--- a/databases/gramps3/patches/patch-ao
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2011/06/09 11:54:59 drochner Exp $
-
---- src/plugins/lib/libhtml.py.orig	2011-05-01 06:54:17.000000000 +0000
-+++ src/plugins/lib/libhtml.py
-@@ -26,8 +26,6 @@
- #
- #------------------------------------------------------------------------
- 
--from __future__ import print_function
--
- """
- HTML operations.
- 
-@@ -103,6 +101,9 @@ _START_CLOSE = set([
- #
- #------------------------------------------------------------------------
- 
-+def myprint(txt):
-+    print txt
-+
- class Html(list):
-     """
-     HTML class: Manages a rooted tree of HTML objects
-@@ -373,7 +374,7 @@ class Html(list):
- #
-     iterkeys = itervalues = iteritems = __iter__
- #
--    def write(self, method=print, indent='\t', tabs=''):
-+    def write(self, method=myprint, indent='\t', tabs=''):
-         """
-         Output function: performs an insertion-order tree traversal
-         and calls supplied method for each item found.
diff --git a/databases/gramps3/patches/patch-ba b/databases/gramps3/patches/patch-ba
new file mode 100644
index 00000000000..c5ddbd421b1
--- /dev/null
+++ b/databases/gramps3/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.3 2012/06/01 20:28:27 drochner Exp $
+
+--- src/config.py.orig	2012-02-25 16:06:52.000000000 +0000
++++ src/config.py
+@@ -292,7 +292,7 @@ register('preferences.sprefix', 'S%04d')
+ register('preferences.use-last-view', True)
+ register('preferences.last-view', '')
+ register('preferences.last-views', [])
+-register('preferences.use-bsddb3', False)
++register('preferences.use-bsddb3', True)
+ 
+ register('researcher.researcher-addr', '')
+ register('researcher.researcher-locality', '')