office/calcurse: Updated for version 2.5

office/calcurse/calcurse.SlackBuild

@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for calcurse
-
-# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
+# Copyright 2007-2009  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,7 +24,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=calcurse
-VERSION=${VERSION:-2.3}
+VERSION=${VERSION:-2.5}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,13 +34,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-fi
 
 set -e # Exit on most errors
 
@@ -58,16 +50,25 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# CFLAGS are ignored here...
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
 
-make CFLAGS="$SLKCFLAGS"	# but not here... :-)
-make install DESTDIR=$PKG
+# Make sure we have the right compile flags set as calcurse seems to 
+# blatantly ignore this: no matter what we do.
+if [ "$ARCH" = "i486" ]; then
+  sed -i 's#CFLAGS = -O2 -Wall -g#CFLAGS="-O2 -march=i486 -mtune=i686 -Wall -g"#g' $TMP/$PRGNAM-$VERSION/Makefile
+elif [ "$ARCH" = "i686" ]; then
+  sed -i 's#CFLAGS = -O2 -Wall -g#CFLAGS="-O2 -march=i686 -mtune=i686 -Wall -g"#g' $TMP/$PRGNAM-$VERSION/Makefile
+fi
+
+make
+make install-strip DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true

office/calcurse/calcurse.info

@@ -1,8 +1,9 @@
 PRGNAM="calcurse"
-VERSION="2.3"
+VERSION="2.5"
 HOMEPAGE="http://culot.org/calcurse/"
-DOWNLOAD="http://culot.org/cgi-bin/get.cgi?calcurse-2.3.tar.gz"
-MD5SUM="3aaa2f788238a837df0cf137f3657567"
+DOWNLOAD="http://culot.org/cgi-bin/get.cgi?calcurse-2.5.tar.gz"
+MD5SUM="7868f67c49b426e3ab4a4d34ce16ef1d"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="dsomero"
+

office/calcurse/slack-desc

@@ -13,7 +13,7 @@ calcurse: you to keep track of your appointments and everyday tasks. CalCurse
 calcurse: has a nice textmode interface with configurable color schemes, 
 calcurse: configurable layout and Vi-like keybindings.
 calcurse:
-calcurse: Homepage: http://culot.org/calcurse/
 calcurse: 
+calcurse: Homepage: http://culot.org/calcurse/
 calcurse:
 calcurse: