From df739fea7a7dd09b248a8a3a399185fee24bdbe1 Mon Sep 17 00:00:00 2001
From: Andy Goth <andrew.m.goth@gmail.com>
Date: Fri, 20 Mar 2020 19:35:55 +0700
Subject: development/fossil: Update script.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/fossil/README            | 17 +++++++++++++++++
 development/fossil/fossil.SlackBuild | 20 ++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'development/fossil')

diff --git a/development/fossil/README b/development/fossil/README
index 3e14b50b03..b72e504d4d 100644
--- a/development/fossil/README
+++ b/development/fossil/README
@@ -56,3 +56,20 @@ Key technical points:
 - manifests can be amended by subsequent control artifacts
 - in most cases, symbolic names refer to the latest matching check-in
 - branches are implemented using propagating symbolic tags
+
+------------------------------------------------------------------------
+
+This SlackBuild script installs not only release versions of Fossil but
+also arbitrary development versions.  If the current directory contains
+a file named "fossil-src.tar.gz", it is used as the source archive, and
+the check-in timestamp is used as the version string.  For example, the
+package name could be "fossil-20200320T040201-x86_64-1_SBo.tgz".
+
+To download the latest trunk development version of Fossil, type:
+$ wget http://fossil-scm.org/home/tarball/fossil-src.tar.gz
+
+To download a specific version of Fossil, type:
+$ wget http://fossil-scm.org/home/tarball/$VERSION/fossil-src.tar.gz
+
+For more information on the allowable $VERSION formats, see:
+http://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki
diff --git a/development/fossil/fossil.SlackBuild b/development/fossil/fossil.SlackBuild
index 060d3ef219..26f0537af5 100644
--- a/development/fossil/fossil.SlackBuild
+++ b/development/fossil/fossil.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fossil
 
-# Copyright 2019 Andy Goth <andrew.m.goth@gmail.com>
+# Copyright 2020 Andy Goth <andrew.m.goth@gmail.com> USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -56,12 +56,21 @@ fi
 
 set -e
 
+FILE=$CWD/$PRGNAM-src-$VERSION.tar.gz
+DIR=$PRGNAM-$VERSION
+
+if [ ! -e "$FILE" ]; then
+  FILE=$CWD/$PRGNAM-src.tar.gz
+  DIR=$PRGNAM-src
+  VERSION=$( tar -xOf $FILE $DIR/manifest | sed '/^D/!d;s/\..*//;s/[-:D ]//g' )
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-src-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $DIR
+tar xvf $FILE
+cd $DIR
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,8 +78,7 @@ find -L . \
  \( -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 \
+CFLAGS=${CFLAGS:-$SLKCFLAGS} \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib$LIBDIRSUFFIX \
-- 
cgit v1.2.3