diff options
Diffstat (limited to 'source/xap/xlockmore')
| -rw-r--r-- | source/xap/xlockmore/slack-desc | 10 | ||||
| -rwxr-xr-x | source/xap/xlockmore/xlockmore.SlackBuild | 23 |
2 files changed, 21 insertions, 12 deletions
diff --git a/source/xap/xlockmore/slack-desc b/source/xap/xlockmore/slack-desc index 92ee2c41..a18d57a2 100644 --- a/source/xap/xlockmore/slack-desc +++ b/source/xap/xlockmore/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 +# 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------------------------------------------------------| @@ -12,8 +12,8 @@ xlockmore: Patrick J. Naughton's xlock screensaver/locker for X, with many xlockmore: more modes added by David A. Bagley. xlockmore: xlockmore: The 'Bob' bitmap has been included especially for Slackware, as well -xlockmore: as a Linux penguin logo. (NOTE: the image of J. R. "Bob" Dobbs is a +xlockmore: as a Linux penguin logo. (NOTE: the image of J. R. "Bob" Dobbs is a xlockmore: registered trademark of The Subgenius Foundation, used by permission) xlockmore: -xlockmore: +xlockmore: Homepage: http://sillycycle.com/xlockmore.html xlockmore: diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild index 3516c567..e2fb8638 100755 --- a/source/xap/xlockmore/xlockmore.SlackBuild +++ b/source/xap/xlockmore/xlockmore.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,6 +20,7 @@ # 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=xlockmore VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} @@ -28,15 +29,23 @@ BUILD=${BUILD:-1} # 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 -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# 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 + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -51,7 +60,6 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xlockmore rm -rf $PKG @@ -93,7 +101,8 @@ CXXFLAGS="$SLKCFLAGS" \ --without-motif \ --without-esound \ --without-gtk \ - --build=$ARCH-slackware-linux + --enable-appdefaultdir=/etc/X11/app-defaults \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 cd xlock |