Depend on system makeinfo and fix build on DragonFly.

4 files changed, 86 insertions, 5 deletions

diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile
index 216522456a7..39c03c9206b 100644
--- a/cross/i386-msdosdjgpp/Makefile
+++ b/cross/i386-msdosdjgpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/26 16:26:08 joerg Exp $
 #
 
 DISTVERSION=		2.02.0
@@ -28,6 +28,7 @@ USE_CROSS_BINUTILS=	yes
 BINUTILS_GNUTARGET=	coff-go32
 BINUTILS_LDEMULATION=	i386go32
 USE_CROSS_EGCS=		yes
+USE_MAKEINFO=		yes
 
 # Scripts in the build need to have a $CPP defined that works with the built
 # compiler
diff --git a/cross/i386-msdosdjgpp/distinfo b/cross/i386-msdosdjgpp/distinfo
index d41ad59cced..d6d70132eaa 100644
--- a/cross/i386-msdosdjgpp/distinfo
+++ b/cross/i386-msdosdjgpp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/04/18 11:42:12 wiz Exp $
+$NetBSD: distinfo,v 1.6 2006/02/26 16:26:08 joerg Exp $
 
 SHA1 (djcrx202.zip) = e99955d2a8cdc59bfe6873af06b8c601115e9da0
 RMD160 (djcrx202.zip) = cf683d5d6af0b2c5afc0dc30977e26f334f8b7d8
@@ -15,5 +15,6 @@ Size (egcs-1.1.1.tar.gz) = 11604853 bytes
 SHA1 (egcs-1.1.1-NetBSD-19980104.diff.gz) = 85ebc334bf9472b9595c4348a6bc440e836b922a
 RMD160 (egcs-1.1.1-NetBSD-19980104.diff.gz) = 29c48af46979cc4337d89fe7c4b0b98f20659671
 Size (egcs-1.1.1-NetBSD-19980104.diff.gz) = 59770 bytes
-SHA1 (patch-aa) = 1b687727bd4ce420da8c23dbaafa3871c71b3800
+SHA1 (patch-aa) = 5b2cd154fc1e262135a16960b8d1737db2c1fe23
 SHA1 (patch-ab) = e1e6a7fad85bfd13460e88e56a172eb94b09bdc4
+SHA1 (patch-ac) = e2837f11c1f0480a75536663f084658835daa11b
diff --git a/cross/i386-msdosdjgpp/patches/patch-aa b/cross/i386-msdosdjgpp/patches/patch-aa
index ef50757eccb..e3b98d80878 100644
--- a/cross/i386-msdosdjgpp/patches/patch-aa
+++ b/cross/i386-msdosdjgpp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2005/04/18 11:42:12 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2006/02/26 16:26:08 joerg Exp $
 
 --- ../egcs-1.1.1/libiberty/strsignal.c.orig	1998-05-16 01:42:42.000000000 +0200
 +++ ../egcs-1.1.1/libiberty/strsignal.c
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.5 2005/04/18 11:42:12 wiz Exp $
  #else
  
  #ifdef NSIG
-+#if !defined(__NetBSD__)
++#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
  static int sys_nsig = NSIG;
 +#endif
  #else
diff --git a/cross/i386-msdosdjgpp/patches/patch-ac b/cross/i386-msdosdjgpp/patches/patch-ac
new file mode 100644
index 00000000000..16f77083907
--- /dev/null
+++ b/cross/i386-msdosdjgpp/patches/patch-ac
@@ -0,0 +1,79 @@
+$NetBSD: patch-ac,v 1.1 2006/02/26 16:26:08 joerg Exp $
+
+--- ../egcs-1.1.1/Makefile.in.orig	2006-02-26 16:07:13.000000000 +0000
++++ ../egcs-1.1.1/Makefile.in
+@@ -500,7 +500,6 @@ ALL_MODULES = \
+ 	all-sn \
+ 	all-tar \
+ 	all-tcl \
+-	all-texinfo \
+ 	all-textutils \
+ 	all-tgas \
+ 	all-time \
+@@ -563,7 +562,6 @@ CROSS_CHECK_MODULES = \
+ 	check-sim \
+ 	check-tar \
+ 	check-tcl \
+-	check-texinfo \
+ 	check-textutils \
+ 	check-tgas \
+ 	check-time \
+@@ -778,7 +776,6 @@ CLEAN_MODULES = \
+ 	clean-sn \
+ 	clean-tar \
+ 	clean-tcl \
+-	clean-texinfo \
+ 	clean-textutils \
+ 	clean-tgas \
+ 	clean-time \
+@@ -899,9 +896,6 @@ info: do-info
+ installcheck: do-installcheck
+ dvi: do-dvi
+ 
+-# Make sure makeinfo is built before we do a `make info'.
+-do-info: all-texinfo
+-
+ install-info: do-install-info dir.info
+ 	s=`cd $(srcdir); pwd`; export s; \
+ 	if [ -f dir.info ] ; then \
+@@ -1327,7 +1321,7 @@ all-gcc:
+ # in parallel.
+ #
+ .PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean
+-bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
++bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean: all-bison all-byacc all-binutils all-gas all-ld
+ 	@r=`pwd`; export r; \
+ 	s=`cd $(srcdir); pwd`; export s; \
+ 	$(SET_LIB_PATH) \
+@@ -1353,7 +1347,7 @@ bootstrap bootstrap-lean bootstrap2 boot
+ 	$(MAKE) all
+ 
+ .PHONY: cross
+-cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
++cross: all-bison all-byacc all-binutils all-gas all-ld
+ 	@r=`pwd`; export r; \
+ 	s=`cd $(srcdir); pwd`; export s; \
+ 	$(SET_LIB_PATH) \
+@@ -1414,12 +1408,12 @@ install-dosrel-fake:
+ 
+ # This is a list of inter-dependencies among modules.
+ all-apache:
+-all-autoconf: all-m4 all-texinfo
++all-autoconf: all-m4
+ all-automake:
+ all-bash:
+ all-bfd:
+ all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc
+-all-bison: all-texinfo
++all-bison:
+ all-byacc:
+ all-cvs:
+ all-db:
+@@ -1491,7 +1485,6 @@ all-tar: all-libiberty
+ all-tcl:
+ all-tclX: all-tcl all-tk
+ all-tk: all-tcl
+-all-texinfo: all-libiberty
+ all-textutils:
+ all-tgas: all-libiberty all-bfd all-opcodes
+ all-time: