diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2016-06-30 20:26:57 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:31:18 +0200 |
commit | d31c50870d0bee042ce660e445c9294a59a3a65b (patch) | |
tree | 6bfc0de3c95267b401b620c2c67859557dc60f97 /source/tcl | |
parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
download | current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz |
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!
The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2. The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system. Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
Diffstat (limited to 'source/tcl')
-rwxr-xr-x | source/tcl/expect/expect.SlackBuild | 38 | ||||
-rw-r--r-- | source/tcl/expect/expect.exp_main_tk.c.version.require.diff | 11 | ||||
-rwxr-xr-x | source/tcl/tcl/tcl.SlackBuild | 20 | ||||
-rwxr-xr-x | source/tcl/tk/tk.SlackBuild | 28 |
4 files changed, 44 insertions, 53 deletions
diff --git a/source/tcl/expect/expect.SlackBuild b/source/tcl/expect/expect.SlackBuild index 42575f8f..ca3ecbd2 100755 --- a/source/tcl/expect/expect.SlackBuild +++ b/source/tcl/expect/expect.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2013, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +22,13 @@ PKGNAM=expect -VERSION=5.44.1.15 -TCLVER=8.6.0 -BUILD=${BUILD:-2} +VERSION=5.45 +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 ) ;; @@ -44,8 +43,8 @@ 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" @@ -58,17 +57,10 @@ else LIBDIRSUFFIX="" fi -if [ ! -d $TMP/tcl${TCLVER} ]; then - echo "ERROR: no $TMP/tcl${TCLVER} -- this is needed for Tcl internal headers" - exit 1 -fi - cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 -cd ${PKGNAM}-$VERSION || exit 1 - -zcat $CWD/expect.exp_main_tk.c.version.require.diff.gz | patch -p1 --verbose || exit 1 +rm -rf ${PKGNAM}${VERSION} +tar xvf $CWD/${PKGNAM}$VERSION.tar.xz || exit 1 +cd ${PKGNAM}$VERSION || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -87,23 +79,13 @@ CFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --disable-static \ --with-tclconfig=/usr/lib${LIBDIRSUFFIX} \ - --with-tclinclude=/usr/include/tcl-private/generic \ - --with-tkconfig=/usr/lib${LIBDIRSUFFIX} \ - --with-tkinclude=/usr/include/tk-private/generic \ + --with-tclinclude=/usr/include \ --build=$ARCH-slackware-linux # Build and install: make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# expectk will not work correctly if called from /bin/sh, -# but using /usr/bin/tclsh will work: -( cd $PKG/usr/bin - for file in multixterm tknewsbiff tkpasswd xpstat ; do - sed -i "s/bin\/sh/usr\/bin\/tclsh/g" $file - done -) - # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/tcl/expect/expect.exp_main_tk.c.version.require.diff b/source/tcl/expect/expect.exp_main_tk.c.version.require.diff deleted file mode 100644 index 3b4e3eb3..00000000 --- a/source/tcl/expect/expect.exp_main_tk.c.version.require.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./exp_main_tk.c.orig 2007-07-11 15:22:10.000000000 -0500 -+++ ./exp_main_tk.c 2009-05-11 16:26:15.000000000 -0500 -@@ -374,7 +374,7 @@ - goto done; - } - } -- if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) { -+ if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) { - code = TCL_ERROR; - goto done; - } diff --git a/source/tcl/tcl/tcl.SlackBuild b/source/tcl/tcl/tcl.SlackBuild index 0f553b76..b087ba72 100755 --- a/source/tcl/tcl/tcl.SlackBuild +++ b/source/tcl/tcl/tcl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012, 2013, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,14 +21,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-8.6.1} +VERSION=${VERSION:-8.6.5} # See also version number 8.6 in the symlinks below...) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # 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 ) ;; @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-tcl # Use -DHAVE_USLEEP=1 otherwise the bundled sqlite doesn't work well. -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686 -DHAVE_USLEEP=1" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -DHAVE_USLEEP=1" LIBDIRSUFFIX="" CONFARGS="--enable-64bit" elif [ "$ARCH" = "s390" ]; then @@ -90,7 +90,6 @@ CFLAGS="$SLKCFLAGS" \ --enable-threads \ --mandir=/usr/man \ --enable-man-symlinks \ - --enable-man-compression=gzip \ ${CONFARGS} \ --build=$ARCH-slackware-linux @@ -120,6 +119,13 @@ make install-private-headers DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/tcl/tk/tk.SlackBuild b/source/tcl/tk/tk.SlackBuild index f3f77bba..9e7da916 100755 --- a/source/tcl/tk/tk.SlackBuild +++ b/source/tcl/tk/tk.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012, 2013, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,14 +21,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-8.6.1} +VERSION=${VERSION:-8.6.5} # See also version number 8.6 in the symlinks below...) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # 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 ) ;; @@ -37,8 +37,8 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -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" @@ -87,7 +87,6 @@ CFLAGS="$SLKCFLAGS" \ --enable-64bit \ --mandir=/usr/man \ --enable-man-symlinks \ - --enable-man-compression=gzip \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -116,6 +115,21 @@ make install-private-headers DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1 | grep -v '\.gz$') ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc |