Mon Jun 23 15:44:14 2008 UTC ()
-make it work with Python-2.4
-remove obsolete dependency on GConf2
-register desktop file
bump PKGREVISION
approved by gdt


(drochner)
diff -r1.1.1.1 -r0 pkgsrc/databases/gramps3/MESSAGE
diff -r1.1.1.1 -r1.2 pkgsrc/databases/gramps3/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/databases/gramps3/distinfo
diff -r0 -r1.1 pkgsrc/databases/gramps3/patches/patch-ba
diff -r0 -r1.1 pkgsrc/databases/gramps3/patches/patch-bb
diff -r0 -r1.1 pkgsrc/databases/gramps3/patches/patch-bc
File Deleted: pkgsrc/databases/gramps3/Attic/MESSAGE
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/gramps3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/gramps3/Attic/Makefile 2008/06/18 22:21:12 1.1.1.1
+++ pkgsrc/databases/gramps3/Attic/Makefile 2008/06/23 15:44:14 1.2
@@ -1,49 +1,48 @@ @@ -1,49 +1,48 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/06/18 22:21:12 gdt Exp $ 1# $NetBSD: Makefile,v 1.2 2008/06/23 15:44:14 drochner Exp $
2# 2#
3 3
4DISTNAME= gramps-3.0.1 4DISTNAME= gramps-3.0.1
 5PKGREVISION= 1
