streamline build scripts
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 3819cae..1bd00f2 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -9,7 +9,8 @@
         some variables, e.g. ones we set, since properties are case sensitive, even if
         the environment variables on your operating system are not, e.g. it will
         be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
+    <property
+        environment="env" />
 
     <!--
         Let users override standard properties, if desired.
@@ -25,7 +26,6 @@
     <property
         name="checkout.builder.clean"
         value="true" />
-	
     <property
         name="mapVersionTag"
         value="HEAD" />
@@ -50,32 +50,31 @@
     <property
         name="mapCvsRoot"
         value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
-
     <property
         name="codir"
-        value="${env.BUILD_HOME}/projectBuilders/${checkoutprojectname}" />
-
-
-
-    <echo message="checkoutprojectname: ${checkoutprojectname}" />
+        value="${env.PROJECT_BUILDERS}/${checkoutprojectname}" />
+    <echo
+        message="checkoutprojectname: ${checkoutprojectname}" />
     <target
         name="checkout"
         if="checkoutprojectname">
         <!-- we always check and init the builder -->
-        <antcall target="getwtpbuilder" />
-        <!-- and projects can do more if needed. -->
-        <antcall target="${checkoutprojectname}" />
+        <antcall
+            target="getbuilder" />
+        <!-- and distribution projects can do more if needed. -->
+        <antcall
+            target="${checkoutprojectname}" />
     </target>
-
-    <target name="wtp-R3.0-N">
-
+    <target
+        name="wtp-R3.0-N">
     </target>
-
-    <target name="retest-wtp-R3.0-N">
-        <antcall target="wtp-R3.0-N" />
+    <target
+        name="retest-wtp-R3.0-N">
+        <antcall
+            target="wtp-R3.0-N" />
     </target>
-
-    <target name="wtp-R3.0-S">
+    <target
+        name="wtp-R3.0-S">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -91,11 +90,13 @@
             dest="${codir}"
             tag="HEAD" />
     </target>
-    <target name="retest-wtp-R3.0-S">
-        <antcall target="wtp-R3.0-S" />
+    <target
+        name="retest-wtp-R3.0-S">
+        <antcall
+            target="wtp-R3.0-S" />
     </target>
-
-    <target name="wtp-R3.0-I">
+    <target
+        name="wtp-R3.0-I">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -111,11 +112,13 @@
             dest="${codir}"
             tag="HEAD" />
     </target>
-    <target name="retest-wtp-R3.0-I">
-        <antcall target="wtp-R3.0-I" />
+    <target
+        name="retest-wtp-R3.0-I">
+        <antcall
+            target="wtp-R3.0-I" />
     </target>
-
-    <target name="wtp-R3.0-R">
+    <target
+        name="wtp-R3.0-R">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -131,12 +134,13 @@
             dest="${codir}"
             tag="HEAD" />
     </target>
-    <target name="retest-wtp-R3.0-R">
-        <antcall target="wtp-R3.0-R" />
+    <target
+        name="retest-wtp-R3.0-R">
+        <antcall
+            target="wtp-R3.0-R" />
     </target>
-
-
-    <target name="wtp-R1.5-M">
+    <target
+        name="wtp-R1.5-M">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -152,10 +156,13 @@
             dest="${codir}"
             tag="R1_5_maintenance" />
     </target>
-    <target name="retest-wtp-R1.5-M">
-        <antcall target="wtp-R1.5-M" />
+    <target
+        name="retest-wtp-R1.5-M">
+        <antcall
+            target="wtp-R1.5-M" />
     </target>
-    <target name="wtp-R2.0-M">
+    <target
+        name="wtp-R2.0-M">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -185,7 +192,8 @@
             dest="${codir}"
             tag="R1_0_maintenance" />
     </target>
-    <target name="wtp-R2.0-R">
+    <target
+        name="wtp-R2.0-R">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -215,11 +223,13 @@
             dest="${codir}"
             tag="R1_0_maintenance" />
     </target>
-    <target name="retest-wtp-R2.0-M">
-        <antcall target="wtp-R2.0-M" />
+    <target
+        name="retest-wtp-R2.0-M">
+        <antcall
+            target="wtp-R2.0-M" />
     </target>
-
-    <target name="jem-R1.5-M">
+    <target
+        name="jem-R1.5-M">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -235,8 +245,8 @@
             dest="${codir}"
             tag="R1_5_maintenance" />
     </target>
-
-    <target name="patches-R1.5-P">
+    <target
+        name="patches-R1.5-P">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -252,8 +262,8 @@
             dest="${codir}"
             tag="R1_5_5_patches" />
     </target>
-
-    <target name="wtp-buildTools-R3.0-T">
+    <target
+        name="wtp-buildTools-R3.0-T">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -268,34 +278,36 @@
     <!--
         The order of execution of these three worker targets
         is critical, check.clean, initBuilders, and
-        then getwtpbuilder.
+        then getbuilder.
     -->
     <target
-        name="getwtpbuilder"
+        name="getbuilder"
         depends="check.clean,initBuilders"
         if="doClean">
         <!-- This is a special property file, that contains (only) the
-            value of wtpBuilderVersion. Then, that version of the builder
+            value of builderVersion. Then, that version of the builder
             is fetched to control the rest of the build -->
-        <property file="${codir}/${env.RELENG}/maps/build.cfg" />
+        <property
+            file="${codir}/${env.RELENG}/maps/build.cfg" />
         <delete
             dir="${codir}/${env.RELENG_BUILDER}"
             failonerror="false" />
         <echo
-            message="Version tag for ${env.RELENG_BUILDER} is: ${wtpBuilderVersion}" />
+            message="Version tag for ${env.RELENG_BUILDER} is: ${builderVersion}" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
             package="${env.RELENG_BUILDER}"
             dest="${codir}"
-            tag="${wtpBuilderVersion}" />
+            tag="${builderVersion}" />
     </target>
-
-    <target name="check.clean">
+    <target
+        name="check.clean">
         <echo
             message="checkout.builder.clean: ${checkout.builder.clean}" />
-        <condition property="doClean">
+        <condition
+            property="doClean">
             <equals
                 arg1="${checkout.builder.clean}"
                 arg2="true"
@@ -303,12 +315,12 @@
                 casesensitive="false" />
         </condition>
     </target>
-
     <target
         name="initBuilders"
         depends="check.clean"
         if="doClean">
-        <echo message="Version tag for ${env.RELENG}: ${mapVersionTag}" />
+        <echo
+            message="Version tag for ${env.RELENG}: ${mapVersionTag}" />
         <cvs
             quiet="true"
             cvsRoot="${mapCvsRoot}"
@@ -316,7 +328,4 @@
             dest="${codir}"
             tag="${mapVersionTag}" />
     </target>
-
-
-</project>
-
+</project>
\ No newline at end of file