From 7b663b891b28d1e244039385689310512709925a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 30 Jan 2020 13:24:55 +0100
Subject: [PATCH] tar, bsdtar: use alternatives for usr/bin/tar.

GNU tar is now called gtar.

This will avoid the need to modify more templates
due to GNU vs BSD tar.
---
 srcpkgs/libarchive/template | 3 ++-
 srcpkgs/tar/template        | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 293648ca1f6..87179ac18a2 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.4.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -28,6 +28,7 @@ post_install() {
 }
 
 bsdtar_package() {
+	alternatives="tar:tar:/usr/bin/bsdtar"
 	replaces="bsdcpio>=0"
 	short_desc="BSD utilities using libarchive"
 	pkg_install() {
diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template
index 2ec183c02f1..d730ea8e101 100644
--- a/srcpkgs/tar/template
+++ b/srcpkgs/tar/template
@@ -1,9 +1,9 @@
 # Template file for 'tar'
 pkgname=tar
 version=1.32
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="gl_cv_struct_dirent_d_ino=yes"
+configure_args="--program-prefix=g gl_cv_struct_dirent_d_ino=yes"
 makedepends="acl-devel"
 short_desc="GNU tape archiver with remote magnetic tape support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,6 +12,8 @@ homepage="https://www.gnu.org/software/tar/"
 distfiles="${GNU_SITE}/tar/${pkgname}-${version}.tar.xz"
 checksum=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8
 
+alternatives="tar:tar:/usr/bin/gtar"
+
 pre_configure() {
 	# chroot-style=ethereal
 	export FORCE_UNSAFE_CONFIGURE=1