[pkgsrc/trunk]: pkgsrc/audio Only libao has been bl3ified. Fix building of l...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6225f581e667
branches:  trunk
changeset: 465884:6225f581e667
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 07 18:00:16 2004 +0000

description:
Only libao has been bl3ified.  Fix building of libao-{arts,esound} until
they have been, too.

diffstat:

 audio/libao-arts/Makefile   |   4 +++-
 audio/libao-esound/Makefile |   4 +++-
 audio/libao/Makefile        |   4 +++-
 audio/libao/Makefile.common |  12 ++++++++----
 4 files changed, 17 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 4001b72f3d54 -r 6225f581e667 audio/libao-arts/Makefile
--- a/audio/libao-arts/Makefile Wed Jan 07 17:40:36 2004 +0000
+++ b/audio/libao-arts/Makefile Wed Jan 07 18:00:16 2004 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/12/08 14:40:13 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/07 18:00:16 jlam Exp $
 #
 
+USE_BUILDLINK2=        yes
+
 .include "../libao/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/libao/libao-arts/}
diff -r 4001b72f3d54 -r 6225f581e667 audio/libao-esound/Makefile
--- a/audio/libao-esound/Makefile       Wed Jan 07 17:40:36 2004 +0000
+++ b/audio/libao-esound/Makefile       Wed Jan 07 18:00:16 2004 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:22:38 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/07 18:00:16 jlam Exp $
 #
 
+USE_BUILDLINK2=        yes
+
 .include "../libao/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/libao/libao-esound/}
diff -r 4001b72f3d54 -r 6225f581e667 audio/libao/Makefile
--- a/audio/libao/Makefile      Wed Jan 07 17:40:36 2004 +0000
+++ b/audio/libao/Makefile      Wed Jan 07 18:00:16 2004 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2004/01/05 20:52:56 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/07 18:00:16 jlam Exp $
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+USE_BUILDLINK3=        yes
+
 .include "Makefile.common"
 
 MAINTAINER=    lukem%NetBSD.org@localhost
diff -r 4001b72f3d54 -r 6225f581e667 audio/libao/Makefile.common
--- a/audio/libao/Makefile.common       Wed Jan 07 17:40:36 2004 +0000
+++ b/audio/libao/Makefile.common       Wed Jan 07 18:00:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/01/05 20:52:56 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/01/07 18:00:16 jlam Exp $
 
 DISTNAME=      libao-0.8.4
 CATEGORIES=    audio devel
@@ -11,7 +11,6 @@
 PATCHDIR=      ${.CURDIR}/../../audio/libao/patches
 
 GNU_CONFIGURE=         yes
-USE_BUILDLINK3=                yes
 USE_GMAKE=             yes
 USE_LIBTOOL=           yes
 
@@ -32,5 +31,10 @@
 CONFIGURE_ARGS+=       --disable-arts
 CONFIGURE_ARGS+=       --disable-esd
 
-.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.if defined(USE_BUILDLINK3)
+.  include "../../devel/pkgconfig/buildlink3.mk"
+.  include "../../mk/ossaudio.buildlink3.mk"
+.elif defined(USE_BUILDLINK2)
+.  include "../../devel/pkgconfig/buildlink2.mk"
+.  include "../../mk/ossaudio.buildlink2.mk"
+.endif