consistency of various sorts

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

12 files changed, 14 insertions, 446 deletions

diff --git a/Master/bin/win32/m-tx.exe b/Master/bin/win32/m-tx.exe
new file mode 100755
index 00000000000..5777d90a17a
--- /dev/null
+++ b/Master/bin/win32/m-tx.exe
diff --git a/Master/bin/win32/mtxrun.dll b/Master/bin/win32/mtxrun.dll
index 4116c5a24a6..4116c5a24a6 100644..100755
--- a/Master/bin/win32/mtxrun.dll
+++ b/Master/bin/win32/mtxrun.dll
diff --git a/Master/source/dviout3183a6-source.zip b/Master/source/dviout3184-source.zip
index f69f259f85b..575a97577bf 100644
--- a/Master/source/dviout3183a6-source.zip
+++ b/Master/source/dviout3184-source.zip
diff --git a/Master/source/ghostscript-8.71.tar.xz b/Master/source/ghostscript-8.71.tar.xz
deleted file mode 100644
index a5ebe756238..00000000000
--- a/Master/source/ghostscript-8.71.tar.xz
+++ /dev/null
diff --git a/Master/source/ghostscript-9.05.tar.bz2 b/Master/source/ghostscript-9.05.tar.bz2
new file mode 100644
index 00000000000..50d5d42b3bf
--- /dev/null
+++ b/Master/source/ghostscript-9.05.tar.bz2
diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll
index 4116c5a24a6..4116c5a24a6 100644..100755
--- a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll
+++ b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll
diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
deleted file mode 100644
index 4769dc39900..00000000000
--- a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
+++ /dev/null
@@ -1,434 +0,0 @@
-%%
-%% This is file `ukinsoku.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ukinsoku.dtx  (with options: `plcore')
-%% 
-%% IMPORTANT NOTICE:
-%% 
-%% For the copyright see the source file.
-%% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ukinsoku.tex.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ukinsoku.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%% File: ukinsoku.dtx
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-%%
-%% 行頭、行末禁則パラメータ
-%%
-%% 1byte characters
-\prebreakpenalty`!=10000
-\prebreakpenalty`"=10000
-\postbreakpenalty`\#=500
-\postbreakpenalty`\$=500
-\postbreakpenalty`\%=500
-\postbreakpenalty`\&=500
-\postbreakpenalty`\`=10000
-\prebreakpenalty`'=10000
-\prebreakpenalty`)=10000
-\postbreakpenalty`(=10000
-\prebreakpenalty`*=500
-\prebreakpenalty`+=500
-\prebreakpenalty`-=10000
-\prebreakpenalty`.=10000
-\prebreakpenalty`,=10000
-\prebreakpenalty`/=500
-\prebreakpenalty`;=10000
-\prebreakpenalty`?=10000
-\prebreakpenalty`:=10000
-\prebreakpenalty`]=10000
-\postbreakpenalty`[=10000
-%%全角文字
-\prebreakpenalty`、=10000
-\prebreakpenalty`。=10000
-\prebreakpenalty`，=10000
-\prebreakpenalty`．=10000
-\prebreakpenalty`・=10000
-\prebreakpenalty`：=10000
-\prebreakpenalty`；=10000
-\prebreakpenalty`？=10000
-\prebreakpenalty`！=10000
-\prebreakpenalty`゛=10000%\jis"212B
-\prebreakpenalty`゜=10000%\jis"212C
-\prebreakpenalty`´=10000%\jis"212D
-\postbreakpenalty`｀=10000%\jis"212E
-\prebreakpenalty`々=10000%\jis"2139
-\prebreakpenalty`…=250%\jis"2144
-\prebreakpenalty`‥=250%\jis"2145
-\postbreakpenalty`‘=10000%\jis"2146
-\prebreakpenalty`’=10000%\jis"2147
-\postbreakpenalty`“=10000%\jis"2148
-\prebreakpenalty`”=10000%\jis"2149
-\prebreakpenalty`）=10000
-\postbreakpenalty`（=10000
-\prebreakpenalty`｝=10000
-\postbreakpenalty`｛=10000
-\prebreakpenalty`］=10000
-\postbreakpenalty`［=10000
-%%\postbreakpenalty`‘=10000
-%%\prebreakpenalty`’=10000
-\postbreakpenalty`〔=10000%\jis"214C
-\prebreakpenalty`〕=10000%\jis"214D
-\postbreakpenalty`〈=10000%\jis"2152
-\prebreakpenalty`〉=10000%\jis"2153
-\postbreakpenalty`《=10000%\jis"2154
-\prebreakpenalty`》=10000%\jis"2155
-\postbreakpenalty`「=10000%\jis"2156
-\prebreakpenalty`」=10000%\jis"2157
-\postbreakpenalty`『=10000%\jis"2158
-\prebreakpenalty`』=10000%\jis"2159
-\postbreakpenalty`【=10000%\jis"215A
-\prebreakpenalty`】=10000%\jis"215B
-\prebreakpenalty`ー=10000
-\prebreakpenalty`＋=200
-\prebreakpenalty`−=200% U+2212 MINUS SIGN
-\prebreakpenalty`－=200% U+FF0D FULLWIDTH HYPHEN-MINUS
-\prebreakpenalty`＝=200
-\postbreakpenalty`＃=200
-\postbreakpenalty`＄=200
-\postbreakpenalty`％=200
-\postbreakpenalty`＆=200
-\prebreakpenalty`ぁ=150
-\prebreakpenalty`ぃ=150
-\prebreakpenalty`ぅ=150
-\prebreakpenalty`ぇ=150
-\prebreakpenalty`ぉ=150
-\prebreakpenalty`っ=150
-\prebreakpenalty`ゃ=150
-\prebreakpenalty`ゅ=150
-\prebreakpenalty`ょ=150
-\prebreakpenalty`ゎ=150%\jis"246E
-\prebreakpenalty`ァ=150
-\prebreakpenalty`ィ=150
-\prebreakpenalty`ゥ=150
-\prebreakpenalty`ェ=150
-\prebreakpenalty`ォ=150
-\prebreakpenalty`ッ=150
-\prebreakpenalty`ャ=150
-\prebreakpenalty`ュ=150
-\prebreakpenalty`ョ=150
-\prebreakpenalty`ヮ=150%\jis"256E
-\prebreakpenalty`ヵ=150%\jis"2575
-\prebreakpenalty`ヶ=150%\jis"2576
-%% kinsoku  JIS X 0208 additional
-\prebreakpenalty`ヽ=10000
-\prebreakpenalty`ヾ=10000
-\prebreakpenalty`ゝ=10000
-\prebreakpenalty`ゞ=10000
-%%
-%% kinsoku  JIS X 0213
-%%
-\prebreakpenalty`〳=10000
-\prebreakpenalty`〴=10000
-\prebreakpenalty`〵=10000
-\prebreakpenalty`〻=10000
-\postbreakpenalty`⦅=10000
-\prebreakpenalty`⦆=10000
-\postbreakpenalty`｟=10000
-\prebreakpenalty`｠=10000
-\postbreakpenalty`〘=10000
-\prebreakpenalty`〙=10000
-\postbreakpenalty`〖=10000
-\prebreakpenalty`〗=10000
-\postbreakpenalty`«=10000
-\prebreakpenalty`»=10000
-\postbreakpenalty`〝=10000
-\prebreakpenalty`〟=10000
-\prebreakpenalty`‼=10000
-\prebreakpenalty`⁇=10000
-\prebreakpenalty`⁈=10000
-\prebreakpenalty`⁉=10000
-\postbreakpenalty`¡=10000
-\postbreakpenalty`¿=10000
-\prebreakpenalty`ː=10000
-\prebreakpenalty`ª=10000
-\prebreakpenalty`º=10000
-\prebreakpenalty`¹=10000
-\prebreakpenalty`²=10000
-\prebreakpenalty`³=10000
-\postbreakpenalty`€=10000
-\prebreakpenalty`ゕ=150
-\prebreakpenalty`ゖ=150
-\prebreakpenalty`ㇰ=150
-\prebreakpenalty`ㇱ=150
-\prebreakpenalty`ㇲ=150
-\prebreakpenalty`ㇳ=150
-\prebreakpenalty`ㇴ=150
-\prebreakpenalty`ㇵ=150
-\prebreakpenalty`ㇶ=150
-\prebreakpenalty`ㇷ=150
-\prebreakpenalty`ㇸ=150
-\prebreakpenalty`ㇹ=150
-%%\prebreakpenalty`ㇷ゚=150
-\prebreakpenalty`ㇺ=150
-\prebreakpenalty`ㇻ=150
-\prebreakpenalty`ㇼ=150
-\prebreakpenalty`ㇽ=150
-\prebreakpenalty`ㇾ=150
-\prebreakpenalty`ㇿ=150
-%%
-%% kinsoku  JIS X 0212
-%%
-%%\postbreakpenalty`¡=10000
-%%\postbreakpenalty`¿=10000
-%%\prebreakpenalty`º=10000
-%%\prebreakpenalty`ª=10000
-\prebreakpenalty`™=10000
-%%
-%% kinsoku  半角片仮名
-%%
-\prebreakpenalty`｡=10000
-\prebreakpenalty`､=10000
-\prebreakpenalty`ﾞ=10000
-\prebreakpenalty`ﾟ=10000
-\prebreakpenalty`｣=10000
-\postbreakpenalty`｢=10000
-%%
-%% xspcode
-\xspcode`(=1
-\xspcode`)=2
-\xspcode`[=1
-\xspcode`]=2
-\xspcode``=1
-\xspcode`'=2
-\xspcode`;=2
-\xspcode`,=2
-\xspcode`.=2
-%%  for 8bit Latin
-\xspcode"80=3
-\xspcode"81=3
-\xspcode"82=3
-\xspcode"83=3
-\xspcode"84=3
-\xspcode"85=3
-\xspcode"86=3
-\xspcode"87=3
-\xspcode"88=3
-\xspcode"89=3
-\xspcode"8A=3
-\xspcode"8B=3
-\xspcode"8C=3
-\xspcode"8D=3
-\xspcode"8E=3
-\xspcode"8F=3
-\xspcode"90=3
-\xspcode"91=3
-\xspcode"92=3
-\xspcode"93=3
-\xspcode"94=3
-\xspcode"95=3
-\xspcode"96=3
-\xspcode"97=3
-\xspcode"98=3
-\xspcode"99=3
-\xspcode"9A=3
-\xspcode"9B=3
-\xspcode"9C=3
-\xspcode"9D=3
-\xspcode"9E=3
-\xspcode"9F=3
-\xspcode"A0=3
-\xspcode"A1=3
-\xspcode"A2=3
-\xspcode"A3=3
-\xspcode"A4=3
-\xspcode"A5=3
-\xspcode"A6=3
-\xspcode"A7=3
-\xspcode"A8=3
-\xspcode"A9=3
-\xspcode"AA=3
-\xspcode"AB=3
-\xspcode"AC=3
-\xspcode"AD=3
-\xspcode"AE=3
-\xspcode"AF=3
-\xspcode"B0=3
-\xspcode"B1=3
-\xspcode"B2=3
-\xspcode"B3=3
-\xspcode"B4=3
-\xspcode"B5=3
-\xspcode"B6=3
-\xspcode"B7=3
-\xspcode"B8=3
-\xspcode"B9=3
-\xspcode"BA=3
-\xspcode"BB=3
-\xspcode"BC=3
-\xspcode"BD=3
-\xspcode"BE=3
-\xspcode"BF=3
-\xspcode"C0=3
-\xspcode"C1=3
-\xspcode"C2=3
-\xspcode"C3=3
-\xspcode"C4=3
-\xspcode"C5=3
-\xspcode"C6=3
-\xspcode"C7=3
-\xspcode"C8=3
-\xspcode"C9=3
-\xspcode"CA=3
-\xspcode"CB=3
-\xspcode"CC=3
-\xspcode"CD=3
-\xspcode"CE=3
-\xspcode"CF=3
-\xspcode"D0=3
-\xspcode"D1=3
-\xspcode"D2=3
-\xspcode"D3=3
-\xspcode"D4=3
-\xspcode"D5=3
-\xspcode"D6=3
-\xspcode"D7=3
-\xspcode"D8=3
-\xspcode"D9=3
-\xspcode"DA=3
-\xspcode"DB=3
-\xspcode"DC=3
-\xspcode"DD=3
-\xspcode"DE=3
-\xspcode"DF=3
-\xspcode"E0=3
-\xspcode"E1=3
-\xspcode"E2=3
-\xspcode"E3=3
-\xspcode"E4=3
-\xspcode"E5=3
-\xspcode"E6=3
-\xspcode"E7=3
-\xspcode"E8=3
-\xspcode"E9=3
-\xspcode"EA=3
-\xspcode"EB=3
-\xspcode"EC=3
-\xspcode"ED=3
-\xspcode"EE=3
-\xspcode"EF=3
-\xspcode"F0=3
-\xspcode"F1=3
-\xspcode"F2=3
-\xspcode"F3=3
-\xspcode"F4=3
-\xspcode"F5=3
-\xspcode"F6=3
-\xspcode"F7=3
-\xspcode"F8=3
-\xspcode"F9=3
-\xspcode"FA=3
-\xspcode"FB=3
-\xspcode"FC=3
-\xspcode"FD=3
-\xspcode"FE=3
-\xspcode"FF=3
-%%
-%% inhibitxspcode
-\inhibitxspcode`、=1
-\inhibitxspcode`。=1
-\inhibitxspcode`，=1
-\inhibitxspcode`．=1
-\inhibitxspcode`；=1
-\inhibitxspcode`？=1
-\inhibitxspcode`）=1
-\inhibitxspcode`（=2
-\inhibitxspcode`］=1
-\inhibitxspcode`［=2
-\inhibitxspcode`｝=1
-\inhibitxspcode`｛=2
-\inhibitxspcode`‘=2
-\inhibitxspcode`’=1
-\inhibitxspcode`“=2
-\inhibitxspcode`”=1
-\inhibitxspcode`〔=2
-\inhibitxspcode`〕=1
-\inhibitxspcode`〈=2
-\inhibitxspcode`〉=1
-\inhibitxspcode`《=2
-\inhibitxspcode`》=1
-\inhibitxspcode`「=2
-\inhibitxspcode`」=1
-\inhibitxspcode`『=2
-\inhibitxspcode`』=1
-\inhibitxspcode`【=2
-\inhibitxspcode`】=1
-\inhibitxspcode`—=0% U+2014 EM DASH
-\inhibitxspcode`―=0% U+2015 HORIZONTAL BAR
-\inhibitxspcode`〜=0% U+301C WAVE DASH
-\inhibitxspcode`～=0% U+FF5E FULLWIDTH TILDE
-\inhibitxspcode`…=0
-\inhibitxspcode`¥=0% U+00A5 YEN SIGN
-\inhibitxspcode`￥=0% U+FFE5 FULLWIDTH YEN SIGN
-\inhibitxspcode`°=1
-\inhibitxspcode`′=1
-\inhibitxspcode`″=1
-%%
-%% inhibitxspcode  JIS X 0213
-%%
-\inhibitxspcode`⦅=2
-\inhibitxspcode`⦆=1
-\inhibitxspcode`｟=2
-\inhibitxspcode`｠=1
-\inhibitxspcode`〘=2
-\inhibitxspcode`〙=1
-\inhibitxspcode`〖=2
-\inhibitxspcode`〗=1
-\inhibitxspcode`«=2
-\inhibitxspcode`»=1
-\inhibitxspcode`〝=2
-\inhibitxspcode`〟=1
-\inhibitxspcode`‼=1
-\inhibitxspcode`⁇=1
-\inhibitxspcode`⁈=1
-\inhibitxspcode`⁉=1
-\inhibitxspcode`¡=2
-\inhibitxspcode`¿=2
-\inhibitxspcode`ª=1
-\inhibitxspcode`º=1
-\inhibitxspcode`¹=1
-\inhibitxspcode`²=1
-\inhibitxspcode`³=1
-\inhibitxspcode`€=2
-%%
-%% inhibitxspcode  JIS X 0212
-%%
-%%\inhibitxspcode`¡=1
-%%\inhibitxspcode`¿=1
-%%\inhibitxspcode`º=1
-%%\inhibitxspcode`ª=1
-\inhibitxspcode`™=1
-%%
-%% inhibitxspcode  半角片仮名
-%%
-\inhibitxspcode`｡=1
-\inhibitxspcode`､=1
-\inhibitxspcode`｢=2
-\inhibitxspcode`｣=1
-\endinput
-%%
-%% End of file `ukinsoku.tex'.
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 04460f71290..12847d296f0 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -6916,7 +6916,7 @@ only those I<not> installed, or only those with update available.
 =item Category
 
 Select which categories are shown: packages, collections, and/or
-schemes.  These are briefly explained in the L<DESCRIPTION> section
+schemes.  These are briefly explained in the L</"DESCRIPTION"> section
 above.
 
 =item Match
diff --git a/Master/texmf/web2c/texmfcnf.lua b/Master/texmf/web2c/texmfcnf.lua
index 82db966b0a4..c6a7bfc8cb6 100644
--- a/Master/texmf/web2c/texmfcnf.lua
+++ b/Master/texmf/web2c/texmfcnf.lua
@@ -10,7 +10,7 @@ return {
 
     type    = "configuration",
     version = "1.1.0",
-    date    = "2011-06-02", -- or so
+    date    = "2012-05-14", -- or so
     time    = "12:12:12",
     comment = "ConTeXt MkIV configuration file",
     author  = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
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
       }
     }
   }