From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 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. --- source/ap/a2ps/a2ps.SlackBuild | 87 +++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 56 deletions(-) (limited to 'source/ap/a2ps/a2ps.SlackBuild') diff --git a/source/ap/a2ps/a2ps.SlackBuild b/source/ap/a2ps/a2ps.SlackBuild index 6df5f4d0..e9dc3d57 100755 --- a/source/ap/a2ps/a2ps.SlackBuild +++ b/source/ap/a2ps/a2ps.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,33 +20,40 @@ # 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=a2ps -PKGNAM2=psutils -VERSION=${VERSION:-4.14} -A2PS=${A2PS:-4.14} -PSUTILS=${PSUTILS:-1.17} -BUILD=${BUILD:-5} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-7} # 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 + +NUMJOBS=${NUMJOBS:-" -j7 "} + TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG -if [ "$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" @@ -56,46 +63,15 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -# First, build and install psutils: cd $TMP -tar xvf $CWD/$PKGNAM2-${PSUTILS}.tar.gz || exit 1 -cd $PKGNAM2 - -# Make sure ownerships and permissions are sane: -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 -zcat $CWD/psutils.diff.gz | patch -p1 --verbose -E --backup --suffix=.orig || exit 1 -zcat $CWD/psutils.destdir.diff.gz | patch -p1 --verbose -E --backup --suffix=.orig || exit 1 - -# Build and install: -make -f Makefile.unix || exit 1 -make -f Makefile.unix install DESTDIR=$PKG || exit 1 - -# Add a documentation directory for psutils: -mkdir -p $PKG/usr/doc/$PKGNAM2-$PSUTILS -cp -a \ - LICENSE README \ - $PKG/usr/doc/$PKGNAM2-$PSUTILS - -# Build, install and delete temporary psutils package for a2ps -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM2-${PSUTILS}-$ARCH-$BUILD.txz || exit 1 -echo "Installing temporary $PKGNAM2 package (this will be removed when the SlackBuild finishes)" -/sbin/installpkg $TMP/$PKGNAM2-${PSUTILS}-$ARCH-$BUILD.txz || exit 1 -rm $TMP/$PKGNAM2-${PSUTILS}-$ARCH-$BUILD.txz || exit 1 - -# Then, build a2ps: -cd $TMP -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 -cd $PKGNAM-$A2PS - -zcat $CWD/a2ps.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -zcat $CWD/a2ps.a2ps_cfg.in.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +zcat $CWD/a2ps.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/a2ps.a2ps_cfg.in.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/a2ps-4.14-texinfo-nodes.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/a2ps-texi-comments.patch.gz | patch -p1 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -116,15 +92,14 @@ lispdir="/usr/share/emacs/site-lisp" \ --mandir=/usr/man \ --sysconfdir=/etc \ --with-medium=letter \ - $ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 # Build and install: -make || exit 1 +make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Remove temporary psutils package: -echo "Removing temporary psutils package" -/sbin/removepkg $PKGNAM2-${PSUTILS}-$ARCH-$BUILD || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ @@ -132,8 +107,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ # Add a documentation directory: mkdir -p $PKG/usr/doc/a2ps-$VERSION -cp -a ABOUT-NLS ANNOUNCE AUTHORS COPYING \ - FAQ INSTALL NEWS README THANKS TODO \ +cp -a \ + ANNOUNCE AUTHORS COPYING* FAQ NEWS README* THANKS TODO \ $PKG/usr/doc/a2ps-$VERSION # If there's a ChangeLog, installing at least part of the recent history -- cgit v1.2.3