diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
| commit | e2afa97f51a1f72e6618533019aaaae07b7d3cf2 (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /audio/libao | |
| parent | e97ad43756dc8382d2c6cb8a7ae09be0eb540f67 (diff) | |
| download | pkgsrc-e2afa97f51a1f72e6618533019aaaae07b7d3cf2.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'audio/libao')
| -rw-r--r-- | audio/libao/Makefile | 6 | ||||
| -rw-r--r-- | audio/libao/PLIST | 2 | ||||
| -rw-r--r-- | audio/libao/buildlink.mk | 2 | ||||
| -rw-r--r-- | audio/libao/buildlink2.mk | 21 | ||||
| -rw-r--r-- | audio/libao/distinfo | 2 | ||||
| -rw-r--r-- | audio/libao/patches/patch-ac | 2 |
6 files changed, 28 insertions, 7 deletions
diff --git a/audio/libao/Makefile b/audio/libao/Makefile index 73a5e4efe94..989fcf856f9 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/08/05 13:08:38 lukem Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/25 18:38:09 jlam Exp $ DISTNAME= libao-0.8.3 CATEGORIES= devel @@ -9,7 +9,7 @@ COMMENT= cross-platform audio library PLIST_SUBST+= VERSION="${DISTNAME}" -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-alsa CONFIGURE_ARGS+= --disable-arts @@ -19,5 +19,5 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -.include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/ossaudio.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libao/PLIST b/audio/libao/PLIST index b576ec42880..e818657f04f 100644 --- a/audio/libao/PLIST +++ b/audio/libao/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:08:39 lukem Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:10 jlam Exp $ include/ao/ao.h include/ao/os_types.h include/ao/plugin.h diff --git a/audio/libao/buildlink.mk b/audio/libao/buildlink.mk index 6d3c276b805..13960596ecd 100644 --- a/audio/libao/buildlink.mk +++ b/audio/libao/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2002/08/05 13:08:39 lukem Exp $ +# $NetBSD: buildlink.mk,v 1.6 2002/08/25 18:38:10 jlam Exp $ # # This Makefile fragment is included by packages that use libao. # diff --git a/audio/libao/buildlink2.mk b/audio/libao/buildlink2.mk new file mode 100644 index 00000000000..3de907e7a76 --- /dev/null +++ b/audio/libao/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:10 jlam Exp $ + +.if !defined(LIBAO_BUILDLINK2_MK) +LIBAO_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libao +BUILDLINK_DEPENDS.libao?= libao>=0.8.3 +BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao + +EVAL_PREFIX+= BUILDLINK_PREFIX.libao=libao +BUILDLINK_PREFIX.libao= ${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 diff --git a/audio/libao/distinfo b/audio/libao/distinfo index 649f01d4e26..4d40c7c2cbb 100644 --- a/audio/libao/distinfo +++ b/audio/libao/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/08/05 13:08:39 lukem Exp $ +$NetBSD: distinfo,v 1.10 2002/08/25 18:38:10 jlam Exp $ SHA1 (libao-0.8.3.tar.gz) = bf918997df2d99e60927cb5bc43b5d1e547811c0 Size (libao-0.8.3.tar.gz) = 210690 bytes diff --git a/audio/libao/patches/patch-ac b/audio/libao/patches/patch-ac index 4b05bfe0118..7cec0fa9fc8 100644 --- a/audio/libao/patches/patch-ac +++ b/audio/libao/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2002/08/05 13:08:39 lukem Exp $ +$NetBSD: patch-ac,v 1.4 2002/08/25 18:38:11 jlam Exp $ --- src/Makefile.in.orig Sat Jul 20 00:17:44 2002 +++ src/Makefile.in |