4 files changed, 23 insertions, 17 deletions

diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 8f09c8b68f6b..55e9ab93c824 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -12,7 +12,8 @@ MAINTAINER=	peter@FreeBSD.org
 PROG=	cvs
 MAN=	cvs.1 cvs.5
 
-SRCS=	add.c admin.c annotate.c buffer.c checkin.c checkout.c classify.c client.c \
+SRCS=	version.h add.c admin.c annotate.c buffer.c \
+	checkin.c checkout.c classify.c client.c \
 	commit.c create_adm.c cvsrc.c diff.c edit.c entries.c error.c \
 	expand_path.c fileattr.c filesubr.c find_names.c \
 	hardlink.c hash.c history.c \
@@ -24,7 +25,7 @@ SRCS=	add.c admin.c annotate.c buffer.c checkin.c checkout.c classify.c client.c
 	wrapper.c zlib.c
 
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../lib -DHAVE_CONFIG_H \
-	 -I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff
+	 -I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
 
 DPADD+=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
 LDADD+=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
@@ -40,11 +41,11 @@ DISTRIBUTION=	krb4
 CFLAGS+= -DENCRYPTION
 .endif
 
-CLEANFILES+=	version.c
+CLEANFILES+=	version.h
 VERSION!=	sed < ${CVSDIR}/configure \
 		-e '/^VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q
 
-version.c: version.c.in
+version.h: version.h.in
 	sed -e "s,@VERSION@,${VERSION}-FreeBSD,g" ${.ALLSRC} > ${.TARGET}
 
 #
diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
index 0907ae459f8d..761b10a5245d 100644
--- a/gnu/usr.bin/cvs/doc/Makefile
+++ b/gnu/usr.bin/cvs/doc/Makefile
@@ -11,15 +11,4 @@ INFOSECTION= "Programming & development tools."
 INFOENTRY_cvs= "* CVS: (cvs).			CVS Reference Manual."
 INFOENTRY_cvsclient= "* CVS-CLIENT: (cvsclient).	CVS client/server Reference Manual."
 
-
-cvs.info cvsclient.info:	CVSvn.texi
-
-CLEANFILES+= CVSvn.texi
-
-CVSvn.texi: ${CVSDIR}/configure
-	echo "@set CVSVN `sed < ${CVSDIR}/configure \
-		    -e '/^VERSION=/!d' \
-		    -e 's/.*=\(.*\)/\1/' \
-		    -e q`" > $@
-
 .include <bsd.info.mk>
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index 33fac5a12c44..c57e69529d37 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/gnu/usr.bin/cvs/lib/Makefile
@@ -11,7 +11,8 @@ MAINTAINER=	peter@FreeBSD.org
 LIB=		cvs
 INTERNALLIB=	YES
 
-CFLAGS+= -I${.CURDIR} -I${CVSDIR}/src -DHAVE_CONFIG_H
+CFLAGS+= -I${.CURDIR} -I${CVSDIR}/src -I${CVSDIR}/lib
+CFLAGS+= -DHAVE_CONFIG_H
 YFLAGS=
 
 SRCS=	argmatch.c getdate.y getline.c \
diff --git a/gnu/usr.bin/cvs/lib/config.h b/gnu/usr.bin/cvs/lib/config.h
index 4bf02bf2cf7e..4169f8208199 100644
--- a/gnu/usr.bin/cvs/lib/config.h
+++ b/gnu/usr.bin/cvs/lib/config.h
@@ -24,6 +24,9 @@
 /* Define if you support file names longer than 14 characters.  */
 #define HAVE_LONG_FILE_NAMES 1
 
+/* Define if you have a working `mmap' system call.  */
+#define HAVE_MMAP 1
+
 /* Define if your struct stat has st_blksize.  */
 #define HAVE_ST_BLKSIZE 1
 
@@ -45,6 +48,9 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef mode_t */
 
+/* Define if your C compiler doesn't accept -c and -o together.  */
+/* #undef NO_MINUS_C_MINUS_O */
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef pid_t */
 
@@ -277,6 +283,9 @@
 /* Define if you have the <ndir.h> header file.  */
 /* #undef HAVE_NDIR_H */
 
+/* Define if you have the <stdlib.h> header file.  */
+#define HAVE_STDLIB_H 1
+
 /* Define if you have the <string.h> header file.  */
 #define HAVE_STRING_H 1
 
@@ -301,12 +310,18 @@
 /* Define if you have the <sys/select.h> header file.  */
 #define HAVE_SYS_SELECT_H 1
 
+/* Define if you have the <sys/stat.h> header file.  */
+#define HAVE_SYS_STAT_H 1
+
 /* Define if you have the <sys/time.h> header file.  */
 #define HAVE_SYS_TIME_H 1
 
 /* Define if you have the <sys/timeb.h> header file.  */
 #define HAVE_SYS_TIMEB_H 1
 
+/* Define if you have the <sys/types.h> header file.  */
+#define HAVE_SYS_TYPES_H 1
+
 /* Define if you have the <syslog.h> header file.  */
 #define HAVE_SYSLOG_H 1
 
@@ -320,7 +335,7 @@
 #define PACKAGE "cvs"
 
 /* Version number of package */
-#define VERSION "1.11.1p1"
+#define VERSION "1.11.2"
 
 /* Path to the pr utility */
 #define PR_PROGRAM "/usr/bin/pr"