Index: trunk/psconfig/psbuild
===================================================================
--- trunk/psconfig/psbuild	(revision 19883)
+++ trunk/psconfig/psbuild	(revision 21932)
@@ -218,7 +218,7 @@
 
     $stop_now = 0;
-    for ($i = 0; !$stop_now && ($i < @cvsname); $i++) {
-        if (($stop ne "") && ($stop eq $cvsname[$i])) { $stop_now = 1; }
-        if (($start ne "") && ($start ne $cvsname[$i])) { next; }
+    for ($i = 0; !$stop_now && ($i < @module); $i++) {
+        if (($stop ne "") && ($stop eq $module[$i])) { $stop_now = 1; }
+        if (($start ne "") && ($start ne $module[$i])) { next; }
         $start = "";
 
@@ -227,12 +227,12 @@
         if ($do_build eq "N") { next; }
 
-        $workdir = "../$cvsname[$i]";
+        $workdir = "../$module[$i]";
 
         # XXX need to grab current value for cleanup
-        print "\n ** psbuild: $cvsname[$i] ** \n";
-        print "\033]0; ** psbuild: $cvsname[$i] ** \007";
+        print "\n ** psbuild: $module[$i] ** \n";
+        print "\033]0; ** psbuild: $module[$i] ** \007";
 
         if (!-d $workdir || !-r $workdir || !-x $workdir) {
-            print STDERR "WARNING: no directory for component $cvsname[$i], skipping\n";
+            print STDERR "WARNING: no directory for component $module[$i], skipping\n";
             next;
         }
@@ -248,11 +248,11 @@
         if (-e "Build.PL") {
             vsystem ("$psperlbuild");
-            if ($?) { &failure($cvsname[$i], "failure in perl Build.PL"); }
+            if ($?) { &failure($module[$i], "failure in perl Build.PL"); }
 
             vsystem ("./Build");
-            if ($?) { &failure($cvsname[$i], "failure in Build"); }
+            if ($?) { &failure($module[$i], "failure in Build"); }
 
             vsystem ("./Build install");
-            if ($?) { &failure($cvsname[$i], "failure in Build install"); }
+            if ($?) { &failure($module[$i], "failure in Build install"); }
 
             next;
@@ -273,26 +273,26 @@
             $skip_configure = 1;
             vsystem ("$psautogen $psopts");
-            if ($?) { &failure($cvsname[$i], "failure in psautogen"); }
+            if ($?) { &failure($module[$i], "failure in psautogen"); }
         }
 
         if ($rebuild_this && -e "configure" && !$skip_configure) {
             vsystem ("$psconfigure $psopts");
-            if ($?) { &failure($cvsname[$i], "failure in psconfigure"); }
-        }
-
-        if (! -e "Makefile") { &failure($cvsname[$i], "missing makefile: do you need to run the -dev developer build?"); }
+            if ($?) { &failure($module[$i], "failure in psconfigure"); }
+        }
+
+        if (! -e "Makefile") { &failure($module[$i], "missing makefile: do you need to run the -dev developer build?"); }
 
         if ($clean) {
             vsystem ("make clean");
-            if ($?) { &failure($cvsname[$i], "failure in make clean"); }
+            if ($?) { &failure($module[$i], "failure in make clean"); }
         }
 
         vsystem ("make");
-        if ($?) { &failure($cvsname[$i], "failure in make"); }
+        if ($?) { &failure($module[$i], "failure in make"); }
 
         vsystem ("make install");
-        if ($?) { &failure($cvsname[$i], "failure in make install"); }
-
-        print "*** done with $cvsname[$i] ***\n";
+        if ($?) { &failure($module[$i], "failure in make install"); }
+
+        print "*** done with $module[$i] ***\n";
 
       success:
@@ -359,5 +359,5 @@
 sub load_distfile {
     # open and read the distribution file
-    # results go into @cvsname, @branchtag, @branchver, @mode
+    # results go into @module, @branchtag, @branchver, @mode
     open (FILE, $distribution) || die "ERROR: can't open distribution file $distribution\n";
     @list = <FILE>;
@@ -365,5 +365,5 @@
 
     @mode = ();
-    @cvsname = ();
+    @module = ();
     @branchtag = ();
     @branchver = ();
@@ -374,7 +374,7 @@
         if ($line =~ m|^\s*\#|) { next; }
 
-        ($mode, $cvsname, $branchtag, $branchver) = split (" ", $line);
-
-        if ($cvsname eq "") { die "missing module name\n"; }
+        ($mode, $module, $branchtag, $branchver) = split (" ", $line);
+
+        if ($module eq "") { die "missing module name\n"; }
 
         ($do_tag, $do_build, $do_package, $do_update) = $mode =~ m|(\S)(\S)(\S)(\S)|;
@@ -385,8 +385,8 @@
 
         if ($verbose) { print "tag: $do_tag, build: $do_build, package: $do_package, update: $do_update "; }
-        if ($verbose) { print "module: $cvsname, branchtag: $branchtag, branchver: $branchver \n"; }
+        if ($verbose) { print "module: $module, branchtag: $branchtag, branchver: $branchver \n"; }
 
         push @mode, $mode;
-        push @cvsname, $cvsname;
+        push @module, $module;
         push @branchtag, $branchtag;
         push @branchver, $branchver;