From 7fe3d489b908ac87bce0c1ce44f3dd4bfe1065fd Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 9 Feb 1999 22:17:21 +0000
Subject: * clean up verbosity of Makefile * now GNUHOST is
 i386-unknown-freebsd{OS_VER} vs. i386-unknown-freebsd

---
 lang/egcs/Makefile      | 13 ++++---------
 lang/gcc-devel/Makefile | 13 ++++---------
 lang/gcc-ooo/Makefile   | 13 ++++---------
 lang/gcc/Makefile       | 13 ++++---------
 lang/gcc295/Makefile    | 13 ++++---------
 lang/gcc30/Makefile     | 13 ++++---------
 lang/gcc31/Makefile     | 13 ++++---------
 lang/gcc32/Makefile     | 13 ++++---------
 lang/gcc33/Makefile     | 13 ++++---------
 lang/gcc34/Makefile     | 13 ++++---------
 lang/gcc35/Makefile     | 13 ++++---------
 lang/gcc40/Makefile     | 13 ++++---------
 lang/gcc41/Makefile     | 13 ++++---------
 lang/gcc42/Makefile     | 13 ++++---------
 lang/gcc43/Makefile     | 13 ++++---------
 lang/gcc44/Makefile     | 13 ++++---------
 lang/gcc45/Makefile     | 13 ++++---------
 lang/gcc46/Makefile     | 13 ++++---------
 lang/gcc47/Makefile     | 13 ++++---------
 lang/gcc48/Makefile     | 13 ++++---------
 20 files changed, 80 insertions(+), 180 deletions(-)

diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 1f920d8d12d8..fd16aa58c606 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.43 1999/02/03 11:11:52 asami Exp $
+# $Id: Makefile,v 1.44 1999/02/09 18:24:50 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -26,8 +26,7 @@ LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
-#GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
-GNUHOST=	${ARCH}-unknown-freebsd
+GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
 .else
 #GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
 GNUHOST=	${ARCH}-unknown-freebsdaout
@@ -44,16 +43,12 @@ MAN1=		cccp.1 g++.1 g77.1 gcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	# If I touch configure.in in any way, the build scafolding wants to
-	# run `autoconf' to regenerate `configure'.  I thought a simple `touch'
-	# of `configure' would do the trick, but it didn't.
-	##${CP} -p ${WRKSRC}/gcc/configure.in ${WRKSRC}/gcc/configure.in-changed
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	touch ${WRKSRC}/gcc/configure
-	touch ${WRKSRC}/gcc/cstamp-h.in
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(cd ${WRKSRC}/gcc/config/${ARCH}/ ; \
 	MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${MV} freebsd-aout.h freebsd-aout.h.in ; \
-- 
cgit v1.2.3