From a4ffe3e84af5f814dff1bbf0bcaec9c2f95426be Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 27 Jul 2006 17:27:29 +0000
Subject: Fix build with m4-1.4.5. Use newer automake package instead of 1.4
 one. (Build dependency change only, so no PKGREVISION bump.)

---
 audio/faad2/Makefile         |  4 ++--
 audio/faad2/distinfo         |  4 ++--
 audio/faad2/patches/patch-ak | 13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'audio/faad2')

diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index 060c0c1e160..9d71e66f9d6 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/06/12 16:28:05 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/07/27 17:27:29 wiz Exp $
 
 DISTNAME=	faad2-2.0
 PKGREVISION=	8
@@ -14,7 +14,7 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 WRKSRC=		${WRKDIR}/faad2
-USE_TOOLS+=	automake14 gmake
+USE_TOOLS+=	automake gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 
diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index 755ed80493c..126afb60dea 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/05/30 20:23:32 tron Exp $
+$NetBSD: distinfo,v 1.12 2006/07/27 17:27:29 wiz Exp $
 
 SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8
 RMD160 (faad2-2.0.tar.gz) = e1e4d7c96cbc3db2b9e67385062ccf5decb61f90
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = a2527f6ddfcf65ba6077bc6145c87bb354c740db
 SHA1 (patch-ah) = d062e23144932994c4193189efc6dfc47520f139
 SHA1 (patch-ai) = 0f09c422d764467fdb5d4bce846bc80e653d4aac
 SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77
-SHA1 (patch-ak) = baed39b230c085cb67710f95e2b11a801547d366
+SHA1 (patch-ak) = d0a89de2fe7be1d784ea65433521d29f13c130a5
 SHA1 (patch-al) = e3dcbf3a0f19a4aca58bcad4ba079b2fee7415e2
 SHA1 (patch-am) = 7473594abc5349658a100db4a7dada5a8835468c
 SHA1 (patch-an) = 2267c3e65f820e72e0db4f2ce7b4c14f430e4cf4
diff --git a/audio/faad2/patches/patch-ak b/audio/faad2/patches/patch-ak
index 19e1df24ab2..7d315e660b5 100644
--- a/audio/faad2/patches/patch-ak
+++ b/audio/faad2/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.2 2005/10/09 03:23:11 ben Exp $
+$NetBSD: patch-ak,v 1.3 2006/07/27 17:27:29 wiz Exp $
 
---- configure.in.orig	2004-02-06 08:04:39.000000000 -0800
+--- configure.in.orig	2004-02-06 17:04:39.000000000 +0100
 +++ configure.in
 @@ -1,5 +1,5 @@
  AC_INIT
@@ -9,6 +9,15 @@ $NetBSD: patch-ak,v 1.2 2005/10/09 03:23:11 ben Exp $
  
  AC_PROG_LIBTOOL
  AC_SUBST(LIBTOOL_DEPS)
+@@ -13,7 +13,7 @@ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_WITH( xmms,   [  --with-xmms             compile XMMS plugins],WITHXMMS=$withval, WITHXMMS=no)
+ 
 @@ -114,7 +114,7 @@ if test x$WITHDRM = xyes; then
    AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
  fi
-- 
cgit v1.2.3