42 files changed, 504 insertions, 14 deletions

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc-ooo/distinfo
+++ b/lang/gcc-ooo/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc-ooo/files/opt.patch-bc b/lang/gcc-ooo/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc-ooo/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc/files/opt.patch-bc b/lang/gcc/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc33/distinfo b/lang/gcc33/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc33/distinfo
+++ b/lang/gcc33/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc33/files/opt.patch-bc b/lang/gcc33/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc33/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc34/files/opt.patch-bc b/lang/gcc34/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc34/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc35/distinfo b/lang/gcc35/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc35/distinfo
+++ b/lang/gcc35/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc35/files/opt.patch-bc b/lang/gcc35/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc35/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc40/files/opt.patch-bc b/lang/gcc40/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc40/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc41/files/opt.patch-bc b/lang/gcc41/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc41/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc42/files/opt.patch-bc b/lang/gcc42/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc42/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc43/files/opt.patch-bc b/lang/gcc43/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc43/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc44/files/opt.patch-bc b/lang/gcc44/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc44/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc45/files/opt.patch-bc b/lang/gcc45/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc45/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc46/files/opt.patch-bc b/lang/gcc46/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc46/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc47/files/opt.patch-bc b/lang/gcc47/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc47/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 5f5893001f68..880195787087 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -14,7 +14,8 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	${PORTVERSION}
-MASTER_SITES=	${MASTER_SITE_GCC}
+MASTER_SITES=	${MASTER_SITE_GCC} \
+		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
@@ -29,6 +30,14 @@ DISTFILES=	\
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+.if defined (WITH_BOUNDSCHECKING)
+# Fetch another file, but don't extract it.  Also add another patchfile.
+BCPATCH=	bounds-checking-gcc-3.3-1.00.patch.bz2
+DISTFILES+=	${BCPATCH}:bc
+EXTRACT_ONLY=	${DISTFILES:S/${BCPATCH}:bc//}
+EXTRA_PATCHES=	${FILESDIR}/opt.patch-bc
+.endif
+
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
@@ -82,6 +91,11 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+.if !defined(WITH_BOUNDSCHECKING)
+	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
+	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
+	@${ECHO_MSG} "to use."
+.endif
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -111,6 +125,15 @@ do-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+.if defined(WITH_BOUNDSCHECKING)
+# Extract bounds-checking patch, removing the ada parts of the patch with sed.
+pre-patch:
+	cd ${_DISTDIR} ; \
+	${BZCAT} ${BCPATCH} | \
+		${SED} -e '/^--- .*ada/,/^diff/d' | \
+		${PATCH} -d ${PATCH_WRKSRC} -E -p1 --quiet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\(const char version_string.*\)";#\1 [FreeBSD]";#' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 417b04f2d4a6..90a6049d07ac 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -4,3 +4,4 @@ MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
 MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
 MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
 MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
+MD5 (bounds-checking-gcc-3.3-1.00.patch.bz2) = b3ac2dbb902f78ffd3db3e38cab9762b
diff --git a/lang/gcc48/files/opt.patch-bc b/lang/gcc48/files/opt.patch-bc
new file mode 100644
index 000000000000..024997f4c17c
--- /dev/null
+++ b/lang/gcc48/files/opt.patch-bc
@@ -0,0 +1,11 @@
+--- gcc/bounds/lib/Makefile.orig	Tue May 20 16:35:05 2003
++++ gcc/bounds/lib/Makefile	Tue May 20 16:35:19 2003
+@@ -14,7 +14,7 @@
+ SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
+ 
+ # Use this on System V.
+-CPPFLAGS = -DUSG
++CPPFLAGS = -DBSD4_2
+ 
+ .c.o:
+ 	$(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \