1 files changed, 16 insertions, 11 deletions
diff --git a/accessibility/easystroke/easystroke.SlackBuild b/accessibility/easystroke/easystroke.SlackBuild
index 0dc4c7c638..0eba1eb045 100644
--- a/accessibility/easystroke/easystroke.SlackBuild
+++ b/accessibility/easystroke/easystroke.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=easystroke
-VERSION=${VERSION:-0.4.5}
+VERSION=${VERSION:-0.4.9}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -15,6 +15,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Determine if we compile manpages with help2man. Default is no.
+COMPILE_MAN=${COMPILE_MAN:-no}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -41,11 +44,18 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# USE the predefined ARCH SLKCFLAGS. Add StartupNotify to desktop menu item.
-sed -i "/^CXXFLAGS/s|-Wall|-Wall ${SLKCFLAGS}|" Makefile
+# Add StartupNotify to desktop menu item.
 echo "StartupNotify=false" >> $PRGNAM.desktop.in
 
-make man install PREFIX=/usr DESTDIR=$PKG
+make CXX="g++ $SLKCFLAGS" CC="gcc -std=c99 $SLKCFLAGS" PREFIX=/usr
+
+if [ "$COMPILE_MAN" == "yes" ]; then
+  make man
+  mkdir -p $PKG/usr/man/man1
+  gzip -9c $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+fi
+
+make install PREFIX=/usr DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -54,13 +64,8 @@ make man install PREFIX=/usr DESTDIR=$PKG
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-mkdir -p $PKG/usr/man/man1
-gzip -9c $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  changelog LICENSE \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a changelog LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -68,4 +73,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}