The branch stable/12 has been updated by mm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ffd9daf078c67fd1b5805447e1ffa2031544d193
commit ffd9daf078c67fd1b5805447e1ffa2031544d193
Author: Xin LI <delp...@freebsd.org>
AuthorDate: 2020-12-29 21:38:47 +0000
Commit: Martin Matuska <m...@freebsd.org>
CommitDate: 2021-01-11 01:16:37 +0000
bsdcat,cpio,tar: derive version string from archive.h
(cherry picked from commit 2ff66a915526b6509ca57f2046bc7b20b0de8a61)
---
usr.bin/bsdcat/Makefile | 3 ++-
usr.bin/cpio/Makefile | 3 ++-
usr.bin/tar/Makefile | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile
index b9ce457a57f6..2e625cf553e5 100644
--- a/usr.bin/bsdcat/Makefile
+++ b/usr.bin/bsdcat/Makefile
@@ -6,7 +6,8 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive
PROG= bsdcat
-BSDCAT_VERSION_STRING= 3.5.0
+BSDCAT_VERSION_STRING!= sed -n
'/define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' \
+ ${_LIBARCHIVEDIR}/libarchive/archive.h
.PATH: ${_LIBARCHIVEDIR}/cat
SRCS= bsdcat.c cmdline.c
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index d3dcb040a902..078963798afa 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -6,7 +6,8 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive
PROG= bsdcpio
-BSDCPIO_VERSION_STRING= 3.5.0
+BSDCPIO_VERSION_STRING!= sed -n
'/define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' \
+ ${_LIBARCHIVEDIR}/libarchive/archive.h
.PATH: ${_LIBARCHIVEDIR}/cpio
SRCS= cpio.c cmdline.c
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 09ad12ee3fa1..8b9b31169e72 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -4,7 +4,8 @@
_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
PROG= bsdtar
-BSDTAR_VERSION_STRING= 3.5.0
+BSDTAR_VERSION_STRING!= sed -n
'/define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' \
+ ${_LIBARCHIVEDIR}/libarchive/archive.h
.PATH: ${_LIBARCHIVEDIR}/tar
SRCS= bsdtar.c \
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
