Index: /trunk/psconfig/psbuild
===================================================================
--- /trunk/psconfig/psbuild	(revision 21931)
+++ /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;
Index: /trunk/psconfig/pschecklibs
===================================================================
--- /trunk/psconfig/pschecklibs	(revision 21931)
+++ /trunk/psconfig/pschecklibs	(revision 21932)
@@ -232,8 +232,8 @@
     print "psconfigure: $psconfigure";
 
-    ## try to build the module from ../../extlibs/$tarball
+    ## try to build the module ../extlibs/$tarball
 
     # go to extlibs and unpack the tarball
-    chdir "../../extlibs";
+    chdir "../extlibs";
 
     print "extract $name from $tarball\n";
Index: /trunk/psconfig/pscheckperl
===================================================================
--- /trunk/psconfig/pscheckperl	(revision 21931)
+++ /trunk/psconfig/pscheckperl	(revision 21932)
@@ -90,6 +90,6 @@
     }
 
-    # try to build the module from ../../extperl/Module.*.tar.gz
-    chdir "../../extperl" or die "Unable to find ../../extperl directory.";
+    # try to build the module from ../extperl/Module.*.tar.gz
+    chdir "../extperl" or die "Unable to find ../extperl directory.";
 
     print "extract $module from $tarball\n";
Index: /trunk/psconfig/psdist
===================================================================
--- /trunk/psconfig/psdist	(revision 21931)
+++ /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;
Index: /trunk/psconfig/tagsets/ipp-2.7.dist
===================================================================
--- /trunk/psconfig/tagsets/ipp-2.7.dist	(revision 21931)
+++ /trunk/psconfig/tagsets/ipp-2.7.dist	(revision 21932)
@@ -6,5 +6,5 @@
 # |||||-- build for developer?
 # |||||
-# |||||  CVS module             CVS branch tag   CVS branch version   
+# |||||  module                 branch name      tag version   
 # ||||| 
   YYNNY  Ohana                  ipp-2-7          -0