diff options
| author | jlam <jlam> | 2004-01-07 18:00:16 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-01-07 18:00:16 +0000 |
| commit | 94c26f17ed792c22d1e7cbe3c7b0c46188c0b1c7 (patch) | |
| tree | 88019d24b86637a098e54b31e3ab8133312f8448 /audio | |
| parent | f2e65730faf676bd615608dfa88e57be0f3b6e25 (diff) | |
| download | pkgsrc-94c26f17ed792c22d1e7cbe3c7b0c46188c0b1c7.tar.gz | |
Only libao has been bl3ified. Fix building of libao-{arts,esound} until
they have been, too.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/libao-arts/Makefile | 4 | ||||
| -rw-r--r-- | audio/libao-esound/Makefile | 4 | ||||
| -rw-r--r-- | audio/libao/Makefile | 4 | ||||
| -rw-r--r-- | audio/libao/Makefile.common | 12 |
4 files changed, 17 insertions, 7 deletions
diff --git a/audio/libao-arts/Makefile b/audio/libao-arts/Makefile index 29e2974ed08..ac3bba00a58 100644 --- a/audio/libao-arts/Makefile +++ b/audio/libao-arts/Makefile @@ -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 --git a/audio/libao-esound/Makefile b/audio/libao-esound/Makefile index 2a832cafbc0..3e8a375df55 100644 --- a/audio/libao-esound/Makefile +++ b/audio/libao-esound/Makefile @@ -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 --git a/audio/libao/Makefile b/audio/libao/Makefile index 65c65ab7cd1..5da08648f52 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -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 diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common index 1bda491c7c9..d9d47e5b384 100644 --- a/audio/libao/Makefile.common +++ b/audio/libao/Makefile.common @@ -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 @@ DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo PATCHDIR= ${.CURDIR}/../../audio/libao/patches GNU_CONFIGURE= yes -USE_BUILDLINK3= yes USE_GMAKE= yes USE_LIBTOOL= yes @@ -32,5 +31,10 @@ CONFIGURE_ARGS+= --disable-alsa09 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 |