<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121466] users/dports/ports/tex/texlive-bin</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121466">121466</a></dd>
<dt>Author</dt> <dd>dports@macports.org</dd>
<dt>Date</dt> <dd>2014-06-25 20:06:32 -0700 (Wed, 25 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[/users/dports] texlive-bin: use muniversal and patches to luajit to
attempt to fix +universal variant; add missing dependency on libXi</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdportsportstextexlivebinPortfile">users/dports/ports/tex/texlive-bin/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdportsportstextexlivebinfilespatchlibs_luajit_configurediff">users/dports/ports/tex/texlive-bin/files/patch-libs_luajit_configure.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchtexk_web2c_configurediff">users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdportsportstextexlivebinPortfile"></a>
<div class="modfile"><h4>Modified: users/dports/ports/tex/texlive-bin/Portfile (121465 => 121466)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/Portfile 2014-06-26 02:39:38 UTC (rev 121465)
+++ users/dports/ports/tex/texlive-bin/Portfile 2014-06-26 03:06:32 UTC (rev 121466)
</span><span class="lines">@@ -5,6 +5,10 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx"> PortGroup texlive 1.0
</span><span class="cx">
</span><ins>+# luajittex requires muniversal (and some patches to configure
+# scripts) to build universal
+PortGroup muniversal 1.0
+
</ins><span class="cx"> name texlive-bin
</span><span class="cx"> version 2014
</span><span class="cx">
</span><span class="lines">@@ -79,6 +83,11 @@
</span><span class="cx"> patch-texk_xdvik_xdvi-sh.in.diff \
</span><span class="cx"> patch-texk_chktex_Makefile.in.diff
</span><span class="cx">
</span><ins>+# patches to luajit/luajittex's config scripts to correctly detect
+# architecture in universal builds
+patchfiles-append patch-libs_luajit_configure.diff \
+ patch-texk_web2c_configure.diff
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
</span><span class="cx"> reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/tl_scripts/Makefile.in
</span><span class="lines">@@ -171,7 +180,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant universal {}
</del><span class="cx"> configure.cppflags-delete -I${prefix}/include
</span><span class="cx"> configure.ldflags-delete -L${prefix}/lib
</span><span class="cx"> configure.cppflags-append -isystem${prefix}/include
</span><span class="lines">@@ -236,7 +244,7 @@
</span><span class="cx"> variant x11 description {Build with x11 support, using Xaw widgets for xdvi} {
</span><span class="cx"> depends_lib-append port:xorg-libXp
</span><span class="cx"> configure.args-delete --without-x --without-pdfopen
</span><del>- depends_lib-append port:xorg-libXaw
</del><ins>+ depends_lib-append port:xorg-libXaw port:xorg-libXi
</ins><span class="cx"> configure.args-append --with-xdvi-x-toolkit=xaw
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchlibs_luajit_configurediff"></a>
<div class="addfile"><h4>Added: users/dports/ports/tex/texlive-bin/files/patch-libs_luajit_configure.diff (0 => 121466)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-libs_luajit_configure.diff (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_luajit_configure.diff 2014-06-26 03:06:32 UTC (rev 121466)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>++++ libs/luajit/configure 2014-06-21 09:06:01.000000000 +0800
+--- libs/luajit/configure.orig 2014-06-25 16:40:10.000000000 +0800
+@@ -5297,7 +5297,7 @@
+
+
+ lj_save_CPPFLAGS=$CPPFLAGS
+-CPPFLAGS="$CPPFLAGS -I$srcdir/LuaJIT-2.0.3/src $LUAJIT_DEFINES -dM"
++CPPFLAGS="$CPPFLAGS $CFLAGS -I$srcdir/LuaJIT-2.0.3/src $LUAJIT_DEFINES -dM"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <lj_arch.h>
</ins></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchtexk_web2c_configurediff"></a>
<div class="addfile"><h4>Added: users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_configure.diff (0 => 121466)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_configure.diff (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_configure.diff 2014-06-26 03:06:32 UTC (rev 121466)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- texk/web2c/configure.orig 2014-06-26 10:15:18.000000000 +0800
++++ texk/web2c/configure 2014-06-26 10:16:28.000000000 +0800
+@@ -18663,8 +18663,8 @@
+
+ LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
+
+-case $host_os:$host_cpu in #(
+- *darwin*:x86_64) :
++case $CFLAGS in #(
++ *"-arch x86_64"*) :
+ LUAJIT_LDEXTRA='-pagezero_size 10000 -image_base 100000000' ;; #(
+ *) :
+ ;;
</ins></span></pre>
</div>
</div>
</body>
</html>