Index: head/sysutils/debootstrap/Makefile =================================================================== --- head/sysutils/debootstrap/Makefile (revision 550012) +++ head/sysutils/debootstrap/Makefile (revision 550013) @@ -1,44 +1,43 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= debootstrap -PORTVERSION= 1.0.115 -PORTREVISION= 1 +PORTVERSION= 1.0.123 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 \ bash:shells/bash -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +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 Index: head/sysutils/debootstrap/distinfo =================================================================== --- head/sysutils/debootstrap/distinfo (revision 550012) +++ head/sysutils/debootstrap/distinfo (revision 550013) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565566198 -SHA256 (debootstrap_1.0.115.tar.gz) = e4811165e02b027feb6a299aa354bcecc351ba273db9f56b072e246ff2b1d4e8 -SIZE (debootstrap_1.0.115.tar.gz) = 75691 +TIMESTAMP = 1598191216 +SHA256 (debootstrap_1.0.123.tar.gz) = 5e5a8147ecdd6be0eea5ac4d6ed8192cc653e93f744dd3306c9b1cc51d6ca328 +SIZE (debootstrap_1.0.123.tar.gz) = 78175 Index: head/sysutils/debootstrap/files/patch-scripts-bionic =================================================================== --- head/sysutils/debootstrap/files/patch-scripts-bionic (revision 550012) +++ head/sysutils/debootstrap/files/patch-scripts-bionic (nonexistent) @@ -1,16 +0,0 @@ ---- scripts/bionic.orig 2020-07-08 20:51:17.590645000 +0100 -+++ scripts/bionic 2020-07-08 20:51:28.786509000 +0100 -@@ -249,10 +249,13 @@ echo \"Warning: Fake initctl called, doing nothing\"" - - info CONFBASE "Configuring the base system..." - -+ # This step sometimes fails due to some missing functionality in Linuxulator. Just ignore it. -+ set +e - smallyes '' | - (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) | - dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING -+ set -e - fi - - if [ -x "$TARGET/sbin/initctl.REAL" ]; then Property changes on: head/sysutils/debootstrap/files/patch-scripts-bionic ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1,2 +0,0 ## -yes -\ No newline at end of property \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/debootstrap/files/patch-scripts-gutsy =================================================================== --- head/sysutils/debootstrap/files/patch-scripts-gutsy (nonexistent) +++ head/sysutils/debootstrap/files/patch-scripts-gutsy (revision 550013) @@ -0,0 +1,16 @@ +--- scripts/gutsy.orig 2020-07-08 20:51:17.590645000 +0100 ++++ scripts/gutsy 2020-07-08 20:51:28.786509000 +0100 +@@ -249,10 +249,13 @@ echo \"Warning: Fake initctl called, doing nothing\"" + + info CONFBASE "Configuring the base system..." + ++ # This step sometimes fails due to some missing functionality in Linuxulator. Just ignore it. ++ set +e + smallyes '' | + (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) | + dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING ++ set -e + fi + + if [ -x "$TARGET/sbin/initctl.REAL" ]; then Property changes on: head/sysutils/debootstrap/files/patch-scripts-gutsy ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1,2 ## +yes +\ No newline at end of property \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/debootstrap/pkg-plist =================================================================== --- head/sysutils/debootstrap/pkg-plist (revision 550012) +++ head/sysutils/debootstrap/pkg-plist (revision 550013) @@ -1,68 +1,73 @@ @(,,0755) sbin/debootstrap man/man8/debootstrap.8.gz %%DATADIR%%/functions %%DATADIR%%/scripts/aequorea +%%DATADIR%%/scripts/amber %%DATADIR%%/scripts/artful +%%DATADIR%%/scripts/ascii %%DATADIR%%/scripts/bartholomea +%%DATADIR%%/scripts/beowulf %%DATADIR%%/scripts/bionic %%DATADIR%%/scripts/bookworm %%DATADIR%%/scripts/breezy %%DATADIR%%/scripts/bullseye %%DATADIR%%/scripts/buster +%%DATADIR%%/scripts/ceres %%DATADIR%%/scripts/chromodoris %%DATADIR%%/scripts/cosmic %%DATADIR%%/scripts/dapper %%DATADIR%%/scripts/dasyatis %%DATADIR%%/scripts/debian-common %%DATADIR%%/scripts/disco %%DATADIR%%/scripts/edgy %%DATADIR%%/scripts/eoan %%DATADIR%%/scripts/etch %%DATADIR%%/scripts/etch-m68k %%DATADIR%%/scripts/feisty +%%DATADIR%%/scripts/focal %%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