Use automake.mk. Drop a now unneeded patch.

3 files changed, 9 insertions, 26 deletions

diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index 5e2c9323c93..f5d273931b7 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/08/28 02:40:32 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2002/10/02 23:20:34 wiz Exp $
 #
 
 DISTNAME=	avifile-0.6.20010814
@@ -12,7 +12,6 @@ HOMEPAGE=	http://divx.euro.ru/
 COMMENT=	MPEG-4 (DivX) video player library
 
 DEPENDS+=	win32-codecs>=010122:../../graphics/win32-codecs
-BUILD_DEPENDS+=	automake>=1.4:../../devel/automake
 
 WRKSRC=		${WRKDIR}/avifile-0.6
 
@@ -22,6 +21,7 @@ NO_SRC_ON_FTP=		"Already in MASTER_SITE_LOCAL"
 
 BUILD_USES_GETTEXT_M4=	YES
 
+AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
@@ -64,7 +64,12 @@ CONFIGURE_ARGS+=	--with-qt-dir="${QTDIR}"
 .endif
 
 pre-configure:
-	cd ${WRKSRC} && ${SH} autogen.sh
+	cd ${WRKSRC} && libtoolize --force --copy
+	cd ${WRKSRC} && ${ACLOCAL}
+	cd ${WRKSRC} && ${AUTOHEADER}
+	cd ${WRKSRC} && ${AUTOCONF}
+	cd ${WRKSRC} && ${AUTOMAKE} --add-missing --copy --foreign
 
 .include "../../devel/SDL/buildlink2.mk"
+.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/avifile-devel/distinfo b/graphics/avifile-devel/distinfo
index 9387fd0f589..59b256843e9 100644
--- a/graphics/avifile-devel/distinfo
+++ b/graphics/avifile-devel/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/03/08 04:16:55 fredb Exp $
+$NetBSD: distinfo,v 1.11 2002/10/02 23:20:36 wiz Exp $
 
 SHA1 (avifile-0.6.20010814.tar.bz2) = 695227679dd09e9b9d1fb71caf58a9d92204b262
 Size (avifile-0.6.20010814.tar.bz2) = 1067753 bytes
-SHA1 (patch-aa) = 811be2038933dfcbd79c787450557cde58173b8a
diff --git a/graphics/avifile-devel/patches/patch-aa b/graphics/avifile-devel/patches/patch-aa
deleted file mode 100644
index 904f34ca892..00000000000
--- a/graphics/avifile-devel/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/03/08 04:16:56 fredb Exp $
-
---- autogen.sh.orig	Fri Aug 10 11:20:43 2001
-+++ autogen.sh
-@@ -40,11 +40,11 @@
- }
- 
- 
--if [ -d /usr/local/share/aclocal ]; then
--  if [ "`aclocal --print-ac-dir`" != "/usr/local/share/aclocal" ]; then
--    ACLOCAL_FLAGS="-I /usr/local/share/aclocal $ACLOCAL_FLAGS"
--  fi
--fi
-+#if [ -d /usr/local/share/aclocal ]; then
-+#  if [ "`aclocal --print-ac-dir`" != "/usr/local/share/aclocal" ]; then
-+#    ACLOCAL_FLAGS="-I /usr/local/share/aclocal $ACLOCAL_FLAGS"
-+#  fi
-+#fi
- 
- # Regenerate configuration files
- ok=0