Don't patch automake source files and remove dependency on automake.

5 files changed, 2 insertions, 48 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index a05b72c1765..39eb42a6005 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/06/25 15:34:47 skrll Exp $
+# $NetBSD: Makefile,v 1.24 2001/07/15 16:34:57 jlam Exp $
 
 DISTNAME=		bison-1.28
 CATEGORIES=		devel
@@ -8,11 +8,8 @@ MAINTAINER=		thorpej@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/bison/bison.html
 COMMENT=		GNU yacc(1) replacement
 
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 BUILD_USES_MSGFMT=	yes
-BUILD_USES_GETTEXT_M4=	yes
 
-#USE_LIBINTL=		# defined
 USE_BUILDLINK_ONLY=	# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--without-included-gettext
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index 6bc59f5263c..f45ed6fb03e 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/06/13 07:55:06 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/07/15 16:34:57 jlam Exp $
 
 SHA1 (bison-1.28.tar.gz) = d11dc896f4642ff432345a5b037505ab0b8791e8
 Size (bison-1.28.tar.gz) = 420341 bytes
 SHA1 (patch-aa) = aecc589ead50fef86dab2d16bae7fd3cf91b21c5
 SHA1 (patch-ab) = 069b0d0db61255b53cac1cdb8ca6dee7d883231c
-SHA1 (patch-ac) = bbf839cfae8b8bd6630437c48b465a5a4ce2214a
 SHA1 (patch-ae) = 3df6fff1b06e813d1b5e39152e301d253c837484
 SHA1 (patch-af) = 874d359014fe72aa922e840b20db6736a09fbe0e
 SHA1 (patch-ag) = 558dcc5e5b63a80b497a799f881003118c3691b1
-SHA1 (patch-ah) = 2d2bf0a8cfa28d217f8c7cf44a3d2c9441874b50
-SHA1 (patch-ai) = af47a691f5fa8ae0e4d64d7034560b9b0d5af369
diff --git a/devel/bison/patches/patch-ac b/devel/bison/patches/patch-ac
deleted file mode 100644
index ce70bdfc6f5..00000000000
--- a/devel/bison/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1999/10/04 17:24:02 jlam Exp $
-
---- src/Makefile.in.orig	Tue Jul  6 09:20:06 1999
-+++ src/Makefile.in	Sat Oct  2 02:42:21 1999
-@@ -95,7 +95,7 @@
- EXTRA_bison_SOURCES = vmsgetargs.c
- 
- bison_LDADD = @INTLLIBS@ @ALLOCA@
--INCLUDES = -I../intl -I$(top_srcdir)/intl
-+INCLUDES = # -I../intl -I$(top_srcdir)/intl
- 
- noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h	 symtab.h system.h types.h getopt.h
- 
diff --git a/devel/bison/patches/patch-ah b/devel/bison/patches/patch-ah
deleted file mode 100644
index d1733ed331d..00000000000
--- a/devel/bison/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/06/13 07:55:07 jlam Exp $
-
---- configure.in.orig	Tue Jul  6 09:03:02 1999
-+++ configure.in	Wed Jun 13 03:49:05 2001
-@@ -35,6 +35,9 @@
- 
- AM_GNU_GETTEXT
- 
-+# Use ${PKGLOCALEDIR} to determine the location of the locale files.
-+DATADIRNAME="${PKGLOCALEDIR}"
-+
- # This is necessary so that .o files in LIBOBJS are also built via
- # the ANSI2KNR-filtering rules.
- LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
diff --git a/devel/bison/patches/patch-ai b/devel/bison/patches/patch-ai
deleted file mode 100644
index 69e3f042384..00000000000
--- a/devel/bison/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/06/13 07:55:08 jlam Exp $
-
---- src/Makefile.am.orig	Mon Jun 14 18:17:01 1999
-+++ src/Makefile.am	Wed Jun 13 03:40:28 2001
-@@ -10,7 +10,7 @@
- EXTRA_bison_SOURCES = vmsgetargs.c
- 
- bison_LDADD = @INTLLIBS@ @ALLOCA@
--INCLUDES = -I../intl -I$(top_srcdir)/intl
-+INCLUDES = # -I../intl -I$(top_srcdir)/intl
- 
- noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h	\
-  symtab.h system.h types.h getopt.h