[80922] users/dports/ports
dports at macports.org
dports at macports.org
Wed Jul 20 19:32:30 PDT 2011
Revision: 80922
http://trac.macports.org/changeset/80922
Author: dports at macports.org
Date: 2011-07-20 19:32:29 -0700 (Wed, 20 Jul 2011)
Log Message:
-----------
texlive portgroup: changes to installing symlinks for generated formats:
* require formats to be listed in texlive.binaries for links to be
created; some formats (e.g. cont-en) should not be invoked directly
* when checking whether a binary with the same name as the format
exists in ${texlive_bindir}, consider a broken symlink as existing
(because we might be installing the target of that symlink too,
as with mptopdf)
Update texlive ports that install formats to list any formats they
want symlinked in texlive.binaries.
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-formats-extra/Portfile
users/dports/ports/tex/texlive-htmlxml/Portfile
users/dports/ports/tex/texlive-lang-cjk/Portfile
users/dports/ports/tex/texlive-lang-czechslovak/Portfile
users/dports/ports/tex/texlive-lang-polish/Portfile
users/dports/ports/tex/texlive-latex/Portfile
users/dports/ports/tex/texlive-math-extra/Portfile
users/dports/ports/tex/texlive-omega/Portfile
users/dports/ports/tex/texlive-xetex/Portfile
Modified: users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl
===================================================================
--- users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl 2011-07-21 02:32:29 UTC (rev 80922)
@@ -210,12 +210,6 @@
}
}
- # create symlinks for any binaries activated by the port
- foreach bin ${texlive.binaries} {
- 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
@@ -256,12 +250,16 @@
"$fmtprefix$fmtname\t$fmtengine\t$fmtpatterns\t$fmtoptions"
# Simulate texlinks
- if {![file exists ${destroot}${prefix}/bin/$fmtname]} {
+ if {$fmtname in ${texlive.binaries}} {
# Decide what to link. Use the specified engine
# unless a binary with the same name as the
- # program exists (this can happen for metafont;
+ # format exists (this can happen for metafont;
# see #28890)
- if {[file exists ${texlive_bindir}/$fmtname]} {
+ #
+ # It's OK if the binary named $fmtname is a broken
+ # symlink, since we might be installing whatever
+ # it's pointing to, hence the use of 'file lstat'.
+ if {![catch {file lstat ${texlive_bindir}/$fmtname ignore}]} {
set linksource ${texlive_bindir}/$fmtname
} else {
set linksource ${prefix}/bin/$fmtengine
@@ -271,6 +269,11 @@
${destroot}${prefix}/bin/$fmtname
ln -s $linksource \
${destroot}${texlive_mactex_texbindir}/$fmtname
+
+ # We've created the symlink for $fmtname; remove
+ # it from texlive.binaries so we don't try to do
+ # so again later.
+ texlive.binaries-delete $fmtname
}
}
@@ -317,6 +320,12 @@
close $langdatfile
close $langdeffile
}
+
+ # create symlinks for any binaries activated by the port
+ foreach bin ${texlive.binaries} {
+ ln -s ${texlive_bindir}/$bin ${destroot}${prefix}/bin
+ ln -s ${texlive_bindir}/$bin ${destroot}${texlive_mactex_texbindir}
+ }
}
post-activate {
Modified: users/dports/ports/tex/texlive-basic/Portfile
===================================================================
--- users/dports/ports/tex/texlive-basic/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-basic/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -39,7 +39,7 @@
{MixedMap mflogo.map} \
{Map mathpple.map}
-texlive.binaries afm2tfm allcm allec allneeded bibtex dvi2fax dvipdfm dvipdfmx dvipdft dvips dvired ebb extractbb fmtutil fmtutil-sys gftodvi gftopk gftype gsftopk inimf initex kpseaccess kpsepath kpsereadlink kpsestat kpsetool kpsewhere kpsewhich kpsexpand luatex makeindex mf-nowin mft mkindex mkocp mkofm mktexfmt mktexlsr mktexmf mktexpk mktextfm pdftex pktogf pktype simpdftex tcdialog tex texconfig texconfig-dialog texconfig-sys texhash texlinks texlua texluac updmap updmap-sys xdvi
+texlive.binaries afm2tfm allcm allec allneeded bibtex dvi2fax dviluatex dvipdfm dvipdfmx dvipdft dvips dvired ebb etex extractbb fmtutil fmtutil-sys gftodvi gftopk gftype gsftopk inimf initex kpseaccess kpsepath kpsereadlink kpsestat kpsetool kpsewhere kpsewhich kpsexpand luatex makeindex mf mf-nowin mft mkindex mkocp mkofm mktexfmt mktexlsr mktexmf mktexpk mktextfm pdfetex pdftex pktogf pktype simpdftex tcdialog tex texconfig texconfig-dialog texconfig-sys texhash texlinks texlua texluac updmap updmap-sys xdvi
texlive.exclude texmf/web2c/fmtutil.cnf \
texmf/web2c/texmf.cnf \
Modified: users/dports/ports/tex/texlive-formats-extra/Portfile
===================================================================
--- users/dports/ports/tex/texlive-formats-extra/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-formats-extra/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -25,6 +25,8 @@
{1 mltex pdftex - {-translate-file=cp227.tcx -mltex mltex.ini}} \
{1 texsis pdftex - {-translate-file=cp227.tcx texsis.ini}}
+texlive.binaries eplain mllatex mltex texsis
+
depends_lib-append port:texlive-latex
texlive.texmfport
Modified: users/dports/ports/tex/texlive-htmlxml/Portfile
===================================================================
--- users/dports/ports/tex/texlive-htmlxml/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-htmlxml/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -25,7 +25,7 @@
{1 xmltex pdftex language.dat {*xmltex.ini}} \
{1 pdfxmltex pdftex language.dat {*pdfxmltex.ini}}
-texlive.binaries ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht t4ht tex4ht
+texlive.binaries ht htcontext htlatex htmex httex httexi htxelatex htxetex jadetex mk4ht pdfjadetex pdfxmltex t4ht tex4ht xmltex
texlive.exclude texmf-dist/scripts/tex4ht/ht.sh \
texmf-dist/scripts/tex4ht/htcontext.sh \
Modified: users/dports/ports/tex/texlive-lang-cjk/Portfile
===================================================================
--- users/dports/ports/tex/texlive-lang-cjk/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-lang-cjk/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -42,7 +42,7 @@
{Map mr2j.map} \
{Map mrj.map}
-texlive.binaries bg5+latex bg5+pdflatex bg5conv bg5latex bg5pdflatex cef5conv cef5latex cef5pdflatex cefconv ceflatex cefpdflatex cefsconv cefslatex cefspdflatex eptex extconv gbklatex gbkpdflatex hbf2gf makejvf mendex pbibtex pdvitype ppltotf ptex ptftopl sjisconv sjislatex sjispdflatex
+texlive.binaries bg5+latex bg5+pdflatex bg5conv bg5latex bg5pdflatex cef5conv cef5latex cef5pdflatex cefconv ceflatex cefpdflatex cefsconv cefslatex cefspdflatex eptex extconv gbklatex gbkpdflatex hbf2gf makejvf mendex pbibtex pdvitype platex ppltotf ptex ptftopl sjisconv sjislatex sjispdflatex
depends_lib-append port:texlive-latex
Modified: users/dports/ports/tex/texlive-lang-czechslovak/Portfile
===================================================================
--- users/dports/ports/tex/texlive-lang-czechslovak/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-lang-czechslovak/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -33,7 +33,7 @@
{MixedMap csother.map} \
{MixedMap cstext.map}
-texlive.binaries vlna
+texlive.binaries cslatex csplain pdfcslatex pdfcsplain vlna
texlive.texmfport
Modified: users/dports/ports/tex/texlive-lang-polish/Portfile
===================================================================
--- users/dports/ports/tex/texlive-lang-polish/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-lang-polish/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -32,5 +32,7 @@
{MixedMap plother.map} \
{MixedMap pltext.map}
+texlive.binaries mex pdfmex utf8mex
+
texlive.texmfport
Modified: users/dports/ports/tex/texlive-latex/Portfile
===================================================================
--- users/dports/ports/tex/texlive-latex/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-latex/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -32,6 +32,8 @@
{Map pazo.map} \
{Map utopia.map}
+texlive.binaries dvilualatex latex lualatex mptopdf pdflatex
+
pre-activate {
# Deactivate texlive-context to avoid conflicts on mft from the
# 2009->2010 update
Modified: users/dports/ports/tex/texlive-math-extra/Portfile
===================================================================
--- users/dports/ports/tex/texlive-math-extra/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-math-extra/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -26,6 +26,8 @@
{MixedMap stmaryrd.map} \
{MixedMap yhmath.map}
+texlive.binaries amstex
+
pre-activate {
# binomexp moved from texlive-latex-extra to texlive-math-extra in TL2010
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
Modified: users/dports/ports/tex/texlive-omega/Portfile
===================================================================
--- users/dports/ports/tex/texlive-omega/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-omega/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -26,7 +26,7 @@
texlive.maps \
{Map omega.map}
-texlive.binaries aleph odvicopy odvitype ofm2opl omfonts opl2ofm otangle otp2ocp outocp ovf2ovp ovp2ovf
+texlive.binaries aleph lamed odvicopy odvitype ofm2opl omfonts opl2ofm otangle otp2ocp outocp ovf2ovp ovp2ovf
texlive.texmfport
Modified: users/dports/ports/tex/texlive-xetex/Portfile
===================================================================
--- users/dports/ports/tex/texlive-xetex/Portfile 2011-07-21 01:59:50 UTC (rev 80921)
+++ users/dports/ports/tex/texlive-xetex/Portfile 2011-07-21 02:32:29 UTC (rev 80922)
@@ -23,7 +23,7 @@
{1 xetex xetex language.def {-etex xetex.ini}} \
{1 xelatex xetex language.dat {-etex xelatex.ini}}
-texlive.binaries T1Wrap teckit_compile xdv2pdf xdvipdfmx xetex
+texlive.binaries T1Wrap teckit_compile xdv2pdf xdvipdfmx xelatex xetex
depends_lib-append port:texlive-latex-recommended \
port:texlive-generic-recommended
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110720/99afcc1a/attachment.html>
More information about the macports-changes
mailing list