# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1271778581 -7200
# Node ID bdee1b1fe95c418ad20a9f4520cec59d4a1325a0
# Parent  49ecbb512ff231b7bfe11f27441ba437a259007b
upgrade package zlib

diff -r 49ecbb512ff2 -r bdee1b1fe95c src/zlib-win32-static.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/zlib-win32-static.patch	Tue Apr 20 17:49:41 2010 +0200
@@ -0,0 +1,28 @@
+diff -r 5a13d390f989 Makefile.in
+--- a/Makefile.in	Tue Apr 20 14:59:46 2010 +0200
++++ b/Makefile.in	Tue Apr 20 17:46:22 2010 +0200
+@@ -167,8 +167,8 @@
+ 	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
+ 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
+ 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+-	cp $(STATICLIB) $(DESTDIR)$(libdir)
+-	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
++	[ -z '$(STATICLIB)'  ] || cp $(STATICLIB)  $(DESTDIR)$(libdir)
++	[ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ 	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
+ 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+ 	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+diff -r 5a13d390f989 configure
+--- a/configure	Tue Apr 20 14:59:46 2010 +0200
++++ b/configure	Tue Apr 20 17:46:22 2010 +0200
+@@ -122,10 +122,7 @@
+   CYGWIN* | Cygwin* | cygwin* | OS/2*)
+         EXE='.exe' ;;
+   MINGW*|mingw*)
+-# temporary bypass
+         rm -f $test.[co] $test $test$shared_ext
+-        echo "Please use win32/Makefile.gcc instead."
+-        exit 1
+         LDSHARED=${LDSHARED-"$cc -shared"}
+         LDSHAREDLIBC=""
+         EXE='.exe' ;;
diff -r 49ecbb512ff2 -r bdee1b1fe95c src/zlib.mk
--- a/src/zlib.mk	Tue Apr 20 14:36:46 2010 +0200
+++ b/src/zlib.mk	Tue Apr 20 17:49:41 2010 +0200
@@ -4,8 +4,8 @@
 # zlib
 PKG             := zlib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.4
-$(PKG)_CHECKSUM := 8cf10521c1927daa5e12efc5e1725a0d70e579f3
+$(PKG)_VERSION  := 1.2.5
+$(PKG)_CHECKSUM := 543fa9abff0442edca308772d6cef85557677e02
 $(PKG)_SUBDIR   := zlib-$($(PKG)_VERSION)
 $(PKG)_FILE     := zlib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://zlib.net/
@@ -19,7 +19,7 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && CC='$(TARGET)-gcc' AR='$(TARGET)-ar' RANLIB='$(TARGET)-ranlib' ./configure \
+    cd '$(1)' && CHOST='$(TARGET)' ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --static
     $(MAKE) -C '$(1)' -j '$(JOBS)' install