update a2ping into scripts, symlink in bins

git-svn-id: svn://tug.org/texlive/trunk@6834 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 35 insertions, 8 deletions

diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 29a2c12ab0f..63ed2a91798 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -486,6 +486,7 @@ $standardfoundry='public';
 %specialdest = (
  'MemoirChapStyles',	'texmf-doc',
  'Type1fonts',		'texmf-doc',
+ 'a2ping',		'texmf',
  'amsldoc-it',		'texmf-doc',
  'amsldoc-vn',		'texmf-doc',
  'amsthdoc-it',		'texmf-doc',
@@ -1244,11 +1245,16 @@ $standardocp='\.ocp';
 );
 $standardxmt='\.xmt';
 
+%specialscripts = (
+ 'a2ping'	=> '\.pl',
+);
+
 # which suffixes to remove after building.  Checked after runins and at
 # the end, in the doc directory.
 $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
                 . '|\.bbl|\.blg|\.idx|\.ind|\.ilg|\.glo|\.gls|\.loa';
 %specialclean  = (
+ 'a2ping'	=> 'README',  # not worth it
  'kpfonts'	=> 'kpfonts.tds.zip',
  'mathexam'	=> 'sample.tex~',
  'mh'		=> "$standardclean|.*\.(drv|ins)",	# derived from dtx's
@@ -1479,12 +1485,13 @@ sub donormal {
    &setup;
    chdir("$DEST/doc/$whichdocformat/$package");
    &buildfilelist;
-# run the .ins files (if any) supplied
+
+   # run the .ins files (if any) supplied
    $inspatt = $specialins{$package} || $standardins;
    $Foundry = $specialfoundry{$package} || $standardfoundry;
    &runins($inspatt);
 
-# rebuild the list of files in the directory
+   # rebuild the list of files in the directory
    &buildfilelist;
    
    if ($Foundry eq "metafont") {
@@ -1494,7 +1501,7 @@ sub donormal {
    }
    
    &dodvi;
-# rebuild again, as we have .dvi files now
+   # rebuild again, as we have .dvi files now
    &buildfilelist;
    &dobst;
    &domp;
@@ -1506,9 +1513,9 @@ sub donormal {
    &doomega;
    &dosource;
    &dotype1;
-#
-# this is a bit weird, but its an easy way to remove
-# empty directories that we never used.
+   &doscripts;
+
+   # remove empty directories that we never used.
    &SYSTEM ("rmdir $DEST/*/$whichformat/$package 2>/dev/null");
 
    &killfiles ($specialclean{$package} || $standardclean);
@@ -1530,7 +1537,9 @@ sub runins
 }
 
 sub install {
-  local($destdir,$thispatt) = @_;
+  my ($destdir,$thispatt) = @_;
+  return unless $thispatt;
+  
   print "\t INSTALL $thispatt to $destdir\n";
   &SYSTEM ("mkdir -p $destdir") unless -d $destdir;
 
@@ -1648,6 +1657,18 @@ sub dotype1{
    &install("$DEST/fonts/opentype/public/$package", $otfpatt);
 }
 
+# scripts.  Build/source/tex/tetex/Makefile.in installs symlinks
+# in the bin directories where appropriate.  Just for simplicitly, let's
+# try keeping DEST as texmf when symlinks get installed; otherwise
+# (if it gets called as a subprogram) texmf-dist is ok.
+# 
+sub doscripts
+{
+   my $scriptpatt = $specialscripts{$package};
+   return unless $scriptpatt;
+   &install ("$DEST/scripts/$package", $scriptpatt);
+}
+
 # xmltex files
 sub doxmt{
    my $xmtpatt = $specialxmt{$package} || $standardxmt;
diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl
index d0765d8ce49..e1360d71564 100755
--- a/Master/tlpkg/bin/ctan2tl
+++ b/Master/tlpkg/bin/ctan2tl
@@ -59,6 +59,12 @@ fi
 echo "$0: ctan dir for $pkg"
 echo "$0: is $ctan_dir1"
 
+if grep " $pkg " $mydir/tlpkg-ctan-check >/dev/null; then :; else
+  echo
+  echo "$0: $pkg not in $mydir/tlpkg-ctan-check, add?"
+fi
+  
+# 
 if $copy_from_ctan; then
 
 # remove whatever dregs in raw that might be lying around.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 28532210ed6..94455ac4f09 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -20,7 +20,7 @@ my $TL;
 
 my @WorkingTLP = qw(
         12many
-        a0poster aastex abbr abc abstract abstyles accfonts achemso
+        a0poster a2ping aastex abbr abc abstract abstyles accfonts achemso
           acmtrans acronym 
           active-conf addlines adrconv ae aguplus aichej AkkTeX algorithm2e
           algorithmicx algorithms