<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9d1d297ed317aa861fc958a4aae4e9713ca0b2e7">https://github.com/macports/macports-ports/commit/9d1d297ed317aa861fc958a4aae4e9713ca0b2e7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9d1d297 dblatex: Add variant to support MacTeX
</span>9d1d297 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9d1d297ed317aa861fc958a4aae4e9713ca0b2e7
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Fri Dec 1 14:27:30 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> dblatex: Add variant to support MacTeX
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55106
</span>---
textproc/dblatex/Portfile | 70 +++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 64 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/dblatex/Portfile b/textproc/dblatex/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 78f8f0d..20d0275 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/dblatex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/dblatex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,9 @@ PortGroup texlive 1.0
</span>
name dblatex
version 0.3.10
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories textproc tex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers cal openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {cal @neverpanic} openmaintainer
</span> license GPL-2+
platforms darwin
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +52,48 @@ python.default_version 27
</span> destroot.destdir --root=${destroot} \
--catalogs=${destroot}${prefix}/etc/xml/catalog
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The mactex variant expects MacTeX to be installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and installs dblatex's stylefiles to MacTeX's texmf (local)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set dblatex.texmflocal ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set dblatex.mactex_bin ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mactex description {Allow dblatex to use a MacTeX installation instead of Macports texlive tools.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To install the mactex variant /Library/TeX/texbin must be added to binpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in macports.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # First, check if MacTeX actually seems to be thereā¦
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dblatex.mactex_candidates { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/Library/TeX/texbin" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/texbin" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir ${dblatex.mactex_candidates} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [file executable "${dir}/kpsewhich"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dblatex.mactex_bin ${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${dblatex.mactex_bin} != "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dblatex.texmflocal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [exec ${dblatex.mactex_bin}/kpsewhich --expand-var='\$TEXMFLOCAL']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regsub -all {'} ${dblatex.texmflocal} "" dblatex.texmflocal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Cannot find MacTeX installation; aborting"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-latex-extra \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-latex-recommended \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-math-science
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "The mactex variant will install styles to MacTeX's texmf-local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dblatex.texmflocal}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (which is outside macport's common directory structure).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ For the mactex variant to work,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dblatex.mactex_bin} must also be added to binpath in macports.conf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # AND, since we're installing files outside macports' normal directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
reinplace "s|${destroot}${prefix}|${prefix}|g" ${destroot}${python.prefix}/bin/dblatex
reinplace "s|#!/usr/bin/env python|#!${python.bin}|" ${destroot}${python.prefix}/bin/dblatex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,25 +105,40 @@ post-destroot {
</span> ln -s ${python.prefix}/share/$f ${destroot}${prefix}/share/$f
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${texlive_texmflocal}/tex/latex/dblatex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mactex]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dblatex.texmflocal ${texlive_texmflocal}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${dblatex.texmflocal}/tex/latex/dblatex
</span> fs-traverse f ${destroot}${python.prefix}/share/dblatex/latex {
if {[file isfile $f]} {
if {[catch {exec ${prefix}/bin/kpsewhich -a [file tail $f]} result]} {
set f [string range $f [string length ${destroot}${python.prefix}/share/dblatex/latex/] end]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir [file dirname ${destroot}${texlive_texmflocal}/tex/latex/dblatex/$f]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${python.prefix}/share/dblatex/latex/$f ${destroot}${texlive_texmflocal}/tex/latex/dblatex/$f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir [file dirname ${destroot}${dblatex.texmflocal}/tex/latex/dblatex/$f]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${python.prefix}/share/dblatex/latex/$f ${destroot}${dblatex.texmflocal}/tex/latex/dblatex/$f
</span> }
}
}
ln -s ${python.prefix}/bin/dblatex ${destroot}${prefix}/bin/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc dblatex.mktexlsr {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mactex]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ texlive.mktexlsr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global dblatex.mactex_bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${dblatex.mactex_bin}/mktexlsr"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [file exists "${dblatex.mactex_bin}/mtxrun"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${dblatex.mactex_bin}/mtxrun --generate"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- texlive.mktexlsr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dblatex.mktexlsr
</span> }
post-deactivate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- texlive.mktexlsr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dblatex.mktexlsr
</span> }
livecheck.regex /${name}-(\[0-9.\]+)/
</pre><pre style='margin:0'>
</pre>