# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1335797660 -7200
# Node ID dcfbc997590a49ebf1987d16927686a46e4cc21a
# Parent  e2cc0a6e47fe84e5a9724d00164dd7c6e1b455a6
tightvnc: fix font path

diff -r e2cc0a6e47fe -r dcfbc997590a smbbox/receipt
--- a/smbbox/receipt	Mon Apr 30 10:18:35 2012 +0200
+++ b/smbbox/receipt	Mon Apr 30 16:54:20 2012 +0200
@@ -9,7 +9,7 @@
 MAINTAINER="shann@slitaz.org"
 SOURCE="smbbox"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="http://shannaraserver.free.fr/DATA/smbbox/$PACKAGE-$VERSION.tar.gz"
+WGET_URL="http://smbbox.free.fr/src/$TARBALL"
 WEB_SITE="http://smbbox.free.fr"
 
 DEPENDS="smbclient smbfs"
diff -r e2cc0a6e47fe -r dcfbc997590a tightvnc/receipt
--- a/tightvnc/receipt	Mon Apr 30 10:18:35 2012 +0200
+++ b/tightvnc/receipt	Mon Apr 30 16:54:20 2012 +0200
@@ -12,7 +12,7 @@
 BUILD_DEPENDS="xorg-imake xorg-gccmakedep xorg-cf-files xorg-libXp \
 xorg-libXaw-dev xorg-libXt-dev xorg-xproto xorg-libXau-dev xorg-libXdmcp-dev \
 xorg-libXmu-dev xorg-xextproto xorg-printproto xorg-kbproto xorg-inputproto \
-xorg-scrnsaverproto xorg-xauth"
+xorg-scrnsaverproto xorg-xauth jpeg-dev zlib-dev"
 TAGS="remote-desktop"
 
 # Rules to configure and make the package.
@@ -20,6 +20,7 @@
 {
 	[ -d vnc_unixsrc ] && mv vnc_unixsrc $src
 	cd $src
+	sed -i "s| FONTDIR =.*$| FONTDIR = /usr/share/fonts/X11|" Xvnc/config/cf/X11.tmpl
 	xmkmf &&
 	make -j1 World &&
 	cd Xvnc &&
@@ -28,9 +29,9 @@
   	-i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1
 	find -name Makefile | xargs sed -i 's|/usr/X11R6/bin|/usr/bin|g'
 	make -j1 &&
-	make -j1 DESTDIR=$PWD/../_pkg install
+	make -j1 DESTDIR=$DESTDIR install
 	cd .. &&
-	make -j1 DESTDIR=$PWD/_pkg install
+	make -j1 DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -39,4 +40,22 @@
 	mkdir -p $fs/usr/bin
 	cp -a $_pkg/usr/bin/Xvnc $fs/usr/bin
 	cp $src/vncpasswd/vncpasswd $fs/usr/bin
+	cat > $fs/usr/bin/startvnc <<EOM
+#!/bin/sh
+
+case "\$1" in
+''|:*)	;;
+*)	cat <<EOT
+Usage: \$0 [display] [geometry] [depth]
+Default: \$0 :1 1920x1024 24
+EOT
+	exit 1
+esac
+	
+. \$HOME/.config/slitaz/applications.conf
+Xvnc -ac -geometry \${2:-1920x1024} -depth \${3:-24} :\${1:-1} &
+export DISPLAY=:\${1:-1}
+exec \$WINDOW_MANAGER
+EOM
+	chmod +x $fs/usr/bin/startvnc
 }