summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-19 00:49:21 +0000
committerKarl Berry <karl@freefriends.org>2010-04-19 00:49:21 +0000
commit2bc657ac94b479f5fc314fcd851ca14671b4c7a5 (patch)
treec72b5548d9394979df3424127e7b2a61dab8b427 /Master/tlpkg
parentce4318062145a577e54694784ca20b669cdce1a3 (diff)
rm marigold, nonfree PCL font
git-svn-id: svn://tug.org/texlive/trunk@17912 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds3
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/marigold.tlpsrc0
3 files changed, 2 insertions, 2 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 74130f8e842..ccd653211c2 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -394,10 +394,11 @@ $Master = "$mydir/../..";
'makor', "&MAKEbase",
'manjutex', "die 'skipping, obsolete on CTAN'", #"&MAKEflatten",
'manpage', "die 'skipping, nonfree license'",
+ 'marigold', "die 'skipping, nonfree font'",
+ 'marvosym', "&MAKEnosymlinks",
'match_parens',"die 'skipping, Ruby'",
'mathabx', "&MAKEflatten",
'mathgifg', "die 'skipping, nonfree font support'",
- 'marvosym', "&MAKEnosymlinks",
'mathdesign', "&MAKEmathdesign",
'mathexam', "&MAKEflatten",
'mathmode', "&setup",
diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
index d40cbdc1e97..fdd5520fbd2 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
@@ -100,7 +100,6 @@ depend linearA
depend logic
depend lxfonts
depend ly1
-depend marigold
depend mathabx
depend mathdesign
depend mnsymbol
diff --git a/Master/tlpkg/tlpsrc/marigold.tlpsrc b/Master/tlpkg/tlpsrc/marigold.tlpsrc
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/tlpkg/tlpsrc/marigold.tlpsrc
+++ /dev/null