[137060] users/dports/ports/tex/texlive-bin
dports at macports.org
dports at macports.org
Wed Jun 3 13:59:59 PDT 2015
Revision: 137060
https://trac.macports.org/changeset/137060
Author: dports at macports.org
Date: 2015-06-03 13:59:58 -0700 (Wed, 03 Jun 2015)
Log Message:
-----------
[texlive 2015]
texlive-bin: initial update of portfile & patches to 2015 version
Modified Paths:
--------------
users/dports/ports/tex/texlive-bin/Portfile
users/dports/ports/tex/texlive-bin/files/patch-texk_chktex_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_Makefile.in.diff
Removed Paths:
-------------
users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile 2015-06-03 20:59:04 UTC (rev 137059)
+++ users/dports/ports/tex/texlive-bin/Portfile 2015-06-03 20:59:58 UTC (rev 137060)
@@ -10,8 +10,7 @@
PortGroup muniversal 1.0
name texlive-bin
-version 2014
-revision 8
+version 2015
categories tex
maintainers dports
@@ -35,21 +34,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 20140614
+master_sites http://giraffe.cs.washington.edu/texlive/test
+set distversion 20150511
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-20140614-stripped.tar.xz \
- rmd160 f34ea0015a123e86c33afbfec506a121f1508925 \
- sha256 2efe3c2a15dc5c52d7bafc2cbee8b2b499cdc034bbdcb959d4989881734380e9 \
- tlpkg-TeXLive-20140614.tar.xz \
- rmd160 24dc163913fa7d523c93cfba60f79c87cfa0e056 \
- sha256 4064edbae6536b12a43d6598bd9ae23fa0426c148adaed1fd9c536118e6b9292
+checksums texlive-source-20150511.tar.xz \
+ rmd160 6b71fc0b518e18130ddf33f1c636e4fdef7e812b \
+ sha256 0f196ed39c4cbba99622f928fa2fa2412423362d5740a74e9f65124b6eebe07f \
+ tlpkg-TeXLive-20150511.tar.xz \
+ rmd160 515a50ed1dad5a145fc9f3825c84ed67139a0d13 \
+ sha256 680374c1b1e4bcae569ea6d3c958f52b91905c8617aebaade29b5ee67b26f9f5
depends_lib port:fontconfig \
port:freetype \
@@ -72,18 +71,14 @@
depends_build path:bin/perl:perl5 \
path:bin/pkg-config:pkgconfig
-# make luatex less sensitive to zlib version changes
-# (cf. http://bugs.debian.org/581818)
-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 \
+patchfiles-append patch-texk_chktex_Makefile.in.diff \
+ 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
-
+ patch-texk_xdvik_xdvi-sh.in.diff
+
# patches to luajit/luajittex's config scripts to correctly detect
# architecture in universal builds
patchfiles-append patch-libs_luajit_configure.diff \
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_chktex_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_chktex_Makefile.in.diff 2015-06-03 20:59:04 UTC (rev 137059)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_chktex_Makefile.in.diff 2015-06-03 20:59:58 UTC (rev 137060)
@@ -1,6 +1,6 @@
---- texk/chktex/Makefile.in.orig 2013-05-07 15:47:23.000000000 -0700
-+++ texk/chktex/Makefile.in 2013-05-07 15:49:05.000000000 -0700
-@@ -562,12 +562,12 @@
+--- texk/chktex/Makefile.in.orig 2015-06-01 16:40:51.000000000 -0700
++++ texk/chktex/Makefile.in 2015-06-01 16:41:51.000000000 -0700
+@@ -616,12 +616,12 @@
# scripts
perl_scripts = deweb
sh_scripts = chkweb
@@ -9,13 +9,13 @@
nodist_bin_SCRIPTS = $(am__append_2)
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@WIN32_TRUE@@WIN32_WRAP_TRUE at wrappers = $(all_scripts:=.exe)
- @WIN32_TRUE@@WIN32_WRAP_TRUE at runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+ @WIN32_TRUE@@WIN32_WRAP_TRUE at runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
-texmfdir = $(datarootdir)/$(scriptsdir)
+texmfdir = @@TEXMFDIST@@/$(scriptsdir)
nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
texmf_SCRIPTS = $(CHKTEX_TREE)/chkweb.sh
-@@ -1521,17 +1521,12 @@
+@@ -1584,17 +1584,12 @@
echo 'script_links.am:install-links: could not find relpath script'; \
exit 1; \
}; \
@@ -28,10 +28,10 @@
for f in $($(TYPE)_scripts); do \
rm -f $$f; \
- if $(AM_V_P); then echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
-+ if $(AM_V_P); then echo "creating link '$$f' -> '$(texmfdir)/$$f.$(EXT)'"; \
++ if $(AM_V_P); then echo "creating link '$$f' -> '$(texmfdir)/$(scriptsdir)/$$f.$(EXT)'"; \
else echo " LINK $$f"; fi; \
- $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
-+ $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
++ $(LN_S) $(texmfdir)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
done
uninstall-links:
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 2015-06-03 20:59:04 UTC (rev 137059)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff 2015-06-03 20:59:58 UTC (rev 137060)
@@ -1,6 +1,7 @@
---- 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 @@
+reverted:
+--- texk/kpathsea/Makefile.in.orig 2015-06-01 16:44:11.000000000 -0700
++++ texk/kpathsea/Makefile.in 2015-06-01 16:45:05.000000000 -0700
+@@ -702,7 +702,6 @@
$(am__append_1)
libkpathsea_la_LDFLAGS = -bindir @bindir@ -no-undefined -version-info $(KPSE_LT_VERSINFO)
libkpathsea_la_LIBADD = $(LTLIBOBJS)
@@ -8,25 +9,25 @@
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 hash.c \
-@@ -768,7 +767,7 @@
- xopendir.h \
- xstat.h
+@@ -787,7 +786,7 @@
+ pkgconfigdir = ${libdir}/pkgconfig
+ pkgconfig_DATA = kpathsea.pc
++DISTCLEANFILES = paths.h kpathsea.h
-DISTCLEANFILES = paths.h stamp-paths kpathsea.h
-+DISTCLEANFILES = paths.h kpathsea.h
kpseaccess_SOURCES = access.c
kpsereadlink_SOURCES = readlink.c
kpsewhich_LDADD = libkpathsea.la
-@@ -780,7 +779,7 @@
+@@ -799,7 +798,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 =
-dist_noinst_DATA = texmf.cnf
-+dist_noinst_DATA =
bin_links = mktexlsr:texhash
TESTS = tests/cnfnewline.test tests/kpseaccess.test \
tests/kpsereadlink.test tests/kpsestat.test \
-@@ -2198,26 +2197,6 @@
+@@ -2263,26 +2262,6 @@
$(libkpathsea_la_OBJECTS): paths.h kpathsea.h
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff 2015-06-03 20:59:04 UTC (rev 137059)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff 2015-06-03 20:59:58 UTC (rev 137060)
@@ -1,21 +1,22 @@
---- texk/tex4htk/Makefile.in.orig 2013-05-07 15:38:38.000000000 -0700
-+++ texk/tex4htk/Makefile.in 2013-05-07 15:39:41.000000000 -0700
-@@ -359,12 +359,12 @@
+reverted:
+--- texk/tex4htk/Makefile.in.orig 2015-06-01 16:46:04.000000000 -0700
++++ texk/tex4htk/Makefile.in 2015-06-01 16:47:01.000000000 -0700
+@@ -407,12 +407,12 @@
LDADD = $(KPATHSEA_LIBS)
perl_scripts = mk4ht
shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex
++scriptsdir = scripts/tex4ht
-scriptsdir = texmf-dist/scripts/tex4ht
-+scriptsdir = scripts/tex4ht
nodist_bin_SCRIPTS = $(am__append_1)
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@WIN32_TRUE@@WIN32_WRAP_TRUE at wrappers = $(all_scripts:=.exe)
- @WIN32_TRUE@@WIN32_WRAP_TRUE at runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+ @WIN32_TRUE@@WIN32_WRAP_TRUE at runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
++texmfdir = @@TEXMFDIST@@/$(scriptsdir)
-texmfdir = $(datarootdir)/$(scriptsdir)
-+texmfdir = @@TEXMFDIST@@/$(scriptsdir)
dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
@WIN32_TRUE at dist_bin_SCRIPTS = $(shell_scripts:=.bat)
CLEANFILES = $(nodist_bin_SCRIPTS)
-@@ -1015,17 +1015,12 @@
+@@ -1071,17 +1071,12 @@
echo 'script_links.am:install-links: could not find relpath script'; \
exit 1; \
}; \
@@ -27,11 +28,11 @@
cd $(DESTDIR)$(bindir) && \
for f in $($(TYPE)_scripts); do \
rm -f $$f; \
++ if $(AM_V_P); then echo "creating link '$$f' -> '$(texmfdir)/$(scriptsdir)/$$f.$(EXT)'"; \
- if $(AM_V_P); then echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
-+ if $(AM_V_P); then echo "creating link '$$f' -> '$(texmfdir)/$$f.$(EXT)'"; \
else echo " LINK $$f"; fi; \
++ $(LN_S) $$(texmfdir)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
- $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
-+ $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
done
uninstall-links:
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_Makefile.in.diff 2015-06-03 20:59:04 UTC (rev 137059)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_Makefile.in.diff 2015-06-03 20:59:58 UTC (rev 137060)
@@ -1,6 +1,6 @@
---- texk/texlive/tl_scripts//Makefile.in.orig 2013-05-07 15:23:07.000000000 -0700
-+++ texk/texlive/tl_scripts//Makefile.in 2013-05-07 15:36:10.000000000 -0700
-@@ -236,13 +236,13 @@
+--- texk/texlive/tl_scripts/Makefile.in.orig 2015-04-26 16:57:20.000000000 -0700
++++ texk/texlive/tl_scripts/Makefile.in 2015-06-01 17:13:53.000000000 -0700
+@@ -275,13 +275,13 @@
texlinks
nodist_bin_SCRIPTS = $(am__append_1)
@@ -8,15 +8,15 @@
+scriptsdir = scripts/texlive
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@WIN32_TRUE@@WIN32_WRAP_TRUE at wrappers = $(all_scripts:=.exe)
- @WIN32_TRUE@@WIN32_WRAP_TRUE at runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+ @WIN32_TRUE@@WIN32_WRAP_TRUE at runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
#
#
-texmfdir = $(datarootdir)/$(scriptsdir)
-+texmfdir = @@TEXMFDIST@@/$(scriptsdir)
- dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(sh_scripts:=.sh)
++texmfdir = @@TEXMFDIR@@/$(scriptsdir)
+ dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(sh_scripts:=.sh)
dist_man_MANS = \
allcm.1 \
-@@ -279,10 +279,10 @@
+@@ -318,10 +318,10 @@
texconfig:texconfig-sys \
updmap:updmap-sys
@@ -27,9 +27,9 @@
-web2cdir = $(datarootdir)/texmf-dist/web2c
+web2cdir = @@TEXMFDIST@@/web2c
dist_web2c_DATA = fmtutil.cnf
- run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
- -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-@@ -760,17 +760,12 @@
+ linked_scripts_dir = $(top_srcdir)/linked_scripts/texlive
+ #
+@@ -803,17 +803,12 @@
echo 'script_links.am:install-links: could not find relpath script'; \
exit 1; \
}; \
Deleted: users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff 2015-06-03 20:59:04 UTC (rev 137059)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff 2015-06-03 20:59:58 UTC (rev 137060)
@@ -1,11 +0,0 @@
---- texk/web2c/luatexdir/luazlib/lzlib.c.orig 2012-02-03 14:47:18.000000000 -0500
-+++ texk/web2c/luatexdir/luazlib/lzlib.c 2012-02-03 14:49:12.000000000 -0500
-@@ -551,7 +551,7 @@
-
- /* make sure header and library version are consistent */
- const char* version = zlibVersion();
-- if (strncmp(version, ZLIB_VERSION, 5))
-+ if (strncmp(version, ZLIB_VERSION, 3))
- {
- lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
- lua_error(L);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150603/ba6c32a2/attachment.html>
More information about the macports-changes
mailing list