Wed Feb 12 18:11:27 2014 UTC ()
-move PYTHON_VERSIONS_INCOMPATIBLE before first use of "pyversion.mk",
otherwise it has no effect
-in buildlink3.mk, also add PYTHON_VERSIONS_INCOMPATIBLE to avoid
picking up the default Python version (XXX we need a way to express
major version restrictions, otherwise this doesn't scale)
(drochner)
diff -r1.18 -r1.19 pkgsrc/devel/libpeas/Makefile
diff -r1.13 -r1.14 pkgsrc/devel/libpeas/buildlink3.mk
--- pkgsrc/devel/libpeas/Makefile 2014/02/12 01:35:43 1.18
+++ pkgsrc/devel/libpeas/Makefile 2014/02/12 18:11:27 1.19
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/02/12 01:35:43 prlw1 Exp $
+# $NetBSD: Makefile,v 1.19 2014/02/12 18:11:27 drochner Exp $
#
DISTNAME= libpeas-1.8.1
@@ -17,11 +17,11 @@
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config gsed
+PYTHON_VERSIONS_INCOMPATIBLE= 26 27
+
.include "../../lang/python/pyversion.mk"
CONFIGURE_ARGS+= --disable-python2
CONFIGURE_ENV+= PYTHON3_CONFIG=/usr/pkg/bin/python${PYVERSSUFFIX}-config
-
-PYTHON_VERSIONS_INCOMPATIBLE= 26 27
PKGCONFIG_OVERRIDE+= data/libpeas-gtk-1.0.pc.in
PKGCONFIG_OVERRIDE+= data/libpeas-1.0.pc.in
--- pkgsrc/devel/libpeas/buildlink3.mk 2013/10/10 14:41:56 1.13
+++ pkgsrc/devel/libpeas/buildlink3.mk 2014/02/12 18:11:27 1.14
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2013/10/10 14:41:56 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2014/02/12 18:11:27 drochner Exp $
BUILDLINK_TREE+= libpeas
@@ -11,6 +11,7 @@
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
+PYTHON_VERSIONS_INCOMPATIBLE+= 26 27
.include "../../devel/py-gobject3/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.endif # LIBPEAS_BUILDLINK3_MK