diff options
| -rw-r--r-- | sysutils/debootstrap/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/debootstrap/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/debootstrap/files/patch-Makefile | 11 | ||||
| -rw-r--r-- | sysutils/debootstrap/files/patch-debootstrap | 16 |
4 files changed, 12 insertions, 22 deletions
diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile index bbb17de89939..9a211172ca44 100644 --- a/sysutils/debootstrap/Makefile +++ b/sysutils/debootstrap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= debootstrap -PORTVERSION= 1.0.81 +PORTVERSION= 1.0.82 CATEGORIES= sysutils MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/sysutils/debootstrap/distinfo b/sysutils/debootstrap/distinfo index ab97f13cfb10..f5642c14345c 100644 --- a/sysutils/debootstrap/distinfo +++ b/sysutils/debootstrap/distinfo @@ -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 diff --git a/sysutils/debootstrap/files/patch-Makefile b/sysutils/debootstrap/files/patch-Makefile index 64ca1393cdb6..5a4723d5ed6d 100644 --- a/sysutils/debootstrap/files/patch-Makefile +++ b/sysutils/debootstrap/files/patch-Makefile @@ -1,8 +1,8 @@ ---- 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%% @@ -19,6 +19,3 @@ - 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)/ diff --git a/sysutils/debootstrap/files/patch-debootstrap b/sysutils/debootstrap/files/patch-debootstrap index f6194b29888f..9afa5ab114e2 100644 --- a/sysutils/debootstrap/files/patch-debootstrap +++ b/sysutils/debootstrap/files/patch-debootstrap @@ -1,6 +1,6 @@ ---- 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 @@ -9,7 +9,7 @@ fi fi -@@ -397,13 +397,7 @@ +@@ -409,13 +409,7 @@ fi ########################################################################### @@ -24,7 +24,7 @@ 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 @@ -36,11 +36,3 @@ 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" |