-make it work with Python-2.4

-remove obsolete dependency on GConf2
-register desktop file
bump PKGREVISION
approved by gdt

6 files changed, 55 insertions, 15 deletions

diff --git a/databases/gramps3/MESSAGE b/databases/gramps3/MESSAGE
deleted file mode 100644
index a0137b4a64a..00000000000
--- a/databases/gramps3/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD$
-
-To enable creation of graphs using the GraphViz engine, install the
-graphics/graphviz package.
-
-===========================================================================
diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile
index 0a62369524d..0784d659e0a 100644
--- a/databases/gramps3/Makefile
+++ b/databases/gramps3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/06/18 22:21:12 gdt Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/23 15:44:14 drochner Exp $
 #
 
 DISTNAME=		gramps-3.0.1
+PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
 
@@ -19,8 +20,6 @@ USE_TOOLS+=		msgfmt pkg-config intltool msgconv
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-# XXX Handle desktop file specially?
-
 # XXX Why?
 CONFIGURE_ARGS+=	--disable-mime-install
 # XXX Why?
@@ -28,12 +27,12 @@ CONFIGURE_ARGS+=	--enable-packager-mode
 
 # XXX Needed still?
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED=	25
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 ## Dependencies are confusing:
 # From README
 # required:
-#   Python 2.5 or greater
+#   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)
@@ -61,8 +60,7 @@ PYTHON_VERSIONS_ACCEPTED=	25
 .include "../../x11/py-gnome2/buildlink3.mk"
 # XXX Why, if we disable mime install?
 .include "../../databases/shared-mime-info/mimedb.mk"
-# XXX Why, if this was dropped?
-.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 --git a/databases/gramps3/distinfo b/databases/gramps3/distinfo
index 3896b4d6206..f3794e6d955 100644
--- a/databases/gramps3/distinfo
+++ b/databases/gramps3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/06/18 22:21:12 gdt Exp $
+$NetBSD: distinfo,v 1.2 2008/06/23 15:44:14 drochner Exp $
 
 SHA1 (gramps-3.0.1.tar.gz) = 371ffba136fe596a3a1a853cd63fd8cd68d0d02b
 RMD160 (gramps-3.0.1.tar.gz) = a76e88bc51e50ae52440cde0779e5b04657a8524
@@ -9,3 +9,6 @@ SHA1 (patch-ac) = b20d68c4626ec4699880b2932728ddd713582ab5
 SHA1 (patch-ad) = 1eaaf42ecc527b797a1889945740a3fd1511aa12
 SHA1 (patch-ae) = c7ff88174e0823cde52ebbdc47e847ef54f90493
 SHA1 (patch-af) = fca8975e8db9841b23065a52b90e92a958077021
+SHA1 (patch-ba) = 5e64b42eda21faec1fdd5fdd1020f5e73eea73ea
+SHA1 (patch-bb) = 74f6c13b93618ba7e6d80ca0560f950da4ee476d
+SHA1 (patch-bc) = 0f42bdec326945b1cc48ee120bc744be85b176ef
diff --git a/databases/gramps3/patches/patch-ba b/databases/gramps3/patches/patch-ba
new file mode 100644
index 00000000000..557d4512a08
--- /dev/null
+++ b/databases/gramps3/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2008/06/23 15:44:14 drochner Exp $
+
+--- src/gramps.py.orig	2008-05-17 22:15:36.000000000 +0200
++++ src/gramps.py
+@@ -94,7 +94,7 @@ gettext.install("gramps",loc,unicode=1)
+ #
+ #-------------------------------------------------------------------------
+ 
+-MIN_PYTHON_VERSION = (2, 5, 0, '', 0)
++MIN_PYTHON_VERSION = (2, 4, 0, '', 0)
+ if not sys.version_info >= MIN_PYTHON_VERSION :
+     print gettext.gettext("Your Python version does not meet the "
+                   "requirements. At least python %d.%d.%d is needed to"
diff --git a/databases/gramps3/patches/patch-bb b/databases/gramps3/patches/patch-bb
new file mode 100644
index 00000000000..7dba75fb0a6
--- /dev/null
+++ b/databases/gramps3/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2008/06/23 15:44:14 drochner Exp $
+
+--- src/plugins/all_relations.py.orig	2008-05-17 22:14:56.000000000 +0200
++++ src/plugins/all_relations.py
+@@ -47,7 +47,7 @@ def run(database, document, person):
+     report = AllRelReport(database, document, person)
+     report.run()
+     
+-class AllRelReport():
++class AllRelReport:
+     """
+     Obtains all relationships, displays the relations, and in details, the 
+     relation path
diff --git a/databases/gramps3/patches/patch-bc b/databases/gramps3/patches/patch-bc
new file mode 100644
index 00000000000..452d19e7596
--- /dev/null
+++ b/databases/gramps3/patches/patch-bc
@@ -0,0 +1,20 @@
+$NetBSD: patch-bc,v 1.1 2008/06/23 15:44:14 drochner Exp $
+
+--- configure.orig	2008-05-17 22:33:13.000000000 +0200
++++ configure
+@@ -6289,12 +6289,12 @@ echo "${ECHO_T}$LINGUAS" >&6; }
+ 
+         if test -n "$PYTHON"; then
+       # If the user set $PYTHON, use it and don't search something else.
+-      { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.5" >&5
+-echo $ECHO_N "checking whether $PYTHON version >= 2.5... $ECHO_C" >&6; }
++      { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
++echo $ECHO_N "checking whether $PYTHON version >= 2.4... $ECHO_C" >&6; }
+       prog="import sys, string
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+-minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
++minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
+ minverhex = 0
+ for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
+ sys.exit(sys.hexversion < minverhex)"