Index: head/Tools/portbuild/scripts/pdispatch
===================================================================
--- head/Tools/portbuild/scripts/pdispatch	(revision 32087)
+++ head/Tools/portbuild/scripts/pdispatch	(revision 32088)
@@ -1,39 +1,40 @@
 #!/bin/sh
 
 # wait 5 hours maximum
 timeout=18000
 
-command=$1
-shift
+branch=$1
+command=$2
+shift 2
 
-if pwd | grep -qF 2.2; then
-  branch=2.2
-elif pwd | grep -qF 3; then
-  branch=3
-else
-  branch=4
-fi
-
 # ssh -x doesn't work on some machines
 unset DISPLAY
 
 pkgname=$(basename $1 .tgz)
 buildroot=$(dirname $(dirname $0))
 
 if grep -qxF $pkgname ${buildroot}/${branch}/duds; then
   echo "skipping $pkgname"
   exit 1
 fi
 
 args=${1+"$@"}
 mach=$(cat ${buildroot}/ulist)
 num=$(echo $(echo $mach | wc -w))
 set $mach
 shift $(echo "$$ $num" | awk '{srand($1); print(int(rand()*$2))}')
+flags=""
 if [ "x$NOCLEAN" != "x" ]; then
-  echo "dispatching: ssh -a $1 ${command} ${branch} -noclean $args"
-  ${buildroot}/scripts/ptimeout $timeout ssh -a $1 ${command} ${branch} -noclean $args
-else
-  echo "dispatching: ssh -a $1 ${command} ${branch} $args"
-  ${buildroot}/scripts/ptimeout $timeout ssh -a $1 ${command} ${branch} $args
+  flags="${flags} -noclean"
 fi
+if [ "x$NO_RESTRICTED" != "x" ]; then
+  flags="${flags} -norestr"
+fi
+if [ "x$NOPLISTCHECK" != "x" ]; then
+  flags="${flags} -noplistcheck"
+fi
+if [ "x$NODUMMY" != "x" ]; then
+  flags="${flags} -nodummy"
+fi
+echo "dispatching: ssh -a $1 ${command} ${branch} $flags $args"
+${buildroot}/scripts/ptimeout $timeout ssh -a $1 ${command} ${branch} ${flags} $args

Property changes on: head/Tools/portbuild/scripts/pdispatch
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property