From b44d8b48a86e070fbbeceeed0f4e1dbb3dd8f03a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Su=C4=8Dan?= <jan@jansucan.com>
Date: Tue, 12 May 2020 07:05:03 +0100
Subject: office/when: Updated for version 1.1.40.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 office/when/when.SlackBuild | 32 ++++++++------------------------
 office/when/when.info       |  6 +++---
 2 files changed, 11 insertions(+), 27 deletions(-)

(limited to 'office/when')

diff --git a/office/when/when.SlackBuild b/office/when/when.SlackBuild
index 69d9c535ec..5e744b4b04 100644
--- a/office/when/when.SlackBuild
+++ b/office/when/when.SlackBuild
@@ -22,8 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#  Modified by slackbuilds.org
+
 PRGNAM=when
-VERSION=${VERSION:-1.1.39}
+VERSION=${VERSION:-1.1.40}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,28 +42,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 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
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_dist
-tar xvf $CWD/$PRGNAM.tar.gz
-cd ${PRGNAM}_dist
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,12 +57,8 @@ 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 {} \;
 
-mkdir -p $PKG/usr/bin
-cp $PRGNAM $PKG/usr/bin
-
-mkdir -p $PKG/usr/man/man1
-cp $PRGNAM.1 $PKG/usr/man/man1
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+make install DESTDIR=$PKG MANDIR=/usr/man/man1
+install -m 755 $PRGNAM $PKG/usr/bin/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/office/when/when.info b/office/when/when.info
index 6d6a504a35..4c116378af 100644
--- a/office/when/when.info
+++ b/office/when/when.info
@@ -1,8 +1,8 @@
 PRGNAM="when"
-VERSION="1.1.39"
+VERSION="1.1.40"
 HOMEPAGE="http://www.lightandmatter.com/when/when.html"
-DOWNLOAD="http://www.lightandmatter.com/when/when.tar.gz"
-MD5SUM="6541047caa51d0c521b703a09579551e"
+DOWNLOAD="https://github.com/bcrowell/when/archive/1.1.40/when-1.1.40.tar.gz"
+MD5SUM="970b4ec6b81dc35d7bb59211b1d0c8a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3