Upgrade to GNU indent 2.2.0

6 files changed, 13 insertions, 73 deletions

diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 86233e9ba65..40298425a4e 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,23 +1,17 @@
-# $NetBSD: Makefile,v 1.15 1999/04/14 21:39:02 tron Exp $
+# $NetBSD: Makefile,v 1.16 1999/08/20 06:12:57 kim Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp
 #
 
-DISTNAME=	indent-1.9.1
-PKGNAME=	gindent-1.9.1
+DISTNAME=	indent-2.2.0
+PKGNAME=	gindent-2.2.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=indent/}
 
-MAINTAINER=	kchowksey@hss.hns.com
+MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/indent/indent.html
 
 GNU_CONFIGURE=	yes
-
-INFO_FILES=	gindent.info
-
-MAKEFILE=	makefile
-
-# agc - force makeinfo to create a new info file with the Dir info.
-pre-install:
-	@rm -f indent.info
+CONFIGURE_ARGS=	--program-prefix=g
+INFO_FILES=	indent.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gindent/files/md5 b/devel/gindent/files/md5
index baef6770749..5f0ad351de4 100644
--- a/devel/gindent/files/md5
+++ b/devel/gindent/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:24 agc Exp $
+$NetBSD: md5,v 1.3 1999/08/20 06:12:58 kim Exp $
 
-MD5 (indent-1.9.1.tar.gz) = 21b5f78c7ade93fa7d33f79ff48d3982
+MD5 (indent-2.2.0.tar.gz) = 45c3b482de8e3e331dc726d817c28661
diff --git a/devel/gindent/files/patch-sum b/devel/gindent/files/patch-sum
deleted file mode 100644
index d485b7a6d37..00000000000
--- a/devel/gindent/files/patch-sum
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:34 agc Exp $
-
-MD5 (patch-aa) = 6031162f54537771c621ef7e6826d4c1
-MD5 (patch-ab) = e0a3fb14d2d8ba7d4091628b28a8ead2
diff --git a/devel/gindent/patches/patch-aa b/devel/gindent/patches/patch-aa
deleted file mode 100644
index 6fbedb85307..00000000000
--- a/devel/gindent/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1998/09/04 21:29:31 agc Exp $
-
---- makefile.in.orig	Thu Aug 28 17:48:56 1997
-+++ makefile.in	Thu Aug 28 17:50:29 1997
-@@ -51,6 +51,7 @@
- exec_prefix = ${prefix}
- bindir = $(exec_prefix)/bin
- infodir = ${prefix}/info
-+mandir = ${prefix}/man
- 
- #### End of system configuration section. ####
- 
-@@ -124,8 +125,9 @@
- # Installation of indent
- #
- install: all
--	${INSTALL_PROGRAM} indent ${bindir}/indent
--	${INSTALL_DATA} ${srcdir}/indent.info ${infodir}/indent.info
-+	${INSTALL_PROGRAM} indent ${bindir}/gindent
-+	${INSTALL_DATA} ${srcdir}/indent.info ${infodir}/gindent.info
-+	${INSTALL_DATA} ${srcdir}/indent.1 ${mandir}/man1/gindent.1
- 
- 
- # Cleaning up
diff --git a/devel/gindent/patches/patch-ab b/devel/gindent/patches/patch-ab
deleted file mode 100644
index e0efff5420d..00000000000
--- a/devel/gindent/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/09/04 21:29:31 agc Exp $
-
---- indent.texinfo	1997/10/08 15:35:14	1.1
-+++ indent.texinfo	1997/10/08 15:37:15
-@@ -18,7 +18,21 @@
- @synindex cp ky
- @setchapternewpage odd
- 
-+@set EDITION 1.3
-+@set VERSION 1.9.1
-+@set UPDATED January 1994
-+
-+@iftex
-+@finalout
-+@end iftex
-+
- @ifinfo
-+@format
-+START-INFO-DIR-ENTRY
-+* Indent: (gindent).             Indent C programs.
-+END-INFO-DIR-ENTRY
-+@end format
-+
- Copyright (C) 1989, 1992, 1993, 1994 Free Software Foundation, Inc.
- 
- @c !!set edition, date, version
diff --git a/devel/gindent/pkg/PLIST b/devel/gindent/pkg/PLIST
index 33c634c76b4..788fe17e861 100644
--- a/devel/gindent/pkg/PLIST
+++ b/devel/gindent/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 1999/02/11 19:17:30 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 1999/08/20 06:12:59 kim Exp $
 bin/gindent
-man/man1/gindent.1.gz
-@unexec install-info --delete %D/info/gindent.info %D/info/dir
-info/gindent.info
-@exec install-info %D/info/gindent.info %D/info/dir
+man/man1/gindent.1
+@unexec install-info --delete %D/info/indent.info %D/info/dir
+info/indent.info
+@exec install-info %D/info/indent.info %D/info/dir