<!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>[120421] 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/120421">120421</a></dd>
<dt>Author</dt> <dd>dports@macports.org</dd>
<dt>Date</dt> <dd>2014-05-27 18:25:04 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[/users/dports] texlive-bin: update patches for 2014 prerelease version</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdportsportstextexlivebinPortfile">users/dports/ports/tex/texlive-bin/Portfile</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchtexk_kpathsea_Makefileindiff">users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdportsportstextexlivebinfilespatchlibsfreetypeMakefileindiff">users/dports/ports/tex/texlive-bin/files/patch-libs-freetype-Makefile.in.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchsvn31126luatexdiff">users/dports/ports/tex/texlive-bin/files/patch-svn31126-luatex.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchsvn31303dvipdfmxdiff">users/dports/ports/tex/texlive-bin/files/patch-svn31303-dvipdfmx.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchsvn31313pdftexluatexdiff">users/dports/ports/tex/texlive-bin/files/patch-svn31313-pdftex-luatex.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchsvn31350dvipsdiff">users/dports/ports/tex/texlive-bin/files/patch-svn31350-dvips.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchsvn31358luatexdiff">users/dports/ports/tex/texlive-bin/files/patch-svn31358-luatex.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchsvn31547dvipsdiff">users/dports/ports/tex/texlive-bin/files/patch-svn31547-dvips.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchsvn31621mendexdiff">users/dports/ports/tex/texlive-bin/files/patch-svn31621-mendex.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchsvn31700dvipdfmxdiff">users/dports/ports/tex/texlive-bin/files/patch-svn31700-dvipdfmx.diff</a></li>
<li><a href="#usersdportsportstextexlivebinfilespatchsvn31735metapostdiff">users/dports/ports/tex/texlive-bin/files/patch-svn31735-metapost.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 (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/Portfile 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/Portfile 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx"> PortGroup texlive 1.0
</span><span class="cx">
</span><span class="cx"> name texlive-bin
</span><del>-version 2013
-revision 5
</del><ins>+version 2014
</ins><span class="cx">
</span><span class="cx"> categories tex
</span><span class="cx"> maintainers dports
</span><span class="lines">@@ -31,21 +30,21 @@
</span><span class="cx"> # download time, it omits a number of libraries and utilities that we
</span><span class="cx"> # don't build. However, the port should still work with an unmodified
</span><span class="cx"> # texlive distfile.
</span><del>-master_sites http://giraffe.cs.washington.edu/texlive/
-set distversion 20130619
</del><ins>+master_sites http://giraffe.cs.washington.edu/texlive/test/
+set distversion 20140523
</ins><span class="cx"> use_xz yes
</span><del>-distname texlive-source-${distversion}-stripped
</del><ins>+distname texlive-source-${distversion}
</ins><span class="cx"> worksrcdir ${distname}
</span><span class="cx">
</span><span class="cx"> set tlpkgdistname tlpkg-TeXLive-${distversion}
</span><span class="cx"> distfiles-append ${tlpkgdistname}${extract.suffix}
</span><span class="cx">
</span><del>-checksums texlive-source-20130619-stripped.tar.xz \
- rmd160 566e82917575c8d26a90c73b3d5a780a6017462a \
- sha256 7a5fc3574f3609fc722cc0f7e6a6b9989d03f2ef536ac13412e152717b6a3172 \
- tlpkg-TeXLive-20130619.tar.xz \
- rmd160 fd998013e216d576b41986183069adaeb637f56b \
- sha256 77c1d0859025f28410805ec493f384c705279e94471790aac7ba80badd586a74
</del><ins>+checksums texlive-source-20140523.tar.xz \
+ rmd160 8c997a79b96c8421d240b3c7a358494512e7fc26 \
+ sha256 f2eedab7d41b043628c39a9323756a758927361982ec40ef24cd512fb2628965 \
+ tlpkg-TeXLive-20140523.tar.xz \
+ rmd160 bd83d1b4e9594ad8d640d48f641d474c73177c31 \
+ sha256 3fe73ca2adf58f1698d23466261204242d5f897729902c786209220304692172
</ins><span class="cx">
</span><span class="cx"> depends_lib port:fontconfig \
</span><span class="cx"> port:freetype \
</span><span class="lines">@@ -73,27 +72,13 @@
</span><span class="cx"> patchfiles-append patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
</span><span class="cx">
</span><span class="cx"> # patches related to changes in install paths
</span><del>-patchfiles-append patch-texk_kpathsea_Makefile.in.diff \
- patch-texk_tex4htk_Makefile.in.diff \
- patch-texk_texlive_linked_scripts_Makefile.in.diff \
- patch-texk_texlive_tl_scripts_Makefile.in.diff \
- patch-texk_xdvik_xdvi-sh.in.diff \
- patch-texk_chktex_Makefile.in.diff
</del><ins>+patchfiles-append patch-texk_kpathsea_Makefile.in.diff \
+ patch-texk_tex4htk_Makefile.in.diff \
+ patch-texk_texlive_linked_scripts_Makefile.in.diff \
+ patch-texk_texlive_tl_scripts_Makefile.in.diff \
+ patch-texk_xdvik_xdvi-sh.in.diff \
+ patch-texk_chktex_Makefile.in.diff
</ins><span class="cx">
</span><del>-# # fixes for makefile brokenness not otherwise specified
-patchfiles-append patch-libs-freetype-Makefile.in.diff
-
-# backported fixes from upstream
-# svn31700 fixes #39334
-patchfiles-append patch-svn31126-luatex.diff \
- patch-svn31303-dvipdfmx.diff \
- patch-svn31313-pdftex-luatex.diff \
- patch-svn31350-dvips.diff \
- patch-svn31358-luatex.diff \
- patch-svn31621-mendex.diff \
- patch-svn31700-dvipdfmx.diff \
- patch-svn31735-metapost.diff
-
</del><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></pre></div>
<a id="usersdportsportstextexlivebinfilespatchlibsfreetypeMakefileindiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-libs-freetype-Makefile.in.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-libs-freetype-Makefile.in.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs-freetype-Makefile.in.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- libs/freetype/Makefile.in.orig 2010-05-17 01:44:34.000000000 -0400
-+++ libs/freetype/Makefile.in 2010-05-17 01:45:55.000000000 -0400
-@@ -465,6 +465,8 @@
- dist-hook:
- rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
-
-+export
-+
- ft-build/Makefile:
- rm -rf ft-build
- $(mkdir_p) ft-build
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchsvn31126luatexdiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31126-luatex.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-svn31126-luatex.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-svn31126-luatex.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-upstream svn31126 fix for luatex
----
- texk/web2c/luatexdir/ChangeLog | 5 +++++
- texk/web2c/luatexdir/pdf/pdfgen.w | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
---- texk/web2c/luatexdir/pdf/pdfgen.w
-+++ texk/web2c/luatexdir/pdf/pdfgen.w
-@@ -572,7 +572,7 @@
- {
- char s[24];
- int w;
-- w = snprintf(s, 23, "%" LONGINTEGER_PRI "d", n);
-+ w = snprintf(s, 23, "%" LONGINTEGER_PRI "d", (LONGINTEGER_TYPE) n);
- check_nprintf(w, 23);
- pdf_out_block(pdf, (const char *) s, (size_t) w);
- }
-@@ -719,7 +719,7 @@
- if (pdf->seek_write_length && pdf->draftmode == 0) {
- xfseeko(pdf->file, (off_t)pdf->stream_length_offset, SEEK_SET,
- pdf->job_name);
-- fprintf(pdf->file, "%" LONGINTEGER_PRI "i", pdf->stream_length);
-+ fprintf(pdf->file, "%" LONGINTEGER_PRI "i", (LONGINTEGER_TYPE) pdf->stream_length);
- xfseeko(pdf->file, 0, SEEK_END, pdf->job_name);
- }
- pdf->seek_write_length = false;
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchsvn31303dvipdfmxdiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31303-dvipdfmx.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-svn31303-dvipdfmx.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-svn31303-dvipdfmx.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-upstream svn31303 fix for dvipdfmx
----
- texk/dvipdfmx/src/jpegimage.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- texk/dvipdfmx/src/jpegimage.c
-+++ texk/dvipdfmx/src/jpegimage.c
-@@ -360,7 +360,7 @@
- struct JPEG_APPn_JFIF *app_data;
- int i;
- for (i = 0; i < j_info->num_appn; i++) {
-- if (j_info->appn[i].marker == JM_APP0 ||
-+ if (j_info->appn[i].marker == JM_APP0 &&
- j_info->appn[i].app_sig == JS_APPn_JFIF)
- break;
- }
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchsvn31313pdftexluatexdiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31313-pdftex-luatex.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-svn31313-pdftex-luatex.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-svn31313-pdftex-luatex.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,81 +0,0 @@
</span><del>-upstream svn31313 fix for pdftex and luatex
----
- texk/web2c/luatexdir/ChangeLog | 5 +++++
- texk/web2c/luatexdir/font/writettf.w | 7 +++----
- texk/web2c/pdftexdir/ChangeLog | 5 +++++
- texk/web2c/pdftexdir/ttf2afm.c | 6 +++---
- texk/web2c/pdftexdir/writettf.c | 7 +++----
- 5 files changed, 19 insertions(+), 11 deletions(-)
-
---- texk/web2c/luatexdir/font/writettf.w
-+++ texk/web2c/luatexdir/font/writettf.w
-@@ -816,14 +816,13 @@
- }
- }
- break;
-+ default:
-+ pdftex_warn("unsupported format (%.8X) of `post' table, assuming 3.0",
-+ (unsigned int) post_format);
- case 0x00030000:
- for (glyph = glyph_tab; glyph - glyph_tab < NMACGLYPHS; glyph++) {
- glyph->name_index = (TTF_USHORT) (glyph - glyph_tab);
- }
-- break;
-- default:
-- pdftex_fail("unsupported format (%.8X) of `post' table",
-- (unsigned int) post_format);
- }
- }
-
---- texk/web2c/pdftexdir/ChangeLog
-+++ texk/web2c/pdftexdir/ChangeLog
-@@ -1,3 +1,8 @@
-+2013-07-30 Peter Breitenlohner <peb@mppmu.mpg.de>
-+
-+ * ttf2afm.c, writettf.c: Treat unknown 'post' table versions
-+ (found in some broken fonts) as 3.0, i.e., no Glyph names.
-+
- 2013-04-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-
- * pdftex.web: pdftex_revision = "14"
---- texk/web2c/pdftexdir/ttf2afm.c
-+++ texk/web2c/pdftexdir/ttf2afm.c
-@@ -521,15 +521,15 @@
- }
- }
- break;
-+ default:
-+ ttf_warn("unsupported format (%.8X) of `post' table, assuming 3.0",
-+ post_format);
- case 0x00030000:
- if (print_glyph == AS_NAME) {
- ttf_warn
- ("no names available in `post' table, print glyph names as indices");
- print_glyph = AS_INDEX;
- }
-- break;
-- default:
-- ttf_fail("unsupported format (%.8X) of `post' table", post_format);
- }
- ttf_seek_tab("loca", 0);
- if (loca_format == 1) {
---- texk/web2c/pdftexdir/writettf.c
-+++ texk/web2c/pdftexdir/writettf.c
-@@ -517,14 +517,13 @@
- }
- }
- break;
-+ default:
-+ pdftex_warn("unsupported format (%.8X) of `post' table, assuming 3.0",
-+ (unsigned int) post_format);
- case 0x00030000:
- for (glyph = glyph_tab; glyph - glyph_tab < NMACGLYPHS; glyph++) {
- glyph->name_index = glyph - glyph_tab;
- }
-- break;
-- default:
-- pdftex_fail("unsupported format (%.8X) of `post' table",
-- (unsigned int) post_format);
- }
- }
-
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchsvn31350dvipsdiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31350-dvips.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-svn31350-dvips.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-svn31350-dvips.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-upstream svn31350 fix dvips
----
- texk/dvipsk/ChangeLog | 5 +++++
- texk/dvipsk/bbox.c | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
- 2013-04-07 Karl Berry <karl@tug.org>
-
- * resident.c (getdefaults) <m>: if <= 0, set to INT_MAX.
---- texk/dvipsk/bbox.c
-+++ texk/dvipsk/bbox.c
-@@ -346,8 +346,8 @@
- if (v - bcd->ury < lly) lly = v - bcd->ury;
- if (v - bcd->lly > ury) ury = v - bcd->lly;
- } else {
-- if (h + bcd->ury < llx) llx = h + bcd->ury;
-- if (h + bcd->lly > urx) urx = h + bcd->lly;
-+ if (h + bcd->ury > urx) urx = h + bcd->ury;
-+ if (h + bcd->lly < llx) llx = h + bcd->lly;
- if (v + bcd->llx < lly) lly = v + bcd->llx;
- if (v + bcd->urx > ury) ury = v + bcd->urx;
- }
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchsvn31358luatexdiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31358-luatex.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-svn31358-luatex.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-svn31358-luatex.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>-upstream svn31358 fix for luatex
----
- texk/web2c/luatexdir/ChangeLog | 5 +++++
- texk/web2c/luatexdir/font/writecff.w | 2 ++
- 2 files changed, 7 insertions(+)
-
---- texk/web2c/luatexdir/font/writecff.w
-+++ texk/web2c/luatexdir/font/writecff.w
-@@ -3389,6 +3389,8 @@
- }
- pdf_begin_obj(pdf, cidset, OBJSTM_NEVER);
- pdf_begin_dict(pdf);
-+ pdf_dict_add_streaminfo(pdf);
-+ pdf_end_dict(pdf);
- pdf_begin_stream(pdf);
- pdf_out_block(pdf, stream, l);
- pdf_end_stream(pdf);
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchsvn31547dvipsdiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31547-dvips.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-svn31547-dvips.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-svn31547-dvips.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-upstream svn31547 fix for dvips
----
- texk/dvipsk/ChangeLog | 5 +++++
- texk/dvipsk/writet1.c | 4 +++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
- 2013-08-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-
- * bbox.c: Fix a bug in bbdopage() to obtain correct BoundingBox in
---- texk/dvipsk/writet1.c
-+++ texk/dvipsk/writet1.c
-@@ -1167,7 +1167,9 @@
- t1_getline();
- while (!t1_prefix("/Encoding")) {
- t1_scan_param();
-- t1_putline();
-+ if (!(t1_prefix("/UniqueID") &&
-+ !strncmp(t1_line_array + strlen(t1_line_array) -4, "def", 3)))
-+ t1_putline();
- t1_getline();
- }
- if (is_reencoded(fm_cur))
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchsvn31621mendexdiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31621-mendex.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-svn31621-mendex.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-svn31621-mendex.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,78 +0,0 @@
</span><del>-upstream svn31621 fix for mendex
----
- texk/mendexk/ChangeLog | 9 +++++++++
- texk/mendexk/Makefile.am | 9 +++++++++
- texk/mendexk/fwrite.c | 4 ++--
- texk/mendexk/tests/foo.idx | 3 +++
- texk/mendexk/tests/foo.ind | 5 +++++
- texk/mendexk/tests/mendex.test | 16 ++++++++++++++++
- 6 files changed, 44 insertions(+), 2 deletions(-)
-
---- texk/mendexk/Makefile.am
-+++ texk/mendexk/Makefile.am
-@@ -50,3 +50,12 @@
- indexsty \
- mendex.doc
-
-+## Tests
-+##
-+TESTS = tests/mendex.test
-+EXTRA_DIST += $(TESTS)
-+
-+## tests/mendex.test
-+EXTRA_DIST += tests/foo.idx tests/foo.ind
-+DISTCLEANFILES = foo.*
-+
---- texk/mendexk/fwrite.c
-+++ texk/mendexk/fwrite.c
-@@ -15,7 +15,7 @@
- static void linecheck(char *lbuff, char *tmpbuff);
- static void crcheck(char *lbuff, FILE *fp);
-
--#define TAIL(x) (x+strlen(x))
-+#define TAIL(x) ((x)+strlen(x))
-
- /* if we don't have vsnprintf() */
- /* #define vsnprintf(buff,len,format,argptr) vsprintf(buff,format,argptr) */
-@@ -385,7 +385,7 @@
- }
- if (strlen(ind.p[j].enc)>0) {
- sprintf(tmpbuff,"%s%s%s",encap_prefix,ind.p[j].enc,encap_infix);
-- sprintf(tmpbuff,"%s%s%s",ind.p[j].page,encap_suffix,delim_n);
-+ sprintf(TAIL(tmpbuff),"%s%s%s",ind.p[j].page,encap_suffix,delim_n);
- linecheck(lbuff,tmpbuff);
- }
- }
---- /dev/null
-+++ texk/mendexk/tests/foo.idx
-@@ -0,0 +1,3 @@
-+\indexentry{foo|(}{1}
-+\indexentry{foo|mac}{1}
-+\indexentry{foo|)}{1}
---- /dev/null
-+++ texk/mendexk/tests/foo.ind
-@@ -0,0 +1,5 @@
-+\begin{theindex}
-+
-+ \item foo, \mac{1}, 1
-+
-+\end{theindex}
---- /dev/null
-+++ texk/mendexk/tests/mendex.test
-@@ -0,0 +1,16 @@
-+#! /bin/sh
-+
-+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
-+# You may freely use, modify and/or distribute this file.
-+
-+TEXMFCNF=$srcdir/../kpathsea
-+export TEXMFCNF
-+
-+rm -f foo.*
-+
-+./mendex $srcdir/tests/foo.idx -o foo.ind1 -t foo.ilg1 \
-+ && diff $srcdir/tests/foo.ind foo.ind1 || exit 1
-+
-+cat $srcdir/tests/foo.idx | ./mendex >foo.ind2 2>foo.ilg2 \
-+ && diff $srcdir/tests/foo.ind foo.ind2 || exit 1
-+
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchsvn31700dvipdfmxdiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31700-dvipdfmx.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-svn31700-dvipdfmx.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-svn31700-dvipdfmx.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,96 +0,0 @@
</span><del>-Index: source/texk/dvipdf-x/dpxcrypt.c
-===================================================================
---- texk/dvipdfmx/src/dpxcrypt.c (revision 31699)
-+++ texk/dvipdfmx/src/dpxcrypt.c (revision 31700)
-@@ -28,12 +28,6 @@
- # include <sys/types.h>
- #endif
- #include <string.h>
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
-
- #include "dpxcrypt.h"
-
-@@ -289,7 +283,7 @@
- #define X(a) do { *p++ = hd->a; *p++ = hd->a >> 8; \
- *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while (0)
- #else /* little endian */
--#define X(a) do { *(unsigned long *)p = (*hd).a ; p += 4; } while (0)
-+#define X(a) do { *(uint32_t *)p = (*hd).a ; p += sizeof(uint32_t); } while (0)
- #endif
- X(A);
- X(B);
-Index: source/texk/dvipdf-x/dpxcrypt.h
-===================================================================
---- texk/dvipdfmx/src/dpxcrypt.h (revision 31699)
-+++ texk/dvipdfmx/src/dpxcrypt.h (revision 31700)
-@@ -24,10 +24,16 @@
- #define _DPXCRYPT_H_
-
- #include <stdio.h>
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-
- /* libgcrypt md5 */
- typedef struct {
-- unsigned long A,B,C,D; /* chaining variables */
-+ uint32_t A,B,C,D; /* chaining variables */
- unsigned long nblocks;
- unsigned char buf[64];
- int count;
-Index: source/texk/dvipdf-x/dpxcrypt.c
-===================================================================
---- texk/xdvipdfmx/src/dpxcrypt.c (revision 31699)
-+++ texk/xdvipdfmx/src/dpxcrypt.c (revision 31700)
-@@ -28,12 +28,6 @@
- # include <sys/types.h>
- #endif
- #include <string.h>
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
-
- #include "dpxcrypt.h"
-
-@@ -289,7 +283,7 @@
- #define X(a) do { *p++ = hd->a; *p++ = hd->a >> 8; \
- *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while (0)
- #else /* little endian */
--#define X(a) do { *(unsigned long *)p = (*hd).a ; p += 4; } while (0)
-+#define X(a) do { *(uint32_t *)p = (*hd).a ; p += sizeof(uint32_t); } while (0)
- #endif
- X(A);
- X(B);
-Index: source/texk/dvipdf-x/dpxcrypt.h
-===================================================================
---- texk/xdvipdfmx/src/dpxcrypt.h (revision 31699)
-+++ texk/xdvipdfmx/src/dpxcrypt.h (revision 31700)
-@@ -24,10 +24,16 @@
- #define _DPXCRYPT_H_
-
- #include <stdio.h>
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-
- /* libgcrypt md5 */
- typedef struct {
-- unsigned long A,B,C,D; /* chaining variables */
-+ uint32_t A,B,C,D; /* chaining variables */
- unsigned long nblocks;
- unsigned char buf[64];
- int count;
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchsvn31735metapostdiff"></a>
<div class="delfile"><h4>Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31735-metapost.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-svn31735-metapost.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-svn31735-metapost.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-upstream svn31735 fix for metapost
----
- texk/web2c/mplibdir/ChangeLog | 4 ++++
- texk/web2c/mplibdir/mp.w | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
---- texk/web2c/mplibdir/mp.w
-+++ texk/web2c/mplibdir/mp.w
-@@ -1,4 +1,4 @@
--% $Id: mp.w 1918 2013-06-13 12:47:55Z taco $
-+% $Id: mp.w 1924 2013-09-20 15:02:58Z taco $
- %
- % This file is part of MetaPost;
- % the MetaPost program is in the public domain.
-@@ -32727,7 +32727,7 @@
- mp_number arg1;
- new_number (arg1);
- number_clone (arg1, x);
-- number_multiply_int (x, 16);
-+ number_multiply_int (arg1, 16);
- make_scaled (x, arg1, internal_value (mp_design_size));
- free_number (arg1);
- }
</del></span></pre></div>
<a id="usersdportsportstextexlivebinfilespatchtexk_kpathsea_Makefileindiff"></a>
<div class="modfile"><h4>Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff (120420 => 120421)</h4>
<pre class="diff"><span>
<span class="info">--- users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff 2014-05-27 23:43:42 UTC (rev 120420)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff 2014-05-28 01:25:04 UTC (rev 120421)
</span><span class="lines">@@ -1,14 +1,14 @@
</span><del>---- texk/kpathsea/Makefile.in.orig 2013-05-06 01:30:37.000000000 -0700
-+++ texk/kpathsea/Makefile.in 2013-05-06 01:31:40.000000000 -0700
-@@ -653,7 +653,6 @@
- libkpathsea_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL
- libkpathsea_la_LDFLAGS = -no-undefined -version-info $(KPSE_LT_VERSINFO)
</del><ins>+--- texk/kpathsea/Makefile.in.orig 2014-05-27 18:09:37.000000000 -0700
++++ texk/kpathsea/Makefile.in 2014-05-27 18:10:11.000000000 -0700
+@@ -690,7 +690,6 @@
+ $(am__append_1)
+ libkpathsea_la_LDFLAGS = -bindir @bindir@ -no-undefined -version-info $(KPSE_LT_VERSINFO)
</ins><span class="cx"> libkpathsea_la_LIBADD = $(LTLIBOBJS)
</span><span class="cx"> -BUILT_SOURCES = paths.h
</span><span class="cx"> libkpathsea_la_SOURCES = tex-file.c absolute.c atou.c cnf.c concat.c \
</span><span class="cx"> concat3.c concatn.c db.c debug.c dir.c elt-dirs.c expand.c \
</span><del>- extend-fname.c file-p.c find-suffix.c fn.c fontmap.c getopt.c \
-@@ -730,7 +729,7 @@
</del><ins>+ extend-fname.c file-p.c find-suffix.c fn.c fontmap.c hash.c \
+@@ -768,7 +767,7 @@
</ins><span class="cx"> xopendir.h \
</span><span class="cx"> xstat.h
</span><span class="cx">
</span><span class="lines">@@ -17,15 +17,16 @@
</span><span class="cx"> kpseaccess_SOURCES = access.c
</span><span class="cx"> kpsereadlink_SOURCES = readlink.c
</span><span class="cx"> kpsewhich_LDADD = libkpathsea.la
</span><del>-@@ -742,7 +741,6 @@
</del><ins>+@@ -780,7 +779,7 @@
</ins><span class="cx"> dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
</span><span class="cx"> dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
</span><span class="cx"> dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
</span><span class="cx"> -dist_noinst_DATA = texmf.cnf
</span><ins>++dist_noinst_DATA =
</ins><span class="cx"> bin_links = mktexlsr:texhash
</span><del>- TESTS = kpseaccess.test kpsereadlink.test kpsestat.test kpsewhich.test
- TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)'
-@@ -2144,26 +2142,6 @@
</del><ins>+ TESTS = tests/cnfnewline.test tests/kpseaccess.test \
+ tests/kpsereadlink.test tests/kpsestat.test \
+@@ -2198,26 +2197,6 @@
</ins><span class="cx">
</span><span class="cx"> $(libkpathsea_la_OBJECTS): paths.h kpathsea.h
</span><span class="cx">
</span><span class="lines">@@ -49,6 +50,6 @@
</span><span class="cx"> - rm -f paths.tmp
</span><span class="cx"> - date >$@
</span><span class="cx"> -
</span><del>- kpathsea.h: Makefile paths.h
</del><ins>+ kpathsea.h: stamp-kpathsea
+ stamp-kpathsea: Makefile paths.h
</ins><span class="cx"> $(AM_V_GEN)rm -f $@; \
</span><del>- ( echo '/* This is a generated file */'; \
</del></span></pre>
</div>
</div>
</body>
</html>