From owner-svn-ports-all@freebsd.org Wed Oct 14 14:55:11 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DBCD743B9A3; Wed, 14 Oct 2020 14:55:11 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CBFnq5QT6z45qy; Wed, 14 Oct 2020 14:55:11 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 997DD1014E; Wed, 14 Oct 2020 14:55:11 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09EEtBCq016112; Wed, 14 Oct 2020 14:55:11 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09EEtAKv016109; Wed, 14 Oct 2020 14:55:10 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202010141455.09EEtAKv016109@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 14 Oct 2020 14:55:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552340 - in head/sysutils/debootstrap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head/sysutils/debootstrap: . files X-SVN-Commit-Revision: 552340 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2020 14:55:11 -0000 Author: trasz Date: Wed Oct 14 14:55:10 2020 New Revision: 552340 URL: https://svnweb.freebsd.org/changeset/ports/552340 Log: Default to Linux instead of kFreeBSD, since that's the more common choice, and drop the no longer relevant ONLY_FOR_ARCHS. Sponsored by: The FreeBSD Foundation Modified: head/sysutils/debootstrap/Makefile head/sysutils/debootstrap/files/patch-debootstrap head/sysutils/debootstrap/pkg-descr head/sysutils/debootstrap/pkg-message Modified: head/sysutils/debootstrap/Makefile ============================================================================== --- head/sysutils/debootstrap/Makefile Wed Oct 14 14:42:54 2020 (r552339) +++ head/sysutils/debootstrap/Makefile Wed Oct 14 14:55:10 2020 (r552340) @@ -3,12 +3,13 @@ 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 @@ -21,9 +22,6 @@ 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' \ Modified: head/sysutils/debootstrap/files/patch-debootstrap ============================================================================== --- head/sysutils/debootstrap/files/patch-debootstrap Wed Oct 14 14:42:54 2020 (r552339) +++ head/sysutils/debootstrap/files/patch-debootstrap Wed Oct 14 14:55:10 2020 (r552340) @@ -37,7 +37,7 @@ +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 Modified: head/sysutils/debootstrap/pkg-descr ============================================================================== --- head/sysutils/debootstrap/pkg-descr Wed Oct 14 14:42:54 2020 (r552339) +++ head/sysutils/debootstrap/pkg-descr Wed Oct 14 14:55:10 2020 (r552340) @@ -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 Modified: head/sysutils/debootstrap/pkg-message ============================================================================== --- head/sysutils/debootstrap/pkg-message Wed Oct 14 14:42:54 2020 (r552339) +++ head/sysutils/debootstrap/pkg-message Wed Oct 14 14:55:10 2020 (r552340) @@ -1,7 +1,7 @@ [ { type: install message: <