Update to 3.1.2. Set LICENSE. Clean up. Make optional parts options.

Version 3.1.2 -- the "Skip the impersonations" release.
* Contains translation updates and small bug fixes.  No new features.
* ca, cs, de, fr, he, it, nb, nl, pl, pt_br, ru, sk, sv,
* fixes a failure in 'Check & Repair Database'
* fixes to Gramplets
* fixes to CLI regressions
* fixes to Latin1 characterset in Graphviz reports
* fixes to many reports
* fixes to the clipboard
* fixes to NarrativeWeb
* fixes to importing from older XML files
* fixes to ensure GRAMPS continues to run on newver versions of Python

3 files changed, 38 insertions, 43 deletions

diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile
index 3c7da5e0e13..2b82e92993d 100644
--- a/databases/gramps3/Makefile
+++ b/databases/gramps3/Makefile
@@ -1,65 +1,41 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:57:18 sno Exp $
+# $NetBSD: Makefile,v 1.7 2009/09/13 14:43:01 wiz Exp $
 #
 
-DISTNAME=		gramps-3.1.1
-PKGREVISION=		1
+DISTNAME=		gramps-3.1.2
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
 
 MAINTAINER=		drochner@NetBSD.org
 HOMEPAGE=		http://gramps-project.org/
 COMMENT=		Genealogical Research and Analysis Management Programming System V3
+LICENSE=		gnu-gpl-v2
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+DEPENDS+=		xdg-utils-[0-9]*:../../misc/xdg-utils
 
-# not clear, leave off for now
-MAKE_JOBS_SAFE=		no
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		msgfmt pkg-config intltool msgconv
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-# XXX Why?
-CONFIGURE_ARGS+=	--disable-mime-install
-# XXX Why?
-CONFIGURE_ARGS+=	--enable-packager-mode
+PYTHON_VERSIONS_ACCEPTED=	26 25
 
-# XXX Needed still?
-CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED=	25 24
+REPLACE_PYTHON=		src/DateHandler/_Date_fr.py
+REPLACE_PYTHON+=	src/plugins/quickview/Reporef.py
+REPLACE_PYTHON+=	src/plugins/rel/rel_fr.py
+
+# pkgsrc registers mime files using mimedb.mk (see below)
+CONFIGURE_ARGS+=	--enable-packager-mode
 
-## Dependencies are confusing:
-# From README
-# required:
-#   Python 2.5 or greater (works with 2.4 after minor modifications)
-#   PyGTK2 2.10 or greater
-#   Python Glade bindings (bogus; included in pygtk2)
-#   librsvg2 (svg icon view)
-# recommended:
-#   graphviz
-#   xdg
-# optional (skipping for now)
-#   gtkspell
-#   ttf-freefont
-# From other sources
-# required:
-#   gnome-doc-utils (build fails without)
-#   py-bsddb3 (and patch)
-# recommended/optional:
-#   py-gnome (for gnome integration)
-#   py25-reportlab (gramps2 MESSAGE, probably no longer)
+.include "options.mk"
 
-# See http://gramps-project.org/wiki/index.php?title=Install_latest_BSDDB
 .include "../../databases/py-bsddb3/buildlink3.mk"
-# XXX Should be option or perhaps not at all
-.include "../../graphics/graphviz/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/python/application.mk"
+BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.10
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../x11/py-gnome2/buildlink3.mk"
-# XXX Why, if we disable mime install?
 .include "../../databases/shared-mime-info/mimedb.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 --git a/databases/gramps3/distinfo b/databases/gramps3/distinfo
index 79349e6809d..955184c9012 100644
--- a/databases/gramps3/distinfo
+++ b/databases/gramps3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2009/06/04 17:29:41 drochner Exp $
+$NetBSD: distinfo,v 1.5 2009/09/13 14:43:01 wiz Exp $
 
-SHA1 (gramps-3.1.1.tar.gz) = 1cfd0ffcec6507a0cb2ec4a703b7e8253ca38871
-RMD160 (gramps-3.1.1.tar.gz) = 56cd774a5145a629d136988d76b9571113729b42
-Size (gramps-3.1.1.tar.gz) = 6794185 bytes
+SHA1 (gramps-3.1.2.tar.gz) = 0f44bb1da675122013b2a362297f2830e86b8a6a
+RMD160 (gramps-3.1.2.tar.gz) = a4b4869b72db4672793522152210094b4178a761
+Size (gramps-3.1.2.tar.gz) = 7298882 bytes
 SHA1 (patch-aa) = 533b40da349023d63b17fffd24bc40b9b7c173ed
 SHA1 (patch-ab) = 111d1b09152d75b04d5c577de445949c08b0f9ab
 SHA1 (patch-ac) = b20d68c4626ec4699880b2932728ddd713582ab5
@@ -10,5 +10,4 @@ SHA1 (patch-ad) = 1eaaf42ecc527b797a1889945740a3fd1511aa12
 SHA1 (patch-ae) = eca1ddafdf1532a44cf4f19662f18656fa376302
 SHA1 (patch-ag) = 8870e1fa3b8cc9bc32d7b9b36d2eb3b22903e910
 SHA1 (patch-ba) = 5e64b42eda21faec1fdd5fdd1020f5e73eea73ea
-SHA1 (patch-bb) = 5627f005dc239ffe9fc6d7bdaeac95cd2cdc687d
 SHA1 (patch-bc) = 0f42bdec326945b1cc48ee120bc744be85b176ef
diff --git a/databases/gramps3/options.mk b/databases/gramps3/options.mk
new file mode 100644
index 00000000000..ea44c15bb68
--- /dev/null
+++ b/databases/gramps3/options.mk
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2009/09/13 14:43:01 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gramps3
+PKG_SUPPORTED_OPTIONS=	graphviz enchant freefont
+PKG_SUGGESTED_OPTIONS=	graphviz enchant freefont
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Menchant)
+DEPENDS+=	${PYPKGPREFIX}-enchant-[0-9]*:../../textproc/py-enchant
+.include "../../x11/py-gnome2-extras/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mfreefont)
+DEPENDS+=	freefont-ttf-[0-9]*:../../fonts/freefont-ttf
+.endif
+
+.if !empty(PKG_OPTIONS:Mgraphviz)
+.include "../../graphics/graphviz/buildlink3.mk"
+.endif