* upgrade to 19980816 snapshot

* reduce maintance costs, advantage PLIST_SUB

3 files changed, 194 insertions, 193 deletions

diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index b94105a20ef..1b207de2750 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -4,18 +4,19 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.25 1998/08/11 08:22:45 obrien Exp $
+# $Id: Makefile,v 1.26 1998/08/12 04:39:10 jdp Exp $
 #
 
-DISTNAME=	egcs-19980803
+DISTNAME=	egcs-19980816
 CATEGORIES=	lang
-MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-08-03/ \
-		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-08-03/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-08-03/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-08-16/ \
+		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-08-16/ \
+		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-08-16/
 
 MAINTAINER=	obrien@FreeBSD.org
 
-EGCS_REV=	egcs-2.91.53
+EGCS_REV=	egcs-2.91.54
+PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNUHOST=	i386-unknown-freebsd
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/lang/gcc31/distinfo b/lang/gcc31/distinfo
index 865c1085feb..fd6543aa0f8 100644
--- a/lang/gcc31/distinfo
+++ b/lang/gcc31/distinfo
@@ -1 +1 @@
-MD5 (egcs-19980803.tar.gz) = 3c6e28dd25140187e322c890231bfc72
+MD5 (egcs-19980816.tar.gz) = cdbfcd7eb47025279faf33bb565f7475
diff --git a/lang/gcc31/pkg-plist b/lang/gcc31/pkg-plist
index 12b2a140bfb..2dc4b41c650 100644
--- a/lang/gcc31/pkg-plist
+++ b/lang/gcc31/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.16 1998/08/11 08:22:46 obrien Exp $
+@comment $Id: PLIST,v 1.17 1998/08/18 18:33:11 hoek Exp $
 bin/g++filt
 bin/g++
 bin/eg++
@@ -6,149 +6,149 @@ bin/g77
 bin/gcc
 bin/egcc
 bin/gcov
-bin/i386-unknown-freebsd-gcc
+bin/%%GNU_HOST%%-gcc
 bin/protoize
 bin/unprotoize
-i386-unknown-freebsd/include/_G_config.h
-i386-unknown-freebsd/include/assert.h
-i386-unknown-freebsd/lib/libiberty.a
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/PlotFile.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/SFile.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/algo.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/algobase.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/algorithm
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/alloc.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/builtinbuf.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/bvector.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cassert
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cctype
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cerrno
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cfloat
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/ciso646
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/climits
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/clocale
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cmath
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/complex
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/complex.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/csetjmp
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/csignal
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cstdarg
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cstddef
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cstdio
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cstdlib
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cstring
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/ctime
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cwchar
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/cwctype
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/defalloc.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/deque
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/deque.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/dummy.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/editbuf.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/floatio.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/fstream
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/fstream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/function.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/functional
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/hash_map
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/hash_map.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/hash_set
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/hash_set.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/hashtable.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/heap.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/indstream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iolibio.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iomanip
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iomanip.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iosfwd
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iostdio.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iostream
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iostream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iostreamP.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/istream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iterator
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/iterator.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/libio.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/libioP.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/list
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/list.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/map
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/map.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/memory
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/multimap.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/multiset.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/numeric
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/ostream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/pair.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/parsestream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/pfstream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/procbuf.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/pthread_alloc
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/pthread_alloc.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/queue
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/rope
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/rope.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/ropeimpl.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/set
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/set.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/slist
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/slist.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stack
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stack.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/std/bastring.cc
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/std/bastring.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/std/complext.cc
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/std/complext.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/std/dcomplex.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/std/fcomplex.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/std/ldcomplex.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/std/straits.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stdexcept
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stdiostream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_algo.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_algobase.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_alloc.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_bvector.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_config.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_construct.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_deque.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_function.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_hash_fun.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_hash_map.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_hash_set.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_hashtable.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_heap.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_iterator.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_list.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_map.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_multimap.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_multiset.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_numeric.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_pair.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_queue.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_raw_storage_iter.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_relops.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_rope.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_set.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_slist.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_stack.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_tempbuf.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_tree.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_uninitialized.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stl_vector.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/stream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/streambuf.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/strfile.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/string
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/strstream
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/strstream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/tempbuf.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/tree.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/type_traits.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/utility
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/vector
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/vector.h
+%%GNU_HOST%%/include/_G_config.h
+%%GNU_HOST%%/include/assert.h
+%%GNU_HOST%%/lib/libiberty.a
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/PlotFile.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/SFile.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/algo.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/algobase.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/algorithm
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/alloc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/builtinbuf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/bvector.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cassert
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cctype
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cerrno
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cfloat
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ciso646
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/climits
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/clocale
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cmath
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/complex
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/complex.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/csetjmp
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/csignal
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cstdarg
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cstddef
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cstdio
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cstdlib
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cstring
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ctime
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cwchar
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cwctype
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/defalloc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/deque
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/deque.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/dummy.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/editbuf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/floatio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/fstream
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/fstream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/function.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/functional
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/hash_map
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/hash_map.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/hash_set
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/hash_set.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/hashtable.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/heap.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/indstream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iolibio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iomanip
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iomanip.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iosfwd
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iostdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iostream
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iostream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iostreamP.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/istream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iterator
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/iterator.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/libio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/libioP.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/list
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/list.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/parsestream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pfstream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/procbuf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pthread_alloc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pthread_alloc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/queue
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/rope
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/rope.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ropeimpl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/set
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/set.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/slist
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/slist.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stack
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stack.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/bastring.cc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/bastring.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/complext.cc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/complext.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/dcomplex.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/fcomplex.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/ldcomplex.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_algo.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_algobase.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_alloc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_bvector.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_config.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_construct.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_deque.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_function.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_hash_fun.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_hash_map.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_hash_set.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_hashtable.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_heap.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_iterator.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_list.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_map.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_multimap.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_numeric.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_pair.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_queue.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_raw_storage_iter.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_relops.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_rope.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_set.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_slist.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_stack.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_tempbuf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_tree.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_uninitialized.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl_vector.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/streambuf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/strfile.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/string
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/strstream
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/strstream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/tempbuf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/tree.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/type_traits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/utility
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
@@ -211,50 +211,50 @@ info/gcc.info-9
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/SYSCALLS.c.X
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/cc1
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/cc1obj
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/cc1plus
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/cpp
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/collect2
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/f771
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/README
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/assert.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/exception
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/float.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g2c.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/limits.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/math.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/new
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/new.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/NXConstStr.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/Object.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/Protocol.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/encoding.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/hash.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/objc-api.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/objc-list.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/objc.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/sarray.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/thr.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc/typedstream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/syslimits.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/typeinfo
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/libgcc.a
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/libobjc.a
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/specs
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/encoding.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/hash.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc-api.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc-list.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
 @comment These 3 libraries are moved from PREFIX/lib to avoid conflicts
 @comment	with the stock compiler.
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/libg2c.a
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/libiberty.a
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/libstdc++.a
-@dirrm i386-unknown-freebsd/include
-@dirrm i386-unknown-freebsd/lib
-@dirrm i386-unknown-freebsd
-@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/objc
-@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++/std
-@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include/g++
-@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53/include
-@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.53
-@dirrm lib/gcc-lib/i386-unknown-freebsd
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libg2c.a
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
+@dirrm %%GNU_HOST%%/include
+@dirrm %%GNU_HOST%%/lib
+@dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%
 @dirrm lib/gcc-lib