diff options
author | jlam <jlam> | 2005-06-01 20:07:59 +0000 |
---|---|---|
committer | jlam <jlam> | 2005-06-01 20:07:59 +0000 |
commit | 6492b8f1ec8698b04f9127eecc0ef008460a9830 (patch) | |
tree | 77aa2e325b82a73660278dbb13238e6aac0adca7 /audio | |
parent | 9c65cd2dcc49b8566966aad971d48eabca98f809 (diff) | |
download | pkgsrc-6492b8f1ec8698b04f9127eecc0ef008460a9830.tar.gz |
Remove mk/autoconf.mk and mk/automake.mk and replace their usage with
USE_TOOLS and any of "autoconf", "autoconf213", "automake" or
"automake14". Also, we don't need to call the auto* tools via
${ACLOCAL}, ${AUTOCONF}, etc., since the tools framework takes care
to symlink the correct tool to the correct name, so we can just use
aclocal, autoconf, etc.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/audacity/Makefile | 5 | ||||
-rw-r--r-- | audio/faac/Makefile | 9 | ||||
-rw-r--r-- | audio/faad2/Makefile | 14 | ||||
-rw-r--r-- | audio/ices-mp3/Makefile | 6 | ||||
-rw-r--r-- | audio/tremor-tools/Makefile | 10 | ||||
-rw-r--r-- | audio/tremor/Makefile | 12 | ||||
-rw-r--r-- | audio/xmms-faad/Makefile | 14 |
7 files changed, 28 insertions, 42 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 0b4b2c92c38..b7452e67037 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:37 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/01 20:07:59 jlam Exp $ DISTNAME= audacity-src-1.2.3 PKGNAME= audacity-1.2.3 @@ -13,7 +13,7 @@ COMMENT= Audio editor DEPENDS+= zip>=0.0:../../archivers/zip WRKSRC= ${WRKDIR}/audacity-src-1.2.3 -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes @@ -39,7 +39,6 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/lib-src/libsndfile/libtool \ .include "../../x11/wxGTK/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" # XXX Internal compiler error with -O2 diff --git a/audio/faac/Makefile b/audio/faac/Makefile index cd64883aadd..6b7c6fabb57 100644 --- a/audio/faac/Makefile +++ b/audio/faac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:52 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 20:07:59 jlam Exp $ # DISTNAME= faac-1.24 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.audiocoding.com/ COMMENT= AAC audio encoder USE_LIBTOOL= yes +USE_TOOLS+= automake GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/faac @@ -19,10 +20,6 @@ LIBTOOLIZE= ${PREFIX}/bin/libtoolize pre-configure: cd ${WRKSRC}; \ ${LIBTOOLIZE} --automake; \ - ${ACLOCAL}; \ - ${AUTOHEADER}; \ - ${AUTOMAKE} -a --foreign -i; \ - ${AUTOCONF} + aclocal; autoheader; automake -a --foreign -i; autoconf -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile index e15d31c07d9..54429eb2678 100644 --- a/audio/faad2/Makefile +++ b/audio/faad2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:37 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 20:07:59 jlam Exp $ # DISTNAME= faad2-2.0 @@ -15,11 +15,10 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} WRKSRC= ${WRKDIR}/faad2 -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake USE_LANGUAGES= c c++ USE_LIBTOOL= YES -AUTOMAKE_REQD= 1.4 AUTOCONF_REQD= 2.50 GNU_CONFIGURE= YES @@ -40,12 +39,11 @@ pre-configure: @${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend for dir in . ; do \ cd ${WRKSRC}/$$dir; \ - ${ACLOCAL} -I .; \ - ${AUTOHEADER}; \ + aclocal -I .; \ + autoheader; \ ${LOCALBASE}/bin/libtoolize --automake; \ - ${AUTOMAKE} --add-missing; \ - ${AUTOCONF}; \ + automake --add-missing; \ + autoconf; \ done -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile index da4691c0699..efa278c69ad 100644 --- a/audio/ices-mp3/Makefile +++ b/audio/ices-mp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:44:53 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 20:07:59 jlam Exp $ # DISTNAME= ices-${ICES_VERSION} @@ -12,6 +12,7 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.icecast.org/ices.php COMMENT= Source client for a streaming server +USE_TOOLS+= automake USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -32,7 +33,7 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} MODDIR= ${PREFIX}/share/${PKGBASE} pre-configure: - cd ${WRKSRC} && ${AUTORECONF} --force + cd ${WRKSRC} && autoreconf --force do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ices ${PREFIX}/bin/${PKGBASE} @@ -65,5 +66,4 @@ CONFIGURE_ARGS+= --with-python=${PYTHONBIN} .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile index f8fda3b7615..179f20ce19c 100644 --- a/audio/tremor-tools/Makefile +++ b/audio/tremor-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 20:07:59 jlam Exp $ DISTNAME= vorbis-tools-1.0 PKGNAME= tremor-tools-1.0.0.8 @@ -17,21 +17,17 @@ CONFLICTS= vorbis-[0-9]* GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \ --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \ --with-ao-prefix=${BUILDLINK_PREFIX.libao} PLIST_SUBST+= DISTNAME="${DISTNAME}" -AUTOMAKE_REQD= 1.4 PTHREAD_OPTS+= require pre-configure: - cd ${WRKSRC} && ${AUTOMAKE} - cd ${WRKSRC} && ${AUTOCONF} - -.include "../../mk/automake.mk" + cd ${WRKSRC} && automake && autoconf .include "../../audio/libao/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile index 1f7cba278dc..0a7a037e2d4 100644 --- a/audio/tremor/Makefile +++ b/audio/tremor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 20:07:59 jlam Exp $ DISTNAME= tremor_snapshot_030406 PKGNAME= tremor-1.0.2 @@ -12,19 +12,17 @@ HOMEPAGE= http://www.xiph.org/ogg/vorbis/ COMMENT= Fixed point decoding library for the Ogg Vorbis audio encoding format WRKSRC= ${WRKDIR}/Tremor -AUTOMAKE_REQD= 1.4 AUTOCONF_REQD= 2.50 GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake USE_LIBTOOL= yes PLIST_SUBST+= DISTNAME=${DISTNAME} pre-configure: - cd ${WRKSRC} && ${ACLOCAL} + cd ${WRKSRC} && aclocal cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --automake - cd ${WRKSRC} && ${AUTOMAKE} --add-missing - cd ${WRKSRC} && ${AUTOCONF} + cd ${WRKSRC} && automake --add-missing + cd ${WRKSRC} && autoconf -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile index b2d436b950a..a13b894f17b 100644 --- a/audio/xmms-faad/Makefile +++ b/audio/xmms-faad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 20:07:59 jlam Exp $ DISTNAME= faad2-2.0 PKGNAME= xmms-faad-2.0 @@ -14,12 +14,11 @@ COMMENT= XMMS plugin for faad #NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR}/faad2 -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake USE_LANGUAGES= c c++ USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= libtool -AUTOMAKE_REQD= 1.4 AUTOCONF_REQD= 2.50 GNU_CONFIGURE= YES @@ -32,11 +31,11 @@ pre-configure: @${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend for dir in . ; do \ cd ${WRKSRC}/$$dir; \ - ${ACLOCAL} -I .; \ - ${AUTOHEADER}; \ + aclocal -I .; \ + autoheader; \ ${LOCALBASE}/bin/libtoolize --automake; \ - ${AUTOMAKE} --add-missing; \ - ${AUTOCONF}; \ + automake --add-missing; \ + autoconf; \ done do-build: @@ -52,5 +51,4 @@ do-install: .include "../../audio/xmms/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" |