development/tup: New maintainer, minor fixes.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 34 insertions, 38 deletions

diff --git a/development/tup/README b/development/tup/README
index a283997b8f3dc..97ebc5a5b2407 100644
--- a/development/tup/README
+++ b/development/tup/README
@@ -1,4 +1,5 @@
-tup (A file-based build system)
+tup (file-based build system)
+
 Tup is a file-based build system for Linux, OSX, and Windows. It
 takes as input a list of file changes and a directed acyclic graph
 (DAG). It then processes the DAG to execute the appropriate commands
diff --git a/development/tup/slack-desc b/development/tup/slack-desc
index 90101dd6d6113..0a84a4e8a8e90 100644
--- a/development/tup/slack-desc
+++ b/development/tup/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
-tup: tup (A file-based build system)
+tup: tup (file-based build system)
 tup:
 tup: Tup is a file-based build system for Linux, OSX, and Windows. It
 tup: takes as input a list of file changes and a directed acyclic graph
diff --git a/development/tup/tup.SlackBuild b/development/tup/tup.SlackBuild
index 20831e3356fa5..6096121dfac73 100644
--- a/development/tup/tup.SlackBuild
+++ b/development/tup/tup.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for tup
 
 # Copyright 2022 Charadon US
+# Copyright 2023 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +23,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230829 bkw: BUILD=2
+# - take over maintenance.
+# - add a couple of missing doc files.
+# - actually use SLKCFLAGS.
+# - add ftdetect for vim, so the tup syntax highlighting actually works.
+# - use tup project page for homepage.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tup
 VERSION=${VERSION:-0.7.11}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +46,6 @@ case "$( uname -m )" in
 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -52,16 +57,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -73,36 +74,28 @@ rm -rf $PRGNAM-v$VERSION
 tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
 cd $PRGNAM-v$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS"
-CXXFLAGS="$SLKCFLAGS"
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+sed -i "s,-Os,$SLKCFLAGS," Tuprules.tup build.sh
+export CFLAGS="$SLKCFLAGS"
+
 ./build.sh
 ./build/tup init
 ./build/tup generate runme.sh
 ./runme.sh
 
-install -d $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/share/vim/vimfiles/{syntax,ftdetect}
-install -m755 -t $PKG/usr/bin tup
-install -m644 -t $PKG/usr/man/man1 tup.1
-install -m644 -t $PKG/usr/share/vim/vimfiles/syntax contrib/syntax/tup.vim
-
-
-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
-
-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/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGVIM=$PKG/usr/share/vim/vimfiles
+mkdir -p $PKG/usr/{bin,man/man1} $PKGVIM/{syntax,ftdetect}
+install -s -m755 -t $PKG/usr/bin tup
+gzip -9 < tup.1 > $PKG/usr/man/man1/tup.1.gz
+install -o root -g root -m644 -t $PKGVIM/syntax contrib/syntax/tup.vim
+install -o root -g root -m644 $CWD/tup.ftdect.vim $PKGVIM/ftdetect/tup.vim
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a *.md COPYING $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/tup/tup.ftdect.vim b/development/tup/tup.ftdect.vim
new file mode 100644
index 0000000000000..cb630e315a778
--- /dev/null
+++ b/development/tup/tup.ftdect.vim
@@ -0,0 +1,2 @@
+autocmd BufRead,BufNewFile *.tup setfiletype tup
+autocmd BufRead,BufNewFile Tupfile setfiletype tup
diff --git a/development/tup/tup.info b/development/tup/tup.info
index f2e6c80b9fd50..17c6752a1e070 100644
--- a/development/tup/tup.info
+++ b/development/tup/tup.info
@@ -1,10 +1,10 @@
 PRGNAM="tup"
 VERSION="0.7.11"
-HOMEPAGE="https://gittup.org"
+HOMEPAGE="https://gittup.org/tup/"
 DOWNLOAD="https://gittup.org/tup/releases/tup-v0.7.11.tar.gz"
 MD5SUM="03ba28a725a48a2c1f0075054bea35f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Charadon"
-EMAIL="dev@iotib.net"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"