summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlpsrc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-06-22 18:15:54 +0000
committerKarl Berry <karl@freefriends.org>2009-06-22 18:15:54 +0000
commit1a45ba09ca26bd4c2c2a4b24a84eeb1ffd46c41b (patch)
treef9919ed26cc67019f7141de2f59feb4d6ed9ba96 /Master/tlpkg/tlpsrc
parente7345494aece5bf020d1f35da01813e6055363d7 (diff)
consistency fixes
git-svn-id: svn://tug.org/texlive/trunk@13887 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlpsrc')
-rw-r--r--Master/tlpkg/tlpsrc/fontname.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texdraw.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/wintools.win32.tlpsrc28
-rw-r--r--Master/tlpkg/tlpsrc/xindy.tlpsrc10
5 files changed, 26 insertions, 20 deletions
diff --git a/Master/tlpkg/tlpsrc/fontname.tlpsrc b/Master/tlpkg/tlpsrc/fontname.tlpsrc
index e51f194ee44..60c86e9a038 100644
--- a/Master/tlpkg/tlpsrc/fontname.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fontname.tlpsrc
@@ -1 +1 @@
-docpattern f texmf/doc/info/fontname.info
+docpattern +f texmf/doc/info/fontname.info
diff --git a/Master/tlpkg/tlpsrc/texdraw.tlpsrc b/Master/tlpkg/tlpsrc/texdraw.tlpsrc
index 51d842a9114..1c4f6ab4fe4 100644
--- a/Master/tlpkg/tlpsrc/texdraw.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texdraw.tlpsrc
@@ -1 +1 @@
-docpattern f texmf/doc/info/texdraw.info
+docpattern +f texmf/doc/info/texdraw.info
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index cce247e8255..023010cb80b 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -34,8 +34,8 @@ binpattern f/i386-cygwin tlpkg/installer/xz/xz.i386-cygwin.exe
binpattern f/!i386-cygwin tlpkg/installer/xz/xzdec.${ARCH}
binpattern f/!i386-cygwin tlpkg/installer/xz/xz.${ARCH}
# we count on lots of platforms providing their own wget.
-binpattern f/!i386-solaris,i386-linux,mips-irix,sparc-linux,alpha-linux,\
-powerpc-linux,i386-freebsd,x86_64-linux \
+binpattern f/!i386-cygwin,i386-solaris,i386-linux,mips-irix,sparc-linux,\
+alpha-linux,powerpc-linux,i386-freebsd,x86_64-linux \
tlpkg/installer/wget/wget.${ARCH}
# former tlmgr stuff
runpattern f texmf/web2c/fmtutil-hdr.cnf
diff --git a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
index fcefbf6460f..448f66da283 100644
--- a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
@@ -1,26 +1,28 @@
category TLCore
-# original bin-winutils
+#
+# these are provided on Windows only, sources come from w32tex.
binpattern f bin/win32/aftopl.exe
+binpattern f bin/win32/bmp2png.exe
binpattern f bin/win32/bmeps.exe
binpattern f bin/win32/cjpeg.exe
binpattern f bin/win32/djpeg.exe
+binpattern f bin/win32/gunzip.exe
+binpattern f bin/win32/gzip.exe
binpattern f bin/win32/jbig2.exe
+binpattern f bin/win32/pdffonts.exe
+binpattern f bin/win32/pdfimages.exe
+binpattern f bin/win32/pdfinfo.exe
+binpattern f bin/win32/pdftops.exe
+binpattern f bin/win32/pdftotext.exe
+binpattern f bin/win32/png22pnm.exe
+binpattern f bin/win32/png2bmp.exe
binpattern f bin/win32/sam2p.exe
binpattern f bin/win32/texview.exe
+binpattern f bin/win32/tiff2png.exe
binpattern f bin/win32/todos.exe
binpattern f bin/win32/tomac.exe
binpattern f bin/win32/tounix.exe
binpattern f bin/win32/type1afm.exe
binpattern f bin/win32/unzip.exe
-# from bin-gzip.win32
-docpattern f texmf/doc/gzip/*
-binpattern f bin/win32/gunzip.exe
-binpattern f bin/win32/gzip.exe
-# from bin-tifftools.win32
-binpattern f bin/win32/tiff2png.exe
-# from bin-xpdf.win32
-binpattern f bin/win32/pdffonts.exe
-binpattern f bin/win32/pdfimages.exe
-binpattern f bin/win32/pdfinfo.exe
-binpattern f bin/win32/pdftops.exe
-binpattern f bin/win32/pdftotext.exe
+#
+docpattern d texmf/doc/gzip
diff --git a/Master/tlpkg/tlpsrc/xindy.tlpsrc b/Master/tlpkg/tlpsrc/xindy.tlpsrc
index 7fd968d6c37..ce11b72c1aa 100644
--- a/Master/tlpkg/tlpsrc/xindy.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xindy.tlpsrc
@@ -1,16 +1,20 @@
category TLCore
+#
runpattern d texmf/xindy
runpattern d texmf/scripts/xindy
#
binpattern f/!mips-irix bin/${ARCH}/texindy
binpattern f/!mips-irix bin/${ARCH}/tex2xindy
binpattern f/!mips-irix bin/${ARCH}/xindy
-binpattern f/!mips-irix bin/${ARCH}/xindy.run
+#
+# cygwin and windows have to use a different name for the clisp executable.
+binpattern f/!mips-irix,i386-cygwin bin/${ARCH}/xindy.run
+binpattern f/i386-cygwin,win32 bin/${ARCH}/xindy-lisp.exe
+#
+# darwin has to split the mem file by architecture.
binpattern f/!mips-irix,universal-darwin bin/${ARCH}/xindy.mem
-binpattern f/i386-cygwin bin/${ARCH}/xindy-lisp.exe
binpattern f/universal-darwin bin/universal-darwin/xindy-i386.mem
binpattern f/universal-darwin bin/universal-darwin/xindy-ppc.mem
-binpattern f bin/win32/xindy-lisp.exe
#
docpattern f texmf/doc/man/man1/*xindy.*
docpattern d texmf/doc/xindy