--- ../vnc_unixsrc/vncserver 2009-02-11 22:27:18.000000000 -0600
+++ vncserver 2009-05-01 16:32:52.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 #
 #  Copyright (C) 2002-2009 Constantin Kaplinsky.  All Rights Reserved.
 #  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
@@ -32,11 +32,14 @@
 $geometry = "1024x768";
 $depth = 24;
 $desktopName = "X";
-$vncClasses = "/usr/local/vnc/classes";
+$vncClasses = "@PREFIX@/share/vnc/classes";
 $vncUserDir = "$ENV{HOME}/.vnc";
 $fontPath = "unix/:7100";
 $authType = "-rfbauth $vncUserDir/passwd";
 
+$fontRoot = "/usr/lib/X11/fonts";
+$fontPath = "$fontRoot/Type1/,$fontRoot/TTF/,$fontRoot/Speedo/,$fontRoot/misc/,$fontRoot/100dpi/,$fontRoot/75dpi/";
+
 # Read configuration from the system-wide and user files if present.
 
 $configFile = "/etc/tightvncserver.conf";
@@ -184,13 +187,13 @@
 
 # Give Xvnc a chance to start up
 
-sleep(1);
+sleep(5);
 unless (kill 0, `cat $pidFile`) {
     warn "Couldn't start Xvnc; trying default font path.\n";
     warn "Please set correct fontPath in the $prog script.\n";
     $cmd =~ s@-fp [^ ]+@@;
     system("$cmd & echo \$! >$pidFile");
-    sleep(1);
+    sleep(5);
 }
 unless (kill 0, `cat $pidFile`) {
     warn "Couldn't start Xvnc process.\n\n";