+ Remove the MANUAL_PACKAGE_BUILD.

+ The C++ includes and gcc specific libs now live under gcc-lib/.....
+ don't install ``c++''
+ make links egcc and eg++
+ c++filt --> g++filt  to non conflict with stock version
+ clean up package dirs on ``pkg_delete''

2 files changed, 185 insertions, 161 deletions

diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index dd970787e5ed..3fe97babba6e 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -4,7 +4,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.17 1998/05/05 06:34:46 obrien Exp $
+# $Id: Makefile,v 1.18 1998/05/19 22:33:41 obrien Exp $
 #
 
 DISTNAME=	egcs-19980508
@@ -15,35 +15,46 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-05-08/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
-MANUAL_PACKAGE_BUILD=	installs libstdc++.a which conflicts with system version
-
+EGCS_REV=	egcs-2.91.28
+GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
+		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 post-patch:
 	@(cd ${WRKSRC}/gcc/config/i386/ ; \
-	MAJ=`sysctl -n kern.osreldate | sed -e '/.....$$/s///'` ; \
-	mv freebsd.h freebsd.h.in ; \
-	sed -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd.h.in >freebsd.h ; \
-	mv freebsd-elf.h freebsd-elf.h.in ; \
-	sed -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd-elf.h.in >freebsd-elf.h)
+	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
+	${MV} freebsd.h freebsd.h.in ; \
+	${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd.h.in >freebsd.h ; \
+	${MV} freebsd-elf.h freebsd-elf.h.in ; \
+	${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd-elf.h.in >freebsd-elf.h)
 
 post-install:
-	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ ${PREFIX}/bin/c++ \
-	${PREFIX}/bin/c++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+	@${RM} -f ${PREFIX}/bin/c++
+	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
+	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
+	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
 	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/i386-unknown-freebsd-gcc \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/cc1 \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/cc1obj \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/cc1plus \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/cpp \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/collect2 \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/f771 ; \
+	${PREFIX}/bin/${GNUHOST}-gcc \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cc1 \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cc1obj \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cc1plus \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cpp \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/collect2 \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/f771 ; \
 		do strip $$prog ; \
 		done)
+	ln -f ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
+	ln -f ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
+	${MV} ${PREFIX}/lib/libf2c.a  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+	${MV} ${PREFIX}/lib/libiberty.a  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+	${MV} ${PREFIX}/lib/libstdc++.a  \
+		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 67b82a5a48ad..917cabf8555d 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -1,8 +1,10 @@
-bin/c++
-bin/c++filt
+@comment $Id$
+bin/g++filt
 bin/g++
+bin/eg++
 bin/g77
 bin/gcc
+bin/egcc
 bin/gcov
 bin/i386-unknown-freebsd-gcc
 bin/protoize
@@ -11,143 +13,143 @@ i386-unknown-freebsd/include/_G_config.h
 i386-unknown-freebsd/include/assert.h
 i386-unknown-freebsd/lib/libiberty.a
 include/f2c.h
