4 files changed, 53 insertions, 40 deletions
diff --git a/development/geany/README b/development/geany/README
index 2d0e291a90061..7d941053e411e 100644
--- a/development/geany/README
+++ b/development/geany/README
@@ -1,8 +1,10 @@
-Geany is a small and lightweight Integrated Development Environment.
-It was developed to  provide a  small  and fast  IDE, which  has only 
-a few dependencies from other packages. It supports many filetypes 
-and has some nice features.
-
-Geany can optionally be built with support for virtual terminals if 
-you have gnome's vte installed (vte has no other gnome dependencies, 
-and it is available from SlackBuilds.org).
+geany 0.13 Small Fast GTK2 IDE
+
+Geany is a text editor using the GTK2 toolkit with basic features of an
+integrated development environment. It was developed to provide a
+small and fast IDE, which has only a few dependencies from other
+packages. It supports many filetypes and has some nice features. 
+
+
+
+
diff --git a/development/geany/geany.SlackBuild b/development/geany/geany.SlackBuild
index fe11c719bb656..acbc105f79579 100644
--- a/development/geany/geany.SlackBuild
+++ b/development/geany/geany.SlackBuild
@@ -1,18 +1,21 @@
 #!/bin/sh
 
-## Written by hollywoodb (hollywoodb@fastmail.fm)
-## Package Homepage: http://geany.uvena.de/
+# Slackware build script for Geany
 
-# Modified by the SlackBuilds.org project
+# Written by  Evan Hisey <ehisey@gmail.com>
+# Modified by Robby Workman <rworkman@slackbuilds.org>
 
-NAME=geany
-VERSION=0.11
+# Exit on most errors
+set -e
+
+PRGNAM=geany
+VERSION=0.13
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$NAME
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
@@ -23,10 +26,10 @@ fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf $NAME-$VERSION
-tar jxvf $CWD/$NAME-$VERSION.tar.bz2 || exit 1
-cd $TMP/$NAME-$VERSION || exit 1
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -38,11 +41,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-the-force \
-  || exit 1
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-the-force
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -51,19 +54,19 @@ make install DESTDIR=$PKG || exit 1
 
 ( 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
+  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-mkdir -p $PKG/usr/doc/$NAME-$VERSION$SUBVER
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \
-  $PKG/usr/doc/$NAME-$VERSION
-mv $PKG/usr/share/geany/GPL-2 $PKG/usr/share/doc/geany/* $PKG/usr/doc/$NAME-$VERSION
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/{geany/GPL-2,doc/geany/*} $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc
-cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
+cp -a INSTALL THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$NAME-$VERSION$SUBVER-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/development/geany/geany.info b/development/geany/geany.info
index eb2a46bf76db1..7dd0e46653228 100644
--- a/development/geany/geany.info
+++ b/development/geany/geany.info
@@ -1,8 +1,8 @@
 PRGNAM="geany"
-VERSION="0.11"
-HOMEPAGE="http://geany.uvena.de/"
-DOWNLOAD="http://dl.sourceforge.net/geany/geany-0.11.tar.bz2"
-MD5SUM="48b0ff7eec8e2a2c02180c83a8c883fd"
-MAINTAINER="hollywoodb"
-EMAIL="hollywoodb@fastmail.fm"
-APPROVED="rworkman"
+VERSION="0.13"
+HOMEPAGE="http://geany.uvena.de/Main/HomePage"
+DOWNLOAD="http://downloads.sourceforge.net/geany/geany-0.13.tar.bz2"
+MD5SUM="0dc4f30b5ee9132f136fd3e7e4f02e0c"
+MAINTAINER="Evan Hisey"
+EMAIL="ehisey@gmail.com"
+APPROVED="Michiel"
diff --git a/development/geany/slack-desc b/development/geany/slack-desc
index 88c98b9d35629..94973e4d5af2d 100644
--- a/development/geany/slack-desc
+++ b/development/geany/slack-desc
@@ -1,9 +1,17 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
 geany: Geany (A small and lightweight Integrated Development Environment)
 geany:
-geany: With basic features of an integrated development environment. It was
-geany: developed to  provide a  small  and fast  IDE, which  has only a few
-geany: dependencies from other packages. It supports many filetypes and has
-geany: some nice features.
+geany: Geany is a text editor using the GTK2 toolkit with basic features of
+geany: an integrated development environment. It was developed to provide a
+geany: small and fast IDE, which has only a few dependencies from other
+geany: packages. It supports many filetypes and has some nice features.
 geany:
 geany: Homepage: http://geany.uvena.de/
 geany: