Index: trunk/psconfig/psdist
===================================================================
--- trunk/psconfig/psdist	(revision 18806)
+++ trunk/psconfig/psdist	(revision 21932)
@@ -100,10 +100,10 @@
 sub difflist {
 
-    for ($i = 0; $i < @cvsname; $i++) {
+    for ($i = 0; $i < @module; $i++) {
         # the base component cannot be rdiffed
-        print STDERR "--- $cvsname[$i] ---\n";
-        if ($cvsname[$i] eq "base") { next; }
+        print STDERR "--- $module[$i] ---\n";
+        if ($module[$i] eq "base") { next; }
         if ($tag[$i] eq "") { next; }
-        &vsystem ("cvs -q rdiff -s -r $tag[$i] $cvsname[$i]");
+        &vsystem ("cvs -q rdiff -s -r $tag[$i] $module[$i]");
         print STDERR "\n\n";
     }
@@ -114,25 +114,25 @@
     print STDERR "setting tags\n";
     if ($settag_mode eq "") { die "-tag mode is not set\n"; }
-    for ($i = 0; $i < @cvsname; $i++) {
-        if (($module ne "") && ($module ne $cvsname[$i])) { next; }
+    for ($i = 0; $i < @module; $i++) {
+        if (($module ne "") && ($module ne $module[$i])) { next; }
         ## XXX make this backwards compatible with pre-ipp-2.4 releases (with four, not five, entries)?
         ($do_tag, $do_build, $do_dist, $do_update, $dev_build) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)(\S)|;
         if ($do_tag eq "N") {
-            push @remind, $cvsname[$i];
-            next;
-        }
-        if ($branchtag[$i] eq "") { die "branch tag missing for $cvsname[$i]\n"; }
+            push @remind, $module[$i];
+            next;
+        }
+        if ($branchtag[$i] eq "") { die "branch tag missing for $module[$i]\n"; }
         if ($branchver[$i] eq "") { die "branch tag version missing\n"; }
         $tag = "$branchtag[$i]$branchver[$i]";
         if ($settag_mode eq "branch") {
-            &vsystem ("cvs -q rtag -b $branchtag[$i] $cvsname[$i]");
+            &vsystem ("cvs -q rtag -b $branchtag[$i] $module[$i]");
             next;
         }
         if ($settag_mode eq "dev") {
-            &vsystem ("cvs -q rtag $tag $cvsname[$i]");
+            &vsystem ("cvs -q rtag $tag $module[$i]");
             next;
         }
         if ($settag_mode eq "rev") {
-            &vsystem ("cvs -q rtag -r $branchtag[$i] $tag $cvsname[$i]");
+            &vsystem ("cvs -q rtag -r $branchtag[$i] $tag $module[$i]");
             next;
         }
@@ -152,21 +152,21 @@
     chdir "..";
 
-    for ($i = 0; $i < @cvsname; $i++) {
-        if (($module ne "") && ($module ne $cvsname[$i])) { next; }
+    for ($i = 0; $i < @module; $i++) {
+        if (($module ne "") && ($module ne $module[$i])) { next; }
         ($do_tag, $do_build, $do_dist, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|;
         if ($do_update eq "N") {
-            push @remind, $cvsname[$i];
+            push @remind, $module[$i];
             next;
         }
         # only update modules with tags
-        if ($branchtag[$i] eq "") { die "branch tag missing for $cvsname[$i]\n"; }
+        if ($branchtag[$i] eq "") { die "branch tag missing for $module[$i]\n"; }
         if ($branchver[$i] eq "") { die "branch tag version missing\n"; }
         $tag = "$branchtag[$i]$branchver[$i]";
         if ($update_mode eq "tags") {
-            &vsystem ("cvs -q co -r $tag $cvsname[$i]");
+            &vsystem ("cvs -q co -r $tag $module[$i]");
             next;
         }
         if ($update_mode eq "head") {
-            &vsystem ("cvs -q co -A $cvsname[$i]");
+            &vsystem ("cvs -q co -A $module[$i]");
             next;
         }
@@ -187,18 +187,18 @@
     mkdir $distribution;
     chdir $distribution;
-    for ($i = 0; $i < @cvsname; $i++) {
-        if (($module ne "") && ($module ne $cvsname[$i])) { next; }
+    for ($i = 0; $i < @module; $i++) {
+        if (($module ne "") && ($module ne $module[$i])) { next; }
         ($do_tag, $do_build, $do_dist, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|;
         if ($do_dist eq "N") { next; }
 
-        if ($branchtag[$i] eq "") { die "branch tag missing for $cvsname[$i]\n"; }
+        if ($branchtag[$i] eq "") { die "branch tag missing for $module[$i]\n"; }
         if ($branchver[$i] eq "") { die "branch tag version missing\n"; }
         $tag = "$branchtag[$i]$branchver[$i]";
 
         if ($mkdist_head) {
-            &vsystem ("cvs co $cvsname[$i]");
+            &vsystem ("cvs co $module[$i]");
             if ($status) { die "error running cvs"; }
         } else {
-            &vsystem ("cvs co -r $tag $cvsname[$i]");
+            &vsystem ("cvs co -r $tag $module[$i]");
             if ($status) { die "error running cvs"; }
         }
@@ -218,11 +218,11 @@
     # run autogen.sh, if present, to build a configure script
     chdir $distribution;
-    for ($i = 0; $i < @cvsname; $i++) {
-        if (($module ne "") && ($module ne $cvsname[$i])) { next; }
+    for ($i = 0; $i < @module; $i++) {
+        if (($module ne "") && ($module ne $module[$i])) { next; }
         ($do_tag, $do_build, $do_dist, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|;
         if ($do_dist eq "N") { next; }
 
-        if (! -e "$cvsname[$i]/autogen.sh" || -e "$cvsname[$i]/Build.PL" ) { next; }
-        chdir $cvsname[$i];
+        if (! -e "$module[$i]/autogen.sh" || -e "$module[$i]/Build.PL" ) { next; }
+        chdir $module[$i];
 
         vsystem ("./autogen.sh --no-configure");
@@ -255,5 +255,5 @@
 sub load_distfile {
     # open and read the distribution file
-    # results go into @cvsname, @branchtag, @branchver, @mode
+    # results go into @module, @branchtag, @branchver, @mode
     $file = "$tagsets/$ARGV[0].dist";
     open (FILE, $file) || die "ERROR: can't open distribution file $file\n";
@@ -262,5 +262,5 @@
 
     @mode = ();
-    @cvsname = ();
+    @module = ();
     @branchtag = ();
     @branchver = ();
@@ -271,7 +271,7 @@
         if ($line =~ m|^\s*\#|) { next; }
 
-        ($mode, $cvsname, $branchtag, $branchver) = split (" ", $line);
-
-        if ($cvsname eq "") { die "missing module name\n"; }
+        ($mode, $my_module, $branchtag, $branchver) = split (" ", $line);
+
+        if ($my_module eq "") { die "missing module name\n"; }
 
         ($do_tag, $do_build, $do_dist, $do_update) = $mode =~ m|(\S)(\S)(\S)(\S)|;
@@ -281,9 +281,9 @@
         if (($do_update ne "Y") && ($do_update ne "N")) { die "invalid tag option $do_update\n"; }
 
-        # print "module: $cvsname, branchtag: $branchtag, branchver: $branchver ";
+        # print "module: $my_module, branchtag: $branchtag, branchver: $branchver ";
         # print "tag: $do_tag, build: $do_build, dist: $do_dist, update: $do_update\n";
 
         push @mode, $mode;
-        push @cvsname, $cvsname;
+        push @module, $my_module;
         push @branchtag, $branchtag;
         push @branchver, $branchver;