diff --git a/java/guavac/Makefile b/java/guavac/Makefile
index f79fc4bf79c6..5374a02b55d0 100644
--- a/java/guavac/Makefile
+++ b/java/guavac/Makefile
@@ -1,31 +1,30 @@
 # New ports collection makefile for:   guavac
 # Version required:    1.2
 # Date created:        10 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.6 1997/11/14 10:20:25 tg Exp $
+# $Id: Makefile,v 1.7 1998/07/12 22:33:46 steve Exp $
 #
 
 DISTNAME=	guavac-1.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.yggdrasil.com/pub/dist/devel/compilers/guavac/
 
 MAINTAINER=	Nakai@technologist.com
 
 CC=		gcc28
 CXX=		g++28
-GNUOSREL!=	uname -r | sed -e 's/[-(].*//'
-LIB_DEPENDS=	${LOCALBASE}/i386-unknown-freebsd${GNUOSREL}/lib/libiberty.a:${PORTSDIR}/lang/glibstdc++28
+BUILD_DEPENDS=	${LOCALBASE}/i386-unknown-freebsd${OSREL}/lib/libiberty.a:${PORTSDIR}/lang/glibstdc++28
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAN1=		guavac.1
 STRIP=
 
 pre-install:
 	@chmod +x ${WRKSRC}/mkinstalldirs
 
 post-install:
 	@strip ${PREFIX}/bin/guavac ${PREFIX}/bin/guavad
 
 .include <bsd.port.mk>
diff --git a/lang/TenDRA/Makefile b/lang/TenDRA/Makefile
index 1c6c1c937823..43ce10ea0779 100644
--- a/lang/TenDRA/Makefile
+++ b/lang/TenDRA/Makefile
@@ -1,73 +1,73 @@
 # New ports collection makefile for:	TenDRA
 # Version required:	4.1.2
 # Date created:		7 Apr 1998
 # Whom:			Robert Nordier <rnordier@iafrica.com>
 #
-# $Id: Makefile,v 1.3 1998/06/06 12:18:39 rnordier Exp $
+# $Id: Makefile,v 1.4 1998/06/09 13:21:03 rnordier Exp $
 #
 
 DISTNAME=	TenDRA-4.1.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://alph.dera.gov.uk/pub/TenDRA/
 
 MAINTAINER=	rnordier@FreeBSD.ORG
 
-OSREL!=		uname -r
+OSRELEASE!=	uname -r
 PLIST=		${WRKDIR}/PLIST
 MAN1=		calculus.1 disp.1 lexi.1 pl.1 sid.1 tcc.1 tchk.1 \
 		tcpplus.1 tdfc2.1 tld.1 tnc.1 trans.1 tspec.1
 MAN5=		tccenv.5
 
 pre-configure:
 	@(cd ${WRKSRC} && \
 	${MKDIR} bin lib man && \
 	${SED}	-e 's:^\(BASE_DIR=\).*:\1${WRKSRC}:' \
 		-e 's:^\(PUBLIC_BIN=\).*:\1$${BASE_DIR}/bin:' \
 		-e 's:^\(INSTALL_DIR=\).*:\1$${BASE_DIR}/lib/TenDRA:' \
 		-e 's:^\(MAN_DIR=\).*:\1$${BASE_DIR}/man:' \
 		-e 's:completed:to build directory completed:' \
 		INSTALL >INSTALL.build && \
 	chmod a+x INSTALL.build && \
 	chmod a-x INSTALL)
-	@${SED} 's:%OSREL%:${OSREL}:' ${PKGDIR}/PLIST >${PLIST}
+	@${SED} 's:%OSREL%:${OSRELEASE}:' ${PKGDIR}/PLIST >${PLIST}
 
 do-build:
 	@(PATH=${WRKSRC}/bin:$$PATH && \
 	cd ${WRKSRC} && \
 	./INSTALL.build)
 	@${ECHO} "Bootstrapping the compiler ..."
 	@${RM} -fr ${WRKSRC}/work
 	@(PATH=${WRKSRC}/bin:$$PATH && \
 	cd ${WRKSRC} && \
 	./INSTALL.build -tcc)
 
 pre-install:
 	@(cd ${WRKSRC} && \
 	${SED}	-e 's:^\(BASE_DIR=\).*:\1${WRKSRC}:' \
 		-e 's:^\(PUBLIC_BIN=\).*:\1${PREFIX}/bin:' \
 		-e 's:^\(INSTALL_DIR=\).*:\1${PREFIX}/lib/TenDRA:' \
 		-e 's:^\(MAN_DIR=\).*:\1${PREFIX}/man:' \
 		INSTALL >INSTALL.install && \
 	chmod a+x INSTALL.install)
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/TenDRA
 	@(PATH=${WRKSRC}/bin:$$PATH && \
 	cd ${WRKSRC} && \
 	./INSTALL.install -tcc -strip)
 	@(cd ${PREFIX}/bin && \
 	chown ${BINOWN}:${BINGRP} tcc tchk tspec && \
 	chmod ${BINMODE} tcc tchk tspec)
 	@(cd ${PREFIX} && \
 	chown -R ${BINOWN}:${BINGRP} lib/TenDRA && \
 	find -X lib/TenDRA -type d | xargs chmod 755 && \
 	${GREP} '^lib/' ${PLIST} | xargs chmod ${SHAREMODE} && \
 	${GREP} '/bin/' ${PLIST} | xargs chmod ${BINMODE})
 	@(cd ${PREFIX}/man/man1 && \
 	chown ${MANOWN}:${MANGRP} ${MAN1} && \
 	chmod ${MANMODE} ${MAN1})
 	@(cd ${PREFIX}/man/man5 && \
 	chown ${MANOWN}:${MANGRP} ${MAN5} && \
 	chmod ${MANMODE} ${MAN5})
 
 .include <bsd.port.mk>
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index 313da1a79294..b291227c906e 100644
--- a/lang/gcc28/Makefile
+++ b/lang/gcc28/Makefile
@@ -1,60 +1,58 @@
 # ex:ts=8
 # Ports collection makefile for:	gcc
 # Version required:			2.8.0
 # Date created:				17 Jan 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
