summaryrefslogtreecommitdiffstats
path: root/archive-libs/zlib
diff options
context:
space:
mode:
authorVlad Glagolev2012-05-12 03:09:58 +0400
committerVlad Glagolev2012-05-12 03:09:58 +0400
commitef54f43e56115282f608f3c58602af6b155df2b0 (patch)
treea6af2fa82339805f79e4e533ac2f58f0355134bc /archive-libs/zlib
parentbcc8ab83730b2972273bae981205da360c70b5fc (diff)
zlib: => 1.2.7
Diffstat (limited to 'archive-libs/zlib')
-rwxr-xr-xarchive-libs/zlib/BUILD3
-rwxr-xr-xarchive-libs/zlib/DETAILS7
-rw-r--r--archive-libs/zlib/HISTORY6
-rwxr-xr-xarchive-libs/zlib/PRE_BUILD2
-rw-r--r--archive-libs/zlib/pkgpath.patch8
5 files changed, 13 insertions, 13 deletions
diff --git a/archive-libs/zlib/BUILD b/archive-libs/zlib/BUILD
index d971d4e5a8..4326b75097 100755
--- a/archive-libs/zlib/BUILD
+++ b/archive-libs/zlib/BUILD
@@ -3,8 +3,6 @@ OPTS="--eprefix=$INSTALL_ROOT $OPTS" &&
CFLAGS="$CFLAGS -DPIC -fPIC" &&
CFLAGS="${CFLAGS/-O?/-O3} -fno-tree-vectorize -mstackrealign -DUNALIGNED_OK" &&
-rm -f ${INSTALL_ROOT}/usr/X11R6/include/zlib.h
-rm -f ${INSTALL_ROOT}/usr/X11R6/lib/libz.a
sedit "s/-O/$CFLAGS/" Makefile &&
./configure --prefix=${TRACK_ROOT}/usr \
@@ -17,4 +15,3 @@ cd $SOURCE_DIRECTORY.static &&
$OPTS &&
make prefix=${INSTALL_ROOT}/usr
-
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index 25cd7ef571..b479a80fe6 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -1,9 +1,8 @@
SPELL=zlib
- VERSION=1.2.6
- PATCHLEVEL=0
- SOURCE_HASH=sha512:5bcfe8f427edb8cc7288b25b2205814c035bdaba7819c2f1b405bdda37fcca5ea2dc04060a918db0c66de88e671024bde8f3def67af261c98c39aae9640c164f
+ VERSION=1.2.7
+ SOURCE_HASH=sha512:3e18c3923210c2c3da6e12735c0d2babdaf661fb704430516b00aaab8d5e690d8d8f46646173c634f04b050a59bf979d343aede472c5038afcda7baa2c897635
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.zlib.net/$SOURCE
WEB_SITE=http://www.zlib.net/
ENTERED=20010922
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index e4b24c8c02..451edf75ce 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,9 @@
+2012-05-12 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.2.7; quoting paths
+ * BUILD: removed obsolete rm commands
+ * PRE_BUILD: removed deprecated sed line
+ * pkgpath.patch: updated
+
2012-01-30 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.2.6
* pkgpath.patch: updated
diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD
index 5685f17160..6db4d60c55 100755
--- a/archive-libs/zlib/PRE_BUILD
+++ b/archive-libs/zlib/PRE_BUILD
@@ -3,7 +3,5 @@ cd "$SOURCE_DIRECTORY" &&
patch -p0 < "$SPELL_DIRECTORY/pkgpath.patch" &&
-sed -i 's/ifdef _LARGEFILE64_SOURCE/ifndef _LARGEFILE64_SOURCE/' zlib.h &&
-
mk_source_dir "$SOURCE_DIRECTORY.static" &&
cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static
diff --git a/archive-libs/zlib/pkgpath.patch b/archive-libs/zlib/pkgpath.patch
index eb4cbd26a2..5f56ecc925 100644
--- a/archive-libs/zlib/pkgpath.patch
+++ b/archive-libs/zlib/pkgpath.patch
@@ -1,15 +1,15 @@
---- Makefile.in.orig 2012-01-30 18:36:25.000000000 +0100
-+++ Makefile.in 2012-01-30 18:40:12.000000000 +0100
+--- Makefile.in.orig 2012-04-23 09:58:06.000000000 +0400
++++ Makefile.in 2012-05-12 02:58:43.735614854 +0400
@@ -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)
OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
-@@ -210,8 +210,8 @@
+ OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
+@@ -212,8 +212,8 @@
install: install-libs
-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi