From c3c373cc28ef944ebcc882a3f54d9a01092e11cd Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 17 Oct 2013 01:14:16 +0000 Subject: [PATCH] - Support staging - Use new LIB_DEPENDS syntax --- audio/audiere/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/audio/audiere/Makefile b/audio/audiere/Makefile index 4fce774cb271..f384ab2c9161 100644 --- a/audio/audiere/Makefile +++ b/audio/audiere/Makefile @@ -11,7 +11,6 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= High-level audio API GNU_CONFIGURE= yes -NO_STAGE= yes USES= gmake WANT_WX= yes USE_AUTOTOOLS= autoconf @@ -49,7 +48,7 @@ CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|dumb|no_&|' .endif .if ${PORT_OPTIONS:MCDAUDIO} -LIB_DEPENDS+= cdaudio:${PORTSDIR}/audio/libcdaudio +LIB_DEPENDS+= libcdaudio.so:${PORTSDIR}/audio/libcdaudio .else CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|cdaudio|no_&|' .endif @@ -57,14 +56,14 @@ CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|cdaudio|no_&|' # since dumb is a static lib and it depends on ogg, we should # link audiere with ogg as well .if ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MDUMB} -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis \ - ogg:${PORTSDIR}/audio/libogg +LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis \ + libogg.so:${PORTSDIR}/audio/libogg .else CONFIGURE_REPLACES+='/AC_CHECK_HEADER/ s|vorbis|no_&|' .endif .if ${PORT_OPTIONS:MSPEEX} -LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex +LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex .else CONFIGURE_REPLACES+='/AC_CHECK_HEADER/ s|speex|no_&|' .endif @@ -75,11 +74,9 @@ post-patch: ${WRKSRC}/configure.in post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include