diff options
Diffstat (limited to 'source/tcl/tk')
| -rw-r--r-- | source/tcl/tk/slack-desc | 6 | ||||
| -rwxr-xr-x | source/tcl/tk/tk.SlackBuild | 21 |
2 files changed, 18 insertions, 9 deletions
diff --git a/source/tcl/tk/slack-desc b/source/tcl/tk/slack-desc index 021e2fb82..1a600e213 100644 --- a/source/tcl/tk/slack-desc +++ b/source/tcl/tk/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------------------------------------------------------| diff --git a/source/tcl/tk/tk.SlackBuild b/source/tcl/tk/tk.SlackBuild index 9e7da916d..eb14a087b 100755 --- a/source/tcl/tk/tk.SlackBuild +++ b/source/tcl/tk/tk.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2012, 2013, 2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012, 2013, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,8 +20,10 @@ # 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) -VERSION=${VERSION:-8.6.5} +PKGNAM=tk +VERSION=${VERSION:-8.6.8} # See also version number 8.6 in the symlinks below...) BUILD=${BUILD:-2} @@ -35,6 +37,14 @@ if [ -z "$ARCH" ]; then esac fi +# 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 "} if [ "$ARCH" = "i586" ]; then @@ -54,7 +64,6 @@ elif [ "$ARCH" = "armel" ]; then LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-tk @@ -62,7 +71,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf tk$VERSION -tar xvf $CWD/tk$VERSION-src.tar.?z* || exit 1 +tar xvf $CWD/tk$VERSION-src.tar.?z || exit 1 cd tk$VERSION || exit 1 sed -i -e "s#^TK_LIBRARY='\$(prefix)/lib/#TK_LIBRARY='\$(libdir)/#" \ unix/configure @@ -87,7 +96,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-64bit \ --mandir=/usr/man \ --enable-man-symlinks \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 |