From f86d461178033174903bd0d6031d959e38e12ac0 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sat, 25 Jan 2014 10:29:56 +0000
Subject: Mark packages as not ready for python-3.x where applicable; either
 because they themselves are not ready or because a dependency isn't. This is
 annotated by PYTHON_VERSIONS_INCOMPATIBLE=  33 # not yet ported as of x.y.z
 or PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-foo, py-bar respectively, please
 use the same style for other packages, and check during updates.

Use versioned_dependencies.mk where applicable.
Use REPLACE_PYTHON instead of handcoded alternatives, where applicable.
Reorder Makefile sections into standard order, where applicable.

Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default
with the next commit.

Whitespace cleanups and other nits corrected, where necessary.
---
 databases/gramps3/Makefile   | 4 +++-
 databases/gramps3/options.mk | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'databases/gramps3')

diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile
index 7158ab38e74..94acb66a7b5 100644
--- a/databases/gramps3/Makefile
+++ b/databases/gramps3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2014/01/02 19:01:54 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2014/01/25 10:29:59 wiz Exp $
 
 DISTNAME=		gramps-3.4.4
 CATEGORIES=		databases
@@ -15,6 +15,8 @@ USE_TOOLS+=		msgfmt pkg-config intltool msgconv
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-ORBit via py-gnome2, py-gtk2
+
 REPLACE_PYTHON=		src/DateHandler/_Date_fr.py
 REPLACE_PYTHON+=	src/plugins/quickview/Reporef.py
 REPLACE_PYTHON+=	src/plugins/rel/rel_fr.py
diff --git a/databases/gramps3/options.mk b/databases/gramps3/options.mk
index 46a65a36e58..365fa646279 100644
--- a/databases/gramps3/options.mk
+++ b/databases/gramps3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2009/09/14 10:35:18 drochner Exp $
+# $NetBSD: options.mk,v 1.3 2014/01/25 10:29:59 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gramps3
 PKG_SUPPORTED_OPTIONS=	graphviz enchant freefont
@@ -7,6 +7,7 @@ PKG_SUPPORTED_OPTIONS=	graphviz enchant freefont
 
 .if !empty(PKG_OPTIONS:Menchant)
 DEPENDS+=	${PYPKGPREFIX}-enchant-[0-9]*:../../textproc/py-enchant
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-ORBit via py-gnome2
 .include "../../x11/py-gnome2-extras/buildlink3.mk"
 .endif
 
-- 
cgit v1.2.3