[120421] users/dports/ports/tex/texlive-bin
dports at macports.org
dports at macports.org
Tue May 27 18:25:04 PDT 2014
Revision: 120421
https://trac.macports.org/changeset/120421
Author: dports at macports.org
Date: 2014-05-27 18:25:04 -0700 (Tue, 27 May 2014)
Log Message:
-----------
[/users/dports] texlive-bin: update patches for 2014 prerelease version
Modified Paths:
--------------
users/dports/ports/tex/texlive-bin/Portfile
users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff
Removed Paths:
-------------
users/dports/ports/tex/texlive-bin/files/patch-libs-freetype-Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-svn31126-luatex.diff
users/dports/ports/tex/texlive-bin/files/patch-svn31303-dvipdfmx.diff
users/dports/ports/tex/texlive-bin/files/patch-svn31313-pdftex-luatex.diff
users/dports/ports/tex/texlive-bin/files/patch-svn31350-dvips.diff
users/dports/ports/tex/texlive-bin/files/patch-svn31358-luatex.diff
users/dports/ports/tex/texlive-bin/files/patch-svn31547-dvips.diff
users/dports/ports/tex/texlive-bin/files/patch-svn31621-mendex.diff
users/dports/ports/tex/texlive-bin/files/patch-svn31700-dvipdfmx.diff
users/dports/ports/tex/texlive-bin/files/patch-svn31735-metapost.diff
Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- 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)
@@ -6,8 +6,7 @@
PortGroup texlive 1.0
name texlive-bin
-version 2013
-revision 5
+version 2014
categories tex
maintainers dports
@@ -31,21 +30,21 @@
# download time, it omits a number of libraries and utilities that we
# don't build. However, the port should still work with an unmodified
# texlive distfile.
-master_sites http://giraffe.cs.washington.edu/texlive/
-set distversion 20130619
+master_sites http://giraffe.cs.washington.edu/texlive/test/
+set distversion 20140523
use_xz yes
-distname texlive-source-${distversion}-stripped
+distname texlive-source-${distversion}
worksrcdir ${distname}
set tlpkgdistname tlpkg-TeXLive-${distversion}
distfiles-append ${tlpkgdistname}${extract.suffix}
-checksums texlive-source-20130619-stripped.tar.xz \
- rmd160 566e82917575c8d26a90c73b3d5a780a6017462a \
- sha256 7a5fc3574f3609fc722cc0f7e6a6b9989d03f2ef536ac13412e152717b6a3172 \
- tlpkg-TeXLive-20130619.tar.xz \
- rmd160 fd998013e216d576b41986183069adaeb637f56b \
- sha256 77c1d0859025f28410805ec493f384c705279e94471790aac7ba80badd586a74
+checksums texlive-source-20140523.tar.xz \
+ rmd160 8c997a79b96c8421d240b3c7a358494512e7fc26 \
+ sha256 f2eedab7d41b043628c39a9323756a758927361982ec40ef24cd512fb2628965 \
+ tlpkg-TeXLive-20140523.tar.xz \
+ rmd160 bd83d1b4e9594ad8d640d48f641d474c73177c31 \
+ sha256 3fe73ca2adf58f1698d23466261204242d5f897729902c786209220304692172
depends_lib port:fontconfig \
port:freetype \
@@ -73,27 +72,13 @@
patchfiles-append patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
# patches related to changes in install paths
-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
+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
-# # 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
-
post-patch {
reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/tl_scripts/Makefile.in
Deleted: users/dports/ports/tex/texlive-bin/files/patch-libs-freetype-Makefile.in.diff
===================================================================
--- 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)
@@ -1,11 +0,0 @@
---- 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
Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31126-luatex.diff
===================================================================
--- 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)
@@ -1,26 +0,0 @@
-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;
Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31303-dvipdfmx.diff
===================================================================
--- 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)
@@ -1,16 +0,0 @@
-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;
- }
Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31313-pdftex-luatex.diff
===================================================================
--- 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)
@@ -1,81 +0,0 @@
-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 at 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 at 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);
- }
- }
-
Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31350-dvips.diff
===================================================================
--- 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)
@@ -1,22 +0,0 @@
-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 at 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;
- }
Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31358-luatex.diff
===================================================================
--- 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)
@@ -1,17 +0,0 @@
-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);
Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31547-dvips.diff
===================================================================
--- 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)
@@ -1,22 +0,0 @@
-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 at 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))
Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31621-mendex.diff
===================================================================
--- 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)
@@ -1,78 +0,0 @@
-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 at 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
-+
Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31700-dvipdfmx.diff
===================================================================
--- 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)
@@ -1,96 +0,0 @@
-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;
Deleted: users/dports/ports/tex/texlive-bin/files/patch-svn31735-metapost.diff
===================================================================
--- 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)
@@ -1,23 +0,0 @@
-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);
- }
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff
===================================================================
--- 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)
@@ -1,14 +1,14 @@
---- 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)
+--- 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)
libkpathsea_la_LIBADD = $(LTLIBOBJS)
-BUILT_SOURCES = paths.h
libkpathsea_la_SOURCES = tex-file.c absolute.c atou.c cnf.c concat.c \
concat3.c concatn.c db.c debug.c dir.c elt-dirs.c expand.c \
- extend-fname.c file-p.c find-suffix.c fn.c fontmap.c getopt.c \
-@@ -730,7 +729,7 @@
+ extend-fname.c file-p.c find-suffix.c fn.c fontmap.c hash.c \
+@@ -768,7 +767,7 @@
xopendir.h \
xstat.h
@@ -17,15 +17,16 @@
kpseaccess_SOURCES = access.c
kpsereadlink_SOURCES = readlink.c
kpsewhich_LDADD = libkpathsea.la
-@@ -742,7 +741,6 @@
+@@ -780,7 +779,7 @@
dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
-dist_noinst_DATA = texmf.cnf
++dist_noinst_DATA =
bin_links = mktexlsr:texhash
- TESTS = kpseaccess.test kpsereadlink.test kpsestat.test kpsewhich.test
- TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)'
-@@ -2144,26 +2142,6 @@
+ TESTS = tests/cnfnewline.test tests/kpseaccess.test \
+ tests/kpsereadlink.test tests/kpsestat.test \
+@@ -2198,26 +2197,6 @@
$(libkpathsea_la_OBJECTS): paths.h kpathsea.h
@@ -49,6 +50,6 @@
- rm -f paths.tmp
- date >$@
-
- kpathsea.h: Makefile paths.h
+ kpathsea.h: stamp-kpathsea
+ stamp-kpathsea: Makefile paths.h
$(AM_V_GEN)rm -f $@; \
- ( echo '/* This is a generated file */'; \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140527/2b0bd86a/attachment-0001.html>
More information about the macports-changes
mailing list