summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-14 23:39:55 +0000
committerKarl Berry <karl@freefriends.org>2012-05-14 23:39:55 +0000
commit55d1de51b1ff992d4bc2accd2f5756a72dde0428 (patch)
tree8057d8178a756e7e16915b2045db568ba7570f2a /Master/tlpkg
parentc891e363f2884b517fdd6952ce26c9943ccee45c (diff)
consistency of various sorts
git-svn-id: svn://tug.org/texlive/trunk@26380 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-bindir4
-rw-r--r--Master/tlpkg/doc/packages.txt5
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds13
3 files changed, 12 insertions, 10 deletions
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 9ad176c09c6..c17546998d5 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -149,7 +149,7 @@ for tlname in $tlnames; do
download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
- $grab http://www.uoregon.edu/~koch/universal-darwin.tar.xz;;
+ $grab http://pages.uoregon.edu/koch/universal-darwin.tar.xz;;
win32)
default_bin_loc=$tmpdir/tl.$tlname.zip
$grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;;
@@ -157,7 +157,7 @@ for tlname in $tlnames; do
download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
- $grab www.uoregon.edu/~koch/x86_64-darwin.tar.xz;;
+ $grab http://pages.uoregon.edu/koch/x86_64-darwin.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/doc/packages.txt b/Master/tlpkg/doc/packages.txt
index a3efaaeb953..8789dfdbcfd 100644
--- a/Master/tlpkg/doc/packages.txt
+++ b/Master/tlpkg/doc/packages.txt
@@ -61,8 +61,9 @@ tlnet freeze:
\cp -ar [a-u]* ../tlpretest/ # omit README (update that)
After tlnet freeze:
- fix release-texlive.txt, .mkisofsrc,
- tl-update-tlnet, TLConfig.pm (see below).
+ fix release-texlive.txt .mkisofsrc tl-update-tlnet TLConfig.pm
+ in Master/tlpkg, update bundled Windows programs as needed:
+ dviout texworks tlgs tlperl tlpsv
in Master: update texinfos, man pages+pdfs. make texlive.texi?
update web pages, including arch list and doc translation list in doc.html.
also including portable-anchor.html this year.
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9b101c7ea20..821a08c23f1 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -849,6 +849,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'springer', "die 'skipping, licenses not checked'",
'sprite', "die 'skipping, noinfo license'",
'ssqquote', "die 'skipping, nonfree license'",
+ 'statrep', "die 'skipping, only for nonfree sas'",
'staves', "&MAKEflatten",
'stmaryrd', "&MAKEflatten",
'stellenbosch',"&MAKEcopy",
@@ -1844,6 +1845,7 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
'papermas', "$package.dtx",
'parrun', 'parrun.ins',
'seuthesis', 'NULL', # don't want to run iconv, etc.
+ 'statrep', "$package.dtx",
'stmaryrd', 'stmaryrd.dtx',
'tablists', 'tablists.dtx',
'thesis', 'install.01|install.ndx',
@@ -2156,7 +2158,7 @@ $standardxmt='\.xmt';
'dosepsbin' => 'dosepsbin\.pl$',
'dviasm' => '\.py$',
'ebong' => '\.py$',
- 'epstopdf' => 'epstopdf\.pl',
+ 'epstopdf' => 'epstopdf\.pl', # doscripts() does r*
'exceltex' => 'exceltex$',
'fig4latex' => 'fig4latex',
'findhyph' => 'findhyph$',
@@ -2176,7 +2178,7 @@ $standardxmt='\.xmt';
'mkgrkindex' => 'mkgrkindex$',
'mkjobtexmf' => 'mkjobtexmf\.pl$',
'musixtex' => '\.lua$',
- 'pdfcrop' => '\.pl$',
+ 'pdfcrop' => '\.pl$', # doscripts() does r*
'pdfjam' => 'pdf[^.]*$',
'pedigree-perl' => '\.pl$',
'perltex' => '\.pl$',
@@ -2217,7 +2219,7 @@ $standardxmt='\.xmt';
'bundledoc' => '\.1$',
'ctanify' => '\.1$',
'dosepsbin' => 'dosepsbin.man',
- 'epstopdf' => 'epstopdf.1|epstopdf.man1.pdf',
+ 'epstopdf' => 'r?epstopdf.1|epstopdf.man1.pdf', # don't keep pdf
'findhyph' => 'findhyph.1',
'fontools' => '\.1$',
'latexdiff' => '\.1$',
@@ -2248,7 +2250,6 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
'cprotect' => $standardclean . '|\.cpt', # temp files for doc
'dateiliste' => $standardclean . '|dateiliste.README*', # already in dist
'elvish' => '\.pk3', # no pk files
- 'epstopdf' => 'epstopdf\.pdf', # we generate
'findhyph' => 'findhyph.pdf', # we generate
'fundus' => $standardclean . '|outline.sty', # in own package
'gentle' => 'gentle.ps.gz', # pdf is enough
@@ -2866,14 +2867,14 @@ sub doscripts {
my $linktarget = "../../$DEST_TREE/scripts/$package/$s";
&SYSTEM ("ln -s $linktarget $platdir/$linkname");
&SYSTEM ("ln -s $linkname $platdir/r$linkname")
- if $linkname eq "pdfcrop"; # rpdfcrop -> pdfcrop
+ if $linkname =~ /pdfcrop|epstopdf/; # rpdfcrop -> pdfcrop
} else {
# Windows. If a shell script, skip. Else copy the wrapper.
next if $s =~ /\.sh$/;
my $w32_wrapper = "$Build/$build_tldir/w32_wrapper/runscript.exe";
&SYSTEM ("$CP $w32_wrapper $platdir/$linkname.exe");
&SYSTEM ("$CP $w32_wrapper $platdir/r$linkname.exe")
- if $linkname eq "pdfcrop"; # rpdfcrop.exe
+ if $linkname =~ /pdfcrop|epstopdf/; # rpdfcrop.exe
}
}
}