use ${INSTALL_INFO} rather than install-info, so that we don't accidently

use an old or non-compatible version that may be in the base system.
This makes this package install flawlessly under Linux.

4 files changed, 70 insertions, 1 deletions

diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index ed2948c3e42..80568ff1f08 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2002/10/21 20:54:13 jlam Exp $
+$NetBSD: distinfo,v 1.17 2003/05/24 19:26:24 jschauma Exp $
 
 SHA1 (gcc-2.95.3.tar.gz) = 535d27038d161c0e7c2662702e11a48aa97ef622
 Size (gcc-2.95.3.tar.gz) = 12911721 bytes
@@ -9,3 +9,6 @@ SHA1 (patch-ab) = 0a9df2c9abb9a3965c085769eb09a6912f894388
 SHA1 (patch-ac) = f42b5ab389c3a51991e61cdb7533875003308001
 SHA1 (patch-ad) = 2fb8cda55220bd202a4b7948277d00f293718caf
 SHA1 (patch-ae) = b9721d3e89a93736b926e1efcfb9d0fb4904277f
+SHA1 (patch-af) = 17639bbcd9f1500d602581f344be630a33d97066
+SHA1 (patch-ag) = 18638e73e62b05209571aa8efa9d713a812f2e94
+SHA1 (patch-ah) = 567d73655864054e84f036a39b8d597eef0789a9
diff --git a/lang/gcc/patches/patch-af b/lang/gcc/patches/patch-af
new file mode 100644
index 00000000000..a20bd95700d
--- /dev/null
+++ b/lang/gcc/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.6 2003/05/24 19:26:25 jschauma Exp $
+
+--- gcc/Makefile.in.orig	Sat May 24 14:56:02 2003
++++ gcc/Makefile.in	Sat May 24 14:57:47 2003
+@@ -2559,10 +2559,10 @@
+ 	for f in cpp.info* gcc.info*; do \
+ 	    $(INSTALL_DATA) $$f $(infodir)/$$f; \
+ 	done
+-	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
++	-if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \
+ 	  if [ -f $(infodir)/dir ] ; then \
+ 	    for f in cpp.info gcc.info; do \
+-		install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \
++		${INSTALL_INFO} --dir-file=$(infodir)/dir $(infodir)/$$f; \
+ 	    done; \
+ 	  else true; fi; \
+ 	else true; fi;
diff --git a/lang/gcc/patches/patch-ag b/lang/gcc/patches/patch-ag
new file mode 100644
index 00000000000..24676e6a4af
--- /dev/null
+++ b/lang/gcc/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.5 2003/05/24 19:26:26 jschauma Exp $
+
+--- gcc/f/Make-lang.in.orig	Sat May 24 14:56:08 2003
++++ gcc/f/Make-lang.in	Sat May 24 14:58:41 2003
+@@ -355,9 +355,9 @@
+ 	  chmod a-x $(infodir)/g77.info*; \
+ 	else true; fi
+ 	@if [ -f $(libsubdir)/lang-f77 -a -f $(srcdir)/f/g77.info ] ; then \
+-	  if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+-	    echo " install-info --info-dir=$(infodir) $(infodir)/g77.info"; \
+-	    install-info --info-dir=$(infodir) $(infodir)/g77.info || : ; \
++	  if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
++	    echo " ${INSTALL_INFO} --info-dir=$(infodir) $(infodir)/g77.info"; \
++	    ${INSTALL_INFO} --info-dir=$(infodir) $(infodir)/g77.info || : ; \
+ 	  else : ; fi; \
+ 	else : ; fi
+ 	rm -f $(libsubdir)/lang-f77
+@@ -390,9 +390,9 @@
+ 	  *) rm -f $(libsubdir)/lang-f77;; \
+ 	esac
+ 	@if [ -f $(libsubdir)/lang-f77 ] ; then \
+-	  if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+-	    echo " install-info --delete --info-dir=$(infodir) $(infodir)/g77.info"; \
+-	    install-info --delete --info-dir=$(infodir) $(infodir)/g77.info || : ; \
++	  if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
++	    echo " ${INSTALL_INFO} --delete --info-dir=$(infodir) $(infodir)/g77.info"; \
++	    ${INSTALL_INFO} --delete --info-dir=$(infodir) $(infodir)/g77.info || : ; \
+ 	  else : ; fi; \
+ 	else : ; fi
+ 	-if [ -f $(libsubdir)/lang-f77 ]; then \
diff --git a/lang/gcc/patches/patch-ah b/lang/gcc/patches/patch-ah
new file mode 100644
index 00000000000..8a635ca0481
--- /dev/null
+++ b/lang/gcc/patches/patch-ah
@@ -0,0 +1,19 @@
+$NetBSD: patch-ah,v 1.5 2003/05/24 19:26:26 jschauma Exp $
+
+--- texinfo/doc/Makefile.in.orig	Sat May 24 14:56:48 2003
++++ texinfo/doc/Makefile.in	Sat May 24 14:59:51 2003
+@@ -182,12 +182,12 @@
+ 
+ uninstall-info:
+ 	$(PRE_UNINSTALL)
+-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
++	@if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+ 	  ii=yes; \
+ 	else ii=; fi; \
+ 	for file in $(INFO_DEPS); do \
+ 	  test -z "$ii" \
+-	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
++	    || ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
+ 	done
+ 	@$(NORMAL_UNINSTALL)
+ 	for file in $(INFO_DEPS); do \