-include/g++/PlotFile.h
-include/g++/SFile.h
-include/g++/algo.h
-include/g++/algobase.h
-include/g++/algorithm
-include/g++/alloc.h
-include/g++/builtinbuf.h
-include/g++/bvector.h
-include/g++/cassert
-include/g++/cctype
-include/g++/cerrno
-include/g++/cfloat
-include/g++/ciso646
-include/g++/climits
-include/g++/clocale
-include/g++/cmath
-include/g++/complex
-include/g++/complex.h
-include/g++/csetjmp
-include/g++/csignal
-include/g++/cstdarg
-include/g++/cstddef
-include/g++/cstdio
-include/g++/cstdlib
-include/g++/cstring
-include/g++/ctime
-include/g++/cwchar
-include/g++/cwctype
-include/g++/defalloc.h
-include/g++/deque
-include/g++/deque.h
-include/g++/dummy.h
-include/g++/editbuf.h
-include/g++/floatio.h
-include/g++/fstream
-include/g++/fstream.h
-include/g++/function.h
-include/g++/functional
-include/g++/hash_map
-include/g++/hash_map.h
-include/g++/hash_set
-include/g++/hash_set.h
-include/g++/hashtable.h
-include/g++/heap.h
-include/g++/indstream.h
-include/g++/iolibio.h
-include/g++/iomanip
-include/g++/iomanip.h
-include/g++/iosfwd
-include/g++/iostdio.h
-include/g++/iostream
-include/g++/iostream.h
-include/g++/iostreamP.h
-include/g++/istream.h
-include/g++/iterator
-include/g++/iterator.h
-include/g++/libio.h
-include/g++/libioP.h
-include/g++/list
-include/g++/list.h
-include/g++/map
-include/g++/map.h
-include/g++/memory
-include/g++/multimap.h
-include/g++/multiset.h
-include/g++/numeric
-include/g++/ostream.h
-include/g++/pair.h
-include/g++/parsestream.h
-include/g++/pfstream.h
-include/g++/procbuf.h
-include/g++/pthread_alloc
-include/g++/pthread_alloc.h
-include/g++/queue
-include/g++/rope
-include/g++/rope.h
-include/g++/ropeimpl.h
-include/g++/set
-include/g++/set.h
-include/g++/slist
-include/g++/slist.h
-include/g++/stack
-include/g++/stack.h
-include/g++/std/bastring.cc
-include/g++/std/bastring.h
-include/g++/std/complext.cc
-include/g++/std/complext.h
-include/g++/std/dcomplex.h
-include/g++/std/fcomplex.h
-include/g++/std/ldcomplex.h
-include/g++/std/straits.h
-include/g++/stdexcept
-include/g++/stdiostream.h
-include/g++/stl.h
-include/g++/stl_algo.h
-include/g++/stl_algobase.h
-include/g++/stl_alloc.h
-include/g++/stl_bvector.h
-include/g++/stl_config.h
-include/g++/stl_construct.h
-include/g++/stl_deque.h
-include/g++/stl_function.h
-include/g++/stl_hash_fun.h
-include/g++/stl_hash_map.h
-include/g++/stl_hash_set.h
-include/g++/stl_hashtable.h
-include/g++/stl_heap.h
-include/g++/stl_iterator.h
-include/g++/stl_list.h
-include/g++/stl_map.h
-include/g++/stl_multimap.h
-include/g++/stl_multiset.h
-include/g++/stl_numeric.h
-include/g++/stl_pair.h
-include/g++/stl_queue.h
-include/g++/stl_raw_storage_iter.h
-include/g++/stl_relops.h
-include/g++/stl_rope.h
-include/g++/stl_set.h
-include/g++/stl_slist.h
-include/g++/stl_stack.h
-include/g++/stl_tempbuf.h
-include/g++/stl_tree.h
-include/g++/stl_uninitialized.h
-include/g++/stl_vector.h
-include/g++/stream.h
-include/g++/streambuf.h
-include/g++/strfile.h
-include/g++/string
-include/g++/strstream
-include/g++/strstream.h
-include/g++/tempbuf.h
-include/g++/tree.h
-include/g++/type_traits.h
-include/g++/utility
-include/g++/vector
-include/g++/vector.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/PlotFile.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/SFile.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/algo.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/algobase.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/algorithm
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/alloc.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/builtinbuf.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/bvector.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cassert
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cctype
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cerrno
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cfloat
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/ciso646
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/climits
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/clocale
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cmath
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/complex
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/complex.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/csetjmp
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/csignal
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cstdarg
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cstddef
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cstdio
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cstdlib
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cstring
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/ctime
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cwchar
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/cwctype
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/defalloc.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/deque
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/deque.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/dummy.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/editbuf.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/floatio.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/fstream
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/fstream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/function.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/functional
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/hash_map
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/hash_map.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/hash_set
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/hash_set.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/hashtable.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/heap.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/indstream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iolibio.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iomanip
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iomanip.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iosfwd
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iostdio.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iostream
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iostream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iostreamP.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/istream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iterator
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/iterator.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/libio.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/libioP.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/list
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/list.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/map
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/map.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/memory
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/multimap.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/multiset.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/numeric
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/ostream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/pair.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/parsestream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/pfstream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/procbuf.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/pthread_alloc
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/pthread_alloc.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/queue
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/rope
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/rope.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/ropeimpl.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/set
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/set.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/slist
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/slist.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stack
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stack.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/std/bastring.cc
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/std/bastring.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/std/complext.cc
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/std/complext.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/std/dcomplex.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/std/fcomplex.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/std/ldcomplex.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/std/straits.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stdexcept
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stdiostream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_algo.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_algobase.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_alloc.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_bvector.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_config.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_construct.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_deque.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_function.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_hash_fun.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_hash_map.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_hash_set.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_hashtable.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_heap.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_iterator.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_list.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_map.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_multimap.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_multiset.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_numeric.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_pair.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_queue.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_raw_storage_iter.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_relops.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_rope.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_set.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_slist.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_stack.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_tempbuf.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_tree.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_uninitialized.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stl_vector.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/stream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/streambuf.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/strfile.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/string
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/strstream
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/strstream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/tempbuf.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/tree.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/type_traits.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/utility
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/vector
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/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
@@ -220,7 +222,6 @@ lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/f771
 lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/README
 lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/assert.h
 lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/exception
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/float.h
 lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/limits.h
 lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/math.h
 lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/new
@@ -241,10 +242,22 @@ lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/typeinfo
 lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/libgcc.a
 lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/libobjc.a
 lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/specs
-lib/libf2c.a
-lib/libiberty.a
-lib/libstdc++.a
+@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.28/libf2c.a
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/libiberty.a
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/libstdc++.a
 man/man1/cccp.1.gz
 man/man1/g++.1.gz
 man/man1/g77.1.gz
 man/man1/gcc.1.gz
+@dirrm i386-unknown-freebsd/include
+@dirrm i386-unknown-freebsd/lib
+@dirrm i386-unknown-freebsd
+@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/objc
+@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++/std
+@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include/g++
+@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28/include
+@dirrm lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.28
+@dirrm lib/gcc-lib/i386-unknown-freebsd
+@dirrm lib/gcc-lib