Fix nits in the auto lib-gcc PLIST generation.

36 files changed, 252 insertions, 468 deletions

diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc-devel/pkg-plist b/lang/gcc-devel/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc-devel/pkg-plist
+++ b/lang/gcc-devel/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc-ooo/pkg-plist
+++ b/lang/gcc-ooo/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc30/pkg-plist b/lang/gcc30/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc30/pkg-plist
+++ b/lang/gcc30/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc31/pkg-plist b/lang/gcc31/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc31/pkg-plist
+++ b/lang/gcc31/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc32/pkg-plist
+++ b/lang/gcc32/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc33/pkg-plist
+++ b/lang/gcc33/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc35/pkg-plist b/lang/gcc35/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc35/pkg-plist
+++ b/lang/gcc35/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 563f511f9edb..32c120ed9938 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -122,14 +122,18 @@ post-install:
 	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
 	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
 	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-.if defined(WANT_SHAREDLIBS)
-	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
-.endif
+#.if defined(WANT_SHAREDLIBS)
+#	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
+#.endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB} -type f -o -type l	>${WRKDIR}/PLIST.gcc-lib
+	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>${WRKDIR}/PLIST.gcc-lib
+	cd ${PREFIX} ;\
+	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 264f8e69036e..4391d82b9824 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -6,12 +6,12 @@ bin/ggcc
 bin/%%GNU_HOST%%-gcc
 bin/%%GNU_HOST%%-g++
 bin/gccbug-%%SNAPVER%%
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jv-scan
-bin/jcf-dump
-%%GNU_HOST%%/include/_G_config.h
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcj
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcjh
+@comment not working on FreeBSD post-libstdc++-v3:	bin/gcov
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jv-scan
+@comment not working on FreeBSD post-libstdc++-v3:	bin/jcf-dump
+@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
@@ -83,19 +83,3 @@ info/gcc.info-9
 @exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
-@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
-@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