Rename all files associated with GNU indent as gindent, to avoid collisions

with NetBSD's indent(1).
Don't strip the binary from the package Makefile - it already gets stripped
by the ${INSTALL_PROGRAM} part of the installation.
Rationalise info file handling.

4 files changed, 19 insertions, 19 deletions

diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index cebde2fae9e..c72eb7d862d 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/08/20 15:16:47 tsarna Exp $
+# $NetBSD: Makefile,v 1.12 1998/09/04 21:29:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp
 #
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnu.org/software/indent/indent.html
 
 GNU_CONFIGURE=	yes
 
-INFO_FILES=	indent.info
+INFO_FILES=	gindent.info
 
 MAKEFILE=	makefile
 
@@ -19,7 +19,4 @@ MAKEFILE=	makefile
 pre-install:
 	@rm -f indent.info
 
-post-install:
-	@strip ${PREFIX}/bin/indent
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gindent/patches/patch-aa b/devel/gindent/patches/patch-aa
index 8251ddbabd7..6fbedb85307 100644
--- a/devel/gindent/patches/patch-aa
+++ b/devel/gindent/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:24 agc Exp $
+$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
@@ -10,11 +10,15 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:24 agc Exp $
  
  #### End of system configuration section. ####
  
-@@ -126,6 +127,7 @@
+@@ -124,8 +125,9 @@
+ # Installation of indent
+ #
  install: all
- 	${INSTALL_PROGRAM} indent ${bindir}/indent
- 	${INSTALL_DATA} ${srcdir}/indent.info ${infodir}/indent.info
-+	${INSTALL_DATA} ${srcdir}/indent.1 ${mandir}/man1/indent.1
+-	${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
index 3a5ebe3df1b..e0efff5420d 100644
--- a/devel/gindent/patches/patch-ab
+++ b/devel/gindent/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:24 agc Exp $
+$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
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 10:40:24 agc Exp $
  @ifinfo
 +@format
 +START-INFO-DIR-ENTRY
-+* Indent: (indent).             Indent C programs.
++* Indent: (gindent).             Indent C programs.
 +END-INFO-DIR-ENTRY
 +@end format
 +
diff --git a/devel/gindent/pkg/PLIST b/devel/gindent/pkg/PLIST
index 918bd38f499..8e75768db5b 100644
--- a/devel/gindent/pkg/PLIST
+++ b/devel/gindent/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 1998/01/24 04:02:37 hubertf Exp $
-bin/indent
-man/man1/indent.1.gz
-@unexec %D/bin/install-info --delete %D/info/indent.info %D/info/dir
-info/indent.info
-@exec %D/bin/install-info %D/info/indent.info %D/info/dir
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@comment $NetBSD: PLIST,v 1.4 1998/09/04 21:29:32 agc Exp $
+bin/gindent
+man/man1/gindent.1.gz
+@unexec %D/bin/install-info --delete %D/info/gindent.info %D/info/dir
+info/gindent.info
+@exec %D/bin/install-info %D/info/gindent.info %D/info/dir