summaryrefslogtreecommitdiffstats
path: root/archive-libs/zlib
diff options
context:
space:
mode:
authorLadislav Hagara2012-01-30 18:49:06 +0100
committerLadislav Hagara2012-01-30 18:49:06 +0100
commit5a99de8138e2f08f9e9af7c590be261335aa5be3 (patch)
treef2b46056794e498040e9d1158f6016263c7ed4f2 /archive-libs/zlib
parentc19575251dc72aa3f7cef15c5968812f23aeafd8 (diff)
zlib 1.2.6
Diffstat (limited to 'archive-libs/zlib')
-rwxr-xr-xarchive-libs/zlib/DETAILS6
-rw-r--r--archive-libs/zlib/HISTORY4
-rw-r--r--archive-libs/zlib/pkgpath.patch18
3 files changed, 14 insertions, 14 deletions
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index 7e0729ff9a..25cd7ef571 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -1,7 +1,7 @@
SPELL=zlib
- VERSION=1.2.5
- PATCHLEVEL=1
- SOURCE_HASH=sha512:88e8aa4bd2f23233cc6c0f52e568c7d8d2c18a69170c2363b574fbe5c86ce352d0768178c3fde6372576c45e0fdf80537ebde773689e3ad8584baddb889d0ede
+ VERSION=1.2.6
+ PATCHLEVEL=0
+ SOURCE_HASH=sha512:5bcfe8f427edb8cc7288b25b2205814c035bdaba7819c2f1b405bdda37fcca5ea2dc04060a918db0c66de88e671024bde8f3def67af261c98c39aae9640c164f
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.zlib.net/$SOURCE
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index 95ae1786aa..e4b24c8c02 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,7 @@
+2012-01-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.2.6
+ * pkgpath.patch: updated
+
2011-01-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* BUILD: set CFLAGS to sane values to avoid segfault in firefox with gcc 4.5
diff --git a/archive-libs/zlib/pkgpath.patch b/archive-libs/zlib/pkgpath.patch
index e7437d5357..eb4cbd26a2 100644
--- a/archive-libs/zlib/pkgpath.patch
+++ b/archive-libs/zlib/pkgpath.patch
@@ -1,15 +1,15 @@
---- Makefile.in.orig 2010-03-14 05:10:27.000000000 +0300
-+++ Makefile.in 2010-03-16 15:01:38.585868726 +0300
-@@ -48,7 +48,7 @@
+--- Makefile.in.orig 2012-01-30 18:36:25.000000000 +0100
++++ Makefile.in 2012-01-30 18:40:12.000000000 +0100
+@@ -52,7 +52,7 @@
includedir = ${prefix}/include
mandir = ${prefix}/share/man
man3dir = ${mandir}/man3
-pkgconfigdir = ${libdir}/pkgconfig
+pkgconfigdir = ${prefix}/lib/pkgconfig
+ tempfile := $(shell mktemp -u __XXXXXX)
- OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
- gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
-@@ -182,11 +182,11 @@
+ OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+@@ -210,8 +210,8 @@
install: install-libs
-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
@@ -19,8 +19,4 @@
+ chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zutil.h
uninstall:
-- cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h
-+ cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h zutil.h
- cd $(DESTDIR)$(libdir); rm -f libz.a; \
- if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
- rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
+ cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h