bogus upstream file, dir exception not needed, pkg build tweaks

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

1 files changed, 22 insertions, 20 deletions

diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2002a872e06..5f6a55f878b 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1169,7 +1169,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'concrete'             => '&PREHOOK_concrete',
  'download'             => '&PREHOOK_savepdf',
  'dynblocks'            => '&PREHOOK_flatten1',
- 'enctex',		=> '&PREHOOK_flatten1',
+ 'enctex'		=> '&PREHOOK_flatten1',
  'fixme'                => '&PREHOOK_fixme',
  'font-change-xetex'    => '&PREHOOK_flatten1',
  'fontools'             => '&PREHOOK_fontools',
@@ -1186,7 +1186,8 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'movie15'              => '&PREHOOK_flatten1',
  'musixtex-fonts'       => '&PREHOOK_unzip',
  'mp3d'                 => '&PREHOOK_mp3d',
- 'numericplots',        => '&PREHOOK_flatten1',
+ 'numericplots'		=> '&PREHOOK_flatten1',
+ 'nwejm'		=> '&PREHOOK_flatten1',
  'pgfornament'		=> '&PREHOOK_flatten1',
  'pictex'               => '&PREHOOK_pictex',
  'pkuthss'              => '&PREHOOK_flatten1',
@@ -1260,7 +1261,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'luaotfload'           => '&POST_do_man',
  'luatexja'             => '&POSTluatexja',
  'm-tx'                 => '&POST_do_man',
- 'mathdesign',          => '&POSTmathdesign',
+ 'mathdesign'           => '&POSTmathdesign',
  'mflogo'               => '&POST_rmsymlink',
  'montex'               => '&POSTmontex',
  'mptopdf'              => '&POSTmptopdf',
@@ -1283,10 +1284,10 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'recipebook'		=> '&POST_rmsymlink',
  'splitindex'           => '&POST_do_man',
  'startex'              => '&POST_otherformat', 
- 'tap',                 => '&POSTtap',
- 'texdraw',             => '&POSTtexdraw',
- 'tex-ps',              => '&POSTtex_ps',
- 'tikz-cd',             => '&POSTtikz_cd',
+ 'tap'                  => '&POSTtap',
+ 'texdraw'              => '&POSTtexdraw',
+ 'tex-ps'               => '&POSTtex_ps',
+ 'tikz-cd'              => '&POSTtikz_cd',
  'tipa-de'              => '&POST_rmsymlink',
  'tudscr'		=> '&POSTtudscr',
  'xecyr'                => '&POSTxecyr',
@@ -1414,7 +1415,7 @@ $standardfmt='latex';
 
 
 # packages which need special .tex/.sty files installed
-$standardtex='\.(.bx|code\.tex|cfg|sty|clo|ldf|cls|def|fd|fontspec|cmap|4ht)$';
+$standardtex='\.(.bx|4ht|cfg|clo|cls|cmap|def|code\.tex|fd|fontspec|ldf|sty)$';
 %specialtex = (
  '2up',         '2up\.tex|' . $standardtex,
  'FAQ-en',      'NULL',
@@ -1632,6 +1633,7 @@ $standardtex='\.(.bx|code\.tex|cfg|sty|clo|ldf|cls|def|fd|fontspec|cmap|4ht)$';
  'notes',       '[^s]\.(eps|pdf|png)|' . $standardtex,  # not notes.pdf
  'ntheorem',    '\.sty|\.std',
  'nucleardata',	'\.(csv|hd|pytxcode)|' . $standardtex,
+ 'nwejm',	'\.(.bx|sty|[^c]\.cfg|cls|def|trsl)$',	# omit ltxdoc.cfg
  'ocgx',        'tikz.*\.code\.tex|' . $standardtex,
  'odsfile',     '\.lua|' . $standardtex,
  'ofs',         '^ofs\.tex|ofsdef\.tex|ofs-.*\.tex|\.sty|a.*\.tex|.*fn\.tex',
@@ -2307,7 +2309,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
  'curve2e'      => 'tex',
  'dateiliste'   => 'latex',  # requires interaction
 #'dccpaper'     => 'pdflatex',
- 'denisbdoc',	=> 'tex',
+ 'denisbdoc' 	=> 'tex',
  'dotseqn'      => 'latex',  # requires interaction
  'delimtxt'     => 'latex -translate-file=empty.tcx',   # no 8-bit
  'download'     => 'pdflatex', # fancy fonts, doc and subfiles combined
@@ -2337,8 +2339,8 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
  'hf-tikz'      => 'tex',
  'hrlatex'      => 'latex',  # requires interaction
  'isodoc'       => 'luatex',
- 'japanese',    => 'platex',
- 'jsclasses',   => 'platex',
+ 'japanese'     => 'platex',
+ 'jsclasses'    => 'platex',
  'kdgdocs'      => 'latex',  # requires interaction
  'komacv'	=> 'latex',  # requires interaction
  'labelcas'     => 'latex',  # requires interaction
@@ -2358,7 +2360,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
  'pbsheet'      => 'latex',  # requires interaction
  'thumb'        => 'latex -translate-file=empty.tcx',   # no 8-bit
  'pageslts'     => 'tex -translate-file=empty.tcx',     # no 8-bit
- 'papermas',    => 'tex',
+ 'papermas'     => 'tex',
  'pauldoc'      => 'latex',  # requires interaction
  'placeat'      => 'luatex',
  'poemscol'     => 'latex',  # requires interaction
@@ -2397,12 +2399,12 @@ $standardinsrunner="latex -interaction=nonstopmode";
  'mpman-ru'             => 'NULL',      # doc
  'musuos'               => 'NULL',      # gind.ist conflict
  'pst-eucl-translation-bg' => 'NULL',   # doc
- 'seuthesis',           => 'NULL',      # doc
- 'tipfr',               => 'NULL',      # doc
- 'tkz-tab',             => 'NULL',      # doc
- 'ticollege',           => 'NULL',      # doc
- 'turnthepage',         => 'NULL',      # doc
- 'voss-mathmode',       => 'NULL',      # doc
+ 'seuthesis'            => 'NULL',      # doc
+ 'tipfr'                => 'NULL',      # doc
+ 'tkz-tab'              => 'NULL',      # doc
+ 'ticollege'            => 'NULL',      # doc
+ 'turnthepage'          => 'NULL',      # doc
+ 'voss-mathmode'        => 'NULL',      # doc
 );
 $standardmakeindex='\.ist';
 
@@ -2675,7 +2677,7 @@ $standardttf = '\.ttf|\.TTC';
  'findhyph'             => 'findhyph$',
  'fragmaster'           => 'fragmaster\.pl$',
  'fontools'             => '(afm2afm|autoinst|ot2kpx)$',
- 'getmap',		=> 'getmapdl.lua',
+ 'getmap' 		=> 'getmapdl.lua',
  'glossaries'		=> 'makeglossaries$|makeglossaries-lite\.lua',
  'installfont'          => 'installfont-tl',
  'kotex-utils'          => '\.pl',
@@ -2708,7 +2710,7 @@ $standardttf = '\.ttf|\.TTC';
  'pdfjam'               => 'pdf[^.]*$',
  'pedigree-perl'        => '\.pl$',
  'perltex'              => '\.pl$',
- 'pfarrei',             => '\.tlu$',
+ 'pfarrei'              => '\.tlu$',
  'pkfix'                => '\.pl$',
  'pkfix-helper'         => 'pkfix-helper$',
  'pmx'                  => '\.lua$',