CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jun 29 11:10:18 UTC 2017

Modified Files:
        pkgsrc/editors/pluma: Makefile
        pkgsrc/graphics/eom: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/pluma/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/eom/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/pluma/Makefile
diff -u pkgsrc/editors/pluma/Makefile:1.5 pkgsrc/editors/pluma/Makefile:1.6
--- pkgsrc/editors/pluma/Makefile:1.5   Fri Jun 23 17:32:16 2017
+++ pkgsrc/editors/pluma/Makefile       Thu Jun 29 11:10:18 2017
@@ -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 @@ CONFIGURE_ARGS+=      --disable-updater # onl
 
 .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"

Index: pkgsrc/graphics/eom/Makefile
diff -u pkgsrc/graphics/eom/Makefile:1.6 pkgsrc/graphics/eom/Makefile:1.7
--- pkgsrc/graphics/eom/Makefile:1.6    Fri Jun 23 17:10:44 2017
+++ pkgsrc/graphics/eom/Makefile        Thu Jun 29 11:10:18 2017
@@ -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 @@ BUILDLINK_TRANSFORM.SunOS+=   rm:-lutil
 
 .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"