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/l/db48/db48.SlackBuild | 36 +++++++++++++++++++-------- source/l/db48/db48.no.broken.doc.install.diff | 14 +++++++++++ source/l/db48/slack-desc | 6 ++--- 3 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 source/l/db48/db48.no.broken.doc.install.diff (limited to 'source/l/db48') diff --git a/source/l/db48/db48.SlackBuild b/source/l/db48/db48.SlackBuild index 2a6c29eb1..3b3ce45ae 100755 --- a/source/l/db48/db48.SlackBuild +++ b/source/l/db48/db48.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,28 +20,37 @@ # 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=db48 VERSION=4.8.30 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} # 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-$PKGNAM -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" @@ -58,8 +67,8 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf db-$VERSION -tar xvf $CWD/db-$VERSION.tar.xz -cd db-$VERSION +tar xvf $CWD/db-$VERSION.tar.xz || exit 1 +cd db-$VERSION || exit 1 chown -R root:root . find . \ @@ -68,9 +77,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# We aren't installing the docs anyway so let's not let them break the build: +zcat $CWD/db48.no.broken.doc.install.diff.gz | patch -p1 --verbose || exit 1 + rm -rf build-dir mkdir build-dir cd build-dir + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ../dist/configure \ @@ -83,7 +96,10 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make -i install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/source/l/db48/db48.no.broken.doc.install.diff b/source/l/db48/db48.no.broken.doc.install.diff new file mode 100644 index 000000000..829e8636d --- /dev/null +++ b/source/l/db48/db48.no.broken.doc.install.diff @@ -0,0 +1,14 @@ +--- ./dist/Makefile.in.orig 2010-04-12 15:25:22.000000000 -0500 ++++ ./dist/Makefile.in 2018-04-09 11:58:49.634283283 -0500 +@@ -1001,11 +1001,6 @@ + + install_docs: + @echo "Installing documentation: $(DESTDIR)$(docdir) ..." +- @test -d $(DESTDIR)$(docdir) || \ +- ($(MKDIR) -p $(DESTDIR)$(docdir) && \ +- $(CHMOD) $(dmode) $(DESTDIR)$(docdir)) +- @cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST) +- @cd $(srcdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/ + + uninstall_docs: + @cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST) diff --git a/source/l/db48/slack-desc b/source/l/db48/slack-desc index e792b8606..285251303 100644 --- a/source/l/db48/slack-desc +++ b/source/l/db48/slack-desc @@ -1,8 +1,8 @@ # 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 customary to +# 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------------------------------------------------------| -- cgit v1.2.3