# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1229161001 0
# Node ID d029ffb67ea42b374dd8980d502b2a51f95a88e3
# Parent  3eb7682451ff01f5960bb3c7b7fe02cb21833eda
Up x11vnc (0.9.6)

diff -r 3eb7682451ff -r d029ffb67ea4 x11vnc-extra/receipt
--- a/x11vnc-extra/receipt	Sat Dec 13 09:29:32 2008 +0000
+++ b/x11vnc-extra/receipt	Sat Dec 13 09:36:41 2008 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="x11vnc-extra"
-VERSION="0.9.3"
+VERSION="0.9.6"
 CATEGORY="network"
 SHORT_DESC="java VNC viewer"
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -14,3 +14,9 @@
 	mkdir -p $fs/usr/share
 	cp -a $_pkg/usr/share/x11vnc $fs/usr/share
 }
+
+# Post install/remove commands for Tazpkg.
+post_install()
+{
+	sed -i 's/X11VNC_OPTIONS="/X11VNC_OPTIONS="-ssl -http /' $1/etc/daemons.conf
+}
diff -r 3eb7682451ff -r d029ffb67ea4 x11vnc/receipt
--- a/x11vnc/receipt	Sat Dec 13 09:29:32 2008 +0000
+++ b/x11vnc/receipt	Sat Dec 13 09:36:41 2008 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="x11vnc"
-VERSION="0.9.3"
+VERSION="0.9.6"
 CATEGORY="network"
 SHORT_DESC="VNC server using X server"
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -16,9 +16,10 @@
 {
 	cd $src
 	./configure --prefix=/usr \
-		$CONFIGURE_ARGS
-	make
-	make DESTDIR=$src/_pkg install
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$src/_pkg install &&
+	rm $src/_pkg/usr/share/applications
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -34,7 +35,7 @@
 {
 	grep -q "^X11VNC" $1/etc/daemons.conf || cat >>$1/etc/daemons.conf <<EOT
 # VNC server options.
-X11VNC_OPTIONS="-rfbauth /etc/vnc.secret -loop"
+X11VNC_OPTIONS="-rfbauth /etc/vnc.secret -loop -tightfilexfer -permitfiletransfer -display :0"
 
 EOT
 	[ -f $1/etc/vnc.secret ] || echo -en 'p\x05\xE3\x8B\x81\xB0\xB2\x1B' \
diff -r 3eb7682451ff -r d029ffb67ea4 x11vnc/stuff/x11vnc
--- a/x11vnc/stuff/x11vnc	Sat Dec 13 09:29:32 2008 +0000
+++ b/x11vnc/stuff/x11vnc	Sat Dec 13 09:36:41 2008 +0000
@@ -13,7 +13,7 @@
 
 case "$1" in
   start)
-    if ps | grep -q $DAEMON; then
+    if ps | grep -v grep | grep -q $DAEMON; then
       echo "$NAME already running."
       exit 1
     fi
@@ -22,7 +22,7 @@
     status
     ;;
   stop)
-    if ! ps | grep -q $DAEMON; then
+    if ! ps | grep -v grep | grep -q $DAEMON; then
       echo "$NAME is not running."
       exit 1
     fi
@@ -31,7 +31,7 @@
     status
     ;;
   restart)
-    if ! ps | grep -q $DAEMON; then
+    if ! ps | grep -v grep | grep -q $DAEMON; then
       echo "$NAME is not running."
       exit 1
     fi