rm marigold, nonfree PCL font

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

11 files changed, 2 insertions, 2 deletions

diff --git a/Master/texmf-dist/fonts/tfm/cg/marigold/cmgr.tfm b/Master/texmf-dist/fonts/tfm/cg/marigold/cmgr.tfm
deleted file mode 100644
index a1ea9fe2258..00000000000
--- a/Master/texmf-dist/fonts/tfm/cg/marigold/cmgr.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/cg/marigold/cmgr8t.tfm b/Master/texmf-dist/fonts/tfm/cg/marigold/cmgr8t.tfm
deleted file mode 100644
index f9c79e6a880..00000000000
--- a/Master/texmf-dist/fonts/tfm/cg/marigold/cmgr8t.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/cg/marigold/mrr10u.tfm b/Master/texmf-dist/fonts/tfm/cg/marigold/mrr10u.tfm
deleted file mode 100644
index fa4ddc4523d..00000000000
--- a/Master/texmf-dist/fonts/tfm/cg/marigold/mrr10u.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/cg/marigold/mrr6j.tfm b/Master/texmf-dist/fonts/tfm/cg/marigold/mrr6j.tfm
deleted file mode 100644
index 5282a144a73..00000000000
--- a/Master/texmf-dist/fonts/tfm/cg/marigold/mrr6j.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/cg/marigold/mrr7j.tfm b/Master/texmf-dist/fonts/tfm/cg/marigold/mrr7j.tfm
deleted file mode 100644
index 58c5f21137d..00000000000
--- a/Master/texmf-dist/fonts/tfm/cg/marigold/mrr7j.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/cg/marigold/mrr8u.tfm b/Master/texmf-dist/fonts/tfm/cg/marigold/mrr8u.tfm
deleted file mode 100644
index 1c52bd4c77a..00000000000
--- a/Master/texmf-dist/fonts/tfm/cg/marigold/mrr8u.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/cg/marigold/cmgr.vf b/Master/texmf-dist/fonts/vf/cg/marigold/cmgr.vf
deleted file mode 100644
index 09e79f99043..00000000000
--- a/Master/texmf-dist/fonts/vf/cg/marigold/cmgr.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/cg/marigold/cmgr8t.vf b/Master/texmf-dist/fonts/vf/cg/marigold/cmgr8t.vf
deleted file mode 100644
index 866c3663fa3..00000000000
--- a/Master/texmf-dist/fonts/vf/cg/marigold/cmgr8t.vf
+++ /dev/null
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