diff -r -u virtuoso-opensource-6.1.1.orig/binsrc/rdf_mappers/make_vad.sh virtuoso-opensource-6.1.1/binsrc/rdf_mappers/make_vad.sh
--- virtuoso-opensource-6.1.1.orig/binsrc/rdf_mappers/make_vad.sh	2010-03-30 17:40:01.000000000 +0200
+++ virtuoso-opensource-6.1.1/binsrc/rdf_mappers/make_vad.sh	2010-05-30 21:14:59.303790362 +0200
@@ -39,8 +39,8 @@
 PACKDATE=`date +"%Y-%m-%d %H:%M"`
 SERVER=${SERVER-}
 THOST=${THOST-localhost}
-TPORT=${TPORT-8445}
-PORT=${PORT-1940}
+TPORT=${TPORT-84451}
+PORT=${PORT-19401}
 ISQL=${ISQL-isql}
 VAD_NAME="rdf_mappers"
 VAD_PKG_NAME="rdf_mappers"
diff -r -u virtuoso-opensource-6.1.1.orig/binsrc/tests/suite/testall.sh virtuoso-opensource-6.1.1/binsrc/tests/suite/testall.sh
--- virtuoso-opensource-6.1.1.orig/binsrc/tests/suite/testall.sh	2010-03-18 20:31:04.000000000 +0100
+++ virtuoso-opensource-6.1.1/binsrc/tests/suite/testall.sh	2010-05-30 21:04:21.852790471 +0200
@@ -48,6 +48,9 @@
 #  assumes that there exists a previously defined Virtuoso datasource
 #  with the name 'Virtuoso' whose host:port is set to localhost:1111
 #
+
+PORT=11111
+
 #
 #  Yet needs to be done:
 #
diff -r -u virtuoso-opensource-6.1.1.orig/binsrc/tests/suite/tsoapudt.sql virtuoso-opensource-6.1.1/binsrc/tests/suite/tsoapudt.sql
--- virtuoso-opensource-6.1.1.orig/binsrc/tests/suite/tsoapudt.sql	2006-08-16 09:58:12.000000000 +0200
+++ virtuoso-opensource-6.1.1/binsrc/tests/suite/tsoapudt.sql	2010-05-30 21:09:54.781790331 +0200
@@ -81,19 +81,19 @@
   procedure ECHOUDT (in X DB.DBA.SOAPSTRUCT) returns DB.DBA.SOAPSTRUCT { X.action(); return X; };
 };
 
-select soap_wsdl ('DB.DBA.M1', 'localhost:1111', 'testns');
+select soap_wsdl ('DB.DBA.M1', 'localhost:11111', 'testns');
 
-select xpath_eval ('/definitions/types/schema/complexType/@name', xml_tree_doc (soap_wsdl ('DB.DBA.M1', 'localhost:1111', 'testns')));
+select xpath_eval ('/definitions/types/schema/complexType/@name', xml_tree_doc (soap_wsdl ('DB.DBA.M1', 'localhost:11111', 'testns')));
 ECHO BOTH $IF $EQU $LAST[1] SOAPSTRUCT  "PASSED" "***FAILED";
 SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
 ECHO BOTH ": checking the WSDL schema fragment for the UDT complexType/@name=" $LAST[1] "\n";
 
-select xpath_eval ('/definitions/message[@name = "ECHOUDTRequest" ]/part[ @name="X" ]/@type', xml_tree_doc (soap_wsdl ('DB.DBA.M1', 'localhost:1111', 'testns')));
+select xpath_eval ('/definitions/message[@name = "ECHOUDTRequest" ]/part[ @name="X" ]/@type', xml_tree_doc (soap_wsdl ('DB.DBA.M1', 'localhost:11111', 'testns')));
 ECHO BOTH $IF $EQU $LAST[1] services.wsdl:SOAPSTRUCT  "PASSED" "***FAILED";
 SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
 ECHO BOTH ": checking the WSDL for the UDT param type  = " $LAST[1] "\n";
 
-select xpath_eval ('/definitions/message[@name = "ECHOUDTResponse" ]/part[ @name="CallReturn" ]/@type', xml_tree_doc (soap_wsdl ('DB.DBA.M1', 'localhost:1111', 'testns')));
+select xpath_eval ('/definitions/message[@name = "ECHOUDTResponse" ]/part[ @name="CallReturn" ]/@type', xml_tree_doc (soap_wsdl ('DB.DBA.M1', 'localhost:11111', 'testns')));
 ECHO BOTH $IF $EQU $LAST[1] services.wsdl:SOAPSTRUCT  "PASSED" "***FAILED";
 SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
 ECHO BOTH ": checking the WSDL for the UDT ret value type  = " $LAST[1] "\n";
@@ -110,19 +110,19 @@
   procedure ECHOUDT (in X DB.DBA.SOAPSTRUCT2) returns DB.DBA.SOAPSTRUCT2 { return X; };
 };
 
-select soap_wsdl ('DB.DBA.M2', 'localhost:1111', 'testns');
+select soap_wsdl ('DB.DBA.M2', 'localhost:11111', 'testns');
 
-select xpath_eval ('/definitions/types/schema/complexType/@name', xml_tree_doc (soap_wsdl ('DB.DBA.M2', 'localhost:1111', 'testns')));
+select xpath_eval ('/definitions/types/schema/complexType/@name', xml_tree_doc (soap_wsdl ('DB.DBA.M2', 'localhost:11111', 'testns')));
 ECHO BOTH $IF $EQU $LAST[1] SOAPSTRUCT2_SOAP  "PASSED" "***FAILED";
 SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
 ECHO BOTH ": checking the WSDL schema fragment for the UDT w/__soap_type complexType/@name=" $LAST[1] "\n";
 
-select xpath_eval ('[ xmlns:ns0="http://www.w3.org/2001/XMLSchema" ] count (/definitions/types/ns0:schema/ns0:complexType[@name="SOAPSTRUCT2_SOAP"]/ns0:all/ns0:element[@name="soapA"])', xml_tree_doc (soap_wsdl ('DB.DBA.M2', 'localhost:1111', 'testns')));
+select xpath_eval ('[ xmlns:ns0="http://www.w3.org/2001/XMLSchema" ] count (/definitions/types/ns0:schema/ns0:complexType[@name="SOAPSTRUCT2_SOAP"]/ns0:all/ns0:element[@name="soapA"])', xml_tree_doc (soap_wsdl ('DB.DBA.M2', 'localhost:11111', 'testns')));
 ECHO BOTH $IF $EQU $LAST[1] 1  "PASSED" "***FAILED";
 SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
 ECHO BOTH ": checking the WSDL schema fragment for the UDT member w/__soap_name  = " $LAST[1] "\n";
 
-select xpath_eval ('[ xmlns:ns0="http://www.w3.org/2001/XMLSchema" ] /definitions/types/ns0:schema/ns0:complexType/ns0:all/ns0:element[@name="soapB"]/@type', xml_tree_doc (soap_wsdl ('DB.DBA.M2', 'localhost:1111', 'testns')));
+select xpath_eval ('[ xmlns:ns0="http://www.w3.org/2001/XMLSchema" ] /definitions/types/ns0:schema/ns0:complexType/ns0:all/ns0:element[@name="soapB"]/@type', xml_tree_doc (soap_wsdl ('DB.DBA.M2', 'localhost:11111', 'testns')));
 ECHO BOTH $IF $EQU $LAST[1] hexBinary "PASSED" "***FAILED";
 SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
 ECHO BOTH ": checking the WSDL schema fragment for the UDT member w/__soap_type  = " $LAST[1] "\n";