1 files changed, 18 insertions, 9 deletions
diff --git a/network/x11vnc/x11vnc.SlackBuild b/network/x11vnc/x11vnc.SlackBuild
index 160212a5a1..d26563d60b 100644
--- a/network/x11vnc/x11vnc.SlackBuild
+++ b/network/x11vnc/x11vnc.SlackBuild
@@ -5,7 +5,8 @@
 #       Updated for version 0.9.6 21/11/2008
 #       Updated for Slackware64 and version 0.9.7 28/05/2009
 #       Updated for version 0.9.8 22/11/2009
-#
+#       Updated for version 0.9.10 23/05/2010
+
 # Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 #
@@ -29,11 +30,20 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=x11vnc
-VERSION=0.9.8
-ARCH=${ARCH:-i486}
+VERSION=0.9.10
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -48,6 +58,9 @@ if [ "$ARCH" = "i486" ]; then
  elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $TMP/$PRGNAM-$VERSION $PKG
@@ -73,17 +86,13 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README ReleaseNotes \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc