Unbreak the upgrade path from 4.9 after removal of GNU getopt and

<gnuregex.h>.

lib/libc/stdlib/getopt_long.c

@@ -42,8 +42,6 @@
 __RCSID("$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $");
 #endif /* LIBC_SCCS and not lint */
 
-#include "namespace.h"
-
 #include <assert.h>
 #include <err.h>
 #include <errno.h>

tools/build/Makefile

@@ -51,6 +51,18 @@ SRCS+=		progname.c
 SRCS+=		strtofflags.c
 .endif
 
+# Lot of tools need <getopt.h> and getopt_long(3).
+.if !exists(/usr/include/getopt.h)
+INCS+=		getopt.h
+.PATH: ${.CURDIR}/../../lib/libc/stdlib
+SRCS+=		getopt_long.c
+.endif
+
+# Some tools depend on a new <regex.h> not requiring <sys/types.h>.
+.if ${BOOTSTRAPPING} < 500042
+INCS+=		regex.h
+.endif
+
 .if empty(SRCS)
 SRCS=		dummy.c
 .endif

tools/build/regex.h

@@ -0,0 +1,4 @@
+/* $FreeBSD$ */
+
+#include <sys/types.h>
+#include "/usr/include/regex.h"