From ab9c9e01f3cd485c142930d1cb9bdb08cf4a1234 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 31 Mar 2022 20:36:55 -0400
Subject: [PATCH] hex: change binary name to avoid conflict

---
 srcpkgs/helix/template | 3 +--
 srcpkgs/hex/template   | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 961a894092b7..6f9d581de694 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -1,7 +1,7 @@
 # Template file for 'helix'
 pkgname=helix
 version=22.03
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path helix-term"
 hostmakedepends="git"
@@ -12,7 +12,6 @@ homepage="https://helix-editor.com/"
 changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
 distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
 checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
-conflicts="hex>=0"
 
 # skip problematic doctests on i686
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/hex/template b/srcpkgs/hex/template
index 6295e03ddffe..07bf3c269d26 100644
--- a/srcpkgs/hex/template
+++ b/srcpkgs/hex/template
@@ -1,7 +1,7 @@
 # Template file for 'hex'
 pkgname=hex
 version=0.4.2
-revision=1
+revision=2
 build_style=cargo
 short_desc="Futuristic take on hexdump"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -11,5 +11,7 @@ distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=a7cc1ece337fc19e77fbbbca145001bc5d447bde4118eb6de2c99407eb1a3b74
 
 post_install() {
+	# avoid conflict with helix
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/bin/hex
 	vlicense LICENSE
 }