From 7884ebd7be4940f55ddd70f72fc05b8f046555ca Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sun, 6 Apr 2003 14:30:41 +0000
Subject: [PATCH] Appease portlint by various whitespace changes.  Remove last
 traces of PATCH_SITES and PATCHFILES which we haven't used lately as well as
 of libgcj not building properly.

---
 lang/gcc-ooo/Makefile | 20 ++++++++------------
 lang/gcc/Makefile     | 20 ++++++++------------
 lang/gcc33/Makefile   | 20 ++++++++------------
 lang/gcc34/Makefile   | 20 ++++++++------------
 lang/gcc35/Makefile   | 20 ++++++++------------
 lang/gcc40/Makefile   | 20 ++++++++------------
 lang/gcc41/Makefile   | 20 ++++++++------------
 lang/gcc42/Makefile   | 20 ++++++++------------
 lang/gcc43/Makefile   | 20 ++++++++------------
 lang/gcc44/Makefile   | 20 ++++++++------------
 lang/gcc45/Makefile   | 20 ++++++++------------
 lang/gcc46/Makefile   | 20 ++++++++------------
 lang/gcc47/Makefile   | 20 ++++++++------------
 lang/gcc48/Makefile   | 20 ++++++++------------
 14 files changed, 112 insertions(+), 168 deletions(-)

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 5a9758582b0f..ed2493a4d7e5 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,5 +1,5 @@
-# ex:ts=8 
-# Ports collection makefile for:	egcs 
+# ex:ts=8
+# Ports collection makefile for:	egcs
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -65,18 +65,17 @@ CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
 CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
-#CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=	--enable-shared
 .else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+=	--disable-shared
 .endif
 .if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
@@ -109,9 +108,6 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
-		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
@@ -220,8 +216,8 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/	
-	@-ncftpls ${SITE} | grep LATEST
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
+	@-ncftpls ${SITE} | ${GREP} LATEST
 .endfor
 
 .include <bsd.port.post.mk>