summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2004-09-28 21:02:43 +0000
committerpeter <peter@FreeBSD.org>2004-09-28 21:02:43 +0000
commitdbad3ede0614d1baae19474c8ba0080c012fb7b4 (patch)
treeaa575053cb9f9cf96f9463d9e4c82d7ce7c8a52f /gnu
parentfd3b3185c9a72cba0bd7bc840f9bf3be86ee9b91 (diff)
downloadFreeBSD-src-dbad3ede0614d1baae19474c8ba0080c012fb7b4.zip
FreeBSD-src-dbad3ede0614d1baae19474c8ba0080c012fb7b4.tar.gz
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>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/cvs/cvsbug/Makefile2
-rw-r--r--gnu/usr.bin/cvs/lib/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index a713378..608d481 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/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>
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index 46e10b9..d09550d 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/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" \
OpenPOWER on IntegriCloud