Index: branches/simtest_nebulous_branches/psconfig/INSTALL
===================================================================
--- branches/simtest_nebulous_branches/psconfig/INSTALL	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/INSTALL	(revision 27840)
@@ -77,8 +77,8 @@
 3. Dependencies
 
-NOTE: It is possible to use the tools discussed below to manually check on the
-external dependencies.  However, the psbuild system now allows you to
-build the full suite including dependencies in a single pass.  To use
-this method, skip to section 5.
+NOTE: It is possible to use the tools discussed below to manually
+check on the external dependencies.  However, the psbuild system
+allows you to build the full suite including dependencies in a single
+pass.  To use this method, skip to section 4.
 
 3.1. External C libraries
@@ -88,13 +88,8 @@
 libraries defined by LD_LIBRARY_PATH, and the installation library
 defined by psconfig.  Any missing dependencies will be listed.
-Tarballs for these libraries may be found on the Pan-STARRS web site
-at:
-
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extlibs-2.6.1.tgz
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl-2.6.1.tgz
-
-These should be installed so they will be available in the user's
-path.  The psconfig commands can be used to install these libraries in
-the psconfig location:
+Tarballs for these libraries are included in the IPP software
+distribution in the directory 'extlibs'.  The command pschecklibs
+-build can be used to install these libraries in the psconfig
+location.  Note that:
 
 'psautogen' replaces autogen.sh
@@ -106,17 +101,11 @@
 Perl modules, and can be used to install them in the appropriate user
 location in the psconfig system.  The command defaults to the latest
-perl installation table (eg, tagsets/ipp-2.6.1.perl).
+perl installation table (eg, tagsets/ipp-2.9.perl).
 
 pscheckperl
 
-will test for the perl modules specified for the latest ipp release.
-if any modules are missing, they can be download from the Pan-STARRS
-web site:
-
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl
-
-The tarballs should be placed in a directory extperl parallel to the
-ipp directory (two levels up from this directory).  If the tarballs
-are in the correct location, they can be built by supplying the -build
+will test for the perl modules specified for the latest IPP release.
+The (known) IPP-required Perl modules are included in the IPP software
+distribution in 'extperl', and can be built by supplying the -build
 flag to pscheckperl:
 
@@ -130,14 +119,8 @@
 psbuild
 
-For additional information on using psbuild, see the listing of
-options below (or type psbuild -help)
-
-5. Single-Pass Build with External Dependencies
-
-If you have not already done so, download the tarball with the
-external libraries and perl modules from:
-
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extlibs-2.6.1.tgz
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl-2.6.1.tgz
+If you have checked the IPP tree out of our svn repository, certain
+steps are slightly modified.  In this case, it is necessary to add the
+option '-dev'.  For additional information on using psbuild, see the
+listing of options below (or type psbuild -help)
 
 It should be possible to build the full IPP installation by issuing
@@ -145,4 +128,19 @@
 
 psbuild -extbuild
+
+5. Building Magic.
+
+The Magic software, required for processing of PS1/GPC1 data before it
+can be released to the community, is not generally available for
+distribution.  For those without access to this software, the psbuild
+will simply skip the step of building the magic software.  For those
+who have access to this software, it is necessary to install the magic
+source code in the IPP tree before building.  The magic and
+ssa-core-cpp tarballs must be placed in the home directory.  Go to the
+magic directory (cd ../magic) and run the command 'make update'.  This
+will untar the magic code into the local magic directory and install
+an appropriately modified makefile.  Return to this directory and
+follow the build instructions as above.  (NOTE: this step is only
+necessary for a new IPP checkout or a new magic tarball).
 
 ------
Index: branches/simtest_nebulous_branches/psconfig/build.timing.txt
===================================================================
--- branches/simtest_nebulous_branches/psconfig/build.timing.txt	(revision 27840)
+++ branches/simtest_nebulous_branches/psconfig/build.timing.txt	(revision 27840)
@@ -0,0 +1,11 @@
+
+Use this file to track the IPP build times on various platforms
+
+Optimized
+
+Unoptimized
+
+ ulili  : Intel Atom        : unthreaded : 64 min
+ pikake : Intel Core 2 Quad : 4 threads  : 12 min
+ ipp053 : Intel Xeon 2xQuad : 4 threads  :  9 min
+
Index: branches/simtest_nebulous_branches/psconfig/pschecklibs
===================================================================
--- branches/simtest_nebulous_branches/psconfig/pschecklibs	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/pschecklibs	(revision 27840)
@@ -11,4 +11,6 @@
 $version = "";
 $build = 0;
+$list_modules = 0;
+my $only = "";
 my %force;
 my %done;                       # Tarballs that have been processed
@@ -35,4 +37,9 @@
         shift; shift; next;
     }
+    if ($ARGV[0] eq "-only") {
+        if (@ARGV < 2) { die "-only must be coupled to a library name\n"; }
+	$only = lc($ARGV[1]);
+        shift; shift; next;
+    }
     if ($ARGV[0] eq "-h")     { &usage (); }
     if ($ARGV[0] eq "help")   { &usage (); }
@@ -40,4 +47,5 @@
     if ($ARGV[0] eq "--help") { &usage (); }
     if ($ARGV[0] eq "-list")  { &list_distributions(); }
+    if ($ARGV[0] eq "-modules") { $list_modules = 1; shift; next; }
     @tARGV = (@tARGV, $ARGV[0]);
     shift;
@@ -59,4 +67,6 @@
 close (FILE);
 
