Date: Tuesday, September 13, 2011 @ 16:01:23 Author: bisson Revision: 137978
upstream update, cleanup Added: x11vnc/trunk/conf.d (from rev 137977, x11vnc/trunk/x11vnc.conf) x11vnc/trunk/rc.d (from rev 137977, x11vnc/trunk/x11vnc.rc) Modified: x11vnc/trunk/PKGBUILD Deleted: x11vnc/trunk/x11vnc.conf x11vnc/trunk/x11vnc.rc -------------+ PKGBUILD | 30 +++++++++++++++--------------- conf.d | 5 +++++ rc.d | 37 +++++++++++++++++++++++++++++++++++++ x11vnc.conf | 5 ----- x11vnc.rc | 37 ------------------------------------- 5 files changed, 57 insertions(+), 57 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-09-13 15:26:07 UTC (rev 137977) +++ PKGBUILD 2011-09-13 20:01:23 UTC (rev 137978) @@ -3,7 +3,7 @@ # Contributor: damir <da...@archlinux.org> pkgname=x11vnc -pkgver=0.9.12 +pkgver=0.9.13 pkgrel=1 pkgdesc='VNC server for real X displays' arch=('i686' 'x86_64') @@ -12,25 +12,25 @@ depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') optdepends=('tk: for GUI support') backup=('etc/conf.d/x11vnc') -source=("http://downloads.sourceforge.net/libvncserver/${pkgname}-${pkgver}.tar.gz" - 'x11vnc.rc' - 'x11vnc.conf') -sha1sums=('cf4e24bee5962b52d8f2a5442a7c44943a9cc0bb' - '3abb3fcadff32662ab847a9e772cd23cfdfe3d1a' - '11011cce06511e9ba61672a1c80bb63a3a187539') +source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'conf.d' + 'rc.d') +sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa' + '11011cce06511e9ba61672a1c80bb63a3a187539' + '477892cf0f0020043444b7493c80684762ded506') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver + rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver - install -D -m 755 "${srcdir}/x11vnc.rc" "${pkgdir}/etc/rc.d/x11vnc" - install -D -m 644 "${srcdir}/x11vnc.conf" "${pkgdir}/etc/conf.d/x11vnc" + install -D -m 755 "${srcdir}/rc.d" "${pkgdir}/etc/rc.d/x11vnc" + install -D -m 644 "${srcdir}/conf.d" "${pkgdir}/etc/conf.d/x11vnc" } Copied: x11vnc/trunk/conf.d (from rev 137977, x11vnc/trunk/x11vnc.conf) =================================================================== --- conf.d (rev 0) +++ conf.d 2011-09-13 20:01:23 UTC (rev 137978) @@ -0,0 +1,5 @@ +# +# Parameters to be passed to x11vnc +# + +X11VNC_ARGS="" Copied: x11vnc/trunk/rc.d (from rev 137977, x11vnc/trunk/x11vnc.rc) =================================================================== --- rc.d (rev 0) +++ rc.d 2011-09-13 20:01:23 UTC (rev 137978) @@ -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 Deleted: x11vnc.conf =================================================================== --- x11vnc.conf 2011-09-13 15:26:07 UTC (rev 137977) +++ x11vnc.conf 2011-09-13 20:01:23 UTC (rev 137978) @@ -1,5 +0,0 @@ -# -# Parameters to be passed to x11vnc -# - -X11VNC_ARGS="" Deleted: x11vnc.rc =================================================================== --- x11vnc.rc 2011-09-13 15:26:07 UTC (rev 137977) +++ x11vnc.rc 2011-09-13 20:01:23 UTC (rev 137978) @@ -1,37 +0,0 @@ -#!/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