diff options
| author | Nikolai Lifanov <lifanov@FreeBSD.org> | 2018-06-17 22:31:48 +0000 |
|---|---|---|
| committer | Nikolai Lifanov <lifanov@FreeBSD.org> | 2018-06-17 22:31:48 +0000 |
| commit | 387268bb4a72fdaf6b78d66cee3b897ffe2c8f7f (patch) | |
| tree | 1d56ae02516e9bd67f1871bf6fd77d3f4bdeaf6c /sysutils/debootstrap | |
| parent | 07bb195c2aed3a067949db752378f817941a94f9 (diff) | |
Notes
Diffstat (limited to 'sysutils/debootstrap')
| -rw-r--r-- | sysutils/debootstrap/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/debootstrap/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/debootstrap/files/patch-debootstrap | 18 | ||||
| -rw-r--r-- | sysutils/debootstrap/pkg-plist | 2 |
4 files changed, 15 insertions, 13 deletions
diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile index 53bf64d14bb1..e467137c01cf 100644 --- a/sysutils/debootstrap/Makefile +++ b/sysutils/debootstrap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= debootstrap -PORTVERSION= 1.0.96 +PORTVERSION= 1.0.102 CATEGORIES= sysutils MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/sysutils/debootstrap/distinfo b/sysutils/debootstrap/distinfo index 26339344e85f..4c265bcdebda 100644 --- a/sysutils/debootstrap/distinfo +++ b/sysutils/debootstrap/distinfo @@ -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 diff --git a/sysutils/debootstrap/files/patch-debootstrap b/sysutils/debootstrap/files/patch-debootstrap index 9afa5ab114e2..b062794e6f3e 100644 --- a/sysutils/debootstrap/files/patch-debootstrap +++ b/sysutils/debootstrap/files/patch-debootstrap @@ -1,4 +1,4 @@ ---- 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 @@ -9,22 +9,22 @@ 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 @@ -34,5 +34,5 @@ +fi + if [ -z "$ARCH" ]; then - ARCH=$HOST_ARCH + ARCH="$HOST_ARCH" fi diff --git a/sysutils/debootstrap/pkg-plist b/sysutils/debootstrap/pkg-plist index 5870cc487ba5..8bb9d66dd0c2 100644 --- a/sysutils/debootstrap/pkg-plist +++ b/sysutils/debootstrap/pkg-plist @@ -5,10 +5,12 @@ man/man8/debootstrap.8.gz %%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 |