Index: head/sysutils/debootstrap/Makefile =================================================================== --- head/sysutils/debootstrap/Makefile (revision 421618) +++ head/sysutils/debootstrap/Makefile (revision 421619) @@ -1,39 +1,39 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= debootstrap -PORTVERSION= 1.0.81 +PORTVERSION= 1.0.82 CATEGORIES= sysutils MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= lifanov@mail.lifanov.com 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 421618) +++ head/sysutils/debootstrap/distinfo (revision 421619) @@ -1,2 +1,3 @@ -SHA256 (debootstrap_1.0.81.tar.gz) = 344c7f841504c262d5088e9618f1d5f79bc122bffbb1dce2873c5e38029bdfb3 -SIZE (debootstrap_1.0.81.tar.gz) = 64394 +TIMESTAMP = 1473424128 +SHA256 (debootstrap_1.0.82.tar.gz) = db0dfad15d5338a8cdbcc3bbfda8dc59c58edf07511303f31746ef6fcc733835 +SIZE (debootstrap_1.0.82.tar.gz) = 64344 Index: head/sysutils/debootstrap/files/patch-Makefile =================================================================== --- head/sysutils/debootstrap/files/patch-Makefile (revision 421618) +++ head/sysutils/debootstrap/files/patch-Makefile (revision 421619) @@ -1,24 +1,21 @@ ---- Makefile.orig 2015-05-19 09:35:39 UTC +--- Makefile.orig 2016-09-09 12:30:20 UTC +++ Makefile -@@ -14,17 +14,15 @@ clean: - rm -f devices.tar.gz - rm -rf dev +@@ -6,14 +6,12 @@ all: + clean: + -DSDIR=$(DESTDIR)/usr/share/debootstrap +DSDIR=$(DESTDIR)%%DATADIR%% install: mkdir -p $(DSDIR)/scripts - mkdir -p $(DESTDIR)/usr/sbin + mkdir -p $(DESTDIR)%%PREFIX%%/sbin cp -a scripts/* $(DSDIR)/scripts/ - install -o root -g root -m 0644 functions $(DSDIR)/ + cp -a functions $(DSDIR)/ - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap - chown root:root $(DESTDIR)/usr/sbin/debootstrap - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)%%PREFIX%%/sbin/debootstrap - - ifeq ($(shell uname),Linux) - install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ Index: head/sysutils/debootstrap/files/patch-debootstrap =================================================================== --- head/sysutils/debootstrap/files/patch-debootstrap (revision 421618) +++ head/sysutils/debootstrap/files/patch-debootstrap (revision 421619) @@ -1,46 +1,38 @@ ---- debootstrap.orig 2014-02-07 15:25:58 UTC +--- debootstrap.orig 2016-09-09 12:32:15 UTC +++ debootstrap -@@ -13,7 +13,7 @@ +@@ -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 -@@ -397,13 +397,7 @@ +@@ -409,13 +409,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" -@@ -425,6 +419,11 @@ +@@ -437,6 +431,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 fi -@@ -621,7 +620,6 @@ - if ! am_doing_phase second_stage; then - cp "$0" "$TARGET/debootstrap/debootstrap" - cp $DEBOOTSTRAP_DIR/functions "$TARGET/debootstrap/functions" -- cp $DEBOOTSTRAP_DIR/devices.tar.gz "$TARGET/debootstrap/devices.tar.gz" - cp $SCRIPT "$TARGET/debootstrap/suite-script" - echo "$ARCH" >"$TARGET/debootstrap/arch" - echo "$SUITE" >"$TARGET/debootstrap/suite"