diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-01 20:07:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-01 20:07:59 +0000 |
| commit | fcb7da800bdfcf21720b30da13c68603c1f09525 (patch) | |
| tree | 77aa2e325b82a73660278dbb13238e6aac0adca7 /multimedia | |
| parent | f252a9837d224356df2bfc3c73223d7e84e939c5 (diff) | |
| download | pkgsrc-fcb7da800bdfcf21720b30da13c68603c1f09525.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 'multimedia')
| -rw-r--r-- | multimedia/transcode/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/xine-lib/Makefile.common | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 98341ad2941..fddf5825ca2 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:22 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 20:08:01 jlam Exp $ DISTNAME= transcode-0.6.12 PKGREVISION= 6 @@ -12,7 +12,7 @@ COMMENT= Command line video-stream processing tool BUILD_DEPENDS+= nasm>=0.98.36:../../devel/nasm -USE_TOOLS+= gmake +USE_TOOLS+= automake gmake USE_LIBTOOL= yes SHLIBTOOL_OVERRIDE= libtool @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-ft-prefix=${BUILDLINK_PREFIX.freetype2} # this used to operate on acinclude.m4 and run aclocal, but running # aclocal here breaks due to missing DLFCN checking post-patch: - -cd ${WRKSRC} && ${ACLOCAL} && ${AUTOCONF} && ${AUTOMAKE} + -cd ${WRKSRC} && aclocal && autoconf && automake cd ${WRKSRC} && \ ${SED} "s|/usr/local|${PREFIX}|g; s|include/libmpeg3|include/mpeg3|g; s|-ldl -lm|-lm|g" configure > configure.new && \ ${MV} configure.new configure && ${CHMOD} a+x configure @@ -59,5 +59,4 @@ post-install: .include "../../x11/gtk/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 26aa6d059b3..a945ec5b291 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile.common,v 1.22 2005/06/01 20:08:01 jlam Exp $ # DISTNAME= xine-lib-1.0.1 @@ -16,12 +16,11 @@ PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES -AUTOCONF_REQD= 2.58 USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= libtool libtool-nofpic PKGCONFIG_OVERRIDE= misc/libxine.pc.in -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest @@ -40,11 +39,10 @@ PLIST_SUBST+= HAVE_XV= .endif pre-configure: - cd ${WRKSRC} && ${AUTOCONF} + cd ${WRKSRC} && autoconf .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/autoconf.mk" |