office/calcurse: Updated for version 4.2.2 + New maintainer.

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

3 files changed, 29 insertions, 26 deletions

diff --git a/office/calcurse/README b/office/calcurse/README
index 8b3b82f0ff..0332ff35b4 100644
--- a/office/calcurse/README
+++ b/office/calcurse/README
@@ -1,4 +1,6 @@
-CalCurse is a calendar and todo list for the console which allows
-you to keep track of your appointments and everyday tasks. CalCurse
-has a nice textmode interface with configurable color schemes, configurable
-layout and Vi-like keybindings.
+calcurse is a calendar and scheduling application for the command line. It
+helps keep track of events, appointments and everyday tasks. A configurable
+notification system reminds user of upcoming deadlines, the curses based
+interface can be customized to suit user needs and a very powerful set of
+command line options can be used to filter and format appointments, making
+it suitable for use in scripts.
diff --git a/office/calcurse/calcurse.SlackBuild b/office/calcurse/calcurse.SlackBuild
index 0b266bd3cd..77d56243f8 100644
--- a/office/calcurse/calcurse.SlackBuild
+++ b/office/calcurse/calcurse.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for calcurse
 
+# Copyright 2017 Frédéric Galusik, Lyon, France
 # Copyright 2007-2011  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
@@ -25,13 +26,13 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=calcurse
-VERSION=${VERSION:-3.2.1}
+VERSION=${VERSION:-4.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
     LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -66,10 +67,10 @@ 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 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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" \
@@ -83,22 +84,22 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-# Remove the manual.html since it's the same as the one in /usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
+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 ABOUT-NLS AUTHORS COPYING INSTALL NEWS README doc/manual* doc/$PRGNAM.1.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
+
+# move doc to the right place
+cp -a $PKG/usr/share/doc/calcurse/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -Rf $PKG/usr/share/doc
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/calcurse/calcurse.info b/office/calcurse/calcurse.info
index baabb16a30..cfe952d0a9 100644
--- a/office/calcurse/calcurse.info
+++ b/office/calcurse/calcurse.info
@@ -1,10 +1,10 @@
 PRGNAM="calcurse"
-VERSION="3.2.1"
+VERSION="4.2.2"
 HOMEPAGE="http://calcurse.org/"
-DOWNLOAD="http://calcurse.org/files/calcurse-3.2.1.tar.gz"
-MD5SUM="427652c011bc5314c71c962233d59436"
+DOWNLOAD="http://calcurse.org/files/calcurse-4.2.2.tar.gz"
+MD5SUM="5b429561569159008c855a106e0f1a21"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
+MAINTAINER="Frédéric Galusik"
+EMAIL="slack+SBo@galusik.xyz"