5 files changed, 309 insertions, 201 deletions

diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index d47e6a89a112..c0f1809b0d3e 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}.${PATCHVERSION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
@@ -53,19 +54,20 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--disable-java-awt --without-x \
 		--enable-java-gc=boehm --disable-libgcj-debug \
 		--enable-interpreter --enable-hash-synchronization \
-		--without-newlib
+		--without-newlib \
+		--with-gxx-include-dir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/include/c++/${GCCVERSION}
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 LIBTOOLFILES=	configure gcc/configure
-INFO=		fastjar
-MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}g77.1  \
-		cpp.1 gcov.1 ${PKGNAMEPREFIX}gcj.1 gcjh.1 gij.1 grepjar.1 jar.1 \
-		jcf-dump.1 jv-convert.1 jv-scan.1 rmic.1 rmiregistry.1
-MAN7=		fsf-funding.7 gfdl.7 gpl.7
+MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}g77.1 \
+		${PKGNAMEPREFIX}gcj.1 ${PKGNAMEPREFIX}grepjar.1 ${PKGNAMEPREFIX}jar.1 \
+		${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1 ${PKGNAMEPREFIX}jcf-dump.1 \
+		${PKGNAMEPREFIX}jv-convert.1 ${PKGNAMEPREFIX}jv-scan.1 ${PKGNAMEPREFIX}rmic.1 \
+		${PKGNAMEPREFIX}rmiregistry.1 ${PKGNAMEPREFIX}gcjh.1 ${PKGNAMEPREFIX}gij.1
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} GCC_TARG=${PKGNAMEPREFIX:S/-$//} \
 		GCC_REV=${GCCVERSION}
 
-BINARIES=	gcc cpp g++ g77 gcov gcj gcjh jcf-dump jv-scan
+BINARIES=	gcc cpp g++ g77 gcov gcj gcjh jcf-dump jv-scan grepjar jar
 
 post-configure:
 	@${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=\s*).+$$,\1libstdc++-v3 libf2c libobjc mingw,' ${WRKSRC}/Makefile
diff --git a/devel/mingw32-gcc/files/patch-fastjar-Makefile.in b/devel/mingw32-gcc/files/patch-fastjar-Makefile.in
new file mode 100644
index 000000000000..be6c085d2940
--- /dev/null
+++ b/devel/mingw32-gcc/files/patch-fastjar-Makefile.in
@@ -0,0 +1,25 @@
+54c54
+< transform = @program_transform_name@
+---
+> transform = s,^,$(target_alias)-,
+344,363d343
+< 	@$(NORMAL_INSTALL)
+< 	$(mkinstalldirs) $(DESTDIR)$(infodir)
+< 	@list='$(INFO_DEPS)'; \
+< 	for file in $$list; do \
+< 	  d=$(srcdir); \
+< 	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+< 	    if test -f $$d/$$ifile; then \
+< 	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+< 	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+< 	    else : ; fi; \
+< 	  done; \
+< 	done
+< 	@$(POST_INSTALL)
+< 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+< 	  list='$(INFO_DEPS)'; \
+< 	  for file in $$list; do \
+< 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+< 	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+< 	  done; \
+< 	else : ; fi
diff --git a/devel/mingw32-gcc/files/patch-gcc-Makefile.in b/devel/mingw32-gcc/files/patch-gcc-Makefile.in
new file mode 100644
index 000000000000..c38e22f0ebd7
--- /dev/null
+++ b/devel/mingw32-gcc/files/patch-gcc-Makefile.in
@@ -0,0 +1,30 @@
+--- gcc/Makefile.in.orig	Sun Aug  3 19:48:36 2003
++++ gcc/Makefile.in	Fri Oct 17 14:25:15 2003
+@@ -2900,21 +2900,12 @@
+ 	  $(INSTALL_DATA) $(docdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
+ 	  chmod a-x $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
+ 	fi
+-	-rm -f $(DESTDIR)$(man1dir)/cpp$(man1ext)
+-	-$(INSTALL_DATA) $(docdir)/cpp.1 $(DESTDIR)$(man1dir)/cpp$(man1ext)
+-	-chmod a-x $(DESTDIR)$(man1dir)/cpp$(man1ext)
+-	-rm -f $(DESTDIR)$(man1dir)/gcov$(man1ext)
+-	-$(INSTALL_DATA) $(docdir)/gcov.1 $(DESTDIR)$(man1dir)/gcov$(man1ext)
+-	-chmod a-x $(DESTDIR)$(man1dir)/gcov$(man1ext)
+-	-rm -f $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
+-	-$(INSTALL_DATA) $(docdir)/fsf-funding.7 $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
+-	-chmod a-x $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
+-	-rm -f $(DESTDIR)$(man7dir)/gfdl$(man7ext)
+-	-$(INSTALL_DATA) $(docdir)/gfdl.7 $(DESTDIR)$(man7dir)/gfdl$(man7ext)
+-	-chmod a-x $(DESTDIR)$(man7dir)/gfdl$(man7ext)
+-	-rm -f $(DESTDIR)$(man7dir)/gpl$(man7ext)
+-	-$(INSTALL_DATA) $(docdir)/gpl.7 $(DESTDIR)$(man7dir)/gpl$(man7ext)
+-	-chmod a-x $(DESTDIR)$(man7dir)/gpl$(man7ext)
++	-rm -f $(DESTDIR)$(man1dir)/$(CPP_CROSS_NAME)$(man1ext)
++	-$(INSTALL_DATA) $(docdir)/cpp.1 $(DESTDIR)$(man1dir)/$(CPP_CROSS_NAME)$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/$(CPP_CROSS_NAME)$(man1ext)
++	-rm -f $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
++	-$(INSTALL_DATA) $(docdir)/gcov.1 $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
+ 
+ # Install the library.
+ install-libgcc: libgcc.mk libgcc.a installdirs
diff --git a/devel/mingw32-gcc/files/patch-gcc-java-Make-lang.in b/devel/mingw32-gcc/files/patch-gcc-java-Make-lang.in
new file mode 100644
index 000000000000..8d2a6d5d3311
--- /dev/null
+++ b/devel/mingw32-gcc/files/patch-gcc-java-Make-lang.in
@@ -0,0 +1,48 @@
+--- ./gcc/java/Make-lang.in.orig	Fri Oct 17 14:15:29 2003
++++ ./gcc/java/Make-lang.in	Fri Oct 17 14:23:42 2003
+@@ -420,24 +420,24 @@
+ 	    chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
+ 	  fi ; \
+ 	fi
+-	-rm -f $(DESTDIR)$(man1dir)/gcjh$(man1ext)
+-	-$(INSTALL_DATA) $(srcdir)/java/gcjh.1 $(DESTDIR)$(man1dir)/gcjh$(man1ext)
+-	-chmod a-x $(DESTDIR)$(man1dir)/gcjh$(man1ext)
+-	-rm -f $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
+-	-$(INSTALL_DATA) $(srcdir)/java/jv-scan.1 $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
+-	-chmod a-x $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
+-	-rm -f $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
+-	-$(INSTALL_DATA) $(srcdir)/java/jcf-dump.1 $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
+-	-chmod a-x $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
+-	-rm -f $(DESTDIR)$(man1dir)/gij$(man1ext)
+-	-$(INSTALL_DATA) $(srcdir)/java/gij.1 $(DESTDIR)$(man1dir)/gij$(man1ext)
+-	-chmod a-x $(DESTDIR)$(man1dir)/gij$(man1ext)
+-	-rm -f $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
+-	-$(INSTALL_DATA) $(srcdir)/java/jv-convert.1 $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
+-	-chmod a-x $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
+-	-rm -f $(DESTDIR)$(man1dir)/rmic$(man1ext)
+-	-$(INSTALL_DATA) $(srcdir)/java/rmic.1 $(DESTDIR)$(man1dir)/rmic$(man1ext)
+-	-chmod a-x $(DESTDIR)$(man1dir)/rmic$(man1ext)
+-	-rm -f $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
+-	-$(INSTALL_DATA) $(srcdir)/java/rmiregistry.1 $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
+-	-chmod a-x $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
++	-rm -f $(DESTDIR)$(man1dir)/$(target_alias)-gcjh$(man1ext)
++	-$(INSTALL_DATA) $(srcdir)/java/gcjh.1 $(DESTDIR)$(man1dir)/$(target_alias)-gcjh$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/$(target_alias)-gcjh$(man1ext)
++	-rm -f $(DESTDIR)$(man1dir)/$(target_alias)-jv-scan$(man1ext)
++	-$(INSTALL_DATA) $(srcdir)/java/jv-scan.1 $(DESTDIR)$(man1dir)/$(target_alias)-jv-scan$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/$(target_alias)-jv-scan$(man1ext)
++	-rm -f $(DESTDIR)$(man1dir)/$(target_alias)-jcf-dump$(man1ext)
++	-$(INSTALL_DATA) $(srcdir)/java/jcf-dump.1 $(DESTDIR)$(man1dir)/$(target_alias)-jcf-dump$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/$(target_alias)-jcf-dump$(man1ext)
++	-rm -f $(DESTDIR)$(man1dir)/$(target_alias)-gij$(man1ext)
++	-$(INSTALL_DATA) $(srcdir)/java/gij.1 $(DESTDIR)$(man1dir)/$(target_alias)-gij$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/$(target_alias)-gij$(man1ext)
++	-rm -f $(DESTDIR)$(man1dir)/$(target_alias)-jv-convert$(man1ext)
++	-$(INSTALL_DATA) $(srcdir)/java/jv-convert.1 $(DESTDIR)$(man1dir)/$(target_alias)-jv-convert$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/$(target_alias)-jv-convert$(man1ext)
++	-rm -f $(DESTDIR)$(man1dir)/$(target_alias)-rmic$(man1ext)
++	-$(INSTALL_DATA) $(srcdir)/java/rmic.1 $(DESTDIR)$(man1dir)/$(target_alias)-rmic$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/$(target_alias)-rmic$(man1ext)
++	-rm -f $(DESTDIR)$(man1dir)/$(target_alias)-rmiregistry$(man1ext)
++	-$(INSTALL_DATA) $(srcdir)/java/rmiregistry.1 $(DESTDIR)$(man1dir)/$(target_alias)-rmiregistry$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/$(target_alias)-rmiregistry$(man1ext)
diff --git a/devel/mingw32-gcc/pkg-plist b/devel/mingw32-gcc/pkg-plist
index 8cbc2af9ff98..707850151c36 100644
--- a/devel/mingw32-gcc/pkg-plist
+++ b/devel/mingw32-gcc/pkg-plist
@@ -8,6 +8,8 @@
 %%GCC_TARG%%/bin/gcov
 %%GCC_TARG%%/bin/jcf-dump
 %%GCC_TARG%%/bin/jv-scan
+%%GCC_TARG%%/bin/grepjar
+%%GCC_TARG%%/bin/jar
 %%GCC_TARG%%/lib/libfrtbegin.a
 %%GCC_TARG%%/lib/libg2c.a
 %%GCC_TARG%%/lib/libg2c.la
@@ -29,194 +31,194 @@ bin/%%GCC_TARG%%-gcjh
 bin/%%GCC_TARG%%-gcov
 bin/%%GCC_TARG%%-jcf-dump
 bin/%%GCC_TARG%%-jv-scan
-bin/grepjar
-bin/jar
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/atomicity.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/basic_file.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/c++config.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/c++io.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/c++locale.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/codecvt_specializations.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/ctype_base.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/ctype_inline.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/ctype_noninline.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/gthr-default.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/gthr-posix.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/gthr-single.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/gthr.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/messages_members.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/os_defines.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/time_members.h
-include/c++/%%GCC_REV%%/algorithm
-include/c++/%%GCC_REV%%/backward/algo.h
-include/c++/%%GCC_REV%%/backward/algobase.h
-include/c++/%%GCC_REV%%/backward/alloc.h
-include/c++/%%GCC_REV%%/backward/backward_warning.h
-include/c++/%%GCC_REV%%/backward/bvector.h
-include/c++/%%GCC_REV%%/backward/complex.h
-include/c++/%%GCC_REV%%/backward/defalloc.h
-include/c++/%%GCC_REV%%/backward/deque.h
-include/c++/%%GCC_REV%%/backward/fstream.h
-include/c++/%%GCC_REV%%/backward/function.h
-include/c++/%%GCC_REV%%/backward/hash_map.h
-include/c++/%%GCC_REV%%/backward/hash_set.h
-include/c++/%%GCC_REV%%/backward/hashtable.h
-include/c++/%%GCC_REV%%/backward/heap.h
-include/c++/%%GCC_REV%%/backward/iomanip.h
-include/c++/%%GCC_REV%%/backward/iostream.h
-include/c++/%%GCC_REV%%/backward/istream.h
-include/c++/%%GCC_REV%%/backward/iterator.h
-include/c++/%%GCC_REV%%/backward/list.h
-include/c++/%%GCC_REV%%/backward/map.h
-include/c++/%%GCC_REV%%/backward/multimap.h
-include/c++/%%GCC_REV%%/backward/multiset.h
-include/c++/%%GCC_REV%%/backward/new.h
-include/c++/%%GCC_REV%%/backward/ostream.h
-include/c++/%%GCC_REV%%/backward/pair.h
-include/c++/%%GCC_REV%%/backward/queue.h
-include/c++/%%GCC_REV%%/backward/rope.h
-include/c++/%%GCC_REV%%/backward/set.h
-include/c++/%%GCC_REV%%/backward/slist.h
-include/c++/%%GCC_REV%%/backward/stack.h
-include/c++/%%GCC_REV%%/backward/stream.h
-include/c++/%%GCC_REV%%/backward/streambuf.h
-include/c++/%%GCC_REV%%/backward/strstream
-include/c++/%%GCC_REV%%/backward/tempbuf.h
-include/c++/%%GCC_REV%%/backward/tree.h
-include/c++/%%GCC_REV%%/backward/vector.h
-include/c++/%%GCC_REV%%/bits/basic_ios.h
-include/c++/%%GCC_REV%%/bits/basic_ios.tcc
-include/c++/%%GCC_REV%%/bits/basic_string.h
-include/c++/%%GCC_REV%%/bits/basic_string.tcc
-include/c++/%%GCC_REV%%/bits/boost_concept_check.h
-include/c++/%%GCC_REV%%/bits/char_traits.h
-include/c++/%%GCC_REV%%/bits/cmath.tcc
-include/c++/%%GCC_REV%%/bits/codecvt.h
-include/c++/%%GCC_REV%%/bits/concept_check.h
-include/c++/%%GCC_REV%%/bits/cpp_type_traits.h
-include/c++/%%GCC_REV%%/bits/deque.tcc
-include/c++/%%GCC_REV%%/bits/fpos.h
-include/c++/%%GCC_REV%%/bits/fstream.tcc
-include/c++/%%GCC_REV%%/bits/functexcept.h
-include/c++/%%GCC_REV%%/bits/gslice.h
-include/c++/%%GCC_REV%%/bits/gslice_array.h
-include/c++/%%GCC_REV%%/bits/indirect_array.h
-include/c++/%%GCC_REV%%/bits/ios_base.h
-include/c++/%%GCC_REV%%/bits/istream.tcc
-include/c++/%%GCC_REV%%/bits/list.tcc
-include/c++/%%GCC_REV%%/bits/locale_classes.h
-include/c++/%%GCC_REV%%/bits/locale_facets.h
-include/c++/%%GCC_REV%%/bits/locale_facets.tcc
-include/c++/%%GCC_REV%%/bits/localefwd.h
-include/c++/%%GCC_REV%%/bits/mask_array.h
-include/c++/%%GCC_REV%%/bits/ostream.tcc
-include/c++/%%GCC_REV%%/bits/pthread_allocimpl.h
-include/c++/%%GCC_REV%%/bits/slice_array.h
-include/c++/%%GCC_REV%%/bits/sstream.tcc
-include/c++/%%GCC_REV%%/bits/stl_algo.h
-include/c++/%%GCC_REV%%/bits/stl_algobase.h
-include/c++/%%GCC_REV%%/bits/stl_alloc.h
-include/c++/%%GCC_REV%%/bits/stl_bvector.h
-include/c++/%%GCC_REV%%/bits/stl_construct.h
-include/c++/%%GCC_REV%%/bits/stl_deque.h
-include/c++/%%GCC_REV%%/bits/stl_function.h
-include/c++/%%GCC_REV%%/bits/stl_heap.h
-include/c++/%%GCC_REV%%/bits/stl_iterator.h
-include/c++/%%GCC_REV%%/bits/stl_iterator_base_funcs.h
-include/c++/%%GCC_REV%%/bits/stl_iterator_base_types.h
-include/c++/%%GCC_REV%%/bits/stl_list.h
-include/c++/%%GCC_REV%%/bits/stl_map.h
-include/c++/%%GCC_REV%%/bits/stl_multimap.h
-include/c++/%%GCC_REV%%/bits/stl_multiset.h
-include/c++/%%GCC_REV%%/bits/stl_numeric.h
-include/c++/%%GCC_REV%%/bits/stl_pair.h
-include/c++/%%GCC_REV%%/bits/stl_pthread_alloc.h
-include/c++/%%GCC_REV%%/bits/stl_queue.h
-include/c++/%%GCC_REV%%/bits/stl_raw_storage_iter.h
-include/c++/%%GCC_REV%%/bits/stl_relops.h
-include/c++/%%GCC_REV%%/bits/stl_set.h
-include/c++/%%GCC_REV%%/bits/stl_stack.h
-include/c++/%%GCC_REV%%/bits/stl_tempbuf.h
-include/c++/%%GCC_REV%%/bits/stl_threads.h
-include/c++/%%GCC_REV%%/bits/stl_tree.h
-include/c++/%%GCC_REV%%/bits/stl_uninitialized.h
-include/c++/%%GCC_REV%%/bits/stl_vector.h
-include/c++/%%GCC_REV%%/bits/stream_iterator.h
-include/c++/%%GCC_REV%%/bits/streambuf.tcc
-include/c++/%%GCC_REV%%/bits/streambuf_iterator.h
-include/c++/%%GCC_REV%%/bits/stringfwd.h
-include/c++/%%GCC_REV%%/bits/type_traits.h
-include/c++/%%GCC_REV%%/bits/valarray_array.h
-include/c++/%%GCC_REV%%/bits/valarray_array.tcc
-include/c++/%%GCC_REV%%/bits/valarray_meta.h
-include/c++/%%GCC_REV%%/bits/vector.tcc
-include/c++/%%GCC_REV%%/bitset
-include/c++/%%GCC_REV%%/cassert
-include/c++/%%GCC_REV%%/cctype
-include/c++/%%GCC_REV%%/cerrno
-include/c++/%%GCC_REV%%/cfloat
-include/c++/%%GCC_REV%%/ciso646
-include/c++/%%GCC_REV%%/climits
-include/c++/%%GCC_REV%%/clocale
-include/c++/%%GCC_REV%%/cmath
-include/c++/%%GCC_REV%%/complex
-include/c++/%%GCC_REV%%/csetjmp
-include/c++/%%GCC_REV%%/csignal
-include/c++/%%GCC_REV%%/cstdarg
-include/c++/%%GCC_REV%%/cstddef
-include/c++/%%GCC_REV%%/cstdio
-include/c++/%%GCC_REV%%/cstdlib
-include/c++/%%GCC_REV%%/cstring
-include/c++/%%GCC_REV%%/ctime
-include/c++/%%GCC_REV%%/cwchar
-include/c++/%%GCC_REV%%/cwctype
-include/c++/%%GCC_REV%%/cxxabi.h
-include/c++/%%GCC_REV%%/deque
-include/c++/%%GCC_REV%%/exception
-include/c++/%%GCC_REV%%/exception_defines.h
-include/c++/%%GCC_REV%%/ext/algorithm
-include/c++/%%GCC_REV%%/ext/enc_filebuf.h
-include/c++/%%GCC_REV%%/ext/functional
-include/c++/%%GCC_REV%%/ext/hash_map
-include/c++/%%GCC_REV%%/ext/hash_set
-include/c++/%%GCC_REV%%/ext/iterator
-include/c++/%%GCC_REV%%/ext/memory
-include/c++/%%GCC_REV%%/ext/numeric
-include/c++/%%GCC_REV%%/ext/rb_tree
-include/c++/%%GCC_REV%%/ext/rope
-include/c++/%%GCC_REV%%/ext/ropeimpl.h
-include/c++/%%GCC_REV%%/ext/slist
-include/c++/%%GCC_REV%%/ext/stdio_filebuf.h
-include/c++/%%GCC_REV%%/ext/stl_hash_fun.h
-include/c++/%%GCC_REV%%/ext/stl_hashtable.h
-include/c++/%%GCC_REV%%/ext/stl_rope.h
-include/c++/%%GCC_REV%%/fstream
-include/c++/%%GCC_REV%%/functional
-include/c++/%%GCC_REV%%/iomanip
-include/c++/%%GCC_REV%%/ios
-include/c++/%%GCC_REV%%/iosfwd
-include/c++/%%GCC_REV%%/iostream
-include/c++/%%GCC_REV%%/istream
-include/c++/%%GCC_REV%%/iterator
-include/c++/%%GCC_REV%%/limits
-include/c++/%%GCC_REV%%/list
-include/c++/%%GCC_REV%%/locale
-include/c++/%%GCC_REV%%/map
-include/c++/%%GCC_REV%%/memory
-include/c++/%%GCC_REV%%/new
-include/c++/%%GCC_REV%%/numeric
-include/c++/%%GCC_REV%%/ostream
-include/c++/%%GCC_REV%%/queue
-include/c++/%%GCC_REV%%/set
-include/c++/%%GCC_REV%%/sstream
-include/c++/%%GCC_REV%%/stack
-include/c++/%%GCC_REV%%/stdexcept
-include/c++/%%GCC_REV%%/streambuf
-include/c++/%%GCC_REV%%/string
-include/c++/%%GCC_REV%%/typeinfo
-include/c++/%%GCC_REV%%/utility
-include/c++/%%GCC_REV%%/valarray
-include/c++/%%GCC_REV%%/vector
+bin/%%GCC_TARG%%-grepjar
+bin/%%GCC_TARG%%-jar
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/atomicity.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/basic_file.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/c++config.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/c++io.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/c++locale.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/codecvt_specializations.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/ctype_base.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/ctype_inline.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/ctype_noninline.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/gthr-default.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/gthr-posix.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/gthr-single.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/gthr.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/messages_members.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/os_defines.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/time_members.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/algorithm
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/algo.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/algobase.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/alloc.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/backward_warning.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/bvector.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/complex.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/defalloc.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/deque.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/fstream.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/function.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/hash_map.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/hash_set.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/hashtable.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/heap.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/iomanip.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/iostream.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/istream.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/iterator.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/list.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/map.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/multimap.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/multiset.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/new.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/ostream.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/pair.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/queue.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/rope.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/set.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/slist.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/stack.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/stream.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/streambuf.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/strstream
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/tempbuf.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/tree.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/backward/vector.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/basic_ios.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/basic_ios.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/basic_string.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/basic_string.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/boost_concept_check.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/char_traits.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/cmath.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/codecvt.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/concept_check.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/cpp_type_traits.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/deque.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/fpos.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/fstream.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/functexcept.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/gslice.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/gslice_array.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/indirect_array.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/ios_base.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/istream.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/list.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/locale_classes.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/locale_facets.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/locale_facets.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/localefwd.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/mask_array.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/ostream.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/pthread_allocimpl.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/slice_array.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/sstream.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_algo.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_algobase.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_alloc.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_bvector.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_construct.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_deque.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_function.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_heap.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_iterator.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_iterator_base_funcs.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_iterator_base_types.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_list.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_map.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_multimap.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_multiset.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_numeric.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_pair.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_pthread_alloc.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_queue.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_raw_storage_iter.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_relops.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_set.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_stack.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_tempbuf.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_threads.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_tree.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_uninitialized.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stl_vector.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stream_iterator.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/streambuf.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/streambuf_iterator.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/stringfwd.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/type_traits.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/valarray_array.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/valarray_array.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/valarray_meta.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bits/vector.tcc
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/bitset
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cassert
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cctype
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cerrno
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cfloat
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ciso646
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/climits
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/clocale
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cmath
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/complex
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/csetjmp
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/csignal
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cstdarg
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cstddef
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cstdio
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cstdlib
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cstring
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ctime
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cwchar
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cwctype
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/cxxabi.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/deque
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/exception
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/exception_defines.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/algorithm
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/enc_filebuf.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/functional
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/hash_map
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/hash_set
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/iterator
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/memory
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/numeric
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/rb_tree
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/rope
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/ropeimpl.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/slist
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/stdio_filebuf.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/stl_hash_fun.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/stl_hashtable.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/stl_rope.h
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/fstream
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/functional
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/iomanip
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ios
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/iosfwd
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/iostream
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/istream
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/iterator
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/limits
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/list
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/locale
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/map
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/memory
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/new
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/numeric
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/ostream
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/queue
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/set
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/sstream
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/stack
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/stdexcept
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/streambuf
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/string
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/typeinfo
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/utility
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/valarray
+%%GCC_TARG%%/include/c++/%%GCC_REV%%/vector
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1obj
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1plus
@@ -266,12 +268,13 @@ lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/jc1
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/jvgenmain
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/libgcc.a
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/specs
-@dirrm include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits
-@dirrm include/c++/%%GCC_REV%%/%%GCC_TARG%%
-@dirrm include/c++/%%GCC_REV%%/backward
-@dirrm include/c++/%%GCC_REV%%/bits
-@dirrm include/c++/%%GCC_REV%%/ext
-@dirrm include/c++/%%GCC_REV%%
+@dirrm %%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits
+@dirrm %%GCC_TARG%%/include/c++/%%GCC_REV%%/%%GCC_TARG%%
+@dirrm %%GCC_TARG%%/include/c++/%%GCC_REV%%/backward
+@dirrm %%GCC_TARG%%/include/c++/%%GCC_REV%%/bits
+@dirrm %%GCC_TARG%%/include/c++/%%GCC_REV%%/ext
+@dirrm %%GCC_TARG%%/include/c++/%%GCC_REV%%
+@dirrm %%GCC_TARG%%/include/c++
 @dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include
 @dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include