-# $Id: Makefile,v 1.10 1998/06/10 20:16:08 asami Exp $
+# $Id: Makefile,v 1.11 1998/06/30 21:10:21 jdp Exp $
 #
 
 DISTNAME=	gcc-2.8.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-GNUOSREL!=	uname -r | sed -e 's/[-(].*//'
-
 PLIST=          ${WRKDIR}/PLIST.fixedup
-GNUHOST=	i386-unknown-freebsd${GNUOSREL}
+GNUHOST=	i386-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/include/g++
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	bootstrap
 MAN1=		cccp28.1 g++28.1 gcc28.1
 
 pre-fetch:
-	@${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OSNAME} ${GNUOSREL}"
+	@${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}"
 
 post-patch:
 	@(cd ${WRKSRC}/config/i386/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd.h freebsd.h.in ; \
 	${SED} -e "s:__FreeBSD__=[0-9]*:__FreeBSD__=$${MAJ}:" freebsd.h.in \
 		>freebsd.h ; \
 	${MV} freebsd-elf.h freebsd-elf.h.in ; \
 	${SED} -e "s:__FreeBSD__=[0-9]*:__FreeBSD__=$${MAJ}:" freebsd-elf.h.in \
 		>freebsd-elf.h)
 
 pre-install:
 	@${SED} -e 's:%GNUHOST%:${GNUHOST}:' ${PKGDIR}/PLIST \
 		> ${PLIST}
 
 post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ ${PREFIX}/bin/gcov \
 	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
 	${PREFIX}/bin/${GNUHOST}-gcc \
 	${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/cc1 \
 	${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/cc1obj \
 	${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/cc1plus \
 	${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/cpp ; \
 		do strip $$prog ; \
 		done)
 	ln -f ${PREFIX}/bin/gcc ${PREFIX}/bin/gcc28
 	ln -f ${PREFIX}/bin/g++ ${PREFIX}/bin/g++28
 	@${MV} ${PREFIX}/man/man1/cccp.1 ${PREFIX}/man/man1/cccp28.1
 	@${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/g++28.1
 	@${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/gcc28.1
 
 .include <bsd.port.mk>
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index a4e8ff528a83..aecafb9769f6 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,67 +1,69 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
 # Version required: 			1998-02-28 
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $
+# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $
 #
 
 DISTNAME=	egcs-19980721
 CATEGORIES=	lang
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-07-21/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-07-21/
 
 MAINTAINER=	obrien@FreeBSD.org
 
 EGCS_REV=	egcs-2.91.51
+# XXX
+#GNUHOST=	i386-unknown-freebsd${OSREL}
 GNUHOST=	i386-unknown-freebsd${GNUOSREL}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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)
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
 	touch ${PREFIX}/info/dir
 
 post-install:
 	@${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/${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/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
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/glibstdc++28/Makefile b/lang/glibstdc++28/Makefile
index 0e1a66aaab30..a401f1283eff 100644
--- a/lang/glibstdc++28/Makefile
+++ b/lang/glibstdc++28/Makefile
@@ -1,44 +1,43 @@
 # ex:ts=8
 # Ports collection makefile for:	GNU libstdc++
 # Version required:			2.8.0
 # Date created:				03 Mar 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
-# $Id: Makefile,v 1.2 1998/03/11 12:25:31 obrien Exp $
+# $Id: Makefile,v 1.3 1998/04/20 10:36:05 obrien Exp $
 #
 
 DISTNAME=	libstdc++-2.8.1.1
 PKGNAME=	glibstdc++-2.8.1.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	obrien@FreeBSD.org
 
 BUILD_DEPENDS=	gcc28:${PORTSDIR}/lang/gcc28 \
 		g++28:${PORTSDIR}/lang/gcc28
 RUN_DEPENDS=	gcc28:${PORTSDIR}/lang/gcc28 \
 		g++28:${PORTSDIR}/lang/gcc28
 
 CC=		gcc28
 CXX=		g++28
-GNUOSREL!=	uname -r | sed -e 's/[-(].*//'
-GCC28DIR=	lib/gcc-lib/i386-unknown-freebsd${GNUOSREL}/2.8.1
+GCC28DIR=	lib/gcc-lib/i386-unknown-freebsd${OSREL}/2.8.1
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 PLIST=          ${WRKDIR}/PLIST.fixedup
 
 pre-install:
-	${SED} -e 's:%%GNUOSREL%%:${GNUOSREL}:' \
+	${SED} -e 's:%%GNUOSREL%%:${OSREL}:' \
 		-e 's:%%GCC28SUBDIR%%:${GCC28DIR}:' \
 		${PKGDIR}/PLIST > ${PLIST}
 
 post-install:
 	${RM} -rf ${PREFIX}/${GCC28DIR}/include/g++
 	${MV} ${PREFIX}/include/g++  \
 		${PREFIX}/${GCC28DIR}//include
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/${GCC28DIR}
 	${MV} ${PREFIX}/lib/libstdc++.a  \
 		${PREFIX}/${GCC28DIR}
 
 .include <bsd.port.mk>