diff options
Diffstat (limited to 'print/texlive-base')
27 files changed, 214 insertions, 299 deletions
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 1286b45..872de93 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= texlive -PORTVERSION= 20140525 -PORTREVISION= 7 +PORTVERSION= 20150521 CATEGORIES= print -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ +MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ PKGNAMESUFFIX= -base DISTNAME= ${PORTNAME}-${DISTVERSION}-source DIST_SUBDIR= TeX @@ -22,15 +21,13 @@ LIB_DEPENDS= libicuio.so:${PORTSDIR}/devel/icu \ libttf.so:${PORTSDIR}/print/freetype \ libpng.so:${PORTSDIR}/graphics/png \ libzzip.so:${PORTSDIR}/devel/zziplib \ - libpoppler.so:${PORTSDIR}/graphics/poppler -# XXX -# libpotrace.so:${PORTSDIR}/graphics/potrace + libpoppler.so:${PORTSDIR}/graphics/poppler \ + libpotrace.so:${PORTSDIR}/graphics/libpotrace -CONFLICTS_INSTALL= texlive-texmf-201[23]* +CONFLICTS_INSTALL= texlive-texmf-201[234]* -USE_TEX= web2c kpathsea ptexenc texhash-bootstrap +USE_TEX= web2c kpathsea ptexenc tlmgr texhash-bootstrap USES= ghostscript gmake pkgconfig perl5 shebangfix tar:xz -USE_AUTOTOOLS= autoconf USE_PERL5= run USE_LDCONFIG= yes # during build phase gnu configure is run a lot @@ -44,22 +41,22 @@ EXCLUDE_FILES= ${DISTNAME}/texk/web2c \ ${DISTNAME}/texk/dvipsk \ ${DISTNAME}/libs/freetype2 \ ${DISTNAME}/libs/gd \ - ${DISTNAME}/libs/graphite \ + ${DISTNAME}/libs/gmp \ + ${DISTNAME}/libs/graphite2 \ ${DISTNAME}/libs/icu \ - ${DISTNAME}/libs/liblua52 \ - ${DISTNAME}/libs/libluajit \ + ${DISTNAME}/libs/lua52 \ + ${DISTNAME}/libs/luajit \ ${DISTNAME}/libs/libpaper \ ${DISTNAME}/libs/libpng \ + ${DISTNAME}/libs/mpfr \ ${DISTNAME}/libs/pixman \ ${DISTNAME}/libs/poppler \ ${DISTNAME}/libs/teckit \ ${DISTNAME}/libs/xpdf \ ${DISTNAME}/libs/zlib \ ${DISTNAME}/libs/zziplib \ - ${DISTNAME}/utils/biber \ - ${DISTNAME}/utils/t1utils -# XXX -# ${DISTNAME}/libs/potrace + ${DISTNAME}/utils/t1utils \ + ${DISTNAME}/libs/potrace EXTRACT_AFTER_ARGS= ${EXCLUDE_FILES:S,^,--exclude ,} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-native-texlive-build \ @@ -81,173 +78,60 @@ CONFIGURE_ARGS= --disable-native-texlive-build \ --with-system-cairo \ --with-system-gd \ --with-system-graphite \ - --with-system-icu \ - --with-icu-include=${LOCALBASE}/include \ - --with-icu-libdir=${LOCALBASE}/lib \ - --with-system-kpathsea \ - --with-kpathsea-include=${LOCALBASE}/include/kpathsea \ - --with-kpathsea-libdir=${LOCALBASE}/lib \ - --with-system-libgs \ - --with-libgs-includes=${LOCALBASE}/include \ - --with-libgs-libdir=${LOCALBASE}/lib \ - --with-system-libpaper \ - --with-libpaper-includes=${LOCALBASE}/include \ - --with-libpaper-libdir=${LOCALBASE}/lib \ - --with-system-libpng \ --with-system-pixman \ --with-system-poppler \ - --with-system-ptexenc \ - --with-ptexenc-include=${LOCALBASE}/include/ptexenc \ - --with-ptexenc-libdir=${LOCALBASE}/lib \ --with-system-t1lib \ - --with-system-teckit \ --with-xpdf-includes=${LOCALBASE}/include/poppler \ --with-xpdf-libdir=${LOCALBASE}/lib \ --with-system-xpdf \ --with-system-zziplib \ --with-system-zlib -# XXX -# --with-system-potrace +.for L in gmp icu kpathsea libgs libpng libpaper mpfr ptexenc potrace teckit +CONFIGURE_ARGS+=--with-system-$L \ + --with-$L-include=${LOCALBASE}/include \ + --with-$L-libdir=${LOCALBASE}/lib +.endfor -CFLAGS+= -I${LOCALBASE}/include \ - -I${LOCALBASE}/include/kpathsea \ - -I${LOCALBASE}/include/ptexenc +CFLAGS+= -I${LOCALBASE}/include PLIST_SUB= INSTALL_DATA="${INSTALL_DATA}" INSTALL_TARGET= install-strip -SHEBANG_FILES= texk/texlive/linked_scripts/a2ping/a2ping.pl \ - texk/texlive/linked_scripts/accfonts/mkt1font \ - texk/texlive/linked_scripts/accfonts/vpl2ovp \ - texk/texlive/linked_scripts/accfonts/vpl2vpl \ - texk/texlive/linked_scripts/adhocfilelist/adhocfilelist.sh \ - texk/texlive/linked_scripts/arara/arara.sh \ - texk/texlive/linked_scripts/authorindex/authorindex \ - texk/texlive/linked_scripts/bibexport/bibexport.sh \ - texk/texlive/linked_scripts/bundledoc/arlatex \ - texk/texlive/linked_scripts/bundledoc/bundledoc \ - texk/texlive/linked_scripts/cachepic/cachepic.tlu \ - texk/texlive/linked_scripts/checkcites/checkcites.lua \ - texk/texlive/linked_scripts/context/perl/mptopdf.pl \ - texk/texlive/linked_scripts/context/stubs/unix/context \ - texk/texlive/linked_scripts/context/stubs/unix/contextjit \ - texk/texlive/linked_scripts/context/stubs/unix/ctxtools \ - texk/texlive/linked_scripts/context/stubs/unix/luatools \ - texk/texlive/linked_scripts/context/stubs/unix/mtxrun \ - texk/texlive/linked_scripts/context/stubs/unix/mtxrunjit \ - texk/texlive/linked_scripts/context/stubs/unix/pstopdf \ - texk/texlive/linked_scripts/context/stubs/unix/texexec \ - texk/texlive/linked_scripts/context/stubs/unix/texmfstart \ - texk/texlive/linked_scripts/convbkmk/convbkmk.rb \ - texk/texlive/linked_scripts/ctanify/ctanify \ - texk/texlive/linked_scripts/ctanupload/ctanupload.pl \ - texk/texlive/linked_scripts/de-macro/de-macro \ - texk/texlive/linked_scripts/dosepsbin/dosepsbin.pl \ - texk/texlive/linked_scripts/dtxgen/dtxgen \ - texk/texlive/linked_scripts/dviasm/dviasm.py \ - texk/texlive/linked_scripts/ebong/ebong.py \ - texk/texlive/linked_scripts/epspdf/epspdf.tlu \ - texk/texlive/linked_scripts/epspdf/epspdftk.tcl \ - texk/texlive/linked_scripts/epstopdf/epstopdf.pl \ - texk/texlive/linked_scripts/exceltex/exceltex \ - texk/texlive/linked_scripts/fig4latex/fig4latex \ - texk/texlive/linked_scripts/findhyph/findhyph \ - texk/texlive/linked_scripts/fontools/afm2afm \ - texk/texlive/linked_scripts/fontools/autoinst \ - texk/texlive/linked_scripts/fontools/ot2kpx \ - texk/texlive/linked_scripts/fragmaster/fragmaster.pl \ - texk/texlive/linked_scripts/glossaries/makeglossaries \ - texk/texlive/linked_scripts/installfont/installfont-tl \ - texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap-sys.sh \ - texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl \ - texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl \ - texk/texlive/linked_scripts/kotex-utils/jamo-normalize.pl \ - texk/texlive/linked_scripts/kotex-utils/komkindex.pl \ - texk/texlive/linked_scripts/kotex-utils/ttf2kotexfont.pl \ - texk/texlive/linked_scripts/latex-git-log/latex-git-log \ - texk/texlive/linked_scripts/latex2man/latex2man \ - texk/texlive/linked_scripts/latexdiff/latexdiff-vc.pl \ - texk/texlive/linked_scripts/latexdiff/latexdiff.pl \ - texk/texlive/linked_scripts/latexdiff/latexrevise.pl \ - texk/texlive/linked_scripts/latexfileversion/latexfileversion \ - texk/texlive/linked_scripts/latexindent/latexindent.pl \ - texk/texlive/linked_scripts/latexmk/latexmk.pl \ - texk/texlive/linked_scripts/latexpand/latexpand \ - texk/texlive/linked_scripts/lilyglyphs/lily-glyph-commands.py \ - texk/texlive/linked_scripts/lilyglyphs/lily-image-commands.py \ - texk/texlive/linked_scripts/lilyglyphs/lily-rebuild-pdfs.py \ - texk/texlive/linked_scripts/listbib/listbib \ - texk/texlive/linked_scripts/listings-ext/listings-ext.sh \ - texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \ - texk/texlive/linked_scripts/ltximg/ltximg.pl \ - texk/texlive/linked_scripts/lua2dox/lua2dox_filter \ - texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua \ - texk/texlive/linked_scripts/m-tx/m-tx.lua \ - texk/texlive/linked_scripts/match_parens/match_parens \ - texk/texlive/linked_scripts/mathspic/mathspic.pl \ - texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \ - texk/texlive/linked_scripts/mkgrkindex/mkgrkindex \ - texk/texlive/linked_scripts/mkjobtexmf/mkjobtexmf.pl \ - texk/texlive/linked_scripts/mkpic/mkpic \ - texk/texlive/linked_scripts/multibibliography/multibibliography.pl \ - texk/texlive/linked_scripts/musixtex/musixflx.lua \ - texk/texlive/linked_scripts/musixtex/musixtex.lua \ - texk/texlive/linked_scripts/oberdiek/pdfatfi.pl \ - texk/texlive/linked_scripts/pax/pdfannotextractor.pl \ - texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl \ - texk/texlive/linked_scripts/pdfjam/pdf180 \ - texk/texlive/linked_scripts/pdfjam/pdf270 \ - texk/texlive/linked_scripts/pdfjam/pdf90 \ - texk/texlive/linked_scripts/pdfjam/pdfbook \ - texk/texlive/linked_scripts/pdfjam/pdfflip \ - texk/texlive/linked_scripts/pdfjam/pdfjam \ - texk/texlive/linked_scripts/pdfjam/pdfjam-pocketmod \ - texk/texlive/linked_scripts/pdfjam/pdfjam-slides3up \ - texk/texlive/linked_scripts/pdfjam/pdfjam-slides6up \ - texk/texlive/linked_scripts/pdfjam/pdfjoin \ - texk/texlive/linked_scripts/pdfjam/pdfnup \ - texk/texlive/linked_scripts/pdfjam/pdfpun \ - texk/texlive/linked_scripts/pedigree-perl/pedigree.pl \ - texk/texlive/linked_scripts/perltex/perltex.pl \ - texk/texlive/linked_scripts/pfarrei/a5toa4.tlu \ - texk/texlive/linked_scripts/pfarrei/pfarrei.tlu \ - texk/texlive/linked_scripts/pkfix-helper/pkfix-helper \ - texk/texlive/linked_scripts/pkfix/pkfix.pl \ - texk/texlive/linked_scripts/pmx/pmx2pdf.lua \ - texk/texlive/linked_scripts/pmxchords/pmxchords.lua \ - texk/texlive/linked_scripts/pst-pdf/ps4pdf \ - texk/texlive/linked_scripts/pst2pdf/pst2pdf.pl \ - texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua \ - texk/texlive/linked_scripts/purifyeps/purifyeps \ - texk/texlive/linked_scripts/pythontex/depythontex.py \ - texk/texlive/linked_scripts/pythontex/pythontex.py \ - texk/texlive/linked_scripts/rubik/rubikrotation.pl \ - texk/texlive/linked_scripts/scripts.lst \ - texk/texlive/linked_scripts/simpdftex/simpdftex \ - texk/texlive/linked_scripts/splitindex/splitindex.pl \ - texk/texlive/linked_scripts/sty2dtx/sty2dtx.pl \ - texk/texlive/linked_scripts/svn-multi/svn-multi.pl \ - texk/texlive/linked_scripts/texcount/texcount.pl \ - texk/texlive/linked_scripts/texdef/texdef.pl \ - texk/texlive/linked_scripts/texdiff/texdiff \ - texk/texlive/linked_scripts/texdirflatten/texdirflatten \ - texk/texlive/linked_scripts/texdoc/texdoc.tlu \ - texk/texlive/linked_scripts/texfot/texfot.pl \ - texk/texlive/linked_scripts/texlive/rungs.tlu \ - texk/texlive/linked_scripts/texlive/tlmgr.pl \ - texk/texlive/linked_scripts/texlive/updmap.pl \ - texk/texlive/linked_scripts/texliveonfly/texliveonfly.py \ - texk/texlive/linked_scripts/texloganalyser/texloganalyser \ - texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl \ - texk/texlive/linked_scripts/typeoutfileinfo/typeoutfileinfo.sh \ - texk/texlive/linked_scripts/ulqda/ulqda.pl \ - texk/texlive/linked_scripts/urlbst/urlbst \ - texk/texlive/linked_scripts/vpe/vpe.pl +SHEBANG_FILES= texk/texlive/linked_scripts/accfonts/mkt1font \ + texk/texlive/linked_scripts/accfonts/vpl2ovp \ + texk/texlive/linked_scripts/accfonts/vpl2vpl \ + texk/texlive/linked_scripts/arara/arara.sh \ + texk/texlive/linked_scripts/bibexport/bibexport.sh \ + texk/texlive/linked_scripts/convbkmk/convbkmk.rb \ + texk/texlive/linked_scripts/ctanupload/ctanupload.pl \ + texk/texlive/linked_scripts/de-macro/de-macro \ + texk/texlive/linked_scripts/dtxgen/dtxgen \ + texk/texlive/linked_scripts/exceltex/exceltex \ + texk/texlive/linked_scripts/findhyph/findhyph \ + texk/texlive/linked_scripts/fragmaster/fragmaster.pl \ + texk/texlive/linked_scripts/installfont/installfont-tl \ + texk/texlive/linked_scripts/kotex-utils/jamo-normalize.pl \ + texk/texlive/linked_scripts/latexpand/latexpand \ + texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \ + texk/texlive/linked_scripts/lua2dox/lua2dox_filter \ + texk/texlive/linked_scripts/mathspic/mathspic.pl \ + texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \ + texk/texlive/linked_scripts/multibibliography/multibibliography.pl \ + texk/texlive/linked_scripts/rubik/rubikrotation.pl \ + texk/texlive/linked_scripts/splitindex/splitindex.pl \ + texk/texlive/linked_scripts/svn-multi/svn-multi.pl \ + texk/texlive/linked_scripts/texdirflatten/texdirflatten \ + texk/texlive/linked_scripts/ulqda/ulqda.pl \ + texk/texlive/linked_scripts/urlbst/urlbst \ + texk/texlive/linked_scripts/yplan/yplan + INFO= dvipng tlbuild post-patch: - cd ${WRKSRC}/texk/texlive/tl_scripts && \ + cd ${WRKSRC}/texk/texlive && \ ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ - fmtutil-sys.sh texconfig-sys.sh updmap-sys.sh + linked_scripts/texlive/fmtutil-sys.sh \ + tl_scripts/texconfig-sys.sh \ + linked_scripts/texlive/updmap-sys.sh post-install-fmtutil: for D in ${TEXHASHDIRS}; do \ @@ -257,7 +141,7 @@ post-install-fmtutil: ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c ${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c/.keep_me ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/fmtutil.cnf \ - ${STAGEDIR}${PREFIX}/${FMTUTIL_CNF} + ${STAGEDIR}${PREFIX}/${FMTUTIL_CNF} post-install: post-install-fmtutil .ORDER: post-install-fmtutil do-texhash diff --git a/print/texlive-base/distinfo b/print/texlive-base/distinfo index e1dface..5e60be0 100644 --- a/print/texlive-base/distinfo +++ b/print/texlive-base/distinfo @@ -1,2 +1,2 @@ -SHA256 (TeX/texlive-20140525-source.tar.xz) = 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be -SIZE (TeX/texlive-20140525-source.tar.xz) = 41657688 +SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 +SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552 diff --git a/print/texlive-base/files/patch-configure b/print/texlive-base/files/patch-configure new file mode 100644 index 0000000..429162c --- /dev/null +++ b/print/texlive-base/files/patch-configure @@ -0,0 +1,36 @@ +--- configure.orig 2015-04-12 11:22:39 UTC ++++ configure +@@ -5685,6 +5685,15 @@ $as_echo "$as_me: -> installed \`zlib + as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5 + fi + fi ++# Check whether --with-teckit-includes was given. ++if test "${with_teckit_includes+set}" = set; then : ++ withval=$with_teckit_includes; ++fi ++ ++# Check whether --with-teckit-libdir was given. ++if test "${with_teckit_libdir+set}" = set; then : ++ withval=$with_teckit_libdir; ++fi + + test "x$need_teckit" = xyes && { + need_zlib=yes +@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system + as_fn_error $? "did not find graphite2" "$LINENO" 5 + fi + +-if $PKG_CONFIG teckit; then +- TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags` +- TECKIT_LIBS=`$PKG_CONFIG teckit --libs` +-elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then +- as_fn_error $? "did not find teckit" "$LINENO" 5 ++if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then ++ TECKIT_INCLUDES="-I$with_teckit_includes" ++fi ++TECKIT_LIBS="-lTECkit" ++if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then ++ TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS" + fi + + if test -n "$ac_tool_prefix"; then diff --git a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in index ebac2a4..d2e3be4 100644 --- a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in +++ b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in @@ -1,6 +1,6 @@ ---- texk/bibtex-x/Makefile.in.orig 2013-12-26 00:37:50.000000000 +0900 -+++ texk/bibtex-x/Makefile.in 2014-08-22 17:37:38.000000000 +0900 -@@ -124,8 +124,7 @@ +--- texk/bibtex-x/Makefile.in.orig 2015-03-12 14:42:02 UTC ++++ texk/bibtex-x/Makefile.in +@@ -121,8 +121,7 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @BIBTEX8_TRUE@am__EXEEXT_1 = bibtex8$(EXEEXT) @BIBTEXU_TRUE@am__EXEEXT_2 = bibtexu$(EXEEXT) @@ -10,7 +10,7 @@ PROGRAMS = $(bin_PROGRAMS) am__objects_1 = bibtex8-bibtex-1.$(OBJEXT) bibtex8-bibtex-2.$(OBJEXT) \ bibtex8-bibtex-3.$(OBJEXT) bibtex8-bibtex-4.$(OBJEXT) \ -@@ -1427,7 +1426,7 @@ +@@ -1438,7 +1437,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(DATA) config.h installdirs: @@ -19,7 +19,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1487,7 +1486,7 @@ +@@ -1498,7 +1497,7 @@ info: info-am info-am: diff --git a/print/texlive-base/files/patch-texk-chktex-Makefile.in b/print/texlive-base/files/patch-texk-chktex-Makefile.in index 70cce1d..b46867f 100644 --- a/print/texlive-base/files/patch-texk-chktex-Makefile.in +++ b/print/texlive-base/files/patch-texk-chktex-Makefile.in @@ -1,8 +1,8 @@ ---- texk/chktex/Makefile.in.orig 2013-12-26 00:37:50.000000000 +0900 -+++ texk/chktex/Makefile.in 2014-08-21 00:21:15.000000000 +0900 -@@ -123,10 +123,8 @@ +--- texk/chktex/Makefile.in.orig 2015-04-13 09:45:32 UTC ++++ texk/chktex/Makefile.in +@@ -119,10 +119,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = deweb.pl + CONFIG_CLEAN_FILES = ChkTeX.t deweb.pl CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(texmfdir)" \ @@ -13,7 +13,7 @@ PROGRAMS = $(bin_PROGRAMS) am__chktex_SOURCES_DIST = @CHKTEX_TREE@/ChkTeX.c \ @CHKTEX_TREE@/ChkTeX.h @CHKTEX_TREE@/FindErrs.c \ -@@ -1379,7 +1377,7 @@ +@@ -1405,7 +1403,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h installdirs: @@ -22,14 +22,14 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1443,8 +1441,8 @@ +@@ -1469,9 +1467,7 @@ info: info-am info-am: --install-data-am: install-configDATA install-dist_pdfdocDATA \ -- install-man install-nodist_texmfSCRIPTS install-texmfSCRIPTS -+install-data-am: \ -+ install-man +-install-data-am: install-configDATA install-man \ +- install-nodist_texmfSCRIPTS install-pdfdocDATA \ +- install-texmfSCRIPTS ++install-data-am: install-man @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am diff --git a/print/texlive-base/files/patch-texk-cjkutils-Makefile.in b/print/texlive-base/files/patch-texk-cjkutils-Makefile.in index 0571f4b..e9f1ff3 100644 --- a/print/texlive-base/files/patch-texk-cjkutils-Makefile.in +++ b/print/texlive-base/files/patch-texk-cjkutils-Makefile.in @@ -1,6 +1,6 @@ ---- texk/cjkutils/Makefile.in.orig 2013-05-22 13:57:46.000000000 +0900 -+++ texk/cjkutils/Makefile.in 2013-05-22 13:58:53.000000000 +0900 -@@ -94,7 +94,7 @@ +--- texk/cjkutils/Makefile.in.orig 2015-03-12 14:42:02 UTC ++++ texk/cjkutils/Makefile.in +@@ -121,7 +121,7 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @WIN32_TRUE@am__EXEEXT_1 = gbklatex$(EXEEXT) gbkpdflatex$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ @@ -9,7 +9,7 @@ PROGRAMS = $(bin_PROGRAMS) bg5conv_SOURCES = bg5conv.c bg5conv_OBJECTS = bg5conv.$(OBJEXT) -@@ -1084,7 +1084,7 @@ +@@ -1412,7 +1412,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) c-auto.h \ all-local installdirs: @@ -18,7 +18,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1142,7 +1142,7 @@ +@@ -1477,7 +1477,7 @@ info: info-am info-am: diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FileFinder.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FileFinder.cpp deleted file mode 100644 index 3977e5b..0000000 --- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FileFinder.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/dvisvgm/dvisvgm-1.6/src/FileFinder.cpp.orig 2014-04-13 22:09:23.000000000 +0900 -+++ texk/dvisvgm/dvisvgm-1.6/src/FileFinder.cpp 2014-08-20 23:34:37.000000000 +0900 -@@ -34,6 +34,7 @@ - #endif - #endif - -+#include <sys/time.h> - #include <cstdlib> - #include <fstream> - #include <map> diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp new file mode 100644 index 0000000..c9f0d5b --- /dev/null +++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp @@ -0,0 +1,10 @@ +--- texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp.orig 2015-03-02 08:48:21 UTC ++++ texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp +@@ -34,6 +34,7 @@ + #endif + #endif + ++#include <sys/time.h> + #include <cstdlib> + #include <fstream> + #include <map> diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Font.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp index b80454f..8444cc2 100644 --- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Font.cpp +++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp @@ -1,5 +1,5 @@ ---- texk/dvisvgm/dvisvgm-1.6/src/Font.cpp.orig 2014-04-13 22:09:23.000000000 +0900 -+++ texk/dvisvgm/dvisvgm-1.6/src/Font.cpp 2014-08-20 23:41:16.000000000 +0900 +--- texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp.orig 2015-03-02 08:48:21 UTC ++++ texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp @@ -19,6 +19,7 @@ *************************************************************************/ diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FontEncoding.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp index bf1b75d..9f03ce0 100644 --- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FontEncoding.cpp +++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp @@ -1,5 +1,5 @@ ---- texk/dvisvgm/dvisvgm-1.6/src/FontEncoding.cpp.orig 2014-01-13 17:24:56.000000000 +0900 -+++ texk/dvisvgm/dvisvgm-1.6/src/FontEncoding.cpp 2014-08-20 23:41:52.000000000 +0900 +--- texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp.orig 2015-03-02 08:48:21 UTC ++++ texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp @@ -19,6 +19,7 @@ *************************************************************************/ diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Message.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp index 2eb775a..14f28df 100644 --- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Message.cpp +++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp @@ -1,5 +1,5 @@ ---- texk/dvisvgm/dvisvgm-1.6/src/Message.cpp.orig 2014-01-13 17:24:56.000000000 +0900 -+++ texk/dvisvgm/dvisvgm-1.6/src/Message.cpp 2014-08-20 23:38:38.000000000 +0900 +--- texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp.orig 2015-03-02 08:48:21 UTC ++++ texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp @@ -19,6 +19,7 @@ *************************************************************************/ diff --git a/print/texlive-base/files/patch-texk-gsftopk-Makefile.in b/print/texlive-base/files/patch-texk-gsftopk-Makefile.in index 0ca699a..61623e5 100644 --- a/print/texlive-base/files/patch-texk-gsftopk-Makefile.in +++ b/print/texlive-base/files/patch-texk-gsftopk-Makefile.in @@ -1,6 +1,6 @@ ---- texk/gsftopk/Makefile.in.orig 2013-05-22 14:05:21.000000000 +0900 -+++ texk/gsftopk/Makefile.in 2013-05-22 14:06:17.000000000 +0900 -@@ -85,8 +85,7 @@ +--- texk/gsftopk/Makefile.in.orig 2015-03-12 14:42:02 UTC ++++ texk/gsftopk/Makefile.in +@@ -112,8 +112,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = c-auto.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -10,7 +10,7 @@ PROGRAMS = $(bin_PROGRAMS) am_gsftopk_OBJECTS = gsftopk.$(OBJEXT) gsftopk_OBJECTS = $(am_gsftopk_OBJECTS) -@@ -751,7 +750,7 @@ +@@ -818,7 +817,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) c-auto.h installdirs: @@ -19,7 +19,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -808,7 +807,7 @@ +@@ -875,7 +874,7 @@ info: info-am info-am: diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-cff.cc b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-cff.cc deleted file mode 100644 index 89f498f..0000000 --- a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-cff.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/lcdf-typetools/lcdf-typetools-2.100/libefont/cff.cc.orig 2014-01-09 21:51:50.000000000 +0900 -+++ texk/lcdf-typetools/lcdf-typetools-2.100/libefont/cff.cc 2014-08-20 23:34:37.000000000 +0900 -@@ -27,6 +27,7 @@ - #include <ctype.h> - #include <efont/t1unparser.hh> - -+#undef static_assert - #ifndef static_assert - #define static_assert(c, msg) switch (c) case 0: case (c): - #endif diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-t1interp.cc b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-t1interp.cc deleted file mode 100644 index 0af2b3d..0000000 --- a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-t1interp.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1interp.cc.orig 2014-01-09 21:51:50.000000000 +0900 -+++ texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1interp.cc 2014-08-20 23:34:37.000000000 +0900 -@@ -30,6 +30,7 @@ - #define CHECK_PATH_START() do { _state = S_PATH; } while (0) - #define CHECK_PATH_END() do { if (_state == S_PATH) { act_closepath(cmd); } _state = S_IPATH; } while (0) - -+#undef static_assert - #ifndef static_assert - # define static_assert(c, msg) switch (c) case 0: case (c): - #endif diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-Makefile.in b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-Makefile.in index b1b5eb6..2226742 100644 --- a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-Makefile.in +++ b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-Makefile.in @@ -1,6 +1,6 @@ ---- ./texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.in.orig 2014-01-09 21:51:50.000000000 +0900 -+++ ./texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.in 2014-08-22 15:36:45.000000000 +0900 -@@ -154,8 +154,8 @@ +--- texk/lcdf-typetools/lcdf-typetools-2.104/Makefile.in.orig 2015-03-12 14:42:02 UTC ++++ texk/lcdf-typetools/lcdf-typetools-2.104/Makefile.in +@@ -163,8 +163,8 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } @@ -11,7 +11,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ -@@ -703,7 +703,7 @@ +@@ -714,7 +714,7 @@ info: info-recursive info-am: diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc new file mode 100644 index 0000000..2ef57a9 --- /dev/null +++ b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc @@ -0,0 +1,10 @@ +--- texk/lcdf-typetools/lcdf-typetools-2.104/libefont/cff.cc.orig 2014-07-08 06:44:39 UTC ++++ texk/lcdf-typetools/lcdf-typetools-2.104/libefont/cff.cc +@@ -27,6 +27,7 @@ + #include <ctype.h> + #include <efont/t1unparser.hh> + ++#undef static_assert + #ifndef static_assert + #define static_assert(c, msg) switch ((int) (c)) case 0: case (c): + #endif diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc new file mode 100644 index 0000000..4c140c5 --- /dev/null +++ b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc @@ -0,0 +1,10 @@ +--- texk/lcdf-typetools/lcdf-typetools-2.104/libefont/t1interp.cc.orig 2014-07-08 06:44:39 UTC ++++ texk/lcdf-typetools/lcdf-typetools-2.104/libefont/t1interp.cc +@@ -30,6 +30,7 @@ + #define CHECK_PATH_START() do { _state = S_PATH; } while (0) + #define CHECK_PATH_END() do { if (_state == S_PATH) { act_closepath(cmd); } _state = S_IPATH; } while (0) + ++#undef static_assert + #ifndef static_assert + # define static_assert(c, msg) switch ((int) (c)) case 0: case (c): + #endif diff --git a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh new file mode 100644 index 0000000..40f8c5a --- /dev/null +++ b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh @@ -0,0 +1,8 @@ +--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh.orig 2015-04-20 07:45:42 UTC ++++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh +@@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH + # hack around a bug in zsh: + test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' + +-exec fmtutil --sys ${1+"$@"} ++exec %%PREFIX%%/bin/fmtutil --sys ${1+"$@"} diff --git a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh new file mode 100644 index 0000000..40cdf46 --- /dev/null +++ b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh @@ -0,0 +1,8 @@ +--- texk/texlive/linked_scripts/texlive/updmap-sys.sh.orig 2015-04-20 07:45:42 UTC ++++ texk/texlive/linked_scripts/texlive/updmap-sys.sh +@@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH + # hack around a bug in zsh: + test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' + +-exec updmap --sys ${1+"$@"} ++exec %%PREFIX%%/bin/updmap --sys ${1+"$@"} diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in b/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in index 6824fff..b72bce2 100644 --- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in +++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in @@ -1,6 +1,6 @@ ---- texk/texlive/tl_scripts/Makefile.in.orig 2013-12-26 00:37:50.000000000 +0900 -+++ texk/texlive/tl_scripts/Makefile.in 2014-12-15 00:41:48.000000000 +0900 -@@ -121,10 +121,9 @@ +--- texk/texlive/tl_scripts/Makefile.in.orig 2015-04-26 23:57:20 UTC ++++ texk/texlive/tl_scripts/Makefile.in +@@ -128,10 +128,9 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } @@ -13,16 +13,16 @@ SCRIPTS = $(dist_texconfig_SCRIPTS) $(dist_texmf_SCRIPTS) \ $(nodist_bin_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) -@@ -253,8 +252,6 @@ +@@ -263,8 +262,6 @@ sh_scripts = \ + dvi2fax \ dvired \ - fmtutil \ fontinst \ - kpsetool \ - kpsewhere \ ps2frag \ pslatex \ rubibtex \ -@@ -283,8 +280,6 @@ +@@ -293,8 +290,6 @@ dist_man_MANS = \ fmtutil.1 \ fmtutil.cnf.5 \ fontinst.1 \ @@ -31,7 +31,7 @@ ps2frag.1 \ pslatex.1 \ rubibtex.1 \ -@@ -296,14 +291,10 @@ +@@ -306,14 +301,10 @@ dist_man_MANS = \ bin_links = \ allcm:allec \ @@ -47,7 +47,7 @@ fmtutil:mktexfmt \ texconfig:texconfig-sys \ updmap:updmap-sys -@@ -627,7 +618,7 @@ +@@ -638,7 +629,7 @@ check-am: all-am check: check-am all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local installdirs: @@ -56,7 +56,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -681,8 +672,8 @@ +@@ -692,8 +683,8 @@ info: info-am info-am: diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil-sys.sh b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil-sys.sh deleted file mode 100644 index 58c1f28..0000000 --- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil-sys.sh +++ /dev/null @@ -1,8 +0,0 @@ ---- texk/texlive/tl_scripts/fmtutil-sys.sh.orig 2013-05-07 13:20:06.000000000 +0900 -+++ texk/texlive/tl_scripts/fmtutil-sys.sh 2013-05-07 13:20:52.000000000 +0900 -@@ -26,4 +26,4 @@ - TEXMFCONFIG="$c" - export TEXMFVAR TEXMFCONFIG - --exec fmtutil ${1+"$@"} -+exec %%PREFIX%%/bin/fmtutil ${1+"$@"} diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf index 7b99618..e964521 100644 --- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf +++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf @@ -1,6 +1,6 @@ ---- texk/texlive/tl_scripts/fmtutil.cnf.orig 2014-04-28 22:32:21.000000000 +0900 -+++ texk/texlive/tl_scripts/fmtutil.cnf 2014-08-21 00:15:56.000000000 +0900 -@@ -36,80 +36,80 @@ +--- texk/texlive/tl_scripts/fmtutil.cnf.orig 2015-05-05 22:32:32 UTC ++++ texk/texlive/tl_scripts/fmtutil.cnf +@@ -37,80 +37,80 @@ # # from aleph: @@ -118,7 +118,7 @@ # # from t2: #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini -@@ -117,20 +117,20 @@ +@@ -118,20 +118,20 @@ platex eptex language.dat *platex.ini #! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini # # from tex: diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.sh b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.sh deleted file mode 100644 index 0fcf9c2..0000000 --- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.sh +++ /dev/null @@ -1,22 +0,0 @@ ---- ./texk/texlive/tl_scripts/fmtutil.sh.orig 2014-04-21 09:17:48.000000000 +0900 -+++ ./texk/texlive/tl_scripts/fmtutil.sh 2014-08-21 05:35:01.000000000 +0900 -@@ -404,8 +404,7 @@ - ############################################################################### - mktexupd() - { -- initTexmfMain -- "$MT_TEXMFMAIN/web2c/mktexupd" "$@" -+ "$MT_MKTEXUPD" "$@" - } - - ############################################################################### -@@ -687,6 +686,9 @@ - - # remove any * for the sake of the kpsewhich lookup. - eval lastarg=\$$# -+ case $lastarg in -+ \#*) eval lastarg=\$$(($# - 1)); texargs="${texargs%\#*}" ;; -+ esac - inifile=`echo $lastarg | sed 's%^\*%%'` - - # See if we can find $inifile for return code: diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh b/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh index 9e92e55..db5746b 100644 --- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh +++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh @@ -1,6 +1,6 @@ ---- texk/texlive/tl_scripts/texconfig-sys.sh.orig 2013-05-07 13:24:39.000000000 +0900 -+++ texk/texlive/tl_scripts/texconfig-sys.sh 2013-05-07 13:24:50.000000000 +0900 -@@ -28,4 +28,4 @@ +--- texk/texlive/tl_scripts/texconfig-sys.sh.orig 2014-07-13 00:06:11 UTC ++++ texk/texlive/tl_scripts/texconfig-sys.sh +@@ -30,4 +30,4 @@ TEXMFVAR="$v" TEXMFCONFIG="$c" export TEXMFVAR TEXMFCONFIG diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-updmap-sys.sh b/print/texlive-base/files/patch-texk-texlive-tl_scripts-updmap-sys.sh deleted file mode 100644 index c82b950..0000000 --- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-updmap-sys.sh +++ /dev/null @@ -1,8 +0,0 @@ ---- texk/texlive/tl_scripts/updmap-sys.sh.orig 2013-05-07 13:25:38.000000000 +0900 -+++ texk/texlive/tl_scripts/updmap-sys.sh 2013-05-07 13:25:50.000000000 +0900 -@@ -27,4 +27,4 @@ - TEXMFCONFIG="$c" - export TEXMFVAR TEXMFCONFIG - --exec updmap ${1+"$@"} -+exec %%PREFIX%%/bin/updmap ${1+"$@"} diff --git a/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in b/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in index f5d2730..e3f2f1b 100644 --- a/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in +++ b/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in @@ -1,7 +1,7 @@ ---- texk/ttf2pk2/Makefile.in.orig 2012-04-26 20:02:04.000000000 +0900 -+++ texk/ttf2pk2/Makefile.in 2013-05-22 14:39:41.000000000 +0900 -@@ -88,9 +88,7 @@ - CONFIG_HEADER = c-auto.h +--- texk/ttf2pk2/Makefile.in.orig 2015-03-12 14:42:02 UTC ++++ texk/ttf2pk2/Makefile.in +@@ -115,9 +115,7 @@ mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ @@ -9,18 +9,18 @@ - "$(DESTDIR)$(mapdatadir)" "$(DESTDIR)$(sfddatadir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) - am__objects_1 = errormsg.$(OBJEXT) filesrch.$(OBJEXT) \ + am__objects_1 = errormsg.$(OBJEXT) filesrch.$(OBJEXT) ftlib.$(OBJEXT) \ ligkern.$(OBJEXT) newobj.$(OBJEXT) parse.$(OBJEXT) \ -@@ -1006,7 +1004,7 @@ +@@ -1321,7 +1319,7 @@ check-am: all-am check: check-am - all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) c-auto.h + all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cfgdatadir)" "$(DESTDIR)$(encdatadir)" "$(DESTDIR)$(mapdatadir)" "$(DESTDIR)$(sfddatadir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1063,8 +1061,7 @@ +@@ -1381,8 +1379,7 @@ info: info-am info-am: diff --git a/print/texlive-base/pkg-plist b/print/texlive-base/pkg-plist index 0d7efdf..1d141ad 100644 --- a/print/texlive-base/pkg-plist +++ b/print/texlive-base/pkg-plist @@ -16,9 +16,11 @@ bin/bg5+pdflatex bin/bg5conv bin/bg5latex bin/bg5pdflatex +bin/bibdoiadd bin/bibexport bin/bibtex8 bin/bibtexu +bin/bibzbladd bin/bundledoc bin/cachepic bin/cef5conv @@ -34,6 +36,7 @@ bin/cfftot1 bin/checkcites bin/chktex bin/chkweb +bin/cjk-gs-integrate bin/context bin/contextjit bin/convbkmk @@ -77,12 +80,14 @@ bin/exceltex bin/extconv bin/fig4latex bin/findhyph +bin/fixmsxpart bin/fmtutil bin/fmtutil-sys bin/fontinst bin/fragmaster bin/gbklatex bin/gbkpdflatex +bin/getmapdl bin/gsftopk bin/hbf2gf bin/ht @@ -114,6 +119,7 @@ bin/lily-image-commands bin/lily-rebuild-pdfs bin/listbib bin/listings-ext.sh +bin/ltx2crossrefxml bin/ltxfileinfo bin/ltximg bin/lua2dox_filter @@ -132,13 +138,13 @@ bin/mk4ht bin/mkgrkindex bin/mkindex bin/mkjobtexmf -bin/mkluatexfontdb bin/mkpic bin/mkt1font bin/mktexfmt bin/mmafm bin/mmpfb bin/mptopdf +bin/msxlint bin/mtxrun bin/mtxrunjit bin/multibibliography @@ -183,6 +189,7 @@ bin/pslatex bin/pst2pdf bin/ptex2pdf bin/purifyeps +bin/pygmentex bin/pythontex bin/repstopdf bin/rpdfcrop @@ -237,6 +244,7 @@ bin/vlna bin/vpe bin/vpl2ovp bin/vpl2vpl +bin/yplan man/man1/afm2pl.1.gz man/man1/allcm.1.gz man/man1/allec.1.gz @@ -274,6 +282,7 @@ man/man1/dvisvgm.1.gz man/man1/dvitodvi.1.gz man/man1/e2pall.1.gz man/man1/extconv.1.gz +man/man1/fixmsxpart.1.gz man/man1/fmtutil-sys.1.gz man/man1/fmtutil.1.gz man/man1/fontinst.1.gz @@ -287,6 +296,7 @@ man/man1/mkindex.1.gz man/man1/mktexfmt.1.gz man/man1/mmafm.1.gz man/man1/mmpfb.1.gz +man/man1/msxlint.1.gz man/man1/otfinfo.1.gz man/man1/otftotfm.1.gz man/man1/pdfclose.1.gz @@ -342,6 +352,7 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/bundledoc/bundledoc %%TEXMFDISTDIR%%/scripts/cachepic/cachepic.tlu %%TEXMFDISTDIR%%/scripts/checkcites/checkcites.lua +%%TEXMFDISTDIR%%/scripts/cjk-gs-integrate/cjk-gs-integrate.pl %%TEXMFDISTDIR%%/scripts/context/perl/mptopdf.pl %%TEXMFDISTDIR%%/scripts/context/stubs/unix/context %%TEXMFDISTDIR%%/scripts/context/stubs/unix/contextjit @@ -351,6 +362,9 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/context/stubs/unix/texexec %%TEXMFDISTDIR%%/scripts/context/stubs/unix/texmfstart %%TEXMFDISTDIR%%/scripts/convbkmk/convbkmk.rb +%%TEXMFDISTDIR%%/scripts/crossrefware/bibdoiadd.pl +%%TEXMFDISTDIR%%/scripts/crossrefware/bibzbladd.pl +%%TEXMFDISTDIR%%/scripts/crossrefware/ltx2crossrefxml.pl %%TEXMFDISTDIR%%/scripts/ctanify/ctanify %%TEXMFDISTDIR%%/scripts/ctanupload/ctanupload.pl %%TEXMFDISTDIR%%/scripts/de-macro/de-macro @@ -368,6 +382,7 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/fontools/autoinst %%TEXMFDISTDIR%%/scripts/fontools/ot2kpx %%TEXMFDISTDIR%%/scripts/fragmaster/fragmaster.pl +%%TEXMFDISTDIR%%/scripts/getmap/getmapdl.lua %%TEXMFDISTDIR%%/scripts/glossaries/makeglossaries %%TEXMFDISTDIR%%/scripts/installfont/installfont-tl %%TEXMFDISTDIR%%/scripts/jfontmaps/kanji-config-updmap-sys.sh @@ -432,6 +447,7 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/pst2pdf/pst2pdf.pl %%TEXMFDISTDIR%%/scripts/ptex2pdf/ptex2pdf.lua %%TEXMFDISTDIR%%/scripts/purifyeps/purifyeps +%%TEXMFDISTDIR%%/scripts/pygmentex/pygmentex.py %%TEXMFDISTDIR%%/scripts/pythontex/depythontex.py %%TEXMFDISTDIR%%/scripts/pythontex/pythontex.py %%TEXMFDISTDIR%%/scripts/rubik/rubikrotation.pl @@ -461,7 +477,7 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/texlive/dvired.sh %%TEXMFDISTDIR%%/scripts/texlive/e2pall.pl %%TEXMFDISTDIR%%/scripts/texlive/fmtutil-sys.sh -%%TEXMFDISTDIR%%/scripts/texlive/fmtutil.sh +%%TEXMFDISTDIR%%/scripts/texlive/fmtutil.pl %%TEXMFDISTDIR%%/scripts/texlive/fontinst.sh %%TEXMFDISTDIR%%/scripts/texlive/ps2frag.sh %%TEXMFDISTDIR%%/scripts/texlive/pslatex.sh @@ -482,6 +498,7 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/ulqda/ulqda.pl %%TEXMFDISTDIR%%/scripts/urlbst/urlbst %%TEXMFDISTDIR%%/scripts/vpe/vpe.pl +%%TEXMFDISTDIR%%/scripts/yplan/yplan %%TEXMFDISTDIR%%/web2c/fmtutil.cnf %%FMTUTIL_CNF%% %%TEXMFCONFIGDIR%%/.keep_me |