diff options
| author | minskim <minskim@pkgsrc.org> | 2004-02-17 16:23:53 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2004-02-17 16:23:53 +0000 |
| commit | 9968ceda1bcd8dd3d683218e6ef5b264b34f634d (patch) | |
| tree | cc61a5f4af8b2fe1c631f29591a7472d062f12d1 | |
| parent | 2701aadddd9955714443d6cb17431511981b73c7 (diff) | |
| download | pkgsrc-9968ceda1bcd8dd3d683218e6ef5b264b34f634d.tar.gz | |
bl3ify
| -rw-r--r-- | audio/xmms-esound/Makefile | 6 | ||||
| -rw-r--r-- | audio/xmms/Makefile.common | 20 | ||||
| -rw-r--r-- | audio/xmms/buildlink3.mk | 30 |
3 files changed, 43 insertions, 13 deletions
diff --git a/audio/xmms-esound/Makefile b/audio/xmms-esound/Makefile index 80c7d2e1b14..5b67ff8fcaa 100644 --- a/audio/xmms-esound/Makefile +++ b/audio/xmms-esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/12/08 14:41:38 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/17 16:24:08 minskim Exp $ # .include "../../audio/xmms/Makefile.common" @@ -16,6 +16,6 @@ BUILDLINK_DEPENDS.xmms= xmms>=1.2.7nb9 BUILD_DIRS= ${WRKSRC}/Output/esd INSTALL_DIRS= ${WRKSRC}/Output/esd -.include "../../audio/esound/buildlink2.mk" -.include "../../audio/xmms/buildlink2.mk" +.include "../../audio/esound/buildlink3.mk" +.include "../../audio/xmms/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common index 7d64ba5434e..6a3b05aa12c 100644 --- a/audio/xmms/Makefile.common +++ b/audio/xmms/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2004/02/14 17:21:34 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2004/02/17 16:23:53 minskim Exp $ # DISTNAME= xmms-1.2.7 @@ -10,7 +10,7 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.xmms.org/ COMMENT= X Multimedia System - an audio player with a Winamp GUI -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_GNU_TOOLS+= make @@ -61,11 +61,11 @@ PLIST_SUBST+= LIBAUDIO=libSolaris PLIST_SUBST+= LIBAUDIO=libOSS .endif -.include "../../audio/libmikmod/buildlink2.mk" -.include "../../audio/libvorbis/buildlink2.mk" -.include "../../converters/libiconv/buildlink2.mk" -.include "../../graphics/Mesa/buildlink2.mk" -.include "../../textproc/libxml/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" -.include "../../mk/ossaudio.buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" +.include "../../audio/libmikmod/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" +.include "../../converters/libiconv/buildlink3.mk" +.include "../../graphics/Mesa/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk new file mode 100644 index 00000000000..b3e4c03f02e --- /dev/null +++ b/audio/xmms/buildlink3.mk @@ -0,0 +1,30 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 16:23:53 minskim Exp $ +# +# This Makefile fragment is included by packages that use xmms. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +XMMS_BUILDLINK3_MK:= ${XMMS_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= xmms +.endif + +.if !empty(XMMS_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= xmms +BUILDLINK_DEPENDS.xmms+= xmms>=1.2.7nb10 +BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms + +PTHREAD_OPTS+= require + +.include "../../audio/libmikmod/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" +.include "../../converters/libiconv/buildlink3.mk" +.include "../../graphics/Mesa/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" + +.endif # XMMS_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |