5 files changed, 23 insertions, 15 deletions

diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index c75bf82b56b8..6fa325cf8786 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -21,14 +21,17 @@ SRCS=	add.c admin.c annotate.c buffer.c \
 	modules.c myndbm.c no_diff.c parseinfo.c patch.c prepend_args.c \
 	rcs.c rcscmds.c \
 	recurse.c release.c remove.c repos.c root.c run.c scramble.c \
-	server.c status.c subr.c tag.c update.c vers_ts.c version.c watch.c \
+	server.c stack.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${DESTDIR}/usr/include/gnu \
+	 -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
 
-DPADD+=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-LDADD+=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
+LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
 
 .if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
 CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index b98451d3b0cc..a7133788e857 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/gnu/usr.bin/cvs/cvsbug/Makefile
@@ -12,10 +12,10 @@ SCRIPTS=	cvsbug
 MAN=		cvsbug.8
 
 CLEANFILES+=    cvsbug
-VERSION!=       sed < ${CVSDIR}/configure \
-		-e '/^[ 	]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q
 
 cvsbug: cvsbug.in
-	sed -e "s,@VERSION@,${VERSION}-FreeBSD,g" ${.ALLSRC} > ${.TARGET}
+	version=`sed < ${CVSDIR}/configure \
+	    -e '/^[ 	]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \
+	sed -e "s,@VERSION@,$${version}-FreeBSD,g" ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index 2d0f439eb77a..46e10b9ff825 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/gnu/usr.bin/cvs/lib/Makefile
@@ -11,14 +11,13 @@ 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${DESTDIR}/usr/include/gnu \
+	 -I${CVSDIR}/lib
 CFLAGS+= -DHAVE_CONFIG_H
 YFLAGS=
 CLEANFILES+=	config.h
 
-VERSION!=       sed < ${CVSDIR}/configure \
-		-e '/^[ 	]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q
-
 CVS_UMASK_DFLT?=	002
 CVS_ADMIN_GROUP?=	cvsadmin
 CVS_TMPDIR_DFLT?=	/tmp
@@ -29,7 +28,9 @@ SRCS=	config.h argmatch.c getdate.y getline.c \
 	xgetwd.c yesno.c
 
 config.h: config.h.proto
-	sed -e "s,@VERSION@,${VERSION}-FreeBSD,g" \
+	version=`sed < ${CVSDIR}/configure \
+	    -e '/^[ 	]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \
+	sed -e "s,@VERSION@,$${version}-FreeBSD,g" \
 	    -e "s,@UMASK_DFLT@,${CVS_UMASK_DFLT},g" \
 	    -e "s,@TMPDIR_DFLT@,${CVS_TMPDIR_DFLT},g" \
 	    -e "s,@CVS_ADMIN_GROUP@,${CVS_ADMIN_GROUP},g" \
diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto
index 3efc40f77011..60a96b720198 100644
--- a/gnu/usr.bin/cvs/lib/config.h.proto
+++ b/gnu/usr.bin/cvs/lib/config.h.proto
@@ -38,7 +38,9 @@
    absolute path to an executable, use the shell to find where the editor
    actually is. This allows sites with /usr/bin/vi or /usr/ucb/vi to work
    equally well (assuming that their PATH is reasonable). */
+#ifndef EDITOR_DFLT
 #define EDITOR_DFLT "vi"
+#endif
 
 /* Define to enable encryption support. */
 /* #undef ENCRYPTION */
@@ -248,7 +250,7 @@
 #define HAVE_SIGVEC 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
+/* #undef HAVE_STDINT_H */
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile
index d68a494a3a98..edf4ebc95f3d 100644
--- a/gnu/usr.bin/cvs/libdiff/Makefile
+++ b/gnu/usr.bin/cvs/libdiff/Makefile
@@ -9,7 +9,9 @@ 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${DESTDIR}/usr/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