Fix the embedded version string in cvs and cvsbug. This breaks scripts

that parse it.

PR: 72139
Submitted by:  Eugene M. Kim <gene@nttmcl.com>

gnu/usr.bin/cvs/cvsbug/Makefile

@@ -15,7 +15,7 @@ CLEANFILES+=    cvsbug
 
 cvsbug: cvsbug.in
 	version=`sed < ${CVSDIR}/configure \
-	    -e '/^[ 	]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \
+	    -e '/^[     ]*VERSION=/!d' -e 's/.*=["'\'']\{0,1\}\([^"'\'']*\)["'\'']\{0,1\}/\1/' -e q`; \
 	sed -e "s,@VERSION@,$${version}-FreeBSD,g" ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>

gnu/usr.bin/cvs/lib/Makefile

@@ -29,7 +29,7 @@ SRCS=	config.h argmatch.c getdate.y getline.c \
 
 config.h: config.h.proto
 	version=`sed < ${CVSDIR}/configure \
-	    -e '/^[ 	]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \
+	    -e '/^[     ]*VERSION=/!d' -e 's/.*=["'\'']\{0,1\}\([^"'\'']*\)["'\'']\{0,1\}/\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" \