5CATEGORIES= databases 6CATEGORIES= databases
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/}
7 8
8MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
9HOMEPAGE= http://gramps-project.org/ 10HOMEPAGE= http://gramps-project.org/
10COMMENT= Genealogical Research and Analysis Management Programming System V3 11COMMENT= Genealogical Research and Analysis Management Programming System V3
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14# not clear, leave off for now 15# not clear, leave off for now
15MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
16 17
17USE_DIRS+= xdg-1.1 18USE_DIRS+= xdg-1.1
18USE_TOOLS+= msgfmt pkg-config intltool msgconv 19USE_TOOLS+= msgfmt pkg-config intltool msgconv
19USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
20GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
21 22
22# XXX Handle desktop file specially? 
23 
24# XXX Why? 23# XXX Why?
25CONFIGURE_ARGS+= --disable-mime-install 24CONFIGURE_ARGS+= --disable-mime-install
26# XXX Why? 25# XXX Why?
27CONFIGURE_ARGS+= --enable-packager-mode 26CONFIGURE_ARGS+= --enable-packager-mode
28 27
29# XXX Needed still? 28# XXX Needed still?
30CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 29CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
31PYTHON_VERSIONS_ACCEPTED= 25 30PYTHON_VERSIONS_ACCEPTED= 25 24
32 31
33## Dependencies are confusing: 32## Dependencies are confusing:
34# From README 33# From README
35# required: 34# required:
36# Python 2.5 or greater 35# Python 2.5 or greater (works with 2.4 after minor modifications)
37# PyGTK2 2.10 or greater 36# PyGTK2 2.10 or greater
38# Python Glade bindings (bogus; included in pygtk2) 37# Python Glade bindings (bogus; included in pygtk2)
39# librsvg2 (svg icon view) 38# librsvg2 (svg icon view)
40# recommended: 39# recommended:
41# graphviz 40# graphviz
42# xdg (above via USE_DIRS??) 41# xdg (above via USE_DIRS??)
43# optional (skipping for now) 42# optional (skipping for now)
44# gtkspell 43# gtkspell
45# ttf-freefont 44# ttf-freefont
46# From other sources 45# From other sources
47# required: 46# required:
48# gnome-doc-utils (build fails without) 47# gnome-doc-utils (build fails without)
49# py-bsddb3 (and patch) 48# py-bsddb3 (and patch)
@@ -51,18 +50,17 @@ PYTHON_VERSIONS_ACCEPTED= 25 @@ -51,18 +50,17 @@ PYTHON_VERSIONS_ACCEPTED= 25
51# py-gnome (for gnome integration) 50# py-gnome (for gnome integration)
52# py25-reportlab (gramps2 MESSAGE, probably no longer) 51# py25-reportlab (gramps2 MESSAGE, probably no longer)
53 52
54# See http://gramps-project.org/wiki/index.php?title=Install_latest_BSDDB 53# See http://gramps-project.org/wiki/index.php?title=Install_latest_BSDDB
55.include "../../databases/py-bsddb3/buildlink3.mk" 54.include "../../databases/py-bsddb3/buildlink3.mk"
56# XXX Should be option or perhaps not at all 55# XXX Should be option or perhaps not at all
57.include "../../graphics/graphviz/buildlink3.mk" 56.include "../../graphics/graphviz/buildlink3.mk"
58.include "../../graphics/librsvg/buildlink3.mk" 57.include "../../graphics/librsvg/buildlink3.mk"
59.include "../../lang/python/application.mk" 58.include "../../lang/python/application.mk"
60.include "../../x11/py-gtk2/buildlink3.mk" 59.include "../../x11/py-gtk2/buildlink3.mk"
61.include "../../x11/py-gnome2/buildlink3.mk" 60.include "../../x11/py-gnome2/buildlink3.mk"
62# XXX Why, if we disable mime install? 61# XXX Why, if we disable mime install?
63.include "../../databases/shared-mime-info/mimedb.mk" 62.include "../../databases/shared-mime-info/mimedb.mk"
64# XXX Why, if this was dropped? 
65.include "../../devel/GConf/schemas.mk" 
66.include "../../graphics/gnome-icon-theme/buildlink3.mk" 63.include "../../graphics/gnome-icon-theme/buildlink3.mk"
67.include "../../textproc/gnome-doc-utils/buildlink3.mk" 64.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 65.include "../../sysutils/desktop-file-utils/desktopdb.mk"
68.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/gramps3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/gramps3/Attic/distinfo 2008/06/18 22:21:12 1.1.1.1
+++ pkgsrc/databases/gramps3/Attic/distinfo 2008/06/23 15:44:14 1.2
@@ -1,11 +1,14 @@ @@ -1,11 +1,14 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/06/18 22:21:12 gdt Exp $ 1$NetBSD: distinfo,v 1.2 2008/06/23 15:44:14 drochner Exp $
2 2
3SHA1 (gramps-3.0.1.tar.gz) = 371ffba136fe596a3a1a853cd63fd8cd68d0d02b 3SHA1 (gramps-3.0.1.tar.gz) = 371ffba136fe596a3a1a853cd63fd8cd68d0d02b
4RMD160 (gramps-3.0.1.tar.gz) = a76e88bc51e50ae52440cde0779e5b04657a8524 4RMD160 (gramps-3.0.1.tar.gz) = a76e88bc51e50ae52440cde0779e5b04657a8524
5Size (gramps-3.0.1.tar.gz) = 5932971 bytes 5Size (gramps-3.0.1.tar.gz) = 5932971 bytes
6SHA1 (patch-aa) = 533b40da349023d63b17fffd24bc40b9b7c173ed 6SHA1 (patch-aa) = 533b40da349023d63b17fffd24bc40b9b7c173ed
7SHA1 (patch-ab) = d10c2b4627c8566d2bc3a24a422daf49c367c123 7SHA1 (patch-ab) = d10c2b4627c8566d2bc3a24a422daf49c367c123
8SHA1 (patch-ac) = b20d68c4626ec4699880b2932728ddd713582ab5 8SHA1 (patch-ac) = b20d68c4626ec4699880b2932728ddd713582ab5
9SHA1 (patch-ad) = 1eaaf42ecc527b797a1889945740a3fd1511aa12 9SHA1 (patch-ad) = 1eaaf42ecc527b797a1889945740a3fd1511aa12
10SHA1 (patch-ae) = c7ff88174e0823cde52ebbdc47e847ef54f90493 10SHA1 (patch-ae) = c7ff88174e0823cde52ebbdc47e847ef54f90493
11SHA1 (patch-af) = fca8975e8db9841b23065a52b90e92a958077021 11SHA1 (patch-af) = fca8975e8db9841b23065a52b90e92a958077021
 12SHA1 (patch-ba) = 5e64b42eda21faec1fdd5fdd1020f5e73eea73ea
 13SHA1 (patch-bb) = 74f6c13b93618ba7e6d80ca0560f950da4ee476d
 14SHA1 (patch-bc) = 0f42bdec326945b1cc48ee120bc744be85b176ef
File Added: pkgsrc/databases/gramps3/patches/Attic/patch-ba
$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"
File Added: pkgsrc/databases/gramps3/patches/Attic/patch-bb
$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
File Added: pkgsrc/databases/gramps3/patches/Attic/patch-bc
$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)"