Revert the revert of "A couple of fixes to make a FreeBSD 6.3 install work."

It was wrongly accused of breaking the mapper.

This reverts commit ae350a6e.

tbsetup/mapper.in

@@ -88,6 +88,7 @@ my $WRAPPER2    = "$TB/libexec/assign_wrapper2";
 my $PTOPGEN     = "$TB/libexec/ptopgen";
 my $VTOPGEN     = "$TB/bin/vtopgen";
 my $NFREE       = "$TB/bin/nfree";
+my $XERCES	= "@HAVE_XERCES@";
 
 #
 # Load the Testbed support stuff. 
@@ -194,7 +195,11 @@ if (defined($options{"c"})) {
     $clear = 1;
 }
 if (defined($options{"l"})) {
-    $userspec = 1;
+    if ($XERCES) {
+	$userspec = 1;
+    } else {
+	fatal("Rspec v2 support requires that Xerces be installed");
+    }
 }
 if (defined($options{"z"})) {
     $randomize = 1;
@@ -575,10 +580,12 @@ sub RunAssign($$)
     $cmd .= "-new"
 	if ($newassign);
     my $args = "";
-    $args .= "-f rspec " 
-	if ($userspec == 1);
-    $args .= "-f text "
-	if ($userspec == 0);
+    if ($XERCES) {
+	$args .= "-f rspec " 
+	    if ($userspec == 1);
+	$args .= "-f text "
+	    if ($userspec == 0);
+    }
     $args .= "$ptopfile $vtopfile";
     $args = "-P $args"
 	if (!$vtop->sharednodecount());

tmcd/common/config/rc.mkelab

@@ -1640,7 +1640,7 @@ sub SetupBossNode()
     # See: http://www.freebsd.org/cgi/query-pr.cgi?pr=121257
     #
     my $tso = "";
-    if ($FBSD_VERSION > 6) {
+    if ($FBSD_VERSION >= 7) {
 	$tso = "-tso";
     }