Index: head/sysutils/debootstrap/Makefile =================================================================== --- head/sysutils/debootstrap/Makefile (revision 472647) +++ head/sysutils/debootstrap/Makefile (revision 472648) @@ -1,39 +1,39 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= debootstrap -PORTVERSION= 1.0.96 +PORTVERSION= 1.0.102 CATEGORIES= sysutils MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= lifanov@FreeBSD.org COMMENT= Install Debian base system into a directory LICENSE= MIT LICENSE_FILE= ${WRKSRC}/debian/copyright RUN_DEPENDS= wget:ftp/wget WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} 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 post-install: ${INSTALL_MAN} ${WRKSRC}/debootstrap.8 \ ${STAGEDIR}${MAN8PREFIX}/man/man8/debootstrap.8 .include Index: head/sysutils/debootstrap/distinfo =================================================================== --- head/sysutils/debootstrap/distinfo (revision 472647) +++ head/sysutils/debootstrap/distinfo (revision 472648) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523456571 -SHA256 (debootstrap_1.0.96.tar.gz) = 5fe34b69069a8dcb425450f81d7e7c9eda9a6afd90082985d9e8f790868dae86 -SIZE (debootstrap_1.0.96.tar.gz) = 69541 +TIMESTAMP = 1529274215 +SHA256 (debootstrap_1.0.102.tar.gz) = 09675c7338ff0a328a1d67d84af93af46716a618d6c8cdb8c76d1ce07cb70ec5 +SIZE (debootstrap_1.0.102.tar.gz) = 72977 Index: head/sysutils/debootstrap/files/patch-debootstrap =================================================================== --- head/sysutils/debootstrap/files/patch-debootstrap (revision 472647) +++ head/sysutils/debootstrap/files/patch-debootstrap (revision 472648) @@ -1,38 +1,38 @@ ---- debootstrap.orig 2016-09-09 12:32:15 UTC +--- debootstrap.orig 2018-06-13 13:00:11 UTC +++ debootstrap @@ -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 -@@ -409,13 +409,7 @@ fi +@@ -474,13 +474,7 @@ fi ########################################################################### -if in_path dpkg && \ - dpkg --print-architecture >/dev/null 2>&1; then -- HOST_ARCH=`/usr/bin/dpkg --print-architecture` +- 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` +- 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" -@@ -437,6 +431,11 @@ if [ -z "$HOST_OS" ]; then +@@ -502,6 +496,11 @@ if [ -z "$HOST_OS" ]; then esac fi +if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then + HOST_ARCH=kfreebsd-`/sbin/sysctl -n hw.machine_arch` + EXTRACTOR_OVERRIDE=ar +fi + if [ -z "$ARCH" ]; then - ARCH=$HOST_ARCH + ARCH="$HOST_ARCH" fi Index: head/sysutils/debootstrap/pkg-plist =================================================================== --- head/sysutils/debootstrap/pkg-plist (revision 472647) +++ head/sysutils/debootstrap/pkg-plist (revision 472648) @@ -1,64 +1,66 @@ @(,,0755) sbin/debootstrap man/man8/debootstrap.8.gz %%DATADIR%%/functions %%DATADIR%%/scripts/aequorea %%DATADIR%%/scripts/artful %%DATADIR%%/scripts/bartholomea %%DATADIR%%/scripts/bionic +%%DATADIR%%/scripts/bookworm %%DATADIR%%/scripts/breezy %%DATADIR%%/scripts/bullseye %%DATADIR%%/scripts/buster %%DATADIR%%/scripts/chromodoris +%%DATADIR%%/scripts/cosmic %%DATADIR%%/scripts/dapper %%DATADIR%%/scripts/dasyatis %%DATADIR%%/scripts/debian-common %%DATADIR%%/scripts/edgy %%DATADIR%%/scripts/etch %%DATADIR%%/scripts/etch-m68k %%DATADIR%%/scripts/feisty %%DATADIR%%/scripts/gutsy %%DATADIR%%/scripts/hardy %%DATADIR%%/scripts/hoary %%DATADIR%%/scripts/hoary.buildd %%DATADIR%%/scripts/intrepid %%DATADIR%%/scripts/jaunty %%DATADIR%%/scripts/jessie %%DATADIR%%/scripts/jessie-kfreebsd %%DATADIR%%/scripts/kali %%DATADIR%%/scripts/kali-dev %%DATADIR%%/scripts/kali-last-snapshot %%DATADIR%%/scripts/kali-rolling %%DATADIR%%/scripts/karmic %%DATADIR%%/scripts/lenny %%DATADIR%%/scripts/lucid %%DATADIR%%/scripts/maverick %%DATADIR%%/scripts/natty %%DATADIR%%/scripts/oldoldstable %%DATADIR%%/scripts/oldstable %%DATADIR%%/scripts/oneiric %%DATADIR%%/scripts/potato %%DATADIR%%/scripts/precise %%DATADIR%%/scripts/quantal %%DATADIR%%/scripts/raring %%DATADIR%%/scripts/sarge %%DATADIR%%/scripts/sarge.buildd %%DATADIR%%/scripts/sarge.fakechroot %%DATADIR%%/scripts/saucy %%DATADIR%%/scripts/sid %%DATADIR%%/scripts/squeeze %%DATADIR%%/scripts/stable %%DATADIR%%/scripts/stretch %%DATADIR%%/scripts/testing %%DATADIR%%/scripts/trusty %%DATADIR%%/scripts/unstable %%DATADIR%%/scripts/utopic %%DATADIR%%/scripts/vivid %%DATADIR%%/scripts/warty %%DATADIR%%/scripts/warty.buildd %%DATADIR%%/scripts/wheezy %%DATADIR%%/scripts/wily %%DATADIR%%/scripts/woody %%DATADIR%%/scripts/woody.buildd %%DATADIR%%/scripts/xenial %%DATADIR%%/scripts/yakkety %%DATADIR%%/scripts/zesty