3 files changed, 25 insertions, 26 deletions

diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 80b1258221e0..012f21251c18 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -82,6 +82,7 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
+	@${LN} -sf ${FILESDIR}/freebsd7.h ${SRCDIR}/gcc/config
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@${REINPLACE_CMD} -e 's/elf_x86_64/elf_x86_64_fbsd/g' \
diff --git a/lang/gcc32/files/freebsd7.h b/lang/gcc32/files/freebsd7.h
new file mode 100644
index 000000000000..0d3ec22e2626
--- /dev/null
+++ b/lang/gcc32/files/freebsd7.h
@@ -0,0 +1,24 @@
+/* FreeBSD version number setting for FreeBSD 6.x systems.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   Contributed by David E. O'Brien <obrien@FreeBSD.org> and BSDi.
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#define FBSD_MAJOR 7
+
+/* $FreeBSD$ */
diff --git a/lang/gcc32/files/patch-gcc+config+freebsd7.h b/lang/gcc32/files/patch-gcc+config+freebsd7.h
deleted file mode 100644
index ed912974ba0e..000000000000
--- a/lang/gcc32/files/patch-gcc+config+freebsd7.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- /dev/null	Sat Aug 13 10:11:00 2005
-+++ gcc/config/freebsd7.h	Sat Aug 13 10:11:42 2005
-@@ -0,0 +1,23 @@
-+/* FreeBSD version number setting for FreeBSD 6.x systems.
-+   Copyright (C) 2001 Free Software Foundation, Inc.
-+   Contributed by David E. O'Brien <obrien@FreeBSD.org> and BSDi.
-+
-+This file is part of GNU CC.
-+
-+GNU CC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define FBSD_MAJOR 7
-+