handle tugboat (both latex and plain)

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

2 files changed, 38 insertions, 5 deletions

diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index 0cd078f3f1c..25638939ae9 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -242,6 +242,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";
  'ticket',	"&MAKEflatten",
  'tipa',	"&MAKEtipa",
  'tpcmfont',	"print \"Not installing tpcmfont\n\"",
+ 'tugboat',	"&MAKEtugboat",  # both plain and latex
  'txfonts',	"&MAKEflatten",
  'ucs',		"&MAKEucs",
  'ukrhyph',	"&MAKEukrhyph",
@@ -1795,6 +1796,21 @@ sub MAKEtexdraw {
  killfiles($cleanpatt);
 }
 
+# tugboat has both plain and latex files, which we are not set up for.
+# move the plain files manually, then handle latex normally.
+# 
+sub MAKEtugboat {
+ print "\t SPECIAL tugboat\n";
+ &setup ();
+ chdir("$DEST/doc/$whichdocformat/$package");
+ #
+ &SYSTEM ("mkdir -p $DEST/doc/plain/tugboat $DEST/tex/plain/tugboat");
+ &SYSTEM ("$MV plain/README plain/tubguide* $DEST/doc/plain/tugboat");
+ &SYSTEM ("$MV plain/tug* $DEST/tex/plain/tugboat");
+ #
+ &donormal ();  # handle latex
+}
+
 sub MAKEexpressg {
  &setup;
 chdir("$DEST/doc/$whichdocformat/$package");
diff --git a/Build/tools/ctan2tl b/Build/tools/ctan2tl
index b59ce7e1071..5545a7e8099 100755
--- a/Build/tools/ctan2tl
+++ b/Build/tools/ctan2tl
@@ -8,6 +8,7 @@
 # Basic usage: ctan2tl /path/to/ctan/package
 # --place to include final `place' invocation (repository adds/removes).
 # --no-ctan if already have files in ../cdbuild/raw/PKG.
+# Unlikely to work without GNU utilities.
 # 
 # This does not actually commit anything to the repository.
 
@@ -31,11 +32,12 @@ else
 fi
 
 if test ! -d $1; then
-  echo "$0: $1 not a directory." >&2
+  echo "$0: $1 not a (CTAN) directory." >&2
   exit 1
 fi
 
 # xx this should be a separate script, also used by tpm-ctan-check.
+ctan_dir1=$1
 pkg=`basename $1`
 
 if $copy_from_ctan; then
@@ -51,7 +53,7 @@ case "$pkg" in
 esac
 
 # lshort is arranged by language.
-pkgdir=`dirname $1`
+pkgdir=`dirname $ctan_dir1`
 up=`basename $pkgdir`
 test "$up" = lshort && pkg=lshort-$pkg
 
@@ -70,6 +72,15 @@ test "$pkg" = doc-vn && test "$up" = contrib && pkg=powerdot-doc-vn
 # amslatex/vietnamese.
 test "$pkg" = vietnamese && test "$up" = amslatex && pkg=amsldoc-vn
 
+# annoyingly, tugboat plain and tugboat latex are stored in two
+# different places on ctan.  we'll assume we're invoked with the latex
+# dir, and now arrange to also copy in the plain stuff to a `plain'
+# subdirectory, which ctan2tds.pl has a further special case to handle.
+# 
+if test "$pkg" = tugboat; then
+  ctan_dir2=`echo $ctan_dir1 | sed s/latex/plain/`
+  destdir2=$pkg/plain
+fi
 
 # remove whatever old stuff we might have.
 rm -rf $pkg
@@ -79,17 +90,23 @@ if test "$pkg" = genmisc; then
   # (that is, no patch.doc or pmat.zip).
   mkdir -p $pkg
   cp -p \
-    `find $1/* '(' -type d -o -type l ')' -prune -o \
-                   '(' -name '*.sty' -o -name *.tex ')' -print` \
+    `find $ctan_dir1/* '(' -type d -o -type l ')' -prune -o \
+                          '(' -name '*.sty' -o -name *.tex ')' -print` \
     $pkg
 else
   # normal case
-  cp -pr $1 $pkg
+  cp -pr $ctan_dir1 $pkg
+  
+  # second ctan directory.
+  if test -n "$ctan_dir2"; then
+    cp -r $ctan_dir2 $destdir2
+  fi
 fi
 
 fi  # end of copying from CTAN.
 
 
+# 
 printf "\n\f ctan2tds\n"
 rm -rf ../cooked/$pkg
 test -d ../cooked || mkdir ../cooked