git: 0619a441a331 - main - sysutils/debootstrap: make it work on arm64 without --arch

[Edward Tomasz Napierala]

The branch main has been updated by trasz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0619a441a3314f1513fd8e334d26d9a6a3d523b3

commit 0619a441a3314f1513fd8e334d26d9a6a3d523b3
Author:     Edward Tomasz Napierala <trasz at FreeBSD.org>
AuthorDate: 2021-05-06 08:31:00 +0000
Commit:     Edward Tomasz Napierala <trasz at FreeBSD.org>
CommitDate: 2021-05-06 08:31:10 +0000

    sysutils/debootstrap: make it work on arm64 without --arch
    
    Reviewed By:    emaste
    Sponsored By:   EPSRC
    Differential Revision:  https://reviews.freebsd.org/D30127
---
 sysutils/debootstrap/Makefile                | 2 +-
 sysutils/debootstrap/files/patch-debootstrap | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile
index d8934457e10e..f0b4d63438d4 100644
--- a/sysutils/debootstrap/Makefile
+++ b/sysutils/debootstrap/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	debootstrap
 PORTVERSION=	1.0.123
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/debootstrap/files/patch-debootstrap b/sysutils/debootstrap/files/patch-debootstrap
index dc2822ec82a9..b8b633661c06 100644
--- a/sysutils/debootstrap/files/patch-debootstrap
+++ b/sysutils/debootstrap/files/patch-debootstrap
@@ -30,7 +30,7 @@
  	HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch")
  fi
  HOST_OS="$HOST_ARCH"
-@@ -542,6 +536,11 @@ if [ -z "$HOST_OS" ]; then
+@@ -542,6 +536,14 @@ if [ -z "$HOST_OS" ]; then
  			HOST_OS=freebsd
  		;;
  	esac
@@ -38,6 +38,9 @@
 +
 +if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then
 +	HOST_ARCH=`/sbin/sysctl -n hw.machine_arch`
++	if [ "$HOST_ARCH" = "aarch64" ]; then
++		HOST_ARCH=arm64
++	fi
 +	EXTRACTOR_OVERRIDE=ar
  fi