From 9893c6739945b2622cc10ae2b86f3c0ab106ba01 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 16 Mar 2010 22:38:46 +0100
Subject: [PATCH] zlib: update to 1.2.4.

--HG--
extra : convert_revision : dce27edb812d97f87b6cbb7e7eefc6a854e149d5
---
 .../patches/configure_build_all_libs.diff     | 25 -------------------
 srcpkgs/zlib/template                         |  9 +++----
 srcpkgs/zlib/zlib-devel.template              |  4 +--
 3 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/zlib/patches/configure_build_all_libs.diff

diff --git a/srcpkgs/zlib/patches/configure_build_all_libs.diff b/srcpkgs/zlib/patches/configure_build_all_libs.diff
deleted file mode 100644
index 86c6b065bdd..00000000000
--- a/srcpkgs/zlib/patches/configure_build_all_libs.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.orig	2008-10-26 00:36:04.000000000 +0200
-+++ configure	2008-10-26 00:36:46.000000000 +0200
-@@ -169,20 +169,9 @@ SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext
- SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
- 
- if test $shared -eq 1; then
--  echo Checking for shared library support...
--  # we must test in two steps (cc then ld), required at least on SunOS 4.x
--  if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
--     test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
-     CFLAGS="$SFLAGS"
--    LIBS="$SHAREDLIBV"
--    echo Building shared library $SHAREDLIBV with $CC.
--  elif test -z "$old_cc" -a -z "$old_cflags"; then
--    echo No shared library support.
--    shared=0;
--  else
--    echo 'No shared library support; try without defining CC and CFLAGS'
--    shared=0;
--  fi
-+    LIBS="libz.a $SHAREDLIBV"
-+    echo Building static and shared library $SHAREDLIBV with $CC.
- fi
- if test $shared -eq 0; then
-   LDSHARED="$CC"
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 7f434f68c0c..4f52048b308 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,14 +1,12 @@
 # Template build file for 'zlib'
 pkgname=zlib
-version=1.2.3
+version=1.2.4
 distfiles="http://www.zlib.net/$pkgname-$version.tar.bz2"
 build_style=configure
-CFLAGS="-fPIC -DPIC"
-configure_args="-s"
-make_install_args="prefix=$XBPS_DESTDIR/$pkgname-$version/usr"
+configure_args="--prefix=/usr --shared"
 short_desc="A compression/decompression Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
+checksum=d0fc3433bb3ff5bbf1d2db57a328c0be39ac4a74d4b39887af522acf7ecd5ecc
 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
@@ -16,5 +14,4 @@ long_desc="
 
 base_chroot=yes
 subpackages="zlib-devel"
-
 Add_dependency run glibc
diff --git a/srcpkgs/zlib/zlib-devel.template b/srcpkgs/zlib/zlib-devel.template
index 7e1ddbc8553..f70983d29fb 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=1
-
 Add_dependency run glibc-devel
 Add_dependency run zlib
 
@@ -14,5 +12,7 @@ do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/libz.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
 }