4 files changed, 41 insertions, 31 deletions
diff --git a/accessibility/easystroke/README b/accessibility/easystroke/README
index e9a4cf5372..9028f62b99 100644
--- a/accessibility/easystroke/README
+++ b/accessibility/easystroke/README
@@ -1,14 +1,17 @@
 Easystroke is a gesture-recognition application for X11.
+Gestures or strokes are movements that you make with you
+mouse (or your pen, finger etc.) while holding down a specific
+mouse button. Easystroke will execute certain actions if
+it recognizes the stroke; currently easystroke can emulate
+key presses, execute shell commands, hold down modifiers and
+emulate a scroll wheel. 
 
-Gestures or strokes are movements that you make with you mouse (or your pen, 
-finger etc.) while holding down a specific mouse button.  Easystroke will 
-execute certain actions if it recognizes the stroke; currently easystroke 
-can emulate key presses, execute shell commands, hold down modifiers and 
-emulate a scroll wheel.
-
-The program was designed with Tablet PCs in mind and can be used effectively 
-even without access to a keyboard.  Easystroke tries to provide an intuitive 
-and efficient user interface while being highly configurable and offering 
+The program was designed with Tablet PCs in mind and can be
+used effectively even without access to a keyboard. Easystroke
+tries to provide an intuitive and efficient user interface,
+while at the same time being highly configurable and offering
 many advanced features.
 
-This requires help2man, boost, and gtkmm.
+Easystroke requires gtkmm.  If you'd also like the manpage installed
+then help2man needs to be installed and then pass COMPILE_MAN=yes
+to the slackbuild.
+\ No newline at end of file
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}
diff --git a/accessibility/easystroke/easystroke.info b/accessibility/easystroke/easystroke.info
index dcf43d0ae3..42e8c0265e 100644
--- a/accessibility/easystroke/easystroke.info
+++ b/accessibility/easystroke/easystroke.info
@@ -1,8 +1,10 @@
 PRGNAM="easystroke"
-VERSION="0.4.5"
+VERSION="0.4.9"
 HOMEPAGE="http://easystroke.wiki.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/easystroke/easystroke-0.4.5.tar.gz"
-MD5SUM="b08baf1f51d969d9ce55519977b3c466"
+DOWNLOAD="http://downloads.sourceforge.net/sourceforge/easystroke/easystroke-0.4.9.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="4d95a69a29a7fb57468044df4570e665"
+MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"
diff --git a/accessibility/easystroke/slack-desc b/accessibility/easystroke/slack-desc
index ef14012403..f2fc90ae8c 100644
--- a/accessibility/easystroke/slack-desc
+++ b/accessibility/easystroke/slack-desc
@@ -6,14 +6,14 @@
 # leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-easystroke: easystroke
+easystroke: easystroke (gesture-recognition application for X11)
 easystroke: 
 easystroke: Easystroke is a gesture-recognition application for X11. Gestures or 
 easystroke: strokes are movements that you make with you mouse (or your pen, 
 easystroke: finger etc.) while holding down a specific mouse button.
-easystroke: 
+easystroke:
+easystroke:
+easystroke:
+easystroke:
+easystroke:
 easystroke: Homepage: http://easystroke.wiki.sourceforge.net/
-easystroke: 
-easystroke: 
-easystroke: 
-easystroke: