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
cvs diff -r1.18 -r1.19 pkgsrc/devel/libpeas/Makefile (expand / switch to unified diff)

--- 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,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.18 2014/02/12 01:35:43 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.19 2014/02/12 18:11:27 drochner Exp $
2# 2#
3 3
4DISTNAME= libpeas-1.8.1 4DISTNAME= libpeas-1.8.1
5CATEGORIES= devel gnome 5CATEGORIES= devel gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libpeas/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libpeas/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://live.gnome.org/Libpeas 10HOMEPAGE= http://live.gnome.org/Libpeas
11COMMENT= GObject-based plugins engine 11COMMENT= GObject-based plugins engine
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= gmake intltool msgfmt pkg-config gsed 18USE_TOOLS+= gmake intltool msgfmt pkg-config gsed
19 19
 20PYTHON_VERSIONS_INCOMPATIBLE= 26 27
 21
20.include "../../lang/python/pyversion.mk" 22.include "../../lang/python/pyversion.mk"
21CONFIGURE_ARGS+= --disable-python2 23CONFIGURE_ARGS+= --disable-python2
22CONFIGURE_ENV+= PYTHON3_CONFIG=/usr/pkg/bin/python${PYVERSSUFFIX}-config 24CONFIGURE_ENV+= PYTHON3_CONFIG=/usr/pkg/bin/python${PYVERSSUFFIX}-config
23 25
24PYTHON_VERSIONS_INCOMPATIBLE= 26 27 
25 
26PKGCONFIG_OVERRIDE+= data/libpeas-gtk-1.0.pc.in 26PKGCONFIG_OVERRIDE+= data/libpeas-gtk-1.0.pc.in
27PKGCONFIG_OVERRIDE+= data/libpeas-1.0.pc.in 27PKGCONFIG_OVERRIDE+= data/libpeas-1.0.pc.in
28 28
29.include "../../devel/glib2/buildlink3.mk" 29.include "../../devel/glib2/buildlink3.mk"
30.include "../../devel/gobject-introspection/buildlink3.mk" 30.include "../../devel/gobject-introspection/buildlink3.mk"
31.include "../../devel/py-gobject3/buildlink3.mk" 31.include "../../devel/py-gobject3/buildlink3.mk"
32.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 32.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
33.include "../../x11/gtk3/buildlink3.mk" 33.include "../../x11/gtk3/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/devel/libpeas/buildlink3.mk (expand / switch to unified diff)

--- 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,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.13 2013/10/10 14:41:56 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.14 2014/02/12 18:11:27 drochner Exp $
2 2
3BUILDLINK_TREE+= libpeas 3BUILDLINK_TREE+= libpeas
4 4
5.if !defined(LIBPEAS_BUILDLINK3_MK) 5.if !defined(LIBPEAS_BUILDLINK3_MK)
6LIBPEAS_BUILDLINK3_MK:= 6LIBPEAS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libpeas+= libpeas>=1.4.0 8BUILDLINK_API_DEPENDS.libpeas+= libpeas>=1.4.0
9BUILDLINK_ABI_DEPENDS.libpeas+= libpeas>=1.6.2nb6 9BUILDLINK_ABI_DEPENDS.libpeas+= libpeas>=1.6.2nb6
10BUILDLINK_PKGSRCDIR.libpeas?= ../../devel/libpeas 10BUILDLINK_PKGSRCDIR.libpeas?= ../../devel/libpeas
11 11
12.include "../../devel/glib2/buildlink3.mk" 12.include "../../devel/glib2/buildlink3.mk"
13.include "../../devel/gobject-introspection/buildlink3.mk" 13.include "../../devel/gobject-introspection/buildlink3.mk"
 14PYTHON_VERSIONS_INCOMPATIBLE+= 26 27
14.include "../../devel/py-gobject3/buildlink3.mk" 15.include "../../devel/py-gobject3/buildlink3.mk"
15.include "../../x11/gtk3/buildlink3.mk" 16.include "../../x11/gtk3/buildlink3.mk"
16.endif # LIBPEAS_BUILDLINK3_MK 17.endif # LIBPEAS_BUILDLINK3_MK
17 18
18BUILDLINK_TREE+= -libpeas 19BUILDLINK_TREE+= -libpeas