From 0fc9e29c92817a085649b3b9183f8f3af998cfc5 Mon Sep 17 00:00:00 2001 From: Andrea D'Amore Date: Thu, 14 Oct 2021 15:52:33 +0200 Subject: [PATCH] netbsd-wtf wmutils-core: use alternatives for bin/wtf Avoid clash between two packages and let the user choose wtf they want. --- srcpkgs/netbsd-wtf/template | 3 ++- srcpkgs/wmutils-core/template | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template index be1b0c28c5c1..c8bf1b71b75c 100644 --- a/srcpkgs/netbsd-wtf/template +++ b/srcpkgs/netbsd-wtf/template @@ -1,7 +1,7 @@ # Template file for 'netbsd-wtf' pkgname=netbsd-wtf version=20180621 -revision=3 +revision=4 _commit=b1e5be48e340146f63b174cc14fef892a783168b build_style=gnu-makefile short_desc="NetBSD's wtf(6) utility" @@ -10,6 +10,7 @@ license="Public Domain" homepage="https://www.netbsd.org" distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz" checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7 +alternatives="wtf:/usr/bin/wtf:/usr/bin/netbsd-wtf" wrksrc="$pkgname-$_commit" make_build_args="PREFIX=/usr" diff --git a/srcpkgs/wmutils-core/template b/srcpkgs/wmutils-core/template index c383df9eb492..60f25f88803f 100644 --- a/srcpkgs/wmutils-core/template +++ b/srcpkgs/wmutils-core/template @@ -1,7 +1,7 @@ # Template file for 'wmutils-core' pkgname=wmutils-core version=1.5 -revision=1 +revision=2 wrksrc="${pkgname##*-}-${version}" build_style=gnu-makefile make_use_env=yes @@ -12,6 +12,7 @@ license="ISC" homepage="https://github.com/wmutils/core" distfiles="https://github.com/${pkgname%-*}/core/archive/v${version}.tar.gz" checksum=72af22ea52bc343bf90a6603ae3e169ed3c15f64635fa42507cc662ab04a6372 +alternatives="wtf:/usr/bin/wtf:/usr/bin/wmutils-wtf" conflicts="lsw" post_extract() { @@ -23,4 +24,6 @@ post_extract() { post_install() { vlicense LICENSE + mv ${DESTDIR}/usr/bin/{wtf,wmutils-wtf} + mv ${DESTDIR}/usr/share/man/man1/{wtf,wmutils-wtf}.1 }