i386 => ${ARCH}

Requested by:   imp

21 files changed, 84 insertions, 84 deletions

diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index b75eae1d973c..53ca564f63b2 100644
--- a/lang/gcc28/Makefile
+++ b/lang/gcc28/Makefile
@@ -4,7 +4,7 @@
 # Date created:				17 Jan 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
-# $Id: Makefile,v 1.17 1998/11/10 07:33:33 obrien Exp $
+# $Id: Makefile,v 1.18 1998/11/11 05:37:24 asami Exp $
 #
 
 DISTNAME=	gcc-2.8.1
@@ -16,9 +16,9 @@ MAINTAINER=	obrien@FreeBSD.org
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "elf"
-GNUHOST=	i386-unknown-freebsdelf${OSREL}
+GNUHOST=	${ARCH}-unknown-freebsdelf${OSREL}
 .else
-GNUHOST=	i386-unknown-freebsd${OSREL}
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .endif
 
 PLIST_SUB=	GNUHOST=${GNUHOST}
@@ -35,7 +35,7 @@ pre-fetch:
 	@${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}"
 
 pre-configure:
-	@(cd ${WRKSRC}/config/i386/ ; \
+	@(cd ${WRKSRC}/config/${ARCH}/ ; \
 	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 \
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 1803f0d19ef9..16480d6ef203 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.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 1803f0d19ef9..16480d6ef203 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.33 1998/09/27 01:56:14 obrien Exp $
+# $Id: Makefile,v 1.35 1998/10/01 21:40:03 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -20,9 +20,9 @@ EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
 ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 .if ${ARE_WE_ELF} == "elf"
-GNUHOST=	i386-unknown-freebsdelf
+GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
-GNUHOST=	i386-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd
 .endif
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 pre-configure:
-	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	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 ; \