summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordillo <dillo@pkgsrc.org>2002-10-02 18:13:16 +0000
committerdillo <dillo@pkgsrc.org>2002-10-02 18:13:16 +0000
commita3cb029db92f6332913849f52ad154c4855caca7 (patch)
treef1f4f93621a6c1e5db560b38bc3986840703aff3
parent40b7a0920f3d2943430553e6f39fe1a0f2cadd69 (diff)
downloadpkgsrc-a3cb029db92f6332913849f52ad154c4855caca7.tar.gz
make use of new automake.mk
-rw-r--r--audio/faad2/Makefile17
-rw-r--r--audio/tremor-tools/Makefile7
-rw-r--r--audio/tremor/Makefile13
3 files changed, 25 insertions, 12 deletions
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index 6db03e94748..dae8462085a 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/05 17:49:42 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/02 18:13:18 dillo Exp $
#
DISTNAME= faad2-1.1
@@ -9,8 +9,6 @@ MAINTAINER= dillo@giga.or.at
HOMEPAGE= http://faac.sourceforge.net/
COMMENT= AAC decoding library
-BUILD_DEPENDS+=autoconf-[0-9]*:../../devel/autoconf
-BUILD_DEPENDS+=automake-[0-9]*:../../devel/automake
RESTRICTED= Dolby doesn't allow binary distributions
NO_BIN_ON_FTP= ${RESTRICTED}
@@ -24,9 +22,18 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
LIBTOOL_OVERRIDE= ${WRKSRC}/common/mp4v2/libtool
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
+AUTOMAKE_REQD= 1.4
pre-configure:
- cd ${WRKSRC} && ${SH} bootstrap
-
+ for dir in . common/mp4v2 ; do \
+ cd ${WRKSRC}/$$dir; \
+ ${ACLOCAL} -I .; \
+ ${AUTOHEADER}; \
+ ${LOCALBASE}/bin/libtoolize --automake; \
+ ${AUTOMAKE} --add-missing; \
+ ${AUTOCONF}; \
+ done
+
+.include "../../mk/automake.mk"
.include "../../audio/libsndfile/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
index c59e5e2e204..53fb0e3b21d 100644
--- a/audio/tremor-tools/Makefile
+++ b/audio/tremor-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/24 09:35:16 chris Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/02 18:13:17 dillo Exp $
DISTNAME= vorbis-tools-1.0
PKGNAME= tremor-tools-1.0.0.8
@@ -25,11 +25,14 @@ CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
PLIST_SUBST+= DISTNAME="${DISTNAME}"
+AUTOMAKE_REQD= 1.4
PTHREAD_OPTS+= require
pre-configure:
- cd ${WRKSRC} && automake && autoconf
+ cd ${WRKSRC} && ${AUTOMAKE}
+ cd ${WRKSRC} && ${AUTOCONF}
+.include "../../mk/automake.mk"
.include "../../audio/tremor/buildlink2.mk"
.include "../../audio/libvorbis/buildlink2.mk"
.include "../../audio/libao/buildlink2.mk"
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index ca6d62a5209..906d38e91a5 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/24 09:49:03 chris Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/02 18:13:16 dillo Exp $
DISTNAME= tremor_snapshot_020923
PKGNAME= tremor-1.0.2
@@ -11,16 +11,19 @@ MAINTAINER= chris@netbsd.org
HOMEPAGE= http://www.xiph.org/ogg/vorbis/
COMMENT= Fixed point decoding library for the Ogg Vorbis audio encoding format
-BUILD_DEPENDS= autoconf>=2.13:../../devel/autoconf
-
+AUTOMAKE_REQD= 1.4
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+#LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PLIST_SUBST+= DISTNAME=${DISTNAME}
pre-configure:
- cd ${WRKSRC} && ${SH} ./autogen.sh
+ cd ${WRKSRC} && ${ACLOCAL}
+ cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --automake
+ cd ${WRKSRC} && ${AUTOMAKE} --add-missing
+ cd ${WRKSRC} && ${AUTOCONF}
+.include "../../mk/automake.mk"
.include "../../mk/bsd.pkg.mk"