summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm2
-rw-r--r--Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-ctie.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc6
-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-patgen.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/bin-tex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-tie.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-ttf2pt1.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/lib-freetype2.win32.tlpsrc (renamed from Master/tlpkg/tlpsrc/lib-freetype2.tlpsrc)2
-rw-r--r--Master/tlpkg/tlpsrc/lib-geturl.win32.tlpsrc (renamed from Master/tlpkg/tlpsrc/lib-geturl.tlpsrc)2
-rw-r--r--Master/tlpkg/tlpsrc/lib-gnu.win32.tlpsrc (renamed from Master/tlpkg/tlpsrc/lib-gnu.tlpsrc)2
-rw-r--r--Master/tlpkg/tlpsrc/lib-md5.win32.tlpsrc (renamed from Master/tlpkg/tlpsrc/lib-md5.tlpsrc)2
-rw-r--r--Master/tlpkg/tlpsrc/lib-regex.win32.tlpsrc (renamed from Master/tlpkg/tlpsrc/lib-regex.tlpsrc)2
-rw-r--r--Master/tlpkg/tlpsrc/lib-texmfmp.win32.tlpsrc (renamed from Master/tlpkg/tlpsrc/lib-texmfmp.tlpsrc)2
-rw-r--r--Master/tlpkg/tlpsrc/lib-zlib.win32.tlpsrc (renamed from Master/tlpkg/tlpsrc/lib-zlib.tlpsrc)2
19 files changed, 25 insertions, 25 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index c93046c58a9..716b53b2287 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -78,7 +78,7 @@ sub from_file
if ($line =~ /^ /) {
die "$srcfile: continuation line not allowed in tlpsrc: $line\n";
}
- if ($line =~ /^name\s*([-\w]+|00texlive\.config)$/) {
+ if ($line =~ /^name\s*([-\w]+(\.win32)?|00texlive\.config)$/) {
$name = "$1";
$started && die("$srcfile: tlpsrc cannot have two name directives");
$started = 1;
diff --git a/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc b/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc
index fb9906b0862..66c57715948 100644
--- a/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc
@@ -1,7 +1,7 @@
name bin-bibtex
category TLCore
depend bin-kpathsea
-depend lib-texmfmp
+depend lib-texmfmp.win32
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-ctie.tlpsrc b/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc
index 41e3bc1625f..2d358cf8edf 100644
--- a/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc
@@ -1,7 +1,7 @@
name bin-ctie
category TLCore
depend bin-kpathsea
-depend lib-texmfmp
+depend lib-texmfmp.win32
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-kpathsea.tlpsrc b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
index 4d57ab17776..463822b3d54 100644
--- a/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
@@ -1,8 +1,8 @@
name bin-kpathsea
category TLCore
-depend lib-geturl
-depend lib-gnu
-depend lib-regex
+depend lib-geturl.win32
+depend lib-gnu.win32
+depend lib-regex.win32
runpattern f texmf/aliases
runpattern f texmf/web2c/*.cnf
runpattern f texmf/web2c/*.cnf-4WIN
diff --git a/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc b/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
index 5df72079758..89ad6b39a9a 100644
--- a/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
@@ -1,7 +1,7 @@
name bin-metafont
category TLCore
depend bin-kpathsea
-depend lib-texmfmp
+depend lib-texmfmp.win32
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 8bd357680f1..b3213fca88f 100644
--- a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
@@ -1,7 +1,7 @@
name bin-metapost
category TLCore
depend bin-kpathsea
-depend lib-texmfmp
+depend lib-texmfmp.win32
execute BuildFormat metapost
runpattern f texmf/fmtutil/format.metapost.cnf
runpattern f texmf/web2c/mp.pool
diff --git a/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc b/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc
index 6356370e519..3d801e100d4 100644
--- a/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc
@@ -1,7 +1,7 @@
name bin-patgen
category TLCore
depend bin-kpathsea
-depend lib-texmfmp
+depend lib-texmfmp.win32
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 f1fd581790f..325490e88e1 100644
--- a/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
@@ -1,10 +1,10 @@
name bin-pdftex
category TLCore
depend bin-kpathsea
-depend lib-gnu
-depend lib-md5
-depend lib-texmfmp
-depend lib-zlib
+depend lib-gnu.win32
+depend lib-md5.win32
+depend lib-texmfmp.win32
+depend lib-zlib.win32
execute BuildFormat pdftex
runpattern f texmf/fmtutil/format.pdftex.cnf
runpattern f texmf/fonts/map/pdftex/updmap/*
diff --git a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
index 00337dee85f..f88a34da450 100644
--- a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
@@ -1,7 +1,7 @@
name bin-tex
category TLCore
depend bin-kpathsea
-depend lib-texmfmp
+depend lib-texmfmp.win32
execute BuildFormat tex
runpattern f texmf/fmtutil/format.tex.cnf
runpattern f texmf/web2c/tex.pool
diff --git a/Master/tlpkg/tlpsrc/bin-tie.tlpsrc b/Master/tlpkg/tlpsrc/bin-tie.tlpsrc
index 021a5250eb1..76e2cbe5a15 100644
--- a/Master/tlpkg/tlpsrc/bin-tie.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tie.tlpsrc
@@ -1,7 +1,7 @@
name bin-tie
category TLCore
depend bin-kpathsea
-depend lib-texmfmp
+depend lib-texmfmp.win32
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-ttf2pt1.tlpsrc b/Master/tlpkg/tlpsrc/bin-ttf2pt1.tlpsrc
index f8e76a3603b..d7716131b3d 100644
--- a/Master/tlpkg/tlpsrc/bin-ttf2pt1.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-ttf2pt1.tlpsrc
@@ -1,6 +1,6 @@
name bin-ttf2pt1
category TLCore
-depend lib-freetype2
+depend lib-freetype2.win32
docpattern f texmf/doc/man/man1/ttf2pt1.1
docpattern f texmf/doc/man/man1/ttf2pt1.1.html
binpattern f bin/win32/ttf2pt1.exe
diff --git a/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc b/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc
index 09b929e9502..29ba1e75a10 100644
--- a/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basicbin.tlpsrc
@@ -1,7 +1,7 @@
name collection-basicbin
category Collection
-depend lib-regex
-depend lib-zlib
+depend lib-regex.win32
+depend lib-zlib.win32
shortdesc Essential binaries
longdesc These programs are regarded as basic for any TeX system.
depend glyphlist
diff --git a/Master/tlpkg/tlpsrc/lib-freetype2.tlpsrc b/Master/tlpkg/tlpsrc/lib-freetype2.win32.tlpsrc
index 987b9ccf427..589142e7732 100644
--- a/Master/tlpkg/tlpsrc/lib-freetype2.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lib-freetype2.win32.tlpsrc
@@ -1,3 +1,3 @@
-name lib-freetype2
+name lib-freetype2.win32
category TLCore
binpattern f bin/win32/tl90freetype2.dll
diff --git a/Master/tlpkg/tlpsrc/lib-geturl.tlpsrc b/Master/tlpkg/tlpsrc/lib-geturl.win32.tlpsrc
index 53a16c790e7..3168e6b8d50 100644
--- a/Master/tlpkg/tlpsrc/lib-geturl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lib-geturl.win32.tlpsrc
@@ -1,3 +1,3 @@
-name lib-geturl
+name lib-geturl.win32
category TLCore
binpattern f bin/win32/tl90geturl.dll
diff --git a/Master/tlpkg/tlpsrc/lib-gnu.tlpsrc b/Master/tlpkg/tlpsrc/lib-gnu.win32.tlpsrc
index 6199a500e4c..7d59eb06275 100644
--- a/Master/tlpkg/tlpsrc/lib-gnu.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lib-gnu.win32.tlpsrc
@@ -1,3 +1,3 @@
-name lib-gnu
+name lib-gnu.win32
category TLCore
binpattern f bin/win32/tl90gnu.dll
diff --git a/Master/tlpkg/tlpsrc/lib-md5.tlpsrc b/Master/tlpkg/tlpsrc/lib-md5.win32.tlpsrc
index 4143ae12490..b9080a323a4 100644
--- a/Master/tlpkg/tlpsrc/lib-md5.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lib-md5.win32.tlpsrc
@@ -1,3 +1,3 @@
-name lib-md5
+name lib-md5.win32
category TLCore
binpattern f bin/win32/tl90md5.dll
diff --git a/Master/tlpkg/tlpsrc/lib-regex.tlpsrc b/Master/tlpkg/tlpsrc/lib-regex.win32.tlpsrc
index 61717bce102..323b61a42ba 100644
--- a/Master/tlpkg/tlpsrc/lib-regex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lib-regex.win32.tlpsrc
@@ -1,3 +1,3 @@
-name lib-regex
+name lib-regex.win32
category TLCore
binpattern f bin/win32/tl90regex.dll
diff --git a/Master/tlpkg/tlpsrc/lib-texmfmp.tlpsrc b/Master/tlpkg/tlpsrc/lib-texmfmp.win32.tlpsrc
index 6a47db3f99b..a7249e044f0 100644
--- a/Master/tlpkg/tlpsrc/lib-texmfmp.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lib-texmfmp.win32.tlpsrc
@@ -1,3 +1,3 @@
-name lib-texmfmp
+name lib-texmfmp.win32
category TLCore
binpattern f bin/win32/tl90texmfmp.dll
diff --git a/Master/tlpkg/tlpsrc/lib-zlib.tlpsrc b/Master/tlpkg/tlpsrc/lib-zlib.win32.tlpsrc
index 472a73358b8..9d205e7371d 100644
--- a/Master/tlpkg/tlpsrc/lib-zlib.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lib-zlib.win32.tlpsrc
@@ -1,4 +1,4 @@
-name lib-zlib
+name lib-zlib.win32
category TLCore
docpattern f texmf/doc/man/man3/zlib.3
docpattern f texmf/doc/man/man3/zlib.3.html