diff options
| author | wiz <wiz@pkgsrc.org> | 2004-04-22 12:29:35 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-04-22 12:29:35 +0000 |
| commit | 46b680a39bfabf2410ac62cd95e8569f938a1deb (patch) | |
| tree | 9c4bed74bb9379d0dfe9ea49f48ae5fdb4735429 /audio/libao | |
| parent | d1218843d5877311e0ca6969c1f5fecd2ab7dec1 (diff) | |
| download | pkgsrc-46b680a39bfabf2410ac62cd95e8569f938a1deb.tar.gz | |
Clean up traces of buildlink2->buildlink3 conversion; remove unused
bl2 file.
Diffstat (limited to 'audio/libao')
| -rw-r--r-- | audio/libao/Makefile | 4 | ||||
| -rw-r--r-- | audio/libao/Makefile.common | 12 | ||||
| -rw-r--r-- | audio/libao/buildlink2.mk | 21 |
3 files changed, 5 insertions, 32 deletions
diff --git a/audio/libao/Makefile b/audio/libao/Makefile index 4c6f8ee39cf..25b98b3145c 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -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 diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common index 97d27e9b5d6..6e2f04a92e0 100644 --- a/audio/libao/Makefile.common +++ b/audio/libao/Makefile.common @@ -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 @@ DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo 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-alsa09 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 --git a/audio/libao/buildlink2.mk b/audio/libao/buildlink2.mk deleted file mode 100644 index 6d4a5e97a08..00000000000 --- a/audio/libao/buildlink2.mk +++ /dev/null @@ -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 |