From 4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8 Mon Sep 17 00:00:00 2001 From: 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. --- games/gcompris/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'games/gcompris') diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 3aefc78ba15..56acbaf437c 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2014/01/01 11:52:15 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2014/01/25 10:30:08 wiz Exp $ DISTNAME= gcompris-12.11 PKGREVISION= 12 @@ -11,6 +11,8 @@ HOMEPAGE= http://gcompris.net/ COMMENT= Educational games for children LICENSE= gnu-gpl-v3 +DEPENDS+= gnuchess-[0-9]*:../../games/gnuchess + USE_TOOLS+= gmake intltool gtar pkg-config msgfmt texi2html GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES @@ -19,10 +21,11 @@ USE_LIBTOOL= YES CHECK_PORTABILITY_SKIP+= macosx/build-gtk.sh INFO_FILES= yes -DEPENDS+= gnuchess-[0-9]*:../../games/gnuchess - PTHREAD_AUTO_VARS= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2, py-gtk2 +PYTHON_VERSIONED_DEPENDENCIES= cairo:link + PKG_SUPPORTED_OPTIONS= gnet PKG_OPTIONS_VAR= PKG_OPTIONS.gcompris .include "../../mk/bsd.options.mk" @@ -50,7 +53,7 @@ post-install: .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" -.include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/application.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -- cgit v1.2.3