2 files changed, 17 insertions, 15 deletions
diff --git a/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild b/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild
index f67629aa54730..afd83eed458bc 100644
--- a/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild
+++ b/misc/wkhtmltopdf/wkhtmltopdf.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wkhtmltopdf
-VERSION=${VERSION:-0.10.0_rc2}
+VERSION=${VERSION:-0.12.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,9 +36,9 @@ if [ -z "$ARCH" ]; then
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	# For consistency's sake, use this
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	# Drop the package in /tmp
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -60,14 +60,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*z?
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -83,10 +83,12 @@ fi
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/man
+mv $PKG/usr/share/man/* $PKG/usr/man/
+rm -rf $PKG/usr/share/
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING* README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING* README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/wkhtmltopdf/wkhtmltopdf.info b/misc/wkhtmltopdf/wkhtmltopdf.info
index d708ca02e05e4..45ec3c7690489 100644
--- a/misc/wkhtmltopdf/wkhtmltopdf.info
+++ b/misc/wkhtmltopdf/wkhtmltopdf.info
@@ -1,8 +1,8 @@
 PRGNAM="wkhtmltopdf"
-VERSION="0.10.0_rc2"
-HOMEPAGE="http://wkhtmltopdf.googlecode.com/"
-DOWNLOAD="http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.10.0_rc2.tar.bz2"
-MD5SUM="56043d6e5e0cc322332b3f8170a78686"
+VERSION="0.12.2.3"
+HOMEPAGE="http://wkhtmltopdf.com"
+DOWNLOAD="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/0.12.2.3.tar.gz"
+MD5SUM="ce6d0c8793d489a12007e6ab867bf310"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""