debootstrap: update to 1.0.87

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Dec 12 15:16:21 2016 +0100
Changeset:	827dbcf68714e07d4d48737cb32dcadad8f87ec9

Modified Files:
	TODO
	debootstrap/Makefile
	debootstrap/distinfo
	debootstrap/patches/patch-debootstrap

Log Message:
debootstrap: update to 1.0.87

debootstrap (1.0.87) unstable; urgency=high

  [ Julien Cristau ]
  * Default to split /usr again, as merged-/usr breaks dpkg-shlibdeps
    (closes: #844221).

  [ Riku Voipio ]
  * remove scratchbox2 support (closes: #796189)

 -- Christian Perrier <bubulle%debian.org@localhost>  Wed, 16 Nov 2016 06:47:27 +0100

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=827dbcf68714e07d4d48737cb32dcadad8f87ec9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 TODO                                  |  1 -
 debootstrap/Makefile                  |  8 ++++----
 debootstrap/distinfo                  | 10 +++++-----
 debootstrap/patches/patch-debootstrap | 12 ++++++------
 4 files changed, 15 insertions(+), 16 deletions(-)

diffs:
diff --git a/TODO b/TODO
index 9415c64..30d4f4e 100644
--- a/TODO
+++ b/TODO
@@ -16,7 +16,6 @@ Suggested package updates
 	o cinelerra-4.5
 	o d4x-2.5.7.1
 	o daphne-1.0
-	o debootstrap-1.0.87
 	o desmume-0.9.11
 	o directfb-1.0.0
 	o dolphin-4.0
diff --git a/debootstrap/Makefile b/debootstrap/Makefile
index 43b64b2..65c1085 100644
--- a/debootstrap/Makefile
+++ b/debootstrap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/08/06 07:56:45 thomasklausner Exp $
+# $NetBSD$
 
-DISTNAME=	debootstrap_1.0.86
+DISTNAME=	debootstrap_1.0.87
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	sysutils emulators
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/d/debootstrap/}
@@ -19,8 +19,8 @@ DEPENDS+=	wget-[0-9]*:../../net/wget
 DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=	coreutils-[0-9]*:../../sysutils/coreutils
 
-#WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/debootstrap
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+#WRKSRC=		${WRKDIR}/debootstrap
 USE_LANGUAGES=	# none
 
 USE_TOOLS+=	gmake xzcat tar bash:run
diff --git a/debootstrap/distinfo b/debootstrap/distinfo
index fdac517..10ca868 100644
--- a/debootstrap/distinfo
+++ b/debootstrap/distinfo
@@ -4,14 +4,14 @@ SHA1 (debian-archive-keyring_2014.3_all.deb) = 7f16adc03d5e2f21afba8ae843d1ed5d7
 RMD160 (debian-archive-keyring_2014.3_all.deb) = 13fec7c8c07af16742af3ddae29422726d341cc1
 SHA512 (debian-archive-keyring_2014.3_all.deb) = 7a24596f250eafb6e62d19523cd13c3b1809bea3f694bd92f3d427f67cd840e0292200e6b033b5c5c5cf41ab40233ae17d133a846be483afa1da3b67cac72931
 Size (debian-archive-keyring_2014.3_all.deb) = 40060 bytes
-SHA1 (debootstrap_1.0.86.tar.gz) = 3261092408a4f0a8d0939e07d1d5fea6e69369ed
-RMD160 (debootstrap_1.0.86.tar.gz) = 04d8843c1ae0e99466053fe1d2ea7c8b9abef6d4
-SHA512 (debootstrap_1.0.86.tar.gz) = f9f4714e7017ae8788cc0e3939b5365fde2298a6bc05b160af652d421b8330611414c524fcb8e2d1c265e70920a62400de04eb5e57aa81e6f240d6fd0ff829a2
-Size (debootstrap_1.0.86.tar.gz) = 65352 bytes
+SHA1 (debootstrap_1.0.87.tar.gz) = 1869a70482119c1616e0332117d21735b3384909
+RMD160 (debootstrap_1.0.87.tar.gz) = 188483834b7ba85b0412476e39beb5e8791f1af0
+SHA512 (debootstrap_1.0.87.tar.gz) = a36d566292f25093e0367a912f262e95036e355a3f4872a5b957cff53999f4491cc30d7d65a08c31e68f98d75c0a5229b88681895720ff9a610d5fffe4565060
+Size (debootstrap_1.0.87.tar.gz) = 65875 bytes
 SHA1 (ubuntu-archive-keyring_2012.05.19-1_all.deb) = 92ada09596a94c01f02929298f3a53d2531ff751
 RMD160 (ubuntu-archive-keyring_2012.05.19-1_all.deb) = 7bfda3f4b6b736265a2381ca86b2b0da9cc3f49f
 SHA512 (ubuntu-archive-keyring_2012.05.19-1_all.deb) = a7bbb034788268919c9ea0f21707436fb1f2f5d1b39a6f4d2cc78cf3f4b7dadc58c5a658beba403712cf3e6c5914bd8e21072ba105f93aa6761b8f0764016350
 Size (ubuntu-archive-keyring_2012.05.19-1_all.deb) = 17986 bytes
 SHA1 (patch-Makefile) = c549532e9a5842b586a85a091eb1204c84f29859
-SHA1 (patch-debootstrap) = 54eff84145e092712419dd0766103180af402933
+SHA1 (patch-debootstrap) = 871d8e81617390d90bc81534d4fcd109773a232a
 SHA1 (patch-functions) = 5a51c6102699cbd0bab867bb0dd9100dabc40559
diff --git a/debootstrap/patches/patch-debootstrap b/debootstrap/patches/patch-debootstrap
index 6733d97..5e4060e 100644
--- a/debootstrap/patches/patch-debootstrap
+++ b/debootstrap/patches/patch-debootstrap
@@ -1,6 +1,6 @@
 $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
 
---- debootstrap.orig	2016-10-27 19:53:47.000000000 +0000
+--- debootstrap.orig	2016-11-14 04:01:52.000000000 +0000
 +++ debootstrap
 @@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
  	if [ -x /debootstrap/debootstrap ]; then
@@ -13,7 +13,7 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
  
 @@ -29,7 +29,7 @@ FORCE_KEYRING=""
  VARIANT=""
- MERGED_USR="yes"
+ MERGED_USR="no"
  ARCH=""
 -HOST_ARCH=""
 +HOST_ARCH="$(uname -m)"
@@ -39,16 +39,16 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
  	esac
  fi
  
-@@ -475,7 +478,7 @@ elif doing_variant scratchbox; then
- 	[ "x$SB2_TARGET" != "x" ] || error 1 SBOXTARGETREQ "No scratchbox target configured for $TARGET"
- 	CHROOT_CMD="sb2 -eR -t $SB2_TARGET"
+@@ -465,7 +468,7 @@ fi
+ if [ "$TARGET" = "/" ]; then
+ 	CHROOT_CMD=""
  else
 -	CHROOT_CMD="chroot $TARGET"
 +	CHROOT_CMD="chroot $TARGET /usr/bin/env LD_PRELOAD=/debootstrap/libfakesyscall-${ARCH}.so"
  fi
  
  if [ -z "$SHA_SIZE" ]; then
-@@ -506,6 +509,7 @@ fi
+@@ -496,6 +499,7 @@ fi
  
  if [ "$TARGET" != "" ]; then
  	mkdir -p "$TARGET/debootstrap"