summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-10-18 14:19:51 +0000
committerNorbert Preining <preining@logic.at>2007-10-18 14:19:51 +0000
commit383376384e8be7e270474ce287fea73559c81d0a (patch)
treee6164f4775a5321c182363a777f271c2a9b572ab /Master/tlpkg
parentd41ee107aabd6ac4e2aff55782060931622f48a4 (diff)
remove the Category at the beginning of a depend line
adapt modules update texlive tlpdb, including the info from the catalogue git-svn-id: svn://tug.org/texlive/trunk@5228 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm24
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm19
-rw-r--r--Master/tlpkg/TeXLive/TeXCatalogue.pm10
-rw-r--r--Master/tlpkg/tlpsrc/CJK.tlpsrc12
-rw-r--r--Master/tlpkg/tlpsrc/amsfonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/antomega.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/beamer.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-aleph.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-amstex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-context.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-csplain.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-ctie.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-eplain.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-etex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/bin-latex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-metafont.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-metapost.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-mex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/bin-mltex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-patgen.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-physe.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-tex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-texsis.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-tie.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-vpe.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-web.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-wordcount.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-basic.tlpsrc38
-rw-r--r--Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc36
-rw-r--r--Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc62
-rw-r--r--Master/tlpkg/tlpsrc/collection-binextra.tlpsrc46
-rw-r--r--Master/tlpkg/tlpsrc/collection-context.tlpsrc10
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc70
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc14
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc22
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc14
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc10
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc10
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontbin.tlpsrc12
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc240
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc60
-rw-r--r--Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc32
-rw-r--r--Master/tlpkg/tlpsrc/collection-games.tlpsrc36
-rw-r--r--Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc48
-rw-r--r--Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc10
-rw-r--r--Master/tlpkg/tlpsrc/collection-graphicstools.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc22
-rw-r--r--Master/tlpkg/tlpsrc/collection-humanities.tlpsrc62
-rw-r--r--Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/collection-langarab.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc28
-rw-r--r--Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc42
-rw-r--r--Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc18
-rw-r--r--Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc16
-rw-r--r--Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc16
-rw-r--r--Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc36
-rw-r--r--Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-langindic.tlpsrc28
-rw-r--r--Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langmanju.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langother.tlpsrc26
-rw-r--r--Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc36
-rw-r--r--Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-latex.tlpsrc52
-rw-r--r--Master/tlpkg/tlpsrc/collection-latex3.tlpsrc18
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1072
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc84
-rw-r--r--Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc54
-rw-r--r--Master/tlpkg/tlpsrc/collection-metapost.tlpsrc46
-rw-r--r--Master/tlpkg/tlpsrc/collection-music.tlpsrc20
-rw-r--r--Master/tlpkg/tlpsrc/collection-omega.tlpsrc18
-rw-r--r--Master/tlpkg/tlpsrc/collection-pictures.tlpsrc46
-rw-r--r--Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc26
-rw-r--r--Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc88
-rw-r--r--Master/tlpkg/tlpsrc/collection-psutils.tlpsrc14
-rw-r--r--Master/tlpkg/tlpsrc/collection-publishers.tlpsrc110
-rw-r--r--Master/tlpkg/tlpsrc/collection-science.tlpsrc86
-rw-r--r--Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-ttfutils.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/collection-wintools.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/collection-xetex.tlpsrc24
-rw-r--r--Master/tlpkg/tlpsrc/eplain.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/esint-type1.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/garuda.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/norasi.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pdfpages.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/polski.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/pst-uml.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/scheme-basic.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/scheme-context.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/scheme-full.tlpsrc164
-rw-r--r--Master/tlpkg/tlpsrc/scheme-gust.tlpsrc68
-rw-r--r--Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc48
-rw-r--r--Master/tlpkg/tlpsrc/scheme-medium.tlpsrc42
-rw-r--r--Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/scheme-omega.tlpsrc70
-rw-r--r--Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc144
-rw-r--r--Master/tlpkg/tlpsrc/scheme-xml.tlpsrc48
-rw-r--r--Master/tlpkg/tlpsrc/texpower.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/vntex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/vpe.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/wordcount.tlpsrc2
145 files changed, 1927 insertions, 1902 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index 8edac0d3517..b858798fca6 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -14,6 +14,7 @@ BEGIN {
@MetaCategories
@NormalCategories
@Categories
+ $MetaCategoriesRegexp
$CategoriesRegexp
$DefaultCategory
);
@@ -21,6 +22,7 @@ BEGIN {
# Meta Categories do not ship files, but call only for other packages
our @MetaCategories = qw/Collection Scheme/;
+our $MetaCategoriesRegexp = '(Collection|Scheme)';
# Normal Categories contain actial files and do not depend on other things.
our @NormalCategories = qw/Package TLCore Documentation/;
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index e90124f57f0..10e377ec05e 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -242,7 +242,6 @@ installers. This function will probably go away.
sub generate_listfiles {
my ($self,$destdir) = @_;
- die "NEEDS TO BE REWRITTEN USING TLConfig!!!\n";
if (not(defined($destdir))) {
$destdir = TeXLive::TLPDB->listdir;
}
@@ -275,13 +274,15 @@ sub _generate_listfile {
&mkpath("$destdir") if (! -d "$destdir");
my (@lop, @lot);
foreach my $d ($tlp->depends) {
- die "NEED TO BE ADJUSTED\n";
- if ($d =~ m/^(Package|Documentation|TLCore)\/(.*)$/) {
- push @lop, $2;
- } elsif ($d =~ m/^Collection\/(.*)$/) {
- push @lot, $1;
+ my $subtlp = $self->get_package($d);
+ if (defined($subtlp)) {
+ if ($subtlp->is_meta_package) {
+ push @lot, $d;
+ } else {
+ push @lop, $d;
+ }
} else {
- warn "strange depends line: $d\n";
+ warn "Strange: $tlp->name depends on $d, but this package does not exists!\n";
}
}
open(TMP, ">$destdir/$listname") or die "Cannot open $destdir/$listname!";
@@ -322,8 +323,13 @@ sub _generate_listfile {
foreach my $c (@lot) {
my $coll = $self->get_package($c);
foreach my $d ($coll->depends) {
- if ($d =~ m/^(Package|Documentation|TLCore)\/(.*)$/) {
- TeXLive::TLUtils::push_uniq(\@collpkg,$2);
+ my $subtlp = $self->get_package($d);
+ if (defined($subtlp)) {
+ if (!($subtlp->is_meta_package)) {
+ TeXLive::TLUtils::push_uniq(\@collpkg,$d);
+ }
+ } else {
+ warn "Strange: $coll->name depends on $d, but this does not exists!\n";
}
}
}
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index e3cde9b0acf..b8e81eaf11a 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -6,7 +6,7 @@
package TeXLive::TLPOBJ;
-use TeXLive::TLConfig qw($DefaultCategory $CategoriesRegexp);
+use TeXLive::TLConfig qw($DefaultCategory $CategoriesRegexp $MetaCategoriesRegexp);
use TeXLive::TLUtils;
use File::Path;
use Cwd;
@@ -86,7 +86,7 @@ sub from_fh {
($lastcmd eq "depend") ) {
$line =~ s/^ /${lastcmd}continued /;
} else {
- die("Continuation of $lastcmd not allowed, please fix tlpobj!\n");
+ die("Continuation of $lastcmd not allowed, please fix tlpobj: line = $line!\n");
}
}
if ($line =~ /^name\s*([-\w]+)$/) {
@@ -536,6 +536,14 @@ sub update_from_catalogue {
}
}
+sub is_meta_package {
+ my $self = shift;
+ if ($self->category =~ /^$MetaCategoriesRegexp$/) {
+ return 1;
+ }
+ return 0;
+}
+
# Helpers.
#
@@ -936,6 +944,11 @@ If arguments are given, they are assumed to be architecture names, and
it returns the above plus the sum of sizes of C<binsize> for those
architectures.
+=item C<is_meta_package>
+
+Returns true if the package is a meta package as defined in TLConfig
+(Currently Collection and Scheme).
+
=item C<{add,remove}_{src,run,doc}files(@files)>
adds or removes files to the respective list of files.
@@ -956,7 +969,7 @@ returns a list of all files of all types.
=head1 SEE ALSO
-The modules L<TeXLive::TLUtils>, L<TeXLive::TLPSRC>,
+The modules L<TeXLive::TLConfig>, L<TeXLive::TLUtils>, L<TeXLive::TLPSRC>,
L<TeXLive::TLPDB>, L<TeXLive::TLTREE>, L<TeXLive::TeXCatalogue>.
=head1 AUTHORS AND COPYRIGHT
diff --git a/Master/tlpkg/TeXLive/TeXCatalogue.pm b/Master/tlpkg/TeXLive/TeXCatalogue.pm
index 4819dd46b5d..4fc64058d88 100644
--- a/Master/tlpkg/TeXLive/TeXCatalogue.pm
+++ b/Master/tlpkg/TeXLive/TeXCatalogue.pm
@@ -51,13 +51,17 @@ sub initialize {
$self->{'entry'}{'date'} = $parser->findvalue('/entry/@datestamp');
$self->{'entry'}{'modder'} = $parser->findvalue('/entry/@modifier');
$self->{'name'} = $parser->findvalue("/entry/name");
- $self->{'caption'} = $parser->findvalue("/entry/caption");
+ $self->{'caption'} = beautify($parser->findvalue("/entry/caption"));
$self->{'description'} = beautify($parser->findvalue("/entry/description"));
$self->{'license'} = $parser->findvalue('/entry/license/@type');
$self->{'version'} = $parser->findvalue('/entry/version/@number');
$self->{'ctan'} = $parser->findvalue('/entry/ctan/@path');
- $self->{'texlive'} = $parser->findvalue('/entry/texlive/@location');
- $self->{'miktex'} = $parser->findvalue('/entry/miktex/@location');
+ if ($parser->findvalue('/entry/texlive/@location') ne "") {
+ $self->{'texlive'} = $parser->findvalue('/entry/texlive/@location');
+ }
+ if ($parser->findvalue('/entry/miktex/@location') ne "") {
+ $self->{'miktex'} = $parser->findvalue('/entry/miktex/@location');
+ }
# parse the documentation entries
my $docset = $parser->find('/entry/documentation');
foreach my $node ($docset->get_nodelist) {
diff --git a/Master/tlpkg/tlpsrc/CJK.tlpsrc b/Master/tlpkg/tlpsrc/CJK.tlpsrc
index 8454aec0102..e964b51cc66 100644
--- a/Master/tlpkg/tlpsrc/CJK.tlpsrc
+++ b/Master/tlpkg/tlpsrc/CJK.tlpsrc
@@ -1,8 +1,8 @@
name CJK
category Package
-depend Package/arphic
-depend Package/cns
-depend Package/garuda
-depend Package/norasi
-depend Package/uhc
-depend Package/wadalab
+depend arphic
+depend cns
+depend garuda
+depend norasi
+depend uhc
+depend wadalab
diff --git a/Master/tlpkg/tlpsrc/amsfonts.tlpsrc b/Master/tlpkg/tlpsrc/amsfonts.tlpsrc
index c44acd3f786..db33ddaeb30 100644
--- a/Master/tlpkg/tlpsrc/amsfonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/amsfonts.tlpsrc
@@ -1,3 +1,3 @@
name amsfonts
category Package
-depend Package/ams
+depend ams
diff --git a/Master/tlpkg/tlpsrc/antomega.tlpsrc b/Master/tlpkg/tlpsrc/antomega.tlpsrc
index 47c96ee92cd..03915ef1c4a 100644
--- a/Master/tlpkg/tlpsrc/antomega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/antomega.tlpsrc
@@ -1,3 +1,3 @@
name antomega
category Package
-depend Package/omega
+depend omega
diff --git a/Master/tlpkg/tlpsrc/beamer.tlpsrc b/Master/tlpkg/tlpsrc/beamer.tlpsrc
index 63601f7fe88..d832f539942 100644
--- a/Master/tlpkg/tlpsrc/beamer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/beamer.tlpsrc
@@ -1,3 +1,3 @@
name beamer
category Package
-depend Package/pgf
+depend pgf
diff --git a/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc b/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
index 7b759fa77be..d7cc1a59330 100644
--- a/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
@@ -1,6 +1,6 @@
name bin-aleph
category TLCore
-depend TLCore/bin-omega
+depend bin-omega
execute BuildFormat aleph
runpattern f texmf/fmtutil/format.aleph.cnf
runpattern f texmf/web2c/aleph.pool
diff --git a/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc b/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc
index 2ce9c5064c4..1ac88598b23 100644
--- a/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc
@@ -1,6 +1,6 @@
name bin-amstex
category TLCore
-depend TLCore/bin-tex
+depend bin-tex
execute BuildFormat amstex
runpattern f texmf/fmtutil/format.amstex.cnf
docpattern f texmf/doc/man/man1/amstex.1
diff --git a/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc b/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc
index 1b387f4a8a3..53264a7f640 100644
--- a/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc
@@ -1,6 +1,6 @@
name bin-bibtex
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
docpattern f texmf/doc/man/man1/bibtex.1
docpattern f texmf/doc/man/man1/bibtex.1.html
binpattern f bin/${ARCH}/bibtex
diff --git a/Master/tlpkg/tlpsrc/bin-context.tlpsrc b/Master/tlpkg/tlpsrc/bin-context.tlpsrc
index c819f33bbd2..3a150e28e9d 100644
--- a/Master/tlpkg/tlpsrc/bin-context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-context.tlpsrc
@@ -1,6 +1,6 @@
name bin-context
category TLCore
-depend TLCore/bin-pdftex
+depend bin-pdftex
execute BuildFormat context
runpattern f texmf/fmtutil/format.context.cnf
docpattern f texmf/doc/man/man1/cont-de.*
diff --git a/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc b/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc
index 2dc61d1797f..c5a20093df9 100644
--- a/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc
@@ -1,6 +1,6 @@
name bin-cslatex
category TLCore
-depend TLCore/bin-latex
+depend bin-latex
execute BuildFormat cslatex
runpattern f texmf/fmtutil/format.cslatex.cnf
binpattern f bin/${ARCH}/cslatex
diff --git a/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc b/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc
index a5fde2a911b..b3640660fc2 100644
--- a/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc
@@ -1,6 +1,6 @@
name bin-csplain
category TLCore
-depend TLCore/bin-tex
+depend bin-tex
execute BuildFormat csplain
runpattern f texmf/fmtutil/format.csplain.cnf
binpattern f bin/${ARCH}/csplain
diff --git a/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc b/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc
index ddc4cab3c8b..bffe1a905fc 100644
--- a/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc
@@ -1,6 +1,6 @@
name bin-ctie
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
docpattern f texmf/doc/man/man1/ctie.1
docpattern f texmf/doc/man/man1/ctie.1.html
binpattern f bin/${ARCH}/ctie
diff --git a/Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc b/Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc
index c4cff3abb4b..2f6d3826486 100644
--- a/Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc
@@ -1,6 +1,6 @@
name bin-dvipdfmx
category TLCore
-depend Package/glyphlist
+depend glyphlist
runpattern f texmf/dvipdfm/*
runpattern f texmf/fonts/map/dvipdfm/dvipdfmx/*
runpattern f texmf/tex/latex/dvipdfmx/*
diff --git a/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc b/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc
index ed9919dc441..2b72d0d6380 100644
--- a/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc
@@ -1,6 +1,6 @@
name bin-eplain
category TLCore
-depend TLCore/bin-etex
+depend bin-etex
execute BuildFormat eplain
runpattern f texmf/fmtutil/format.eplain.cnf
docpattern f texmf/doc/info/eplain.info
diff --git a/Master/tlpkg/tlpsrc/bin-etex.tlpsrc b/Master/tlpkg/tlpsrc/bin-etex.tlpsrc
index b80f9735857..e9976b93acd 100644
--- a/Master/tlpkg/tlpsrc/bin-etex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-etex.tlpsrc
@@ -1,6 +1,6 @@
name bin-etex
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
execute BuildFormat etex
runpattern f texmf/fmtutil/format.etex.cnf
docpattern f texmf/doc/man/man1/etex.1
diff --git a/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc
index aae4f5b014e..b9f0c86d41a 100644
--- a/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc
@@ -1,7 +1,7 @@
name bin-jadetex
category TLCore
-depend TLCore/bin-pdftex
-depend TLCore/bin-tex
+depend bin-pdftex
+depend bin-tex
execute BuildFormat jadetex
runpattern f texmf/fmtutil/format.jadetex.cnf
binpattern f bin/${ARCH}/jadetex
diff --git a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
index fb2eefd325d..b3356965c28 100644
--- a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
@@ -1,6 +1,6 @@
name bin-latex
category TLCore
-depend TLCore/bin-etex
+depend bin-etex
execute BuildFormat latex
runpattern f texmf/fmtutil/format.latex.cnf
runpattern f texmf/tex/generic/config/preload.cfg
diff --git a/Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc b/Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc
index c46c5a635b5..3b59c61a2e0 100644
--- a/Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc
@@ -1,6 +1,6 @@
name bin-lcdftypetools
category TLCore
-depend Package/glyphlist
+depend glyphlist
runpattern f texmf/lcdftools/*
docpattern f texmf/doc/man/man1/cfftot1.1
docpattern f texmf/doc/man/man1/cfftot1.1.html
diff --git a/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc b/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
index da3a8fefd0e..b80c8da1c15 100644
--- a/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
@@ -1,6 +1,6 @@
name bin-metafont
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
execute BuildFormat metafont
runpattern f texmf/fmtutil/format.metafont.cnf
runpattern f texmf/metafont/config/*
diff --git a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
index bf202cc35d3..723bbc48d96 100644
--- a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
@@ -1,6 +1,6 @@
name bin-metapost
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
execute BuildFormat metapost
runpattern f texmf/fmtutil/format.metapost.cnf
runpattern f texmf/web2c/mp.pool
diff --git a/Master/tlpkg/tlpsrc/bin-mex.tlpsrc b/Master/tlpkg/tlpsrc/bin-mex.tlpsrc
index 05f3ac06faa..3b3964fb9bd 100644
--- a/Master/tlpkg/tlpsrc/bin-mex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-mex.tlpsrc
@@ -1,7 +1,7 @@
name bin-mex
category TLCore
-depend TLCore/bin-pdftex
-depend TLCore/bin-tex
+depend bin-pdftex
+depend bin-tex
execute BuildFormat mex
execute BuildFormat utf8mex
runpattern f texmf/fmtutil/format.mex.cnf
diff --git a/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc b/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc
index 0bf17fd810b..b652e9e196d 100644
--- a/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc
@@ -1,6 +1,6 @@
name bin-mltex
category TLCore
-depend TLCore/bin-latex
+depend bin-latex
execute BuildFormat mltex
runpattern f texmf/fmtutil/format.mltex.cnf
binpattern f bin/${ARCH}/mllatex
diff --git a/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc b/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc
index 2965b9eed71..81979a20bf5 100644
--- a/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc
@@ -1,6 +1,6 @@
name bin-patgen
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
docpattern f texmf/doc/man/man1/patgen.1
docpattern f texmf/doc/man/man1/patgen.1.html
binpattern f bin/${ARCH}/patgen
diff --git a/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc b/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
index 20086ed17bf..2d9ea8a0173 100644
--- a/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
@@ -1,6 +1,6 @@
name bin-pdftex
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
execute BuildFormat pdftex
runpattern f texmf/fmtutil/format.pdftex.cnf
runpattern f texmf/fonts/map/pdftex/updmap/*
diff --git a/Master/tlpkg/tlpsrc/bin-physe.tlpsrc b/Master/tlpkg/tlpsrc/bin-physe.tlpsrc
index 0a60e57e76e..bf6ea4237d9 100644
--- a/Master/tlpkg/tlpsrc/bin-physe.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-physe.tlpsrc
@@ -1,6 +1,6 @@
name bin-physe
category TLCore
-depend TLCore/bin-tex
+depend bin-tex
execute BuildFormat physe
runpattern f texmf/fmtutil/format.physe.cnf
binpattern f bin/${ARCH}/physe
diff --git a/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc b/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc
index 92412f8a8c8..0044e7f1211 100644
--- a/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc
@@ -1,6 +1,6 @@
name bin-phyzzx
category TLCore
-depend TLCore/bin-tex
+depend bin-tex
execute BuildFormat phyzzx
runpattern f texmf/fmtutil/format.phyzzx.cnf
binpattern f bin/${ARCH}/phyzzx
diff --git a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
index 0cff5a2a7e7..3aecac81ba5 100644
--- a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
@@ -1,6 +1,6 @@
name bin-tex
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
execute BuildFormat tex
runpattern f texmf/fmtutil/format.tex.cnf
runpattern f texmf/web2c/tex.pool
diff --git a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
index c911bc97d7f..2213c9f8cd5 100644
--- a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
@@ -1,6 +1,6 @@
name bin-texdoc
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
runpattern f texmf/perl/texdoctk.pl
runpattern f texmf/texdoctk/*
docpattern f texmf/doc/man/man1/texdoc.1
diff --git a/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc b/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc
index 02d0518a453..2d1396f4489 100644
--- a/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc
@@ -1,6 +1,6 @@
name bin-texinfo
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
runpattern f texmf/perl/texi2html.pl
docpattern f texmf/doc/info/fontname.info
docpattern f texmf/doc/info/info-stnd.info
diff --git a/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc b/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc
index 944f628f465..4bc68530b2c 100644
--- a/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc
@@ -1,6 +1,6 @@
name bin-texsis
category TLCore
-depend TLCore/bin-tex
+depend bin-tex
execute BuildFormat texsis
runpattern f texmf/fmtutil/format.texsis.cnf
binpattern f bin/${ARCH}/texsis
diff --git a/Master/tlpkg/tlpsrc/bin-tie.tlpsrc b/Master/tlpkg/tlpsrc/bin-tie.tlpsrc
index b37465726d6..489c910af65 100644
--- a/Master/tlpkg/tlpsrc/bin-tie.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tie.tlpsrc
@@ -1,6 +1,6 @@
name bin-tie
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
docpattern f texmf/doc/man/man1/tie.1
docpattern f texmf/doc/man/man1/tie.1.html
binpattern f bin/${ARCH}/tie
diff --git a/Master/tlpkg/tlpsrc/bin-vpe.tlpsrc b/Master/tlpkg/tlpsrc/bin-vpe.tlpsrc
index 593cff37439..04aac61ad2f 100644
--- a/Master/tlpkg/tlpsrc/bin-vpe.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-vpe.tlpsrc
@@ -2,4 +2,4 @@ name bin-vpe
category TLCore
runpattern f texmf/scripts/vpe/*
binpattern f bin/${ARCH}/vpe
-depend Package/vpe
+depend vpe
diff --git a/Master/tlpkg/tlpsrc/bin-web.tlpsrc b/Master/tlpkg/tlpsrc/bin-web.tlpsrc
index 0af71827b09..8b213b53715 100644
--- a/Master/tlpkg/tlpsrc/bin-web.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-web.tlpsrc
@@ -1,6 +1,6 @@
name bin-web
category TLCore
-depend TLCore/bin-kpathsea
+depend bin-kpathsea
docpattern f texmf/doc/man/man1/tangle.1
docpattern f texmf/doc/man/man1/tangle.1.html
docpattern f texmf/doc/man/man1/weave.1
diff --git a/Master/tlpkg/tlpsrc/bin-wordcount.tlpsrc b/Master/tlpkg/tlpsrc/bin-wordcount.tlpsrc
index 0e7a5a0d060..91d397ecdee 100644
--- a/Master/tlpkg/tlpsrc/bin-wordcount.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-wordcount.tlpsrc
@@ -1,4 +1,4 @@
name bin-wordcount
category TLCore
binpattern f bin/${ARCH}/wordcount.sh
-depend Package/wordcount
+depend wordcount
diff --git a/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc b/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
index d7fc2f64dde..6b93097033a 100644
--- a/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
@@ -1,7 +1,7 @@
name bin-xmltex
category TLCore
-depend TLCore/bin-pdftex
-depend TLCore/bin-tex
+depend bin-pdftex
+depend bin-tex
execute BuildFormat xmltex
runpattern f texmf/fmtutil/format.xmltex.cnf
binpattern f bin/${ARCH}/giftopng
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index ed2c7c6b55d..f210ece3ae5 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -4,22 +4,22 @@ shortdesc Essential programs and files
longdesc These files are regarded as basic for any TeX system, covering
longdesc plain TeX macros, Computer Modern fonts, and configuration for
longdesc common drivers.
-depend Package/ams
-depend Package/amsfonts
-depend Package/bibtex
-depend Package/cm
-depend Package/cmex
-depend Package/dvips
-depend Package/enctex
-depend Package/etex
-depend Package/fontname
-depend Package/lm
-depend Package/makeindex
-depend Package/metafont
-depend Package/mflogo
-depend Package/misc
-depend Package/plain
-depend Package/xu-hyphen
-depend TLCore/hyphen-base
-depend TLCore/collection-basicbin
-depend TLCore/collection-documentation-base
+depend ams
+depend amsfonts
+depend bibtex
+depend cm
+depend cmex
+depend dvips
+depend enctex
+depend etex
+depend fontname
+depend lm
+depend makeindex
+depend metafont
+depend mflogo
+depend misc
+depend plain
+depend xu-hyphen
+depend hyphen-base
+depend collection-basicbin
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc b/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc
index 5361f45e7a4..52e0993ce3f 100644
--- a/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc
@@ -2,21 +2,21 @@ name collection-basicbin
category Collection
shortdesc Essential binaries
longdesc These programs are regarded as basic for any TeX system.
-depend TLCore/bin-bibtex
-depend TLCore/bin-dialog
-depend TLCore/bin-dvipdfm
-depend TLCore/bin-dvipdfmx
-depend TLCore/bin-dvipsk
-depend TLCore/bin-etex
-depend TLCore/bin-getnonfreefonts
-depend TLCore/bin-gsftopk
-depend TLCore/bin-kpathsea
-depend TLCore/bin-makeindex
-depend TLCore/bin-metafont
-depend TLCore/bin-mfware
-depend TLCore/bin-pdftex
-depend TLCore/bin-tetex
-depend TLCore/bin-tex
-depend TLCore/bin-texconfig
-depend TLCore/bin-thumbpdf
-depend TLCore/bin-xdvi
+depend bin-bibtex
+depend bin-dialog
+depend bin-dvipdfm
+depend bin-dvipdfmx
+depend bin-dvipsk
+depend bin-etex
+depend bin-getnonfreefonts
+depend bin-gsftopk
+depend bin-kpathsea
+depend bin-makeindex
+depend bin-metafont
+depend bin-mfware
+depend bin-pdftex
+depend bin-tetex
+depend bin-tex
+depend bin-texconfig
+depend bin-thumbpdf
+depend bin-xdvi
diff --git a/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
index c5376b52c2d..8e07b669f73 100644
--- a/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
@@ -2,34 +2,34 @@ name collection-bibtexextra
category Collection
shortdesc Extra BibTeX styles
longdesc Additional BibTeX styles and bibliography databases.
-depend Package/apacite
-depend Package/beebe
-depend Package/bibarts
-depend Package/bibhtml
-depend Package/biblist
-depend Package/bibtopic
-depend Package/bibunits
-depend Package/compactbib
-depend Package/custom-bib
-depend Package/dk-bib
-depend Package/doipubmed
-depend Package/elsevier-bib
-depend Package/figbib
-depend Package/footbib
-depend Package/harvard
-depend Package/harvmac
-depend Package/ijqc
-depend Package/inlinebib
-depend Package/iopart-num
-depend Package/jneurosci
-depend Package/jurabib
-depend Package/listbib
-depend Package/multibib
-depend Package/munich
-depend Package/notes2bib
-depend Package/perception
-depend Package/rsc
-depend Package/sort-by-letters
-depend Package/splitbib
-depend Package/urlbst
-depend TLCore/collection-latex
+depend apacite
+depend beebe
+depend bibarts
+depend bibhtml
+depend biblist
+depend bibtopic
+depend bibunits
+depend compactbib
+depend custom-bib
+depend dk-bib
+depend doipubmed
+depend elsevier-bib
+depend figbib
+depend footbib
+depend harvard
+depend harvmac
+depend ijqc
+depend inlinebib
+depend iopart-num
+depend jneurosci
+depend jurabib
+depend listbib
+depend multibib
+depend munich
+depend notes2bib
+depend perception
+depend rsc
+depend sort-by-letters
+depend splitbib
+depend urlbst
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index e83bfd3376d..aa444ece3e0 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -4,26 +4,26 @@ shortdesc TeX auxiliary programs
longdesc Various useful, but non-essential, support programs. Includes
longdesc programs and macros for DVI file manipulation, literate
longdesc programming, PerlTeX, patgen, etc.
-depend Package/cweb
-depend Package/mkind-english
-depend TLCore/bin-bibtex8
-depend TLCore/bin-ctie
-depend TLCore/bin-cweb
-depend TLCore/bin-detex
-depend TLCore/bin-dtl
-depend TLCore/bin-dvi2tty
-depend TLCore/bin-dvicopy
-depend TLCore/bin-dvidvi
-depend TLCore/bin-dviljk
-depend TLCore/bin-dvipos
-depend TLCore/bin-lacheck
-depend TLCore/bin-patgen
-depend TLCore/bin-pdftools
-depend TLCore/bin-seetexk
-depend TLCore/bin-texdoc
-depend TLCore/bin-texware
-depend TLCore/bin-tie
-depend TLCore/bin-tpic2pdftex
-depend TLCore/bin-vpe
-depend TLCore/bin-web
-depend TLCore/collection-basic
+depend cweb
+depend mkind-english
+depend bin-bibtex8
+depend bin-ctie
+depend bin-cweb
+depend bin-detex
+depend bin-dtl
+depend bin-dvi2tty
+depend bin-dvicopy
+depend bin-dvidvi
+depend bin-dviljk
+depend bin-dvipos
+depend bin-lacheck
+depend bin-patgen
+depend bin-pdftools
+depend bin-seetexk
+depend bin-texdoc
+depend bin-texware
+depend bin-tie
+depend bin-tpic2pdftex
+depend bin-vpe
+depend bin-web
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-context.tlpsrc b/Master/tlpkg/tlpsrc/collection-context.tlpsrc
index 26170f557ab..465ca3cfc8d 100644
--- a/Master/tlpkg/tlpsrc/collection-context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-context.tlpsrc
@@ -2,8 +2,8 @@ name collection-context
category Collection
shortdesc ConTeXt format
longdesc Hans Hagen's powerful macro package, ConText
-depend Package/context
-depend Package/jmn
-depend Package/lmextra
-depend TLCore/bin-context
-depend TLCore/collection-basic
+depend context
+depend jmn
+depend lmextra
+depend bin-context
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc
index 6103280c96d..1adad248dc8 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-base
category Collection
shortdesc Base documentation
longdesc Basic documentation
-depend Documentation/texlive-common
-depend Documentation/texlive-en
+depend texlive-common
+depend texlive-en
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc
index 8710be7b21d..1d973a5600a 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-bulgarian
category Collection
shortdesc Bulgarian documentation
longdesc Assorted useful Bulgarian documentation and guides
-depend Documentation/lshort-bulgarian
-depend TLCore/collection-documentation-base
+depend lshort-bulgarian
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc
index 03810e75520..7b7de19e138 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc
@@ -1,5 +1,5 @@
name collection-documentation-chinese
category Collection
shortdesc Chinese documentation
-depend Documentation/texlive-zh-cn
-depend TLCore/collection-documentation-base
+depend texlive-zh-cn
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc
index 4f1b48545bd..b28dcbcbce2 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc
@@ -2,6 +2,6 @@ name collection-documentation-czechslovak
category Collection
shortdesc Czechslovak documentation
longdesc Assorted useful Czechslovak documentation and guides
-depend Documentation/lshort-slovak
-depend Documentation/texlive-cz
-depend TLCore/collection-documentation-base
+depend lshort-slovak
+depend texlive-cz
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc
index cf44fa9f034..a427eb17569 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc
@@ -2,7 +2,7 @@ name collection-documentation-dutch
category Collection
shortdesc Dutch documentation
longdesc Assorted useful Dutch documentation and guides
-depend Documentation/lkort
-depend Documentation/lshort-dutch
-depend Documentation/ntg
-depend TLCore/collection-documentation-base
+depend lkort
+depend lshort-dutch
+depend ntg
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc
index d8d279109b6..7a775a091a5 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc
@@ -2,38 +2,38 @@ name collection-documentation-english
category Collection
shortdesc English documentation
longdesc Documentation in English.
-depend Documentation/FAQ-en
-depend Documentation/MemoirChapStyles
-depend Documentation/Type1fonts
-depend Documentation/amslatex-primer
-depend Documentation/components-of-TeX
-depend Documentation/comprehensive
-depend Documentation/dtxtut
-depend Documentation/firststeps
-depend Documentation/free-math-font-survey
-depend Documentation/gentle
-depend Documentation/guide-to-latex
-depend Documentation/help
-depend Documentation/impatient
-depend Documentation/knuth
-depend Documentation/l2tabu-english
-depend Documentation/latex-graphics-companion
-depend Documentation/latex-web-companion
-depend Documentation/lshort-english
-depend Documentation/math-into-latex
-depend Documentation/mathmode
-depend Documentation/metafont-for-beginners
-depend Documentation/metafp
-depend Documentation/metapost-examples
-depend Documentation/pstricks-tutorial
-depend Documentation/tamethebeast
-depend Documentation/tds
-depend Documentation/tex-refs
-depend Documentation/texbytopic
-depend Documentation/tlc2
-depend Documentation/truetype
-depend Documentation/visualfaq
-depend Documentation/webguide
-depend Documentation/wp-conv
-depend Documentation/xetexref
-depend TLCore/collection-documentation-base
+depend FAQ-en
+depend MemoirChapStyles
+depend Type1fonts
+depend amslatex-primer
+depend components-of-TeX
+depend comprehensive
+depend dtxtut
+depend firststeps
+depend free-math-font-survey
+depend gentle
+depend guide-to-latex
+depend help
+depend impatient
+depend knuth
+depend l2tabu-english
+depend latex-graphics-companion
+depend latex-web-companion
+depend lshort-english
+depend math-into-latex
+depend mathmode
+depend metafont-for-beginners
+depend metafp
+depend metapost-examples
+depend pstricks-tutorial
+depend tamethebeast
+depend tds
+depend tex-refs
+depend texbytopic
+depend tlc2
+depend truetype
+depend visualfaq
+depend webguide
+depend wp-conv
+depend xetexref
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc
index c1c965adbe5..a97b008b91a 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-finnish
category Collection
shortdesc Finnish documentation
longdesc Assorted useful Finnish documentation and guides
-depend Documentation/lshort-finnish
-depend TLCore/collection-documentation-base
+depend lshort-finnish
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc
index c38c7743c0e..897860023be 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc
@@ -2,10 +2,10 @@ name collection-documentation-french
category Collection
shortdesc French documentation
longdesc Assorted useful French documentation and guides.
-depend Documentation/FAQ-fr
-depend Documentation/epslatex-fr
-depend Documentation/impatient-fr
-depend Documentation/l2tabu-french
-depend Documentation/lshort-french
-depend Documentation/texlive-fr
-depend TLCore/collection-documentation-base
+depend FAQ-fr
+depend epslatex-fr
+depend impatient-fr
+depend l2tabu-french
+depend lshort-french
+depend texlive-fr
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc
index eb06f3fa591..655de2794bc 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc
@@ -1,14 +1,14 @@
name collection-documentation-german
category Collection
shortdesc German documentation
-depend Documentation/FAQ-ge
-depend Documentation/kopka
-depend Documentation/l2picfaq
-depend Documentation/l2tabu
-depend Documentation/latex-tipps-und-tricks
-depend Documentation/lshort-german
-depend Documentation/templates-fenn
-depend Documentation/templates-sommer
-depend Documentation/texlive-ge
-depend Documentation/voss-de
-depend TLCore/collection-documentation-base
+depend FAQ-ge
+depend kopka
+depend l2picfaq
+depend l2tabu
+depend latex-tipps-und-tricks
+depend lshort-german
+depend templates-fenn
+depend templates-sommer
+depend texlive-ge
+depend voss-de
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc
index 0714de2090c..73fa2c7761e 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-greek
category Collection
shortdesc Greek documentation
longdesc Assorted useful Greek documentation and guides
-depend Documentation/gentle-gr
-depend TLCore/collection-documentation-base
+depend gentle-gr
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc
index 6ce63d7d9fd..0af0532dc53 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc
@@ -2,10 +2,10 @@ name collection-documentation-italian
category Collection
shortdesc Italian documentation
longdesc Assorted useful Italian documentation and guides
-depend Documentation/amsldoc-it
-depend Documentation/amsmath-it
-depend Documentation/amsthdoc-it
-depend Documentation/fancyhdr-it
-depend Documentation/l2tabu-it
-depend Documentation/lshort-italian
-depend TLCore/collection-documentation-base
+depend amsldoc-it
+depend amsmath-it
+depend amsthdoc-it
+depend fancyhdr-it
+depend l2tabu-it
+depend lshort-italian
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc
index de70ca8a137..7d995392227 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-japanese
category Collection
shortdesc Japanese documentation
longdesc Assorted useful Japanese documentation and guides
-depend Documentation/lshort-japanese
-depend TLCore/collection-documentation-base
+depend lshort-japanese
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc
index 42d88c7677a..389240ad3df 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-korean
category Collection
shortdesc Korean documentation
longdesc Assorted useful Korean documentation and guides
-depend Documentation/lshort-korean
-depend TLCore/collection-documentation-base
+depend lshort-korean
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc
index 31847b16525..b6b15fdd484 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-mongolian
category Collection
shortdesc Mongolian documentation
longdesc Assorted useful Mongolian documentation and guides
-depend Documentation/lshort-mongolian
-depend TLCore/collection-documentation-base
+depend lshort-mongolian
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
index 650afcbf289..810bf8ca9e9 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
@@ -2,8 +2,8 @@ name collection-documentation-polish
category Collection
shortdesc Polish documentation
longdesc Assorted useful Polish documentation and guides
-depend Documentation/guides-pl
-depend Documentation/lshort-polish
-depend Documentation/tex-virtual-academy-pl
-depend Documentation/texlive-pl
-depend TLCore/collection-documentation-base
+depend guides-pl
+depend lshort-polish
+depend tex-virtual-academy-pl
+depend texlive-pl
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc
index 717d36ce792..f34db16fdd7 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc
@@ -1,8 +1,8 @@
name collection-documentation-portuguese
category Collection
shortdesc Portuguese documentation
-depend Documentation/beamer-tut-pt
-depend Documentation/cursolatex
-depend Documentation/lshort-portuguese
-depend Documentation/xypic-tut-pt
-depend TLCore/collection-documentation-base
+depend beamer-tut-pt
+depend cursolatex
+depend lshort-portuguese
+depend xypic-tut-pt
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc
index 2d22fe4a2f8..66603e0ddfa 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc
@@ -2,6 +2,6 @@ name collection-documentation-russian
category Collection
shortdesc Russian documentation
longdesc Assorted useful Russian documentation and guides
-depend Documentation/lshort-russian
-depend Documentation/texlive-ru
-depend TLCore/collection-documentation-base
+depend lshort-russian
+depend texlive-ru
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc
index 84a8fd5886c..a0da8632073 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc
@@ -2,6 +2,6 @@ name collection-documentation-spanish
category Collection
shortdesc Spanish documentation
longdesc Assorted useful Spanish documentation and guides
-depend Documentation/es-tex-faq
-depend Documentation/lshort-spanish
-depend TLCore/collection-documentation-base
+depend es-tex-faq
+depend lshort-spanish
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc
index c37da72d5fa..d761520a0c6 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-thai
category Collection
shortdesc Thai documentation
longdesc Thai documentation and guides.
-depend Documentation/lshort-thai
-depend TLCore/collection-documentation-base
+depend lshort-thai
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc
index f6ada6fd54e..2277370bfbc 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-turkish
category Collection
shortdesc Turkish documentation
longdesc Turkish documentation and guides.
-depend Documentation/lshort-turkish
-depend TLCore/collection-documentation-base
+depend lshort-turkish
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc
index 0f92d048908..27a4c014d95 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc
@@ -2,5 +2,5 @@ name collection-documentation-ukrainian
category Collection
shortdesc Ukrainian documentation
longdesc Assorted useful Ukrainian documentation and guides
-depend Documentation/lshort-ukr
-depend TLCore/collection-documentation-base
+depend lshort-ukr
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc
index 10aab5a70a2..978688e07a5 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc
@@ -1,7 +1,7 @@
name collection-documentation-vietnamese
category Collection
shortdesc Vietnamese documentation
-depend Documentation/amsldoc-vn
-depend Documentation/lshort-vietnamese
-depend Documentation/ntheorem-vn
-depend TLCore/collection-documentation-base
+depend amsldoc-vn
+depend lshort-vietnamese
+depend ntheorem-vn
+depend collection-documentation-base
diff --git a/Master/tlpkg/tlpsrc/collection-fontbin.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontbin.tlpsrc
index 046f59f869c..bb11b40adf6 100644
--- a/Master/tlpkg/tlpsrc/collection-fontbin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontbin.tlpsrc
@@ -4,9 +4,9 @@ shortdesc TeX font-related programs
longdesc Programs for conversion between font formats, testing fonts
longdesc (virtual fonts stuff, .gf and .pk manipulation, mft, fontinst,
longdesc etc.)
-depend Package/fontinst
-depend Package/mft
-depend TLCore/bin-afm2pl
-depend TLCore/bin-fontware
-depend TLCore/bin-ps2pkm
-depend TLCore/collection-basic
+depend fontinst
+depend mft
+depend bin-afm2pl
+depend bin-fontware
+depend bin-ps2pkm
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
index 53ab8c1ad8a..8c8137c6be9 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
@@ -2,123 +2,123 @@ name collection-fontsextra
category Collection
shortdesc Extra fonts
longdesc All sorts of extra fonts
-depend Package/accfonts
-depend Package/ai
-depend Package/albertus
-depend Package/aleph
-depend Package/allrunes
-depend Package/antiqua
-depend Package/antt
-depend Package/apl
-depend Package/ar
-depend Package/archaic
-depend Package/arev
-depend Package/ascii
-depend Package/astro
-depend Package/atqolive
-depend Package/augie
-depend Package/aurical
-depend Package/barcodes
-depend Package/bayer
-depend Package/bbding
-depend Package/bbm
-depend Package/bbm-macros
-depend Package/bbold
-depend Package/belleek
-depend Package/bera
-depend Package/blacklettert1
-depend Package/bookhands
-depend Package/braille
-depend Package/brushscr
-depend Package/calligra
-depend Package/cherokee
-depend Package/cirth
-depend Package/clarendo
-depend Package/cm-lgc
-depend Package/cm-super
-depend Package/cmastro
-depend Package/cmbright
-depend Package/cmll
-depend Package/cmpica
-depend Package/coronet
-depend Package/courier-scaled
-depend Package/cryst
-depend Package/dancers
-depend Package/dice
-depend Package/dictsym
-depend Package/dingbat
-depend Package/doublestroke
-depend Package/duerer
-depend Package/ean
-depend Package/ecc
-depend Package/eco
-depend Package/eiad
-depend Package/elvish
-depend Package/epigrafica
-depend Package/epsdice
-depend Package/esvect
-depend Package/eulervm
-depend Package/euxm
-depend Package/feyn
-depend Package/fge
-depend Package/foekfont
-depend Package/fourier
-depend Package/fouriernc
-depend Package/frcursive
-depend Package/futhark
-depend Package/garamond
-depend Package/genealogy
-depend Package/gothic
-depend Package/greenpoint
-depend Package/groff
-depend Package/grotesq
-depend Package/hands
-depend Package/hfbright
-depend Package/hfoldsty
-depend Package/hieroglf
-depend Package/ifsym
-depend Package/initials
-depend Package/iwona
-depend Package/kixfont
-depend Package/knuthotherfonts
-depend Package/kpfonts
-depend Package/lettrgth
-depend Package/lfb
-depend Package/linearA
-depend Package/logic
-depend Package/ly1
-depend Package/marigold
-depend Package/mathdesign
-depend Package/mnsymbol
-depend Package/morse
-depend Package/nkarta
-depend Package/oca
-depend Package/ocherokee
-depend Package/ocr-a
-depend Package/oesch
-depend Package/ogham
-depend Package/oinuit
-depend Package/optima
-depend Package/osmanian
-depend Package/pacioli
-depend Package/pclnfss
-depend Package/phaistos
-depend Package/phonetic
-depend Package/psafm
-depend Package/punk
-depend Package/sauter
-depend Package/sauterfonts
-depend Package/semaphor
-depend Package/simpsons
-depend Package/skull
-depend Package/tapir
-depend Package/tengwarscript
-depend Package/tpslifonts
-depend Package/trajan
-depend Package/umrand
-depend Package/univers
-depend Package/universa
-depend Package/wsuipa
-depend Package/yfonts
-depend Package/zefonts
-depend TLCore/collection-basic
+depend accfonts
+depend ai
+depend albertus
+depend aleph
+depend allrunes
+depend antiqua
+depend antt
+depend apl
+depend ar
+depend archaic
+depend arev
+depend ascii
+depend astro
+depend atqolive
+depend augie
+depend aurical
+depend barcodes
+depend bayer
+depend bbding
+depend bbm
+depend bbm-macros
+depend bbold
+depend belleek
+depend bera
+depend blacklettert1
+depend bookhands
+depend braille
+depend brushscr
+depend calligra
+depend cherokee
+depend cirth
+depend clarendo
+depend cm-lgc
+depend cm-super
+depend cmastro
+depend cmbright
+depend cmll
+depend cmpica
+depend coronet
+depend courier-scaled
+depend cryst
+depend dancers
+depend dice
+depend dictsym
+depend dingbat
+depend doublestroke
+depend duerer
+depend ean
+depend ecc
+depend eco
+depend eiad
+depend elvish
+depend epigrafica
+depend epsdice
+depend esvect
+depend eulervm
+depend euxm
+depend feyn
+depend fge
+depend foekfont
+depend fourier
+depend fouriernc
+depend frcursive
+depend futhark
+depend garamond
+depend genealogy
+depend gothic
+depend greenpoint
+depend groff
+depend grotesq
+depend hands
+depend hfbright
+depend hfoldsty
+depend hieroglf
+depend ifsym
+depend initials
+depend iwona
+depend kixfont
+depend knuthotherfonts
+depend kpfonts
+depend lettrgth
+depend lfb
+depend linearA
+depend logic
+depend ly1
+depend marigold
+depend mathdesign
+depend mnsymbol
+depend morse
+depend nkarta
+depend oca
+depend ocherokee
+depend ocr-a
+depend oesch
+depend ogham
+depend oinuit
+depend optima
+depend osmanian
+depend pacioli
+depend pclnfss
+depend phaistos
+depend phonetic
+depend psafm
+depend punk
+depend sauter
+depend sauterfonts
+depend semaphor
+depend simpsons
+depend skull
+depend tapir
+depend tengwarscript
+depend tpslifonts
+depend trajan
+depend umrand
+depend univers
+depend universa
+depend wsuipa
+depend yfonts
+depend zefonts
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc
index cf21e200a24..b8ef7106fc0 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc
@@ -2,33 +2,33 @@ name collection-fontsrecommended
category Collection
shortdesc Recommended fonts
longdesc Recommended fonts
-depend Package/avantgar
-depend Package/bookman
-depend Package/charter
-depend Package/cmextra
-depend Package/courier
-depend Package/euro
-depend Package/euro-ce
-depend Package/eurofont
-depend Package/eurosans
-depend Package/eurosym
-depend Package/fpl
-depend Package/helvetic
-depend Package/marvosym
-depend Package/mathpazo
-depend Package/ncntrsbk
-depend Package/palatino
-depend Package/pxfonts
-depend Package/rsfs
-depend Package/symbol
-depend Package/tex-gyre
-depend Package/times
-depend Package/timesnew
-depend Package/tipa
-depend Package/txfonts
-depend Package/utopia
-depend Package/wasy
-depend Package/wasysym
-depend Package/zapfchan
-depend Package/zapfding
-depend TLCore/collection-basic
+depend avantgar
+depend bookman
+depend charter
+depend cmextra
+depend courier
+depend euro
+depend euro-ce
+depend eurofont
+depend eurosans
+depend eurosym
+depend fpl
+depend helvetic
+depend marvosym
+depend mathpazo
+depend ncntrsbk
+depend palatino
+depend pxfonts
+depend rsfs
+depend symbol
+depend tex-gyre
+depend times
+depend timesnew
+depend tipa
+depend txfonts
+depend utopia
+depend wasy
+depend wasysym
+depend zapfchan
+depend zapfding
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
index b4b3153d848..4c20927e042 100644
--- a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
@@ -3,19 +3,19 @@ category Collection
shortdesc Extra formats
longdesc A collection of TeX `formats', ie large-scale macro packages
longdesc designed to be dumped into .fmt file
-depend Package/alatex
-depend Package/edmac
-depend Package/eplain
-depend Package/mltex
-depend Package/physe
-depend Package/phyzzx
-depend Package/psizzl
-depend Package/startex
-depend Package/texsis
-depend Package/ytex
-depend TLCore/bin-eplain
-depend TLCore/bin-mltex
-depend TLCore/bin-physe
-depend TLCore/bin-phyzzx
-depend TLCore/bin-texsis
-depend TLCore/collection-basic
+depend alatex
+depend edmac
+depend eplain
+depend mltex
+depend physe
+depend phyzzx
+depend psizzl
+depend startex
+depend texsis
+depend ytex
+depend bin-eplain
+depend bin-mltex
+depend bin-physe
+depend bin-phyzzx
+depend bin-texsis
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-games.tlpsrc b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
index d9279fe2cdf..f9e7e72df46 100644
--- a/Master/tlpkg/tlpsrc/collection-games.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
@@ -2,21 +2,21 @@ name collection-games
category Collection
shortdesc Games typesetting (chess, etc)
longdesc Setups for typesetting various board games, including chess
-depend Package/backgammon
-depend Package/bridge
-depend Package/cchess
-depend Package/cheq
-depend Package/chess
-depend Package/egameps
-depend Package/go
-depend Package/hexgame
-depend Package/jeopardy
-depend Package/othello
-depend Package/psgo
-depend Package/sgame
-depend Package/skak
-depend Package/skaknew
-depend Package/sudoku
-depend Package/sudokubundle
-depend Package/xq
-depend TLCore/collection-latex
+depend backgammon
+depend bridge
+depend cchess
+depend cheq
+depend chess
+depend egameps
+depend go
+depend hexgame
+depend jeopardy
+depend othello
+depend psgo
+depend sgame
+depend skak
+depend skaknew
+depend sudoku
+depend sudokubundle
+depend xq
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
index e63a0ebdc6b..490d1cc4887 100644
--- a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
@@ -3,27 +3,27 @@ category Collection
shortdesc Miscellaneous extra generic macros
longdesc This is a mixed bag of macro packages and fonts which do not seem
longdesc to belong elsewhere.
-depend Package/abbr
-depend Package/abstyles
-depend Package/aurora
-depend Package/barr
-depend Package/borceux
-depend Package/c-pascal
-depend Package/colorsep
-depend Package/dinat
-depend Package/eijkhout
-depend Package/fenixpar
-depend Package/fltpoint
-depend Package/insbox
-depend Package/mathdots
-depend Package/metatex
-depend Package/mftoeps
-depend Package/midnight
-depend Package/multi
-depend Package/ofs
-depend Package/pdf-trans
-depend Package/psfig
-depend Package/realcalc
-depend Package/vrb
-depend Package/vtex
-depend TLCore/collection-basic
+depend abbr
+depend abstyles
+depend aurora
+depend barr
+depend borceux
+depend c-pascal
+depend colorsep
+depend dinat
+depend eijkhout
+depend fenixpar
+depend fltpoint
+depend insbox
+depend mathdots
+depend metatex
+depend mftoeps
+depend midnight
+depend multi
+depend ofs
+depend pdf-trans
+depend psfig
+depend realcalc
+depend vrb
+depend vtex
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
index 4ba37165740..ad21a88d58e 100644
--- a/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
@@ -3,8 +3,8 @@ category Collection
shortdesc Miscellaneous generic macros
longdesc This is a mixed bag of macro packages and fonts which do not seem
longdesc to belong elsewhere
-depend Package/epsf
-depend Package/genmisc
-depend Package/multido
-depend Package/tex-ps
-depend TLCore/collection-basic
+depend epsf
+depend genmisc
+depend multido
+depend tex-ps
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-graphicstools.tlpsrc b/Master/tlpkg/tlpsrc/collection-graphicstools.tlpsrc
index d2c4485e932..d76934c7fec 100644
--- a/Master/tlpkg/tlpsrc/collection-graphicstools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-graphicstools.tlpsrc
@@ -2,5 +2,5 @@ name collection-graphicstools
category Collection
shortdesc Graphics tools
longdesc dvipng, pngtools.
-depend TLCore/bin-dvipng
-depend TLCore/bin-pngtools
+depend bin-dvipng
+depend bin-pngtools
diff --git a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc b/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
index 1d0bc621d4d..e0d123486d7 100644
--- a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
@@ -2,14 +2,14 @@ name collection-htmlxml
category Collection
shortdesc HTML/SGML/XML support
longdesc Packages to convert LaTeX to XML/HTML, and typset XML/SGML
-depend Package/jadetex
-depend Package/passivetex
-depend Package/tex4ht
-depend Package/xmlplay
-depend Package/xmltex
-depend TLCore/bin-jadetex
-depend TLCore/bin-tex4htk
-depend TLCore/bin-xmltex
-depend TLCore/collection-basic
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-latex
+depend jadetex
+depend passivetex
+depend tex4ht
+depend xmlplay
+depend xmltex
+depend bin-jadetex
+depend bin-tex4htk
+depend bin-xmltex
+depend collection-basic
+depend collection-fontsrecommended
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
index 63523de1b06..d83940db0b3 100644
--- a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
@@ -3,34 +3,34 @@ category Collection
shortdesc LaTeX support for the humanities
longdesc A collection of LaTeX packages for law, linguistics, the social
longdesc sciences, and the humanities.
-depend Package/alnumsec
-depend Package/arydshln
-depend Package/bibleref
-depend Package/camel
-depend Package/covington
-depend Package/dramatist
-depend Package/ecltree
-depend Package/ednotes
-depend Package/jura
-depend Package/juraabbrev
-depend Package/juramisc
-depend Package/jurarsp
-depend Package/ledmac
-depend Package/lexikon
-depend Package/lineno
-depend Package/linguex
-depend Package/numline
-depend Package/parallel
-depend Package/parrun
-depend Package/plari
-depend Package/play
-depend Package/poemscol
-depend Package/qobitree
-depend Package/qtree
-depend Package/rtklage
-depend Package/screenplay
-depend Package/sides
-depend Package/stage
-depend Package/tree-dvips
-depend Package/verse
-depend Package/xyling
+depend alnumsec
+depend arydshln
+depend bibleref
+depend camel
+depend covington
+depend dramatist
+depend ecltree
+depend ednotes
+depend jura
+depend juraabbrev
+depend juramisc
+depend jurarsp
+depend ledmac
+depend lexikon
+depend lineno
+depend linguex
+depend numline
+depend parallel
+depend parrun
+depend plari
+depend play
+depend poemscol
+depend qobitree
+depend qtree
+depend rtklage
+depend screenplay
+depend sides
+depend stage
+depend tree-dvips
+depend verse
+depend xyling
diff --git a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc b/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
index 1978d07db91..3cf125ffb07 100644
--- a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
@@ -2,7 +2,7 @@ name collection-langafrican
category Collection
shortdesc African scripts
longdesc Fonts for typesetting some African scripts
-depend Package/ethiop
-depend Package/ethiop-t1
-depend Package/fc
-depend TLCore/collection-basic
+depend ethiop
+depend ethiop-t1
+depend fc
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc b/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc
index 3394bb8e2e9..c8b8e2f2e3c 100644
--- a/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc
@@ -2,7 +2,7 @@ name collection-langarab
category Collection
shortdesc Arabic
longdesc Fonts and support for typesetting Arabic
-depend Package/arabi
-depend Package/arabtex
-depend TLCore/hyphen-arabic
-depend TLCore/collection-basic
+depend arabi
+depend arabtex
+depend hyphen-arabic
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc
index 6aa7db2d73c..5f9242d10e2 100644
--- a/Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc
@@ -2,5 +2,5 @@ name collection-langarmenian
category Collection
shortdesc Armenian
longdesc Essential armenian
-depend Package/armenian
-depend TLCore/collection-basic
+depend armenian
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
index 18c3ef5251d..260b8a62576 100644
--- a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
@@ -2,17 +2,17 @@ name collection-langcjk
category Collection
shortdesc Chinese, Japanese, Korean
longdesc CJK (Chinese, Japanese, Korean) macros, fonts, documentation.
-depend Package/CJK
-depend Package/arphic
-depend Package/c90enc
-depend Package/cns
-depend Package/garuda
-depend Package/japanese
-depend Package/norasi
-depend Package/uhc
-depend Package/wadalab
-depend Package/yi4latex
-depend TLCore/bin-cjkutils
-depend TLCore/hyphen-pinyin
-depend TLCore/collection-basic
-depend TLCore/collection-documentation-chinese
+depend CJK
+depend arphic
+depend c90enc
+depend cns
+depend garuda
+depend japanese
+depend norasi
+depend uhc
+depend wadalab
+depend yi4latex
+depend bin-cjkutils
+depend hyphen-pinyin
+depend collection-basic
+depend collection-documentation-chinese
diff --git a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
index d68f7d32ec2..0c31f36b1c9 100644
--- a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
@@ -2,7 +2,7 @@ name collection-langcroatian
category Collection
shortdesc Croatian
longdesc Essential croatian
-depend Package/croatian
-depend Package/hrlatex
-depend TLCore/hyphen-croatian
-depend TLCore/collection-basic
+depend croatian
+depend hrlatex
+depend hyphen-croatian
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
index 8580e1f87a4..4a17c3bdd51 100644
--- a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
@@ -2,24 +2,24 @@ name collection-langcyrillic
category Collection
shortdesc Cyrillic
longdesc Fonts and macro packages to typeset Cyrillic texts.
-depend Package/bghyphen
-depend Package/cmcyr
-depend Package/cmcyralt
-depend Package/cyrillic
-depend Package/cyrplain
-depend Package/disser
-depend Package/eskd
-depend Package/eskdx
-depend Package/gost
-depend Package/lh
-depend Package/lhcyr
-depend Package/ot2cyr
-depend Package/ruhyphen
-depend Package/t2
-depend Package/timescyr
-depend Package/ukrhyph
-depend TLCore/bin-cyrillic
-depend TLCore/hyphen-bulgarian
-depend TLCore/hyphen-russian
-depend TLCore/hyphen-ukrainian
-depend TLCore/collection-basic
+depend bghyphen
+depend cmcyr
+depend cmcyralt
+depend cyrillic
+depend cyrplain
+depend disser
+depend eskd
+depend eskdx
+depend gost
+depend lh
+depend lhcyr
+depend ot2cyr
+depend ruhyphen
+depend t2
+depend timescyr
+depend ukrhyph
+depend bin-cyrillic
+depend hyphen-bulgarian
+depend hyphen-russian
+depend hyphen-ukrainian
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
index 74d3e49d127..d17ae83d471 100644
--- a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
@@ -2,13 +2,13 @@ name collection-langczechslovak
category Collection
shortdesc Czech/Slovak
longdesc Pick this if you want Czech/Slovak fonts and other packages
-depend Package/cs
-depend Package/cslatex
-depend Package/csplain
-depend TLCore/bin-cslatex
-depend TLCore/bin-csplain
-depend TLCore/bin-vlna
-depend TLCore/hyphen-czechslovak
-depend TLCore/collection-basic
-depend TLCore/collection-latex
+depend cs
+depend cslatex
+depend csplain
+depend bin-cslatex
+depend bin-csplain
+depend bin-vlna
+depend hyphen-czechslovak
+depend collection-basic
+depend collection-latex
execute BuildLanguageDat cz
diff --git a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
index be8d81abd05..1806b48e671 100644
--- a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
@@ -2,5 +2,5 @@ name collection-langdanish
category Collection
shortdesc Danish
longdesc Essential Danish
-depend TLCore/hyphen-danish
-depend TLCore/collection-basic
+depend hyphen-danish
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
index edfe7ca887b..3da30e23cca 100644
--- a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
@@ -2,5 +2,5 @@ name collection-langdutch
category Collection
shortdesc Dutch
longdesc Essential Dutch
-depend TLCore/hyphen-dutch
-depend TLCore/collection-basic
+depend hyphen-dutch
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
index 71d7fad6ba3..b0c33176257 100644
--- a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
@@ -2,7 +2,7 @@ name collection-langfinnish
category Collection
shortdesc Finnish
longdesc Essential finnish
-depend Package/finbib
-depend TLCore/hyphen-finnish
-depend TLCore/collection-basic
+depend finbib
+depend hyphen-finnish
+depend collection-basic
execute BuildLanguageDat fi
diff --git a/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc b/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
index a5a66eb65f9..a9e19345870 100644
--- a/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
@@ -2,12 +2,12 @@ name collection-langfrench
category Collection
shortdesc French
longdesc Essential French
-depend Package/aeguill
-depend Package/frenchle
-depend Package/mafr
-depend Package/tabvar
-depend Package/variations
-depend TLCore/hyphen-basque
-depend TLCore/hyphen-french
-depend TLCore/collection-basic
+depend aeguill
+depend frenchle
+depend mafr
+depend tabvar
+depend variations
+depend hyphen-basque
+depend hyphen-french
+depend collection-basic
execute BuildLanguageDat fr
diff --git a/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
index 2d140636668..5ba3babd6ed 100644
--- a/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
@@ -2,12 +2,12 @@ name collection-langgerman
category Collection
shortdesc German
longdesc Essential German
-depend Package/german
-depend Package/germbib
-depend Package/mkind-german
-depend Package/r-und-s
-depend Package/uhrzeit
-depend Package/umlaute
-depend TLCore/hyphen-german
-depend TLCore/collection-basic
+depend german
+depend germbib
+depend mkind-german
+depend r-und-s
+depend uhrzeit
+depend umlaute
+depend hyphen-german
+depend collection-basic
execute BuildLanguageDat de
diff --git a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
index 946a68ab157..c029e6dc624 100644
--- a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
@@ -2,21 +2,21 @@ name collection-langgreek
category Collection
shortdesc Greek typesetting
longdesc Fonts and support for typesetting Greek
-depend Package/betababel
-depend Package/cb
-depend Package/greek
-depend Package/greektex
-depend Package/grtimes
-depend Package/grverb
-depend Package/ibycus
-depend Package/ibycus-babel
-depend Package/ibygrk
-depend Package/kdgreek
-depend Package/kerkis
-depend Package/levy
-depend Package/lgreek
-depend Package/teubner
-depend Package/yannisgr
-depend TLCore/hyphen-greek
-depend TLCore/hyphen-ibycus
-depend TLCore/collection-basic
+depend betababel
+depend cb
+depend greek
+depend greektex
+depend grtimes
+depend grverb
+depend ibycus
+depend ibycus-babel
+depend ibygrk
+depend kdgreek
+depend kerkis
+depend levy
+depend lgreek
+depend teubner
+depend yannisgr
+depend hyphen-greek
+depend hyphen-ibycus
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
index 064f84e5e74..01759f100cd 100644
--- a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
@@ -2,5 +2,5 @@ name collection-langhebrew
category Collection
shortdesc Hebrew
longdesc Fonts and support for typesetting Hebrew
-depend Package/cjhebrew
-depend TLCore/collection-basic
+depend cjhebrew
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
index 49d7c90b586..29d19d8a5af 100644
--- a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
@@ -2,7 +2,7 @@ name collection-langhungarian
category Collection
shortdesc Hungarian
longdesc Essential Hungarian
-depend Package/magyar
-depend TLCore/hyphen-hungarian
-depend TLCore/collection-basic
+depend magyar
+depend hyphen-hungarian
+depend collection-basic
execute BuildLanguageDat hu
diff --git a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
index d1e8883a645..0ed5c7531ae 100644
--- a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
@@ -2,17 +2,17 @@ name collection-langindic
category Collection
shortdesc Indic
longdesc Essential indic
-depend Package/bangtex
-depend Package/bengali
-depend Package/burmese
-depend Package/ebong
-depend Package/itrans
-depend Package/malayalam
-depend Package/omega-devanagari
-depend Package/sanskrit
-depend Package/velthuis
-depend Package/wnri
-depend Package/wntamil
-depend TLCore/bin-devnag
-depend TLCore/bin-ebong
-depend TLCore/collection-basic
+depend bangtex
+depend bengali
+depend burmese
+depend ebong
+depend itrans
+depend malayalam
+depend omega-devanagari
+depend sanskrit
+depend velthuis
+depend wnri
+depend wntamil
+depend bin-devnag
+depend bin-ebong
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
index c70d36dd4c5..f849a40598e 100644
--- a/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
@@ -1,7 +1,7 @@
name collection-langitalian
category Collection
shortdesc Italian
-depend Package/itnumpar
-depend TLCore/hyphen-italian
-depend TLCore/collection-basic
+depend itnumpar
+depend hyphen-italian
+depend collection-basic
execute BuildLanguageDat it
diff --git a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
index 5262582f580..43bb67325c4 100644
--- a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
@@ -2,6 +2,6 @@ name collection-langlatin
category Collection
shortdesc Latin
longdesc Essential Latin
-depend TLCore/hyphen-latin
-depend TLCore/collection-basic
+depend hyphen-latin
+depend collection-basic
execute BuildLanguageDat la
diff --git a/Master/tlpkg/tlpsrc/collection-langmanju.tlpsrc b/Master/tlpkg/tlpsrc/collection-langmanju.tlpsrc
index e37e0e810b4..bd33bc4119b 100644
--- a/Master/tlpkg/tlpsrc/collection-langmanju.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langmanju.tlpsrc
@@ -2,5 +2,5 @@ name collection-langmanju
category Collection
shortdesc Manju
longdesc Essential Manju
-depend Package/manjutex
-depend TLCore/collection-basic
+depend manjutex
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
index 525abb5af8d..04d35180e37 100644
--- a/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
@@ -2,8 +2,8 @@ name collection-langmongolian
category Collection
shortdesc Mongolian
longdesc Essential mongolian
-depend Package/montex
-depend Package/soyombo
-depend TLCore/hyphen-mongolian
-depend TLCore/collection-basic
+depend montex
+depend soyombo
+depend hyphen-mongolian
+depend collection-basic
execute BuildLanguageDat mn
diff --git a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
index 7d496f5352c..516a79aec73 100644
--- a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
@@ -2,6 +2,6 @@ name collection-langnorwegian
category Collection
shortdesc Norwegian
longdesc Essential Norwegian
-depend TLCore/hyphen-norwegian
-depend TLCore/collection-basic
+depend hyphen-norwegian
+depend collection-basic
execute BuildLanguageDat no
diff --git a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
index fb51cc162f9..349b1ee688d 100644
--- a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
@@ -2,16 +2,16 @@ name collection-langother
category Collection
shortdesc Other hyphenation files
longdesc Other hyphenation patterns
-depend TLCore/hyphen-coptic
-depend TLCore/hyphen-esperanto
-depend TLCore/hyphen-estonian
-depend TLCore/hyphen-icelandic
-depend TLCore/hyphen-indonesian
-depend TLCore/hyphen-interlingua
-depend TLCore/hyphen-romanian
-depend TLCore/hyphen-serbian
-depend TLCore/hyphen-slovene
-depend TLCore/hyphen-turkish
-depend TLCore/hyphen-usorbian
-depend TLCore/hyphen-welsh
-depend TLCore/collection-basic
+depend hyphen-coptic
+depend hyphen-esperanto
+depend hyphen-estonian
+depend hyphen-icelandic
+depend hyphen-indonesian
+depend hyphen-interlingua
+depend hyphen-romanian
+depend hyphen-serbian
+depend hyphen-slovene
+depend hyphen-turkish
+depend hyphen-usorbian
+depend hyphen-welsh
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
index a8680e8b3d1..34377fd7722 100644
--- a/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
@@ -2,22 +2,22 @@ name collection-langpolish
category Collection
shortdesc Polish
longdesc Pick this if you want Polish fonts and other packages
-depend Package/antp
-depend Package/antt
-depend Package/cc-pl
-depend Package/gustlib
-depend Package/iwona
-depend Package/mex
-depend Package/mwcls
-depend Package/ogonek
-depend Package/pl
-depend Package/polski
-depend Package/qfonts
-depend Package/qpxqtx
-depend Package/tap
-depend Package/tex-gyre
-depend Package/utf8mex
-depend TLCore/bin-mex
-depend TLCore/hyphen-polish
-depend TLCore/collection-latex
+depend antp
+depend antt
+depend cc-pl
+depend gustlib
+depend iwona
+depend mex
+depend mwcls
+depend ogonek
+depend pl
+depend polski
+depend qfonts
+depend qpxqtx
+depend tap
+depend tex-gyre
+depend utf8mex
+depend bin-mex
+depend hyphen-polish
+depend collection-latex
execute BuildLanguageDat pl
diff --git a/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
index fa9ddf52eb4..70e243811a7 100644
--- a/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
@@ -1,7 +1,7 @@
name collection-langportuguese
category Collection
shortdesc Portuguese
-depend Package/ordinalpt
-depend TLCore/hyphen-portuguese
-depend TLCore/collection-basic
+depend ordinalpt
+depend hyphen-portuguese
+depend collection-basic
execute BuildLanguageDat pt
diff --git a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
index c9011a13057..ccd209c7cde 100644
--- a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
@@ -2,6 +2,6 @@ name collection-langspanish
category Collection
shortdesc Spanish
longdesc Essential spanish
-depend TLCore/hyphen-spanish
-depend TLCore/collection-basic
+depend hyphen-spanish
+depend collection-basic
execute BuildLanguageDat es
diff --git a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
index da397050cf5..d9ef75eb60e 100644
--- a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
@@ -2,7 +2,7 @@ name collection-langswedish
category Collection
shortdesc Swedish
longdesc Essential swedish
-depend Package/swebib
-depend TLCore/hyphen-swedish
-depend TLCore/collection-basic
+depend swebib
+depend hyphen-swedish
+depend collection-basic
execute BuildLanguageDat sw
diff --git a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc b/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
index 9fb2c5cb763..07e4331b1c1 100644
--- a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
@@ -2,6 +2,6 @@ name collection-langtibetan
category Collection
shortdesc Tibetan
longdesc Fonts and support for typesetting Tibetan
-depend Package/ctib
-depend Package/otibet
-depend TLCore/collection-basic
+depend ctib
+depend otibet
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc
index d866cf62394..c26bb97cb35 100644
--- a/Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc
@@ -2,6 +2,6 @@ name collection-langukenglish
category Collection
shortdesc UK English
longdesc Essential UK English
-depend TLCore/hyphen-ukenglish
-depend TLCore/collection-basic
+depend hyphen-ukenglish
+depend collection-basic
execute BuildLanguageDat uk
diff --git a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
index bee4a65f225..9335dee3f16 100644
--- a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
@@ -2,6 +2,6 @@ name collection-langvietnamese
category Collection
shortdesc Vietnamese
longdesc Vietnamese support
-depend Package/plnfss
-depend Package/vntex
-depend TLCore/collection-basic
+depend plnfss
+depend vntex
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
index c4885ba1bfb..d50fef8b370 100644
--- a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
@@ -3,29 +3,29 @@ category Collection
shortdesc Basic LaTeX packages
longdesc These packages are either mandated by the core LaTeX team, or
longdesc otherwise highly recommended.
-depend Package/ae
-depend Package/amscls
-depend Package/amsltx2
-depend Package/amsmath
-depend Package/amsrefs
-depend Package/babel
-depend Package/babelbib
-depend Package/carlisle
-depend Package/colortbl
-depend Package/fancyhdr
-depend Package/geometry
-depend Package/graphics
-depend Package/hyperref
-depend Package/latex
-depend Package/latex-fonts
-depend Package/latexconfig
-depend Package/ltxmisc
-depend Package/mfnfss
-depend Package/natbib
-depend Package/pdftex-def
-depend Package/pslatex
-depend Package/psnfss
-depend Package/pspicture
-depend Package/tools
-depend TLCore/bin-latex
-depend TLCore/collection-basic
+depend ae
+depend amscls
+depend amsltx2
+depend amsmath
+depend amsrefs
+depend babel
+depend babelbib
+depend carlisle
+depend colortbl
+depend fancyhdr
+depend geometry
+depend graphics
+depend hyperref
+depend latex
+depend latex-fonts
+depend latexconfig
+depend ltxmisc
+depend mfnfss
+depend natbib
+depend pdftex-def
+depend pslatex
+depend psnfss
+depend pspicture
+depend tools
+depend bin-latex
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc
index ce2c03686d6..bc2b9bd777b 100644
--- a/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc
@@ -1,12 +1,12 @@
name collection-latex3
category Collection
shortdesc LaTeX3 packages
-depend Package/expl3
-depend Package/galley
-depend Package/template
-depend Package/xbase
-depend Package/xinitials
-depend Package/xor
-depend Package/xparse
-depend Package/xtheorem
-depend TLCore/collection-latex
+depend expl3
+depend galley
+depend template
+depend xbase
+depend xinitials
+depend xor
+depend xparse
+depend xtheorem
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 07c68b60bbe..13e154876bc 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -2,539 +2,539 @@ name collection-latexextra
category Collection
shortdesc LaTeX supplementary packages
longdesc A large collection of add-on packages for LaTeX.
-depend Package/ESIEEcv
-depend Package/GuIT
-depend Package/HA-prosper
-depend Package/Tabbing
-depend Package/a0poster
-depend Package/abstract
-depend Package/achemso
-depend Package/acronym
-depend Package/adrconv
-depend Package/adrlist
-depend Package/akletter
-depend Package/altfont
-depend Package/animate
-depend Package/answers
-depend Package/appendix
-depend Package/arcs
-depend Package/arrayjob
-depend Package/assignment
-depend Package/attachfile
-depend Package/authorindex
-depend Package/autotab
-depend Package/beamer-contrib
-depend Package/begriff
-depend Package/beton
-depend Package/bez123
-depend Package/bezos
-depend Package/bigfoot
-depend Package/binomexp
-depend Package/bizcard
-depend Package/blindtext
-depend Package/boites
-depend Package/bookest
-depend Package/booklet
-depend Package/bophook
-depend Package/boxhandler
-depend Package/breakurl
-depend Package/bullcntr
-depend Package/bussproofs
-depend Package/calendar
-depend Package/calrsfs
-depend Package/calxxxx
-depend Package/captcont
-depend Package/casyl
-depend Package/cbcoptic
-depend Package/ccaption
-depend Package/cclicenses
-depend Package/cd
-depend Package/cd-cover
-depend Package/cdpbundl
-depend Package/cellspace
-depend Package/changebar
-depend Package/changes
-depend Package/chappg
-depend Package/chapterfolder
-depend Package/china2e
-depend Package/circ
-depend Package/cjw
-depend Package/clefval
-depend Package/cleveref
-depend Package/clock
-depend Package/cmdstring
-depend Package/cmdtrack
-depend Package/cmsd
-depend Package/codepage
-depend Package/colorinfo
-depend Package/colorwav
-depend Package/combine
-depend Package/comment
-depend Package/concprog
-depend Package/contour
-depend Package/cooking
-depend Package/cool
-depend Package/coollist
-depend Package/coolstr
-depend Package/cooltooltips
-depend Package/coordsys
-depend Package/courseoutline
-depend Package/coursepaper
-depend Package/coverpage
-depend Package/crossreference
-depend Package/crosswrd
-depend Package/csquotes
-depend Package/cuisine
-depend Package/currvita
-depend Package/cursor
-depend Package/cv
-depend Package/cwpuzzle
-depend Package/dashbox
-depend Package/dashrule
-depend Package/datatool
-depend Package/dateiliste
-depend Package/datenumber
-depend Package/datetime
-depend Package/decimal
-depend Package/deleq
-depend Package/delimtxt
-depend Package/diagnose
-depend Package/dialogl
-depend Package/dichokey
-depend Package/dinbrief
-depend Package/directory
-depend Package/dlfltxb
-depend Package/dnaseq
-depend Package/docmfp
-depend Package/doi
-depend Package/dotseqn
-depend Package/dpfloat
-depend Package/draftcopy
-depend Package/draftwatermark
-depend Package/dropping
-depend Package/dtk
-depend Package/dtxgallery
-depend Package/dvdcoll
-depend Package/eCards
-depend Package/easy
-depend Package/ebezier
-depend Package/ecv
-depend Package/eemeir
-depend Package/egplot
-depend Package/ellipsis
-depend Package/elmath
-depend Package/elpres
-depend Package/em
-depend Package/emulateapj
-depend Package/endfloat
-depend Package/endheads
-depend Package/engpron
-depend Package/engrec
-depend Package/enumitem
-depend Package/envbig
-depend Package/environ
-depend Package/envlab
-depend Package/epigraph
-depend Package/epiolmec
-depend Package/epspdfconversion
-depend Package/eqlist
-depend Package/eqname
-depend Package/eqparbox
-depend Package/esdiff
-depend Package/esint
-depend Package/esint-type1
-depend Package/etaremune
-depend Package/etoolbox
-depend Package/europecv
-depend Package/everypage
-depend Package/exam
-depend Package/examdesign
-depend Package/examplep
-depend Package/exercise
-depend Package/expdlist
-depend Package/export
-depend Package/extract
-depend Package/facsimile
-depend Package/fancynum
-depend Package/fancytooltips
-depend Package/fax
-depend Package/figsize
-depend Package/filecontents
-depend Package/fink
-depend Package/fixfoot
-depend Package/fixme
-depend Package/flabels
-depend Package/flagderiv
-depend Package/flashcards
-depend Package/flippdf
-depend Package/floatrow
-depend Package/flowfram
-depend Package/fmp
-depend Package/fmtcount
-depend Package/fnbreak
-depend Package/fncychap
-depend Package/foilhtml
-depend Package/footmisc
-depend Package/footnpag
-depend Package/forloop
-depend Package/formlett
-depend Package/formular
-depend Package/frankenstein
-depend Package/fribrief
-depend Package/fullblck
-depend Package/fullpict
-depend Package/fundus
-depend Package/g-brief
-depend Package/gauss
-depend Package/gcard
-depend Package/gcite
-depend Package/genmpage
-depend Package/geomsty
-depend Package/ginpenc
-depend Package/gloss
-depend Package/glossaries
-depend Package/gmdoc
-depend Package/gmeometric
-depend Package/gmiflink
-depend Package/gmutils
-depend Package/gmverb
-depend Package/graphicx-psmin
-depend Package/grfpaste
-depend Package/grnumalt
-depend Package/hanging
-depend Package/harpoon
-depend Package/hc
-depend Package/hhtensor
-depend Package/hilowres
-depend Package/histogr
-depend Package/hitec
-depend Package/hpsdiss
-depend Package/hvfloat
-depend Package/hyper
-depend Package/hyperxmp
-depend Package/hyphenat
-depend Package/ifmslide
-depend Package/image-gallery
-depend Package/interactiveworkbook
-depend Package/inversepath
-depend Package/invoice
-depend Package/ipa
-depend Package/iso
-depend Package/iso10303
-depend Package/isodate
-depend Package/isodoc
-depend Package/isorot
-depend Package/isotope
-depend Package/kalender
-depend Package/kastrup
-depend Package/kerntest
-depend Package/keystroke
-depend Package/labbook
-depend Package/labelcas
-depend Package/labels
-depend Package/lastpage
-depend Package/latex-tds
-depend Package/layouts
-depend Package/lazylist
-depend Package/lcd
-depend Package/lcg
-depend Package/leading
-depend Package/leaflet
-depend Package/leftidx
-depend Package/lettre
-depend Package/lettrine
-depend Package/lewis
-depend Package/lhelp
-depend Package/limap
-depend Package/lipsum
-depend Package/listliketab
-depend Package/listofsymbols
-depend Package/lkproof
-depend Package/localloc
-depend Package/logpap
-depend Package/lsc
-depend Package/ltablex
-depend Package/ltabptch
-depend Package/ltxindex
-depend Package/mailing
-depend Package/makebox
-depend Package/makecell
-depend Package/makecirc
-depend Package/makecmds
-depend Package/makedtx
-depend Package/makeglos
-depend Package/manfnt
-depend Package/manuscript
-depend Package/mapcodes
-depend Package/maple
-depend Package/marginnote
-depend Package/mathexam
-depend Package/maybemath
-depend Package/mcaption
-depend Package/mceinleger
-depend Package/mcite
-depend Package/menu
-depend Package/method
-depend Package/metre
-depend Package/mff
-depend Package/mftinc
-depend Package/minipage-marginpar
-depend Package/minitoc
-depend Package/minutes
-depend Package/misc209
-depend Package/mla-paper
-depend Package/mlist
-depend Package/moderncv
-depend Package/modroman
-depend Package/morehelp
-depend Package/moresize
-depend Package/moreverb
-depend Package/movie15
-depend Package/mparhack
-depend Package/msc
-depend Package/msg
-depend Package/mslapa
-depend Package/mtgreek
-depend Package/multenum
-depend Package/multibbl
-depend Package/multicap
-depend Package/multirow
-depend Package/mwrite
-depend Package/nag
-depend Package/namespc
-depend Package/ncclatex
-depend Package/ncctools
-depend Package/newfile
-depend Package/newlfm
-depend Package/newthm
-depend Package/newvbtm
-depend Package/niceframe
-depend Package/noitcrul
-depend Package/nomencl
-depend Package/nomentbl
-depend Package/nonfloat
-depend Package/notes
-depend Package/ntabbing
-depend Package/ntheorem
-depend Package/numname
-depend Package/numprint
-depend Package/ocr-latex
-depend Package/octavo
-depend Package/oldstyle
-depend Package/onlyamsmath
-depend Package/opcit
-depend Package/outline
-depend Package/outliner
-depend Package/overpic
-depend Package/oxford
-depend Package/pageno
-depend Package/pagenote
-depend Package/paper
-depend Package/papercdcase
-depend Package/papertex
-depend Package/paralist
-depend Package/paresse
-depend Package/patch
-depend Package/patchcmd
-depend Package/pauldoc
-depend Package/pawpict
-depend Package/pbox
-depend Package/pbsheet
-depend Package/pdfcprot
-depend Package/pdfscreen
-depend Package/pdfslide
-depend Package/pdfsync
-depend Package/pdfwin
-depend Package/pecha
-depend Package/perltex
-depend Package/permute
-depend Package/photo
-depend Package/pittetd
-depend Package/placeins
-depend Package/plates
-depend Package/plweb
-depend Package/polyglot
-depend Package/polynom
-depend Package/polynomial
-depend Package/polytable
-depend Package/postcards
-depend Package/ppower4
-depend Package/ppr-prv
-depend Package/preprint
-depend Package/prettyref
-depend Package/preview
-depend Package/probsoln
-depend Package/progkeys
-depend Package/program
-depend Package/progress
-depend Package/prosper
-depend Package/protocol
-depend Package/psfragx
-depend Package/pst-pdf
-depend Package/qcm
-depend Package/qstest
-depend Package/qsymbols
-depend Package/quotchap
-depend Package/randtext
-depend Package/rccol
-depend Package/rcsinfo
-depend Package/rectopma
-depend Package/refcheck
-depend Package/refman
-depend Package/refstyle
-depend Package/regcount
-depend Package/register
-depend Package/relenc
-depend Package/repeatindex
-depend Package/resume
-depend Package/rlepsf
-depend Package/rmpage
-depend Package/robustcommand
-depend Package/robustindex
-depend Package/romannum
-depend Package/rotfloat
-depend Package/rotpages
-depend Package/rst
-depend Package/rtkinenc
-depend Package/sauerj
-depend Package/savefnmark
-depend Package/savesym
-depend Package/savetrees
-depend Package/scale
-depend Package/scalebar
-depend Package/schedule
-depend Package/sciwordconv
-depend Package/script
-depend Package/sdrt
-depend Package/sectionbox
-depend Package/sectsty
-depend Package/semantic
-depend Package/semioneside
-depend Package/seqsplit
-depend Package/sf298
-depend Package/sffms
-depend Package/sfmath
-depend Package/shadbox
-depend Package/shadethm
-depend Package/shapepar
-depend Package/shortlst
-depend Package/shorttoc
-depend Package/showdim
-depend Package/showexpl
-depend Package/showlabels
-depend Package/sidecap
-depend Package/simplecv
-depend Package/slantsc
-depend Package/slashbox
-depend Package/slidenotes
-depend Package/smalltableof
-depend Package/smartref
-depend Package/smflatex
-depend Package/snapshot
-depend Package/soul
-depend Package/sparklines
-depend Package/splitindex
-depend Package/spotcolor
-depend Package/sprite
-depend Package/srcltx
-depend Package/sseq
-depend Package/ssqquote
-depend Package/stack
-depend Package/statistik
-depend Package/stdclsdv
-depend Package/stdpage
-depend Package/sttools
-depend Package/subdepth
-depend Package/subeqn
-depend Package/subeqnarray
-depend Package/subfigure
-depend Package/subfloat
-depend Package/substr
-depend Package/supertabular
-depend Package/svgcolor
-depend Package/svn
-depend Package/svn-multi
-depend Package/svninfo
-depend Package/syntax
-depend Package/syntrace
-depend Package/synttree
-depend Package/tableaux
-depend Package/tabto-ltx
-depend Package/tabulary
-depend Package/talk
-depend Package/taupin
-depend Package/tcldoc
-depend Package/technics
-depend Package/texilikecover
-depend Package/texlogos
-depend Package/texmate
-depend Package/texpower
-depend Package/texshade
-depend Package/textcase
-depend Package/textfit
-depend Package/textmerg
-depend Package/textpos
-depend Package/thumb
-depend Package/ticket
-depend Package/timesht
-depend Package/timing
-depend Package/titlefoot
-depend Package/titlesec
-depend Package/titling
-depend Package/tocbibind
-depend Package/tocloft
-depend Package/tocvsec2
-depend Package/todo
-depend Package/tokenizer
-depend Package/toolbox
-depend Package/topfloat
-depend Package/totpages
-depend Package/tracking
-depend Package/trfsigns
-depend Package/trsym
-depend Package/trivfloat
-depend Package/twoup
-depend Package/type1cm
-depend Package/typedref
-depend Package/typogrid
-depend Package/ulsy
-depend Package/umoline
-depend Package/underlin
-depend Package/undertilde
-depend Package/units
-depend Package/upmethodology
-depend Package/upquote
-depend Package/ushort
-depend Package/varindex
-depend Package/vector
-depend Package/versions
-depend Package/vhistory
-depend Package/vita
-depend Package/vmargin
-depend Package/volumes
-depend Package/vpe
-depend Package/vrsion
-depend Package/wallpaper
-depend Package/warning
-depend Package/warpcol
-depend Package/was
-depend Package/williams
-depend Package/wordcount
-depend Package/wordlike
-depend Package/wrapfig
-depend Package/xbmc
-depend Package/xtab
-depend Package/xtcapts
-depend Package/xdoc
-depend Package/xfor
-depend Package/xifthen
-depend Package/xmpincl
-depend Package/xnewcommand
-depend Package/xoptarg
-depend Package/xytree
-depend Package/yafoot
-depend Package/yplan
-depend Package/zed-csp
-depend TLCore/bin-perltex
-depend TLCore/bin-ppower4
-depend TLCore/collection-latex
+depend ESIEEcv
+depend GuIT
+depend HA-prosper
+depend Tabbing
+depend a0poster
+depend abstract
+depend achemso
+depend acronym
+depend adrconv
+depend adrlist
+depend akletter
+depend altfont
+depend animate
+depend answers
+depend appendix
+depend arcs
+depend arrayjob
+depend assignment
+depend attachfile
+depend authorindex
+depend autotab
+depend beamer-contrib
+depend begriff
+depend beton
+depend bez123
+depend bezos
+depend bigfoot
+depend binomexp
+depend bizcard
+depend blindtext
+depend boites
+depend bookest
+depend booklet
+depend bophook
+depend boxhandler
+depend breakurl
+depend bullcntr
+depend bussproofs
+depend calendar
+depend calrsfs
+depend calxxxx
+depend captcont
+depend casyl
+depend cbcoptic
+depend ccaption
+depend cclicenses
+depend cd
+depend cd-cover
+depend cdpbundl
+depend cellspace
+depend changebar
+depend changes
+depend chappg
+depend chapterfolder
+depend china2e
+depend circ
+depend cjw
+depend clefval
+depend cleveref
+depend clock
+depend cmdstring
+depend cmdtrack
+depend cmsd
+depend codepage
+depend colorinfo
+depend colorwav
+depend combine
+depend comment
+depend concprog
+depend contour
+depend cooking
+depend cool
+depend coollist
+depend coolstr
+depend cooltooltips
+depend coordsys
+depend courseoutline
+depend coursepaper
+depend coverpage
+depend crossreference
+depend crosswrd
+depend csquotes
+depend cuisine
+depend currvita
+depend cursor
+depend cv
+depend cwpuzzle
+depend dashbox
+depend dashrule
+depend datatool
+depend dateiliste
+depend datenumber
+depend datetime
+depend decimal
+depend deleq
+depend delimtxt
+depend diagnose
+depend dialogl
+depend dichokey
+depend dinbrief
+depend directory
+depend dlfltxb
+depend dnaseq
+depend docmfp
+depend doi
+depend dotseqn
+depend dpfloat
+depend draftcopy
+depend draftwatermark
+depend dropping
+depend dtk
+depend dtxgallery
+depend dvdcoll
+depend eCards
+depend easy
+depend ebezier
+depend ecv
+depend eemeir
+depend egplot
+depend ellipsis
+depend elmath
+depend elpres
+depend em
+depend emulateapj
+depend endfloat
+depend endheads
+depend engpron
+depend engrec
+depend enumitem
+depend envbig
+depend environ
+depend envlab
+depend epigraph
+depend epiolmec
+depend epspdfconversion
+depend eqlist
+depend eqname
+depend eqparbox
+depend esdiff
+depend esint
+depend esint-type1
+depend etaremune
+depend etoolbox
+depend europecv
+depend everypage
+depend exam
+depend examdesign
+depend examplep
+depend exercise
+depend expdlist
+depend export
+depend extract
+depend facsimile
+depend fancynum
+depend fancytooltips
+depend fax
+depend figsize
+depend filecontents
+depend fink
+depend fixfoot
+depend fixme
+depend flabels
+depend flagderiv
+depend flashcards
+depend flippdf
+depend floatrow
+depend flowfram
+depend fmp
+depend fmtcount
+depend fnbreak
+depend fncychap
+depend foilhtml
+depend footmisc
+depend footnpag
+depend forloop
+depend formlett
+depend formular
+depend frankenstein
+depend fribrief
+depend fullblck
+depend fullpict
+depend fundus
+depend g-brief
+depend gauss
+depend gcard
+depend gcite
+depend genmpage
+depend geomsty
+depend ginpenc
+depend gloss
+depend glossaries
+depend gmdoc
+depend gmeometric
+depend gmiflink
+depend gmutils
+depend gmverb
+depend graphicx-psmin
+depend grfpaste
+depend grnumalt
+depend hanging
+depend harpoon
+depend hc
+depend hhtensor
+depend hilowres
+depend histogr
+depend hitec
+depend hpsdiss
+depend hvfloat
+depend hyper
+depend hyperxmp
+depend hyphenat
+depend ifmslide
+depend image-gallery
+depend interactiveworkbook
+depend inversepath
+depend invoice
+depend ipa
+depend iso
+depend iso10303
+depend isodate
+depend isodoc
+depend isorot
+depend isotope
+depend kalender
+depend kastrup
+depend kerntest
+depend keystroke
+depend labbook
+depend labelcas
+depend labels
+depend lastpage
+depend latex-tds
+depend layouts
+depend lazylist
+depend lcd
+depend lcg
+depend leading
+depend leaflet
+depend leftidx
+depend lettre
+depend lettrine
+depend lewis
+depend lhelp
+depend limap
+depend lipsum
+depend listliketab
+depend listofsymbols
+depend lkproof
+depend localloc
+depend logpap
+depend lsc
+depend ltablex
+depend ltabptch
+depend ltxindex
+depend mailing
+depend makebox
+depend makecell
+depend makecirc
+depend makecmds
+depend makedtx
+depend makeglos
+depend manfnt
+depend manuscript
+depend mapcodes
+depend maple
+depend marginnote
+depend mathexam
+depend maybemath
+depend mcaption
+depend mceinleger
+depend mcite
+depend menu
+depend method
+depend metre
+depend mff
+depend mftinc
+depend minipage-marginpar
+depend minitoc
+depend minutes
+depend misc209
+depend mla-paper
+depend mlist
+depend moderncv
+depend modroman
+depend morehelp
+depend moresize
+depend moreverb
+depend movie15
+depend mparhack
+depend msc
+depend msg
+depend mslapa
+depend mtgreek
+depend multenum
+depend multibbl
+depend multicap
+depend multirow
+depend mwrite
+depend nag
+depend namespc
+depend ncclatex
+depend ncctools
+depend newfile
+depend newlfm
+depend newthm
+depend newvbtm
+depend niceframe
+depend noitcrul
+depend nomencl
+depend nomentbl
+depend nonfloat
+depend notes
+depend ntabbing
+depend ntheorem
+depend numname
+depend numprint
+depend ocr-latex
+depend octavo
+depend oldstyle
+depend onlyamsmath
+depend opcit
+depend outline
+depend outliner
+depend overpic
+depend oxford
+depend pageno
+depend pagenote
+depend paper
+depend papercdcase
+depend papertex
+depend paralist
+depend paresse
+depend patch
+depend patchcmd
+depend pauldoc
+depend pawpict
+depend pbox
+depend pbsheet
+depend pdfcprot
+depend pdfscreen
+depend pdfslide
+depend pdfsync
+depend pdfwin
+depend pecha
+depend perltex
+depend permute
+depend photo
+depend pittetd
+depend placeins
+depend plates
+depend plweb
+depend polyglot
+depend polynom
+depend polynomial
+depend polytable
+depend postcards
+depend ppower4
+depend ppr-prv
+depend preprint
+depend prettyref
+depend preview
+depend probsoln
+depend progkeys
+depend program
+depend progress
+depend prosper
+depend protocol
+depend psfragx
+depend pst-pdf
+depend qcm
+depend qstest
+depend qsymbols
+depend quotchap
+depend randtext
+depend rccol
+depend rcsinfo
+depend rectopma
+depend refcheck
+depend refman
+depend refstyle
+depend regcount
+depend register
+depend relenc
+depend repeatindex
+depend resume
+depend rlepsf
+depend rmpage
+depend robustcommand
+depend robustindex
+depend romannum
+depend rotfloat
+depend rotpages
+depend rst
+depend rtkinenc
+depend sauerj
+depend savefnmark
+depend savesym
+depend savetrees
+depend scale
+depend scalebar
+depend schedule
+depend sciwordconv
+depend script
+depend sdrt
+depend sectionbox
+depend sectsty
+depend semantic
+depend semioneside
+depend seqsplit
+depend sf298
+depend sffms
+depend sfmath
+depend shadbox
+depend shadethm
+depend shapepar
+depend shortlst
+depend shorttoc
+depend showdim
+depend showexpl
+depend showlabels
+depend sidecap
+depend simplecv
+depend slantsc
+depend slashbox
+depend slidenotes
+depend smalltableof
+depend smartref
+depend smflatex
+depend snapshot
+depend soul
+depend sparklines
+depend splitindex
+depend spotcolor
+depend sprite
+depend srcltx
+depend sseq
+depend ssqquote
+depend stack
+depend statistik
+depend stdclsdv
+depend stdpage
+depend sttools
+depend subdepth
+depend subeqn
+depend subeqnarray
+depend subfigure
+depend subfloat
+depend substr
+depend supertabular
+depend svgcolor
+depend svn
+depend svn-multi
+depend svninfo
+depend syntax
+depend syntrace
+depend synttree
+depend tableaux
+depend tabto-ltx
+depend tabulary
+depend talk
+depend taupin
+depend tcldoc
+depend technics
+depend texilikecover
+depend texlogos
+depend texmate
+depend texpower
+depend texshade
+depend textcase
+depend textfit
+depend textmerg
+depend textpos
+depend thumb
+depend ticket
+depend timesht
+depend timing
+depend titlefoot
+depend titlesec
+depend titling
+depend tocbibind
+depend tocloft
+depend tocvsec2
+depend todo
+depend tokenizer
+depend toolbox
+depend topfloat
+depend totpages
+depend tracking
+depend trfsigns
+depend trsym
+depend trivfloat
+depend twoup
+depend type1cm
+depend typedref
+depend typogrid
+depend ulsy
+depend umoline
+depend underlin
+depend undertilde
+depend units
+depend upmethodology
+depend upquote
+depend ushort
+depend varindex
+depend vector
+depend versions
+depend vhistory
+depend vita
+depend vmargin
+depend volumes
+depend vpe
+depend vrsion
+depend wallpaper
+depend warning
+depend warpcol
+depend was
+depend williams
+depend wordcount
+depend wordlike
+depend wrapfig
+depend xbmc
+depend xtab
+depend xtcapts
+depend xdoc
+depend xfor
+depend xifthen
+depend xmpincl
+depend xnewcommand
+depend xoptarg
+depend xytree
+depend yafoot
+depend yplan
+depend zed-csp
+depend bin-perltex
+depend bin-ppower4
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
index 3bb9c577c27..827f64cf1ee 100644
--- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
@@ -3,45 +3,45 @@ category Collection
shortdesc LaTeX recommended packages
longdesc A collection of recommended add-on packages for LaTeX which have
longdesc widespread use
-depend Package/anysize
-depend Package/beamer
-depend Package/booktabs
-depend Package/caption
-depend Package/cite
-depend Package/citeref
-depend Package/cmap
-depend Package/crop
-depend Package/ctable
-depend Package/ec
-depend Package/eso-pic
-depend Package/euler
-depend Package/extsizes
-depend Package/fancybox
-depend Package/fancyref
-depend Package/fancyvrb
-depend Package/float
-depend Package/floatflt
-depend Package/fp
-depend Package/index
-depend Package/jknapltx
-depend Package/koma-script
-depend Package/listings
-depend Package/mdwtools
-depend Package/memoir
-depend Package/microtype
-depend Package/ms
-depend Package/ntgclass
-depend Package/oberdiek
-depend Package/pdfpages
-depend Package/powerdot
-depend Package/psfrag
-depend Package/rcs
-depend Package/rotating
-depend Package/seminar
-depend Package/setspace
-depend Package/subfig
-depend Package/thumbpdf
-depend Package/ucs
-depend Package/xcolor
-depend Package/xkeyval
-depend TLCore/collection-latex
+depend anysize
+depend beamer
+depend booktabs
+depend caption
+depend cite
+depend citeref
+depend cmap
+depend crop
+depend ctable
+depend ec
+depend eso-pic
+depend euler
+depend extsizes
+depend fancybox
+depend fancyref
+depend fancyvrb
+depend float
+depend floatflt
+depend fp
+depend index
+depend jknapltx
+depend koma-script
+depend listings
+depend mdwtools
+depend memoir
+depend microtype
+depend ms
+depend ntgclass
+depend oberdiek
+depend pdfpages
+depend powerdot
+depend psfrag
+depend rcs
+depend rotating
+depend seminar
+depend setspace
+depend subfig
+depend thumbpdf
+depend ucs
+depend xcolor
+depend xkeyval
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
index a1c70791c08..2faba12fabf 100644
--- a/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
@@ -2,30 +2,30 @@ name collection-mathextra
category Collection
shortdesc Advanced math typesetting
longdesc Extra math
-depend Package/12many
-depend Package/amstex
-depend Package/boldtensors
-depend Package/breqn
-depend Package/ccfonts
-depend Package/commath
-depend Package/concmath
-depend Package/concrete
-depend Package/eqnarray
-depend Package/extarrows
-depend Package/extpfeil
-depend Package/faktor
-depend Package/hvmath
-depend Package/mathcomp
-depend Package/mh
-depend Package/mhequ
-depend Package/nath
-depend Package/stmaryrd
-depend Package/synproof
-depend Package/tensor
-depend Package/tmmath
-depend Package/turnstile
-depend Package/venn
-depend Package/yhmath
-depend TLCore/bin-amstex
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-latex
+depend 12many
+depend amstex
+depend boldtensors
+depend breqn
+depend ccfonts
+depend commath
+depend concmath
+depend concrete
+depend eqnarray
+depend extarrows
+depend extpfeil
+depend faktor
+depend hvmath
+depend mathcomp
+depend mh
+depend mhequ
+depend nath
+depend stmaryrd
+depend synproof
+depend tensor
+depend tmmath
+depend turnstile
+depend venn
+depend yhmath
+depend bin-amstex
+depend collection-fontsrecommended
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc b/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
index d3d3546fb4f..c6c191a4cc4 100644
--- a/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
@@ -1,26 +1,26 @@
name collection-metapost
category Collection
shortdesc MetaPost (and Metafont) drawing packages
-depend Package/automata
-depend Package/cmarrows
-depend Package/emp
-depend Package/expressg
-depend Package/exteps
-depend Package/featpost
-depend Package/feynmf
-depend Package/hatching
-depend Package/latexmp
-depend Package/metaobj
-depend Package/metaplot
-depend Package/metapost
-depend Package/metauml
-depend Package/mfpic
-depend Package/mp3d
-depend Package/mpattern
-depend Package/piechartmp
-depend Package/roex
-depend Package/slideshow
-depend Package/splines
-depend Package/textpath
-depend TLCore/bin-metapost
-depend TLCore/collection-basic
+depend automata
+depend cmarrows
+depend emp
+depend expressg
+depend exteps
+depend featpost
+depend feynmf
+depend hatching
+depend latexmp
+depend metaobj
+depend metaplot
+depend metapost
+depend metauml
+depend mfpic
+depend mp3d
+depend mpattern
+depend piechartmp
+depend roex
+depend slideshow
+depend splines
+depend textpath
+depend bin-metapost
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-music.tlpsrc b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
index ca7208729a9..de7c865a798 100644
--- a/Master/tlpkg/tlpsrc/collection-music.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
@@ -2,13 +2,13 @@ name collection-music
category Collection
shortdesc Music typesetting
longdesc Music typesetting packages
-depend Package/abc
-depend Package/guitar
-depend Package/harmony
-depend Package/musictex
-depend Package/musixlyr
-depend Package/musixps
-depend Package/musixtex
-depend Package/songbook
-depend TLCore/bin-musixflx
-depend TLCore/collection-latex
+depend abc
+depend guitar
+depend harmony
+depend musictex
+depend musixlyr
+depend musixps
+depend musixtex
+depend songbook
+depend bin-musixflx
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc b/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
index 5ede78edc0f..50a4e6a19a1 100644
--- a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
@@ -2,12 +2,12 @@ name collection-omega
category Collection
shortdesc Omega
longdesc Omega, a 16-bit extended TeX by John Plaice and Yannis Haralambous
-depend Package/antomega
-depend Package/lambda
-depend Package/mxd
-depend Package/mxedruli
-depend Package/omega
-depend TLCore/bin-aleph
-depend TLCore/bin-omega
-depend TLCore/bin-omegaware
-depend TLCore/collection-basic
+depend antomega
+depend lambda
+depend mxd
+depend mxedruli
+depend omega
+depend bin-aleph
+depend bin-omega
+depend bin-omegaware
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
index 56ed014f9ea..f3559e4e912 100644
--- a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
@@ -1,26 +1,26 @@
name collection-pictures
category Collection
shortdesc Packages for drawing graphics
-depend Package/bardiag
-depend Package/curve
-depend Package/curve2e
-depend Package/curves
-depend Package/dcpic
-depend Package/dottex
-depend Package/dratex
-depend Package/eepic
-depend Package/gnuplottex
-depend Package/miniplot
-depend Package/pb-diagram
-depend Package/petri-nets
-depend Package/pgf
-depend Package/picinpar
-depend Package/pict2e
-depend Package/pictex
-depend Package/pictex2
-depend Package/pmgraph
-depend Package/randbild
-depend Package/swimgraf
-depend Package/texdraw
-depend Package/xypic
-depend TLCore/collection-basic
+depend bardiag
+depend curve
+depend curve2e
+depend curves
+depend dcpic
+depend dottex
+depend dratex
+depend eepic
+depend gnuplottex
+depend miniplot
+depend pb-diagram
+depend petri-nets
+depend pgf
+depend picinpar
+depend pict2e
+depend pictex
+depend pictex2
+depend pmgraph
+depend randbild
+depend swimgraf
+depend texdraw
+depend xypic
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
index 09513c0e7bf..2f6f588b6ca 100644
--- a/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
@@ -2,16 +2,16 @@ name collection-plainextra
category Collection
shortdesc Plain TeX supplementary packages
longdesc A collection of add-on packages and macros for plain TeX.
-depend Package/cellular
-depend Package/colortab
-depend Package/fixpdfmag
-depend Package/fontch
-depend Package/hyplain
-depend Package/jsmisc
-depend Package/mkpattern
-depend Package/newsletr
-depend Package/plgraph
-depend Package/treetex
-depend Package/typespec
-depend Package/vertex
-depend TLCore/collection-basic
+depend cellular
+depend colortab
+depend fixpdfmag
+depend fontch
+depend hyplain
+depend jsmisc
+depend mkpattern
+depend newsletr
+depend plgraph
+depend treetex
+depend typespec
+depend vertex
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
index 9680a4e54a2..6d0400061cc 100644
--- a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
@@ -2,47 +2,47 @@ name collection-pstricks
category Collection
shortdesc PSTricks packages
longdesc Additional PSTricks packages
-depend Package/auto-pst-pdf
-depend Package/makeplot
-depend Package/pdftricks
-depend Package/pst-2dplot
-depend Package/pst-3d
-depend Package/pst-3dplot
-depend Package/pst-bar
-depend Package/pst-barcode
-depend Package/pst-blur
-depend Package/pst-circ
-depend Package/pst-coil
-depend Package/pst-dbicons
-depend Package/pst-diffraction
-depend Package/pst-eps
-depend Package/pst-eucl
-depend Package/pst-fill
-depend Package/pst-fr3d
-depend Package/pst-fractal
-depend Package/pst-func
-depend Package/pst-geo
-depend Package/pst-ghsb
-depend Package/pst-gr3d
-depend Package/pst-grad
-depend Package/pst-infixplot
-depend Package/pst-jtree
-depend Package/pst-labo
-depend Package/pst-lens
-depend Package/pst-light3d
-depend Package/pst-math
-depend Package/pst-optexp
-depend Package/pst-optic
-depend Package/pst-osci
-depend Package/pst-pdgr
-depend Package/pst-poly
-depend Package/pst-qtree
-depend Package/pst-slpe
-depend Package/pst-soroban
-depend Package/pst-text
-depend Package/pst-uml
-depend Package/pst-vue3d
-depend Package/pstricks
-depend Package/pstricks-add
-depend Package/uml
-depend TLCore/collection-basic
+depend auto-pst-pdf
+depend makeplot
+depend pdftricks
+depend pst-2dplot
+depend pst-3d
+depend pst-3dplot
+depend pst-bar
+depend pst-barcode
+depend pst-blur
+depend pst-circ
+depend pst-coil
+depend pst-dbicons
+depend pst-diffraction
+depend pst-eps
+depend pst-eucl
+depend pst-fill
+depend pst-fr3d
+depend pst-fractal
+depend pst-func
+depend pst-geo
+depend pst-ghsb
+depend pst-gr3d
+depend pst-grad
+depend pst-infixplot
+depend pst-jtree
+depend pst-labo
+depend pst-lens
+depend pst-light3d
+depend pst-math
+depend pst-optexp
+depend pst-optic
+depend pst-osci
+depend pst-pdgr
+depend pst-poly
+depend pst-qtree
+depend pst-slpe
+depend pst-soroban
+depend pst-text
+depend pst-uml
+depend pst-vue3d
+depend pstricks
+depend pstricks-add
+depend uml
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-psutils.tlpsrc b/Master/tlpkg/tlpsrc/collection-psutils.tlpsrc
index 9394d51e095..a5aa57b5be3 100644
--- a/Master/tlpkg/tlpsrc/collection-psutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-psutils.tlpsrc
@@ -2,10 +2,10 @@ name collection-psutils
category Collection
shortdesc PostScript and Truetype utilities
longdesc Utilities to manipulate TrueType and PostScript files
-depend Package/dvipsconfig
-depend TLCore/bin-getafm
-depend TLCore/bin-lcdftypetools
-depend TLCore/bin-pstools
-depend TLCore/bin-psutils
-depend TLCore/bin-t1utils
-depend TLCore/bin-ttf2pt1
+depend dvipsconfig
+depend bin-getafm
+depend bin-lcdftypetools
+depend bin-pstools
+depend bin-psutils
+depend bin-t1utils
+depend bin-ttf2pt1
diff --git a/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc b/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
index f2c37153a99..8268f3c52f4 100644
--- a/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
@@ -2,58 +2,58 @@ name collection-publishers
category Collection
shortdesc Support for publishers
longdesc Essential publishers
-depend Package/IEEEconf
-depend Package/IEEEtran
-depend Package/aastex
-depend Package/acmconf
-depend Package/acmtrans
-depend Package/active-conf
-depend Package/aguplus
-depend Package/aiaa
-depend Package/ametsoc
-depend Package/apa
-depend Package/asaetr
-depend Package/ascelike
-depend Package/chem-journal
-depend Package/classicthesis
-depend Package/ebsthesis
-depend Package/economic
-depend Package/elsevier
-depend Package/gatech-thesis
-depend Package/icsv
-depend Package/ieeepes
-depend Package/ifacmtg
-depend Package/ijmart
-depend Package/imac
-depend Package/jhep
-depend Package/jpsj
-depend Package/kluwer
-depend Package/mentis
-depend Package/mnras
-depend Package/muthesis
-depend Package/nature
-depend Package/nih
-depend Package/nrc
-depend Package/philosophersimprint
-depend Package/pracjourn
-depend Package/procIAGssymp
-depend Package/ptptex
-depend Package/revtex
-depend Package/sae
-depend Package/siggraph
-depend Package/spie
-depend Package/stellenbosch
-depend Package/sugconf
-depend Package/thesis-titlepage-fhac
-depend Package/toptesi
-depend Package/tugboat
-depend Package/tugboat-plain
-depend Package/uaclasses
-depend Package/ucthesis
-depend Package/uiucthesis
-depend Package/umthesis
-depend Package/umich-thesis
-depend Package/uwthesis
-depend Package/vancouver
-depend Package/york-thesis
-depend TLCore/collection-latex
+depend IEEEconf
+depend IEEEtran
+depend aastex
+depend acmconf
+depend acmtrans
+depend active-conf
+depend aguplus
+depend aiaa
+depend ametsoc
+depend apa
+depend asaetr
+depend ascelike
+depend chem-journal
+depend classicthesis
+depend ebsthesis
+depend economic
+depend elsevier
+depend gatech-thesis
+depend icsv
+depend ieeepes
+depend ifacmtg
+depend ijmart
+depend imac
+depend jhep
+depend jpsj
+depend kluwer
+depend mentis
+depend mnras
+depend muthesis
+depend nature
+depend nih
+depend nrc
+depend philosophersimprint
+depend pracjourn
+depend procIAGssymp
+depend ptptex
+depend revtex
+depend sae
+depend siggraph
+depend spie
+depend stellenbosch
+depend sugconf
+depend thesis-titlepage-fhac
+depend toptesi
+depend tugboat
+depend tugboat-plain
+depend uaclasses
+depend ucthesis
+depend uiucthesis
+depend umthesis
+depend umich-thesis
+depend uwthesis
+depend vancouver
+depend york-thesis
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-science.tlpsrc b/Master/tlpkg/tlpsrc/collection-science.tlpsrc
index 54507c0e2c0..188dbde6f40 100644
--- a/Master/tlpkg/tlpsrc/collection-science.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-science.tlpsrc
@@ -2,46 +2,46 @@ name collection-science
category Collection
shortdesc Typesetting for natural and computer sciences
longdesc Typesetting for natural and computer sciences
-depend Package/SIstyle
-depend Package/SIunits
-depend Package/alg
-depend Package/algorithm2e
-depend Package/algorithmicx
-depend Package/algorithms
-depend Package/biocon
-depend Package/bitfield
-depend Package/bpchem
-depend Package/bytefield
-depend Package/chemarrow
-depend Package/chemcompounds
-depend Package/chemcono
-depend Package/chemscheme
-depend Package/chemstyle
-depend Package/clrscode
-depend Package/complexity
-depend Package/computational-complexity
-depend Package/digiconfigs
-depend Package/dyntree
-depend Package/formula
-depend Package/functan
-depend Package/galois
-depend Package/gastex
-depend Package/hepparticles
-depend Package/hepthesis
-depend Package/hepunits
-depend Package/karnaugh
-depend Package/mhchem
-depend Package/mhs
-depend Package/miller
-depend Package/newalg
-depend Package/objectz
-depend Package/pseudocode
-depend Package/scientificpaper
-depend Package/sciposter
-depend Package/sfg
-depend Package/struktex
-depend Package/t-angles
-depend Package/textopo
-depend Package/unitsdef
-depend Package/youngtab
-depend TLCore/collection-latex
+depend SIstyle
+depend SIunits
+depend alg
+depend algorithm2e
+depend algorithmicx
+depend algorithms
+depend biocon
+depend bitfield
+depend bpchem
+depend bytefield
+depend chemarrow
+depend chemcompounds
+depend chemcono
+depend chemscheme
+depend chemstyle
+depend clrscode
+depend complexity
+depend computational-complexity
+depend digiconfigs
+depend dyntree
+depend formula
+depend functan
+depend galois
+depend gastex
+depend hepparticles
+depend hepthesis
+depend hepunits
+depend karnaugh
+depend mhchem
+depend mhs
+depend miller
+depend newalg
+depend objectz
+depend pseudocode
+depend scientificpaper
+depend sciposter
+depend sfg
+depend struktex
+depend t-angles
+depend textopo
+depend unitsdef
+depend youngtab
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc b/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
index 704113ea933..3dbf191f2db 100644
--- a/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
@@ -2,6 +2,6 @@ name collection-texinfo
category Collection
shortdesc GNU Texinfo
longdesc Programs and macros for the GNU Texinfo documentation system.
-depend Package/texinfo
-depend TLCore/bin-texinfo
-depend TLCore/collection-basic
+depend texinfo
+depend bin-texinfo
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-ttfutils.tlpsrc b/Master/tlpkg/tlpsrc/collection-ttfutils.tlpsrc
index e9671920ffc..4fab686e2ee 100644
--- a/Master/tlpkg/tlpsrc/collection-ttfutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-ttfutils.tlpsrc
@@ -2,4 +2,4 @@ name collection-ttfutils
category Collection
shortdesc TrueType font manipulation
longdesc Utilities to manipulate TrueType fonts
-depend TLCore/bin-ttfutils
+depend bin-ttfutils
diff --git a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
index 29774880d0e..a29df0d7d23 100644
--- a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
@@ -3,6 +3,6 @@ category Collection
shortdesc Win32 support programs
longdesc Additional usefull programs for Windows: bzip2, gzip, jpeg2ps,
longdesc tiff2png.
-depend TLCore/bin-tifftools
-depend TLCore/bin-winutils
-depend TLCore/collection-perl
+depend bin-tifftools
+depend bin-winutils
+depend collection-perl
diff --git a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
index f6251902c37..878ccf4e437 100644
--- a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
@@ -2,15 +2,15 @@ name collection-xetex
category Collection
shortdesc XeTeX macros
longdesc Macro files for XeTeX, Unicode-enabled TeX by Jonathan Kew.
-depend Package/arabxetex
-depend Package/euenc
-depend Package/fontspec
-depend Package/ifxetex
-depend Package/philokalia
-depend Package/xetex
-depend Package/xetexconfig
-depend Package/xetexurl
-depend Package/xltxtra
-depend Package/xunicode
-depend TLCore/bin-xetex
-depend TLCore/collection-basic
+depend arabxetex
+depend euenc
+depend fontspec
+depend ifxetex
+depend philokalia
+depend xetex
+depend xetexconfig
+depend xetexurl
+depend xltxtra
+depend xunicode
+depend bin-xetex
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc
index 0ce83ba5348..85fcd1fd10e 100644
--- a/Master/tlpkg/tlpsrc/eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc
@@ -1,3 +1,3 @@
name eplain
category Package
-depend TLCore/bin-eplain
+depend bin-eplain
diff --git a/Master/tlpkg/tlpsrc/esint-type1.tlpsrc b/Master/tlpkg/tlpsrc/esint-type1.tlpsrc
index a602ea6b28d..4b8b4447e9d 100644
--- a/Master/tlpkg/tlpsrc/esint-type1.tlpsrc
+++ b/Master/tlpkg/tlpsrc/esint-type1.tlpsrc
@@ -1,3 +1,3 @@
name esint-type1
category Package
-depend Package/esint
+depend esint
diff --git a/Master/tlpkg/tlpsrc/garuda.tlpsrc b/Master/tlpkg/tlpsrc/garuda.tlpsrc
index ef84b8acfa9..3273c49eb10 100644
--- a/Master/tlpkg/tlpsrc/garuda.tlpsrc
+++ b/Master/tlpkg/tlpsrc/garuda.tlpsrc
@@ -1,4 +1,4 @@
name garuda
category Package
-depend Package/c90enc
+depend c90enc
execute addMap garuda.map
diff --git a/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc
index 2f20ca5f53d..f85769ce62d 100644
--- a/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc
@@ -1,5 +1,5 @@
name hyphen-russian
category TLCore
-depend Package/ruhyphen
+depend ruhyphen
execute BuildLanguageDat ru
runpattern f texmf/tex/generic/config/language.ru.dat
diff --git a/Master/tlpkg/tlpsrc/mex.tlpsrc b/Master/tlpkg/tlpsrc/mex.tlpsrc
index f6f667c3c36..f92b4dc82a0 100644
--- a/Master/tlpkg/tlpsrc/mex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mex.tlpsrc
@@ -1,6 +1,6 @@
name mex
category Package
-depend Package/pl
-depend TLCore/hyphen-polish
+depend pl
+depend hyphen-polish
runpattern +!d texmf-dist/tex/mex/utf8mex
docpattern +!d texmf-dist/doc/mex/utf8mex
diff --git a/Master/tlpkg/tlpsrc/norasi.tlpsrc b/Master/tlpkg/tlpsrc/norasi.tlpsrc
index e6ea0fe83fc..b5e7bda53ef 100644
--- a/Master/tlpkg/tlpsrc/norasi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/norasi.tlpsrc
@@ -1,4 +1,4 @@
name norasi
category Package
-depend Package/c90enc
+depend c90enc
execute addMap norasi.map
diff --git a/Master/tlpkg/tlpsrc/pdfpages.tlpsrc b/Master/tlpkg/tlpsrc/pdfpages.tlpsrc
index b17be2a0846..909f0e55401 100644
--- a/Master/tlpkg/tlpsrc/pdfpages.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdfpages.tlpsrc
@@ -1,3 +1,3 @@
name pdfpages
category Package
-depend Package/eso-pic
+depend eso-pic
diff --git a/Master/tlpkg/tlpsrc/polski.tlpsrc b/Master/tlpkg/tlpsrc/polski.tlpsrc
index a9567aee548..8e199770c9e 100644
--- a/Master/tlpkg/tlpsrc/polski.tlpsrc
+++ b/Master/tlpkg/tlpsrc/polski.tlpsrc
@@ -1,4 +1,4 @@
name polski
category Package
-depend Package/pl
-depend TLCore/hyphen-polish
+depend pl
+depend hyphen-polish
diff --git a/Master/tlpkg/tlpsrc/pst-uml.tlpsrc b/Master/tlpkg/tlpsrc/pst-uml.tlpsrc
index 3bafa30877f..e40565d09dd 100644
--- a/Master/tlpkg/tlpsrc/pst-uml.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pst-uml.tlpsrc
@@ -1,3 +1,3 @@
name pst-uml
category Package
-depend Package/multido
+depend multido
diff --git a/Master/tlpkg/tlpsrc/scheme-basic.tlpsrc b/Master/tlpkg/tlpsrc/scheme-basic.tlpsrc
index febe6f063dd..690427c2da9 100644
--- a/Master/tlpkg/tlpsrc/scheme-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-basic.tlpsrc
@@ -4,5 +4,5 @@ shortdesc TeX Live basic scheme
longdesc This is the basic TeX Live scheme: it is a small set of files
longdesc sufficient to typeset plain TeX or LaTeX documents in PostScript
longdesc or PDF.
-depend TLCore/collection-basic
-depend TLCore/collection-latex
+depend collection-basic
+depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/scheme-context.tlpsrc b/Master/tlpkg/tlpsrc/scheme-context.tlpsrc
index d10ab814ee7..f4eec0d4ec7 100644
--- a/Master/tlpkg/tlpsrc/scheme-context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-context.tlpsrc
@@ -3,6 +3,6 @@ category Scheme
shortdesc TeX Live scheme for ConTeXt
longdesc This is the ConTeXt TeX Live scheme: it is a small set of files
longdesc sufficient to typeset ConTeXt documents in PostScript or PDF.
-depend TLCore/collection-context
-depend TLCore/collection-metapost
-depend TLCore/collection-xetex
+depend collection-context
+depend collection-metapost
+depend collection-xetex
diff --git a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
index aafd777fe28..d51358a2fac 100644
--- a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
@@ -3,85 +3,85 @@ category Scheme
shortdesc TeX Live full scheme
longdesc This is the full TeX Live collection: it holds all the files
longdesc available.
-depend TLCore/collection-basic
-depend TLCore/collection-bibtexextra
-depend TLCore/collection-binextra
-depend TLCore/collection-context
-depend TLCore/collection-documentation-base
-depend TLCore/collection-documentation-bulgarian
-depend TLCore/collection-documentation-chinese
-depend TLCore/collection-documentation-czechslovak
-depend TLCore/collection-documentation-dutch
-depend TLCore/collection-documentation-english
-depend TLCore/collection-documentation-finnish
-depend TLCore/collection-documentation-french
-depend TLCore/collection-documentation-german
-depend TLCore/collection-documentation-greek
-depend TLCore/collection-documentation-italian
-depend TLCore/collection-documentation-japanese
-depend TLCore/collection-documentation-korean
-depend TLCore/collection-documentation-mongolian
-depend TLCore/collection-documentation-polish
-depend TLCore/collection-documentation-portuguese
-depend TLCore/collection-documentation-russian
-depend TLCore/collection-documentation-spanish
-depend TLCore/collection-documentation-thai
-depend TLCore/collection-documentation-turkish
-depend TLCore/collection-documentation-ukrainian
-depend TLCore/collection-documentation-vietnamese
-depend TLCore/collection-fontbin
-depend TLCore/collection-fontsextra
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-formatsextra
-depend TLCore/collection-games
-depend TLCore/collection-genericextra
-depend TLCore/collection-genericrecommended
-depend TLCore/collection-graphicstools
-depend TLCore/collection-htmlxml
-depend TLCore/collection-humanities
-depend TLCore/collection-langafrican
-depend TLCore/collection-langarab
-depend TLCore/collection-langarmenian
-depend TLCore/collection-langcjk
-depend TLCore/collection-langcroatian
-depend TLCore/collection-langcyrillic
-depend TLCore/collection-langczechslovak
-depend TLCore/collection-langdanish
-depend TLCore/collection-langdutch
-depend TLCore/collection-langfinnish
-depend TLCore/collection-langfrench
-depend TLCore/collection-langgerman
-depend TLCore/collection-langgreek
-depend TLCore/collection-langhebrew
-depend TLCore/collection-langhungarian
-depend TLCore/collection-langindic
-depend TLCore/collection-langitalian
-depend TLCore/collection-langlatin
-depend TLCore/collection-langmanju
-depend TLCore/collection-langmongolian
-depend TLCore/collection-langnorwegian
-depend TLCore/collection-langother
-depend TLCore/collection-langpolish
-depend TLCore/collection-langportuguese
-depend TLCore/collection-langspanish
-depend TLCore/collection-langswedish
-depend TLCore/collection-langtibetan
-depend TLCore/collection-langukenglish
-depend TLCore/collection-langvietnamese
-depend TLCore/collection-latex
-depend TLCore/collection-latex3
-depend TLCore/collection-latexextra
-depend TLCore/collection-latexrecommended
-depend TLCore/collection-mathextra
-depend TLCore/collection-metapost
-depend TLCore/collection-music
-depend TLCore/collection-omega
-depend TLCore/collection-pictures
-depend TLCore/collection-plainextra
-depend TLCore/collection-pstricks
-depend TLCore/collection-psutils
-depend TLCore/collection-publishers
-depend TLCore/collection-science
-depend TLCore/collection-texinfo
-depend TLCore/collection-ttfutils
-depend TLCore/collection-xetex
+depend collection-basic
+depend collection-bibtexextra
+depend collection-binextra
+depend collection-context
+depend collection-documentation-base
+depend collection-documentation-bulgarian
+depend collection-documentation-chinese
+depend collection-documentation-czechslovak
+depend collection-documentation-dutch
+depend collection-documentation-english
+depend collection-documentation-finnish
+depend collection-documentation-french
+depend collection-documentation-german
+depend collection-documentation-greek
+depend collection-documentation-italian
+depend collection-documentation-japanese
+depend collection-documentation-korean
+depend collection-documentation-mongolian
+depend collection-documentation-polish
+depend collection-documentation-portuguese
+depend collection-documentation-russian
+depend collection-documentation-spanish
+depend collection-documentation-thai
+depend collection-documentation-turkish
+depend collection-documentation-ukrainian
+depend collection-documentation-vietnamese
+depend collection-fontbin
+depend collection-fontsextra
+depend collection-fontsrecommended
+depend collection-formatsextra
+depend collection-games
+depend collection-genericextra
+depend collection-genericrecommended
+depend collection-graphicstools
+depend collection-htmlxml
+depend collection-humanities
+depend collection-langafrican
+depend collection-langarab
+depend collection-langarmenian
+depend collection-langcjk
+depend collection-langcroatian
+depend collection-langcyrillic
+depend collection-langczechslovak
+depend collection-langdanish
+depend collection-langdutch
+depend collection-langfinnish
+depend collection-langfrench
+depend collection-langgerman
+depend collection-langgreek
+depend collection-langhebrew
+depend collection-langhungarian
+depend collection-langindic
+depend collection-langitalian
+depend collection-langlatin
+depend collection-langmanju
+depend collection-langmongolian
+depend collection-langnorwegian
+depend collection-langother
+depend collection-langpolish
+depend collection-langportuguese
+depend collection-langspanish
+depend collection-langswedish
+depend collection-langtibetan
+depend collection-langukenglish
+depend collection-langvietnamese
+depend collection-latex
+depend collection-latex3
+depend collection-latexextra
+depend collection-latexrecommended
+depend collection-mathextra
+depend collection-metapost
+depend collection-music
+depend collection-omega
+depend collection-pictures
+depend collection-plainextra
+depend collection-pstricks
+depend collection-psutils
+depend collection-publishers
+depend collection-science
+depend collection-texinfo
+depend collection-ttfutils
+depend collection-xetex
diff --git a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
index e60cf7458b1..efcf08632cc 100644
--- a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
@@ -4,37 +4,37 @@ shortdesc GUST TeX Live scheme
longdesc This is the GUST TeX Live scheme: it is a set of files sufficient
longdesc to typeset Polish plain TeX, LaTeX and ConTeXt documents in
longdesc PostScript or PDF.
-depend Documentation/FAQ-en
-depend Documentation/Type1fonts
-depend Documentation/amslatex-primer
-depend Documentation/comprehensive
-depend Documentation/firststeps
-depend Documentation/impatient
-depend Documentation/metafont-for-beginners
-depend Documentation/metafp
-depend Documentation/metapost-examples
-depend Documentation/pstricks-tutorial
-depend Documentation/tds
-depend Package/amstex
-depend Package/comment
-depend Package/concrete
-depend Package/seminar
-depend Package/tex4ht
-depend TLCore/bin-amstex
-depend TLCore/bin-bibtex8
-depend TLCore/bin-dvidvi
-depend TLCore/bin-dviljk
-depend TLCore/bin-seetexk
-depend TLCore/bin-tex4htk
-depend TLCore/bin-texdoc
-depend TLCore/collection-basic
-depend TLCore/collection-context
-depend TLCore/collection-documentation-polish
-depend TLCore/collection-fontbin
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-langpolish
-depend TLCore/collection-latex
-depend TLCore/collection-latexrecommended
-depend TLCore/collection-metapost
-depend TLCore/collection-psutils
-depend TLCore/collection-xetex
+depend FAQ-en
+depend Type1fonts
+depend amslatex-primer
+depend comprehensive
+depend firststeps
+depend impatient
+depend metafont-for-beginners
+depend metafp
+depend metapost-examples
+depend pstricks-tutorial
+depend tds
+depend amstex
+depend comment
+depend concrete
+depend seminar
+depend tex4ht
+depend bin-amstex
+depend bin-bibtex8
+depend bin-dvidvi
+depend bin-dviljk
+depend bin-seetexk
+depend bin-tex4htk
+depend bin-texdoc
+depend collection-basic
+depend collection-context
+depend collection-documentation-polish
+depend collection-fontbin
+depend collection-fontsrecommended
+depend collection-langpolish
+depend collection-latex
+depend collection-latexrecommended
+depend collection-metapost
+depend collection-psutils
+depend collection-xetex
diff --git a/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc
index 8393e3330b9..2f7822e229b 100644
--- a/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc
@@ -4,27 +4,27 @@ shortdesc GUTenberg TeX Live scheme
longdesc This is the GUTenberg TeX Live scheme: it is a small set of files
longdesc sufficient to typeset plain TeX or LaTeX documents in PostScript
longdesc or PDF, specifically for French-speaking users.
-depend TLCore/collection-basic
-depend TLCore/collection-bibtexextra
-depend TLCore/collection-binextra
-depend TLCore/collection-context
-depend TLCore/collection-documentation-english
-depend TLCore/collection-documentation-french
-depend TLCore/collection-fontbin
-depend TLCore/collection-fontsextra
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-genericextra
-depend TLCore/collection-htmlxml
-depend TLCore/collection-langfrench
-depend TLCore/collection-langgerman
-depend TLCore/collection-latex
-depend TLCore/collection-latexextra
-depend TLCore/collection-latexrecommended
-depend TLCore/collection-mathextra
-depend TLCore/collection-metapost
-depend TLCore/collection-pictures
-depend TLCore/collection-plainextra
-depend TLCore/collection-pstricks
-depend TLCore/collection-psutils
-depend TLCore/collection-texinfo
+depend collection-basic
+depend collection-bibtexextra
+depend collection-binextra
+depend collection-context
+depend collection-documentation-english
+depend collection-documentation-french
+depend collection-fontbin
+depend collection-fontsextra
+depend collection-fontsrecommended
+depend collection-fontsrecommended
+depend collection-genericextra
+depend collection-htmlxml
+depend collection-langfrench
+depend collection-langgerman
+depend collection-latex
+depend collection-latexextra
+depend collection-latexrecommended
+depend collection-mathextra
+depend collection-metapost
+depend collection-pictures
+depend collection-plainextra
+depend collection-pstricks
+depend collection-psutils
+depend collection-texinfo
diff --git a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
index 9077a0e32c4..1404ad25d5f 100644
--- a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
@@ -4,24 +4,24 @@ shortdesc TeX Live medium scheme
longdesc This is the medium TeX Live collection: it holds a sufficient set
longdesc of files for a usable installation, but omits many additional
longdesc packages.
-depend TLCore/collection-basic
-depend TLCore/collection-binextra
-depend TLCore/collection-context
-depend TLCore/collection-documentation-english
-depend TLCore/collection-fontbin
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-langczechslovak
-depend TLCore/collection-langdutch
-depend TLCore/collection-langfrench
-depend TLCore/collection-langgerman
-depend TLCore/collection-langitalian
-depend TLCore/collection-langpolish
-depend TLCore/collection-langportuguese
-depend TLCore/collection-langspanish
-depend TLCore/collection-langukenglish
-depend TLCore/collection-latex
-depend TLCore/collection-latexrecommended
-depend TLCore/collection-mathextra
-depend TLCore/collection-metapost
-depend TLCore/collection-texinfo
-depend TLCore/collection-xetex
+depend collection-basic
+depend collection-binextra
+depend collection-context
+depend collection-documentation-english
+depend collection-fontbin
+depend collection-fontsrecommended
+depend collection-langczechslovak
+depend collection-langdutch
+depend collection-langfrench
+depend collection-langgerman
+depend collection-langitalian
+depend collection-langpolish
+depend collection-langportuguese
+depend collection-langspanish
+depend collection-langukenglish
+depend collection-latex
+depend collection-latexrecommended
+depend collection-mathextra
+depend collection-metapost
+depend collection-texinfo
+depend collection-xetex
diff --git a/Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc b/Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc
index ea52467a6e5..460340f448e 100644
--- a/Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc
@@ -3,4 +3,4 @@ category Scheme
shortdesc TeX Live minimal scheme
longdesc This is the minimal TeX Live scheme, with support for only plain
longdesc TeX. (No LaTeX macros.)
-depend TLCore/collection-basic
+depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc b/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc
index 35ea71652eb..f8405ad13cc 100644
--- a/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc
@@ -3,38 +3,38 @@ category Scheme
shortdesc TeX Live for Omega users
longdesc This is a collection for people working only with Omega and
longdesc relatives on multilingual scripts.
-depend TLCore/collection-basic
-depend TLCore/collection-binextra
-depend TLCore/collection-documentation-english
-depend TLCore/collection-fontbin
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-langafrican
-depend TLCore/collection-langarmenian
-depend TLCore/collection-langcjk
-depend TLCore/collection-langcroatian
-depend TLCore/collection-langcyrillic
-depend TLCore/collection-langczechslovak
-depend TLCore/collection-langdanish
-depend TLCore/collection-langdutch
-depend TLCore/collection-langfinnish
-depend TLCore/collection-langfrench
-depend TLCore/collection-langgerman
-depend TLCore/collection-langgreek
-depend TLCore/collection-langhungarian
-depend TLCore/collection-langindic
-depend TLCore/collection-langitalian
-depend TLCore/collection-langlatin
-depend TLCore/collection-langmanju
-depend TLCore/collection-langmongolian
-depend TLCore/collection-langnorwegian
-depend TLCore/collection-langother
-depend TLCore/collection-langpolish
-depend TLCore/collection-langportuguese
-depend TLCore/collection-langspanish
-depend TLCore/collection-langswedish
-depend TLCore/collection-langtibetan
-depend TLCore/collection-langukenglish
-depend TLCore/collection-langvietnamese
-depend TLCore/collection-latex
-depend TLCore/collection-omega
-depend TLCore/collection-texinfo
+depend collection-basic
+depend collection-binextra
+depend collection-documentation-english
+depend collection-fontbin
+depend collection-fontsrecommended
+depend collection-langafrican
+depend collection-langarmenian
+depend collection-langcjk
+depend collection-langcroatian
+depend collection-langcyrillic
+depend collection-langczechslovak
+depend collection-langdanish
+depend collection-langdutch
+depend collection-langfinnish
+depend collection-langfrench
+depend collection-langgerman
+depend collection-langgreek
+depend collection-langhungarian
+depend collection-langindic
+depend collection-langitalian
+depend collection-langlatin
+depend collection-langmanju
+depend collection-langmongolian
+depend collection-langnorwegian
+depend collection-langother
+depend collection-langpolish
+depend collection-langportuguese
+depend collection-langspanish
+depend collection-langswedish
+depend collection-langtibetan
+depend collection-langukenglish
+depend collection-langvietnamese
+depend collection-latex
+depend collection-omega
+depend collection-texinfo
diff --git a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
index 1149e533282..0567a266540 100644
--- a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
@@ -3,75 +3,75 @@ category Scheme
shortdesc teTeX scheme
longdesc TeX Live scheme nearly equivalent to the teTeX distribution that
longdesc was maintained by Thomas Esser.
-depend Documentation/FAQ-en
-depend Documentation/amslatex-primer
-depend Documentation/firststeps
-depend Documentation/gentle
-depend Documentation/help
-depend Documentation/lshort-english
-depend Documentation/mathmode
-depend Documentation/pstricks-tutorial
-depend Documentation/tamethebeast
-depend Documentation/tds
-depend Documentation/tex-refs
-depend Package/bbm
-depend Package/bbm-macros
-depend Package/bbold
-depend Package/cmbright
-depend Package/cweb
-depend Package/eplain
-depend Package/eulervm
-depend Package/mkind-english
-depend Package/mltex
-depend Package/rsfs
-depend TLCore/bin-bibtex8
-depend TLCore/bin-ctie
-depend TLCore/bin-cweb
-depend TLCore/bin-detex
-depend TLCore/bin-dtl
-depend TLCore/bin-dvi2tty
-depend TLCore/bin-dvicopy
-depend TLCore/bin-dvidvi
-depend TLCore/bin-dviljk
-depend TLCore/bin-eplain
-depend TLCore/bin-mltex
-depend TLCore/bin-patgen
-depend TLCore/bin-seetexk
-depend TLCore/bin-tie
-depend TLCore/bin-web
-depend TLCore/collection-basic
-depend TLCore/collection-context
-depend TLCore/collection-documentation-base
-depend TLCore/collection-fontbin
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-genericrecommended
-depend TLCore/collection-langcjk
-depend TLCore/collection-langcroatian
-depend TLCore/collection-langcyrillic
-depend TLCore/collection-langczechslovak
-depend TLCore/collection-langdanish
-depend TLCore/collection-langdutch
-depend TLCore/collection-langfinnish
-depend TLCore/collection-langfrench
-depend TLCore/collection-langgerman
-depend TLCore/collection-langgreek
-depend TLCore/collection-langhungarian
-depend TLCore/collection-langitalian
-depend TLCore/collection-langlatin
-depend TLCore/collection-langmongolian
-depend TLCore/collection-langnorwegian
-depend TLCore/collection-langother
-depend TLCore/collection-langpolish
-depend TLCore/collection-langportuguese
-depend TLCore/collection-langspanish
-depend TLCore/collection-langswedish
-depend TLCore/collection-langukenglish
-depend TLCore/collection-langvietnamese
-depend TLCore/collection-latex
-depend TLCore/collection-latexrecommended
-depend TLCore/collection-mathextra
-depend TLCore/collection-metapost
-depend TLCore/collection-omega
-depend TLCore/collection-pictures
-depend TLCore/collection-pstricks
-depend TLCore/collection-texinfo
+depend FAQ-en
+depend amslatex-primer
+depend firststeps
+depend gentle
+depend help
+depend lshort-english
+depend mathmode
+depend pstricks-tutorial
+depend tamethebeast
+depend tds
+depend tex-refs
+depend bbm
+depend bbm-macros
+depend bbold
+depend cmbright
+depend cweb
+depend eplain
+depend eulervm
+depend mkind-english
+depend mltex
+depend rsfs
+depend bin-bibtex8
+depend bin-ctie
+depend bin-cweb
+depend bin-detex
+depend bin-dtl
+depend bin-dvi2tty
+depend bin-dvicopy
+depend bin-dvidvi
+depend bin-dviljk
+depend bin-eplain
+depend bin-mltex
+depend bin-patgen
+depend bin-seetexk
+depend bin-tie
+depend bin-web
+depend collection-basic
+depend collection-context
+depend collection-documentation-base
+depend collection-fontbin
+depend collection-fontsrecommended
+depend collection-genericrecommended
+depend collection-langcjk
+depend collection-langcroatian
+depend collection-langcyrillic
+depend collection-langczechslovak
+depend collection-langdanish
+depend collection-langdutch
+depend collection-langfinnish
+depend collection-langfrench
+depend collection-langgerman
+depend collection-langgreek
+depend collection-langhungarian
+depend collection-langitalian
+depend collection-langlatin
+depend collection-langmongolian
+depend collection-langnorwegian
+depend collection-langother
+depend collection-langpolish
+depend collection-langportuguese
+depend collection-langspanish
+depend collection-langswedish
+depend collection-langukenglish
+depend collection-langvietnamese
+depend collection-latex
+depend collection-latexrecommended
+depend collection-mathextra
+depend collection-metapost
+depend collection-omega
+depend collection-pictures
+depend collection-pstricks
+depend collection-texinfo
diff --git a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc b/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
index 1a0666d2bde..4cb1f20eaf8 100644
--- a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
@@ -3,27 +3,27 @@ category Scheme
shortdesc XML typesetting scheme
longdesc This contains the things you need to do XML-related work,
longdesc including PassiveTeX, Jadetex, Context and Omega
-depend Package/context
-depend Package/jadetex
-depend Package/ltxmisc
-depend Package/marvosym
-depend Package/marvosym
-depend Package/metapost
-depend Package/passivetex
-depend Package/rotating
-depend Package/stmaryrd
-depend Package/tex4ht
-depend Package/tipa
-depend Package/ucs
-depend Package/wasy
-depend Package/wasysym
-depend Package/xmltex
-depend TLCore/bin-context
-depend TLCore/bin-jadetex
-depend TLCore/bin-metapost
-depend TLCore/bin-tex4htk
-depend TLCore/bin-xmltex
-depend TLCore/collection-basic
-depend TLCore/collection-fontsrecommended
-depend TLCore/collection-latex
-depend TLCore/collection-omega
+depend context
+depend jadetex
+depend ltxmisc
+depend marvosym
+depend marvosym
+depend metapost
+depend passivetex
+depend rotating
+depend stmaryrd
+depend tex4ht
+depend tipa
+depend ucs
+depend wasy
+depend wasysym
+depend xmltex
+depend bin-context
+depend bin-jadetex
+depend bin-metapost
+depend bin-tex4htk
+depend bin-xmltex
+depend collection-basic
+depend collection-fontsrecommended
+depend collection-latex
+depend collection-omega
diff --git a/Master/tlpkg/tlpsrc/texpower.tlpsrc b/Master/tlpkg/tlpsrc/texpower.tlpsrc
index ac89a6ac7f7..bca2d7caae7 100644
--- a/Master/tlpkg/tlpsrc/texpower.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texpower.tlpsrc
@@ -1,3 +1,3 @@
name texpower
category Package
-depend Package/tpslifonts
+depend tpslifonts
diff --git a/Master/tlpkg/tlpsrc/vntex.tlpsrc b/Master/tlpkg/tlpsrc/vntex.tlpsrc
index 934ad52276f..48a6d43ba16 100644
--- a/Master/tlpkg/tlpsrc/vntex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/vntex.tlpsrc
@@ -1,6 +1,6 @@
name vntex
category Package
-depend Package/plnfss
+depend plnfss
execute addMap arevvn.map
execute addMap chartervn.map
execute addMap cmbrightvn.map
diff --git a/Master/tlpkg/tlpsrc/vpe.tlpsrc b/Master/tlpkg/tlpsrc/vpe.tlpsrc
index 06e2fbec30e..19a5c215206 100644
--- a/Master/tlpkg/tlpsrc/vpe.tlpsrc
+++ b/Master/tlpkg/tlpsrc/vpe.tlpsrc
@@ -1,3 +1,3 @@
name vpe
category Package
-depend TLCore/bin-vpe
+depend bin-vpe
diff --git a/Master/tlpkg/tlpsrc/wordcount.tlpsrc b/Master/tlpkg/tlpsrc/wordcount.tlpsrc
index 874c0a99071..f53b87a8587 100644
--- a/Master/tlpkg/tlpsrc/wordcount.tlpsrc
+++ b/Master/tlpkg/tlpsrc/wordcount.tlpsrc
@@ -1,3 +1,3 @@
name wordcount
category Package
-depend TLCore/bin-wordcount
+depend bin-wordcount