+ 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''

1 files changed, 29 insertions, 18 deletions

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index dd970787e5ed..3fe97babba6e 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/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