From ed4ca099f85deb5c01294bde81376961478877ba Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Fri, 1 Jun 2007 00:19:51 +0000 Subject: [PATCH] Use python/application.mk and update PKGNAME for latest version. --- xmms2/Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/xmms2/Makefile b/xmms2/Makefile index 0553795e2e..3b51eede69 100644 --- a/xmms2/Makefile +++ b/xmms2/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2007/05/27 17:59:12 tnn2 Exp $ +# $NetBSD: Makefile,v 1.15 2007/06/01 00:19:51 thomasklausner Exp $ # DISTNAME= xmms2-0.2DrJekyll -PKGNAME= xmms2-0.2rc8 -PKGREVISION= 1 +PKGNAME= xmms2-0.2rc10 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmms2/} EXTRACT_SUFX= .tar.bz2 @@ -12,28 +11,33 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xmms2.xmms.org/ COMMENT= Audio player featuring a client-server model -BUILD_DEPENDS+= python24>=2.4.0:../../lang/python24 - HAS_CONFIGURE= yes USE_TOOLS+= pkg-config USE_LANGUAGES= c c++ MANCOMPRESSED= yes +PKGCONFIG_OVERRIDE+= _build_/default/xmms2-client-cpp-glib.pc +PKGCONFIG_OVERRIDE+= _build_/default/xmms2-plugin.pc +PKGCONFIG_OVERRIDE+= _build_/default/xmms2-client.pc +PKGCONFIG_OVERRIDE+= _build_/default/xmms2-client-glib.pc + do-configure: - cd ${WRKSRC:Q} && ${PREFIX}/bin/python2.4 ./waf configure \ + cd ${WRKSRC:Q} && ${PYTHONBIN} ./waf configure \ --prefix=${PREFIX} --with-mandir=${PREFIX}/man do-build: - cd ${WRKSRC:Q} && ${PREFIX}/bin/python2.4 ./waf build + cd ${WRKSRC:Q} && ${PYTHONBIN} ./waf build do-install: - cd ${WRKSRC:Q} && ${PREFIX}/bin/python2.4 ./waf install - + cd ${WRKSRC:Q} && ${PYTHONBIN} ./waf install .include "options.mk" .include "../../audio/libmad/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +# just used for waf +BUILDLINK_DEPMETHOD.python= build +.include "../../lang/python/application.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk"