6 files changed, 65 insertions, 18 deletions
diff --git a/graphics/evolus-pencil/README b/graphics/evolus-pencil/README
index 4a2d6e4d73b72..e50af1c81f593 100644
--- a/graphics/evolus-pencil/README
+++ b/graphics/evolus-pencil/README
@@ -1,5 +1,7 @@
-The Pencil Project's unique mission is to build a free and
-opensource tool for making diagrams and GUI prototyping that
-everyone can use.
+The Pencil Project's unique mission is to build a free and opensource
+tool for making diagrams and GUI prototyping that everyone can use.
+
+For more stencils and templates, visit
+http://code.google.com/p/evoluspencil/downloads/list
 
 This requires xulrunner.
diff --git a/graphics/evolus-pencil/doinst.sh b/graphics/evolus-pencil/doinst.sh
index 24e4bc11e0955..5fb28930db0b9 100644
--- a/graphics/evolus-pencil/doinst.sh
+++ b/graphics/evolus-pencil/doinst.sh
@@ -1,4 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
diff --git a/graphics/evolus-pencil/evolus-pencil.SlackBuild b/graphics/evolus-pencil/evolus-pencil.SlackBuild
index 87d8087e0d0db..9421060bccdd3 100644
--- a/graphics/evolus-pencil/evolus-pencil.SlackBuild
+++ b/graphics/evolus-pencil/evolus-pencil.SlackBuild
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Slackware build script for evolus-pencil
+
 # Copyright 2010  Binh Nguyen <binhnguyen@fastmail.fm>
 # All rights reserved.
 #
@@ -20,30 +22,61 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 PRGNAM=evolus-pencil
-VERSION=1.2
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.2}
+BUILD=${BUILD:-2}
+APPBUILD=${APPBUILD:-0}
 TAG=${TAG:-_SBo}
 
-ARCH=i386
-
-RPMBUILD=0
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
 set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $PKG
-rpm2cpio $CWD/$PRGNAM-$VERSION-$RPMBUILD.$ARCH.rpm | cpio -imdv
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/Pencil-$VERSION-$APPBUILD-linux-gtk.tar.gz -C $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION $PKG/usr/bin
+cp -a * $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION 
+
+# Remove unnecessary stuff
+rm $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/pencil 
+find $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION -name "*~" -delete
+
+# Create start-up script for the app
+cat <<EOT >$PKG/usr/bin/evoluspencil
+#!/bin/sh
+/usr/bin/xulrunner --app "/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/application.ini"
+EOT
+chmod 0755 $PKG/usr/bin/evoluspencil
+
+# Correct desktop file and put it in place
+mkdir -p $PKG/usr/share/applications
+sed "s/lib/lib${LIBDIRSUFFIX}/" $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/evolus-pencil/evolus-pencil.desktop b/graphics/evolus-pencil/evolus-pencil.desktop
new file mode 100644
index 0000000000000..36d764a7c7f89
--- /dev/null
+++ b/graphics/evolus-pencil/evolus-pencil.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Pencil Sketching Tool
+Comment=Sketching and GUI prototyping tool
+Exec=/usr/bin/evoluspencil
+Terminal=false
+Type=Application
+StartupNotify=true
+Icon=/usr/lib/evolus-pencil-1.2/chrome/content/Icons/icon.svg
+Categories=Graphics;2DGraphics;Development
+MimeType=application/ep
+Name[en_US]=Pencil Sketching Tool
+Name[vi_VN]=Công cụ phát thảo Pencil
diff --git a/graphics/evolus-pencil/evolus-pencil.info b/graphics/evolus-pencil/evolus-pencil.info
index 3b057724b3781..4dac175fd5fdc 100644
--- a/graphics/evolus-pencil/evolus-pencil.info
+++ b/graphics/evolus-pencil/evolus-pencil.info
@@ -1,10 +1,10 @@
 PRGNAM="evolus-pencil"
 VERSION="1.2"
 HOMEPAGE="http://pencil.evolus.vn/"
-DOWNLOAD="http://evoluspencil.googlecode.com/files/evolus-pencil-1.2-0.i386.rpm"
-MD5SUM="84d25c824f89185813c8649ed3d2196f"
-DOWNLOAD_x86_64="UNSUPPORTED"
+DOWNLOAD="http://evoluspencil.googlecode.com/files/Pencil-1.2-0-linux-gtk.tar.gz"
+MD5SUM="e6aab47b8ce77d523eb2c412ec7fccc2"
+DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Binh Nguyen"
 EMAIL="binhnguyen@fastmail.fm"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/graphics/evolus-pencil/slack-desc b/graphics/evolus-pencil/slack-desc
index e467ae830b8d1..8437e1eea1eb5 100644
--- a/graphics/evolus-pencil/slack-desc
+++ b/graphics/evolus-pencil/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler----------------------------------------------------|
-evolus-pencil: Evolus Pencil (The Opensource GUI Prototyping Tool)
+evolus-pencil: Evolus Pencil (Opensource GUI Prototyping Tool)
 evolus-pencil:
 evolus-pencil: The Pencil Project's unique mission is to build a free and
 evolus-pencil: opensource tool for making diagrams and GUI prototyping that