* fix fixincludes (again)

* disable acats tests for now; the attempts to make sure that the ada tools in
  ${WRKBUILD}/gcc are used are quirky, wrong and don't work, causing the test
  suite to fail early.

This allows the actual regression tests to run.

ok naddy@ tobiasu@

lang/gcc/4.8/patches/patch-fixincludes_fixincl_x

@@ -0,0 +1,17 @@
+$OpenBSD: patch-fixincludes_fixincl_x,v 1.1 2013/05/03 07:44:55 pascal Exp $
+--- fixincludes/fixincl.x.orig	Thu May  2 13:32:57 2013
++++ fixincludes/fixincl.x	Thu May  2 13:33:23 2013
+@@ -6154,11 +6154,11 @@ static const char* apzSolaris_Complex_CxxPatch[] = { s
+     "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
+ #ifdef\t__cplusplus\\\n\
+ extern \"C\" {\\\n\
+-#endif",
++#endif\\\n",
+     "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\
+ #ifdef\t__cplusplus\\\n\
+ }\\\n\
+-#endif",
++#endif\\\n",
+     (char*)NULL };
+ 
+ /* * * * * * * * * * * * * * * * * * * * * * * * * *

lang/gcc/4.8/patches/patch-fixincludes_inclhack_def

@@ -0,0 +1,15 @@
+$OpenBSD: patch-fixincludes_inclhack_def,v 1.1 2013/05/03 07:44:55 pascal Exp $
+--- fixincludes/inclhack.def.orig	Wed May  1 17:00:31 2013
++++ fixincludes/inclhack.def	Wed May  1 17:00:58 2013
+@@ -3213,9 +3213,9 @@ fix = {
+     mach      = "*-*-solaris2.*";
+     files     = complex.h;
+     sed	      = "/#if[ \t]*!defined(__cplusplus)/c\\\n"
+-    		"#ifdef\t__cplusplus\\\nextern \"C\" {\\\n#endif";
++    		"#ifdef\t__cplusplus\\\nextern \"C\" {\\\n#endif\\\n";
+     sed	      = "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n"
+-		"#ifdef\t__cplusplus\\\n}\\\n#endif";
++		"#ifdef\t__cplusplus\\\n}\\\n#endif\\\n";
+     test_text = "#if !defined(__cplusplus)\n"
+ 		"#endif	/* !defined(__cplusplus) */";
+ };

lang/gcc/4.8/patches/patch-gcc_ada_gcc-interface_Make-lang_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-gcc_ada_gcc-interface_Make-lang_in,v 1.1 2013/05/03 07:44:55 pascal Exp $
+--- gcc/ada/gcc-interface/Make-lang.in.orig	Thu May  2 14:42:29 2013
++++ gcc/ada/gcc-interface/Make-lang.in	Thu May  2 14:42:40 2013
+@@ -845,8 +845,8 @@ ada.stagefeedback: stagefeedback-start
+ 
+ lang_checks += check-gnat
+ 
+-check-ada: check-acats check-gnat
+-check-ada-subtargets: check-acats-subtargets check-gnat-subtargets
++check-ada: check-gnat
++check-ada-subtargets: check-gnat-subtargets
+ 
+ ACATSDIR = $(TESTSUITEDIR)/ada/acats
+