[pkgsrc/trunk]: pkgsrc/audio bl3ify

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a8b0f69657a
branches:  trunk
changeset: 468891:1a8b0f69657a
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Feb 17 16:23:53 2004 +0000

description:
bl3ify

diffstat:

 audio/xmms-esound/Makefile |   6 +++---
 audio/xmms/Makefile.common |  20 ++++++++++----------
 audio/xmms/buildlink3.mk   |  30 ++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 13 deletions(-)

diffs (90 lines):

diff -r cbdca36e5b01 -r 1a8b0f69657a audio/xmms-esound/Makefile
--- a/audio/xmms-esound/Makefile        Tue Feb 17 16:21:00 2004 +0000
+++ b/audio/xmms-esound/Makefile        Tue Feb 17 16:23:53 2004 +0000
@@ -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 @@
 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 -r cbdca36e5b01 -r 1a8b0f69657a audio/xmms/Makefile.common
--- a/audio/xmms/Makefile.common        Tue Feb 17 16:21:00 2004 +0000
+++ b/audio/xmms/Makefile.common        Tue Feb 17 16:23:53 2004 +0000
@@ -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 @@
 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=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 -r cbdca36e5b01 -r 1a8b0f69657a audio/xmms/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmms/buildlink3.mk  Tue Feb 17 16:23:53 2004 +0000
@@ -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/+$//}