- Update to 1.0.32

- Alphabetically reorder pkg-plist

4 files changed, 51 insertions, 43 deletions

diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile
index 91026192924a..2400875818bc 100644
--- a/sysutils/debootstrap/Makefile
+++ b/sysutils/debootstrap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	debootstrap
-PORTVERSION=	1.0.28
-PORTREVISION=	1
+PORTVERSION=	1.0.32
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/d/${PORTNAME}
diff --git a/sysutils/debootstrap/distinfo b/sysutils/debootstrap/distinfo
index abc76b7cf89c..8719da1feea9 100644
--- a/sysutils/debootstrap/distinfo
+++ b/sysutils/debootstrap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (debootstrap_1.0.28.tar.gz) = e01dd19e1f364fa5b7130e1fbec67b930576885e3c79d74223b203c5e6fc1a95
-SIZE (debootstrap_1.0.28.tar.gz) = 54832
+SHA256 (debootstrap_1.0.32.tar.gz) = 3e235b1feb126ded2cf7ffe1d9a52562463a1136bb8ef615aafa406ed3ca3a51
+SIZE (debootstrap_1.0.32.tar.gz) = 55252
diff --git a/sysutils/debootstrap/files/patch-functions b/sysutils/debootstrap/files/patch-functions
index acdd53e04af5..2f97c92dd75e 100644
--- a/sysutils/debootstrap/files/patch-functions
+++ b/sysutils/debootstrap/files/patch-functions
@@ -1,19 +1,26 @@
---- functions.orig	2011-02-22 01:25:08.000000000 +0100
-+++ functions	2011-03-14 20:42:00.536562918 +0100
-@@ -232,7 +232,11 @@
- 	# args: dest checksum size
+--- functions.orig	2011-05-20 19:57:18.000000000 +0200
++++ functions	2011-07-15 17:15:49.989386001 +0200
+@@ -236,9 +236,17 @@
  	local expchecksum="$2"
  	local expsize="$3"
--	relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
-+	if [ "`uname -s`" = "FreeBSD" ]; then
-+		relchecksum=`sha${SHA_SIZE} < "$1"`
-+	else
-+		relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
-+	fi
+ 	if [ "$DEBOOTSTRAP_CHECKSUM_FIELD" = "MD5SUM" ]; then
+-		relchecksum=`md5sum < "$1" | sed 's/ .*$//'`
++		if [ "`uname -s`" = "FreeBSD" ]; then
++			relchecksum=`md5 < "$1"`
++		else
++			relchecksum=`md5sum < "$1" | sed 's/ .*$//'`
++		fi
+ 	else
+-		relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
++		if [ "`uname -s`" = "FreeBSD" ]; then
++			relchecksum=`sha${SHA_SIZE} < "$1"`
++		else
++			relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
++		fi		
+ 	fi
  	relsize=`wc -c < "$1"`
  	if [ "$expsize" -ne "$relsize" ] || [ "$expchecksum" != "$relchecksum" ]; then
- 		return 1
-@@ -510,9 +514,9 @@
+@@ -524,9 +532,9 @@
  		local i=
  		if [ "$normi" != "" ]; then
  			i="$normi"
@@ -25,7 +32,7 @@
  			i="$gzi"
  		fi
  		if [ "$i" != "" ]; then
-@@ -538,11 +542,11 @@
+@@ -552,11 +560,11 @@
  			ext="$ext $normi ."
  			i="$normi"
  		fi
@@ -39,7 +46,7 @@
  			ext="$ext $gzi gz"
  			i="${i:-$gzi}"
  		fi
-@@ -676,7 +680,7 @@
+@@ -690,7 +698,7 @@
  	    for c in $COMPONENTS; do
  		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
  		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
@@ -48,7 +55,7 @@
  			rm -f "$pkgdest"
  			gunzip "$pkgdest.gz"
  		elif get "$m/$path" "$pkgdest"; then
-@@ -934,12 +938,16 @@
+@@ -948,12 +956,16 @@
  	    hurd-*)
  		;;
  	    *)
@@ -71,7 +78,7 @@
  		if [ -d "$TARGET/sys" ] && \
  		   grep -q '[[:space:]]sysfs' /proc/filesystems 2>/dev/null; then
  			umount_on_exit /sys
-@@ -964,13 +972,17 @@
+@@ -978,13 +990,17 @@
  	    hurd-*)
  		setup_devices_hurd ;;
  	    *)
@@ -94,7 +101,7 @@
  			fi
  		fi
  		;;
-@@ -1178,12 +1190,14 @@
+@@ -1197,12 +1213,14 @@
  	    kfreebsd-*|hurd-*)
  		;;
  	    *)
diff --git a/sysutils/debootstrap/pkg-plist b/sysutils/debootstrap/pkg-plist
index ced246fc883f..2738e0335740 100644
--- a/sysutils/debootstrap/pkg-plist
+++ b/sysutils/debootstrap/pkg-plist
@@ -1,35 +1,37 @@
 sbin/debootstrap
 share/debootstrap/functions
-share/debootstrap/scripts/sarge
-share/debootstrap/scripts/sid
-share/debootstrap/scripts/hoary.buildd
-share/debootstrap/scripts/hardy
-share/debootstrap/scripts/intrepid
+share/debootstrap/scripts/breezy
+share/debootstrap/scripts/dapper
+share/debootstrap/scripts/edgy
 share/debootstrap/scripts/etch
-share/debootstrap/scripts/woody
-share/debootstrap/scripts/sarge.buildd
-share/debootstrap/scripts/unstable
-share/debootstrap/scripts/karmic
 share/debootstrap/scripts/etch-m68k
+share/debootstrap/scripts/feisty
+share/debootstrap/scripts/gutsy
+share/debootstrap/scripts/hardy
 share/debootstrap/scripts/hoary
-share/debootstrap/scripts/potato
-share/debootstrap/scripts/warty.buildd
+share/debootstrap/scripts/hoary.buildd
+share/debootstrap/scripts/intrepid
+share/debootstrap/scripts/jaunty
+share/debootstrap/scripts/karmic
 share/debootstrap/scripts/lenny
+share/debootstrap/scripts/lucid
 share/debootstrap/scripts/maverick
-share/debootstrap/scripts/stable
-share/debootstrap/scripts/dapper
-share/debootstrap/scripts/testing
-share/debootstrap/scripts/feisty
+share/debootstrap/scripts/natty
+share/debootstrap/scripts/oldstable
+share/debootstrap/scripts/oneiric
+share/debootstrap/scripts/potato
+share/debootstrap/scripts/sarge
+share/debootstrap/scripts/sarge.buildd
 share/debootstrap/scripts/sarge.fakechroot
-share/debootstrap/scripts/breezy
+share/debootstrap/scripts/sid
 share/debootstrap/scripts/squeeze
+share/debootstrap/scripts/stable
+share/debootstrap/scripts/testing
+share/debootstrap/scripts/unstable
 share/debootstrap/scripts/warty
-share/debootstrap/scripts/jaunty
-share/debootstrap/scripts/gutsy
-share/debootstrap/scripts/lucid
-share/debootstrap/scripts/natty
-share/debootstrap/scripts/woody.buildd
-share/debootstrap/scripts/edgy
+share/debootstrap/scripts/warty.buildd
 share/debootstrap/scripts/wheezy
+share/debootstrap/scripts/woody
+share/debootstrap/scripts/woody.buildd
 @dirrm share/debootstrap/scripts
 @dirrm share/debootstrap