Merge targets pre-configure and pre-build, simplify them, and remove

patch-va.  All of these dealt with us patching generated files (which
we don't do any longer).

2 files changed, 2 insertions, 20 deletions

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 4a2c4533a8ca..1b84da7c3c47 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -119,15 +119,9 @@ post-patch:
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
-	@# Keep from running `autoconf' and `autoheader' since we modified
-	@# configure.in by patching it.
-	@${TOUCH} ${SRCDIR}/gcc/configure
-	@${TOUCH} ${SRCDIR}/gcc/cstamp-h.in
-	@${MKDIR} ${CONFIGURE_WRKSRC}
-	@${RM} -f ${SRCDIR}/gcc/*/*.info*
-
-pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
+	@${RM} -f ${SRCDIR}/gcc/*/*.info*
+	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
diff --git a/lang/gcc-ooo/files/patch-va b/lang/gcc-ooo/files/patch-va
deleted file mode 100644
index c8c656a80ba2..000000000000
--- a/lang/gcc-ooo/files/patch-va
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/Makefile.in.orig	Mon Aug 27 21:06:24 2001
-+++ gcc/Makefile.in	Fri Aug 31 08:45:23 2001
-@@ -895,3 +895,3 @@
- $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in
--	(cd $(srcdir) && autoconf)
-+	(cd $(srcdir) && echo "wants to run autoconf, blah")
- 
-@@ -917,3 +917,3 @@
- @MAINT@ $(srcdir)/cstamp-h.in: $(srcdir)/configure.in $(srcdir)/acconfig.h
--@MAINT@	(cd $(srcdir) && autoheader)
-+@MAINT@	(cd $(srcdir) && echo "wants to run autoheader, blah")
- @MAINT@	@rm -f $(srcdir)/cstamp-h.in