Index: head/sysutils/debootstrap/Makefile
===================================================================
--- head/sysutils/debootstrap/Makefile	(revision 552339)
+++ head/sysutils/debootstrap/Makefile	(revision 552340)
@@ -1,43 +1,41 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	debootstrap
 PORTVERSION=	1.0.123
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN/pool/main/d/${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	trasz@FreeBSD.org
-COMMENT=	Install Debian base system into a directory
+COMMENT=	Install Debian or Ubuntu base system into a directory
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/debian/copyright
 
 RUN_DEPENDS=	wget:ftp/wget \
 		bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 USES=		gmake perl5
 USE_PERL5=	run
-
-ONLY_FOR_ARCHS=	i386 amd64
-ONLY_FOR_ARCHS_REASON=	Debian GNU/kFreeBSD available only for i386 and amd64
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/debootstrap
 	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},g' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/debootstrap
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/debootstrap
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/debootstrap.8 \
 		${STAGEDIR}${MAN8PREFIX}/man/man8/debootstrap.8
 
 .include <bsd.port.mk>
Index: head/sysutils/debootstrap/files/patch-debootstrap
===================================================================
--- head/sysutils/debootstrap/files/patch-debootstrap	(revision 552339)
+++ head/sysutils/debootstrap/files/patch-debootstrap	(revision 552340)
@@ -1,44 +1,44 @@
 --- debootstrap.orig	2019-07-06 11:22:30 UTC
 +++ debootstrap
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!%%LOCALBASE%%/bin/bash
  set -e
  
  VERSION='@VERSION@'
 @@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
  	if [ -x /debootstrap/debootstrap ]; then
  		DEBOOTSTRAP_DIR=/debootstrap
  	else
 -		DEBOOTSTRAP_DIR=/usr/share/debootstrap
 +		DEBOOTSTRAP_DIR=%%DATADIR%%
  	fi
  fi
  
 @@ -498,13 +498,7 @@ fi
  
  ###########################################################################
  
 -if in_path dpkg && \
 -     dpkg --print-architecture >/dev/null 2>&1; then
 -	HOST_ARCH=$(/usr/bin/dpkg --print-architecture)
 -elif in_path udpkg && \
 -     udpkg --print-architecture >/dev/null 2>&1; then
 -	HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
 -elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then
 +if [ -e "$DEBOOTSTRAP_DIR/arch" ]; then
  	HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch")
  fi
  HOST_OS="$HOST_ARCH"
 @@ -524,6 +518,11 @@ if [ -z "$HOST_OS" ]; then
  			HOST_OS=freebsd
  		;;
  	esac
 +fi
 +
 +if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then
-+	HOST_ARCH=kfreebsd-`/sbin/sysctl -n hw.machine_arch`
++	HOST_ARCH=`/sbin/sysctl -n hw.machine_arch`
 +	EXTRACTOR_OVERRIDE=ar
  fi
  
  if [ -z "$ARCH" ]; then
Index: head/sysutils/debootstrap/pkg-descr
===================================================================
--- head/sysutils/debootstrap/pkg-descr	(revision 552339)
+++ head/sysutils/debootstrap/pkg-descr	(revision 552340)
@@ -1,10 +1,9 @@
 debootstrap is a tool which will install a Debian base system into
-a subdirectory of another, already installed system. It doesn't require an
-installation CD, just access to a Debian repository.
+a subdirectory of another, already installed system. It doesn't require
+an installation CD, just access to a Debian repository.
 
-In FreeBSD, you can use debootstrap to install Debian into
-a subdirectory of your existing FreeBSD installation (i386 or amd64)
-and then run Debian GNU/kFreeBSD (i386 or amd64) or Debian Linux (i386)
-in a jail or chroot.
+In FreeBSD, you can use debootstrap to install Debian into a subdirectory
+of your existing FreeBSD installation and then run Debian Linux in a jail
+or chroot.
 
 WWW: https://wiki.debian.org/Debootstrap
Index: head/sysutils/debootstrap/pkg-message
===================================================================
--- head/sysutils/debootstrap/pkg-message	(revision 552339)
+++ head/sysutils/debootstrap/pkg-message	(revision 552340)
@@ -1,10 +1,10 @@
 [
 { type: install
   message: <<EOM
-To successfully create an installation of Debian GNU/kFreeBSD
+To successfully create an installation of Debian or Ubuntu
 debootstrap requires the following kernel modules loaded:
 
 fdescfs linprocfs linsysfs tmpfs
 EOM
 }
 ]