summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/tlpkg/TeXLive/TLPostActions.pm9
-rw-r--r--Master/tlpkg/tlpsrc/bin-xetex.tlpsrc20
-rw-r--r--Master/tlpkg/tlpsrc/collection-xetex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/xetex.tlpsrc27
4 files changed, 25 insertions, 32 deletions
diff --git a/Master/tlpkg/TeXLive/TLPostActions.pm b/Master/tlpkg/TeXLive/TLPostActions.pm
index 1188f0e4b2a..a347431761a 100644
--- a/Master/tlpkg/TeXLive/TLPostActions.pm
+++ b/Master/tlpkg/TeXLive/TLPostActions.pm
@@ -26,13 +26,12 @@ our %PostInstall;
our %PostRemove;
+# xetex
#
-# bin-xetex
-#
-sub do_install_bin_xetex {
+sub do_install_xetex {
my ($texdir, $texdirw, $texmfsysvar) = @_;
#
- # bin-xetex installs font-config related stuff
+ # bin-installs font-config related stuff
#
# new version according to Staszek
if (!defined($texmfsysvar)) {
@@ -89,7 +88,7 @@ sub do_install_bin_xetex {
system("fc-cache","-v", "-r");
}
}
-$PostInstall{"bin-xetex"} = \&do_install_bin_xetex;
+$PostInstall{"xetex"} = \&do_install_xetex;
#
# bin-texdoc
diff --git a/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc
deleted file mode 100644
index 99379421b72..00000000000
--- a/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc
+++ /dev/null
@@ -1,20 +0,0 @@
-name bin-xetex
-category TLCore
-execute BuildFormat xetex
-runpattern f texmf/fmtutil/format.xetex.cnf
-# still needed for darwin only?
-binpattern f bin/${ARCH}/T1Wrap
-binpattern f bin/${ARCH}/xdv2pdf
-# disabled according to Staszek's email
-#binpattern f bin/${ARCH}/xeplain
-#binpattern f bin/win32/TECkit_x86.dll
-binpattern f bin/${ARCH}/xdvipdfmx
-binpattern f bin/${ARCH}/xelatex
-binpattern f bin/${ARCH}/xetex
-binpattern f bin/win32/cache/*
-binpattern f bin/win32/conf/*
-binpattern f bin/win32/conf/conf.d/*
-binpattern f bin/win32/teckit_compile.exe
-binpattern f bin/win32/fc-*
-binpattern f bin/win32/icu*.dll
-depend xetexconfig
diff --git a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
index 26af8562885..e20da269990 100644
--- a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
@@ -18,5 +18,4 @@ depend xetexconfig
depend xetexfontinfo
depend xltxtra
depend xunicode
-depend bin-xetex
depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index 3f2a2aa5af6..9967654cd2a 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -1,10 +1,25 @@
name xetex
-category Package
-# we are not using + on the operands here; so we are not including the
-# default list of directories for "Package"s. We don't want them,
-# because there are several XeTeX-specific packages (xetexfontinfo,
-# xetex-pstricks), and it's better not to have to list them all here.
+category TLCore
+#
+execute BuildFormat xetex
+runpattern f texmf/fmtutil/format.xetex.cnf
+#
+# these are only needed for darwin only.
+binpattern f bin/${ARCH}/T1Wrap
+binpattern f bin/${ARCH}/xdv2pdf
+#
docpattern d texmf-dist/doc/xetex/base
runpattern d texmf-dist/fonts/misc/xetex
runpattern d texmf-dist/scripts/xetex
-depend bin-xetex
+#
+binpattern f bin/${ARCH}/xdvipdfmx
+binpattern f bin/${ARCH}/xelatex
+binpattern f bin/${ARCH}/xetex
+binpattern f bin/win32/cache/*
+binpattern f bin/win32/conf/*
+binpattern f bin/win32/conf/conf.d/*
+binpattern f bin/win32/teckit_compile.exe
+binpattern f bin/win32/fc-*
+binpattern f bin/win32/icu*.dll
+depend xetexconfig
+