summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/slackroll/slackroll.SlackBuild15
-rw-r--r--system/slackroll/slackroll.info6
2 files changed, 12 insertions, 9 deletions
diff --git a/system/slackroll/slackroll.SlackBuild b/system/slackroll/slackroll.SlackBuild
index 4088c4a1d6..b67bb23661 100644
--- a/system/slackroll/slackroll.SlackBuild
+++ b/system/slackroll/slackroll.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for slackroll
-# Copyright 2011-2018 Andrew Clemons, Wellington New Zealand
+# Copyright 2011-2018,2020-2021 Andrew Clemons, Wellington New Zealand
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,9 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=slackroll
-VERSION=${VERSION:-v48}
-SRCVER=${VERSION#v}
+GITREV="${GITREV:-0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac}"
+VERSION=${VERSION:-git$(echo "$GITREV" | sed 's/^\(.\{7\}\).*$/\1/')}
+SRCVER=${SRCVER:-v48}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -40,9 +41,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$GITREV
+tar xvf $CWD/$PRGNAM-$GITREV.tar.gz
+cd $PRGNAM-$GITREV
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -67,6 +68,8 @@ cp -a \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mv $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$SRCVER
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/slackroll/slackroll.info b/system/slackroll/slackroll.info
index 6cad4e8adb..aa3edaa433 100644
--- a/system/slackroll/slackroll.info
+++ b/system/slackroll/slackroll.info
@@ -1,8 +1,8 @@
PRGNAM="slackroll"
-VERSION="v48"
+VERSION="git0c6ab0b"
HOMEPAGE="http://rg3.github.io/slackroll/"
-DOWNLOAD="https://github.com/rg3/slackroll/archive/v48/slackroll-48.tar.gz"
-MD5SUM="145652bb1b1170dfd7b2ca661bfd3301"
+DOWNLOAD="https://github.com/rg3/slackroll/archive/0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac/slackroll-0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac.tar.gz"
+MD5SUM="4474bcb2e48cf55947c9b30022381a9e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""