From 6a1c1e3fe555026ced5a58c2ff241ed116a7bf68 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sun, 19 Sep 2021 18:37:06 +0300 Subject: [PATCH] moreutils: update to 0.66. By ericonr: - move INSTALL.msg to README.voidlinux, fix actual command names Closes: #33027 [via git-merge-pr] --- srcpkgs/moreutils/INSTALL.msg | 8 -------- srcpkgs/moreutils/files/README.voidlinux | 5 +++++ srcpkgs/moreutils/template | 9 +++++---- 3 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 srcpkgs/moreutils/INSTALL.msg create mode 100644 srcpkgs/moreutils/files/README.voidlinux diff --git a/srcpkgs/moreutils/INSTALL.msg b/srcpkgs/moreutils/INSTALL.msg deleted file mode 100644 index f81cbb4191f..00000000000 --- a/srcpkgs/moreutils/INSTALL.msg +++ /dev/null @@ -1,8 +0,0 @@ -Since some tools of moreutils conflict with other package's names, the -corresponding files and their manpages are renamed: - -GNU parallel: - parallel -> moreutils-parallel - -Task Spooler: (https://github.com/voidlinux/void-packages/issues/4282) - ts -> moreutils-ts diff --git a/srcpkgs/moreutils/files/README.voidlinux b/srcpkgs/moreutils/files/README.voidlinux new file mode 100644 index 00000000000..9710c4e2511 --- /dev/null +++ b/srcpkgs/moreutils/files/README.voidlinux @@ -0,0 +1,5 @@ +Since some moreutils tools conflict with other packages, the +following executables and their manpages have been renamed: + +- parallel -> moreutils_parallel (GNU parallel) +- ts -> moreutils_ts (Task Spooler) diff --git a/srcpkgs/moreutils/template b/srcpkgs/moreutils/template index 909d90dd1ea..e6712725a17 100644 --- a/srcpkgs/moreutils/template +++ b/srcpkgs/moreutils/template @@ -1,6 +1,6 @@ # Template file for 'moreutils' pkgname=moreutils -version=0.65 +version=0.66 revision=1 build_style=gnu-makefile make_build_args="DOCBOOK2XMAN=docbook2man" @@ -11,16 +11,17 @@ maintainer="lemmi " license="GPL-2.0-only, BSD-2-Clause" homepage="https://joeyh.name/code/moreutils/" distfiles="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/moreutils-${version}.tar.gz" -checksum=60c9f6b55204e64cfcd12fd66e75cf7a061b6761f3d5b7797f2452cb17598881 +checksum=dc079e018aaff22446cf36eccb298627bb0222ec6dc23a173860c9e1f16e214d post_install() { - # rename parallel to not conflict with gnu-parllel - # rename ts: https://github.com/voidlinux/void-packages/issues/4282 + # rename parallel to not conflict with gnu-parallel + # rename ts to not conflict with ts for conflict in parallel ts; do mv ${DESTDIR}/usr/bin/{,moreutils_}${conflict} mv ${DESTDIR}/usr/share/man/man1/{,moreutils_}${conflict}.1 done + vdoc ${FILESDIR}/README.voidlinux sed -n '/Copyright/,/DAMAGE/p' is_utf8/is_utf8.c > LICENSE-is-utf8 vlicense LICENSE-is-utf8