diff options
Diffstat (limited to 'source/x/xdg-user-dirs')
| -rw-r--r-- | source/x/xdg-user-dirs/slack-desc | 8 | ||||
| -rwxr-xr-x | source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild | 23 |
2 files changed, 20 insertions, 11 deletions
diff --git a/source/x/xdg-user-dirs/slack-desc b/source/x/xdg-user-dirs/slack-desc index 543415cbb..8ea428003 100644 --- a/source/x/xdg-user-dirs/slack-desc +++ b/source/x/xdg-user-dirs/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------------------------------------------------------| @@ -10,7 +10,7 @@ xdg-user-dirs: xdg-user-dirs (manage XDG user directories) xdg-user-dirs: xdg-user-dirs: xdg-user-dirs is a tool used by various XDG compliant desktop xdg-user-dirs: environments to locate user well-known user directories such as -xdg-user-dirs: the Desktop folder. It also handles localization/translation of the +xdg-user-dirs: the Desktop folder. It also handles localization/translation of the xdg-user-dirs: filenames. xdg-user-dirs: xdg-user-dirs: Homepage: http://freedesktop.org/wiki/Software/xdg-user-dirs diff --git a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild index c6cd23327..9bea00aa3 100755 --- a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild +++ b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for xdg-user-dirs # Copyright 2010 Robby Workman, Northport, Alabama, USA -# Copyright 2014 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2014, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,24 +23,33 @@ # 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=xdg-user-dirs VERSION=${VERSION:-0.15} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) 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" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" |