[arch-commits] Commit in x11vnc/repos (4 files)

[Eric Bélanger]

    Date: Tuesday, February 24, 2009 @ 22:11:17
  Author: eric
Revision: 27734

Merged revisions 356,27732 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/x11vnc/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r27732 | eric | 2009-02-24 21:47:12 -0500 (Tue, 24 Feb 2009) | 2 lines
  
  upgpkg: x11vnc 0.9.6-1
      upstream update, FHS man pages, added daemon script (close FS#11326)
........

Added:
  x11vnc/repos/extra-i686/x11vnc.conf
    (from rev 27732, x11vnc/trunk/x11vnc.conf)
  x11vnc/repos/extra-i686/x11vnc.rc
    (from rev 27732, x11vnc/trunk/x11vnc.rc)
Modified:
  x11vnc/repos/extra-i686/	(properties)
  x11vnc/repos/extra-i686/PKGBUILD

-------------+
 PKGBUILD    |   23 +++++++++++++----------
 x11vnc.conf |    5 +++++
 x11vnc.rc   |   37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 10 deletions(-)


Property changes on: x11vnc/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /x11vnc/trunk:1
   + /x11vnc/trunk:1-27733

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-25 02:47:35 UTC (rev 27733)
+++ extra-i686/PKGBUILD	2009-02-25 03:11:17 UTC (rev 27734)
@@ -2,21 +2,24 @@
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=x11vnc
-pkgver=0.9.4
+pkgver=0.9.6
 pkgrel=1
-pkgdesc="a VNC server for real X displays"
+pkgdesc="A VNC server for real X displays"
 arch=("i686" "x86_64")
+url="http://www.karlrunge.com/x11vnc/"
 license=("GPL2")
-#source=(http://dl.sourceforge.net/sourceforge/libvncserver/$pkgname-$pkgver.tar.gz)
-url="http://www.karlrunge.com/x11vnc/"
-source=("$url/$pkgname-$pkgver.tar.gz")
 depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
+backup=('etc/conf.d/x11vnc')
+source=(http://downloads.sourceforge.net/sourceforge/libvncserver/$pkgname-$pkgver.tar.gz \
+        x11vnc.rc x11vnc.conf)
+md5sums=('2d5a80271a11230ab8b26d10f0c5b563' '93fc00459cfa5fe76f07045ee89bd6d4'\
+         '3a6df4b01c7f02741904b978bb7bcd90')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install || return 1
+  make DESTDIR=$pkgdir install || return 1
+  install -D -m 755 $srcdir/x11vnc.rc $pkgdir/etc/rc.d/x11vnc || return 1
+  install -D -m 644 $srcdir/x11vnc.conf $pkgdir/etc/conf.d/x11vnc || return 1
 }
-
-md5sums=('75c717fc7468e0cf9a632a2172dea13a')

Copied: x11vnc/repos/extra-i686/x11vnc.conf (from rev 27732, x11vnc/trunk/x11vnc.conf)
===================================================================
--- extra-i686/x11vnc.conf	                        (rev 0)
+++ extra-i686/x11vnc.conf	2009-02-25 03:11:17 UTC (rev 27734)
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to x11vnc
+#
+
+X11VNC_ARGS=""

Copied: x11vnc/repos/extra-i686/x11vnc.rc (from rev 27732, x11vnc/trunk/x11vnc.rc)
===================================================================
--- extra-i686/x11vnc.rc	                        (rev 0)
+++ extra-i686/x11vnc.rc	2009-02-25 03:11:17 UTC (rev 27734)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/x11vnc
+
+PID=$(pidof -o %PPID /usr/bin/x11vnc)
+case "$1" in
+  start)
+    stat_busy "Starting x11vnc"
+    [ -z "$PID" ] && /usr/bin/x11vnc $X11VNC_ARGS &> /dev/null &
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon x11vnc
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping x11vnc"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon x11vnc
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0