From 3e04eee854d087cfc5a0254ac99356019eb94b0f Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Fri, 2 Mar 2001 10:09:40 +0000
Subject: Fix nits in the auto lib-gcc PLIST generation.

---
 lang/gcc32/Makefile  | 12 ++++++++----
 lang/gcc32/pkg-plist | 28 ++++++----------------------
 2 files changed, 14 insertions(+), 26 deletions(-)

(limited to 'lang/gcc32')

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
-- 
cgit