zlib: aligned with upstream and removed old patch

diff --git a/zlib/.footprint b/zlib/.footprint
index a65699ed701f1fa3d7eed79f39b80e9e970bd440..4538e1a2017de2c97e9fb8413ecbeda2f868e092 100644 (file)
--- a/zlib/.footprint
+++ b/zlib/.footprint
@@ -1,12 +1,13 @@
+drwxr-xr-x     root/root       lib/
+lrwxrwxrwx     root/root       lib/libz.so.1 -> libz.so.1.2.7
+-rwxr-xr-x     root/root       lib/libz.so.1.2.7
 drwxr-xr-x     root/root       usr/
 drwxr-xr-x     root/root       usr/include/
 -rw-r--r--     root/root       usr/include/zconf.h
 -rw-r--r--     root/root       usr/include/zlib.h
 drwxr-xr-x     root/root       usr/lib/
 -rw-r--r--     root/root       usr/lib/libz.a
-lrwxrwxrwx     root/root       usr/lib/libz.so -> libz.so.1.2.7
-lrwxrwxrwx     root/root       usr/lib/libz.so.1 -> libz.so.1.2.7
--rwxr-xr-x     root/root       usr/lib/libz.so.1.2.7
+lrwxrwxrwx     root/root       usr/lib/libz.so -> ../../lib/libz.so.1.2.7
 drwxr-xr-x     root/root       usr/lib/pkgconfig/
 -rw-r--r--     root/root       usr/lib/pkgconfig/zlib.pc
 drwxr-xr-x     root/root       usr/man/

diff --git a/zlib/Pkgfile b/zlib/Pkgfile
index dbab3c751eaf14a0d86ba31b92a8c39215cf12a3..6ccc8282cb66659415679a624228a9c82952dc82 100644 (file)
--- a/zlib/Pkgfile
+++ b/zlib/Pkgfile
@@ -6,15 +6,14 @@
 
 name=zlib
 version=1.2.7
-release=1
+release=2
 source=(http://www.zlib.net/$name-$version.tar.bz2)
 
 build() {
   cd $name-$version
-  ./configure --prefix=/usr \
-              --shared
+  ./configure --prefix=/usr --sharedlibdir=/lib
   make
-  make prefix=$PKG/usr mandir=$PKG/usr/man install
-
-  chmod -v 644 $PKG/usr/lib/libz.a
+  make DESTDIR=$PKG mandir=/usr/man install
+  ln -sf ../../lib/libz.so.$version $PKG/usr/lib/libz.so
+  rm $PKG/lib/libz.so
 }

diff --git a/zlib/zlib-1.2.5-lfs-decls.patch b/zlib/zlib-1.2.5-lfs-decls.patch
deleted file mode 100644 (file)
index 8d73430..0000000
--- a/zlib/zlib-1.2.5-lfs-decls.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/316377
-
-try to unbreak over-eager LFS logic in zlib header
-
---- zlib-1.2.5/zlib.h
-+++ zlib-1.2.5/zlib.h
-@@ -1578,7 +1578,7 @@
- #  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));