[pkgsrc/trunk]: pkgsrc Work around include ordering issues with meta-pkgs/mat...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/30983b852c1b
branches:  trunk
changeset: 364565:30983b852c1b
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Jun 29 11:10:18 2017 +0000

description:
Work around include ordering issues with meta-pkgs/mate/Makefile.common
to ensure a valid python is chosen.  This should be fixed properly after
the branch.

diffstat:

 editors/pluma/Makefile |  8 ++++++--
 graphics/eom/Makefile  |  8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 3ad97ea3036a -r 30983b852c1b editors/pluma/Makefile
--- a/editors/pluma/Makefile    Thu Jun 29 09:01:10 2017 +0000
+++ b/editors/pluma/Makefile    Thu Jun 29 11:10:18 2017 +0000
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2017/06/23 17:32:16 youri Exp $
+# $NetBSD: Makefile,v 1.6 2017/06/29 11:10:18 jperkin Exp $
 
+# XXX: meta-pkgs/mate/Makefile.common includes pyversion.mk which sets the
+# python version too early and clashes with PYTHON_VERSIONS_INCOMPATIBLE
+# from libpeas bl3, so we include it early to ensure a valid version is
+# chosen.  This is not ideal, please fix it properly at some point.
+.include "../../devel/libpeas/buildlink3.mk"
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      pluma-${VERSION:R}.2
@@ -18,7 +23,6 @@
 
 .include "../../devel/glib2/schemas.mk"
 
-.include "../../devel/libpeas/buildlink3.mk"
 .include "../../x11/mate-desktop/buildlink3.mk"
 .include "../../x11/gtksourceview3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff -r 3ad97ea3036a -r 30983b852c1b graphics/eom/Makefile
--- a/graphics/eom/Makefile     Thu Jun 29 09:01:10 2017 +0000
+++ b/graphics/eom/Makefile     Thu Jun 29 11:10:18 2017 +0000
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2017/06/23 17:10:44 youri Exp $
+# $NetBSD: Makefile,v 1.7 2017/06/29 11:10:18 jperkin Exp $
 
+# XXX: meta-pkgs/mate/Makefile.common includes pyversion.mk which sets the
+# python version too early and clashes with PYTHON_VERSIONS_INCOMPATIBLE
+# from libpeas bl3, so we include it early to ensure a valid version is
+# chosen.  This is not ideal, please fix it properly at some point.
+.include "../../devel/libpeas/buildlink3.mk"
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      eom-${VERSION:R}.2
@@ -17,7 +22,6 @@
 
 .include "../../x11/mate-desktop/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
-.include "../../devel/libpeas/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"