Fix up a corrupt infodir entry in "chill.info" that install-info could not

delete cleanly, which foiled subsequent installations, and add an INSTALL
script (keyword PRE-INSTALL) to ensure that the corrupt entry is removed.

4 files changed, 62 insertions, 2 deletions

diff --git a/lang/gcc/INSTALL b/lang/gcc/INSTALL
new file mode 100644
index 00000000000..b17dfc6eefe
--- /dev/null
+++ b/lang/gcc/INSTALL
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Prior versions of the "gcc" package would install a corrupted
+# info entry for "chill", which would foil subsequent installations.
+# This script attempts to clean up that entry.
+
+if [ $# -ne 2 -o ! -d "${PKG_PREFIX}" -o ! -w "${PKG_PREFIX}/info/dir" ]
+# Script was called improperly.
+then
+    exit 1
+fi
+
+if [ "$2" != "PRE-INSTALL" ]
+# No problem
+then
+    exit 0
+fi
+
+if [ ! -x /bin/ed ]
+# Who knows? Give up.
+then
+    exit 0
+fi
+
+echo Fixing up infodir from previous installation\.\.\.
+/bin/ed "${PKG_PREFIX}/info/dir" 2> /dev/null << END
+/^* Chill/d
+w
+q
+END
+if [ $? -eq 0 ]
+then
+    \.\.\.fixed\.
+    exit 0
+fi
+echo \.\.\.nothing to fix\.
+exit 0
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 89de864a592..5ae0deffe71 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2001/09/27 23:18:17 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2001/12/29 17:41:45 fredb Exp $
 
 DISTNAME=		gcc-2.95.2
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
 
@@ -75,6 +76,9 @@ post-build:
 	done
 .endif
 
+pre-install:
+	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} any PRE-INSTALL
+
 .if (${OPSYS} != SunOS)
 post-install:
 	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/curses.h ${PREFIX}/${PKGNAME}/bin/cc
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index c894d2c73cc..26ce9292fe0 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/05/04 10:15:45 skrll Exp $
+$NetBSD: distinfo,v 1.5 2001/12/29 17:41:46 fredb Exp $
 
 SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8
 Size (gcc-2.95.2.tar.gz) = 12885815 bytes
@@ -28,3 +28,4 @@ SHA1 (patch-aw) = 6a793c8735e167dbcab1c33248438a6ac8057717
 SHA1 (patch-ax) = 242d5219ba8b0debe038e186deecc980f9bf9a3f
 SHA1 (patch-ay) = eaaf536efdee990fa6970b1281fed4c6f2621c26
 SHA1 (patch-az) = 67d507f29492b3bc7a11551a1344aff3b8bb56fe
+SHA1 (patch-ba) = 3e0b1a3b07d6070ec353eab8963ba785a9d11a85
diff --git a/lang/gcc/patches/patch-ba b/lang/gcc/patches/patch-ba
new file mode 100644
index 00000000000..e76cd453947
--- /dev/null
+++ b/lang/gcc/patches/patch-ba
@@ -0,0 +1,18 @@
+$NetBSD: patch-ba,v 1.1 2001/12/29 17:41:47 fredb Exp $
+
+--- ../gcc-2.95.2/gcc/ch/chill.texi.orig	Wed Dec 16 14:59:05 1998
++++ ../gcc-2.95.2/gcc/ch/chill.texi
+@@ -5,9 +5,10 @@
+ 
+ @ifinfo
+ @format
+-START-INFO-DIR-ENTRY
+-* Chill::                       Chill compiler
+-END-INFO-DIR-ENTRY
++@dircategory Programming
++@direntry
++* Chill: (chill).               Chill compiler
++@end direntry
+ @end format
+ @end ifinfo
+