diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/l/zlib | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/zlib')
-rw-r--r-- | source/l/zlib/slack-desc | 10 | ||||
-rwxr-xr-x | source/l/zlib/zlib.SlackBuild | 62 |
2 files changed, 35 insertions, 37 deletions
diff --git a/source/l/zlib/slack-desc b/source/l/zlib/slack-desc index 41f7b6455..92b39c809 100644 --- a/source/l/zlib/slack-desc +++ b/source/l/zlib/slack-desc @@ -1,19 +1,19 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| zlib: zlib (compression library) zlib: -zlib: zlib is a general purpose thread safe data compression library. The +zlib: zlib is a general purpose thread safe data compression library. The zlib: data format used by the zlib library is described by RFCs 1950 to zlib: 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format) zlib: rfc1951.txt (deflate format) and rfc1952.txt (gzip format). zlib: -zlib: +zlib: Homepage: http://www.zlib.net zlib: zlib: zlib: diff --git a/source/l/zlib/zlib.SlackBuild b/source/l/zlib/zlib.SlackBuild index eb2842806..93a0e3787 100755 --- a/source/l/zlib/zlib.SlackBuild +++ b/source/l/zlib/zlib.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,30 +20,35 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=zlib -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-zlib -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -61,7 +66,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf zlib-$VERSION -tar xvf $CWD/zlib-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/zlib-$VERSION.tar.xz || exit 1 cd zlib-$VERSION || exit 1 chown -R root:root . @@ -73,29 +78,11 @@ find . \ CFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=/usr -make clean -make || exit 1 -CFLAGS="$SLKCFLAGS" \ -./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --shared + --shared || exit 1 make || exit 1 - -mkdir -p $PKG/usr/include -cp -a zlib.h zconf.h $PKG/usr/include -chmod 644 $PKG/usr/include/* -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} -cp -a libz.a libz.so* $PKG/usr/lib${LIBDIRSUFFIX} -chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/* -chmod 644 $PKG/usr/lib${LIBDIRSUFFIX}/libz.a -mkdir -p $PKG/usr/man/man3 -cat zlib.3 | gzip -9c > $PKG/usr/man/man3/zlib.3.gz - -# Add pkgconfig file: -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig -cat zlib.pc > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/zlib.pc +make install DESTDIR=$PKG || exit 1 # Now that libkmod requires libz, we had better move the shared library # up a level: @@ -114,6 +101,17 @@ mkdir $PKG/lib${LIBDIRSUFFIX} find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) +# Move man page directory: +mv $PKG/usr/share/man $PKG/usr +rmdir $PKG/usr/share + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + mkdir -p $PKG/usr/doc/zlib-$VERSION cp -a \ FAQ INDEX README* \ |