network/x11vnc: Updated for version 0.9.7

2 files changed, 38 insertions, 9 deletions

diff --git a/network/x11vnc/x11vnc.SlackBuild b/network/x11vnc/x11vnc.SlackBuild
index ba83313858c8..aada3583c60e 100644
--- a/network/x11vnc/x11vnc.SlackBuild
+++ b/network/x11vnc/x11vnc.SlackBuild
@@ -1,14 +1,36 @@
 #!/bin/sh
 
-# Pierre Cazenave <pwcazenave <at> gmail <dot> com>
+# Slackbuild for x11vnc.
 #       Original script for version 0.9.3 10/11/2007
 #       Updated for version 0.9.6 21/11/2008
+#       Updated for Slackware64 and version 0.9.7 28/05/2009
+#
+# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
 # Modified by Robby Workman <rworkman@slackbuilds.org>
+#
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=x11vnc
-VERSION=0.9.6
+VERSION=0.9.7
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -18,10 +40,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
  elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
  elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 rm -rf $TMP/$PRGNAM-$VERSION $PKG
@@ -35,6 +60,7 @@ chmod -R u+w,go+r-w,a-s .
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -44,8 +70,10 @@ 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
-   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -57,6 +85,7 @@ 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 {} \;
 
 mkdir -p $PKG/install
diff --git a/network/x11vnc/x11vnc.info b/network/x11vnc/x11vnc.info
index a9b930d020c0..91733104f6f8 100644
--- a/network/x11vnc/x11vnc.info
+++ b/network/x11vnc/x11vnc.info
@@ -1,8 +1,8 @@
 PRGNAM="x11vnc"
-VERSION="0.9.6"
+VERSION="0.9.7"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
-DOWNLOAD="http://www.karlrunge.com/x11vnc/x11vnc-0.9.6.tar.gz"
-MD5SUM="4f326504767e2dff3d59fe31c5d79f5b"
+DOWNLOAD="http://www.karlrunge.com/x11vnc/x11vnc-0.9.7.tar.gz"
+MD5SUM="30a167577f657909b3355421e14e2ddb"
 MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave <at> gmail <dot> com"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"