From 3302442b971e9fa46d50d19913e0ed316dff7ebd Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Sun, 9 Jun 2013 13:21:29 -0500
Subject: netbsd fix for virtualfb.sh xvfb startup A


diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh
index 980fa7b..cb0b0a0 100644
--- a/scripts/setenv-unibuild.sh
+++ b/scripts/setenv-unibuild.sh
@@ -54,7 +54,9 @@ setenv_netbsd()
  QMAKESPEC=netbsd-g++
  QTDIR=/usr/pkg/qt4
  PATH=/usr/pkg/qt4/bin:$PATH
- LD_LIBRARY_PATH=/usr/pkg/qt4/lib:/usr/X11R7/lib:$LD_LIBRARY_PATH
+ LD_LIBRARY_PATH=/usr/pkg/qt4/lib:$LD_LIBRARY_PATH
+ LD_LIBRARY_PATH=/usr/X11R7/lib:$LD_LIBRARY_PATH
+ LD_LIBRARY_PATH=/usr/pkg/lib:$LD_LIBRARY_PATH
 
  export QMAKESPEC
  export QTDIR
diff --git a/tests/virtualfb.sh b/tests/virtualfb.sh
index 186b389..252da98 100755
--- a/tests/virtualfb.sh
+++ b/tests/virtualfb.sh
@@ -24,7 +24,15 @@ start()
   fi
 
   VFB_DISPLAY=`echo | awk 'BEGIN{srand();} {printf ":%.0f", rand()*1000+100};'`
-  $VFB_BINARY $VFB_DISPLAY -screen 0 800x600x24 &> ./virtualfb.log &
+  if [ $debug ]; then 
+    echo debug VFB_DISPLAY $VFB_DISPLAY
+    echo debug VFB_BINARY $VFB_BINARY
+  fi
+  if [ $BASH ]; then
+    $VFB_BINARY $VFB_DISPLAY -screen 0 800x600x24 \&> ./virtualfb.log &
+  else
+    $VFB_BINARY $VFB_DISPLAY -screen 0 800x600x24 > ./virtualfb.log &
+  fi
   # on some systems $! gives us VFB_BINARY's PID, on others we have to subtract 1
   VFB_PID_MINUS0=$!
   VFB_PID_MINUS1=$(($VFB_PID_MINUS0 - 1))
-- 
cgit v0.10.1