From cd1cee9d3f195af69e9305a550631ad1d7a573ce Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 11 Jul 2011 19:06:14 +0200
Subject: [PATCH] zlib32: sync with zlib pkg.

---
 srcpkgs/zlib32/template              | 16 +++++++++-------
 srcpkgs/zlib32/zlib32-devel.template |  5 +++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/zlib32/template b/srcpkgs/zlib32/template
index aa8ed59401..45e2d51654 100644
--- a/srcpkgs/zlib32/template
+++ b/srcpkgs/zlib32/template
@@ -1,15 +1,16 @@
 # Template file for 'zlib32'
 pkgname=zlib32
 version=1.2.5
+revision=3
 distfiles="
-http://xbps.nopcode.org/repos/stable/i686/zlib-${version}.i686.xbps
-http://xbps.nopcode.org/repos/stable/i686/zlib-devel-${version}.i686.xbps"
+http://xbps.nopcode.org/repos/current/i686/zlib-${version}_3.i686.xbps
+http://xbps.nopcode.org/repos/current/i686/zlib-devel-${version}_1.i686.xbps"
 build_style=custom-install
 short_desc="A compression/decompression Library (32 bits)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-cf85398c5d8fbc088d78cdf2e576f8b3fdeca62e59125af1d4f67285cd113666
-afcbb528ab625e59c9d05ba6871e381e6c6cfa3e33e4bc261c47797b5ac2e16d"
+c36d15ba557eaf7441c69a17df2c45ffd06cb65f00ce680a1b1e40ed325a8a25
+f50e07a9063a536ab0ecdb5c771f2b1ab2a579a6b2d81dc674bb7b6ab720e680"
 long_desc="
  This is a general purpose data compression library. All the code
  is thread safe. The data format used by the library is described
@@ -30,9 +31,10 @@ do_install()
 {
 	for f in ${distfiles}; do
 		local srcfile="${XBPS_SRCDISTDIR}/$(basename ${f})"
-		bsdtar xf ${srcfile} -C ${wrksrc} || return 1
+		bsdtar xf ${srcfile} -C ${wrksrc}
 	done
 
-	install -d ${DESTDIR}/usr/lib32
-	cp -a ${wrksrc}/usr/lib/*.{a,so*} ${DESTDIR}/usr/lib32
+	vmkdir usr/lib32
+	vcopy "usr/lib/*.a" usr/lib32
+	vcopy "usr/lib/*.so*" usr/lib32
 }
diff --git a/srcpkgs/zlib32/zlib32-devel.template b/srcpkgs/zlib32/zlib32-devel.template
index 4c36d581a9..8bc60af01b 100644
--- a/srcpkgs/zlib32/zlib32-devel.template
+++ b/srcpkgs/zlib32/zlib32-devel.template
@@ -5,11 +5,12 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run glibc32-devel
 Add_dependency run zlib32
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib32
-	mv ${SRCPKGDESTDIR}/usr/lib32/libz.a ${DESTDIR}/usr/lib32
+	vmove usr/lib32/libz.a usr/lib32
 }