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, and even though it does
not directly address PR pkg/20880 (which I could not reproduce), it covers
similar problems.

4 files changed, 67 insertions, 6 deletions

diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo
index 07656c2e80f..9d0133c31c4 100644
--- a/lang/gcc3/distinfo
+++ b/lang/gcc3/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2003/05/22 09:37:27 wiz Exp $
+$NetBSD: distinfo,v 1.6 2003/05/24 18:38:58 jschauma Exp $
 
 SHA1 (gcc-3.2.2.tar.gz) = 152883d3e1f6190298cb7be43076abeaeac6c2a9
 Size (gcc-3.2.2.tar.gz) = 26664960 bytes
 SHA1 (patch-aa) = 6e9e7eeb7e9ddc043eb2b7c3cb05e7b6112e813b
-SHA1 (patch-ab) = c5d7023257047c52fad595bd5ddee3641aaa142f
+SHA1 (patch-ab) = 3cb04098b3d97b1da9d24d64197dcea2771c9624
+SHA1 (patch-ac) = 1bd470366c793bfb12895e365ac4e9f3e5fda101
+SHA1 (patch-ad) = b4023140daf745d613b26909247bdf9e4066c8a4
diff --git a/lang/gcc3/patches/patch-ab b/lang/gcc3/patches/patch-ab
index 8e273eb3f17..3c002f47ffb 100644
--- a/lang/gcc3/patches/patch-ab
+++ b/lang/gcc3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2003/05/22 09:37:28 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2003/05/24 18:38:58 jschauma Exp $
 
---- gcc/Makefile.in.orig	Fri Apr 18 08:36:04 2003
-+++ gcc/Makefile.in
-@@ -1236,6 +1236,7 @@ c-semantics.o : c-semantics.c $(CONFIG_H
+--- gcc/Makefile.in.orig	Tue Jan 28 16:54:07 2003
++++ gcc/Makefile.in	Sat May 24 13:01:38 2003
+@@ -1236,6 +1236,7 @@
  # Language-independent files.
  
  DRIVER_DEFINES = \
@@ -10,3 +10,17 @@ $NetBSD: patch-ab,v 1.1 2003/05/22 09:37:28 wiz Exp $
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
    -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+@@ -2662,11 +2663,11 @@
+ 	    $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
+ 	  done; \
+ 	else true; fi
+-	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
++	-if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \
+ 	  if [ -f $(DESTDIR)$(infodir)/dir ] ; then \
+ 	    for f in cpp.info gcc.info gccint.info cppinternals.info; do \
+ 		if [ -f $(DESTDIR)$(infodir)/$$f ]; then \
+-		  install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
++		  ${INSTALL_INFO} --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
+ 		else true; fi; \
+ 	    done; \
+ 	  else true; fi; \
diff --git a/lang/gcc3/patches/patch-ac b/lang/gcc3/patches/patch-ac
new file mode 100644
index 00000000000..00da245b9ca
--- /dev/null
+++ b/lang/gcc3/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2003/05/24 18:38:59 jschauma Exp $
+
+--- gcc/f/Make-lang.in.orig	Sat May 24 12:59:15 2003
++++ gcc/f/Make-lang.in	Sat May 24 13:00:08 2003
+@@ -277,9 +277,9 @@
+ 	  chmod a-x $(DESTDIR)$(infodir)/g77.info*; \
+ 	else true; fi
+ 	@if [ -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=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
+-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(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=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
++	    ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
+ 	  else : ; fi; \
+ 	else : ; fi
+ 
+@@ -297,9 +297,9 @@
+ 	else true; fi
+ 
+ f77.uninstall: installdirs
+-	if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+-	  echo " install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
+-	  install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(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=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
++	  ${INSTALL_INFO} --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
+ 	else : ; fi
+ 	rm -rf $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
+ 	rm -rf $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \
diff --git a/lang/gcc3/patches/patch-ad b/lang/gcc3/patches/patch-ad
new file mode 100644
index 00000000000..7559581015c
--- /dev/null
+++ b/lang/gcc3/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2003/05/24 18:38:59 jschauma Exp $
+
+--- gcc/java/Make-lang.in.orig	Sat May 24 13:53:25 2003
++++ gcc/java/Make-lang.in	Sat May 24 13:53:47 2003
+@@ -207,8 +207,8 @@
+ 	  else true; fi; \
+ 	else true; fi
+ 	-if [ -f jc1$(exeext) ] && [ -f $(DESTDIR)$(infodir)/gcj.info ]; then \
+-	  if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+-	    install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/gcj.info; \
++	  if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \
++	    ${INSTALL_INFO} --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/gcj.info; \
+ 	  else true; fi; \
+ 	else true; fi
+