[pkgsrc/trunk]: pkgsrc/audio Clean up traces of buildlink2->buildlink3 conver...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20486a98711f
branches:  trunk
changeset: 473647:20486a98711f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Apr 22 12:29:35 2004 +0000

description:
Clean up traces of buildlink2->buildlink3 conversion; remove unused
bl2 file.

diffstat:

 audio/libao-arts/Makefile   |   4 +---
 audio/libao-esound/Makefile |   4 +---
 audio/libao/Makefile        |   4 +---
 audio/libao/Makefile.common |  12 ++++--------
 audio/libao/buildlink2.mk   |  21 ---------------------
 5 files changed, 7 insertions(+), 38 deletions(-)

diffs (95 lines):

diff -r c53d1f5db732 -r 20486a98711f audio/libao-arts/Makefile
--- a/audio/libao-arts/Makefile Thu Apr 22 12:28:11 2004 +0000
+++ b/audio/libao-arts/Makefile Thu Apr 22 12:29:35 2004 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2004/04/22 12:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/22 12:29:35 wiz Exp $
 #
 
-USE_BUILDLINK3=        yes
-
 .include "../libao/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/libao/libao-arts/}
diff -r c53d1f5db732 -r 20486a98711f audio/libao-esound/Makefile
--- a/audio/libao-esound/Makefile       Thu Apr 22 12:28:11 2004 +0000
+++ b/audio/libao-esound/Makefile       Thu Apr 22 12:29:35 2004 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/03/07 06:21:51 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/22 12:29:35 wiz Exp $
 #
 
-USE_BUILDLINK3=        yes
-
 .include "../libao/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/libao/libao-esound/}
diff -r c53d1f5db732 -r 20486a98711f audio/libao/Makefile
--- a/audio/libao/Makefile      Thu Apr 22 12:28:11 2004 +0000
+++ b/audio/libao/Makefile      Thu Apr 22 12:29:35 2004 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2004/01/07 18:07:46 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/22 12:29:35 wiz Exp $
 
 PKG_INSTALLATION_TYPES=        overwrite
 
-USE_BUILDLINK3=        yes
-
 .include "Makefile.common"
 
 MAINTAINER=    lukem%NetBSD.org@localhost
diff -r c53d1f5db732 -r 20486a98711f audio/libao/Makefile.common
--- a/audio/libao/Makefile.common       Thu Apr 22 12:28:11 2004 +0000
+++ b/audio/libao/Makefile.common       Thu Apr 22 12:29:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/03/15 19:10:21 minskim Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/04/22 12:29:35 wiz Exp $
 
 DISTNAME=      libao-0.8.4
 CATEGORIES=    audio devel
@@ -11,6 +11,7 @@
 PATCHDIR=      ${.CURDIR}/../../audio/libao/patches
 
 GNU_CONFIGURE=         yes
+USE_BUILDLINK3=                yes
 USE_GNU_TOOLS+=                make
 USE_LIBTOOL=           yes
 
@@ -37,10 +38,5 @@
 CONFIGURE_ARGS+=       --disable-arts
 CONFIGURE_ARGS+=       --disable-esd
 
-.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
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
diff -r c53d1f5db732 -r 20486a98711f audio/libao/buildlink2.mk
--- a/audio/libao/buildlink2.mk Thu Apr 22 12:28:11 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/02/19 17:54:05 wiz Exp $
-
-.if !defined(LIBAO_BUILDLINK2_MK)
-LIBAO_BUILDLINK2_MK=   # defined
-
-BUILDLINK_PACKAGES+=           libao
-BUILDLINK_DEPENDS.libao?=      libao>=0.8.4
-BUILDLINK_PKGSRCDIR.libao?=    ../../audio/libao
-
-EVAL_PREFIX+=          BUILDLINK_PREFIX.libao=libao
-BUILDLINK_PREFIX.libao_DEFAULT=        ${LOCALBASE}
-BUILDLINK_FILES.libao= include/ao/ao.h
-BUILDLINK_FILES.libao+=        include/ao/os_types.h
-BUILDLINK_FILES.libao+=        lib/libao.*
-BUILDLINK_FILES.libao+=        lib/ao/*
-
-BUILDLINK_TARGETS+=    libao-buildlink
-
-libao-buildlink: _BUILDLINK_USE
-
-.endif # LIBAO_BUILDLINK2_MK