texlive[44809] Master/tlpkg/libexec/ctan2tds: switch back to standard

[commits+preining at tug.org]

Revision: 44809
          http://tug.org/svn/texlive?view=revision&revision=44809
Author:   preining
Date:     2017-07-15 15:01:27 +0200 (Sat, 15 Jul 2017)
Log Message:
-----------
switch back to standard ctan2tds and use config file

Modified Paths:
--------------
    trunk/Master/tlpkg/libexec/ctan2tds

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2017-07-15 13:01:11 UTC (rev 44808)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2017-07-15 13:01:27 UTC (rev 44809)
@@ -70,7 +70,7 @@
  'a4',          "die 'skipping, just a pointer to ntgclass'",
  'aastex',      "&MAKEflatten",
  'accenti',     "die 'skipping, use bosisio instead'",
- 'acmtrans',    "nonfree_die('skipping, nonfree (nosell) license', '&MAKEflatten')",
+ 'acmtrans',    "die 'skipping, nonfree (nosell) license'",
  'acromake',    "die 'skipping, nonfree (nomodify) license'",
  'acroflex',    "die 'skipping, per author (dps) request'",
  'acrotex',     "die 'skipping, per author (dps) request'",
@@ -77,7 +77,7 @@
  'adforn',      "&MAKEcopy",
  'adfsymbols',  "&MAKEcopy",
  'adobe-euro',  "die 'skipping, support for nonfree fonts'",
- 'adobecaslon', "nonfree_die('skipping, support for nonfree fonts', '&MAKEflatten')",
+ 'adobecaslon', "die 'skipping, support for nonfree fonts'",
  'adrlist',     "die 'skipping, noinfo license'",
  'ae',          "&MAKEae",
  'aeb_mlink',   "die 'skipping, per author (dps) request'",
@@ -128,7 +128,7 @@
  'asana-math',  "die 'skipping, use Asana-Math'",
  'ascii',       "die 'skipping, use ascii-font'",
  'ascii-font',  "&MAKEflatten",
- 'astron',      "nonfree_die('skipping, nonfree license', '&MAKEflatten')",
+ 'astron',      "die 'skipping, nonfree license'",
  'atqolive',    "die 'skipping, nonfree font'",
  'augie',       "&MAKEaugie",
  'aurical',     "&MAKEaurical",
@@ -6403,13 +6403,4 @@
   return $result;
 }
 
-sub nonfree_die {
-  my ($diestr, $cmd) = @_;
-  if ($opt_contrib) {
-    eval $cmd;
-  } else {
-    die $diestr;
-  }
-}
-
 # vim: set tabstop=8 shiftwidth=2 expandtab: