From ca1b7466e13fb589f710c2e0447ed9568b660be6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 15 Jul 2017 13:01:27 +0000 Subject: switch back to standard ctan2tds and use config file git-svn-id: svn://tug.org/texlive/trunk@44809 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/libexec/ctan2tds | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index b184a782714..94836ac0b61 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -70,14 +70,14 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); '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'", '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 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); '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 @@ sub readconfig { return $result; } -sub nonfree_die { - my ($diestr, $cmd) = @_; - if ($opt_contrib) { - eval $cmd; - } else { - die $diestr; - } -} - # vim: set tabstop=8 shiftwidth=2 expandtab: -- cgit v1.2.3