From 261c657eab7f14267f32391db184992483380bd7 Mon Sep 17 00:00:00 2001 From: Soren Jacobsen Date: Mon, 10 May 2004 01:48:50 +0000 Subject: [PATCH] Convert to buildlink3. --- freevo/Makefile | 14 +++++++------- py-mmpython/Makefile | 4 ++-- py-mmpython/buildlink2.mk | 22 ---------------------- py-mmpython/buildlink3.mk | 20 ++++++++++++++++++++ 4 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 py-mmpython/buildlink2.mk create mode 100644 py-mmpython/buildlink3.mk diff --git a/freevo/Makefile b/freevo/Makefile index 3389d80147..3a2813bd13 100644 --- a/freevo/Makefile +++ b/freevo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/03/31 19:10:30 thomasklausner Exp $ +# $NetBSD: Makefile,v 1.9 2004/05/10 01:49:05 blef Exp $ # DISTNAME= freevo-1.4.1 @@ -10,8 +10,9 @@ HOMEPAGE= http://freevo.sourceforge.net/ COMMENT= Fancy-lookging digital video jukebox DEPENDS+= mplayer>=1.0rc3:../../multimedia/mplayer +DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes PY_PATCHPLIST= yes PYDISTUTILSPKG= yes @@ -35,10 +36,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/local_conf.py.example \ ${PKG_SYSCONFDIR}/local_conf.py -.include "../../wip/py-game/buildlink2.mk" -.include "../../net/py-twisted/buildlink2.mk" -.include "../../wip/py-mmpython/buildlink2.mk" -.include "../../textproc/py-xml/buildlink2.mk" -.include "../../graphics/py-imaging/buildlink2.mk" +.include "../../wip/py-game/buildlink3.mk" +.include "../../wip/py-mmpython/buildlink3.mk" +.include "../../textproc/py-xml/buildlink3.mk" +.include "../../graphics/py-imaging/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/py-mmpython/Makefile b/py-mmpython/Makefile index 5fa347f221..6e4704e0ed 100644 --- a/py-mmpython/Makefile +++ b/py-mmpython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/04 10:47:24 mpasternak Exp $ +# $NetBSD: Makefile,v 1.2 2004/05/10 01:48:50 blef Exp $ # DISTNAME= mmpython-0.3 @@ -10,7 +10,7 @@ MAINTAINER= dotz@irc.pl HOMEPAGE= http://mmpython.sourceforge.net/ COMMENT= Extract text information from mp3, ogg, avi, jpg and more -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes PY_PATCHPLIST= yes PYDISTUTILSPKG= yes diff --git a/py-mmpython/buildlink2.mk b/py-mmpython/buildlink2.mk deleted file mode 100644 index 0dd571c700..0000000000 --- a/py-mmpython/buildlink2.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/01/04 10:47:24 mpasternak Exp $ -# -# This Makefile fragment is included by packages that use ${PYPKGPREFIX}-mmpython. -# - -.if !defined(PY_MMPYTHON_BUILDLINK2_MK) -PY_MMPYTHON_BUILDLINK2_MK= # defined - -.include "../../lang/python/pyversion.mk" - -BUILDLINK_PACKAGES+= ${PYPKGPREFIX}-mmpython -BUILDLINK_DEPENDS.${PYPKGPREFIX}-mmpython?= ${PYPKGPREFIX}-mmpython>=0.3 -BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-mmpython?= ../../wip/py-mmpython - -EVAL_PREFIX+= BUILDLINK_PREFIX.${PYPKGPREFIX}-mmpython=${PYPKGPREFIX}-mmpython -BUILDLINK_PREFIX.${PYPKGPREFIX}-mmpython_DEFAULT= ${LOCALBASE} - -BUILDLINK_TARGETS+= ${PYPKGPREFIX}-mmpython-buildlink - -${PYPKGPREFIX}-mmpython-buildlink: _BUILDLINK_USE - -.endif # PY_MMPYTHON_BUILDLINK2_MK diff --git a/py-mmpython/buildlink3.mk b/py-mmpython/buildlink3.mk new file mode 100644 index 0000000000..d0c6b96842 --- /dev/null +++ b/py-mmpython/buildlink3.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/05/10 01:48:51 blef Exp $ + +.include "../../lang/python/pyversion.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +PY_MMPYTHON_BUILDLINK3_MK:= ${PY_MMPYTHON_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= pymmpython +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npymmpython} +BUILDLINK_PACKAGES+= pymmpython + +.if !empty(PY_MMPYTHON_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.pymmpython+= ${PYPKGPREFIX}-mmpython>=0.3 +BUILDLINK_PKGSRCDIR.pymmpython?= ../../wip/py-mmpython +.endif # PY_MMPYTHON_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}