From fab3eaebe0b82fc669b85bff776cd9c35c4a23eb Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 1 Feb 2012 00:32:02 +0100
Subject: [PATCH] zlib: update to 1.2.6.

---
 .../zlib/patches/makefile_ranlib_syntax.patch | 19 +++++++++++++++++++
 .../zlib/patches/zlib-1.2.5-lfs-decls.patch   | 13 -------------
 srcpkgs/zlib/template                         | 19 ++++++++-----------
 srcpkgs/zlib/zlib-devel.template              |  2 --
 4 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 srcpkgs/zlib/patches/makefile_ranlib_syntax.patch
 delete mode 100644 srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch

diff --git a/srcpkgs/zlib/patches/makefile_ranlib_syntax.patch b/srcpkgs/zlib/patches/makefile_ranlib_syntax.patch
new file mode 100644
index 00000000000..9214e00e6aa
--- /dev/null
+++ b/srcpkgs/zlib/patches/makefile_ranlib_syntax.patch
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	2012-01-28 23:48:50.000000000 +0100
++++ Makefile.in	2012-02-01 00:28:04.898440495 +0100
+@@ -190,7 +190,7 @@ install-libs: $(LIBS)
+ 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+ 	cp $(STATICLIB) $(DESTDIR)$(libdir)
+ 	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
+-	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
++	-@$(RANLIB) $(DESTDIR)$(libdir)/libz.a
+ 	-@if test -n "$(SHAREDLIBV)"; then \
+ 	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
+ 	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
+@@ -199,7 +199,6 @@ install-libs: $(LIBS)
+ 	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+ 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
+ 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+-	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
+ 	fi
+ 	cp zlib.3 $(DESTDIR)$(man3dir)
+ 	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
diff --git a/srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch b/srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch
deleted file mode 100644
index 8c1be2b0d7a..00000000000
--- a/srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: zlib-1.2.5/zlib.h
-===================================================================
---- zlib.h
-+++ zlib.h
-@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
- #  define gzoffset gzoffset64
- #  define adler32_combine adler32_combine64
- #  define crc32_combine crc32_combine64
--#  ifdef _LARGEFILE64_SOURCE
-+#  ifndef _LARGEFILE64_SOURCE
-      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index e653f8ac67c..15621ce3355 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,8 +1,8 @@
 # Template build file for 'zlib'
 pkgname=zlib
-version=1.2.5
-revision=5
-distfiles="http://www.zlib.net/$pkgname-$version.tar.bz2"
+version=1.2.6
+homepage="http://www.zlib.net"
+distfiles="$homepage/$pkgname-$version.tar.bz2"
 build_style=configure
 configure_args="--prefix=/usr --shared"
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
@@ -12,7 +12,8 @@ make_build_args="CFLAGS=-fPIC"
 make_install_args="LDCONFIG="
 short_desc="A compression/decompression Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307
+license="zlib"
+checksum=fa3e3e4881fa5810b8903f2c7e0dcd5a0a673535f0438021c4bbb5db1b918c8e
 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
@@ -21,10 +22,6 @@ long_desc="
 bootstrap=yes
 subpackages="zlib-devel"
 
-post_install()
-{
-	chmod 755 ${DESTDIR}/usr/lib/libz.so.${version}
-	cd ${DESTDIR}/usr/lib && \
-		ln -s libz.so.${version} libz.so.1 &&
-		ln -s libz.so.${version} libz.so
-}
+if [ "$BOOTSTRAP_PKG_REBUILD" ]; then
+	Add_dependency build coreutils
+fi
diff --git a/srcpkgs/zlib/zlib-devel.template b/srcpkgs/zlib/zlib-devel.template
index 2983a6d387f..84ee4ed0217 100644
--- a/srcpkgs/zlib/zlib-devel.template
+++ b/srcpkgs/zlib/zlib-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=2
-
 Add_dependency run glibc-devel
 Add_dependency run zlib