TLTREE.pm (_initialize_lines): do not ignore symlinks to directories,

i.e., bin/*/man.
texlive-scripts: include bin/*/man; hope it works out.
texlive.infra, tlmgr: doc tweaks.

tl-update-auto: skip texnansi.enc, now part of ly1.
tl-update-{asy,bindir,messages}: doc/url updates.


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

7 files changed, 20 insertions, 13 deletions

diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm
index efce2cc9fbd..dc8c8d49844 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -60,7 +60,6 @@ sub init_from_statusfile {
 sub init_from_files {
   my $self = shift;
   my $svnroot = $self->{'svnroot'};
-  #my @lines = `find $svnroot ! -wholename '*/.svn*'`;
   my @lines = `find $svnroot`;
   my $retval = $?;
   if ($retval != 0) {
@@ -82,13 +81,14 @@ sub _initialize_lines {
   chdir($self->svnroot) || die "chdir($self->{svnroot}) failed: $!";
   foreach my $l (@lines) {
     chomp($l);
-    next if ($l =~ /^\?/);    # ignore files not under version control
-    if ($l =~ /^(.)(.)(.)(.)(.)(.)..\s*(\d+)\s+([\d\?]+)\s+([\w\?]+)\s+(.+)$/) {
+    next if $l =~ /^\?/;    # ignore files not under version control
+    if ($l =~ /^(.)(.)(.)(.)(.)(.)..\s*(\d+)\s+([\d\?]+)\s+([\w\?]+)\s+(.+)$/){
       $self->{'revision'} = $7 unless defined($self->{'revision'});
       my $lastchanged = ($8 eq "?" ? 1 : $8);
       my $entry = "$10";
       next if ($1 eq "D"); # ignore files which are removed
-      next if -d $entry;  # TODO: what to do with links???
+      next if -d $entry && ! -l $entry; # keep symlinks to dirs (bin/*/man),
+                                        # ignore normal dirs.
       # collect architectures, assuming nothing is in bin/ but arch subdirs.
       if ($entry =~ m,^bin/([^/]*)/,) {
         $archs{$1} = 1;
diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy
index 0f73e2cab4f..b68c30c767f 100755
--- a/Master/tlpkg/bin/tl-update-asy
+++ b/Master/tlpkg/bin/tl-update-asy
@@ -102,7 +102,7 @@ elif false && $update_runtime_from_ainst; then
     $xmf/doc \
     $xmf/tex/*/asymptote"
 
-  svn status $ci | sed -n 's/^\?//p'
+  svn status $ci | sed -n 's/^\?//p' | fgrep -v binaries
   #svn add ...
 
   cd /tmp/ainst
diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index ead38785c2b..382d72d73d6 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -106,7 +106,7 @@ done
 
 fontnameencslave=texmf-dist/fonts/enc/dvips/base
 #
-files=`cd $fontnamemaster && ls *.enc | egrep -vw '(groff|t5).enc'`
+files=`cd $fontnamemaster && ls *.enc | egrep -vw '(groff|t5|texnansi).enc'`
 for basef in $files; do
   fontnameencslavef=$fontnameencslave/$basef
   if $diff $fontnameencslavef $fontnamemaster/$basef >$temp.$basef.diff; then
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 1552ead55bc..863c7a5eea9 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -140,11 +140,13 @@ for tlname in $tlnames; do
     default_bin_loc=$download_loc
     grab="$download -O $download_loc"
     $grab http://ocean1.ee.duth.gr/~apostolo/i386-pc-solaris2.11.tar.xz;;
-   *-darwin)
-    default_bin_loc=$download_loc
-    $grab http://www.uoregon.edu/~koch/$tlname.tar.gz;;
    powerpc-linux)
     default_bin_loc=/home/tschmitz/powerpc-linux.tar.bz2;;
+   universal-darwin)
+    download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+    default_bin_loc=$download_loc
+    grab="$download -O $download_loc"
+    $grab http://www.uoregon.edu/~koch/universal-darwin-20100616.tar.xz;;
    sparc-linux)
     default_bin_loc=/home/karl/s.tgz;;
    win32)
@@ -154,7 +156,7 @@ for tlname in $tlnames; do
     download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
     default_bin_loc=$download_loc
     grab="$download -O $download_loc"
-    $grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;;   
+    $grab  www.uoregon.edu/~koch/x86_64-darwin-20100616.tar.xz;;
    x86_64-linux)
     default_bin_loc=$download_loc
     $grab ftp://ftpth.mppmu.mpg.de/pub/peb/TLtests/Build-x86_64-linux.tar.bz2;;
diff --git a/Master/tlpkg/bin/tl-update-messages b/Master/tlpkg/bin/tl-update-messages
index a637e78968b..e95800ded94 100755
--- a/Master/tlpkg/bin/tl-update-messages
+++ b/Master/tlpkg/bin/tl-update-messages
@@ -22,7 +22,7 @@ xgettext -o tlpkg/translations/messages.pot  -L Perl   \
        texmf/scripts/texlive/tlmgrgui.pl      \
        texmf/scripts/texlive/tlmgrgui/*.pl
 
-	--package-version=2010			\
+#	--package-version=2010			\
 #	--package-name="TeX Live"		\
 
 
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 3ac97ad7c13..7146625baff 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -1,12 +1,17 @@
 category TLCore
 shortdesc TeX Live infrastructure programs
-longdesc Includes install-tl, tl-portable, rungs, et al.
+longdesc Includes install-tl, tl-portable, rungs, et al., not needed for
+longdesc tlmgr to run but still ours.  Not included in tlcritical.
+#
 depend texlive.infra
+#
 runpattern d texmf/scripts/texlive/lua
 runpattern f texmf/scripts/texlive/rungs.tlu
 runpattern f texmf/scripts/texlive/test-tlpdb.tlu
 runpattern f texmf/scripts/texlive/texconf.tlu
+#
 binpattern f bin/${ARCH}/rungs
+binpattern f bin/${ARCH}/man
 #
 # install-tl and tl-portable
 runpattern f tl-portable
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 3d4123d6f54..cad55ab666f 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -3,7 +3,7 @@ shortdesc basic TeX Live infrastructure
 longdesc This package contains the files needed to get the TeX Live
 longdesc tools (notably tlmgr) running: perl modules, xz binaries, plus
 longdesc (sometimes) tar and wget.  These files end up in the standalone
-longdesc install packages.
+longdesc install packages, and in the tlcritical repository.
 #
 docpattern f tlpkg/README
 docpattern f texmf/scripts/texlive/NEWS