[73052] users/dports/ports
dports at macports.org
dports at macports.org
Mon Nov 1 21:48:38 PDT 2010
Revision: 73052
http://trac.macports.org/changeset/73052
Author: dports at macports.org
Date: 2010-11-01 21:48:35 -0700 (Mon, 01 Nov 2010)
Log Message:
-----------
texlive: do not install binaries into $prefix/bin until they're usable
(see #25460, #25875)
* texlive-bin: initially install binaries and manpages into a hidden
directory, $texlive_bindir = $prefix/libexec/texlive/binaries
* texlive portgroup: when installing texmf packages, activate any
files listed in texlive.binaries by creating symlinks from
$texlive_bindir into $prefix/bin
* texlive portgroup: install manpages from $texlive_bindir if
available
Also create a 'texbin' directory containing the same symlinks
installed into $prefix/bin that can be used for MacTeX's Tex
Distribution prefpane (see #26784)
Modified Paths:
--------------
users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl
users/dports/ports/tex/texlive-basic/Portfile
users/dports/ports/tex/texlive-bin/Portfile
users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff
users/dports/ports/tex/texlive-bin-extra/Portfile
users/dports/ports/tex/texlive-fontutils/Portfile
Added Paths:
-----------
users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_xdvik_xdvi-sh.in.diff
Modified: users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl
===================================================================
--- users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl 2010-11-02 04:45:53 UTC (rev 73051)
+++ users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl 2010-11-02 04:48:35 UTC (rev 73052)
@@ -67,6 +67,25 @@
# configuration data from texconfig
set texlive_texmfsysconfig "${prefix}/etc/texmf"
+# location of binaries installed by texlive-bin
+#
+# All TeXLive binaries are built by texlive-bin, but most of them
+# aren't usable without the support files installed by other ports:
+# for example, xetex needs texlive-xetex, tex4ht needs
+# texlive-htmlxml, and just about everything needs texlive-basic. We
+# don't want to install useless files into $prefix/bin, so instead
+# texlive-bin installs its binaries into this "hidden" directory, and
+# other ports "activate" them when they are ready to be used by creating
+# symlinks into $prefix/bin.
+set texlive_bindir "${prefix}/libexec/texlive/binaries"
+
+# another directory containing symlinks to activated texlive binaries
+#
+# This is provided to support MacTeX's TeX Distribution preference
+# pane: it can select the active TeX distribution by pointing the
+# /usr/texbin symlink here
+set texlive_mactex_texbindir "${prefix}/libexec/texlive/texbin"
+
# Remove dependencies on any texlive-documentation-* ports, for use by
# -doc variants
proc texlive.removedocdepends {} {
@@ -131,6 +150,8 @@
build { }
destroot {
+ xinstall -d ${destroot}${texlive_mactex_texbindir}
+
set indexlist {"runfiles"}
if {[variant_isset "doc"]} { lappend indexlist "docfiles" }
if {[variant_isset "src"]} { lappend indexlist "srcfiles" }
@@ -161,14 +182,20 @@
# check for manpages and treat specially
if [regexp {^texmf/doc/man/man(\d)/([^/]+)} $line -> section filename] {
- if {![tbool texlive.excludemanpages]} {
- if [string match "*.$section" $filename] {
- # actually a manpage; install it
+ if [string match "*.$section" $filename] {
+ # actually a manpage; install it. If
+ # texlive-bin installed a manpage with the
+ # same name, use it instead to make sure the
+ # documentation matches the binary.
+ if [file exists ${texlive_bindir}/man${section}/$filename.gz] {
+ ln -s ${texlive_bindir}/man${section}/$filename.gz \
+ ${destroot}${prefix}/share/man/man$section/
+ } else {
copy $srcfile ${destroot}${prefix}/share/man/man$section/
- } else {
- # not actually a manpage; do nothing
- # (e.g. don't install PDF manpages)
}
+ } else {
+ # not actually a manpage; do nothing
+ # (e.g. don't install PDF manpages)
}
} else {
# not a manpage; install into requested target dir
@@ -188,6 +215,13 @@
}
}
+ # create symlinks for any binaries activated by the port
+ foreach bin ${texlive.binaries} {
+ ui_msg "activating binary $bin"
+ ln -s ${texlive_bindir}/$bin ${destroot}${prefix}/bin
+ ln -s ${texlive_bindir}/$bin ${destroot}${texlive_mactex_texbindir}
+ }
+
# install a documentation file containing the list of TeX
# packages installed. This also ensures that each port
# provides at least one file, even if there's nothing to
@@ -232,6 +266,8 @@
![file exists ${destroot}${prefix}/bin/$fmtname]} {
ln -s ${prefix}/bin/$fmtengine \
${destroot}${prefix}/bin/$fmtname
+ ln -s ${prefix}/bin/$fmtengine \
+ ${destroot}${texlive_mactex_texbindir}/$fmtname
}
}
@@ -281,7 +317,7 @@
}
post-activate {
- system "${prefix}/bin/mktexlsr"
+ system "${texlive_bindir}/mktexlsr"
if {${texlive.forceupdatecnf}} {
# If force was specified, update all the config files, and
# regenerate all maps and formats.
@@ -316,7 +352,7 @@
post-deactivate {
# Update ls-R and any config files to reflect that the package
# is now gone
- system "${prefix}/bin/mktexlsr"
+ system "${texlive_bindir}/mktexlsr"
if {${texlive.forceupdatecnf} || ${texlive.languages} != ""} {
system "${prefix}/libexec/texlive-update-cnf language.dat"
system "${prefix}/libexec/texlive-update-cnf language.def"
Modified: users/dports/ports/tex/texlive-basic/Portfile
===================================================================
--- users/dports/ports/tex/texlive-basic/Portfile 2010-11-02 04:45:53 UTC (rev 73051)
+++ users/dports/ports/tex/texlive-basic/Portfile 2010-11-02 04:48:35 UTC (rev 73052)
@@ -40,68 +40,12 @@
texlive.binaries xdvi kpsepath afm2tfm texlua ebb kpsexpand updmap-sys kpsereadlink allneeded mktexmf mkindex bibtex dvired mft tex fmtutil-sys dvipdfm dvipdfmx texconfig-dialog allcm simpdftex pktype dvips gftodvi gftopk kpsewhere kpsestat gftype extractbb kpseaccess kpsetool allec texconfig-sys mktexlsr dvi2fax mkofm gsftopk mktextfm pdftex pktogf luatex dvipdft fmtutil kpsewhich mf-nowin mktexpk texconfig texluac xdvi-xaw updmap makeindex texlinks tcdialog mkocp mktexfmt texhash
-texlive.exclude texmf/doc/man/man1/afm2tfm.1 \
- texmf/doc/man/man1/allcm.1 \
- texmf/doc/man/man1/allec.1 \
- texmf/doc/man/man1/allneeded.1 \
- texmf/doc/man/man1/bibtex.1 \
- texmf/doc/man/man1/dvi2fax.1 \
- texmf/doc/man/man1/dvips.1 \
- texmf/doc/man/man1/dvired.1 \
- texmf/doc/man/man1/fmtutil-sys.1 \
- texmf/doc/man/man1/fmtutil.1 \
- texmf/doc/man/man1/fontinst.1 \
- texmf/doc/man/man1/gftodvi.1 \
- texmf/doc/man/man1/gftopk.1 \
- texmf/doc/man/man1/gftype.1 \
- texmf/doc/man/man1/gsftopk.1 \
- texmf/doc/man/man1/kpseaccess.1 \
- texmf/doc/man/man1/kpsepath.1 \
- texmf/doc/man/man1/kpsereadlink.1 \
- texmf/doc/man/man1/kpsestat.1 \
- texmf/doc/man/man1/kpsetool.1 \
- texmf/doc/man/man1/kpsewhere.1 \
- texmf/doc/man/man1/kpsewhich.1 \
- texmf/doc/man/man1/kpsexpand.1 \
- texmf/doc/man/man1/gsftopk.1 \
- texmf/doc/man/man1/luatex.1 \
- texmf/doc/man/man1/makeindex.1 \
- texmf/doc/man/man1/mf-nowin.1 \
- texmf/doc/man/man1/mf.1 \
- texmf/doc/man/man1/mft.1 \
- texmf/doc/man/man1/mkindex.1 \
- texmf/doc/man/man1/mkocp.1 \
- texmf/doc/man/man1/mkofm.1 \
- texmf/doc/man/man1/mktexfmt.1 \
- texmf/doc/man/man1/mktexlsr.1 \
- texmf/doc/man/man1/mktexmf.1 \
- texmf/doc/man/man1/mktexpk.1 \
- texmf/doc/man/man1/mktextfm.1 \
- texmf/doc/man/man1/pdfetex.1 \
- texmf/doc/man/man1/pdftex.1 \
- texmf/doc/man/man1/pktogf.1 \
- texmf/doc/man/man1/pktype.1 \
- texmf/doc/man/man1/tcdialog.1 \
- texmf/doc/man/man1/tex.1 \
- texmf/doc/man/man1/texconfig-sys.1 \
- texmf/doc/man/man1/texconfig.1 \
- texmf/doc/man/man1/texlinks.1 \
- texmf/doc/man/man1/texhash.1 \
- texmf/doc/man/man1/updmap-sys.1 \
- texmf/doc/man/man1/updmap.1 \
- texmf/doc/man/man1/xdvi.1 \
- texmf/doc/man/man5/fmtutil.cnf.5 \
- texmf/doc/man/man5/updmap.cfg.5 \
- texmf/web2c/fmutil.cnf \
+texlive.exclude texmf/web2c/fmutil.cnf \
texmf/web2c/texmf.cnf \
texmf/web2c/updmap.cfg \
texmf/tex/generic/config/language.dat \
texmf/tex/generic/config/language.def
-post-destroot {
- delete ${destroot}/${prefix}/bin/mf
-}
-
pre-activate {
# If texlive 2007 metaport is installed, deactivate it to avoid
# conflicts on $prefix/bin/etex etc.
Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile 2010-11-02 04:45:53 UTC (rev 73051)
+++ users/dports/ports/tex/texlive-bin/Portfile 2010-11-02 04:48:35 UTC (rev 73052)
@@ -59,11 +59,15 @@
patchfiles patch-configure \
patch-libs_icu_icu-4.4_configure.diff \
patch-libs-freetype-Makefile.in.diff \
- patch-texk_texlive_linked_scripts_Makefile.in.diff
+ patch-texk_texlive_linked_scripts_Makefile.in.diff \
+ patch-texk_tex4htk_Makefile.in.diff \
+ patch-texk_xdvik_xdvi-sh.in.diff
post-patch {
reinplace "s|@@TEXMFMAIN@@|${texlive_texmfmain}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
+ reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/tex4htk/Makefile.in
+ reinplace "s|@@TEXLIVE_BINDIR@@|${texlive_bindir}|" ${worksrcpath}/texk/xdvik/xdvi-sh.in
# Link our texmf.cnf in so that the proper paths are compiled into kpathsea
delete ${worksrcpath}/texk/kpathsea/texmf.cnf
@@ -86,12 +90,13 @@
#
# Exceptions are freetype1 (not in MacPorts anymore) and icu (the
# texlive version is non-standard)
-configure.args --mandir=${prefix}/share/man \
+configure.args --bindir=${texlive_bindir} \
+ --mandir=${texlive_bindir} \
--infodir=${prefix}/share/info \
--disable-multiplatform \
--disable-native-texlive-build \
--without-old-mac-fonts \
- --with-tex-banner="TeX Live/MacPorts ${version}_${revision}" \
+ --with-banner-add="/MacPorts ${version}_${revision}" \
--enable-shared \
--with-system-freetype2 \
--without-system-freetype \
@@ -106,6 +111,7 @@
--with-t1lib-libdir=${prefix}/lib \
--with-system-xpdf \
--with-system-zlib \
+ --enable-etex \
--disable-detex \
--disable-dvi2tty \
--disable-ps2eps \
@@ -134,12 +140,20 @@
delete ${destroot}${prefix}/texmf-dist
# Do not install symlinks to scripts that we will not install
- delete ${destroot}${prefix}/bin/latexmk
- delete ${destroot}${prefix}/bin/tlmgr
+ delete ${destroot}${texlive_bindir}/latexmk
+ delete ${destroot}${texlive_bindir}/tlmgr
+
+ # gzip manpages that are installed into texlive_bindir
+ foreach manpage [glob -directory ${destroot}${texlive_bindir} man*/*] {
+ # need to make sure it isn't a symlink
+ if {[file type $manpage] == "file"} {
+ system "gzip $manpage"
+ }
+ }
}
post-activate {
- system "${prefix}/bin/mktexlsr"
+ system "${texlive_bindir}/mktexlsr"
}
variant atsui description {Use ATSUI instead of freetype for XeTeX font rendering (forces 32-bit)} {
Added: users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff 2010-11-02 04:48:35 UTC (rev 73052)
@@ -0,0 +1,44 @@
+--- texk/tex4htk/Makefile.in.orig 2010-11-01 20:10:42.000000000 -0400
++++ texk/tex4htk/Makefile.in 2010-11-01 22:31:56.000000000 -0400
+@@ -274,8 +274,8 @@
+ wcontext wlatex wmex wtex wtexi wxelatex wxetex xhcontext \
+ xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \
+ xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java
+-tex4ht_subdir = texmf-dist/scripts/tex4ht
+-tex4htdir = ${prefix}/$(tex4ht_subdir)
++tex4ht_subdir = scripts/tex4ht
++tex4htdir = @@TEXMFDIST@@/$(tex4ht_subdir)
+ tex4ht_SCRIPTS =
+ bin_SCRIPTS =
+ all: c-auto.h
+@@ -837,25 +837,20 @@
+ echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.sh'"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.sh"; \
+ done
+- case "$(bindir)" in \
+- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+- *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+- exit 1;; \
+- esac
++ $(MAKE) $(AM_MAKEFLAGS) install-links
+
+ .PHONY: install-links
+ install-links:
+ @cd $(DESTDIR)$(bindir) && \
+ for p in $(perl_scripts); do \
+ rm -f $$p; \
+- echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.pl'"; \
+- $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \
++ echo "creating link '$$p' -> '$(tex4htdir)/$$p.pl'"; \
++ $(LN_S) $(tex4htdir)/$$p.pl $$p; \
+ done && \
+ for p in $(shell_scripts); do \
+ rm -f $$p; \
+- echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \
+- $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.sh $$p; \
++ echo "creating link '$$p' -> '$(tex4htdir)/$$p.sh'"; \
++ $(LN_S) $(tex4htdir)/$$p.sh $$p; \
+ done
+
+ uninstall-hook:
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff 2010-11-02 04:45:53 UTC (rev 73051)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff 2010-11-02 04:48:35 UTC (rev 73052)
@@ -1,6 +1,23 @@
---- texk/texlive/linked_scripts/Makefile.in.orig 2010-10-26 23:44:12.000000000 -0400
-+++ texk/texlive/linked_scripts/Makefile.in 2010-10-26 23:46:18.000000000 -0400
-@@ -589,16 +589,16 @@
+--- texk/texlive/linked_scripts/Makefile.in.orig 2010-11-01 20:10:29.000000000 -0400
++++ texk/texlive/linked_scripts/Makefile.in 2010-11-01 22:27:35.000000000 -0400
+@@ -575,13 +575,10 @@
+ #
+ # We support both multiplatform and non-multiplatform builds.
+ #
++
++# MacPorts: hard-code link destinations instead of using relative ones
+ install-data-hook:
+- case "$(bindir)" in \
+- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+- *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+- exit 1;; \
+- esac
++ $(MAKE) $(AM_MAKEFLAGS) install-links
+
+ .PHONY: install-links
+ install-links:
+@@ -589,16 +586,16 @@
for s in $(nobase_dist_scriptx_SCRIPTS); do \
target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
rm -f $$target; \
@@ -21,7 +38,7 @@
done && \
for s in $(bin_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
-@@ -606,12 +606,7 @@
+@@ -606,12 +603,7 @@
rm -f $$link; \
echo "creating link '$$link' -> '$$file'"; \
$(LN_S) $$file $$link; \
Added: users/dports/ports/tex/texlive-bin/files/patch-texk_xdvik_xdvi-sh.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_xdvik_xdvi-sh.in.diff (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_xdvik_xdvi-sh.in.diff 2010-11-02 04:48:35 UTC (rev 73052)
@@ -0,0 +1,8 @@
+--- texk/xdvik/xdvi-sh.in.orig 2010-11-01 20:11:17.000000000 -0400
++++ texk/xdvik/xdvi-sh.in 2010-11-01 22:34:49.000000000 -0400
+@@ -50,4 +50,4 @@
+ XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
+ fi
+
+-exec @final_exec_name@ $NAMEOPT ${1+"$@"}
++exec @@TEXLIVE_BINDIR@@/@final_exec_name@ $NAMEOPT ${1+"$@"}
Modified: users/dports/ports/tex/texlive-bin-extra/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin-extra/Portfile 2010-11-02 04:45:53 UTC (rev 73051)
+++ users/dports/ports/tex/texlive-bin-extra/Portfile 2010-11-02 04:48:35 UTC (rev 73052)
@@ -19,7 +19,7 @@
depends_lib port:texlive-basic
-texlive.binaries purifyeps dviselect pdfjam-slides6up ps4pdf latex2man dviconcat pkfix-helper pooltype dv2dt xasy dvidvi pdf90 synctex e2pall pkfix pdfnup detex dvilj2p dvigif ctangle dvilj texloganalyser tpic2pdftex bundledoc tangle findhyph dvilj6 chktex pdfjam-pocketmod arlatex pdfflip a2ping texdiff tie pdftosrc pdfclose mkjobtexmf texdirflatten patgen dvi2tty latexdiff-vc rpdfcrop pdfjam-slides3up texdoctk texdoc dviasm latexmk dvibook asy disdvi pdf180 pdfbook dvipng fragmaster lacheck dvisvgm pdf270 dvitype dvilj4 texcount bibtex8 dvilj4l cweave pdfjam pdfjoin dvitodvi listings-ext.sh pdfcrop pdfpun deweb bibtexu pdfopen dvihp weave pdfatfi dt2dv dvipos de-macro chkweb ctie dvicopy latexdiff latexrevise
+texlive.binaries purifyeps dviselect pdfjam-slides6up ps4pdf latex2man dviconcat pkfix-helper pooltype dv2dt xasy dvidvi pdf90 synctex e2pall pkfix pdfnup dvilj2p dvigif ctangle dvilj texloganalyser tpic2pdftex bundledoc tangle findhyph dvilj6 chktex pdfjam-pocketmod arlatex pdfflip a2ping texdiff tie pdftosrc pdfclose mkjobtexmf texdirflatten patgen dvi2tty latexdiff-vc rpdfcrop pdfjam-slides3up texdoctk texdoc dviasm dvibook asy disdvi pdf180 pdfbook dvipng fragmaster lacheck dvisvgm pdf270 dvitype dvilj4 texcount bibtex8 dvilj4l cweave pdfjam pdfjoin dvitodvi listings-ext.sh pdfcrop pdfpun deweb bibtexu pdfopen dvihp weave pdfatfi dt2dv dvipos de-macro chkweb ctie dvicopy latexdiff latexrevise
texlive.excludemanpages yes
Modified: users/dports/ports/tex/texlive-fontutils/Portfile
===================================================================
--- users/dports/ports/tex/texlive-fontutils/Portfile 2010-11-02 04:45:53 UTC (rev 73051)
+++ users/dports/ports/tex/texlive-fontutils/Portfile 2010-11-02 04:48:35 UTC (rev 73052)
@@ -19,7 +19,7 @@
depends_lib port:texlive-basic
-texlive.binaries cfftot1 pk2bm showglyphs afm2afm t1asm getafm ps2eps fixpspps ttf2afm tftopl autoinst ot2kpx psbook epstopdf ttf2pk pstops psmerge ps2pk t1reencode mkt1font afm2pl ttftotype42 fixscribeps fixwpps includeres showchar fixwfwps otftotfm t1rawafm t1unmac vftovp fixtpps pslatex t1dotlessj mmafm ttf2tfm otfinfo fontinst fixfmps mmpfb vptovf font2afm extractres repstopdf pfm2kpx psresize epsffit t1disasm t1mac ttfdump ps2frag mag t1binary fixwwps t1testpage fixpsditps pfb2pfa bbox vpl2ovp fixmacps pltotf vpl2vpl psnup cmap2enc fixdlsrps t1ascii psselect t1lint
+texlive.binaries cfftot1 pk2bm showglyphs afm2afm getafm fixpspps ttf2afm tftopl autoinst ot2kpx psbook epstopdf ttf2pk pstops psmerge ps2pk t1reencode mkt1font afm2pl ttftotype42 fixscribeps fixwpps includeres showchar fixwfwps otftotfm t1rawafm vftovp fixtpps pslatex t1dotlessj mmafm ttf2tfm otfinfo fontinst fixfmps mmpfb vptovf font2afm repstopdf pfm2kpx psresize ttfdump ps2frag mag fixwwps t1testpage fixpsditps pfb2pfa vpl2ovp fixmacps pltotf vpl2vpl psnup cmap2enc fixdlsrps psselect t1lint
texlive.excludemanpages yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101101/dce7513b/attachment-0001.html>
More information about the macports-changes
mailing list