+if ($list_modules) { &list_modules(); }
+
 # set the psconfig version:
 if ("$version" eq "") {
@@ -65,4 +75,12 @@
 if ("$version" eq "") {
     $version = "default";
+}
+
+# generate new psconfig.csh if needed
+if (! -e "psconfig.csh" || ! -e "psconfig.bash") {
+    $psconfdir = $ENV{'PSCONFDIR'};
+    if ($psconfdir eq "") { die "PSCONFDIR not found, run psbuild -bootstrap and follow instructions\n"; }
+    vsystem ("cat psconfig.csh.in | sed 's|\@PSCONFDIR@|$psconfdir|' > psconfig.csh");
+    vsystem ("cat psconfig.bash.in | sed 's|\@PSCONFDIR@|$psconfdir|' > psconfig.bash");
 }
 
@@ -146,4 +164,5 @@
     if (($auto_force ne "Y") && ($auto_force ne "N")) { die "invalid value for auto_force field\n"; }
 
+    if ($only && ($only ne lc($name))) { next; }
 
     if ((defined $force{lc($name)} or defined $force{'all'}) and
@@ -501,5 +520,8 @@
 
 sub usage {
-    print STDERR "USAGE: pschecklibs [-version] [-build]\n";
+    print STDERR "USAGE: pschecklibs [-version] [-build] [-only module] [-force module] [-force all]\n";
+    print STDERR "  multiple [-force (module)] options may be specified\n";
+    print STDERR "USAGE: pschecklibs [-list] : show C libraries file\n";
+    print STDERR "USAGE: pschecklibs [-modules] : list available C modules\n";
     exit 2;
 }
@@ -521,4 +543,22 @@
 }
 
+sub list_modules {
+
+    foreach $line (@list) {
+	chop $line;
+	if ($line =~ m|^\s*$|) { next; }
+	if ($line =~ m|^\s*\#|) { next; }
+
+	($type, $name, $altnames, $altpaths, $tarball, $tardir, $auto_force, $configure_opts, $make_opts, $install_opts) = split (" ", $line);
+	if ($type eq "bin") {
+	    print STDERR "bin: $name\n";
+	}
+	if ($type eq "lib") {
+	    print STDERR "lib: $name\n";
+	}
+    }
+    exit 0;
+}
+
 sub failure {
     system ("ls");
Index: branches/simtest_nebulous_branches/psconfig/pscheckmods
===================================================================
--- branches/simtest_nebulous_branches/psconfig/pscheckmods	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/pscheckmods	(revision 27840)
@@ -3,6 +3,9 @@
 if (@ARGV != 2) { die "USAGE: pscheckmods (module) (version)\n"; }
 
+# print STDERR "checking in @INC\n";
+
 $x = eval "require $ARGV[0]; 1";
 if (! $x) { 
+    # print "$ARGV[0]: missing\n";
     exit 1;
 }
Index: branches/simtest_nebulous_branches/psconfig/pscheckperl
===================================================================
--- branches/simtest_nebulous_branches/psconfig/pscheckperl	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/pscheckperl	(revision 27840)
@@ -9,15 +9,16 @@
 for (; @ARGV > 0; ) {
     if ($ARGV[0] eq "-version") {
-	$version = $ARGV[1];
+        $version = $ARGV[1];
         shift; shift; next;
     }
     if ($ARGV[0] eq "-build") {
-	$build = 1;
+        $build = 1;
         shift; next;
     }
     if ($ARGV[0] eq "-force") {
-	$force{$ARGV[1]} = 1;
-	shift; shift; next;
+        $force{$ARGV[1]} = 1;
+        shift; shift; next;
     }
+    if ($ARGV[0] eq "-path")  { &list_include_path (); }
     if ($ARGV[0] eq "-h")     { &usage (); }
     if ($ARGV[0] eq "help")   { &usage (); }
@@ -31,5 +32,5 @@
 if ( @ARGV > 1) { &usage(); }
 
-if ( @ARGV == 0) { 
+if ( @ARGV == 0) {
     @list = <$tagsets/*.perl>;
     $file = $list[-1];
@@ -52,4 +53,11 @@
 }
 
+# generate new psconfig.csh if needed
+if (! -e "psconfig.csh" || ! -e "psconfig.bash") {
+    $psconfdir = $ENV{'PSCONFDIR'};
+    if ($psconfdir eq "") { die "PSCONFDIR not found, run psbuild -bootstrap and follow instructions\n"; }
+    vsystem ("cat psconfig.csh.in | sed 's|\@PSCONFDIR@|$psconfdir|' > psconfig.csh");
+    vsystem ("cat psconfig.bash.in | sed 's|\@PSCONFDIR@|$psconfdir|' > psconfig.bash");
+}
 
 $prefix  = `csh -f psconfig.csh --prefix $version`; chomp $prefix;
@@ -77,22 +85,29 @@
     if ($line =~ m|^\s*\#|) { next; }
 
-    ($N, $module, $tarball, $modver, $prompts) = split (" ", $line);
+    $Nvalue = ($N, $module, $tarball, $modver, $buildopts, $prompts) = split (" ", $line);
+    if ($Nvalue < 6) {
+        print "Error in perl module config line $line\n";
+        exit 1;
+    }
+    # print "N: $N, module: $module, tarball: $tarball, modver: $modver, buildopts: $buildopts, prompts: $prompts\n";
 
-    if ($modver eq "") { $modver = 0; } 
+    # we require the number of fields to be fixed, so this test is now invalid:
+    # if ($modver eq "") { $modver = 0; }
+
     system ("pscheckmods $module $modver");
-    if (($? == 0) and not defined $force{$module} and not defined $force{'all'}) { 
-	# print "$module: found\n";
-	next; 
+    if (($? == 0) and not defined $force{$module} and not defined $force{'all'}) {
+        # print "$module: found\n";
+        next;
     }
 
     if (defined $force{$module}) {
-	print "$module: force\n";
+        print "$module: force\n";
     } else {
-	print "$module: missing\n";
+        print "$module: missing\n";
     }
-    unless ($build or defined $force{$module} or defined $force{'all'}) { 
-	$Nmissing ++;
-	push @missing, $module;
-	next; 
+    unless ($build or defined $force{$module} or defined $force{'all'}) {
+        $Nmissing ++;
+        push @missing, $module;
+        next;
     }
 
@@ -102,5 +117,5 @@
     print "extract $module from $tarball\n";
     vsystem ("tar xvzf $tarball");
-    
+
     ($tardir) = $tarball =~ m|(\S*).tar.gz|;
     print "tardir: $tardir\n";
@@ -108,18 +123,28 @@
     chdir $tardir;
 
-    # build the MakeMaker makefile, setting the output directories
-    if ($prompts) {
-	@answers = split (",", $prompts);
-	open (PIPE, "|perl Makefile.PL PREFIX=$prefix LIB=$perldir");
-	foreach $answer (@answers) {
-	    print PIPE "$answer\n";
-	}
-	close (PIPE);
+    # we use NONE as the empty word
+    if ($buildopts eq "NONE") { $buildopts = ""; }
+    if ($prompts eq "NONE") { $prompts = ""; }
+
+    if (-e "Build.PL" and $module ne "Params::Validate" and $module ne "DateTime::TimeZone") {
+        # vsystem("perl Build.PL --install_path lib=$perldir ");
+        vsystem("perl Build.PL --install_base $prefix $buildopts");
+        vsystem("Build");
+        vsystem("Build install");
     } else {
-	vsystem ("perl Makefile.PL PREFIX=$prefix LIB=$perldir");
+        # build the MakeMaker makefile, setting the output directories
+        if ($prompts) {
+            @answers = split (",", $prompts);
+            open (PIPE, "|perl Makefile.PL PREFIX=$prefix LIB=$perldir $buildopts");
+            foreach $answer (@answers) {
+                print PIPE "$answer\n";
+            }
+            close (PIPE);
+        } else {
+            vsystem ("perl Makefile.PL PREFIX=$prefix LIB=$perldir $buildopts");
+        }
+        vsystem ("make < /dev/null");
+        vsystem ("make install");
     }
-    
-    vsystem ("make < /dev/null");
-    vsystem ("make install");
 
     chdir $homedir;
@@ -127,11 +152,11 @@
 if (!$build) {
     if ($Nmissing > 0) {
-	print "The following $Nmissing perl modules are missing from your system\n";
-	foreach $name (@missing) {
-	    print "  $name\n";
-	}
-	print "you may install them in your local path by re-running pscheckperl with -build\n";
+        print "The following $Nmissing perl modules are missing from your system\n";
+        foreach $name (@missing) {
+            print "  $name\n";
+        }
+        print "you may install them in your local path by re-running pscheckperl with -build\n";
     } else {
-	print "no perl modules are missing from your system\n";
+        print "no perl modules are missing from your system\n";
     }
 }
@@ -139,5 +164,5 @@
 
 sub usage {
-    print STDERR "USAGE: pscheckperl [-version] [-build]\n";
+    print STDERR "USAGE: pscheckperl [-version] [-build] [-path]\n";
     exit 2;
 }
@@ -152,8 +177,15 @@
     @list = <$tagsets/*.perl>;
     foreach $line (@list) {
-	chomp $line;
-	($dist) = $line =~ m|$tagsets/(\S*).perl|;
-	print STDERR "$dist\n";
+        chomp $line;
+        ($dist) = $line =~ m|$tagsets/(\S*).perl|;
+        print STDERR "$dist\n";
     }
     exit 2;
 }
+
+sub list_include_path {
+    foreach $path (@INC) {
+        print STDERR "$path\n";
+    }
+    exit 2;
+}
Index: branches/simtest_nebulous_branches/psconfig/psconfig.bash.in
===================================================================
--- branches/simtest_nebulous_branches/psconfig/psconfig.bash.in	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/psconfig.bash.in	(revision 27840)
@@ -35,5 +35,7 @@
 # environment variables
 export PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --path $version`
+export CPATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --cpath $version`
 export ARCH=`/bin/csh -f $PSCONFDIR/psconfig.csh --arch $version`
+export LIBRARY_PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --library_path $version`
 export LD_LIBRARY_PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --ld_library_path $version`
 export PKG_CONFIG_PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --pkg_config_path $version`
Index: branches/simtest_nebulous_branches/psconfig/psconfig.csh.in
===================================================================
--- branches/simtest_nebulous_branches/psconfig/psconfig.csh.in	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/psconfig.csh.in	(revision 27840)
@@ -357,5 +357,5 @@
 # Build wants to put things in prefix/*, MakeMaker wants to put them in prefix/perl5/*
 set plibdir  = {$PSCONFDIR}/{$PSCONFIG}/lib
-# set plib5dir = {$PSCONFDIR}/{$PSCONFIG}/lib/perl5
+set plib5dir = {$PSCONFDIR}/{$PSCONFIG}/lib/perl5
 set newpath = ""
 set pathlist = `echo $PERL5LIB | tr ':' '\n'`
@@ -378,7 +378,7 @@
 else
   if ("$newpath" == "") then
-    setenv PERL5LIB {$plibdir}:
-  else
-    setenv PERL5LIB {$plibdir}:{$newpath}
+    setenv PERL5LIB {$plibdir}:{$plib5dir}:
+  else
+    setenv PERL5LIB {$plibdir}:{$plib5dir}:{$newpath}
   endif 
 endif 
Index: branches/simtest_nebulous_branches/psconfig/tagsets/00_nebulous-1.0.perl
===================================================================
--- branches/simtest_nebulous_branches/psconfig/tagsets/00_nebulous-1.0.perl	(revision 27840)
+++ branches/simtest_nebulous_branches/psconfig/tagsets/00_nebulous-1.0.perl	(revision 27840)
@@ -0,0 +1,87 @@
+# NN    Name                           Tarball                                  Version        Optional Responses
+# a Version of 0 is required if no specific version is desired
+  00    Getopt::Long                   Getopt-Long-2.36.tar.gz                  2.3            n
+  00    Module::Build                  Module-Build-0.2806.tar.gz               0.2806
+  01    ExtUtils::MakeMaker            ExtUtils-MakeMaker-6.54.tar.gz           0
+  02    Params::Validate               Params-Validate-0.92.tar.gz              0.92
+# 02    Apache::Test                   Apache-Test-1.29.tar.gz                  1.29
+  03    DateTime::TimeZone             DateTime-TimeZone-0.59.tar.gz            0
+  04    DateTime::Locale               DateTime-Locale-0.33.tar.gz              0
+  05    Time::Local                    Time-Local-1.17.tar.gz                   0
+  06    DateTime                       DateTime-0.36.tar.gz                     0
+  07    MIME::Base64                   MIME-Base64-3.07.tar.gz                  0
+  08    IO::Compress::Base             IO-Compress-Base-2.003.tar.gz            0
+  09    Compress::Raw::Zlib            Compress-Raw-Zlib-2.003.tar.gz           0
+  10    Class::Factory::Util           Class-Factory-Util-1.6.tar.gz            0
+  11    DateTime::Format::Strptime     DateTime-Format-Strptime-1.0700.tar.gz   0
+  12    Net::Domain::TLD               Net-Domain-TLD-1.65.tar.gz               0
+  13    Sub::Uplevel                   Sub-Uplevel-0.14.tar.gz                  0
+  14    HTML::Tagset                   HTML-Tagset-3.10.tar.gz                  0
+  15    Digest                         Digest-1.15.tar.gz                       0
+  16    IO::Compress::Zlib::Extra      IO-Compress-Zlib-2.003.tar.gz            0
+  17    version                        version-0.70.tar.gz                      0
+  18    Text::Balanced                 Text-Balanced-v2.0.0.tar.gz              0
+  19    DateTime::Format::Builder      DateTime-Format-Builder-0.7807.tar.gz    0
+  20    ExtUtils::Manifest             ExtUtils-Manifest-1.51.tar.gz            0
+  21    URI                            URI-1.35.tar.gz                          1.30
+  22    Data::Validate::Domain         Data-Validate-Domain-0.05.tar.gz         0
+  23    Test::Exception                Test-Exception-0.24.tar.gz               0
+  24    Tree::DAG_Node                 Tree-DAG_Node-1.05.tar.gz                0
+  25    Array::Compare                 Array-Compare-1.13.tar.gz                0
+  26    HTML::Parser                   HTML-Parser-3.56.tar.gz                  0
+  27    Digest::MD5                    Digest-MD5-2.36.tar.gz                   0
+  28    Net::FTP                       libnet-1.19.tar.gz                       0
+  29    Compress::Zlib                 Compress-Zlib-2.003.tar.gz               0
+  30    Locale::Maketext::Simple       Locale-Maketext-Simple-0.18.tar.gz       0
+  31    Parse::RecDescent              Parse-RecDescent-1.94.tar.gz             1.94
+  32    Class::Accessor                Class-Accessor-0.30.tar.gz               0.19
+  33    DateTime::Format::ISO8601      DateTime-Format-ISO8601-0.06.tar.gz      0.06
+  34    CGI                            CGI.pm-3.25.tar.gz                       3
+  35    Test::Cmd                      Test-Cmd-1.05.tar.gz                     1.05
+  36    Net::HTTPServer                Net-HTTPServer-1.1.1.tar.gz              1.1.1
+  37    LWP                            libwww-perl-5.805.tar.gz                 0
+  38    Digest::MD5::File              Digest-MD5-File-0.05.tar.gz              0.03
+  39    File::Temp                     File-Temp-0.18.tar.gz                    0.16
+  40    Data::Validate::URI            Data-Validate-URI-0.01.tar.gz            0.01
+  41    Test::Warn                     Test-Warn-0.08.tar.gz                    0
+  42    YAML                           YAML-0.62.tar.gz                         0.58           y
+  43    Module::Load                   Module-Load-0.10.tar.gz                  0
+  44    Params::Check                  Params-Check-0.25.tar.gz                 0
+  45    Template                       Template-Toolkit-2.16.tar.gz             0              n,n
+  46    Statistics::Descriptive        Statistics-Descriptive-2.6.tar.gz        2.6
+  47    Storable                       Storable-2.15.tar.gz                     0
+  48    IO::String                     IO-String-1.08.tar.gz                    0
+  49    Date::Parse                    TimeDate-1.16.tar.gz                     0
+  50    Digest::SHA1                   Digest-SHA1-2.11.tar.gz                  0
+  51    DB_File                        DB_File-1.814.tar.gz                     0
+  52    File::NFSLock                  File-NFSLock-1.20.tar.gz                 0
+  53    Heap                           Heap-0.71.tar.gz                         0
+  54    Module::Load::Conditional      Module-Load-Conditional-0.16.tar.gz      0
+  55    IPC::Run                       IPC-Run-0.80.tar.gz                      0
+  56    Cache                          Cache-2.04.tar.gz                        0
+  57    IPC::Cmd                       IPC-Cmd-0.36.tar.gz                      0.36
+  58    SOAP::Lite                     SOAP-Lite-0.69.tar.gz                    0              yes,yes,no
+  59    Log::Log4perl                  Log-Log4perl-1.10.tar.gz                 0
+  61    Text::Glob                     Text-Glob-0.08.tar.gz                    0.08
+  62    Number::Compare                Number-Compare-0.01.tar.gz               0.01
+  63    File::Find::Rule               File-Find-Rule-0.30.tar.gz               0.30
+  65    Test::More                     Test-Simple-0.74.tar.gz                  0.49
+  66    Apache::DBI                    Apache-DBI-1.06.tar.gz                   0
+  67    Apache2::SOAP                  Apache2-SOAP-0.72.tar.gz                 0
+  68    Test::URI                      Test-URI-1.08.tar.gz                     0
+# 69    Sys::Statistics::Linux::DiskUsage Sys-Statistics-Linux-0.26.tar.gz      0
+  70    Config::YAML                   Config-YAML-1.42.tar.gz                  0
+  72    File::ExtAttr                  File-ExtAttr-1.07.tar.gz                 0
+  73    DBI                            DBI-1.601.tar.gz                         0
+  71    DBD::mysql                     DBD-mysql-4.006.tar.gz                   0
+  74    Net::Server::Daemonize         Net-Server-0.97.tar.gz                   0.05
+  75    File::Path                      File-Path-2.04.tar.gz			0
+  76    File::Mountpoint                File-Mountpoint-0.01.tar.gz             0.01
+  77    Filesys::Df                     Filesys-Df-0.92.tar.gz                  0.92
+  78    SQL::Interp                     SQL-Interp-1.06.tar.gz                  0
+  79    Log::Dispatch::Email::MailSend  Log-Dispatch-2.22.tar.gz		0
+  80    Abstract::Meta::Class          Abstract-Meta-Class-0.13.tar.gz		0
+  81    DBIx::Connection               DBIx-Connection-0.13.tar.gz		0
+  82    Simple::SAX::Serializer        Simple-SAX-Serializer-0.05.tar.gz	0
+  83    Test::Distribution             Test-Distribution-2.00.tar.gz		0
+  84    Test::DBUnit                   Test-DBUnit-0.20.tar.gz                  0.20
Index: branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.8.dist
===================================================================
--- branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.8.dist	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.8.dist	(revision 27840)
@@ -69,5 +69,5 @@
   YYYYY  DataStore              ipp-2-8          -0
 
-  YYYYY  ppMops                 ipp-2-8          -0
+  YYYYY  ppTranslate            ipp-2-8          -0
 
   YNNNN  extsrc/gpcsw           ipp-2-8          -0
Index: branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.9.dist
===================================================================
--- branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.9.dist	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.9.dist	(revision 27840)
@@ -69,9 +69,12 @@
   YNYYN  ippMonitor             ipp-2-9          -0
   YYYYY  DataStore              ipp-2-9          -0
+  YYYYY  DataStoreServer        ipp-2-9          -0
 
-  YYYYY  ppMops                 ipp-2-9          -0
+  YYYYY  ppTranslate            ipp-2-9          -0
 
   YYYYY  extsrc/gpcsw           ipp-2-9          -0
   YYYYY  magic                  ipp-2-9          -0
+  YYYYY  magic/censorObjects    ipp-2-9          -0
+  YYYYY  magic/remove           ipp-2-9          -0
 
 # there are externally required C libraries and perl modules (see INSTALL)
Index: branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.9.libs
===================================================================
--- branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.9.libs	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.9.libs	(revision 27840)
@@ -20,7 +20,8 @@
 
 # Build tools
+bin m4                   NONE           NONE   m4-1.4.13.tar.gz         m4-1.4.13        N NONE NONE NONE
 bin autoconf             NONE           NONE   autoconf-2.63.tar.gz     autoconf-2.63    N NONE NONE NONE
 bin automake             NONE           NONE   automake-1.10.tar.gz     automake-1.10    N NONE NONE NONE
-bin libtool              NONE           NONE   libtool-2.2.6a.tar.gz    libtool-2.2.6    N NONE NONE NONE
+bin libtool              NONE           NONE   libtool-2.2.6-p1.tar.gz  libtool-2.2.6-p1 N NONE NONE NONE
 bin pkg-config           NONE           NONE   pkg-config-0.23.tar.gz   pkg-config-0.23  N NONE NONE NONE
 
@@ -33,5 +34,5 @@
 lib libpng               NONE           NONE   libpng-1.2.15.tar.gz     libpng-1.2.15    N NONE NONE NONE
 lib libjpeg              NONE           jpeg   jpegsrc.v6b-p1.tar.gz    jpeg-6b          N --enable-shared NONE install-lib
-lib libcfitsio           NONE           NONE   cfitsio3100-p2.tar.gz    cfitsio3100-p2   N --enable-shared shared NONE
+lib libcfitsio           NONE           NONE   cfitsio3100-p2.tar.gz    cfitsio3100-p2   N --enable-shared shared,all NONE
 lib libmysqlclient       NONE           mysql  mysql-5.0.51a.tar.gz     mysql-5.0.51a    N NONE NONE NONE
 lib libgsl               NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         N NONE NONE NONE
Index: branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.9.perl
===================================================================
--- branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.9.perl	(revision 25061)
+++ branches/simtest_nebulous_branches/psconfig/tagsets/ipp-2.9.perl	(revision 27840)
@@ -1,83 +1,99 @@
-# NN    Name                           Tarball                                  Version        Optional Responses
-  00    Getopt::Long                   Getopt-Long-2.36.tar.gz                  2.3            n
-  00    Module::Build                  Module-Build-0.2806.tar.gz               0.2806
-  01    ExtUtils::MakeMaker            ExtUtils-MakeMaker-6.31.tar.gz           0
-  02    Params::Validate               Params-Validate-0.91.tar.gz       0.77
-#  02    Apache::Test                   Apache-Test-1.29.tar.gz                  1.29
-  03    DateTime::TimeZone             DateTime-TimeZone-0.59.tar.gz            0
-  04    DateTime::Locale               DateTime-Locale-0.33.tar.gz              0
-  05    Time::Local                    Time-Local-1.17.tar.gz                   0
-  06    DateTime                       DateTime-0.36.tar.gz                     0
-  07    MIME::Base64                   MIME-Base64-3.07.tar.gz                  0
-  08    IO::Compress::Base             IO-Compress-Base-2.003.tar.gz            0
-  09    Compress::Raw::Zlib            Compress-Raw-Zlib-2.003.tar.gz           0
-  10    Class::Factory::Util           Class-Factory-Util-1.6.tar.gz            0
-  11    DateTime::Format::Strptime     DateTime-Format-Strptime-1.0700.tar.gz   0
-  12    Net::Domain::TLD               Net-Domain-TLD-1.65.tar.gz               0
-  13    Sub::Uplevel                   Sub-Uplevel-0.14.tar.gz                  0
-  14    HTML::Tagset                   HTML-Tagset-3.10.tar.gz                  0
-  15    Digest                         Digest-1.15.tar.gz                       0
-  16    IO::Compress::Zlib::Extra      IO-Compress-Zlib-2.003.tar.gz            0
-  17    version                        version-0.70.tar.gz                      0
-  18    Text::Balanced                 Text-Balanced-v2.0.0.tar.gz              0
-  19    DateTime::Format::Builder      DateTime-Format-Builder-0.7807.tar.gz    0
-  20    ExtUtils::Manifest             ExtUtils-Manifest-1.51.tar.gz            0
-  21    URI                            URI-1.35.tar.gz                          1.30
-  22    Data::Validate::Domain         Data-Validate-Domain-0.05.tar.gz         0
-  23    Test::Exception                Test-Exception-0.24.tar.gz               0
-  24    Tree::DAG_Node                 Tree-DAG_Node-1.05.tar.gz                0
-  25    Array::Compare                 Array-Compare-1.13.tar.gz                0
-  26    HTML::Parser                   HTML-Parser-3.56.tar.gz                  0
-  27    Digest::MD5                    Digest-MD5-2.36.tar.gz                   0
-  28    Net::FTP                       libnet-1.19.tar.gz                       0
-  29    Compress::Zlib                 Compress-Zlib-2.003.tar.gz               0
-  30    Locale::Maketext::Simple       Locale-Maketext-Simple-0.18.tar.gz       0
-  31    Parse::RecDescent              Parse-RecDescent-1.94.tar.gz             1.94
-  32    Class::Accessor                Class-Accessor-0.30.tar.gz               0.19
-  33    DateTime::Format::ISO8601      DateTime-Format-ISO8601-0.06.tar.gz      0.06
-  34    CGI                            CGI.pm-3.25.tar.gz                       3
-  35    Test::Cmd                      Test-Cmd-1.05.tar.gz                     1.05
-  36    Net::HTTPServer                Net-HTTPServer-1.1.1.tar.gz              1.1.1
-  37    LWP                            libwww-perl-5.805.tar.gz                 0
-  38    Digest::MD5::File              Digest-MD5-File-0.05.tar.gz              0.03
-  39    File::Temp                     File-Temp-0.18.tar.gz                    0.16
-  40    Data::Validate::URI            Data-Validate-URI-0.01.tar.gz            0.01
-  41    Test::Warn                     Test-Warn-0.08.tar.gz                    0
-  42    YAML                           YAML-0.62.tar.gz                         0.58           y
-  43    Module::Load                   Module-Load-0.10.tar.gz                  0
-  44    Params::Check                  Params-Check-0.25.tar.gz                 0
-  45    Template                       Template-Toolkit-2.16.tar.gz             0              n,n
-  46    Statistics::Descriptive        Statistics-Descriptive-2.6.tar.gz        2.6
-  47    Storable                       Storable-2.15.tar.gz                     0
-  48    IO::String                     IO-String-1.08.tar.gz                    0
-  49    Date::Parse                    TimeDate-1.16.tar.gz                     0
-  50    Digest::SHA1                   Digest-SHA1-2.11.tar.gz                  0
-  51    DB_File                        DB_File-1.814.tar.gz                     0
-  52    File::NFSLock                  File-NFSLock-1.20.tar.gz                 0
-  53    Heap                           Heap-0.71.tar.gz                         0
-  54    Module::Load::Conditional      Module-Load-Conditional-0.16.tar.gz      0
-  55    IPC::Run                       IPC-Run-0.80.tar.gz                      0
-  56    Cache                          Cache-2.04.tar.gz                        0
-  57    IPC::Cmd                       IPC-Cmd-0.36.tar.gz                      0.36
-  58    SOAP::Lite                     SOAP-Lite-0.69.tar.gz                    0              yes,yes,no
-  59    Log::Log4perl                  Log-Log4perl-1.10.tar.gz                 0
-# 60    File::ExtAttr                  File-ExtAttr-1.04.tar.gz                 0
-  61    Text::Glob                     Text-Glob-0.08.tar.gz                    0.08
-  62    Number::Compare                Number-Compare-0.01.tar.gz               0.01
-  63    File::Find::Rule               File-Find-Rule-0.30.tar.gz               0.30
-  64    Astro::FITS::CFITSIO           Astro-FITS-CFITSIO-1.05.tar.gz           0
-  65    Test::More                     Test-Simple-0.74.tar.gz                  0.49
-#  66    Apache::DBI                   Apache-DBI-1.06.tar.gz                   0
-#  67    Apache2::SOAP                 Apache2-SOAP-0.72.tar.gz                 0
-  68    Test::URI                      Test-URI-1.08.tar.gz                     0
-#  69    Sys::Statistics::Linux::DiskUsage Sys-Statistics-Linux-0.26.tar.gz      0
-#  70    Config::YAML                  Config-YAML-1.42.tar.gz                  0
-#  72    File::ExtAttr                 File-ExtAttr-1.07.tar.gz                 0
-  73    DBI                            DBI-1.601.tar.gz                         0
-  71    DBD::mysql                     DBD-mysql-4.006.tar.gz                   0
-#  74    Net::Server::Daemonize                Net-Server-0.97.tar.gz                   0.05
-  75    File::Path                      File-Path-2.04.tar.gz
-  76    File::Mountpoint                File-Mountpoint-0.01.tar.gz             0.01
-  77    Filesys::Df                     Filesys-Df-0.92.tar.gz                  0.92
-  78    SQL::Interp                     SQL-Interp-1.06.tar.gz
-  79    Log::Dispatch::Email::MailSend  Log-Dispatch-2.22.tar.gz
+# notes:
+# Build.PL/Makefile.PL options are added to the line "perl Build.PL / perl Makefile.PL", a value of NONE is required if no options are desired
+# Build.PL/Makefile.PL responses are supplied via stdin to "perl Build.PL / perl Makefile.PL", a value of NONE is required if no responses are desired
+
+# NN    Name                           Tarball                                  Version        Build.PL/Makefile.PL Build.PL/Makefile.PL responses
+# a Version of 0 is required if no specific version is desired                                 options   responses
+  00    Getopt::Long                   Getopt-Long-2.36.tar.gz                  2.3            NONE      n
+  00    Module::Build                  Module-Build-0.2806.tar.gz               0.2806         NONE      NONE # special comment here
+  01    ExtUtils::MakeMaker            ExtUtils-MakeMaker-6.54.tar.gz           0              NONE      NONE
+  02a   Attribute::Handlers            Attribute-Handlers-0.87.tar.gz           0.79           NONE      NONE
+  02    Params::Validate               Params-Validate-0.92.tar.gz              0.92           NONE      NONE
+# 02    Apache::Test                   Apache-Test-1.29.tar.gz                  1.29           NONE      NONE
+  03a   Class::Singleton               Class-Singleton-1.4.tar.gz               0              NONE      NONE
+  03    DateTime::TimeZone             DateTime-TimeZone-0.59.tar.gz            0              NONE      NONE
+  04    DateTime::Locale               DateTime-Locale-0.33.tar.gz              0              NONE      NONE
+  05    Time::Local                    Time-Local-1.17.tar.gz                   0              NONE      NONE
+  06    DateTime                       DateTime-0.36.tar.gz                     0              NONE      NONE
+  07    MIME::Base64                   MIME-Base64-3.07.tar.gz                  0              NONE      NONE
+  08    IO::Compress::Base             IO-Compress-Base-2.003.tar.gz            0              NONE      NONE
+  09    Compress::Raw::Zlib            Compress-Raw-Zlib-2.003.tar.gz           0              NONE      NONE
+  10    Class::Factory::Util           Class-Factory-Util-1.6.tar.gz            0              NONE      NONE
+  11    DateTime::Format::Strptime     DateTime-Format-Strptime-1.0700.tar.gz   0              NONE      NONE
+  12    Net::Domain::TLD               Net-Domain-TLD-1.65.tar.gz               0              NONE      NONE
+  13    Sub::Uplevel                   Sub-Uplevel-0.14.tar.gz                  0              NONE      NONE
+  14    HTML::Tagset                   HTML-Tagset-3.10.tar.gz                  0              NONE      NONE
+  15    Digest                         Digest-1.15.tar.gz                       0              NONE      NONE
+  16    IO::Compress::Zlib::Extra      IO-Compress-Zlib-2.003.tar.gz            0              NONE      NONE
+  17    version                        version-0.70.tar.gz                      0              NONE      NONE
+  18    Text::Balanced                 Text-Balanced-v2.0.0.tar.gz              0              NONE      NONE
+  19    DateTime::Format::Builder      DateTime-Format-Builder-0.7807.tar.gz    0              NONE      NONE
+  20    ExtUtils::Manifest             ExtUtils-Manifest-1.51.tar.gz            0              NONE      NONE
+  21    URI                            URI-1.35.tar.gz                          1.30           NONE      NONE
+  22    Data::Validate::Domain         Data-Validate-Domain-0.05.tar.gz         0              NONE      NONE
+  23    Test::Exception                Test-Exception-0.24.tar.gz               0              NONE      NONE
+  24    Tree::DAG_Node                 Tree-DAG_Node-1.05.tar.gz                0              NONE      NONE
+  25    Array::Compare                 Array-Compare-1.13.tar.gz                0              NONE      NONE
+  26    HTML::Parser                   HTML-Parser-3.56.tar.gz                  0              NONE      NONE
+  27    Digest::MD5                    Digest-MD5-2.36.tar.gz                   0              NONE      NONE
+  28    Net::FTP                       libnet-1.19.tar.gz                       0              NONE      n
+  29    Compress::Zlib                 Compress-Zlib-2.003.tar.gz               0              NONE      NONE
+  30    Locale::Maketext::Simple       Locale-Maketext-Simple-0.18.tar.gz       0              NONE      NONE
+  31    Parse::RecDescent              Parse-RecDescent-1.94.tar.gz             1.94           NONE      NONE
+  32    Class::Accessor                Class-Accessor-0.30.tar.gz               0.19           NONE      NONE
+  33    DateTime::Format::ISO8601      DateTime-Format-ISO8601-0.06.tar.gz      0.06           NONE      NONE
+  34    CGI                            CGI.pm-3.25.tar.gz                       3              NONE      NONE
+  35    Test::Cmd                      Test-Cmd-1.05.tar.gz                     1.05           NONE      NONE
+  36    Net::HTTPServer                Net-HTTPServer-1.1.1.tar.gz              1.1.1          NONE      NONE
+  37    LWP                            libwww-perl-5.805.tar.gz                 0              NONE      NONE
+  38    Digest::MD5::File              Digest-MD5-File-0.05.tar.gz              0.03           NONE      NONE
+  39    File::Temp                     File-Temp-0.18.tar.gz                    0.16           NONE      NONE
+  40    Data::Validate::URI            Data-Validate-URI-0.01.tar.gz            0.01           NONE      NONE
+  41    Test::Warn                     Test-Warn-0.08.tar.gz                    0              NONE      NONE
+  42    YAML                           YAML-0.62.tar.gz                         0.58           NONE      y
+  43    Module::Load                   Module-Load-0.10.tar.gz                  0              NONE      NONE
+  44    Params::Check                  Params-Check-0.25.tar.gz                 0              NONE      NONE
+  45    Template                       Template-Toolkit-2.16.tar.gz             0              NONE      n,n
+  46    Statistics::Descriptive        Statistics-Descriptive-2.6.tar.gz        2.6            NONE      NONE
+  47    Storable                       Storable-2.15.tar.gz                     0              NONE      NONE
+  48    IO::String                     IO-String-1.08.tar.gz                    0              NONE      NONE
+  49    Date::Parse                    TimeDate-1.16.tar.gz                     0              NONE      NONE
+  50    Digest::SHA1                   Digest-SHA1-2.11.tar.gz                  0              NONE      NONE
+  51    DB_File                        DB_File-1.814.tar.gz                     0              NONE      NONE
+  52    File::NFSLock                  File-NFSLock-1.20.tar.gz                 0              NONE      NONE
+  53    Heap                           Heap-0.71.tar.gz                         0              NONE      NONE
+  54    Module::Load::Conditional      Module-Load-Conditional-0.16.tar.gz      0              NONE      NONE
+  55    IPC::Run                       IPC-Run-0.80.tar.gz                      0              NONE      NONE
+  56    Cache                          Cache-2.04.tar.gz                        0              NONE      NONE
+  57    IPC::Cmd                       IPC-Cmd-0.36.tar.gz                      0.36           NONE      NONE
+  58    SOAP::Lite                     SOAP-Lite-0.69.tar.gz                    0              NONE      yes,yes,no
+  59    Log::Log4perl                  Log-Log4perl-1.10.tar.gz                 0              NONE      NONE
+# 60    File::ExtAttr                  File-ExtAttr-1.04.tar.gz                 0              NONE      NONE
+  61    Text::Glob                     Text-Glob-0.08.tar.gz                    0.08           NONE      NONE
+  62    Number::Compare                Number-Compare-0.01.tar.gz               0.01           NONE      NONE
+  63    File::Find::Rule               File-Find-Rule-0.30.tar.gz               0.30           NONE      NONE
+  64    Astro::FITS::CFITSIO           Astro-FITS-CFITSIO-1.05.tar.gz           0              NONE      NONE
+  65    Test::More                     Test-Simple-0.74.tar.gz                  0.49           NONE      NONE
+# 66    Apache::DBI                    Apache-DBI-1.06.tar.gz                   0              NONE      NONE
+# 67    Apache2::SOAP                  Apache2-SOAP-0.72.tar.gz                 0              NONE      NONE
+  68    Test::URI                      Test-URI-1.08.tar.gz                     0              NONE      NONE
+# 69    Sys::Statistics::Linux::DiskUsage Sys-Statistics-Linux-0.26.tar.gz      0              NONE      NONE
+# 70    Config::YAML                   Config-YAML-1.42.tar.gz                  0              NONE      NONE
+# 72    File::ExtAttr                  File-ExtAttr-1.07.tar.gz                 0              NONE      NONE
+  73    DBI                            DBI-1.601.tar.gz                         0              NONE      NONE
+  71    DBD::mysql                     DBD-mysql-4.006.tar.gz                   0              NONE      NONE
+# 74    Net::Server::Daemonize         Net-Server-0.97.tar.gz                   0.05           NONE      NONE
+  75    File::Path                      File-Path-2.04.tar.gz                   0              NONE      NONE
+  76    File::Mountpoint                File-Mountpoint-0.01.tar.gz             0.01           NONE      NONE
+  77    Filesys::Df                     Filesys-Df-0.92.tar.gz                  0.92           NONE      NONE
+  78    SQL::Interp                     SQL-Interp-1.06.tar.gz                  0              NONE      NONE
+  79a   Mail::Send                      MailTools-2.04.tar.gz                   0              NONE      NONE
+  79b   Log::Dispatch::Email::MailSend  Log-Dispatch-2.22.tar.gz                0              NONE      NONE
+  80    Abstract::Meta::Class          Abstract-Meta-Class-0.13.tar.gz          0              NONE      NONE
+  81    DBIx::Connection               DBIx-Connection-0.13.tar.gz              0              NONE      NONE
+  82a   Test::Pod                      Test-Pod-1.40.tar.gz                     0              NONE      NONE
+  82c   XML::NamespaceSupport          XML-NamespaceSupport-1.10.tar.gz         0              --skip    NONE
+  82b   XML::SAX                       XML-SAX-0.96.tar.gz                      0              NONE      Y
+  82d   Simple::SAX::Serializer        Simple-SAX-Serializer-0.05.tar.gz        0              NONE      NONE
+  83    Test::Distribution             Test-Distribution-2.00.tar.gz            0              NONE      NONE
+  84    Test::DBUnit                   Test-DBUnit-0.20.tar.gz                  0.20           NONE      NONE
