* [PR PATCH] netbsd-wtf wmutils-core: use alternatives for bin/wtf
@ 2021-10-14 14:00 anddam
2021-10-14 14:06 ` Duncaen
2021-10-14 17:33 ` [PR PATCH] [Closed]: " anddam
0 siblings, 2 replies; 3+ messages in thread
From: anddam @ 2021-10-14 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1723 bytes --]
There is a new pull request by anddam against master on the void-packages repository
https://github.com/anddam/void-packages feature-give-the-real-wtf-its-dignity-back
https://github.com/void-linux/void-packages/pull/33538
netbsd-wtf wmutils-core: use alternatives for bin/wtf
Avoid clash between two packages and let the user choose wtf they want.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feature-give-the-real-wtf-its-dignity-back-33538.patch --]
[-- Type: text/x-diff, Size: 2043 bytes --]
From 0fc9e29c92817a085649b3b9183f8f3af998cfc5 Mon Sep 17 00:00:00 2001
From: Andrea D'Amore <a@d-amo.re>
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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: netbsd-wtf wmutils-core: use alternatives for bin/wtf
2021-10-14 14:00 [PR PATCH] netbsd-wtf wmutils-core: use alternatives for bin/wtf anddam
@ 2021-10-14 14:06 ` Duncaen
2021-10-14 17:33 ` [PR PATCH] [Closed]: " anddam
1 sibling, 0 replies; 3+ messages in thread
From: Duncaen @ 2021-10-14 14:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/33538#issuecomment-943392144
Comment:
Alternatives are generally for programs that provide the same functionality, not to resolve conflicts.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Closed]: netbsd-wtf wmutils-core: use alternatives for bin/wtf
2021-10-14 14:00 [PR PATCH] netbsd-wtf wmutils-core: use alternatives for bin/wtf anddam
2021-10-14 14:06 ` Duncaen
@ 2021-10-14 17:33 ` anddam
1 sibling, 0 replies; 3+ messages in thread
From: anddam @ 2021-10-14 17:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1539 bytes --]
There's a closed pull request on the void-packages repository
netbsd-wtf wmutils-core: use alternatives for bin/wtf
https://github.com/void-linux/void-packages/pull/33538
Description:
Avoid clash between two packages and let the user choose wtf they want.
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-14 17:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-14 14:00 [PR PATCH] netbsd-wtf wmutils-core: use alternatives for bin/wtf anddam
2021-10-14 14:06 ` Duncaen
2021-10-14 17:33 ` [PR PATCH] [Closed]: " anddam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).