Switch back to regex.h and fix error when mismatched regex.h used with

system libgnuregex

gnu/usr.bin/cvs/cvs/Makefile

@@ -24,8 +24,10 @@ SRCS=	add.c admin.c annotate.c buffer.c \
 	server.c status.c subr.c tag.c update.c vers_ts.c version.c watch.c \
 	wrapper.c zlib.c
 
-CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H \
-	 -I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
+# gnu must be before lib to pick correct regex.h
+CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \
+	 -I${.CURDIR}/../../../../../include/gnu \
+	 -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
 
 DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
 LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz

gnu/usr.bin/cvs/lib/Makefile

@@ -11,7 +11,10 @@ MAINTAINER=	peter@FreeBSD.org
 LIB=		cvs
 INTERNALLIB=	YES
 
-CFLAGS+= -I. -I${CVSDIR}/src -I${CVSDIR}/lib
+# gnu must be before lib to pick correct regex.h
+CFLAGS+= -I. -I${CVSDIR}/src \
+	 -I${.CURDIR}/../../../../../include/gnu \
+	 -I${CVSDIR}/lib
 CFLAGS+= -DHAVE_CONFIG_H
 YFLAGS=
 CLEANFILES+=	config.h

gnu/usr.bin/cvs/libdiff/Makefile

@@ -9,7 +9,10 @@ MAINTAINER=	peter@FreeBSD.org
 LIB=		diff
 INTERNALLIB=	YES
 
-CFLAGS+= -I../lib -I${CVSDIR}/lib -DHAVE_CONFIG_H
+# gnu must be before lib to pick correct regex.h
+CFLAGS+= -I../lib \
+	 -I${.CURDIR}/../../../../../include/gnu \
+	 -I${CVSDIR}/lib -DHAVE_CONFIG_H
 
 SRCS =	diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c context.c ed.c \
         normal.c ifdef.c util.c dir.c version.c diff.h side.c