diff --git a/Mk/Uses/tex.mk b/Mk/Uses/tex.mk index c62df38e53ec..a9658b7d6500 100644 --- a/Mk/Uses/tex.mk +++ b/Mk/Uses/tex.mk @@ -1,631 +1,631 @@ # Feature: tex # Usage: USES=tex # Valid ARGS: (none) # MAINTAINER: tex@FreeBSD.org # This imports variables only, and USE_TEX= full # means full TeXLive dependency except for documentation and source. # # USE_TEX is used to enable additional specific features and # fnctionalities for tex. # # Valid keywords for USE_TEX are as following: # base: base part # texmf: texmf tree (except for documentation and source) # source: source # docs: documentation # web2c: WEB2C toolchain and TeX engines # kpathsea: kpathsea library # ptexenc: character code conversion library for pTeX # basic: basic TeX engines including tex and pdftex # tlmgr: tlmgr dependency (Perl modules) # texlua: texlua53 library # texluajit: texluajit library # synctex: synctex library # xpdfopen: pdfopen/pdfclose utility # dvipsk: dvipsk # dvipdfmx: DVIPDFMx # xdvik: XDvi # gbklatex: gbklatex # formats: TeX, LaTeX, AMSTeX, EplainTeX, # CSplainTeX, METAFONT, MLTeX, PDFTeX, TeXsis # tex: TeX # latex: LaTeX # pdftex: PDFTeX # jadetex: JadeTeX # luatex: LuaTeX # ptex: pTeX # xetex: XeTeX # xmltex: XMLTeX # # texhash: directory search hash regeneration # updmap: font map regeneration # fmtutil: format regeneration # # Examples: # USE_TEX= latex:build # USE_TEX= formats # USE_TEX= latex:build dvipsk:build .if !defined(_INCLUDE_USES_TEX_MK) _INCLUDE_USES_TEX_MK= yes # List all valid USE_TEX features here _VALID_TEX_FEATURES= base texmf source docs web2c kpathsea ptexenc basic \ tlmgr texlua texluajit synctex xpdfopen dvipsk dvipdfmx \ xdvik gbklatex formats tex latex pdftex jadetex luatex \ ptex xetex xmltex texhash texhash-bootstrap updmap fmtutil full _INVALID_TEX_FEATURES= . for var in ${USE_TEX:O:u:C/:(build|extract|lib|run|test)$//} . if empty(_VALID_TEX_FEATURES:M${var}) _INVALID_TEX_FEATURES+= ${var} . endif . endfor . if !empty(_INVALID_TEX_FEATURES) IGNORE= uses unknown USE_TEX features: ${_INVALID_TEX_FEATURES} . endif . if !empty(tex_ARGS) IGNORE= USES=tex takes no arguments . endif # Make each individual feature available as _TEX_FEATURE_ . for var in ${USE_TEX} _TEX_FEATURE_${var:C/=.*$//:tu}= ${var:C/.*=//:S/,/ /g} . endfor # default TeX distribution. "texlive" TEX_DEFAULT?= texlive .if ${TEX_DEFAULT} != texlive IGNORE= Only 'texlive' is supported as value for TEX_DEFAULT .endif TEXMFDIR?= share/texmf TEXMFDISTDIR?= share/texmf-dist TEXMFLOCALDIR?= share/texmf-local TEXMFVARDIR?= share/texmf-var TEXMFCONFIGDIR?=share/texmf-config FMTUTIL_CNF?= ${TEXMFCONFIGDIR}/web2c/fmtutil.cnf TEXHASHDIRS?= ${TEXMFDIR} ${TEXMFDISTDIR} ${TEXMFLOCALDIR} ${TEXMFVARDIR} ${TEXMFCONFIGDIR} -TEXLIVE_YEAR?= 2023 -TEXLIVE_VERSION?= ${TEXLIVE_YEAR}0313 +TEXLIVE_YEAR?= 2024 +TEXLIVE_VERSION?= ${TEXLIVE_YEAR}0312 DISTNAME_TEXMF= texlive-${TEXLIVE_VERSION}-texmf .for V in TEXMFDIR TEXMFDISTDIR TEXMFLOCALDIR TEXMFVARDIR TEXMFCONFIGDIR FMTUTIL_CNF PLIST_SUB+= $V="${$V}" .endfor _USE_TEX_TEXMF_DEP= ${LOCALBASE}/${TEXMFDISTDIR}/README _USE_TEX_TEXMF_PORT= print/${_USE_TEX_TEXMF_PKGNAME} _USE_TEX_TEXMF_PKGNAME= texlive-texmf _USE_TEX_BASE_DEP= texconfig _USE_TEX_BASE_PORT= print/${_USE_TEX_BASE_PKGNAME} _USE_TEX_BASE_PKGNAME= texlive-base _USE_TEX_GBKLATEX_DEP= gbklatex _USE_TEX_GBKLATEX_PORT= ${_USE_TEX_BASE_PORT} _USE_TEX_GBKLATEX_PKGNAME=${_USE_TEX_BASE_PKGNAME} _USE_TEX_SOURCE_DEP= ${_USE_TEX_SOURCE_PKGNAME}>=${TEXLIVE_VERSION} _USE_TEX_SOURCE_PORT= print/${_USE_TEX_SOURCE_PKGNAME} _USE_TEX_SOURCE_PKGNAME=texlive-texmf-source _USE_TEX_DOCS_DEP= ${LOCALBASE}/${TEXMFDISTDIR}/doc/texlive/texlive-en/README _USE_TEX_DOCS_PORT= print/${_USE_TEX_DOCS_PKGNAME} _USE_TEX_DOCS_PKGNAME= texlive-docs _USE_TEX_TLMGR_DEP= ${LOCALBASE}/${TEXMFDISTDIR}/.texlive-tlmgr _USE_TEX_TLMGR_PORT= print/${_USE_TEX_TLMGR_PKGNAME} _USE_TEX_TLMGR_PKGNAME= texlive-tlmgr _USE_TEX_DVIPSK_DEP= dvips _USE_TEX_DVIPSK_PORT= print/${_USE_TEX_DVIPSK_PKGNAME} _USE_TEX_DVIPSK_PKGNAME=tex-dvipsk _USE_TEX_XDVIK_DEP= xdvi _USE_TEX_XDVIK_PORT= print/${_USE_TEX_XDVIK_PKGNAME} _USE_TEX_XDVIK_PKGNAME= tex-xdvik _USE_TEX_DVIPDFMX_DEP= dvipdfmx _USE_TEX_DVIPDFMX_PORT= print/${_USE_TEX_DVIPDFMX_PKGNAME} _USE_TEX_DVIPDFMX_PKGNAME=tex-dvipdfmx _USE_TEX_BASIC_DEP= tex _USE_TEX_BASIC_PORT= print/${_USE_TEX_BASIC_PKGNAME} _USE_TEX_BASIC_PKGNAME= tex-basic-engines .for _L in TEX LATEX PDFTEX _USE_TEX_${_L}_DEP= ${_USE_TEX_FORMATS_DEP} _USE_TEX_${_L}_PORT= ${_USE_TEX_FORMATS_PORT} _USE_TEX_${_L}_PKGNAME= ${_USE_TEX_FORMATS_PKGNAME} .endfor _USE_TEX_JADETEX_DEP= jadetex _USE_TEX_JADETEX_PORT= print/${_USE_TEX_JADETEX_PKGNAME} _USE_TEX_JADETEX_PKGNAME=tex-jadetex _USE_TEX_XMLTEX_DEP= xmltex _USE_TEX_XMLTEX_PORT= print/${_USE_TEX_XMLTEX_PKGNAME} _USE_TEX_XMLTEX_PKGNAME=tex-xmltex _USE_TEX_PTEX_DEP= ptex _USE_TEX_PTEX_PORT= japanese/${_USE_TEX_PTEX_PKGNAME} _USE_TEX_PTEX_PKGNAME= tex-ptex _USE_TEX_WEB2C_DEP= weave _USE_TEX_WEB2C_PORT= devel/${_USE_TEX_WEB2C_PKGNAME} _USE_TEX_WEB2C_PKGNAME= tex-web2c _USE_TEX_KPATHSEA_DEP= libkpathsea.so _USE_TEX_KPATHSEA_PORT= devel/${_USE_TEX_KPATHSEA_PKGNAME} _USE_TEX_KPATHSEA_PKGNAME=tex-kpathsea _USE_TEX_PTEXENC_DEP= libptexenc.so _USE_TEX_PTEXENC_PORT= print/${_USE_TEX_PTEXENC_PKGNAME} _USE_TEX_PTEXENC_PKGNAME=tex-ptexenc _USE_TEX_TEXLUA_DEP= libtexlua53.so _USE_TEX_TEXLUA_PORT= devel/${_USE_TEX_TEXLUA_PKGNAME} _USE_TEX_TEXLUA_PKGNAME=tex-libtexlua _USE_TEX_TEXLUAJIT_DEP= libtexluajit.so _USE_TEX_TEXLUAJIT_PORT= devel/${_USE_TEX_TEXLUAJIT_PKGNAME} _USE_TEX_TEXLUAJIT_PKGNAME=tex-libtexluajit _USE_TEX_FORMATS_DEP= ${LOCALBASE}/${TEXMFVARDIR}/web2c/tex/tex.fmt _USE_TEX_FORMATS_PORT= print/${_USE_TEX_FORMATS_PKGNAME} _USE_TEX_FORMATS_PKGNAME=tex-formats _USE_TEX_SYNCTEX_DEP= libsynctex.so _USE_TEX_SYNCTEX_PORT= devel/${_USE_TEX_SYNCTEX_PKGNAME} _USE_TEX_SYNCTEX_PKGNAME=tex-synctex _USE_TEX_XPDFOPEN_DEP= pdfopen _USE_TEX_XPDFOPEN_PORT= print/${_USE_TEX_XPDFOPEN_PKGNAME} _USE_TEX_XPDFOPEN_PKGNAME= xpdfopen _USE_TEX_LUATEX_DEP= luatex _USE_TEX_LUATEX_PORT= print/${_USE_TEX_LUATEX_PKGNAME} _USE_TEX_LUATEX_PKGNAME=tex-luatex _USE_TEX_XETEX_DEP= xetex _USE_TEX_XETEX_PORT= print/${_USE_TEX_XETEX_PKGNAME} _USE_TEX_XETEX_PKGNAME= tex-xetex _USE_TEX_FULLLIST= texmf>=${TEXLIVE_VERSION} base>=${TEXLIVE_VERSION} \ web2c tlmgr:run \ basic formats xetex jadetex luatex xmltex ptex \ dvipsk dvipdfmx xdvik xpdfopen:run \ kpathsea:lib ptexenc:lib texlua:lib texluajit:lib synctex:lib .if !empty(USE_TEX:tu:MFULL) USE_TEX:= ${USE_TEX:tu:NFULL} ${_USE_TEX_FULLLIST:tu} .endif .for _UU in ${USE_TEX:tu} _U:= ${_UU} # ugly but necessary in for loop _VOP:= . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXMF) && empty(_U:M*[<>=]*) _U:= ${_U}>=${TEXLIVE_VERSION} . endif . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MBASE) && empty(_U:M*[<>=]*) _U:= ${_U}>=${TEXLIVE_VERSION} . endif . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MKPATHSEA) || \ !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MPTEXENC) || \ !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXLUA) || \ !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXLUAJIT) || \ !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MSYNCTEX) _U:= ${_U}:lib . endif . if !empty(_U:M*[<>=]*) _VOP:= ${_U:C/^[^<>=]*//:C/\:.*$//} . endif . if empty(_U:M*\:*) _C:= BUILD RUN . else _C:= ${_U:C/.*://:S/,/ /g:C/[<>=][^\:]*//g} . endif . for _CC in ${_C:tu} _V:=${_UU:C/[<>=][^\:]*//:C/\:.*$//} . if defined(_USE_TEX_${_V}_PORT) . if !empty(_VOP) . for _T in ${_USE_TEX_${_V}_PKGNAME}${_VOP}:${_USE_TEX_${_V}_PORT} TEX_${_CC}_DEPENDS+= ${_T} . endfor . else . for _T in ${_USE_TEX_${_V}_DEP}:${_USE_TEX_${_V}_PORT} TEX_${_CC}_DEPENDS+= ${_T} . endfor . endif . endif . endfor .endfor .for _C in EXTRACT BUILD LIB RUN TEST ${_C}_DEPENDS+= ${TEX_${_C}_DEPENDS:O:u} .endfor .ORDER: do-texhash do-fmtutil do-updmap .if !empty(USE_TEX:Mtexhash) || \ !empty(USE_TEX:Mtexhash-bootstrap) || \ !empty(USE_TEX:Mfmtutil) || \ !empty(USE_TEX:Mupdmap) .PHONY: do-texhash do-texhash: . if !empty(USE_TEX:Mtexhash-bootstrap) @${ECHO_CMD} "@postexec ${LOCALBASE}/bin/mktexlsr " \ "${TEXHASHDIRS:S,^,%D/,}" >> ${TMPPLIST} @for D in ${TEXHASHDIRS}; do \ ${ECHO_CMD} "@rmtry $$D/ls-R"; \ ${ECHO_CMD} "@dir $$D"; \ done >> ${TMPPLIST} . else @${ECHO_CMD} "@postexec for D in ${TEXHASHDIRS:S,^,${PREFIX}/,}; do " \ "if [ -r \$$D/ls-R ]; then " \ "${LOCALBASE}/bin/mktexlsr \$$D; " \ "fi; done" >> ${TMPPLIST} @${ECHO_CMD} "@preunexec for D in ${TEXHASHDIRS:S,^,${PREFIX}/,}; do " \ "if [ -r \$$D/ls-R ]; then " \ "${LOCALBASE}/bin/mktexlsr \$$D; " \ "fi; done" >> ${TMPPLIST} . endif post-install-script: do-texhash .endif .if !empty(USE_TEX:Mfmtutil) .PHONY: do-fmtutil . for F in ${TEX_FORMATS} do-fmtutil: post-install-$F do-fmtutil-$F do-fmtutil-$F: ${TEST} -n '${TEX_FORMAT_${F:tu}}' ${PRINTF} "%s\t#$F\n" ${TEX_FORMAT_${F:tu}} \ > ${WRKDIR}/fmtutil.cnf ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFVARDIR}/web2c \ ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c ${LN} -f -s ${LOCALBASE}/${TEXMFDISTDIR}/web2c/texmf.cnf \ ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/texmf.cnf ${LOCALBASE}/bin/mktexlsr ${TEXHASHDIRS:S,^,${STAGEDIR}${PREFIX}/,} ${CAT} ${WRKDIR}/fmtutil.cnf | \ while read format dum; do \ ${SETENV} PATH=${STAGEDIR}${PREFIX}/bin:${PATH}:${LOCALBASE}/bin \ TEXMFDIST=${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}:${LOCALBASE}/${TEXMFDISTDIR} \ ${LOCALBASE}/bin/fmtutil-sys \ --byfmt $$format \ --fmtdir ${STAGEDIR}${PREFIX}/${TEXMFVARDIR}/web2c \ --cnffile ${WRKDIR}/fmtutil.cnf; \ done # XXX #cd ${STAGEDIR}${PREFIX}/${TEXMFVARDIR}/web2c && \ # ${FIND} . -name "*.log" | ${XARGS} \ # ${REINPLACE_CMD:S/.bak/ ""/} "s,${STAGEDIR},,g" ${RM} ${TEXHASHDIRS:S,^,${STAGEDIR}${PREFIX}/,:S,$,/ls-R,} \ ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/texmf.cnf ${RMDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c || ${TRUE} ${RMDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR} || ${TRUE} _PLIST_FILES+= ${TEX_FORMAT_${F:tu}_FILES} _PLIST_DIRS+=${TEX_FORMAT_${F:tu}_DIRS} _PLIST_FILES+= ${TEX_FORMAT_${F:tu}_BIN} . endfor post-install-script: do-fmtutil PLIST_FILES= ${_PLIST_FILES:O:u} PLIST_DIRS= ${_PLIST_DIRS:O:u} ${TEXMFVARDIR}/web2c .endif .if !empty(USE_TEX:Mupdmap) .PHONY: do-updmap do-updmap: @${ECHO_CMD} "@postexec ${SETENV} PATH=${PATH}:${LOCALBASE}/bin " \ "TEXMFMAIN=${LOCALBASE}/${TEXMFDIR} " \ "${LOCALBASE}/bin/updmap-sys" >> ${TMPPLIST} @${ECHO_CMD} "@preunexec ${SETENV} PATH=${PATH}:${LOCALBASE}/bin " \ "TEXMFMAIN=${LOCALBASE}/${TEXMFDIR} " \ "${LOCALBASE}/bin/updmap-sys" >> ${TMPPLIST} post-install-script: do-updmap .endif TEX_FORMAT_AMSTEX?= \ "amstex pdftex - -translate-file=cp227.tcx *amstex.ini" TEX_FORMAT_AMSTEX_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/amstex.log \ ${TEXMFVARDIR}/web2c/pdftex/amstex.fmt TEX_FORMAT_AMSTEX_BIN= \ bin/amstex TEX_FORMAT_AMSTEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-amstex: ${LN} -fs pdftex ${STAGEDIR}${PREFIX}/bin/amstex TEX_FORMAT_CSPLAIN?= \ "csplain pdftex - -etex -enc csplain-utf8.ini" \ "pdfcsplain pdftex - -etex -enc csplain-utf8.ini" TEX_FORMAT_CSPLAIN_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/csplain.log \ ${TEXMFVARDIR}/web2c/pdftex/csplain.fmt \ ${TEXMFVARDIR}/web2c/pdftex/pdfcsplain.log \ ${TEXMFVARDIR}/web2c/pdftex/pdfcsplain.fmt TEX_FORMAT_CSPLAIN_BIN= \ bin/csplain TEX_FORMAT_CSPLAIN_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-csplain: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/csplain TEX_FORMAT_EPLAIN?= \ "eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini" TEX_FORMAT_EPLAIN_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/eplain.log \ ${TEXMFVARDIR}/web2c/pdftex/eplain.fmt TEX_FORMAT_EPLAIN_BIN= \ bin/eplain TEX_FORMAT_EPLAIN_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-eplain: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/eplain TEX_FORMAT_JADETEX?= \ "jadetex pdftex language.dat *jadetex.ini" \ "pdfjadetex pdftex language.dat *pdfjadetex.ini" TEX_FORMAT_JADETEX_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/jadetex.log \ ${TEXMFVARDIR}/web2c/pdftex/jadetex.fmt \ ${TEXMFVARDIR}/web2c/pdftex/pdfjadetex.log \ ${TEXMFVARDIR}/web2c/pdftex/pdfjadetex.fmt TEX_FORMAT_JADETEX_BIN= \ bin/jadetex \ bin/pdfjadetex TEX_FORMAT_JADETEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-jadetex: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/jadetex ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfjadetex TEX_FORMAT_LATEX-BIN?= \ "latex pdftex language.dat -translate-file=cp227.tcx *latex.ini" \ "pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini" TEX_FORMAT_LATEX-BIN_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/latex.log \ ${TEXMFVARDIR}/web2c/pdftex/latex.fmt \ ${TEXMFVARDIR}/web2c/pdftex/pdflatex.log \ ${TEXMFVARDIR}/web2c/pdftex/pdflatex.fmt TEX_FORMAT_LATEX-BIN_BIN= \ bin/latex \ bin/pdflatex TEX_FORMAT_LATEX-BIN_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-latex-bin: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/latex ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdflatex TEX_FORMAT_LUATEX?= \ "luatex luatex language.def,language.dat.lua luatex.ini" \ "dviluatex luatex language.def,language.dat.lua dviluatex.ini" \ "dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini" \ "lualatex luahbtex language.dat,language.dat.lua lualatex.ini" \ "luajittex luajittex language.def,language.dat.lua luatex.ini" \ "pdfcsplain luatex - -etex csplain.ini" \ "lollipop luatex - lollipop.ini" TEX_FORMAT_LUATEX_FILES= \ ${TEXMFVARDIR}/web2c/luatex/dviluatex.log \ ${TEXMFVARDIR}/web2c/luatex/dviluatex.fmt \ ${TEXMFVARDIR}/web2c/luatex/dvilualatex.log \ ${TEXMFVARDIR}/web2c/luatex/dvilualatex.fmt \ ${TEXMFVARDIR}/web2c/luatex/luatex.log \ ${TEXMFVARDIR}/web2c/luatex/luatex.fmt \ ${TEXMFVARDIR}/web2c/luatex/pdfcsplain.log \ ${TEXMFVARDIR}/web2c/luatex/pdfcsplain.fmt \ ${TEXMFVARDIR}/web2c/luahbtex/lualatex.fmt \ ${TEXMFVARDIR}/web2c/luahbtex/lualatex.log \ ${TEXMFVARDIR}/web2c/luajittex/luajittex.log \ ${TEXMFVARDIR}/web2c/luajittex/luajittex.fmt TEX_FORMAT_LUATEX_BIN= \ bin/dviluatex \ bin/dvilualatex \ bin/luahbtex \ bin/luajittex \ bin/lualatex \ bin/lualollipop \ bin/luatex \ bin/texlua \ bin/texluac \ bin/texluajit \ bin/texluajitc TEX_FORMAT_LUATEX_DIRS= \ ${TEXMFVARDIR}/web2c/luatex \ ${TEXMFVARDIR}/web2c/luajittex post-install-luatex: ${LN} -sf luahbtex ${STAGEDIR}${PREFIX}/bin/lualatex ${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/dviluatex ${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/dvilualatex ${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/lualollipop ${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/texlua ${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/texluac ${LN} -sf luajittex ${STAGEDIR}${PREFIX}/bin/texluajit ${LN} -sf luajittex ${STAGEDIR}${PREFIX}/bin/texluajitc TEX_FORMAT_LOLLIPOP?= \ "lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini" TEX_FORMAT_LOLLIPOP_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/lollipop.log \ ${TEXMFVARDIR}/web2c/pdftex/lollipop.fmt TEX_FORMAT_LOLLIPOP_BIN= \ bin/lollipop TEX_FORMAT_LOLLIPOP_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-lollipop-bin: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/lollipop TEX_FORMAT_METAFONT?= \ "mf mf-nowin - -translate-file=cp227.tcx mf.ini" TEX_FORMAT_METAFONT_FILES= \ ${TEXMFVARDIR}/web2c/metafont/mf.log \ ${TEXMFVARDIR}/web2c/metafont/mf.base TEX_FORMAT_METAFONT_DIRS= \ ${TEXMFVARDIR}/web2c/metafont post-install-metafont: @${DO_NADA} TEX_FORMAT_MEX?= \ "mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini" \ "pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini" \ "utf8mex pdftex mexconf.tex -enc *utf8mex.ini" TEX_FORMAT_MEX_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/mex.log \ ${TEXMFVARDIR}/web2c/pdftex/mex.fmt \ ${TEXMFVARDIR}/web2c/pdftex/pdfmex.log \ ${TEXMFVARDIR}/web2c/pdftex/pdfmex.fmt \ ${TEXMFVARDIR}/web2c/pdftex/utf8mex.log \ ${TEXMFVARDIR}/web2c/pdftex/utf8mex.fmt TEX_FORMAT_MEX_BIN= \ bin/mex \ bin/pdfmex \ bin/utf8mex TEX_FORMAT_MEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-mex: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/mex ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfmex ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/utf8mex TEX_FORMAT_MLTEX?= \ "mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini" \ "mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini" TEX_FORMAT_MLTEX_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/mllatex.log \ ${TEXMFVARDIR}/web2c/pdftex/mllatex.fmt \ ${TEXMFVARDIR}/web2c/pdftex/mltex.log \ ${TEXMFVARDIR}/web2c/pdftex/mltex.fmt TEX_FORMAT_MLTEX_BIN= \ bin/mltex \ bin/mllatex TEX_FORMAT_MLTEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-mltex: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/mltex ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/mllatex TEX_FORMAT_MPTOPDF?= \ "mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex" TEX_FORMAT_MPTOPDF_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/mptopdf.log \ ${TEXMFVARDIR}/web2c/pdftex/mptopdf.fmt TEX_FORMAT_MPTOPDF_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-mptopdf: @${DO_NADA} TEX_FORMAT_PDFTEX?= \ "pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini" \ "etex pdftex language.def -translate-file=cp227.tcx *etex.ini" \ "pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini" TEX_FORMAT_PDFTEX_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/pdftex.log \ ${TEXMFVARDIR}/web2c/pdftex/pdftex.fmt \ ${TEXMFVARDIR}/web2c/pdftex/etex.log \ ${TEXMFVARDIR}/web2c/pdftex/etex.fmt \ ${TEXMFVARDIR}/web2c/pdftex/pdfetex.log \ ${TEXMFVARDIR}/web2c/pdftex/pdfetex.fmt TEX_FORMAT_PDFTEX_BIN= \ bin/etex \ bin/pdfetex TEX_FORMAT_PDFTEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-pdftex: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfetex ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/etex TEX_FORMAT_PTEX?= \ "ptex ptex - ptex.ini" \ "ptex eptex language.def *eptex.ini" \ "platex eptex language.dat *platex.ini" TEX_FORMAT_PTEX_FILES= \ ${TEXMFVARDIR}/web2c/ptex/ptex.log \ ${TEXMFVARDIR}/web2c/ptex/ptex.fmt \ ${TEXMFVARDIR}/web2c/eptex/ptex.log \ ${TEXMFVARDIR}/web2c/eptex/ptex.fmt \ ${TEXMFVARDIR}/web2c/eptex/platex.log \ ${TEXMFVARDIR}/web2c/eptex/platex.fmt TEX_FORMAT_PTEX_BIN= \ bin/eptex \ bin/ptex \ bin/platex \ bin/upbibtex \ bin/updvitype \ bin/uppltotf \ bin/uptftopl TEX_FORMAT_PTEX_DIRS= \ ${TEXMFVARDIR}/web2c/ptex \ ${TEXMFVARDIR}/web2c/eptex post-install-ptex: ${LN} -sf eptex ${STAGEDIR}${PREFIX}/bin/platex TEX_FORMAT_TEX?= \ "tex tex - tex.ini" TEX_FORMAT_TEX_FILES= \ ${TEXMFVARDIR}/web2c/tex/tex.log \ ${TEXMFVARDIR}/web2c/tex/tex.fmt TEX_FORMAT_TEX_DIRS= \ ${TEXMFVARDIR}/web2c/tex post-install-tex: @${DO_NADA} TEX_FORMAT_TEXSIS?= \ "texsis pdftex - -translate-file=cp227.tcx texsis.ini" TEX_FORMAT_TEXSIS_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/texsis.log \ ${TEXMFVARDIR}/web2c/pdftex/texsis.fmt TEX_FORMAT_TEXSIS_BIN= \ bin/texsis TEX_FORMAT_TEXSIS_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-texsis: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/texsis TEX_FORMAT_UPTEX?= \ "uptex uptex - uptex.ini" \ "euptex euptex language.def *euptex.ini" \ "uplatex euptex language.dat *uplatex.ini" TEX_FORMAT_UPTEX_FILES= \ ${TEXMFVARDIR}/web2c/euptex/euptex.log \ ${TEXMFVARDIR}/web2c/euptex/euptex.fmt \ ${TEXMFVARDIR}/web2c/uptex/uptex.log \ ${TEXMFVARDIR}/web2c/uptex/uptex.fmt \ ${TEXMFVARDIR}/web2c/euptex/uplatex.log \ ${TEXMFVARDIR}/web2c/euptex/uplatex.fmt TEX_FORMAT_UPTEX_BIN= \ bin/euptex \ bin/uptex \ bin/uplatex TEX_FORMAT_UPTEX_DIRS= \ ${TEXMFVARDIR}/web2c/euptex \ ${TEXMFVARDIR}/web2c/uptex post-install-uptex: ${LN} -sf euptex ${STAGEDIR}${PREFIX}/bin/uplatex TEX_FORMAT_XETEX?= \ "xetex xetex language.def -etex xetex.ini" \ "xelatex xetex language.dat -etex xelatex.ini" \ "pdfcsplain xetex - -etex csplain.ini" \ "lollipop xetex - -etex lollipop.ini" TEX_FORMAT_XETEX_FILES= \ ${TEXMFVARDIR}/web2c/xetex/lollipop.fmt \ ${TEXMFVARDIR}/web2c/xetex/lollipop.log \ ${TEXMFVARDIR}/web2c/xetex/pdfcsplain.log \ ${TEXMFVARDIR}/web2c/xetex/pdfcsplain.fmt \ ${TEXMFVARDIR}/web2c/xetex/xetex.log \ ${TEXMFVARDIR}/web2c/xetex/xetex.fmt \ ${TEXMFVARDIR}/web2c/xetex/xelatex.log \ ${TEXMFVARDIR}/web2c/xetex/xelatex.fmt TEX_FORMAT_XETEX_BIN= \ bin/xetex \ bin/xelatex \ bin/xelollipop TEX_FORMAT_XETEX_DIRS= \ ${TEXMFVARDIR}/web2c/xetex post-install-xetex: ${LN} -sf xetex ${STAGEDIR}${PREFIX}/bin/xelatex ${LN} -sf xetex ${STAGEDIR}${PREFIX}/bin/xelollipop TEX_FORMAT_XMLTEX?= \ "xmltex pdftex language.dat *xmltex.ini" \ "pdfxmltex pdftex language.dat *pdfxmltex.ini" TEX_FORMAT_XMLTEX_FILES= \ ${TEXMFVARDIR}/web2c/pdftex/xmltex.log \ ${TEXMFVARDIR}/web2c/pdftex/xmltex.fmt \ ${TEXMFVARDIR}/web2c/pdftex/pdfxmltex.log \ ${TEXMFVARDIR}/web2c/pdftex/pdfxmltex.fmt TEX_FORMAT_XMLTEX_BIN= \ bin/xmltex \ bin/pdfxmltex TEX_FORMAT_XMLTEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-xmltex: ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/xmltex ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfxmltex .endif # !defined(_INCLUDE_USES_TEX_MK) diff --git a/UPDATING b/UPDATING index f0077905cb2d..fb8804a9bc68 100644 --- a/UPDATING +++ b/UPDATING @@ -1,3268 +1,3282 @@ This file documents some of the problems you may encounter when upgrading your ports. We try our best to minimize these disruptions, but sometimes they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20240529: + AFFECTS: users of TeX* + AUTHOR: bofh@FreeBSD.org + + TeX system has been updated to 2024 from 2023. Normal pkg upgrade or + portmaster -a should handle all the upgrade properly. In case not please + create a ticket or send a mail to tex@FreeBSD.org + + Previously users have reported to delete texlive-texmf prior to + starting update, or pkg-static will indicate there is a conflict + during the upgrade of texlive-base : + + # pkg remove texlive-texmf + 20240529: AFFECTS: users of python AUTHOR: rm@FreeBSD.org The default version of python3 and python was switched to 3.11. For ports users wanting to keep version 3.9 as default, add DEFAULT_VERSIONS+= python=3.9 python3=3.9 to make.conf Following procedures may ease the upgrade: For users of pre-build packages: # sh # for i in $(pkg query -g %n 'py39-*'); do pkg set -yn ${i}:py311-${i#py39-}; done # pkg upgrade For portmaster users: # sh # portmaster -o lang/python311 python39 # REINSTALL="$(pkg info -o "*py39*" | awk '{printf "%s ", $2}')" # pkg delete -f "*py39*" # portmaster $REINSTALL # REBUILD=$(pkg query -g "%n:%dn" '*' | grep py3 | grep -v py311 | cut -d : -f 1 | sort -u) # portmaster $REBUILD # REBUILD2=$(pkg list | grep python-39 | xargs pkg which | awk '{print $6}' | sort -u) # portmaster $REBUILD2 Final steps (for pre-built packages & portmaster): If no longer required, Python 3.9 can be removed via "pkg remove python39" and the directory /usr/local/lib/python3.9 can then be deleted afterwards, if not empty. 20240522: AFFECTS: net-p2p/transmission-daemon The web interface has been separated from the daemon port into its own port. This allows users of transmission-gtk and transmission-qt to install the web interface. 20240521: AFFECTS: www/gitlab AUTHOR: mfechner@FreeBSD.org Make sure you upgrade first to 16.11.x before you upgrade to the today released version 17.0.0. For more details see: https://gitlab.fechner.net/mfechner/Gitlab-docu/-/blob/master/update/16.11-17.0-freebsd.md 20240517: AFFECTS: comms/tio AUTHOR: diizzy@FreeBSD.org As of 3.1 upstream have reworked configuration file layout and syntax so older configurations will not work. For more details, see https://github.com/tio/tio/releases/tag/v3.1 20240513: AFFECTS: users of security/libressl AUTHOR: brnrd@FreeBSD.org The port has been updated to the latest stable version 3.9 of LibreSSL. The shared library versions of the libraries have been bumped. After upgrading, manually update all packages that depend on any of the libraries provided by LibreSSL (libssl, libcrypto and libtls) since the versions of these libraries have changed. Normally, you can obtain the list of dependent software by running the following command: # pkg info -r libressl Then you should rebuild all ports depending on libressl to avoid dangling shared library dependencies. 20240509: AFFECTS: databases/timescaledb AUTHOR: kbowling@FreeBSD.org The Foreign Key storage in hypertables has changed in an incompatible way, after runing ALTER EXTENSION, you must run the SQL script here: https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql For more details, see https://github.com/timescale/timescaledb/pull/6797 20240508: AFFECTS: www/oauth2-proxy AUTHOR: netchild@FreeBSD.org The start script is converted to be instance aware. To use it: - cp /usr/local/etc/oauth2-proxy.cfg.sample /usr/local/etc/oauth2-proxy-myapp.cfg - vi /usr/local/etc/oauth2-proxy-myapp.cfg - ln -s oauth2_proxy /usr/local/etc/rc.d/oauth2_proxy_myapp - sysctl oauth2_proxy_myapp_enable=YES - service oauth2_proxy_myapp start This allows to easily start multiple instances on the same system. As part of this, the start script was renamed to oauth2_proxy. This only affects manual restarts, no change in rc.conf is needed. 20240430: AFFECTS: audio/py-pyradio AUTHOR: nivit@FreeBSD.org The new version of Pyradio moves some data files to new locations. To see what it really does, run pyradio from a terminal the first time. Besides that, the recordings are moved/saved into ~/pyradio-recordings. You can change that directory in the config file. For more details, see https://github.com/coderholic/pyradio/releases/tag/0.9.3 20240423: AFFECTS: textproc/vale AUTHOR: bofh@FreeBSD.org When upgrading to v3.0.0, the vocabularies need to be moved from $StylesPath/Vocab to $StylesPath/config/vocabularies. 20240421: AFFECTS: www/gitlab-ce AUTHOR: mfechner@FreeBSD.org With the upgrade to version 16.11 the default path for gitlab-ce changed: /usr/local/www/gitlab-ce -> /usr/local/www/gitlab Make sure you follow the upgrade manual very carefully: https://gitlab.fechner.net/mfechner/Gitlab-docu/-/blob/master/update/16.10-16.11-freebsd.md The gitlab port also got a new flavor gitlab@ee to make the Gitlab Enterprise Edition available (you will need a license for it). Please note, that the ee flavor is a draft, but any feedback is welcome. See also the installation and upgrade manual for more details. https://gitlab.fechner.net/mfechner/Gitlab-docu/-/blob/master/install/16.11-freebsd.md 20240408: AFFECTS: users of databases/p5-DBD-mysql AUTHOR: flo@FreeBSD.org Upstream removed support for MariaDB from the 5.0 branch. So if you use MariaDB you need to use databases/p5-DBD-mysql4 from now on. Portmaster users: portmaster -o databases/p5-DBD-mysql4 databases/p5-DBD-mysql portmaster -a Portupgrade users: portupgrade -o databases/p5-DBD-mysql4 -f databases/p5-DBD-mysql portupgrade -a 20240330: AFFECTS: users of mail/spamassassin AUTHOR: cy@FreeBSD.org sa-update must be run following update and prior to restarting sa-spamd else it will fail to start due to a syntax error. 20240326: AFFECTS: users of net/bird2 AUTHOR: olivier@FreeBSD.org The net/bird2 default flavor has ben switched to netlink on FreeBSD >= 14.0 There is not change for FreeBSD < 14.0 (default flavor is still rtsock) 20240319: AFFECTS: users of net/rdist6 AUTHOR: cy@FreeBSD.org As of 52032b3d50c0 net/rdist6 will install its binary named rdist instead of rdist6. Base FreeBSD no longer has its own rdist binary. Therefore there is no need to rename the rdist6 binary to rdist6 to avoid confusion. The historical and default name of the rdist binary is "rdist". 20240318: AFFECTS: users of net-mgmt/unifi8 AUTHOR: otis@FreeBSD.org The default MongoDB version dependency has been switched from 4.4 to 5.0. Although MongoDB 4.4 -> MongoDB 5.0 datafiles in-place upgrade seem to work, users are strongly recommended to take full backup of unifi database prior to upgrade and start with clean installation afterwards. See updating entry 20230310 for details. 20240316: AFFECTS: users of net/rabbitmq AUTHOR: dch@FreeBSD.org In preparation for upgrading to future RabbitMQ releases, users *must* enable all feature flags before upgrading stepwise to v3.12.13, to be able to migrate later to v3.13.0 when it is released in 2024Q2. See https://www.rabbitmq.com/docs/upgrade for details. 20240228: AFFECTS: users of www/redmine50 AUTHOR: bofh@FreeBSD.org The default version of ruby has been switched from 3.1 to 3.2. However www/redmine50 does not support ruby 3.2. Users should add the following in their relevant make.conf file: DEFAULT_VERSIONS+=ruby=3.1 Although redmine 5.1.X supports ruby 3.2 and later but so far there is no redmine51 ports in the tree. 20240222: AFFECTS: users of databases/xtrabackup8 AUTHOR: eugen@FreeBSD.org The port databases/xtrabackup8 upgraded to version 8.0.35-30 and renamed to databases/xtrabackup80 in preparation for upcoming incompatible branch databases/xtrabackup81, to avoid confusion. 20231229: AFFECTS: users of databases/tarantool AUTHOR: arrowd@FreeBSD.org A new major version of the tarantool has been released. databases/tarantool renamed to databases/tarantool2. 2.11 is an LTS version and will be supported for a while. 20231125: AFFECTS: users of lang/php81 AUTHOR: bofh@FreeBSD.org The default version of PHP has been switched from 8.1 to 8.2. If you use binary packages you should make a list of php packages before running 'pkg upgrade': # pkg info \*php81\* > ~/installed-php-ports-list After the upgrade, check with such list if all your php extensions are still installed, and reinstall them if needed. If you use mod_php81 you need to deinstall it and install mod_php82. 20231104: AFFECTS: users of security/libressl AUTHOR: brnrd@FreeBSD.org The port has been updated to the latest stable version 3.8 of LibreSSL. The shared library versions of the libraries have been bumped. After upgrading, manually update all packages that depend on any of the libraries provided by LibreSSL (libssl, libcrypto and libtls) since the versions of these libraries have changed. Normally, you can obtain the list of dependent software by running the following command: # pkg info -r libressl Then you should rebuild all ports depending on libressl to avoid dangling shared library dependencies. 20231031: AFFECTS: users of devel/subversion-lts AUTHOR: michaelo@FreeBSD.org devel/subversion-lts has been updated from 1.10.x to the latest LTS version, 1.14.x. Some changes between these releases may require attention from administrators or users. Refer to https://subversion.apache.org/docs/release-notes/1.14.html#compat-misc for details. 20231028: AFFECTS: users of net-mgmt/nfdump nfdump-1.7.x is compatible to nfdump-1.6.18, which means it can read files created with nfdump-1.6.18 or newer. Flow files created with earlier nfdump versions may not contain all flow elements. If you have older files, it is recommended to use nfdump-1.6.17 to update the records. nfdump 1.7.x provides the same set of programs as 1.6.x and can be used almost as a drop-in replacement. This may change in future and older legacy programs may be removed. You can convert any old files from nfdump-1.6 to nfdump-1.7 format by reading/writing files: ./nfdump -r old-flowfile -y -w new-flowfile Please note, that only nfdump may read older flow files. All other programs relay on the new file format. 20231027: AFFECTS: users of net-mgmt/librenms AUTHOR: dvl@FreeBSD.org When updating to >= 23.10.0, a broken crontab is fixed. This breakage caused the validation error: Scheduler is not running After updating, If that error does not clear for you, run: sudo lnms config:cache 20231027: AFFECTS: users of print/ghostscript9* AUTHOR: michaelo@FreeBSD.org The default ghostscript version has been updated from 9 to 10. If you compile your own ports you may keep 9 as the default version by adding the following lines to your /etc/make.conf file: # # Keep ghostscript 9 as default version # DEFAULT_VERSIONS+=ghostscript=9 Please note that print/ghostcript9* will be removed in the future since it is not supported by upstream anymore. 20231026: AFFECTS: users of lang/chicken AUTHOR: gahr@FreeBSD.org The chicken binaries csc and csi, together with their manual pages, have been renamed to chicken-csc and chicken-csi, to avoid conflicts with lang/mono. This is in line with what several Linux distros do. See PR 274736. 20231023: AFFECTS: users of mail/mailman3 AUTHOR: einar@isnic.is logging.http section has now been split into two parts, logging.http is for the Mailman internal code and logging.gunicorn is for Gunicorn specifically since they have different logging formats. This should fix spurious errors with KeyError: t that was often confusing for users. Python 3.9 is now the minimum supported version of Python. 20231017: AFFECTS: users of lang/perl5* AUTHOR: delphij@FreeBSD.org The default Perl version has been switched to Perl 5.36. If you are using binary packages to upgrade your system, you do not have anything to do, pkg upgrade will do the right thing. For the other people, assuming you are migrating from 5.34 to 5.36, do: First, add to /etc/make.conf: DEFAULT_VERSIONS+= perl5=5.36 Portupgrade users: portupgrade -o lang/perl5.36 -f lang/perl5.34 You can now remove the DEFAULT_VERSIONS line added earlier from /etc/make.conf Then you will need to rebuild everything that uses libperl.so, you can do so with: portupgrade -f `pkg shlib -qR libperl.so.5.34` If, for some reason, this command fails at one point, it is safe to run it again, it will not rebuild what it already rebuilt, as the ports that have been rebuilt no longer depend on libperl.so.5.34 but on libperl.so.5.36. Portmaster users: portmaster -o lang/perl5.36 lang/perl5.34 You can now remove the DEFAULT_VERSIONS line added earlier from /etc/make.conf Then you will need to rebuild everything that uses libperl.so, you can do so with: portmaster -f `pkg shlib -qR libperl.so.5.34` If, for some reason, this command fails at one point, it is safe to run it again, it will not rebuild what it already rebuilt, as the ports that have been rebuilt no longer depend on libperl.so.5.34 but on libperl.so.5.36. 20231014: AFFECTS: users of security/openssl and security/openssl30 AUTHOR: brnrd@FreeBSD.org The openssl port was renamed to openssl111 and subsequently the openssl30 port was renamed to openssl. The shared library version of OpenSSL has been bumped. Users of DEFAULT_VERSIONS= ssl=openssl30 must update this to ssl=openssl. Users of DEFAULT_VERSIONS= ssl=openssl should not change this unless they use ports that require the deprecated OpenSSL 1.1.1 version. You must rebuild all ports that depend on OpenSSL if you use OpenSSL from ports. 20231011: AFFECTS: users of www/caddy AUTHOR: adamw@FreeBSD.org The default admin endpoint has changed from localhost:2019 to /var/run/caddy/caddy.sock. Using a Unix socket is more secure, allowing it to be secured by filesystem permissions rather than requiring a firewall. If you only control caddy from the rc(8) script (service caddy ...), you don't need to do anything. If you access the API yourself, you will want to update your scripts to use the new socket. To use the old endpoint, add the following to /etc/rc.conf: caddy_admin="localhost:2019" 20231009: AFFECTS: users of net/ntpd-rs AUTHOR: mikael@freebsd.org In 1.0.0 the configuration has been completely reworked, please check the documentation for details. Configuration will not automatically migrate. 20231004: AFFECTS: www/gitlab-ce AUTHOR: mfechner@FreeBSD.org Before you upgrade to version 16.4.x or higher, make sure you did the upgrade to 16.3.x! The database migration for 16.4.1 can fail due to unexpected name of a foreign key. So it is recommended to have a database backup available in case the solution described in the update manual does not work for you. The upgrade manual can be found as usual here: https://gitlab.fechner.net/mfechner/Gitlab-docu/-/blob/master/update/16.3-16.4-freebsd.md 20230930: AFFECTS: users of Transmission (net-p2p/transmission@*) AUTHOR: mondo.debater_0q@icloud.com Fixes Bug 274065 by reorganizing the port as a metaport (net-p2p/transmission) and components port (net-p2p/transmission-components). Each component may be installed through the flavors of transmission-componenents (@cli, @daemon, @docs, @gtk, @qt, @utils). Alternatively, one or more component may be installed by running make config on the metaport net-p2p/transmission. AFFECTS: users of devel/php-composer2 AUTHOR: madpilot@FreeBSD.org The composer2 ports has been moved over the old devel/php-composer port, which was still providing the old EOLed version 1 of the software. Please use `pkg install php81-composer` (substitute 81 with the PHP version you're using) to properly upgrade. 20230924: AFFECTS: users of XFCE desktop (x11-wm/xfce4) AUTHOR: madpilot@FreeBSD.org XFCE 4.18 is incompatible with the latest version of the adwaita icon theme (version 42.0 and newer), which was used as the default one. Due to this the default icon theme has been changed to x11-themes/xfce-icons-elementary. Users that have XFCE already installed and are using the adwaita icon theme will notice missing icons. To fix this you can install any other icon theme (like x11-themes/xfce-icons-elementary) and configure XFCE to use that via the "appearance" settings application, under the "icons" tab. 20230919: AFFECTS: users of net-p2p/transmission AUTHOR: mondo.debater_0q@icloud.com The 4.0 port haphazardly consolidated prior slave ports into flavors of a single port. The flavors have now been revised to better match releases prior to 4.0. The -full flavor included in the 4.0 port has been replaced with -default, which restores the compile-time options of prior release's metaport. Other flavors allow for more piecemeal installs. The prior -web slave port can be installed through the -default flavor or the -daemon flavor. See Bug 273841 for more details. 20230915: AFFECTS: users of print/ghostscript10 AUTHOR: michael.osipov@siemens.com The port flavors have been replaced with a default port option of X11. The flavors approach creates conflicting dependencies with other ports which cannot be solved this time with the ports framework. See PRs 270989 and 272541 for details. 20230910: AFFECTS: users of dns/powerdns AUTHOR: tremere@cainites.net In Authoritative Server 4.8, the LMDB backend gains a new Lightning Stream-compatible schema, which requires a data migration (this is automatic, and there is no migration back to the old schema). LMDB backend users should pay extra attention to the Upgrade Notes (https://doc.powerdns.com/authoritative/upgrading.html). 20230910: AFFECTS: users of net-mgmt/netbox AUTHOR: kai@FreeBSD.org 1. Please make sure that the PostgreSQL server for the NetBox instance is running version 12 or higher. This is because Django 4.2 requires PostgreSQL 12 as a minimum. 2. Please also check the pkg-message and the changelogs for further info. 20230908: AFFECTS: users of databases/postgresql* and other software using PostgreSQL to run AUTHOR: kbowling@FreeBSD.org The default version of PostgreSQL has been switched from 13 to 15. The upgrade procedure can use up twice the space the databases currently needs. If you have a big amount of stored data take a closer look at the manpage of pg_upgrade for avoidance and/or speedup of the upgrade. The upgrade instructions consider a basic usage and do not match complex scenarios like replication, sharding, or similar. Upgrade instructions: First stop your PostgreSQL, create PostgreSQL-binaries and backup your data. If you have another Version of PostgreSQL installed, for example 13, your files are named according to this. # service postgresql stop # pkg create postgresql13-server postgresql13-contrib # mkdir /tmp/pg-upgrade # tar xf postgresql13-server-13.12.pkg -C /tmp/pg-upgrade # tar xf postgresql13-contrib-13.12.pkg -C /tmp/pg-upgrade # pkg delete -f databases/postgresql13-server databases/postgresql13-contrib databases/postgresql13-client Now update PostgreSQL: pkg user: # pkg install databases/postgresql15-server databases/postgresql15-contrib # pkg upgrade Portmaster users: # portmaster databases/postgresql15-server databases/postgresql15-contrib # portmaster -a Portupgrade users: # portinstall databases/postgresql15-server databases/postgresql15-contrib # portupgrade -a After installing the new PostgreSQL version you need to convert all your databases to new version: # su -l postgres -c "/usr/local/bin/initdb --encoding=utf-8 --lc-collate=C -D /var/db/postgres/data15 -U postgres" # su -l postgres -c "pg_upgrade -b /tmp/pg-upgrade/usr/local/bin/ -d /var/db/postgres/data13/ -B /usr/local/bin/ -D /var/db/postgres/data15/ -U postgres " Now the migration is finished. You can start PostgreSQL again with: # service postgresql start ATTENTION: 1) The default user changed from "pgsql" to "postgres" in 11. The migration steps above now assume the "postgres" database user and FreeBSD user. 2) See the updating entry 20190829 if you are updating from a release prior to 11. 3) If you use non-default initdb options, you have to adjust the initdb-command accordingly 20230906: AUTHOR: jrm@FreeBSD.org AFFECTS: users of sysutils/devcpu-data* The CPU microcode ports have been reorganized. The new ports are: sysutils/cpu-microcode, sysutils/cpu-microcode-amd, sysutils/cpu-microcode-intel, and cpu-microcode-rc. To install all CPU microcode packages: pkg install cpu-microcode To install only packages for a specific CPU vendor: pkg install cpu-microcode-amd or pkg install cpu-microcode-intel To give users time to adjust to these changes, sysutils/devcpu-data will remain in the tree until the end of 2023. The port has been converted to a metaport and now provides the same functionality as sysutils/cpu-microcode. Refer to the commit log in bc7829212d153aeff69b439d08e2e3001ef88ba3 for an explanation as to why these changes were made. 20230904: AUTHOR: netchild@FreeBSD.org AFFECTS: users of misc/openhab The rc.d script of 4.0.2 had an error which didn't take the user to run openhab into account. After installing the update and stopping openhab run (for the default settings) chown -R openhab:openhab /var/db/openhab/userdata /var/log/openhab If you use other directories for the userdata and logs, you need to adapt accordingly. 20230822: AUTHOR: arrowd@FreeBSD.org AFFECTS: users of sysutils/polkit together with sysutils/consolekit2 ConsoleKit2 has grown some logind1 compatibility which resulted in breaking changes in its API. One of its consumers, Polkit, is patched to handle it, so make sure to update both ports simultaneously. 20230822: AUTHOR: leres@FreeBSD.org AFFECTS: users of security/zeek Zeek has been upgraded to 6.0.0 and the NETMAP option was removed; it was too difficult to build it without zeek being installed in %%PREFIX%%. The consensus was that this was a rarely used feature, please reach out to me if need this (I've done some work on a new security/zeek-netmap port that is probably the right way forward). When I upgraded zeek on my systems I found some cruft left over from previous versions. The way I recommend upgrading from 5.0.9 to 6.0.0 is: service zeek stop pkg delete -fy zeek py311-zkg [clean up leftover files in /usr/local/lib/zeek] pkg install -y zeek service zeek deploy 20230817: AFFECTS: users of databases/redis AUTHOR: yasu@FreeBSD.org The databases/redis port has been updated to 7.2. Users wanting to stay on 7.0 can replace databases/redis with databases/redis70 with one of the following commands. If you use pkg with binary packages: # pkg set -o databases/redis:databases/redis70 # pkg upgrade If you use portmaster: # portmaster -o databases/redis70 databases/redis If you use portupgrade: # portupgrade -o databases/redis70 databases/redis 20230814: AFFECTS: usrs of www/kdsoap AUTHOR: kde@FreeBSD.org The port www/kdsoap has been flavorized to support both Qt5 and Qt6. For symmetry, the Qt5 package has been renamed to kdsoap-qt5. 20230811: AFFECTS: users of www/p5-AnyEvent-WebSocket-Client AUTHOR: rodrigo@FreeBSD.org The update to AnyEvent-WebSocket-Client 0.55 introduce a change in behavior: close() default return code is now 1000 instead of 1005 20230730: AFFECTS: users of lang/perl5* AUTHOR: delphij@FreeBSD.org The default Perl version has been switched to Perl 5.34. If you are using binary packages to upgrade your system, you do not have anything to do, pkg upgrade will do the right thing. 20230726: AFFECTS: users of misc/openhab AUTHOR: netchild@FreeBSD.org The update to openhab 4.0.0 may require changes to the running 3.x setup. Read the release notes at https://github.com/openhab/openhab-distro/releases/tag/4.0.0 and the blog entry at https://www.openhab.org/blog/2023-07-23-openhab-4-0-release.html for manual changes which are required before updating the port. After the update the pkg-message provides some more info about manual changes which are required to perform before the first start of 4.0.0. Note, this includes a switch from java 11 to java 17. You can deinstall openjdk11 afterwards, if it is not needed for something else. 20230723: AFFECTS: users of security/py-cryptography AUTHOR: tcberner@FreeBSD.org Modern py-cryptography uses rust. In order to still support the Tier-2 architectures without rust support, a new default-version was added: PYCRYPTOGRAPHY it allows for the values 'rust' and 'legacy'. The default is 'rust' on all platforms supporting this. Note: users that are relying on the 'legacy' version will also take care of using a non-base OpenSSL in the future. 20230620: AFFECTS: users of lang/elixir-devel AUTHOR: dch@FreeBSD.org Note that Elixir now *requires* OTP25+ or better at runtime. For the -devel flavour you are still free to choose OTP25 or OTP26, but the default OTP24 from lang/erlang will *not* work. 20230618: AFFECTS: users of devel/soft-serve AUTHOR: ashish@FreeBSD.org soft-serve no longer uses config repository for configuration. To migrate configuration from 0.4.x to 0.5.x, please review the upgrade documentation at: https://github.com/charmbracelet/soft-serve/releases/tag/v0.5.0 The migration process has been incorporated in rc.d script's migrate command, and can be performed using following instructions: 0. Please make sure to backup repository data 1. Stop existing process: # /usr/local/etc/rc.d/soft-serve stop 2. Run the rc.d script to migrate, e.g. # /usr/local/etc/rc.d/soft-serve migrate INFO Setting SSH listen address... INFO Copying SSH host key... INFO Reading config repository... INFO Setting server settings... INFO Copying repos... INFO Copying repo ports INFO Copying readme from "config" to ".soft-serve" INFO Setting repos metadata & collabs... INFO Creating users & collabs... INFO Creating user "ashish" INFO Writing config... INFO Done! Another variable is introduced in rc.d script, soft_serve_data_path, indicating the path to data directory used by soft-serve. 20230618: AFFECTS: textproc/apache-solr* AUTHOR: mfechner@FreeBSD.org Apache solr is upgraded to version 9. Data migration is required, examples for dovecot data can be found here: https://dovecot.org/pipermail/dovecot/2022-May/124701.html https://dovecot.org/pipermail/dovecot/2022-May/124711.html If you like to stay on version8: # pkg delete apache-solr # pkg install apache-solr8 20230609: AFFECTS: users of security/sequoia AUTHOR: vishwin@FreeBSD.org sq has been split to security/sequoia-sq; security/sequoia becomes a meta-port, where security/sequoia-sq is currently the only dependency. As other programs are individually ported over, they will become OPTIONS in the meta-port. Per upstream, FFI is deprecated in favour of point solutions. 20230602: AFFECTS: users of net-mgmt/netbox AUTHOR: kai@FreeBSD.org 1. If the plugin security/py-netbox-secretstore is used, which is no longer maintained by upstream, the following steps must be done before upgrading to NetBox 3.5: * Migrate from security/py-netbox-secretstore (= 1.4.2_2) to security/py-netbox-secrets (= 1.7.6) with a NetBox 3.4.x instance. It is very important that the versions of py-netbox-secretstore and py-netbox-secrets match as specified otherwise the migration will not be successful. The reason for this is that py-netbox-secrets 1.8.x is not backwards compatible with Netbox 3.4. For further details please see the updating instructions of py-netbox-secretstore or the UPDATING entry of 2023-05-11. 2. Please also check the pkg-message and the changelogs for further info. 20230531: AFFECTS: users of net-mgmt/netdisco AUTHOR: dgeo@centrale-marseille.fr The netdisco user now needs a HOME and a shell. For existing installs you will need to set HOME to /usr/local/etc/netdisco and shell to /bin/sh. For example in one shell line: pw user mod netdisco -d /usr/local/etc/netdisco -s /bin/sh 20230526: AFFECTS: users of mail/exim AUTHOR: pi@FreeBSD.org The port changes from USE_DB to USE_NDBM. Any existing configuration like ${lookup{$needle}dbm{haystack.db}} will need to change to ${lookup{$needle}dbm{haystack}}. Please also rename your old DBM files while the exim daemon is stopped: find /var/spool/exim/db/* -not -name \*.lockfile -exec mv -i {} {}.db \; 20230513: AFFECTS: users of www/tt-rss AUTHOR: dereks@lifeofadishwasher.com www/tt-rss now expects the user to install the database drivers by hand allowing the port to be database independent however it would be best if you mark the php driver packages as a non-automatic package such that pkg-autoremove doesn't uninstall them. Change 80 to your corresponding php version (80, 81, 82) mysql: pkg set -yA 0 php80-mysqli php80-pdo_mysql; pgsql: pkg set -yA 0 php80-pgsql php80-pdo_pgsql; 20230511: AFFECTS: users of net-mgmt/py-netbox-secretstore AUTHOR: kai@FreeBSD.org Upstream no longer maintains py-netbox-secretstore which it is not compatible with NetBox 3.5 or newer. To ensure compatibility with newer releases of NetBox, the py-netbox-secrets plugin should be used instead. To migrate from security/py-netbox-secretstore to security/py-netbox-secrets please do following steps: 1. Make a backup. 2. Install security/py-netbox-secrets 3. Enable both plugins by updating the following line in the netbox configuration (e.g. /usr/local/share/netbox/netbox/configuration.py): PLUGINS = ['netbox_secretstore', 'netbox_secrets'] 4. Run NetBox migrations: # cd /usr/local/share/netbox # python3.9 manage.py migrate 5. Re-adjust the indices for the netbox-secrets plugin: # python3.9 manage.py sqlsequencereset netbox_secrets > output.sql 6. Run the output of the previous command in the database, e.g.: # psql -d NETBOXDB < output.sql 7. You can now remove netbox-secretstore from the application by removing it from the PLUGINS line in the netbox configuration: PLUGINS = ['netbox_secrets'] 8. Collect static files of the netbox-secrets plugin: # python3.9 manage.py collectstatic --no-input 9. Restart WSGI/httpd environment (supervisord/apache/nginx/etc.). 10. You may have clean up your database of the old tables manually, e.g.: DROP TABLE netbox_secretstore_secret; DROP TABLE netbox_secretstore_secretrole; DROP TABLE netbox_secretstore_sessionkey; DROP TABLE netbox_secretstore_userkey; 11. Uninstall security/py-netbox-secretstore. 20230505: AFFECTS: users of mail/mutt AUTHOR: dereks@lifeofadishwasher.com The patches included in the mail/mutt port will be removed in approximately a month making the port more inline with upstream. If you require any of these features most are available in mail/neomutt or it's possible to use EXTRA_PATCH_TREE to patch a port when building locally. 20230504: AFFECTS: users of sysutils/py-mqttwarn AUTHOR: dvl@FreeBSD.org The redis option REISPUB has been renamed to REDISPUB You should update any make.conf setting etc which refer to this. e.g. change sysutils_py-mqttwarn_REISPUB to sysutils_py-mqttwarn_REDISPUB 20230416: AFFECTS: users of databases/mongodb50, databases/mongodb44 and databases/mongodb60 AUTHOR: ronald@FreeBSD.org MongoDB removed the settings 'fork' and 'pidFilePath' from the default etc/mongodb.conf file. This does not affect mongod started by etc/rc.d/mongod as the settings are passed as arguments. Please verify custom uses of mongod. 20230414: AFFECTS: users of www/gitea AUTHOR: fernape@FreeBSD.org Gitea 1.19.1 contains a breaking change. actions unit has ben renamed to to repo.actions. 20230407: AFFECTS: users of devel/sonarqube-community AUTHOR: netchild@FreeBSD.org You need to make sure to update missing and changed values in PREFIX/libexec/sonarqube/conf/sonar.properties from PREFIX/libexec/sonarqube/conf/sonar.properties.sample 20230318: AFFECTS: users of security/libressl AUTHOR: brnrd@FreeBSD.org The port has been updated to the latest stable version 3.6 of LibreSSL. The shared library versions of the libraries have been bumped. After upgrading, manually update all packages that depend on any of the libraries provided by LibreSSL (libssl, libcrypto and libtls) since the versions of these libraries have changed. Normally, you can obtain the list of dependent software by running the following command: # pkg info -r libressl Then you should rebuild all ports depending on libressl to avoid dangling shared library dependencies. 20230315: AFFECTS: users of lang/ruby30 AUTHOR: yasu@FreeBSD.org The default ruby version has been updated from 3.0 to 3.1. If you compile your own ports you may keep 3.0 as the default version by adding the following lines to your /etc/make.conf file: # # Keep ruby 3.0 as default version # DEFAULT_VERSIONS+=ruby=3.0 If you wish to update to the new default version, you need to first stop any software that uses ruby. Then, you will need to follow these steps, depending upon how you manage your system. If you use pkg, simply upgrade: # pkg upgrade If you do not use pkg, please check entry 20190420. The description there should also work for this version. 20230314: AFFECTS: users of security/openssl-devel AUTHOR: brnrd@FreeBSD.org Users using DEFAULT_VERSIONS=ssl=openssl-devel must update their configuration to DEFAULT_VERSIONS=ssl=openssl30 or openssl31. 20230313: AFFECTS: users of databases/sqlite3 AUTHOR: fuz@FreeBSD.org Due to various ports not being prepared for this change (see 20230227 entry), the DQS option of databases/sqlite3 has been reenabled as a stop gap measure. It is scheduled to be disabled again for good no earlier than 20240101, giving downstream software authors more time to fix their queries. See also: https://sqlite.org/quirks.html#dblquote 20230311: AFFECTS: users of net/dshell AUTHOR: nobutaka@FreeBSD.org net/dshell now depends on net/py-pcapy-ng instead of net/py-pcapy. Because net/py-pcapy-ng conflicts with net/py-pcapy, please uninstall py39-pcapy with the following command before upgrading: # pkg delete -f py39-pcapy 20230310: AFFECTS: users of net-mgmt/unifi7 AUTHOR: otis@FreeBSD.org The mongodb dependency has been changed from 36 to 44, as MongoDB 3.6 is long out out support and end of life. The upgrade path should be as following: 1. Take a backup from within the unifi7 application PRIOR to updating! 2. Stop the unifi7 service (if running) 3. Copy the "backup" directory from LOCALBASE/share/java/unifi/data to a safe location. Also copy keystore and system.properties if you have made any modifications to those files 4. Remove files and directories under LOCALBASE/share/java/unifi/data 5. Upgrade the package 6. Copy the "backup" directory from a safe location back to LOCALBASE/share/java/unifi/data 7. Start the service 8. Restore the configuration from backup As an optional step, review system.properties and keystore to merge any manual modifications you have made (this has to be done with the application stopped) 20230310: AFFECTS: user of benchmarks/ddosify AUTHOR: fernape@FreeBSD.org keep-alive is removed from config file. In default mode, the engine will use keep-alive for all requests. If you want to disable keep-alive for a step, you can add Connection: close header to the step. 20230306: AFFECTS: users of www/qt5-webengine AUTHOR: kai@FreeBSD.org Users that upgrade www/qt5-webengine without using pkg/poudriere might experience failures due to conflicts with the installed version of 5.15.2. In that case, pkg delete -f the qt5-webengine package before building the updated version. 20230304: AFFECTS: users of accessibility/atk and accessibilty/at-spi2-atk AUTHOR: tcberner@FreeBSD.org The packages accessibility/atk and accessibility/at-spi2-atk have been integrated upstream into at-spi2-core. Users of these packages can manually remove them prior to updating accessibility/at-spi2-core using pkg delete -f atk at-spi2-atk if the pkg update process fails due to conflicting files. 20230227: AFFECTS: users of databases/sqlite3 AUTHOR: fuz@FreeBSD.org Option DQS is now disabled by default. This option controls the "double quoted string literals are accepted" quirk, permitting the use of double quotes around string literals if enabled. Users who rely on this quirk need to manually build databases/sqlite3 with the DQS option enabled. See also: https://sqlite.org/quirks.html#dblquote 20230227: AFFECTS: users of mail/py-spf-engine AUTHOR: yasu@FreeBSD.org Default configuration file path of pyspf-milter has changed. Since it looks for ${PREFIX}/etc/etc/pyspf-milter/pyspf-milter.conf now, you should edit the file if you run pyspf-milter. Alternatively you can specify other configuration file path by setting pyspf_milter_conffile variable in /etc/rc.conf. 20230222: AFFECTS: users of net-mgmt/netbox AUTHOR: kai@FreeBSD.org 1. Please make sure that the PostgreSQL server for the NetBox instance is running version 11 or higher. This is because PostgreSQL 10 is End-of-Life since November 2022 and Django 4.1 requires PostgreSQL 11 as a minimum. 2. Please also check the pkg-message and the changelogs for further info. 20230218: AFFECTS: users of databases/mysql57-(server|client) AUTHOR: joneum@FreeBSD.org The default MySQL version has been updated from 5.7 to 8.0. If you compile your own ports you may keep 5.7 as the default version by adding the following lines to your /etc/make.conf file: # # Keep MySQL 5.7 as default version # DEFAULT_VERSIONS+=mysql=5.7 If you wish to update to the new default version, you need to first stop any running server instance. Then, you will need to follow these steps, depending on installed packages. # pkg set -o databases/mysql57-client:databases/mysql80-client # pkg set -o databases/mysql57-server:databases/mysql80-server # pkg upgrade 20230213: Affects: users of sysutils/nut* AUTHOR: cy@FreeBSD.org The nut file ownership fixups due to the UID/GID change from uucp/uucp to nut/nut may not be desireable for all users. Some users with custom file ownership may wish ownership to remain untouched. This revision to the nut family of ports/packages allows users to optionally disable automatic fixup of nut file ownership. 20230213: AFFECTS: users of security/logcheck AUTHOR: yasu@FreeBSD.org Since 1.4.1 ${PREFIX}/etc/logcheck/logcheck.logfiles is empty and files to be checked by logcheck are specified in ${PREFIX}/etc/logcheck/logcheck.logfiles.d/syslog.logfiles. So if you previously edited the former, then you should edit the latter now. 20230210: AFFECTS: users of mail/fetchmail AUTHOR: fernape@FreeBSD.org Fetchmail now warns about OpenSSL before 1.1.1s or 3.0.7, and rejects wolfSSL older than 5.5.1. 20230209: AFFECTS: users of audio/jack AUTHOR: fernape@FreeBSD.org audio/jack 1.9.22 fixes an issue with latency correction on FreeBSD. Latency correction parameters have to be measured again after update. 20230130: AFFECTS: users of USES=nodejs, www/node*, www/npm* and www/yarn* AUTHOR: sunpoet@FreeBSD.org The current USES=nodejs has the following issues: - www/node is not the default version while www/node16 is. - It also means inconsistent naming of node ports. - www/npm duplicates with www/npm-node16. - www/yarn duplicates with www/yarn-node16. The notable changes are introduced to fix the above issues: - Rewrite Mk/Uses/nodejs.mk. - Add new LTS version of nodejs (www/node18). - Add new current version of nodejs (www/node19). - Change default nodejs version from 16 to 18 (latest LTS), - Use consistent naming for all supported node versions. - Convert www/node, www/npm and www/yarn to meta ports. After these changes: - All supported node versions are named as node{14,16,18,19}. - www/node is a meta port which depends on the default version (e.g. www/node18) - www/npm is a meta port which depends on the default version (e.g. www/npm-node18) - www/yarn is a meta port which depends on the default version (e.g. www/yarn-node18) 20230129: AFFECTS: users of benchmarks/ddosify AUTHOR: fernape@freebsd.org In 0.13.0 some configuration keys have been renamed for consistency. Have a look at https://github.com/ddosify/ddosify/releases/tag/v0.13.0 for details. 20230127: AFFECTS: users of security/openvpn AUTHOR: mandree@freebsd.org OpenVPN has been updated to the new upstream release v2.6.0, which is quite compatible with v2.5 versions. A copy of the latest v2.5.8 port is being kept as security/openvpn25 (or openvpn25 package) until end of March 2023. 20230116: AFFECTS: users of sysutils/nut and sysutils/nut-devel AUTHOR: cy@freebsd.org As of PR/268960 Network UPS Tools will now run under its own UID and GID instead of uucp. Users who wish to continue using the uucp user and group may add NUT_USER=uucp and NUT_GROUP=uucp to their make.conf. After upgrading sysutils/nut or sysutils/nut-devel with this patch, restart devd. Then restart nut. This will fix up the permissions of UPS USB devices and allow nut to start normally. 20230111: AFFECTS: users of sysutils/graylog AUTHOR: dch@freebsd.org Graylog 5.x and higher effectively constrains ElasticSearch dependencies, and in most cases will force a migration to OpenSearch 2.x, now available in ports. Plan accordingly. 20230104: AFFECTS: users of mail/spamassassin AUTHOR: cy@freebsd.org As of spamassassin 4.0.0 (3fdfceb36029) the deprecated HashCash plug-in was finally removed. Users using the HashCash plug-in will need to remove references to it. 20221226: AFFECTS: users of sysutils/zrepl AUTHOR: driesm@FreeBSD.org The Prometheus metric zrepl_version_daemon has been converted to the zrepl_start_time metric. The metric still reports the zrepl verison in a label. But the metric value is now the Unix timestamp at the time the daemon was started. The Grafana dashboard in dist/grafana has been updated. The RPC protocol version has also been bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume. 20221220: AFFECTS: users of net-mgmt/unbound_exporter AUTHOR: thomas@beingboiled.info The config defaults for the log file and certificates have been changed. See /usr/local/etc/rc.d/unbound_exporter for possible options and adjust your rc.conf accordingly. 20221215: AFFECTS: users of security/clamav AUTHOR: yasu@FreeBSD.org Many users report that after updating ClamAV to 1.0.0 clamd and freshclam fails to start with integrity check error of databases. According to the result of investigation it happens with following conditions. 1. ClamAV is built on non-cleanroom environment (that is, neither FreeBSD official ClamAV package is used nor the package is built by user with poudriere). 2. math/tomsfastmath is installed in the system that ClamAV is built. So if the errror happens on you system, uninstall TomsFastMath first and then rebuild and reinstall ClamAV. The problem should disappear. 20221128: AFFECTS: devel/py-proxmoxer AUTHOR: einar@isnic.is AuthenticationError Moved proxmoxer.backends.https.AuthenticationError was moved to proxmoxer.AuthenticationError (the class itself is the same). Any imports or references to proxmoxer.backends.https.AuthenticationError should be changed to proxmoxer.AuthenticationError. ProxmoxResourceBase Removed While this should be a fully internal change, the ProxmoxResourceBase class was removed. Use ProxmoxResource instead. Removed ProxmoxHTTPTicketAuth The auth_token and csrf_token arguments are no longer supported. If an existing (still valid) token needs to be used, you can pass the token as password and proxmoxer will attempt to renew the ticket and retrieve a new token and CSRF token. 20221126: AFFECTS: textproc/kibana8 AUTHOR: otis@FreeBSD.org kibana8 now installs kibana-specific utilities into LOCALBASE/bin as symbolic links. Please check whether it will overwrite your local files with names same as these utilities and if so, please rename them or move out of the way in a different manner. 20221126: AFFECTS: textproc/elasticsearch8 AUTHOR: otis@FreeBSD.org elasticsearch8 now installs elasticsearch-specific utilities into LOCALBASE/bin as symbolic links (i.e. elasticsearch-cli and similar). Please check whether it will overwrite your local files with names same as these utilities and if so, please rename them or move out of the way in a different manner. 20221126: AFFECTS: users of lang/php80 AUTHOR: bofh@FreeBSD.org The default version of PHP has been switched from 8.0 to 8.1. If you use binary packages you should make a list of php packages before running 'pkg upgrade': # pkg info \*php80\* > ~/installed-php-ports-list After the upgrade, check with such list if all your php extensions are still installed, and reinstall them if needed. If you use mod_php80 you need to deinstall it and install mod_php81. 20221123: AFFECTS: x11-wm/jwm AUTHOR: fernape@FreeBSD.org jwm 2.4 introduces changes in the configuration. To convert an existing v2.3 configuration file using xsltproc, run: cp ~/.jwmrc ~/.jwmrc.old xsltproc jwm-2.4.xslt ~/.jwmrc.old > ~/.jwmrc If you have multiple configuration files, it may be necessary to apply the XSLT to some or all of them depending on what configuration options are stored in the file. 20221017: AFFECTS: archivers/star AUTHOR: fernape@FreeBSD.org With the update of devel/schilybase to 2022-10-16 a new port archivers/tartest has been splitted off from archivers/star. 20221016: AFFECTS: textproc/apache-solr AUTHOR: mfechner@FreeBSD.org Apache solr version 9 is released and made available as extra port textproc/apache-solr9. Version 9 cannot start directly with data from version 8. Additional steps for data migration is required. If you like to use the new version, deinstall the old version and install the new version: # pkg delete apache-solr # pkg install apache-solr9 After this you need to migrate data and migration, for this check the solr documentation. 20221015: AFFECTS: users of gstreamer1-* when upgrading via port builds on the host AUTHOR: riggs@FreeBSD.org The update of the gstreamer1-* ports to 1.20.3 requires a clean install of gstreamer1-* ports. In particular, when trying to update ports in-place using portupgrade or portmaster, the builds are likely to fail due to dependency mismatches. If this is your preferred update path, you need to deinstall (pkg delete -f) gstreamer1 and the plugins before reinstalling them from the ports tree. Note that pkg upgrade will do the right thing: If you use official FreeBSD packages or build your own set of packages using poudriere, nothing special is needed. 20221012: AFFECTS: devel/websvn AUTHOR: michael.osipov@siemens.com WebSVN 2.8.0 includes full PHP 8.x support which requires a change from PEAR to Composer 2. You must manually install dependencies through it, the ports system will not handle it anymore for you since */horde* (PR 266552) has been marked as incompatible with PHP 8.x for the time being. See pkg-message for detailed instructions. 20221011: AFFECTS: users of security/acme.sh AUTHOR: dvl@FreeBSD.org This update may break your install if you were using a symlink to %%EXAMPLESDIR%%/acme.sh.conf - that file is no longer installed. Instead, a log rotation configuration is now installed to etc/cron.d/acme.sh.sample you should modify etc/cron.d/acme.sh to needs. The port now installs a log rotation file to etc/newsyslog.d/acme.sh.sample and you you should update etc/newsyslog.d/acme.sh to suit your needs. This file has long been part of the port, but was never installed. Neither the log rotation nor the crontab are active until you remove the comments. 20221002: AFFECTS: users of shells/bash AUTHOR: ehaupt@FreeBSD.org Bash has been updated to version 5.2. In previous versions, the default port option-set used to link against libreadline from ports. However, the current version of devel/readline is too old for bash 5.2. For now, the default option has been switched to use the bundled version of libreadline and the other option is marked broken. Once devel/readline is updated this can be reverted. If you're updating bash from source and you've previously explicitly set to use use PORTS_READLINE, you'll have to disable the PORTS_READLINE option before updating: # cd /usr/ports/shells/bash # make config or flush it entirely: # cd /usr/ports/shells/bash # make rmconfig 20220929: AFFECTS: users of graphics/bmeps AUTHOR: takefu@airport.fm The executable name has been changed from this edition from bmpp to bitmap2pp 20220925: AFFECTS: users of security/libressl AUTHOR: brnrd@FreeBSD.org The port has been updated to the latest stable version 3.5 of LibreSSL. The shared library versions of the libraries have been bumped. After upgrading, manually update all packages that depend on any of the libraries provided by LibreSSL (libssl, libcrypto and libtls) since the versions of these libraries have changed. Normally, you can obtain the list of dependent software by running the following command: # pkg info -r libressl Then you should rebuild all ports depending on libressl to avoid dangling shared library dependencies. 20220919: AFFECTS: users of audio/strawberry AUTHOR: mandree@FreeBSD.org strawberry now uses FLAVORs based on the qt version, offering -qt5 and -qt6, with -qt5 the default. You may need to explicitly install either of the new flavors. 20220919: AFFECTS: users of sysutils/schilyutils AUTHOR: fuz@fuz.su Schilyutils has been split up into two ports. If you want the bosh shell, the new port is shells/bosh, which can be installed with: # pkg install bosh or # portmaster -o shells/bosh 20220918: AFFECTS: users of mail/roundcube AUTHOR: brnrd@FreeBSD.org Roundcube has been upgraded to 1.6.0 and introduces breaking changes to configuration options of remote services (imap, smtp, ldap, sieve). Check https://roundcube.net/news/2022/07/28/roundcube-1.6.0-released for details. Version 1.6 no longer includes the Classic and Larry skins, which are now available as separate mail/roundcube-classic and mail/roundcube-larry ports. 20220910: AFFECTS: users of devel/cmake AUTHOR: diizzy@FreeBSD.org CMake has been converted to a meta-port and new CMake packages created causes conflicts with old binary packages prior to this change. If CMake was installed using binary packages via pkg it needs to be uninstalled using pkg delete before installing CMake and related packages after this change. pkg delete cmake pkg install cmake-core If you're using portmaster you also need to delete the old CMake package before upgrading. 20220909: AFFECTS: users of emulators/qemu AUTHOR: bofh@FreeBSD.org emulators/qemu has been updated to 7.1.0. Previous 7.0.X branch has been repocopied to emulators/qemu70. If someone wants to stick with 7.0.X branch please use one of the following command: # pkg install qemu70/qemu70-nox11(based on flavor used) or # portmaster -o emulators/qemu70 emulators/qemu or # portupgrade -o emulators/qemu70 emulators/qemu 20220903: AFFECTS: users of editors/vim AUTHOR: adamw@FreeBSD.org The Vim port no longer installs a system-wide vimrc. It drastically affected config loading order, and led to various settings being clobbered, duplicated, or ignored. Vim's provided defaults.vim (/usr/local/share/vim/vim90/defaults.vim) continues to be read just as before, but its settings are no longer clobbered. Take a look in there for any settings you may want to change, and do ':h initialization' to see where Vim looks for config files. 20220903: AFFECTS: users of archivers/py-borgbackup AUTHOR: mandree@FreeBSD.org Borgbackup has been upgraded to version 1.2. For users who you wish to continue using version 1.1, use either of these commands for upgrading: With binary packages through pkg: pkg set -o archivers/py-borgbackup:archivers/py-borgbackup11 pkg upgrade With portmaster or portupgrade (replace the command accordingly): portmaster -o archivers/py-borgbackup11 archivers/py-borgbackup 20220901: AFFECTS: users of mail/rainloop-community AUTHOR: yasu@FreeBSD.org Since 1.17.0 upstream distributes only one "legacy" edition under MIT license and mail/rainloop-community is removed as a result. So please uninstall mail/rainloop-community (rainloop-community-phpXY) and install mail/rainloop (rainloop-phpXY) instead. 20220831: AFFECTS: users of x11/xscreensaver on 13.1-RELEASE AUTHOR: zirias@FreeBSD.org With the update to 6.04, xscreensaver now uses security/unix-selfauth-helper for PAM authentication. This relies on pam_exec.so, which had a bug causing a segfault on authentication attempts prior to 13.1-RELEASE-p1. For details, please see https://www.freebsd.org/security/advisories/FreeBSD-EN-22:19.pam_exec.asc Make sure your system is fully upgraded, otherwise you might be unable to unlock your screen. 20220825: AFFECTS: users of net/xrdp or net/xrdp-devel AUTHOR: meta@FreeBSD.org After xorg upgrade to 21.1.4, xorgxrdp session doesn't start as before This is because bin/Xorg has been replaced with X server binary wrapper. You must manually edit the Xorg section in etc/xrdp/sesman.ini to get it working again. The following is a short example of where, how to modify sesman.ini. Make sure to replace LOCALBASE with your actual path. [Xorg] ; Specify the path of non-suid Xorg executable. It might differ depending ; on your distribution and version. Find out the appropreate path for your ; environment. The typical path is known as follows: ; ; Fedora 26 or later : param=/usr/libexec/Xorg ; Debian 9 or later : param=/usr/lib/xorg/Xorg ; Ubuntu 16.04 or later : param=/usr/lib/xorg/Xorg ; Arch Linux : param=/usr/lib/Xorg ; CentOS 7 : param=/usr/bin/Xorg or param=Xorg ; CentOS 8 : param=/usr/libexec/Xorg ; -param=Xorg +param=LOCALBASE/libexec/Xorg 20220815: AFFECTS: users of net/keycloak AUTHOR: fernape@FreeBSD.org The flavors -mysql and -postgres were removed, the necessary configuration for those database backends was rolled into the base release by upstream. The configuration files changed completely, so they need to be rebuilt from scratch. 20220807: AFFECTS: users of news/inn AUTHOR: kbowling@FreeBSD.org The inn port has been updated to 2.7 release. Users upgrading from prior versions should read through the announcement for any manual upgrading steps that apply to your environment. https://lists.isc.org/pipermail/inn-announce/2022-July/000015.html 20220711: AFFECTS: users of security/stunnel AUTHOR: zi@FreeBSD.org The stunnel port has been updated to drop privileges to the stunnel user by default. As a result of this change, the pid file location has changed. If you have a running copy of stunnel, you should stop the process before performing the upgrade. Alternatively, you will need to # pkill stunnel;service stunnel start after the upgrade has been completed. 202207XYZ: AFFECTS: users of devel/maven-wrapper and devel/maven AUTHOR: michaelo@apache.org The environment variable M2_HOME has been replaced with more common MAVEN_HOME which can be used to pass a custom Maven home directory. 20220629: AFFECTS: updating x11-servers/xorg-server from a port AUTHOR: se@FreeBSD.org The xorg-server port now has a library dependency on x11/libxcvt, which cannot be installed when the previous version of xorg-server is present. To be able to update xorg-server from a port, the previous version needs to be manually deinstalled to allow libxcvt to be installed. 20220628: AFFECTS: users of Erlang and Elixir AUTHOR: dch@FreeBSD.org For more than a decade, the Elixir Mix tool and the Erlang rebar or erlang.mk build tools have been the de facto way of installing and managing packages for specific applications. All main-stream applications, from Riak, CouchDB, RabbitMQ, Phoenix, and Elixir, expect that packages are fetched and compiled into an OTP Release, with in-built version locking, external package management. There is no point in maintaining a large number of libraries, that are used neither for development, nor operations. Users are directed to https://rebar3.org/ https://erlang.mk/ or https://elixir-lang.org/getting-started/mix-otp/introduction-to-mix.html to fetch custom packages. https://www.freebsd.org/status/report-2021-07-2021-09/#_freebsd_erlang_ecosystem_ports_update 20220626: AFFECTS: users of python AUTHOR: thierry@FreeBSD.org The default version of python3 and python was switched to 3.9. For ports users wanting to keep version 3.8 as default, add DEFAULT_VERSIONS+= python=3.8 python3=3.8 to make.conf Following procedures may ease the upgrade: For users of pre-build packages: # sh # for i in $(pkg query -g %n 'py38-*'); do pkg set -yn ${i}:py39-${i#py38-}; done # pkg upgrade For portmaster users: # sh # portmaster -o lang/python39 python38 # REINSTALL="$(pkg info -o "*py38*" | awk '{printf "%s ", $2}')" # pkg delete -f "*py38*" # portmaster $REINSTALL # REBUILD=$(pkg query -g "%n:%dn" '*' | grep py3 | grep -v py39 | cut -d : -f 1 | sort -u) # portmaster $REBUILD # REBUILD2=$(pkg list | grep python-38 | xargs pkg which | awk '{print $6}' | sort -u) # portmaster $REBUILD2 Final steps (for pre-built packages & portmaster): If no longer required, Python 3.8 can be removed via "pkg remove python38" and the directory /usr/local/lib/python3.8 can then be deleted afterwards, if not empty. 20220625: AFFECTS: users of sysutils/fusefs-bindfs AUTHOR: doralitze@chaotikum.org Bindfs defaults to use direct I/O since version 1.16. While this results in major performance improvements as well as several bug fixes, this also breaks direct legacy calls to mmap. If your application still uses them consider these two options: 1. Mount using `--no-direct-io` 2. Upgrade your application in order to query mapping guards 20220623: AFFECTS: users of science/gramps AUTHOR: fernape@FreeBSD.org databases/py-bsddb3 is deprecated and will be removed in the future. With that gramps will lose the ability to load family trees using Berkeley DB. It is suggested to migrate all family trees using Berkeley DB by exporting them to gramps xml and import that gramps xml into a family tree using sqlite as database. 20220620: AFFECTS: users of www/selenium AUTHOR: fernape@FreeBSD.org The port has changed startup args so if you are using selenium_args= in rc.conf you need to add the parameter "standalone" manually. 20220616: AFFECTS: users of net-mgmt/netbox AUTHOR: kai@FreeBSD.org /!\ WARNING /!\ The NetBox 3.2 release contains major changes, so at least items 1.), 2.) and 3.) must be checked before proceeding with the upgrade! /!\ WARNING /!\ 1. This release includes a database migration that will remove the "asn", "contact_name", "contact_phone", and "contact_email" fields from the site model. (These fields have been superseded by the ASN and contact models introduced in NetBox v3.1.) To protect against the accidental destruction of data, the upgrade process will fail if any sites still have data in any of these fields. To bypass this safeguard, set the NETBOX_DELETE_LEGACY_DATA environment variable when running the upgrade script, which will permit the destruction of legacy data. A set of migration scripts is available to assist with the migration of legacy site data: https://github.com/netbox-community/migration-scripts 2. NetBox v3.2 requires Python 3.8 or later. 3. If the NetBox Plugin "net-mgmt/py-netbox-plugin-extension" is used, please disable it before the migrations are applied. This can be done by removing the entry "netbox_plugin_extensions" from the "PLUGINS" section in the NetBox configuration. Once the upgrade is done, this port/package can be safely removed as it's no longer required. 4. Please also check the pkg-message and the changelogs for further info. 20220608: AFFECTS: devel/autoconf-wrapper, devel/autoconf213 AUTHOR: tijl@FreeBSD.org These ports have been renamed to devel/autoconf-switch and devel/autoconf2.13 respectively. If your favourite port updating tool cannot handle that then just remove the packages with "pkg delete" and then install the new port. 20220607: AFFECTS: security/openssh-portable AUTHOR: bdrewery@FreeBSD.org OpenSSH has been updated to 9.0p1 with incompatible changes. See https://www.openssh.com/txt/release-9.0 for details. 20220602: AFFECTS: sysutils/graylog AUTHOR: dch@FreeBSD.org Graylog 4.3.0+ fails to start if graylog's internal collector for system statistics is enabled. This will eventually be addressed upstream. Add disable_native_system_stats_collector=true to your graylog.conf. 20220513: AFFECTS: devel/nexus2-oss AUTHOR: michael.osipov@siemens.com Nexus 2.15.x introduces incompatible configuration changes. You must review changes in ETCDIR/wrapper.conf and ETCDIR/jetty*.xml with updated samples as well as NEXUS_WORKDIR/conf/logback-nexus.xml with its origin from DATADIR/nexus/WEB-INF/lib/nexus-core-VERSION.jar!/META-INF/log/logback-nexus.xml, grant write access to files in ETCDIR since Nexus itself might update files in place otherwise your instance will not properly work after the update. 20220510 AFFECTS: sysutils/zrepl AUTHOR: monwarez@gmail.com The zrepl update to 0.5.0.8 includes the following breaking changes: - The Prometheus metric zrepl_version_daemon was converted to zrepl_start_time The metric still reports the zrepl version in a label. But the metric *value* is now the Unix timestamp at the time the daemon was started. The Grafana dashboard in zrepl examples directory has been updated. 20220502: AFFECTS: mail/mutt AUTHOR: dereks@lifeofadishwasher.com Default header cache option has been changed to the new option LMDB using databases/lmdb. The BDB option still exists but now uses databases/db18 due to the EOL of databases/db5. 20220501: AFFECTS: users of drm-current-kmod and drm-devel-kmod AUTHOR: manu@FreeBSD.org Both ports where removed. If you were using either one of them directly (i.e. without using graphics/drm-kmod metaport) use graphics/drm-510-kmod. If you have some problems with this one try drm-54-kmod and report a bug on https://github.com/freebsd/drm-kmod. 20220428: AFFECTS: users of databases/redis AUTHOR: yasu@FreeBSD.org The databases/redis port has been updated to 7.0. Users wanting to stay on 6.2 can replace databases/redis with databases/redis62 with one of the following commands. If you use pkg with binary packages: # pkg set -o databases/redis:databases/redis62 # pkg upgrade If you use portmaster: # portmaster -o databases/redis62 databases/redis If you use portupgrade: # portupgrade -o databases/redis62 databases/redis 20220426: AFFECTS: users of deskutils/grantleetheme AUTHOR: kde@FreeBSD.org The pkg update of deskutils/grantleetheme to 22.04 can fail due to a filesystem location having changed from being a file to being a directory. This leads to pkg's temporary file creation throwing an error. To update to KDE Gear 22.04 please run # pkg delete -f grantleetheme prior to the update. 20220424: AFFECTS: users of emulators/qemu AUTHOR: bofh@FreeBSD.org emulators/qemu has been updated to 7.0.0. Previous 6.2.X branch has been repocopied to emulators/qemu6. If someone wants to stick with 6.2.X branch please use one of the following command: # pkg install qemu6/qemu6-nox11(based on flavor used) or # portmaster -o emulators/qemu6 emulators/qemu or # portupgrade -o emulators/qemu6 emulators/qemu 20220421: AFFECTS: users of lang/ruby27 AUTHOR: yasu@FreeBSD.org The default ruby version has been updated from 2.7 to 3.0. If you compile your own ports you may keep 2.7 as the default version by adding the following lines to your /etc/make.conf file: # # Keep ruby 2.7 as default version # DEFAULT_VERSIONS+=ruby=2.7 If you wish to update to the new default version, you need to first stop any software that uses ruby. Then, you will need to follow these steps, depending upon how you manage your system. If you use pkg, simply upgrade: # pkg upgrade If you do not use pkg, please check entry 20190420. The description there should also work for this version. 20220413: AFFECTS: users of net-im/py-matrix-synapse AUTHOR: ports@skyforge.at Synapse will now refuse to start up if open registration is enabled, in order to help mitigate abuse across the federation. If you would like to provide registration to anyone, consider adding email, recaptcha or token-based verification in order to prevent automated registration from bad actors. This check can be disabled by setting the enable_registration_without_verification option in your homeserver configuration file to true. More details are available in the upgrade notes[0]. Synapse will additionally now refuse to start when using PostgreSQL with a non-C values for COLLATE and CTYPE, unless the config flag allow_unsafe_locale, found in the database section of the configuration file, is set to true. See the upgrade notes[1] for details. [0] https://matrix-org.github.io/synapse/v1.56/upgrade.html#open-registration-without-verification-is-now-disabled-by-default [1] https://matrix-org.github.io/synapse/v1.56/upgrade#change-in-behaviour-for-postgresql-databases-with-unsafe-locale 20220410: AFFECTS: users of sysutils/screen AUTHOR: cy@FreeBSD.org As of sysutils/screen-4.9.0_5, the MULTUSER option is default, reverting to the traditional setuid-root behavior. People who wish to secure their screen install must terminate all screen sessions, then install screen without the MULTIUSER option. The option was reversed because it caused too much astonishment among users of screen. 20220401: AFFECTS: security/sshguard AUTHOR: kevinz5000@gmail.com Blacklisting is now disabled by default to avoid overriding the setting in sshguard.conf. To enable blacklisting, uncomment the BLACKLIST_FILE line in sshguard.conf. 20220329: AFFECTS: users of sysutils/screen AUTHOR: cy@FreeBSD.org As of sysutils/screen-4.9.0_3, the multiuser feature is not supported by default. The multiuser feature requires setuid root to function. This creates a security risk. Some Linux distributions have had non-setuuid root screen for a dozen or more years. FreeBSD is following suit. A new MULTIUSER option has been added to enable users to install setuid root screen. The MULTIUSER option default is OFF. Users who wish to use the multiuser feature may, - Build screen using the MULTIUSER option, or - Poudriere users can use poudriere-options to enable the MULTIUSER option, or - Users can chmod the setuid bit for ${LOCALBASE}/bin/screen-4.9.0, making screen setuid root to enable the multiuser feature. 20220326: AFFECTS: users of misc/freebsd-doc-* AUTHOR: blackend@FreeBSD.org A change to the doc toolchain prevents the build of individual localized HTML versions of the documentation without building the en_US version. HTML option is currently disabled until a good solution is found. PDF version, the default option, is now the only available option. Please re-run "make config" to pick up this new default. 20220313: AFFECTS: users of net/unison AUTHOR: madpilot@FreeBSD.org unison has been updated to version 2.52. The new version introduces a new wire protocol and on disk archive format. This new version is compatible with 2.51 clients for communication, so it's now possible to upgrade one side and then the other. The archive files are automatically converted to the new version, but once they are converted the y are incompatible with the previous version. In case you need version 2.51, the previous version of the port is preserved in net/unison251. 20220311: AFFECTS: users of multimedia/get_iplayer AUTHOR: jamie@catflap.org get_iplayer has a number of changes to quality settings that may break existing configurations. Please see the release notes for further information: https://github.com/get-iplayer/get_iplayer/wiki/release320to329#release329 20220311: AFFECTS: users of emulators/virtualbox-ose AUTHOR: grembo@FreeBSD.org In order to comply to hier(7), VirtualBox's configuration of non-default IP ranges to be used in host-only mode moved from /etc/vbox/networks.conf to ${LOCALBASE}/etc/vbox/networks.conf. 20220311: AFFECTS: users of net/nats-server AUTHOR: olgeni@FreeBSD.org A dedicated 'nats' user was added, replacing 'nobody' in the startup script. You should check your configuration and assign updated ownership to your data files. 20220227: AFFECTS: users of graphics/bmeps AUTHOR: takefu@airport.fm The binary and man page have been renamed from bmpp{.1.gz} to bitmap2pp{.1.gz} 20220225: AFFECTS: users of x11-toolkits/py-wxPython40 AUTHOR: lbartoletti@FreeBSD.org x11-toolkits/py-wxPython40 has been removed to be replaced by the 4.1 version. However the new wxPython ports is now named x11-toolkits/py-wxPython4. Depending on the tools you use, you may have to remove the port before ports upgrade. 20220224: AFFECTS: users of net-im/openfire AUTHOR: nikita@druba.su The port version have been updated from 4.6.x to 4.7.x. It is recommended to do database and configs backup before updating. 20220219: AFFECTS: users of sysutils/intel-pcm-devel AUTHOR: egypcio@FreeBSD.org sysutils/intel-pcm-devel became quite obsolete once sysutils/intel-pcm is now pretty much following a constant and stable update cycle, so users of the -devel version are encouraged to switch to it. If you still have sysutils/intel-pcm-devel installed, please delete it from your system and install sysutils/intel-pcm instead: # pkg delete sysutils/intel-pcm-devel # pkg install sysutils/intel-pcm 20220219: AFFECTS: users of math/qhull* AUTHOR: stephen@FreeBSD.org Because of entries in MOVED, portupgrade can get confused updating qhull. It is recommended that you delete qhull and ports depending upon it, and then reinstalling all the dependent ports. 20220218: AFFECTS: users of TeX* AUTHOR: bofh@FreeBSD.org TeX system has been updated to 2021 from 2015. Normal pkg upgrade or portmaster -a should handle all the upgrade properly. In case not please create a ticket or send a mail to tex@FreeBSD.org print/tex-aleph has been removed as per upstream. This package should be removed manually. Additionally users have reported to delete texlive-texmf prior to starting update, or pkg-static will indicate there is a conflict during the upgrade of texlive-base : # pkg remove tex-aleph texlive-texmf 20220218: AFFECTS: users of net-mgmt/librenms AUTHOR: dvl@FreeBSD.org The storage directory has moved from WWWDIR to /var/db/librenms/storage to comply with man 7 hier. When upgrading, you may need to manually create this symlink. 20220212: AFFECTS: users of lang/php8[01][-extensions]? AUTHOR: bofh@FreeBSD.org Non-Default OPTION MYSQL80 has been removed in lieu of making php8[01]-openssl as part of DEFAULT php8[01] installation. Although for php74 it is not the case. Ports that depends on security/php8[01]-openssl will no longer be installed as these have been removed. There is no side effect of this for ports which have USE_PHP=openssl. In case for php74 as the default php74-openssl will be installed otherwise it will be used from php installation. If you are using pkg, you have to remove php8[01]-openssl manually after the upgrade : # pkg info \*php8\* > ~/installed-php-ports-list # pkg upgrade -y # pkg delete -f php8[01]-openssl # service -R While rebuilding from ports users old php.conf is not overwritten. So have to manually remove the ports. For portmaster users: # sh # REINSTALL="$(pkg info -o "*php80*" | grep -v openssl | awk '{printf "%s ", $2}')" # pkg delete -f "*php80*" # portmaster $REINSTALL # portmaster -a 20220207: AFFECTS: users of security/amavisd-new AUTHOR: flo@FreeBSD.org Amavis does now depend on archivers/7-zip (7zz) you might need to update your amavisd.conf and replace all ocurances of p7zip (7zr) accordingly. 20220129: AFFECTS: users of editors/neovim AUTHOR: adamw@FreeBSD.org Neovim now uses luajit-openresty as the Lua provider. Many neovim plugins compile some of their code (Packer does this, as do many LSP plugins). Neovim will produce errors and fail to load the plugins. Deleting and reinstalling any plugins that produce errors should fix the startup. If you use Packer, you also want to delete the startup cache: # rm -rf ~/.config/nvim/plugin/packer_compiled.lua 20220128: AFFECTS: users of x11-fonts/source-sans-ttf AUTHOR: fernape@FreeBSD.org The font name has changed its prefix from SourceSansPro* to SourceSans*. Users of this font might need to change their configurations to pick up the new names. 20220128: AFFECTS: users of net-im/dendrite AUTHOR: ashish@FreeBSD.org The configuration needs to be updated to version 2 following upgrade to Dendrite v0.6. Please refer to /usr/local/etc/dendrite/dendrite.yaml.sample for a sample configuration. 20220127: AFFECTS: users of PyQt AUTHOR: kde@FreeBSD.org Most of the PyQt ports have been merged into single port devel/py-qt5-pyqt. `pkg upgrade` will handle update automatically . 20220126: AFFECTS: users of mail/bogofilter, mail/bogofilter-lmdb AUTHOR: mandree@FreeBSD.org The default version of mail/bogofilter now uses LMDB instead of Berkeley DB. It is not compatible and cannot read databases. Your options are: 1. use bogoutil on each wordlist for each of your users first, ONLY THEN reinstall bogofilter, THEN reload the databases with bogoutil, OR 2. install the matching bogofilter version and If you had been using bogofilter-lmdb so far, install bogofilter. If you had been using bogofilter so far, install bogofilter-bdb. 20220125: AFFECTS: users of lang/php74 AUTHOR: tz@FreeBSD.org The default version of PHP has been switched from 7.4 to 8.0. If you use binary packages you should make a list of php packages before running 'pkg upgrade': # pkg info \*php7\* > ~/installed-php-ports-list After the upgrade, check with such list if all your php extensions are still installed, and reinstall them if needed. If you use mod_php74 you need to deinstall it and install mod_php80. 20220120: AFFECTS: users of x11-wm/dwm AUTHOR: 0mp@FreeBSD.org dwm has been updated to 6.3. The option RUGAPS is no longer available because it depends on a patch only available for version 6.2. RUGAPS can be reintroduced if desired once it is ported to 6.3 by the interested party. 20220118: AFFECTS: users of net-mgmt/netbox AUTHOR: kai@FreeBSD.org 1. Please make sure that the PostgreSQL server for the NetBox instance is running version 10 or higher. This is because PostgreSQL 9.6 is End-of-Life since November 2021 and NetBox 3.1 makes use of the "macaddr8" field which was introduced with PostgreSQL 10. 2. Please also check the pkg-message and the changelogs for further info. 20220110: AFFECTS: users of security/bastillion AUTHOR: netchild@FreeBSD.org If you already performed the actions of the next entry, the following action in this entry needs to be performed regardless. If you did not already perform the actions of the next entry, only the action of this entry needs to be performed. The datastore of bastillion needs to be upgraded (if you do not see users / can not login, you forgot to upgrade it): java -jar %%PREFIX%%/jetty_bastillion/upgrade/bastillion-upgrade-4.00.01.jar %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties 20220104: AFFECTS: users of security/bastillion AUTHOR: netchild@FreeBSD.org The datastore of bastillion needs to be upgraded (if you do not see users / can not login, you forgot to upgrade it): java -jar %%PREFIX%%/jetty_bastillion/upgrade/bastillion-upgrade-4.00.00.jar %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties 20220102: AFFECTS: users of sysutils/py-azure-cli AUTHOR: dbaio@FreeBSD.org When upgrading to Azure CLI v2.31.0, you will need to re-authenticate on Azure services. $ az login --use-device-code Starting in version 2.30.0, Azure CLI uses MSAL as the underlying authentication library. MSAL uses AAD v2.0 authentication flow to provide more functionality and increases security for token cache. More info: https://docs.microsoft.com/en-us/cli/azure/msal-based-azure-cli 20211220: AFFECTS: users of devel/notcurses AUTHOR: nickblack@linux.com Notcurses 3 introduces a new SONAME and significant API/ABI changes. Dependent applications must be recompiled at a minimum. A complete guide to updating for the new API is available under "Porting API2 Applications to API3" at https://github.com/dankamongmen/notcurses/releases/tag/v3.0.0 20211220: AFFECTS: users of net-im/openfire AUTHOR: nikita@druba.su The port options have been renamed to be more readable. When not using the default options, they have to be regenerated. # cd /usr/ports/net-im/openfire # make config 20211213: AFFECTS: users of emulators/qemu-utils AUTHOR: bofh@FreeBSD.org New port emulators/qemu@tools has been introduced which is similar to emulators/qemu-utils. qemu-utils has also been DEPRECATED in favor for this as it's MASTER port has also been marked DEPRECATED and set to expire on 2022-01-09. For updating to qemu-tools please use one of the following command: # pkg install qemu-tools or # portmaster -o emulators/qemu-utils emulators/qemu@tools 20211116: AFFECTS: users of emulators/qemu50 AUTHOR: bofh@FreeBSD.org emulators/qemu50 has been moved to emulators/qemu5 and updated to 5.2.0 which is the last version from 5.X.X branch. This is done in preparation of updating emulators/qemu into latest 6.X branch. If someone wants to stick with 5.X.X branch please use one of the following command: # pkg install qemu5 or # portmaster -o emulators/qemu50 emulators/qemu5 This version also introduces a stripped nox11 version which can be installed with: # pkg install qemu5-nox11 or # portmaster emulators/qemu5@nox11 20211115: AFFECTS: AFFECTS: users of *-emacs2x-* packages AUTHOR: jrm@FreeBSD.org To avoid problems when editors/emacs or editors/emacs-devel are updated, the emacs major version has been removed from these package names. For example, the old and new package names of devel/magit are ----------------------------------------------------------- | Old Package Name | New Package Name | |-------------------------- |-----------------------------| | magit-emacs27 | magit | | magit-emacs27_nox | magit-emacs_nox | | magit-emacs27_canna | magit-emacs_canna | | | | | magit-emacs29_nox | magit-emacs_devel_nox | | magit-emacs29 | magit-emacs_devel | ----------------------------------------------------------- To handle these final package name changes, follow a similar procedure as the one described in the 20200811 entry. That is, simply running `pkg upgrade` will not upgrade, e.g., foo-emacs27_nox to foo-emacs_nox. Binary package users: To update these packages, run these commands under /bin/sh with superuser privileges before upgrading. # default flavor of editors/emacs installed for i in $(pkg query -g %n '*-emacs27'); do if [ "$i" != "notmuch-emacs27" ]; then nn=$(echo "$i" | sed -e 's/-emacs27//') else nn=$(echo "$i" | sed -e 's/-emacs27/-emacs/') fi pkg set -yn "$i":"$nn" done # canna or nox flavor of editors/emacs installed for i in $(pkg query -g %n '*-emacs27*'); do nn=$(echo "$i" | sed -e 's/emacs27/emacs/') pkg set -yn "$i":"$nn" done # editors/emacs-devel installed for i in $(pkg query -g %n '*-emacs29*'); do nn=$(echo "$i" | sed -e 's/emacs29/emacs_devel/') pkg set -yn "$i":"$nn" done portmaster users: portmaster -r emacs 20211110: AFFECTS: users of www/node*, www/npm*, www/yarn* AUTHOR: mfechner@FreeBSD.org The port framework was updated to use a default version for nodejs. The default version is pointing to the latest LTS version which is currently version 16. You can overwrite this by defining in /etc/make.conf, e.g. version 17: DEFAULT_VERSIONS=nodejs=17 Or if you would like to stick always to the current version use: DEFAULT_VERSIONS=nodejs=current If you would like to use yarn or npm together with nodejs version 17, just install the package that is pulling the wanted dependency to nodejs: # pkg install yarn-node17 # pkg install npm-node17 20211109: AFFECTS: users of security/libressl AUTHOR: brnrd@FreeBSD.org The port has been updated to the latest stable version 3.4 of LibreSSL. The shared library versions of the libraries have been bumped. After upgrading, manually update all packages that depend on any of the libraries provided by LibreSSL (libssl, libcrypto and libtls) since the versions of these libraries have changed. Normally, you can obtain the list of dependent software by running the following command: # pkg info -r libressl Then you should rebuild all ports depending on libressl to avoid dangling shared library dependencies. 20211107: AFFECTS: users of sysutils/devcpu-data AUTHOR: jrm@FreeBSD.org The RC variable name microcode_cpus is now deprecated. Users should instead use the variable microcode_update_cpus. Two new ports were branched from sysutils/devcpu-data, sysustils/devcpu-data-amd and sysustils/devcpu-data-intel. The two new ports contain only the CPU microcode updates for each vendor and sysutils/devcpu-data now only contains an RC script. Both new ports are on-by-default, optional dependencies of sysutils/devcpu-data. 20211101: AFFECTS: users of textproc/redisearch AUTHOR: osa@FreeBSD.org The textproc/redisearch port has been updated to the recent stable release - v2.2. Users wanting to stay on v2.0 can replace textproc/redisearch with textproc/redisearch20 with one of the following commands: # pkg install textproc/redisearch20 or # portmaster -o textproc/redisearch20 textproc/redisearch or # portupgrade -o textproc/redisearch20 textproc/redisearch NOTE: The textproc/redisearch20 brings a new name for the module, i.e. redisearch20.so, so be careful. 20211024: AFFECTS: sysutils/beats7 AUTHOR: otis@FreeBSD.org The following breaking changes apply to beats 7.15.0 and newer: - All beats: Loading Kibana assets (dashboards, index templates) rely on Saved Object API. So to provide a reliable service, Beats can only import and export dashboards using at least Kibana 7.15. - Filebeat: - Remove all alias fields pointing to ECS fields from modules. This affects the Suricata and Traefik modules. - Fix Crowdstrike ingest pipeline that was creating flattened process fields. - Rename log.path to log.file.path in filestream to be consistent with log input and ECS. - Heartbeat: - Remove long deprecated watch_poll functionality. - Fix inconsistency in event.dataset values between heartbeat and fleet by always setting this value to the monitor type / fleet dataset. - Metricbeat: - Fix Elasticsearch jvm.gc.collectors.old being exposed as young Full changelog: https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.15.0.html https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.15.1.html 20211024: AFFECTS: users of databases/postgresql* and other software using PostgreSQL to run AUTHOR: kbowling@FreeBSD.org The default version of PostgreSQL has been switched from 12 to 13. The upgrade procedure can use up twice the space the databases currently needs. If you have a big amount of stored data take a closer look at the manpage of pg_upgrade for avoidance and/or speedup of the upgrade. The upgrade instructions consider a basic usage and do not match complex scenarios like replication, sharding, or similar. Upgrade instructions: First stop your PostgreSQL, create PostgreSQL-binaries and backup your data. If you have another Version of PostgreSQL installed, for example 12.8, your files are named according to this. # service postgresql stop # pkg create postgresql12-server postgresql12-contrib # mkdir /tmp/pg-upgrade # tar xf postgresql12-server-12.8.pkg -C /tmp/pg-upgrade # tar xf postgresql12-contrib-12.8.pkg -C /tmp/pg-upgrade # pkg delete -f databases/postgresql12-server databases/postgresql12-contrib databases/postgresql12-client Now update PostgreSQL: pkg user: # pkg install databases/postgresql13-server databases/postgresql13-contrib # pkg upgrade Portmaster users: # portmaster databases/postgresql13-server databases/postgresql13-contrib # portmaster -a Portupgrade users: # portinstall databases/postgresql13-server databases/postgresql13-contrib # portupgrade -a After installing the new PostgreSQL version you need to convert all your databases to new version: # su -l postgres -c "/usr/local/bin/initdb --encoding=utf-8 --lc-collate=C -D /var/db/postgres/data13 -U postgres" # su -l postgres -c "pg_upgrade -b /tmp/pg-upgrade/usr/local/bin/ -d /var/db/postgres/data12/ -B /usr/local/bin/ -D /var/db/postgres/data13/ -U postgres " Now the migration is finished. You can start PostgreSQL again with: # service postgresql start ATTENTION: 1) The default user changed from "pgsql" to "postgres" in 11. The migration steps above now assume the "postgres" database user and FreeBSD user. 2) See the updating entry 20190829 if you are updating from a release prior to 11. 3) If you use non-default initdb options, you have to adjust the initdb-command accordingly 20211023: AFFECTS: users of www/node AUTHOR: bhughes@FreeBSD.org The www/node port has been updated to Node.js v17.0.0, the latest upstream release. A new port, www/node16, has been created for the upcoming v16.x LTS branch. Users wanting to stay on v16.x can replace www/node with www/node16 with one of the following commands: # pkg install www/node16 or # portmaster -o www/node16 www/node or # portupgrade -o www/node16 www/node 20211012: AFFECTS: users of devel/git AUTHOR: garga@FreeBSD.org devel/git port was split into multiple sub-ports that depend on devel/git and install additional files: - devel/git-cvs - CVS related scripts and man pages - devel/git-gui - GUI related scripts and man pages - devel/git-p4 - Perforce related scripts and man pages - devel/git-svn - Subversion related scripts and man pages Due to these changes, CVS, GUI, PERFORCE, and SUBVERSION options as well as gui and svn flavors were removed from the port. 20211010: AFFECTS: users of gtk2 flavored devel/geany* AUTHOR: madpilot@FreeBSD.org Upstream dropped support for gtk2. Due to this the ports are now unflavored, installing only with gtk3 support. If you are already using the default gtk3 flavor will get the new version with a simple "pkg upgrade". To upgrade when using the gtk2 flavors you need to use "pkg install" to install the new unflavored gtk3 packages, pkg will automatically uninstall the old gtk2 flavors. If using ports, you will need to uninstall all geany packages and its plugins and reinstall from an updated ports tree. The "geany-plugin-multiterm" plugin was only available as a gtk2 flavor when installing the gtk2 flavor of geany and has not been ported to gtk3, so has been removed from the tree, so the geany-plugin-multiterm-gtk2 package should be removed from the system. 20211007: AFFECTS: user of security/clamav AUTHOR: yasu@FreeBSD.org Upstream changed end-of-life policy and introduced long time support (LTS) feature release. * LTS feature release will be identified approximately every two years and supported for at least three years from the initial publication date of that LTS feature version. * Regular (non-LTS) feature releases will be supported for at least four months from the initial publication date of the next feature release or until the feature release after that is published. According to it new port security/clamav-lts is added for users who want to use LTS version of ClamAV. Users wanting to switch to LTS version can replace security/clamav with security/clamav-lts with one of following commands. If you use pkg with binary packages: # pkg set -o security/clamav:security/clamav-lts # pkg upgrade If you use portmaster: # portmaster -o security/clamav-lts security/clamav If you use portupgrade: # portupgrade -o security/clamav-lts security/clamav 20211006: AFFECTS: users of misc/freebsd-doc-* AUTHOR: blackend@FreeBSD.org The misc/freebsd-doc-* ports have been updated to the new doc toolchain, and use a somewhat different arrangement of directories and symlinks, which pkg 1.17 does not handle well. Users are encouraged to delete the misc/freebsd-doc-* ports, then reinstall the new ones without using the pkg upgrade facility. 20211006: AFFECTS: users of net/kafkacat AUTHOR: sergey@akhmatov.ru kafkacat has been renamed to kcat upstream. So switch to net/kcat instead. 20211004: AFFECTS: users of net-mgmt/netbox AUTHOR: kai@FreeBSD.org /!\ WARNING /!\ The NetBox 3.0 release contains major changes, so at least items 1.), 2.) and 3.) must be checked before proceeding with the upgrade! /!\ WARNING /!\ 1. Please ensure that your local installation of net-mgmt/netbox is at the 2.11 release before attempting to upgrade to NetBox 3.0 or later. 2. Please also note that the previously deprecated secrets functionality has been removed with NetBox 3.0. This means, all of the secrets still remain in the database once upgraded, only the secrets functionality on the part of NetBox is no longer given. In order to continue to be able to access the stored secrets as usual (and then possibly migrate them to another solution, e.g. security/vault), please install the security/py-netbox-secretstore port once NetBox has been upgraded to 3.x and follow its installation instructions how to enable the plugin. 3. If plugins are used, they should be temporarily deactivated to avoid disruptions during the upgrade process. 4. Please also check the pkg-message and the changelogs for further info. 20211004: AFFECTS: users of www/py-pyjwt AUTHOR: rhurlin@FreeBSD.org To make it possible to easily import py-pyjwt v2.x the current port was moved to a versioned directory. If you use portmaster: portmaster -o www/py-pyjwt1 www/py-pyjwt If you use portupgrade: portupgrade -fo www/py-pyjwt1 www/py-pyjwt If you use pkg with binary packages: pkg set -o www/py-pyjwt:www/py-pyjwt1 20210912: AFFECTS: x11-wm/cage, x11-wm/hikari, x11-wm/labwc, x11-wm/sway, x11-wm/wayfire AUTHOR: jbeich@FreeBSD.org SUID option has been removed in favor of seatd-launch(1) which doesn't require special handling in every consumer and doesn't bypass group permissions. If you've already enabled seatd service or use consolekit2 then nothing changes. Otherwise, $ sway 00:00:00.001 [ERROR] [wlr] [libseat] [libseat/libseat.c:83] No backend was able to open a seat 00:00:00.001 [ERROR] [wlr] [backend/session/session.c:84] Unable to create seat: Function not implemented 00:00:00.001 [ERROR] [wlr] [backend/session/session.c:218] Failed to load session backend 00:00:00.001 [ERROR] [wlr] [backend/backend.c:353] Failed to start a DRM session 00:00:00.001 [ERROR] [sway/server.c:53] Unable to create backend can be fixed by $ ck-launch-session sway or $ seatd-launch sway or # sysrc seatd_enable=YES # service seatd start $ sway Replace "sway" with your compositor e.g., "cage", "hikari", "labwc", "wayfire". 20210907: AFFECTS: consumers of math/eigen[23] AUTHOR: adridg@FreeBSD.org math/eigen2 has been marked deprecated. There do not seem to be any consumers in FreeBSD ports. math/eigen3 has had its options re-vamped. The default options previously pulled in multiple useless library dependencies. The options also forced a specific BLAS implementation. The new options depend only on the default BLAS (whatever USES=blaslapack picks), but this can be turned off. The previous multiple useless libraries -- which are not useless when running the tests in Eigen -- are now hidden behind the default-off TEST option. Users of a carefully-tuned Eigen build should re-evaluate the options available. 20210902: AFFECTS: users of editors/vim AUTHOR: adamw@FreeBSD.org The vim ports have been completely reworked to take advantage of flavors. The biggest change is that the `vim' package is now console-only. If you want the GTk3 GUI, you'll need to install the `vim-gtk3' package instead. All the GUI toolkits have their own package now: vim-gtk3, vim-gtk2, -athena, -motif, and -x11. The vim-tiny package still exists. Also: only python3 bindings are included now. There are very few plugins written in Perl or Ruby, so there really wasn't a need to bundle those languages with Vim. They still exist as OPTIONS, so you can still enable them if you'd like. Also, support for py27 has been dropped. 20210901: AFFECTS: users of audio/ampache AUTHOR: crees@FreeBSD.org With the upgrade to Ampache 5.0.0, the root Ampache folder has changed to %%WWWDIR%%/ampache/public. Please update your web server aliases, for example if you use Apache, then in httpd.conf make sure the lines look like this: Alias /ampache /usr/local/www/ampache/public If you have customised your .htaccess files to allow for a different alias, you'll need to move them to the new location after upgrading: # sh -c 'cd /usr/local/www/ampache && for f in */.htaccess; do mv $f public/$f; done' More upgrade notes can be found on Github: https://github.com/ampache/ampache/releases/tag/5.0.0 20210823: AFFECTS: users of mail/mu AUTHOR: hrs@FreeBSD.org mail/mu now uses XDG Base Directory Specification for the default locations for various files. The mu database now lives under ~/.cache/mu rather than ~/.mu by default. After upgrading, move the contents under ~/.mu to ~/.cache/mu. 20210823: AFFECTS: users of mail/postfixadmin AUTHOR: ports.maintainer@evilphi.com The 3.2->3.3 upgrade requires generating a new setup password hash. The normal post-upgrade visit to setup.php will walk you through the steps. For more information, see the "Version 3.3" section of the change log: https://github.com/postfixadmin/postfixadmin/blob/postfixadmin-3.3.9/CHANGELOG.TXT 20210818: AFFECTS: users of databases/redis AUTHOR: osa@FreeBSD.org The databases/redis port has been updated to the recent stable release. Users wanting to stay on v6.0 can replace databases/redis with databases/redis6 with one of the following commands: # pkg install databases/redis6 or # portmaster -o databases/redis6 databases/redis or # portupgrade -o databases/redis6 databases/redis 20210805: AFFECTS: users of sysutils/beats7 AUTHOR: otis@FreeBSD.org Beats may not be sending data to some distributions of Elasticsearch In this release, Elastic is enabling a licensing change that was broadly communicated earlier in 2021. This change would imply that 7.13 instances of Beats would fail to connect to 7.10 or earlier open source distributions of Elasticsearch and Kibana. The most visible effect is that sysutils/beats7 users can expect difficulties to send data to Elastic instances hosted in AWS. For more information, see: https://www.elastic.co/guide/en/beats/libbeat/current/breaking-changes-7.13.html 20210801: AFFECTS: users of OpenLDAP AUTHOR: delphij@FreeBSD.org SASL is now always enabled for OpenLDAP. If you use portmaster: portmaster -o net/openldap24-client openldap-sasl-client If you use portupgrade: portupgrade -fo net/openldap24-client openldap-sasl-client If you use pkg with binary packages: pkg set -o net/openldap24-sasl-client:net/openldap24-client 20210730: AFFECTS: users of multimedia/mlt, multimedia/mlt-qt and multimedia/py-mlt AUTHOR: kde@FreeBSD.org multimedia/{py-,}mlt{-qt5,} has been moved to multimedia/{py-,}mlt6{-qt5,} to make room for importin the next major version of the mlt framework. 20210721: AFFECTS: users of x11/rxvt-unicode AUTHOR: thierry@FreeBSD.org Since 9.26, there is a regression in resource parsing, which no longer accepts a prefix of the form "URxvt*keysym" ("*." is equivalent to "*"). Changing "*." to "." should make your bindings work again. 20210704: AFFECTS: users of misc/qtchooser AUTHOR: kde@FreeBSD.org QtChooser allows you to select your version of Qt among those installed. However, this tool is no longer supported upstream and will not be available for Qt6. By default, our Qt installations are done in: ${LOCALBASE}/lib/qt${QT_VERSION} as recommended. We have added symbolic linking for the main binaries to ${LOCALBASE}/bin with the suffix -qt5. 20210628: AFFECTS: users of misc/openhab AUTHOR: netchild@FreeBSD.org You need to run sed -i -e 's:^karaf.framework.equinox=.*:karaf.framework.equinox=mvn\:org.eclipse.platform/org.eclipse.osgi/3.16.200: ; s:^karaf.framework.felix=.*:karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/6.0.4:' /var/db/openhab/userdata/etc/config.properties to update the version numbers of some components in a config file. 20210621: AFFECTS: users of www/gitlab-ce AUTHOR: mfechner@FreeBSD.org The upgrade of Gitlab 14.0.0 is in preparation. You must upgrade first to 13.12. For more information see here: https://about.gitlab.com/blog/2021/06/04/gitlab-moving-to-14-breaking-changes/ To do the upgrade, make sure you follow the upgrade manuals: https://gitlab.fechner.net/mfechner/Gitlab-docu/-/tree/master/update I will merge the 14.0.0 upgrade later to quarterly branch to give you some time for the upgrade to 13.12. 20210620: AFFECTS: users of misc/openhab2 AUTHOR: netchild@FreeBSD.org The openhab v3 port has been committed. Upstream has removed the version from the name, as such the FreeBSD port follows in all places (start script name, directory names, ...). Users are encouraged to migrate from misc/openhab2 to misc/openhab. No automatic config migration is available Both versions can be installed in parallel, but an users has to take care to not run both at the same time on the same port. 20210617: AFFECTS: users of graphics/mesa-libs and x11/nvidia-driver AUTHOR: kbowling@FreeBSD.org Some libraries from mesa-libs are now provided by libglvnd while others were renamed. nvidia-driver already used libglvnd but bundled a copy which is now provided as a separate package. When building outside poudriere make sure to remove mesa-libs and nvidia-driver first in order to avoid conflict with libglvnd. For portmaster users: # pkg delete -f mesa-libs nvidia-driver # portmaster -a For portupgrade users: # pkg delete -f mesa-libs nvidia-driver # portupgrade -a 20210523: AFFECTS: users of www/tt-rss AUTHOR: dereks@lifeofadishwasher.com tt-rss config.php syntax has changed. You can find detailed changes here https://tt-rss.org/wiki/GlobalConfig or look at config.php.sample. Expect your config.php to not work with newer www/tt-rss releases. Due to changes in ttrssd before updating you should stop ttrssd or otherwise kill the php process running update_daemon2.php. 20210516: AFFECTS: users of security/bitwarden_rs AUTHOR: mr@FreeBSD.org bitwarden_rs has been renamed to vaultwarden upstream. So switch to security/vaultwarden instead. 20210515: AFFECTS: users of databases/postgresql??-server AUTHOR: girgen@FreeBSD.org The rc.conf parameter for the login class of the postgresql daemon has changed name from postgresql_class to postgresql_login_class. rc.subr(8) states that the parameter should be named ${name}_login_class. 20210512: AFFECTS: users of sysutils/ansible* AUTHOR: 0mp@FreeBSD.org Ansible has been updated to 3.3.0. Please follow the porting guide to update the rulesets: https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_3.html 20210508: AFFECTS: users of devel/pycharm-ce AUTHOR: bsam@FreeBSD.org Pycharm-ce has switched to the supported java version 11. 20210506: AFFECTS: users of mail/postfix AUTHOR: ohauer@FreeBSD.org Postfix 3.6 and higher requires minimum OpenSSL 1.1.1 FreeBSD 11 users using base OpenSSL can switch to mail/postfix35 If you wish to use postfix35 until FreeBSD 11 EoL you might run the following command: # pkg set -o mail/postfix:mail/postfix35 # pkg upgrade 20210505: AFFECTS: users of sysutils/terraform AUTHOR: 0mp@FreeBSD.org Terraform has been updated from 0.13 to 0.15, which introduces several incompatible changes. Please follow upgrading guide when updating the package. https://www.terraform.io/upgrade-guides/0-14.html https://www.terraform.io/upgrade-guides/0-15.html 20210426: AFFECTS: users of x11-fonts/iosevka AUTHOR: 0mp@FreeBSD.org The selection of options for Iosevka has become less granular as the port has switched from TTF-based distfiles to super-TTC-based distfiles. Now all the spacing variants are contained within one file for each Iosevka style. 20210425: AFFECTS: users of python AUTHOR: kai@FreeBSD.org The default version of python3 and python was switched to 3.8. For ports users wanting to keep version 3.7 as default, add DEFAULT_VERSIONS+= python=3.7 python3=3.7 to make.conf Following procedures may ease the upgrade: For users of pre-build packages: # sh # for i in $(pkg query -g %n 'py37-*'); do pkg set -yn ${i}:py38-${i#py37-}; done # pkg upgrade For portmaster users: # sh # portmaster -o lang/python38 python37 # REINSTALL="$(pkg info -o "*py37*" | awk '{printf "%s ", $2}')" # pkg delete -f "*py37*" # portmaster $REINSTALL # REBUILD=$(pkg query -g "%n:%dn" '*' | grep py3 | grep -v py38 | cut -d : -f 1 | sort -u) # portmaster $REBUILD # REBUILD2=$(pkg list | grep python-37 | xargs pkg which | awk '{print $6}' | sort -u) # portmaster $REBUILD2 20210420: AFFECTS: users of www/node AUTHOR: bhughes@FreeBSD.org The www/node port has been updated to Node.js v16.0.0, the latest upstream release. This is a major release, including many significant changes. Users are encouraged to read the release announcements before upgrading: https://nodejs.org/en/blog/release/v16.0.0/ 20210416: AFFECTS: Users of shells/bash, shells/bash-static with PORTS_READLINE=off AUTHOR: olce.freebsd@certner.fr Bundled readline now will use LOCALBASE/etc/inputrc as its ultimate default inputrc file (instead of /etc/inputrc). This puts these ports in line with what devel/readline has been doing recently (since 20210103). 20210414: AFFECTS: users of graphics/OpenEXR or graphics/ilmbase AUTHOR: mandree@FreeBSD.org graphics/ilmbase was removed in favor of math/Imath 3.0.1, and graphics/OpenEXR was updated to 3.0.1. Ports that depend on OpenEXR and/or ilmbase according to INDEX were patched, for ports where OpenEXR is an option that defaults to off, these typical items needs to be changed - file bug reports in that case, preferably with tested patches: - The IlmBase parts Imath and half are now repackaged as Imath - The IlmThread and Iex libraries are now part of OpenEXR - Some header files were rearranged accordingly, into ${LOCALBASE}/include/OpenEXR vs. ${LOCALBASE}/include/Imath - Some code needs a few #include statements added, often #include or #include - Some classes were removed, and the C++11 standard library features need to be used, f. i. std::numeric_limits. - Some code used Int64 or SInt64 should use uint64_t or int64_t. Detailed porting hints are available here: https://github.com/AcademySoftwareFoundation/Imath/blob/v3.0.1/docs/PortingGuide2-3.md 20210411: AFFECTS: users or devel/py-RPyC AUTHOR: skozlov@FreeBSD.org devel/py-RPyC has been updated to version 5.0.1, which have some incompatibilities with 4.x branch. Be sure to check them out before upgrading: https://rpyc.readthedocs.io/en/latest/changelog.html#backwards-incompatible 20210414: AFFECTS: users of x11-fonts/oldschool-pc-fonts AUTHOR: evgeniy@khramtsov.org x11-fonts/oldschool-pc-fonts has been upgraded to 2.2. This version changed names of many fonts. If you have configuration files with specific font names set, you need to update your configurations after upgrade. 20210406: AFFECTS: users of www/phpvirtualbox AUTHOR: dereks@lifeofadishwasher.com www/phpvirtualbox has been updated to version 6.1. This new version only supports version 6.1 of VirtualBox. Version 5.x of phpvirtualbox has been preserved as www/phpvirtualbox-legacy. If you require support for VirtualBox 5.x please install this version. Remember to copy your configuration file in the new legacy installation. 20210328: AFFECTS: users of www/caddy AUTHOR: adamw@FreeBSD.org The default locations for caddy runtime files have changed. - Caddy's runtime log is now /var/log/caddy/caddy.log (was /var/log/caddy.log) - Automatic SSL certs are now stored in /var/db/caddy/data/caddy (was /root/.local/share/caddy) - Configuration autosaves are now stored in /var/db/caddy/config/caddy (was /root/.config/caddy) You can change these defaults. See /usr/local/etc/rc.d/caddy for the list of settings. 20210322: AFFECTS: users of net/wireguard AUTHOR: decke@FreeBSD.org A wireguard kernel implementation supporting FreeBSD 12.1 and newer was added as net/wireguard-kmod recently. The new default for users of net/wireguard is the kernel module. If you experience problems with it you can switch back to wireguard-go by removing net/wireguard-kmod and making sure net/wireguard-go is installed. The userland tools wg-quick(8) and wg(8) try to use kernel support if the kernel module is available and otherwise fall back to wireguard-go automatically. Config files are fully compatible. 20210317: AFFECTS: users of security/strongswan AUTHOR: driesm@FreeBSD.org The stroke starter interface has been deprecated by upstream for some time now. The default interface for controlling the charon daemon has switched from stroke to vici. Users still using the legacy config files such as ipsec.conf and ipsec.secret (stroke, starter) can easily revert to the old behavior by: # sysrc strongswan_interface="stroke" It is recommended to use the vici interface which is configured by swanctl.conf. Check : https://wiki.strongswan.org/projects/strongswan/wiki/Fromipsecconf to ease the transition from ipsec.* to swanctl.conf 20210313: AFFECTS: users of net-mgmt/phpipam AUTHOR: marko.cupac@mimar.rs ipaddresses table in phpipam database is likely to contain incorrect datetime values which prevent successful upgrade. Make sure to create backup of phpipam database. Before starting upgrade wizard in web interface run the following SQL query on phpipam database: UPDATE ipaddresses SET lastSeen='1970-01-01 00:00:01' WHERE lastSeen < '0000-01-01 00:00:00'; 20210310: AFFECTS: users of textproc/redisearch AUTHOR: osa@FreeBSD.org The textproc/redisearch port has been updated to the recent stable release - v2.0. Users wanting to stay on v1.6 can replace textproc/redisearch with textproc/redisearch16 with one of the following commands: # pkg install textproc/redisearch16 or # portmaster -o textproc/redisearch16 textproc/redisearch or # portupgrade -o textproc/redisearch16 textproc/redisearch NOTE: The textproc/redisearch16 brings a new name for the module, i.e. redisearch16.so, so be careful. 20210309: AFFECTS: users of emulators/virtualbox-ose AUTHOR: madpilot@FreeBSD.org emulators/virtualbox-ose has been updated to 6.1.18. This new version only works on amd64 hardware. Previous version 5.x of the virtualbox ports have been preserved as emulators/virtualbox-ose-legacy and similarly named ports for the other parts. If you can't run the latest version or wish to stay with the old version, please install the legacy ports. Also the additions at present build successfully only for amd64. If you need i386 additions you can fallback to the old legacy ones. NOTE: There is no support for moving saved running machine states across major updates of virtualbox. It is recommended to properly shutdown all virtual machines before upgrading. Otherwise the saved state can simply be discarded after the upgrade, if it's not important to preserve it. It should also be possible to downgrade to the legacy ports and shutdown the machine properly from the saved state and then upgrade back again. 20210302: AFFECTS: users of editors/emacs-devel AUTHOR: jrm@FreeBSD.org If you get the error "Symbol's value as variable is void: minor-modes", rebuild the offending Emacs packages. See https://lists.gnu.org/archive/html/emacs-devel/2021-02/msg01164.html for details. 20210220: AFFECTS: users of math/py-mathics AUTHOR: thierry@FreeBSD.org math/py-mathics has been split into several ports, and Mathics Core only provides a rudimentary command-line shell called mathics. To get the same functionality as in 1.x, you need to install either mathicsscript or Mathics-Django. 20210219: AFFECTS: users of games/mangband AUTHOR: adridg@FreeBSD.org The client has updated from 1.1.3 (which has a single public server left) to the current 1.5.3 (which has more public servers). If you update, you can NOT connect to the old server any more. Remember to finish your game before updating. 20210210: AFFECTS: users of audio/spotifyd AUTHOR: rodrigo@FreeBSD.org The configuration format for audio/spotifyd is now TOML, make sure to update your configuration file after upgrading the port. Look at the sample configuration file for a working example. https://github.com/Spotifyd/spotifyd/blob/master/docs/src/config/File.md 20210208: AFFECTS: users of mail/mailscanner AUTHOR: crees@FreeBSD.org The clamavmodule has finally been removed after a long deprecation period. Please remove all references to it in your mailscanner.conf as it will now count as a syntax error and may stop MailScanner starting! 20210204: AFFECTS: users of www/unit AUTHOR: osa@FreeBSD.org The default location for NGINX Unit's state directory has changed. It was moved from /usr/local/libexec/unit to /var/db/unit in order to avoid write operations on /usr/local filesystem. 20210130: AFFECTS: users of graphics/opencv-core AUTHOR: tcberner@FreeBSD.org graphics/opencv-core has been reintegrated into graphics/opencv. So there is no longer a circular dependency opencv-core -> ffmpeg -> opencv If you experience problems updating the packages, try pkg delete -f opencv-core 20210124: AFFECTS: users of net-mgmt/netbox AUTHOR: kai@FreeBSD.org The Django templating language (DTL) is no longer supported for export templates. Please ensure that all export templates use Jinja2 before upgrading. Also the support for embedded graphs was completely removed and several changes to the REST API were made. Please check the changelogs for further details. 20210114: AFFECTS: users of net-im/matterircd AUTHOR: norrland@nullbyte.se Commandline switches Switched to viper for cmdline parsing, which does not support "short" flags. You'll need to use --flag instead of -flag. Eg ./matterircd --debug Bridge specific configuration is now only in configuration file. This means the following flags have been removed: -restrict,-mmteam,-mmserver, -mminsecure,-mmskiptlsverify. You can set those in matterircd.toml, see the example file. Config changes BlacklistUser feature for slack has been renamed to DenyUsers. JoinMpImOnTalk feature has been renamed to JoinDM and is available for slack/mattermost JoinInclude, JoinExclude now support regexp (see matterircd.toml.example) 20210113: AFFECTS: users of databases/redis[-devel] AUTHOR: osa@FreeBSD.org The databases/redis port has been updated to the recent stable release. Users wanting to stay on v5.x can replace databases/redis with databases/redis5 with one of the following commands: # pkg install databases/redis5 or # portmaster -o databases/redis5 databases/redis or # portupgrade -o databases/redis5 databases/redis diff --git a/devel/tex-kpathsea/Makefile b/devel/tex-kpathsea/Makefile index cf03c00fc387..b3e816e349d3 100644 --- a/devel/tex-kpathsea/Makefile +++ b/devel/tex-kpathsea/Makefile @@ -1,45 +1,43 @@ PORTNAME= kpathsea -PORTVERSION= 6.3.5 -PORTREVISION= 1 +DISTVERSION= 6.4.0 CATEGORIES= devel MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${TEXLIVE_VERSION}-source DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= Path searching library for TeX LICENSE= LGPL21+ USES= libtool pathfix tar:xz tex USE_LDCONFIG= yes GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share INSTALL_TARGET= install-strip EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux texk/kpathsea texk/texlive/tl_support \ texk/texlive/linked_scripts/texlive-extra \ texk/texlive/linked_scripts/texlive WRKSRC= ${WRKDIR}/${DISTNAME}/texk/kpathsea INFO= kpathsea PLIST_SUB= VERSION=${PORTVERSION} post-install: (cd ${WRKDIR}/${DISTNAME}/texk/texlive/linked_scripts/texlive-extra && \ for f in kpsetool kpsewhere; do \ ${INSTALL_SCRIPT} $${f}.sh ${STAGEDIR}${PREFIX}/bin/$$f; \ ${INSTALL_MAN} ../../tl_support/$${f}.1 \ ${STAGEDIR}${PREFIX}/share/man/man1/$${f}.1; \ done; \ for l in kpsexpand kpsepath; do \ ${LN} -sf kpsetool ${STAGEDIR}${PREFIX}/bin/$$l; \ ${LN} -sf kpsetool.1 ${STAGEDIR}${PREFIX}/share/man/man1/$${l}.1; \ done) .include diff --git a/devel/tex-kpathsea/distinfo b/devel/tex-kpathsea/distinfo index 01e363d09aaf..868ccf1bb864 100644 --- a/devel/tex-kpathsea/distinfo +++ b/devel/tex-kpathsea/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680449457 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 +TIMESTAMP = 1715395808 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 diff --git a/devel/tex-kpathsea/files/patch-Makefile.in b/devel/tex-kpathsea/files/patch-Makefile.in index ccaf8dc65e6a..720660f15034 100644 --- a/devel/tex-kpathsea/files/patch-Makefile.in +++ b/devel/tex-kpathsea/files/patch-Makefile.in @@ -1,20 +1,20 @@ ---- Makefile.in.orig 2023-04-02 15:35:03 UTC +--- Makefile.in.orig 2024-05-11 23:34:39 UTC +++ Makefile.in @@ -364,7 +364,7 @@ DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) -HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \ +HEADERS = $(nodist_kpseinclude_HEADERS) \ $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -@@ -2103,7 +2103,7 @@ installdirs-am: +@@ -2104,7 +2104,7 @@ installdirs-am: installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) diff --git a/devel/tex-kpathsea/files/patch-texmf.cnf b/devel/tex-kpathsea/files/patch-texmf.cnf index d66797fc00a9..cb7f2f056fbc 100644 --- a/devel/tex-kpathsea/files/patch-texmf.cnf +++ b/devel/tex-kpathsea/files/patch-texmf.cnf @@ -1,167 +1,57 @@ ---- texmf.cnf.orig 2023-02-25 22:59:04 UTC +--- texmf.cnf.orig 2024-02-23 16:44:23 UTC +++ texmf.cnf -@@ -1,13 +1,13 @@ - % original texmf.cnf -- runtime path configuration file for kpathsea. - % Public domain. --% -+% - % If you modify this original file, YOUR CHANGES WILL BE LOST when it is - % updated. Instead, put your changes -- and only your changes, not an - % entire copy! -- in ../../texmf.cnf. That is, if this file is - % installed in /some/path/to/texlive/2023/texmf-dist/web2c/texmf.cnf, - % put your custom settings in /some/path/to/texlive/2023/texmf.cnf. - % (Below, we use YYYY in place of the specific year.) --% -+% - % What follows is a super-summary of what this .cnf file can - % contain. Please read the Kpathsea manual for more information. - % -@@ -55,11 +55,11 @@ - % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. - % Kpathsea sets (in kpathsea/progname.c): - % SELFAUTOLOC (directory of the binary=/usr/local/texlive/YYYY/bin/i386-linux), --% SELFAUTODIR (its parent = /usr/local/texlive/YYYY/bin), -+% SELFAUTODIR (its parent = /usr/local/texlive/YYYY/bin), +@@ -59,7 +59,7 @@ % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive). % Sorry for the off-by-one-generation names. -TEXMFROOT = $SELFAUTOPARENT +TEXMFROOT = $SELFAUTODIR/share - % The main tree of distributed packages and programs: - TEXMFDIST = $TEXMFROOT/texmf-dist -@@ -69,7 +69,7 @@ TEXMFMAIN = $TEXMFDIST + % The various texmf trees used by TeX Live, follow. + % They must must all have the TDS directory structure (https://tug.org/tds). +@@ -72,7 +72,7 @@ TEXMFMAIN = $TEXMFDIST TEXMFMAIN = $TEXMFDIST % Local additions to the distribution trees. -TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local +TEXMFLOCAL = $TEXMFROOT/texmf-local % TEXMFSYSVAR, where *-sys store cached runtime data. TEXMFSYSVAR = $TEXMFROOT/texmf-var -@@ -99,12 +99,12 @@ TEXMFAUXTREES = {} - % - % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named - % explicitly and before other trees. --% -+% - % TEXMFLOCAL precedes TEXMFDIST because locally-installed versions - % should take precedence over distribution files -- although it is - % generally a source of confusion to have different versions of a - % package installed, whatever the trees, so try to avoid it. --% -+% - % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is - % ever defined (the 99% common case), no extra elements will be added to - % the search paths. tlmgr takes care to end any value with a trailing comma. -@@ -452,7 +452,7 @@ MAILCAPLIBDIR = $TEXMFROOT/etc - % Default settings for the fontconfig library as used by the Windows - % versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. - % ConTeXT MkIV (all platforms) also use these values. --% -+% - FONTCONFIG_FILE = fonts.conf - FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf - FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache -@@ -499,12 +499,12 @@ DVIPDFMXINPUTS = $TEXMF/dvipdfmx - DVIPDFMXINPUTS = $TEXMF/dvipdfmx - - % Lua needs to look in TEXINPUTS for lua scripts distributed with packages. --% -+% - % But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in - % the environment with a colon, say, TEXINPUTS=/some/dir:, the intended - % default expansion of TEXINPUTS will not happen and .lua files under - % the /tex/ tree will not be found. --% -+% - % So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. - % The default LUAINPUTS suffices for luatex and dviluatex. - % -@@ -542,14 +542,14 @@ RUBYINPUTS = $TEXMFDOTDIR;$TEXMF/scripts/{$progname, - % paradoxical), but the compile-time default in paths.h is built from it. - % The SELFAUTO* variables are set automatically from the location of - % argv[0], in kpse_set_program_name. --% -+% - % This main texmf.cnf file is installed, for a release YYYY, in a - % directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf. - % Since this file is subject to future updates, the TeX Live installer - % or human administrator may also create a file - % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file - % will take precedence over the distributed one. --% -+% - % For security reasons, it is best not to include . in this path. - % - % The idea behind this lengthy definition: for each of -@@ -558,13 +558,13 @@ RUBYINPUTS = $TEXMFDOTDIR;$TEXMF/scripts/{$progname, - % then the subdirectories ./texmf-local, texmf-dist, ./texmf. - % At any given installation, most of these directories will not exist, - % but they all turn out to be useful somewhere. --% -+% - % Special addition -- we want to include one more directory: the - % great-grandparent's texmf-local, because that is how TL is installed - % by default. That is, given a binary - % /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find - % /usr/local/texlive/texmf-local/web2c/texmf.cnf. I.e., not under YYYY. --% -+% - % As a result, we cannot use actual brace expansion in the definition, - % since we don't want to scatter ../'s throughout the value. Hence we - % explicitly list every directory. Arguably more understandable anyway. -@@ -578,6 +578,7 @@ $SELFAUTOLOC/texmf/web2c,\ +@@ -583,6 +583,7 @@ $SELFAUTOLOC/texmf/web2c,\ $SELFAUTOLOC/texmf-dist/web2c,\ $SELFAUTOLOC/texmf/web2c,\ \ +/var/db/tlpkg,\ $SELFAUTODIR,\ $SELFAUTODIR/share/texmf-local/web2c,\ $SELFAUTODIR/share/texmf-dist/web2c,\ -@@ -634,14 +635,14 @@ shell_escape = p - shell_escape = p - - % No spaces in this command list. --% -+% - % The programs listed here are as safe as any we know: they either do - % not write any output files, respect openout_any, or have hard-coded - % restrictions similar to or higher than openout_any=p. They also have - % no features to invoke arbitrary other programs, and no known - % exploitable bugs. All to the best of our knowledge. They also have - % practical use for being called from TeX. --% -+% - shell_escape_commands = \ - bibtex,bibtex8,\ - extractbb,\ -@@ -813,7 +814,7 @@ pool_size = 6250000 +@@ -832,7 +833,7 @@ pool_size = 6250000 pool_size = 6250000 % Minimum pool space after TeX's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. -string_vacancies = 90000 +string_vacancies = 150000 % Maximum number of strings. max_strings = 500000 % Min pool space left after loading .fmt. -@@ -825,7 +826,7 @@ strings_free = 100 +@@ -844,7 +845,7 @@ strings_free = 100 % expansion works by writing material into the buffer and reparsing the % line. As a consequence, certain constructs require the buffer to be % very large, even though most documents can be handled with a small value. -buf_size = 200000 +buf_size = 300000 % Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in % the sources), but we don't need that much. The value here suffices -@@ -837,8 +838,8 @@ hyph_size = 8191 % prime number of hyphenation +@@ -856,8 +857,8 @@ hyph_size = 8191 % prime number of hyphenation hyph_size = 8191 % prime number of hyphenation exceptions, >610, <65535 % http://primes.utm.edu/curios/page.php/8191.html % dynamically increased as necessary, so not important. -nest_size = 1000 % simultaneous semantic levels (e.g., groups) -max_in_open = 15 % simultaneous input files and error insertions, +nest_size = 2500 % simultaneous semantic levels (e.g., groups) +max_in_open = 15 % simultaneous input files and error insertions, % also applies to MetaPost param_size = 20000 % simultaneous macro parameters, also applies to MP save_size = 200000 % for saving values outside current group diff --git a/devel/tex-libtexlua/Makefile b/devel/tex-libtexlua/Makefile index d585124d12a4..84984da0107f 100644 --- a/devel/tex-libtexlua/Makefile +++ b/devel/tex-libtexlua/Makefile @@ -1,31 +1,31 @@ PORTNAME= libtexlua -PORTVERSION= 5.3.6 -PORTREVISION= 1 +DISTVERSION= 5.3.6 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR} PKGNAMEPREFIX= tex- DISTNAME= texlive-${TEXLIVE_VERSION}-source DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= Lua library for TeXLive LICENSE= MIT LICENSE_FILE= ${WRKDIR}/LICENSE.MIT USES= libtool pathfix pkgconfig tar:xz tex USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux libs/lua53 WRKSRC= ${WRKDIR}/${DISTNAME}/libs/lua53 post-extract: ${SED} -e '/\*\ Copyright/,/\*\//!d;s/^\*//;/^\*\*/d' \ ${WRKSRC}/lua53-src/src/lua.h > ${WRKDIR}/LICENSE.MIT .include diff --git a/devel/tex-libtexlua/distinfo b/devel/tex-libtexlua/distinfo index 3e66aa4907af..cbb0b7d2b6b8 100644 --- a/devel/tex-libtexlua/distinfo +++ b/devel/tex-libtexlua/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680473625 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 +TIMESTAMP = 1715392237 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 diff --git a/devel/tex-libtexluajit/Makefile b/devel/tex-libtexluajit/Makefile index c8e5e01c67db..d3b28d3abd3f 100644 --- a/devel/tex-libtexluajit/Makefile +++ b/devel/tex-libtexluajit/Makefile @@ -1,39 +1,39 @@ PORTNAME= libtexluajit -PORTVERSION= 2.1.0 -PORTREVISION= 2 +DISTVERSION= 2.1.0 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR} PKGNAMEPREFIX= tex- DISTNAME= texlive-${TEXLIVE_VERSION}-source DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= LuaJIT library for TeXLive LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LuaJIT-src/COPYRIGHT BROKEN_mips= Does not configure: error: Sorry, cannot preprocess lj_arch.h BROKEN_mips64= Does not configure: error: Sorry, cannot preprocess lj_arch.h BROKEN_powerpc64= Does not build: uninitialized constant Config (NameError) BROKEN_riscv64= Does not configure: error: Sorry, cannot preprocess lj_arch.h USES= compiler libtool pathfix pkgconfig tar:xz tex USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux libs/luajit WRKSRC= ${WRKDIR}/${DISTNAME}/libs/luajit .include .if ${ARCH:Mpowerpc*} && ${COMPILER_VERSION} < 140 BUILD_DEPENDS+= as:devel/binutils CFLAGS+= -fno-integrated-as .endif .include diff --git a/devel/tex-libtexluajit/distinfo b/devel/tex-libtexluajit/distinfo index 959e16ad385d..b890827824f2 100644 --- a/devel/tex-libtexluajit/distinfo +++ b/devel/tex-libtexluajit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680474121 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 +TIMESTAMP = 1715470181 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 diff --git a/devel/tex-synctex/Makefile b/devel/tex-synctex/Makefile index 0108802c033a..9af97f07f317 100644 --- a/devel/tex-synctex/Makefile +++ b/devel/tex-synctex/Makefile @@ -1,60 +1,60 @@ PORTNAME= synctex -PORTVERSION= 2.0.0 -PORTREVISION= 3 +DISTVERSION= 2.0.0 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${TEXLIVE_VERSION}-source DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= Synchronization TeXnology parser library WWW= https://itexmac.sourceforge.net/SyncTeX.html LICENSE= MIT LICENSE_FILE= ${WRKSRC}/synctexdir/README.txt USES= libtool localbase pathfix pkgconfig tar:xz tex USE_LDCONFIG= yes USE_TEX= kpathsea GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= ${EXCLUDE_ENGINES:S/^/--disable-/} \ --with-system-kpathsea \ --with-system-zlib \ --without-gmp-includes \ --without-gmp-libdir \ --without-mf-x-toolkit \ --without-mpfr-includes \ --without-mpfr-libdir \ --without-system-cairo \ --without-system-freetype2 \ --without-system-gmp \ --without-system-graphite2 \ --without-system-harfbuzz \ --without-system-icu \ --without-system-libpng \ --without-system-mpfr \ --without-system-pixman \ --without-system-ptexenc \ --without-system-teckit \ --without-system-zziplib \ --without-x INSTALL_TARGET= install-strip EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c EXTRACT_FILES= build-aux texk/web2c EXCLUDE_ENGINES= etex aleph luatex luajittex pdftex mf mf-nowin ptex \ eptex uptex euptex xetex tex otangle mp pmp upmp web2c \ web-progs luahbtex luajithbtex mflua mfluajit latex \ pdftex hitex post-extract: @${FIND} ${WRKSRC} -name '*.orig' -delete .include diff --git a/devel/tex-synctex/distinfo b/devel/tex-synctex/distinfo index a00c4263f5e7..9b7eb22af8f6 100644 --- a/devel/tex-synctex/distinfo +++ b/devel/tex-synctex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680563845 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 +TIMESTAMP = 1715471845 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 diff --git a/devel/tex-synctex/files/patch-Makefile.in b/devel/tex-synctex/files/patch-Makefile.in index 6bf9346c3b06..76462cf87b25 100644 --- a/devel/tex-synctex/files/patch-Makefile.in +++ b/devel/tex-synctex/files/patch-Makefile.in @@ -1,1336 +1,40 @@ ---- Makefile.in.orig 2023-04-03 23:25:20 UTC +--- Makefile.in.orig 2024-05-11 23:58:42 UTC +++ Makefile.in -@@ -101,9 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE +@@ -102,9 +102,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \ md5main$(EXEEXT) -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \ - ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \ - ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \ +bin_PROGRAMS = $(am__EXEEXT_4) \ $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \ $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \ -@@ -113,7 +111,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__ +@@ -114,7 +112,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__ $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \ $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \ $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) -noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ +noinst_PROGRAMS = \ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \ $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \ $(am__EXEEXT_38) $(am__EXEEXT_39) $(am__EXEEXT_40) \ -@@ -488,7 +486,7 @@ am__v_AR_0 = @echo " AR " $@; - AM_V_AR = $(am__v_AR_@AM_V@) - am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) - am__v_AR_0 = @echo " AR " $@; --am__v_AR_1 = -+am__v_AR_1 = - libff_a_AR = $(AR) $(ARFLAGS) - libff_a_LIBADD = - am__dirstamp = $(am__leading_dot)dirstamp -@@ -1234,7 +1232,7 @@ am__v_lt_0 = --silent - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent --am__v_lt_1 = -+am__v_lt_1 = - libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@ -@@ -1699,11 +1697,11 @@ am__v_GEN_0 = @echo " GEN " $@; - AM_V_GEN = $(am__v_GEN_@AM_V@) - am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) - am__v_GEN_0 = @echo " GEN " $@; --am__v_GEN_1 = -+am__v_GEN_1 = - AM_V_at = $(am__v_at_@AM_V@) - am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) - am__v_at_0 = @ --am__v_at_1 = -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c - depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp - am__maybe_remake_depfiles = depfiles -@@ -2395,7 +2393,7 @@ am__v_CC_0 = @echo " CC " $@; - AM_V_CC = $(am__v_CC_@AM_V@) - am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) - am__v_CC_0 = @echo " CC " $@; --am__v_CC_1 = -+am__v_CC_1 = - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -2403,7 +2401,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; - AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; --am__v_CCLD_1 = -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -@@ -2413,14 +2411,14 @@ am__v_CXX_0 = @echo " CXX " $@; - AM_V_CXX = $(am__v_CXX_@AM_V@) - am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) - am__v_CXX_0 = @echo " CXX " $@; --am__v_CXX_1 = -+am__v_CXX_1 = - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) - am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) - am__v_CXXLD_0 = @echo " CXXLD " $@; --am__v_CXXLD_1 = -+am__v_CXXLD_1 = - OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) - LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ -@@ -2430,7 +2428,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@; - AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@) - am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@) - am__v_OBJCXX_0 = @echo " OBJCXX " $@; --am__v_OBJCXX_1 = -+am__v_OBJCXX_1 = - OBJCXXLD = $(OBJCXX) - OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \ -@@ -2438,7 +2436,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; - AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@) - am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@) - am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; --am__v_OBJCXXLD_1 = -+am__v_OBJCXXLD_1 = - SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ - $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \ - $(nodist_libluahbtexspecific_a_SOURCES) \ -@@ -3105,14 +3103,14 @@ version = $(WEB2CVERSION) +@@ -3124,7 +3122,7 @@ version = $(WEB2CVERSION) AM_CXXFLAGS = ## $(WARNING_CXXFLAGS) AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS) version = $(WEB2CVERSION) -SUBDIRS = doc lib man web2c . window omegafonts otps +SUBDIRS = lib man . proglib = lib/lib.a #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a - - #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a - --#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a -+#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a - EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \ -@@ -3128,7 +3126,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/m - lib_LIBRARIES = $(am__append_126) - lib_LTLIBRARIES = $(am__append_125) - dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 --nodist_man_MANS = -+nodist_man_MANS = - TEST_EXTENSIONS = .pl .test - # - # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for -@@ -3634,8 +3632,6 @@ bin_links = $(am__append_5) $(am__append_14) $(am__app +@@ -3655,8 +3653,6 @@ bin_links = $(am__append_5) $(am__append_14) $(am__app bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \ $(am__append_24) $(am__append_33) $(am__append_41) \ $(am__append_49) $(am__append_54) $(am__append_67) \ - upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \ - uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \ - $(am__append_78) $(am__append_92) $(am__append_97) \ - $(am__append_102) $(am__append_107) - install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \ -@@ -3711,19 +3707,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si - tangle_silent = $(tangle_silent_@AM_V@) - tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@) - tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ # --tangle_silent_1 = -+tangle_silent_1 = - # - ctangle = $(buildenv) $(CTANGLE) - ctangle_silent = $(ctangle_silent_@AM_V@) - ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@) - ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ # --ctangle_silent_1 = -+ctangle_silent_1 = - # - tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE) - tie_silent = $(tie_silent_@AM_V@) - tie_silent_ = $(tie_silent_@AM_DEFAULT_V@) - tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ # --tie_silent_1 = -+tie_silent_1 = - tie_c = $(tie) -c $@ - tie_m = $(tie) -m $@ - -@@ -3732,7 +3728,7 @@ DIFF = diff - - # For trip, trap, and other tests - DIFF = diff --DIFFFLAGS = -+DIFFFLAGS = - AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \ - DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \ - DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \ -@@ -3740,29 +3736,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor - - # To run, e.g., just the original trip test, in the build directory: - # make -C $ww TRIPTRAP=trip.diffs triptrap --# where $ww is the web2c build directory. --# -+# where $ww is the web2c build directory. -+# - # This will run the triptrap-sh script - # which then runs make TEST=triptest.test check-am, - # which then runs the (srcdir file) triptest.test script; - # its output will be in (builddir file) trip.diffs, --# and triptest.out if the test failed, -+# and triptest.out if the test failed, - # plus various created files in the tripdir/ subdirectory. - # The triptest.diffs file will have the actual abs_srcdir value replaced - # with the constant string "SRCDIR" to minimize differences, and "../" - # replaced with "./" to match the canonical output. Confusing. For the - # real output, see triptest.log. --# -+# - # To build only tex, make -C $ww tex (i.e., in builddir) should do it. - # Unfortunately the check-am target depends on all-am, so all engines - # are built before any tests are run. If this is a problem, just have to - # edit the generated Makefile in builddir to remove the dependency. --# -+# - # Other per-engine invocations (see triptrap-sh for complete list): - # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap --# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap --# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap --# -+# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap -+# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap -+# - triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh - - # The environment for making dumps. -@@ -3773,7 +3769,7 @@ cp_silent_0 = @echo " COPY " $@; - cp_silent = $(cp_silent_@AM_V@) - cp_silent_ = $(cp_silent_@AM_DEFAULT_V@) - cp_silent_0 = @echo " COPY " $@; --cp_silent_1 = -+cp_silent_1 = - nodist_tangle_SOURCES = tangle.c tangle.h - nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h - tangleboot_DEPENDENCIES = $(default_dependencies) -@@ -3820,7 +3816,7 @@ nodist_initex_SOURCES = callexe.c - tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C - initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" - nodist_initex_SOURCES = callexe.c --initex_LDADD = -+initex_LDADD = - tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130) - - # With --enable-ipc, TeX may need to link with -lsocket. -@@ -3848,7 +3844,7 @@ nodist_call_mf_SOURCES = callexe.c - tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test - call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\" - nodist_call_mf_SOURCES = callexe.c --call_mf_LDADD = -+call_mf_LDADD = - dist_mf_SOURCES = mfextra.c - mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) - mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) -@@ -3880,7 +3876,7 @@ nodist_call_mflua_SOURCES = callexe.c - mf_tests = mftraptest.test - call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\" - nodist_call_mflua_SOURCES = callexe.c --call_mflua_LDADD = -+call_mflua_LDADD = - dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h - mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES) - mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS) -@@ -3912,7 +3908,7 @@ libmfluaotfcc_a_CPPFLAGS = \ - -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \ - -I$(top_srcdir)/mfluadir/otfcc/include \ - -I$(top_srcdir)/mfluadir/otfcc/include/dep \ -- -I$(top_srcdir)/mfluadir/otfcc/lib -+ -I$(top_srcdir)/mfluadir/otfcc/lib - - libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS) - -@@ -4174,7 +4170,7 @@ libmfluaotfcc_a_SOURCES = \ - mfluadir/otfcc/lib/table/VDMX.h \ - mfluadir/otfcc/lib/table/SVG.c \ - mfluadir/otfcc/lib/table/head.h \ -- mfluadir/otfcc/lib/table/TSI5.c -+ mfluadir/otfcc/lib/table/TSI5.c - - libmfluapotrace_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/potrace \ -@@ -4185,7 +4181,7 @@ libmfluapotrace_a_SOURCES = \ - #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources) - libmfluapotrace_a_SOURCES = \ - mfluadir/potrace/luafunc.c \ -- mfluadir/potrace/luafunc.h -+ mfluadir/potrace/luafunc.h - - libmflualpeg_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/luapeg \ -@@ -4194,11 +4190,11 @@ libmflualpeg_a_SOURCES = \ - libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmflualpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\" - nodist_call_mfluajit_SOURCES = callexe.c --call_mfluajit_LDADD = -+call_mfluajit_LDADD = - dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h - mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES) - mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS) -@@ -4234,7 +4230,7 @@ libmfluajitlpeg_a_SOURCES = \ - libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmfluajitlpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir - mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ -@@ -4242,7 +4238,7 @@ nodist_call_mpost_SOURCES = callexe.c - - call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" - nodist_call_mpost_SOURCES = callexe.c --call_mpost_LDADD = -+call_mpost_LDADD = - - # Creating one file: just one rule - mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) -@@ -4254,10 +4250,10 @@ nodist_call_pmpost_SOURCES = callexe.c - mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test - call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\" - nodist_call_pmpost_SOURCES = callexe.c --call_pmpost_LDADD = -+call_pmpost_LDADD = - call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\" - nodist_call_upmpost_SOURCES = callexe.c --call_upmpost_LDADD = -+call_upmpost_LDADD = - pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - -@@ -4311,7 +4307,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - - nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \ -- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) -+ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) - - nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h) - nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h) -@@ -4605,7 +4601,7 @@ hiformat_c_h_l_y = \ - hiskip.c \ - histretch.c - --hitex_c = hitex.c -+hitex_c = hitex.c - - # hitex - nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c) -@@ -4758,11 +4754,11 @@ libluasocket_sources = \ - luatexdir/luasocket/src/timeout.h \ - luatexdir/luasocket/src/udp.c \ - luatexdir/luasocket/src/udp.h \ -- luatexdir/luasocket/src/usocket.h -+ luatexdir/luasocket/src/usocket.h - --libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a --#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a --libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a -+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a -+#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a -+libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a - libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES) - #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES) - libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \ -@@ -4892,8 +4888,8 @@ LUA_DEPEND = $(LUA53_DEPEND) - LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES) - LUA_LIBS = $(LUA53_LIBS) - LUA_DEPEND = $(LUA53_DEPEND) --libluatex_a_DEPENDENCIES = libff.a libluamisc.a --libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a -+libluatex_a_DEPENDENCIES = libff.a libluamisc.a -+libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a - libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ - $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \ - -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \ -@@ -4914,7 +4910,7 @@ dist_libluatex_a_SOURCES = \ - dist_libluatex_a_SOURCES = \ - luatexdir/lua/lstrlibext.c \ - luatexdir/lua/helpers.c \ -- luatexdir/lua/texluac.c -+ luatexdir/lua/texluac.c - - nodist_libluatex_a_SOURCES = \ - $(dist_libluatex_sources) \ -@@ -4932,7 +4928,7 @@ nodist_libluatexspecific_a_SOURCES = \ - - #dist_libluatexspecific_a_SOURCES = - nodist_libluatexspecific_a_SOURCES = \ -- $(dist_libluatexspecific_sources) -+ $(dist_libluatexspecific_sources) - - #dist_libluajittexspecific_a_SOURCES = - nodist_libluajittexspecific_a_SOURCES = \ -@@ -4940,46 +4936,46 @@ nodist_libluahbtexspecific_a_SOURCES = \ - - #dist_libluahbtexspecific_a_SOURCES = - nodist_libluahbtexspecific_a_SOURCES = \ -- $(dist_libluahbtexspecific_sources) -+ $(dist_libluahbtexspecific_sources) - --#dist_libluajithbtexspecific_a_SOURCES = -+#dist_libluajithbtexspecific_a_SOURCES = - nodist_libluajithbtexspecific_a_SOURCES = \ -- $(dist_libluajithbtexspecific_sources) -+ $(dist_libluajithbtexspecific_sources) - - dist_libluatexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - dist_libluajittexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - --# luatexdir/utils/utils-hb.c -+# luatexdir/utils/utils-hb.c - dist_libluahbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - - --#luatexdir/utils/utils-hb.c -+#luatexdir/utils/utils-hb.c - dist_libluajithbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - --libluatex_web = --nodist_libluatex_sources = -+libluatex_web = -+nodist_libluatex_sources = - - # dist_libluatex_sources += \ - # luatexdir/tex/align.h \ -@@ -5047,7 +5043,7 @@ nodist_libluatex_sources = - # luatexdir/tex/texmath.c \ - # luatexdir/tex/texnodes.c \ - # luatexdir/tex/textcodes.c \ --# luatexdir/tex/textoken.c -+# luatexdir/tex/textoken.c - dist_libluatex_sources = luatexdir/luatexcallbackids.h \ - luatexdir/luatex.h luatexdir/luatex-common.h \ - luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \ -@@ -5180,7 +5176,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src - # luatexdir/lua/luanode.c \ - # luatexdir/lua/luastuff.c \ - # luatexdir/lua/luatoken.c \ --# luatexdir/lua/mplibstuff.c -+# luatexdir/lua/mplibstuff.c - luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) - - ################################################################################ -@@ -5297,16 +5293,16 @@ nodist_call_luatex_SOURCES = callexe.c - - call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" - nodist_call_luatex_SOURCES = callexe.c --call_luatex_LDADD = -+call_luatex_LDADD = - call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\" - nodist_call_luahbtex_SOURCES = callexe.c --call_luahbtex_LDADD = -+call_luahbtex_LDADD = - call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\" - nodist_call_luajittex_SOURCES = callexe.c --call_luajittex_LDADD = -+call_luajittex_LDADD = - call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\" - nodist_call_luajithbtex_SOURCES = callexe.c --call_luajithbtex_LDADD = -+call_luajithbtex_LDADD = - - # LuaTeX/LuaJITTeX Tests - # -@@ -5646,7 +5642,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf - w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status - @rm -f w2c/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h --$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f w2c/stamp-h1 - touch $@ -@@ -5934,7 +5930,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys. - luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \ - luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp) - --libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) -+libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) - $(AM_V_at)-rm -f libff.a - $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD) - $(AM_V_at)$(RANLIB) libff.a -@@ -5949,7 +5945,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_ - ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) -+libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libkanji.a - $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libkanji.a -@@ -5972,7 +5968,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \ - luatexdir/luaffi/$(am__dirstamp) \ - luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp) - --libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) -+libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaffi.a - $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaffi.a -@@ -6025,12 +6021,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) -+libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaharfbuzz.a - $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaharfbuzz.a - --libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) -+libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluahbtexspecific.a - $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluahbtexspecific.a -@@ -6077,12 +6073,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) -+libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitharfbuzz.a - $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitharfbuzz.a - --libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) -+libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajithbtexspecific.a - $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajithbtexspecific.a -@@ -6147,7 +6143,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) -+libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitmisc.a - $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitmisc.a -@@ -6206,7 +6202,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) -+libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitsocket.a - $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitsocket.a -@@ -6613,7 +6609,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) -+libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittex.a - $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittex.a -@@ -6630,7 +6626,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) -+libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittexspecific.a - $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittexspecific.a -@@ -6659,7 +6655,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT): - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) -+libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluamisc.a - $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluamisc.a -@@ -6712,7 +6708,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT): - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) -+libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluasocket.a - $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluasocket.a -@@ -7058,7 +7054,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$ - synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) -+libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatex.a - $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatex.a -@@ -7075,7 +7071,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT): - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) -+libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatexspecific.a - $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatexspecific.a -@@ -7088,12 +7084,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) -+libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmd5.a - $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD) - $(AM_V_at)$(RANLIB) libmd5.a - --libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) -+libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmf.a - $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD) - $(AM_V_at)$(RANLIB) libmf.a -@@ -7109,7 +7105,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d - mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) -+libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflua.a - $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflua.a -@@ -7119,7 +7115,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am - mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) -+libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajit.a - $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajit.a -@@ -7133,7 +7129,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) -+libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajitlpeg.a - $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajitlpeg.a -@@ -7141,7 +7137,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) -+libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflualpeg.a - $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflualpeg.a -@@ -7662,7 +7658,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT - mfluadir/otfcc/lib/table/$(am__dirstamp) \ - mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp) - --libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) -+libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluaotfcc.a - $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluaotfcc.a -@@ -7676,22 +7672,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT): - mfluadir/potrace/$(am__dirstamp) \ - mfluadir/potrace/$(DEPDIR)/$(am__dirstamp) - --libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) -+libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluapotrace.a - $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluapotrace.a - --libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) -+libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibbackends.a - $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibbackends.a - --libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) -+libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibcore.a - $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibcore.a - --libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) -+libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibextramath.a - $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibextramath.a -@@ -7708,7 +7704,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$( - mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) -+libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmputil.a - $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD) - $(AM_V_at)$(RANLIB) libmputil.a -@@ -7779,7 +7775,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \ - pdftexdir/regex/$(am__dirstamp) \ - pdftexdir/regex/$(DEPDIR)/$(am__dirstamp) - --libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) -+libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libpdftex.a - $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD) - $(AM_V_at)$(RANLIB) libpdftex.a -@@ -7790,7 +7786,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT) - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) -+libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libsynctex.a - $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD) - $(AM_V_at)$(RANLIB) libsynctex.a -@@ -7805,7 +7801,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$( - uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) -+libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libukanji.a - $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libukanji.a -@@ -7846,7 +7842,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \ - luatexdir/unilib/$(am__dirstamp) \ - luatexdir/unilib/$(DEPDIR)/$(am__dirstamp) - --libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) -+libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) - $(AM_V_at)-rm -f libunilib.a - $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD) - $(AM_V_at)$(RANLIB) libunilib.a -@@ -7904,7 +7900,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp) - --libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) -+libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libxetex.a - $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD) - $(AM_V_at)$(RANLIB) libxetex.a -@@ -7915,7 +7911,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) -+libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS) - alephdir/$(am__dirstamp): - @$(MKDIR_P) alephdir -@@ -7930,87 +7926,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di - alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \ - alephdir/$(DEPDIR)/$(am__dirstamp) - --aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) -+aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) - @rm -f aleph$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS) - --bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) -+bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) - @rm -f bibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS) - --call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) -+call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) - @rm -f call_luahbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS) - --call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) -+call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) - @rm -f call_luajithbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS) - --call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) -+call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) - @rm -f call_luajittex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS) - --call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) -+call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) - @rm -f call_luatex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS) - --call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) -+call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) - @rm -f call_mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS) - --call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) -+call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) - @rm -f call_mflua$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS) - --call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) -+call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) - @rm -f call_mfluajit$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS) - --call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) -+call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) - @rm -f call_mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS) - --call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) -+call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) - @rm -f call_pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS) - --call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) -+call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) - @rm -f call_upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS) - --ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) -+ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) - @rm -f ctangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS) - --ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) -+ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) - @rm -f ctangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS) - --ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) -+ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) - @rm -f ctie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS) - --ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) -+ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) - @rm -f ctwill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS) - --ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) -+ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) - @rm -f ctwill-refsort$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS) - --ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) -+ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) - @rm -f ctwill-twinx$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS) - --cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) -+cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) - @rm -f cweave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS) - --dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) -+dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) - @rm -f dvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS) - --dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) -+dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) - @rm -f dvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS) - eptexdir/$(am__dirstamp): -@@ -8024,7 +8020,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) -+eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) - @rm -f eptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS) - etexdir/$(am__dirstamp): -@@ -8038,7 +8034,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di - synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) -+etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) - @rm -f etex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS) - euptexdir/$(am__dirstamp): -@@ -8052,23 +8048,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) -+euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) - @rm -f euptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS) - --gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) -+gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) - @rm -f gftodvi$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS) - --gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) -+gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) - @rm -f gftopk$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS) - --gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) -+gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) - @rm -f gftype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS) - --himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) -+himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) - @rm -f himktables$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS) - hitexdir/$(am__dirstamp): -@@ -8082,19 +8078,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d - hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \ - hitexdir/$(DEPDIR)/$(am__dirstamp) - --hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) -+hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) - @rm -f hishrink$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS) - --histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) -+histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) - @rm -f histretch$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS) - --hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) -+hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) - @rm -f hitex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS) - --initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) -+initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) - @rm -f initex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS) - luatexdir/$(am__dirstamp): -@@ -8108,7 +8104,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir - mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) -+luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) - @rm -f luahbtex$(EXEEXT) - $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS) - luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8116,7 +8112,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__ - mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) -+luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) - @rm -f luajithbtex$(EXEEXT) - $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS) - luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8124,7 +8120,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di - mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) -+luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) - @rm -f luajittex$(EXEEXT) - $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS) - luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8132,33 +8128,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst - mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) -+luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) - @rm -f luatex$(EXEEXT) - $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS) - libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) -+md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) - @rm -f md5main$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS) - --mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) -+mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) - @rm -f mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS) - --mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) -+mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) - @rm -f mf-nowin$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS) - mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) -+mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) - @rm -f mflua$(EXEEXT) - $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS) - mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) -+mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) - @rm -f mflua-nowin$(EXEEXT) - $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS) - mfluajitdir/$(am__dirstamp): -@@ -8171,38 +8167,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) -+mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) - @rm -f mfluajit$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS) - mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) -+mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) - @rm -f mfluajit-nowin$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS) - --mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) -+mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) - @rm -f mft$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS) - --mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) -+mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) - @rm -f mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS) - --odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) -+odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) - @rm -f odvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS) - --odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) -+odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) - @rm -f odvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS) - --otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) -+otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) - @rm -f otangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS) - --patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) -+patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) - @rm -f patgen$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS) - pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8210,67 +8206,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) -+pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) - @rm -f pdftex$(EXEEXT) - $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS) - pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) -+pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) - @rm -f pdftosrc$(EXEEXT) - $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS) - --pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) -+pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) - @rm -f pktogf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS) - --pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) -+pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) - @rm -f pktype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS) - --pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) -+pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) - @rm -f pltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS) - --pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) -+pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) - @rm -f pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS) - --pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) -+pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) - @rm -f pooltype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS) - ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) -+ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) - @rm -f ptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS) - synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) -+synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) - @rm -f synctex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS) - --tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) -+tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) - @rm -f tangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS) - --tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) -+tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) - @rm -f tangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS) - synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) -+tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) - @rm -f tex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS) - --tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) -+tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) - @rm -f tftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS) - --tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) -+tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) - @rm -f tie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS) - pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8278,65 +8274,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__ - pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) -+ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) - @rm -f ttf2afm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS) - --twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) -+twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) - @rm -f twill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS) - --upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) -+upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) - @rm -f upbibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS) - --updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) -+updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) - @rm -f updvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS) - --upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) -+upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) - @rm -f upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS) - --uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) -+uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) - @rm -f uppltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS) - uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) -+uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) - @rm -f uptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS) - --uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) -+uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) - @rm -f uptftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS) - --vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) -+vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) - @rm -f vftovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS) - --vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) -+vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) - @rm -f vptovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS) - --weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) -+weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) - @rm -f weave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS) - --wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) -+wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) - @rm -f wofm2opl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS) - --wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) -+wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) - @rm -f wopl2ofm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS) - --wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) -+wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) - @rm -f wovf2ovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS) - --wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) -+wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) - @rm -f wovp2ovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS) - xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \ -@@ -8344,7 +8340,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) -+xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) - @rm -f xetex$(EXEEXT) - $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS) - -@@ -19275,7 +19271,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) - fi; \ - $$success || exit 1 - --check-TESTS: -+check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) -@@ -19285,7 +19281,7 @@ check-TESTS: - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; --recheck: all -+recheck: all - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ -@@ -21636,7 +21632,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND) - - #EXTRA_DIST += - --#EXTRA_DIST += -+#EXTRA_DIST += - - $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND) - -@@ -21801,7 +21797,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w - $(mp_ctangle) tfmin.w - - # Creating several files: need stamp file and two rules with identical recipes --$(mp_c_h): mp-tangle -+$(mp_c_h): mp-tangle - $(mp_ctangle_sh) mp - mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh - $(mp_ctangle_sh) mp -@@ -21848,7 +21844,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) - - $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h) - --$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) -+$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) - $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND) - $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) - -@@ -22099,7 +22095,7 @@ hitables.c: himktables$(EXEEXT) - hitables.c: himktables$(EXEEXT) - ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; } - --# hitex, histretch, and hishrink all need (at least) some -+# hitex, histretch, and hishrink all need (at least) some - # of the sources generated from hiformat.w. - # - $(hitex_OBJECTS): hiformat-tangle -@@ -22166,36 +22162,36 @@ $(libff_a_OBJECTS): libunilib.a - - $(libff_a_OBJECTS): libunilib.a - --$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - - utils-hb.c: luatexdir/utils/utils.c - $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c - --luatex-api-hb.h: luatexdir/lua/luatex-api.h -+luatex-api-hb.h: luatexdir/lua/luatex-api.h - $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h - - luastuff-hb.c: luatexdir/lua/luastuff.c -- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c -+ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c - - luainit-hb.c: luatexdir/lua/luainit.c - $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c - --printing-hb.c: luatexdir/tex/printing.c -- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c -+printing-hb.c: luatexdir/tex/printing.c -+ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c - - #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND) - - $(libluaffi_a_OBJECTS): $(LUA_DEPEND) - - #liblua53ffi_sources = $(libluaffi_sources) --#EXTRA_DIST -+#EXTRA_DIST - - $(luatex_OBJECTS): libluatex.a - $(luajittex_OBJECTS): libluajittex.a + $(am__append_78) $(am__append_79) $(am__append_80) \ + $(am__append_94) $(am__append_99) $(am__append_104) \ + $(am__append_109) diff --git a/devel/tex-synctex/files/patch-man-Makefile.in b/devel/tex-synctex/files/patch-man_Makefile.in similarity index 63% rename from devel/tex-synctex/files/patch-man-Makefile.in rename to devel/tex-synctex/files/patch-man_Makefile.in index d5ba9febe698..1650d55a5f10 100644 --- a/devel/tex-synctex/files/patch-man-Makefile.in +++ b/devel/tex-synctex/files/patch-man_Makefile.in @@ -1,49 +1,49 @@ ---- man/Makefile.in.orig 2023-04-03 23:22:42 UTC +--- man/Makefile.in.orig 2024-05-12 00:07:34 UTC +++ man/Makefile.in -@@ -171,11 +171,11 @@ am__v_GEN_0 = @echo " GEN " $@; +@@ -173,11 +173,11 @@ am__v_GEN_0 = @echo " GEN " $@; AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ -@@ -461,16 +461,12 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source +@@ -466,16 +466,13 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source mf.man mpost.man etex.man $(pdftex_man_sources) ptex.man \ ppltotf.man ptftopl.man pbibtex.man luatex.man xetex.man \ $(otangle_man_sources) aleph.man $(misc_man_sources) spell.add -bootstrap_man_sources = ctie.man cweb.man ctwill.man tangle.man tie.man +bootstrap_man_sources = # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 --man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \ -- ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \ -+man1_links = $(am__append_3) $(am__append_5) \ - $(am__append_6) $(am__append_10) $(am__append_12) \ -- $(am__append_14) $(am__append_17) latex-dev:pdflatex-dev \ -- latex-dev:xelatex-dev latex-dev:lualatex-dev \ -- latex-dev:dvilualatex-dev latex-dev:platex-dev \ -- latex-dev:uplatex-dev -+ $(am__append_14) $(am__append_17) +-man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-proofsort \ +- ctwill:ctwill-refsort ctwill:ctwill-twinx $(am__append_2) \ ++man1_links = $(am__append_2) \ + $(am__append_4) $(am__append_6) $(am__append_7) \ + $(am__append_11) $(am__append_13) $(am__append_15) \ +- $(am__append_18) latex-dev:pdflatex-dev latex-dev:xelatex-dev \ +- latex-dev:lualatex-dev latex-dev:dvilualatex-dev \ +- latex-dev:platex-dev latex-dev:uplatex-dev ++ $(am__append_18) web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \ gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \ pltotf.man pooltype.man tftopl.man twill.man \ -@@ -478,11 +474,7 @@ otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp. +@@ -483,11 +480,7 @@ otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp. pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man -misc_man_sources = \ - amstex.man \ - latex.man \ - latex-dev.man \ - pdfetex.man +misc_man_sources = SUFFIXES = .1 .man .ps .dvi man_files = $(man_sources:.man=.1) diff --git a/devel/tex-web2c/Makefile b/devel/tex-web2c/Makefile index 18ee3e7a937a..0e68ce615fb3 100644 --- a/devel/tex-web2c/Makefile +++ b/devel/tex-web2c/Makefile @@ -1,79 +1,79 @@ PORTNAME= web2c -PORTVERSION= ${TEXLIVE_VERSION} -PORTREVISION= 1 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= devel MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR} PKGNAMEPREFIX= tex- DISTNAME= texlive-${PORTVERSION}-source DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= TeX implementation translating WEB to C LICENSE= LGPL21+ LIB_DEPENDS= libgmp.so:math/gmp \ + libmpfi.so:math/mpfi \ libmpfr.so:math/mpfr \ libopenjp2.so:graphics/openjpeg \ libpng.so:graphics/png \ libzzip.so:devel/zziplib -USES= gnome libtool localbase pathfix pkgconfig tar:xz tex xorg +USES= gmake gnome libtool localbase pathfix pkgconfig tar:xz tex xorg USE_GNOME= cairo USE_LDCONFIG= yes USE_TEX= kpathsea ptexenc USE_XORG= pixman GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --disable-aleph \ --disable-eptex \ --disable-euptex \ --disable-hitex \ --disable-latex \ --disable-luahbtex \ --disable-luajithbtex \ --disable-luajittex \ --disable-luatex \ --disable-mflua \ --disable-mfluajit \ --disable-pdftex \ --disable-ptex \ --disable-synctex \ --disable-tex \ --disable-uptex \ --disable-xetex \ + --with-system-mpfi \ --with-system-zlib \ --with-system-zziplib \ --with-x=no \ --without-mf-x-toolkit .for L in pixman cairo gmp mpfr libpng icu kpathsea ptexenc CONFIGURE_ARGS+= --with-$L-include=${LOCALBASE}/include \ --with-$L-libdir=${LOCALBASE}/lib \ --with-system-$L .endfor INSTALL_TARGET= install-strip CONFLICTS_INSTALL= cweb EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux libs/xpdf texk/web2c WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c INFO= web2c post-extract: @${FIND} ${WRKSRC} -name '*.orig' -delete pre-configure: for D in libs/xpdf; do \ cd ${WRKDIR}/${DISTNAME}/$$D && \ ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \ done .include diff --git a/devel/tex-web2c/distinfo b/devel/tex-web2c/distinfo index 85bbbc168250..c97bb4227fd9 100644 --- a/devel/tex-web2c/distinfo +++ b/devel/tex-web2c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680479556 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 +TIMESTAMP = 1715473290 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 diff --git a/devel/tex-web2c/files/patch-Makefile.in b/devel/tex-web2c/files/patch-Makefile.in index 66997ea418d5..c0801f707710 100644 --- a/devel/tex-web2c/files/patch-Makefile.in +++ b/devel/tex-web2c/files/patch-Makefile.in @@ -1,1323 +1,33 @@ ---- Makefile.in.orig 2023-04-06 19:09:14 UTC +--- Makefile.in.orig 2024-05-13 11:24:13 UTC +++ Makefile.in -@@ -96,7 +96,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE +@@ -97,7 +97,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE mf-nowin$(EXEEXT) mflua$(EXEEXT) mflua-nowin$(EXEEXT) \ mfluajit$(EXEEXT) mfluajit-nowin$(EXEEXT) mpost$(EXEEXT) \ pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) eptex$(EXEEXT) \ - uptex$(EXEEXT) $(am__EXEEXT_2) euptex$(EXEEXT) pdftex$(EXEEXT) \ + uptex$(EXEEXT) euptex$(EXEEXT) pdftex$(EXEEXT) \ ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \ -@@ -109,7 +109,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__ +@@ -110,7 +110,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__ $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \ $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \ $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \ - $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \ + $(am__EXEEXT_21) $(am__EXEEXT_22) \ $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \ $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \ $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) -@@ -488,7 +488,7 @@ am__v_AR_0 = @echo " AR " $@; - AM_V_AR = $(am__v_AR_@AM_V@) - am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) - am__v_AR_0 = @echo " AR " $@; --am__v_AR_1 = -+am__v_AR_1 = - libff_a_AR = $(AR) $(ARFLAGS) - libff_a_LIBADD = - am__dirstamp = $(am__leading_dot)dirstamp -@@ -1234,7 +1234,7 @@ am__v_lt_0 = --silent - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent --am__v_lt_1 = -+am__v_lt_1 = - libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@ -@@ -1699,11 +1699,11 @@ am__v_GEN_0 = @echo " GEN " $@; - AM_V_GEN = $(am__v_GEN_@AM_V@) - am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) - am__v_GEN_0 = @echo " GEN " $@; --am__v_GEN_1 = -+am__v_GEN_1 = - AM_V_at = $(am__v_at_@AM_V@) - am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) - am__v_at_0 = @ --am__v_at_1 = -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c - depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp - am__maybe_remake_depfiles = depfiles -@@ -2395,7 +2395,7 @@ am__v_CC_0 = @echo " CC " $@; - AM_V_CC = $(am__v_CC_@AM_V@) - am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) - am__v_CC_0 = @echo " CC " $@; --am__v_CC_1 = -+am__v_CC_1 = - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -2403,7 +2403,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; - AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; --am__v_CCLD_1 = -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -@@ -2413,14 +2413,14 @@ am__v_CXX_0 = @echo " CXX " $@; - AM_V_CXX = $(am__v_CXX_@AM_V@) - am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) - am__v_CXX_0 = @echo " CXX " $@; --am__v_CXX_1 = -+am__v_CXX_1 = - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) - am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) - am__v_CXXLD_0 = @echo " CXXLD " $@; --am__v_CXXLD_1 = -+am__v_CXXLD_1 = - OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) - LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ -@@ -2430,7 +2430,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@; - AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@) - am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@) - am__v_OBJCXX_0 = @echo " OBJCXX " $@; --am__v_OBJCXX_1 = -+am__v_OBJCXX_1 = - OBJCXXLD = $(OBJCXX) - OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \ -@@ -2438,7 +2438,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; - AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@) - am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@) - am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; --am__v_OBJCXXLD_1 = -+am__v_OBJCXXLD_1 = - SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ - $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \ - $(nodist_libluahbtexspecific_a_SOURCES) \ -@@ -3112,7 +3112,7 @@ proglib = lib/lib.a - - #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a - --#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a -+#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a - EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \ -@@ -3124,11 +3124,11 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a l +@@ -3143,10 +3143,10 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a l libluahbtexspecific.a libluajithbtexspecific.a libluaffi.a \ libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \ libmd5.a -EXTRA_LTLIBRARIES = libsynctex.la +EXTRA_LTLIBRARIES = - lib_LIBRARIES = $(am__append_126) - lib_LTLIBRARIES = $(am__append_125) + lib_LIBRARIES = $(am__append_128) + lib_LTLIBRARIES = $(am__append_127) -dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 --nodist_man_MANS = +dist_man_MANS = -+nodist_man_MANS = + nodist_man_MANS = TEST_EXTENSIONS = .pl .test # - # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for -@@ -3711,19 +3711,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si - tangle_silent = $(tangle_silent_@AM_V@) - tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@) - tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ # --tangle_silent_1 = -+tangle_silent_1 = - # - ctangle = $(buildenv) $(CTANGLE) - ctangle_silent = $(ctangle_silent_@AM_V@) - ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@) - ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ # --ctangle_silent_1 = -+ctangle_silent_1 = - # - tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE) - tie_silent = $(tie_silent_@AM_V@) - tie_silent_ = $(tie_silent_@AM_DEFAULT_V@) - tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ # --tie_silent_1 = -+tie_silent_1 = - tie_c = $(tie) -c $@ - tie_m = $(tie) -m $@ - -@@ -3732,7 +3732,7 @@ DIFF = diff - - # For trip, trap, and other tests - DIFF = diff --DIFFFLAGS = -+DIFFFLAGS = - AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \ - DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \ - DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \ -@@ -3740,29 +3740,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor - - # To run, e.g., just the original trip test, in the build directory: - # make -C $ww TRIPTRAP=trip.diffs triptrap --# where $ww is the web2c build directory. --# -+# where $ww is the web2c build directory. -+# - # This will run the triptrap-sh script - # which then runs make TEST=triptest.test check-am, - # which then runs the (srcdir file) triptest.test script; - # its output will be in (builddir file) trip.diffs, --# and triptest.out if the test failed, -+# and triptest.out if the test failed, - # plus various created files in the tripdir/ subdirectory. - # The triptest.diffs file will have the actual abs_srcdir value replaced - # with the constant string "SRCDIR" to minimize differences, and "../" - # replaced with "./" to match the canonical output. Confusing. For the - # real output, see triptest.log. --# -+# - # To build only tex, make -C $ww tex (i.e., in builddir) should do it. - # Unfortunately the check-am target depends on all-am, so all engines - # are built before any tests are run. If this is a problem, just have to - # edit the generated Makefile in builddir to remove the dependency. --# -+# - # Other per-engine invocations (see triptrap-sh for complete list): - # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap --# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap --# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap --# -+# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap -+# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap -+# - triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh - - # The environment for making dumps. -@@ -3773,7 +3773,7 @@ cp_silent_0 = @echo " COPY " $@; - cp_silent = $(cp_silent_@AM_V@) - cp_silent_ = $(cp_silent_@AM_DEFAULT_V@) - cp_silent_0 = @echo " COPY " $@; --cp_silent_1 = -+cp_silent_1 = - nodist_tangle_SOURCES = tangle.c tangle.h - nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h - tangleboot_DEPENDENCIES = $(default_dependencies) -@@ -3820,7 +3820,7 @@ nodist_initex_SOURCES = callexe.c - tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C - initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" - nodist_initex_SOURCES = callexe.c --initex_LDADD = -+initex_LDADD = - tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130) - - # With --enable-ipc, TeX may need to link with -lsocket. -@@ -3848,7 +3848,7 @@ nodist_call_mf_SOURCES = callexe.c - tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test - call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\" - nodist_call_mf_SOURCES = callexe.c --call_mf_LDADD = -+call_mf_LDADD = - dist_mf_SOURCES = mfextra.c - mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) - mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) -@@ -3880,7 +3880,7 @@ nodist_call_mflua_SOURCES = callexe.c - mf_tests = mftraptest.test - call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\" - nodist_call_mflua_SOURCES = callexe.c --call_mflua_LDADD = -+call_mflua_LDADD = - dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h - mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES) - mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS) -@@ -3912,7 +3912,7 @@ libmfluaotfcc_a_CPPFLAGS = \ - -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \ - -I$(top_srcdir)/mfluadir/otfcc/include \ - -I$(top_srcdir)/mfluadir/otfcc/include/dep \ -- -I$(top_srcdir)/mfluadir/otfcc/lib -+ -I$(top_srcdir)/mfluadir/otfcc/lib - - libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS) - -@@ -4174,7 +4174,7 @@ libmfluaotfcc_a_SOURCES = \ - mfluadir/otfcc/lib/table/VDMX.h \ - mfluadir/otfcc/lib/table/SVG.c \ - mfluadir/otfcc/lib/table/head.h \ -- mfluadir/otfcc/lib/table/TSI5.c -+ mfluadir/otfcc/lib/table/TSI5.c - - libmfluapotrace_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/potrace \ -@@ -4185,7 +4185,7 @@ libmfluapotrace_a_SOURCES = \ - #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources) - libmfluapotrace_a_SOURCES = \ - mfluadir/potrace/luafunc.c \ -- mfluadir/potrace/luafunc.h -+ mfluadir/potrace/luafunc.h - - libmflualpeg_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/luapeg \ -@@ -4194,11 +4194,11 @@ libmflualpeg_a_SOURCES = \ - libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmflualpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\" - nodist_call_mfluajit_SOURCES = callexe.c --call_mfluajit_LDADD = -+call_mfluajit_LDADD = - dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h - mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES) - mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS) -@@ -4234,7 +4234,7 @@ libmfluajitlpeg_a_SOURCES = \ - libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmfluajitlpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir - mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ -@@ -4242,7 +4242,7 @@ nodist_call_mpost_SOURCES = callexe.c - - call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" - nodist_call_mpost_SOURCES = callexe.c --call_mpost_LDADD = -+call_mpost_LDADD = - - # Creating one file: just one rule - mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) -@@ -4254,10 +4254,10 @@ nodist_call_pmpost_SOURCES = callexe.c - mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test - call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\" - nodist_call_pmpost_SOURCES = callexe.c --call_pmpost_LDADD = -+call_pmpost_LDADD = - call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\" - nodist_call_upmpost_SOURCES = callexe.c --call_upmpost_LDADD = -+call_upmpost_LDADD = - pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - -@@ -4311,7 +4311,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - - nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \ -- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) -+ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) - - nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h) - nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h) -@@ -4605,7 +4605,7 @@ hiformat_c_h_l_y = \ - hiskip.c \ - histretch.c - --hitex_c = hitex.c -+hitex_c = hitex.c - - # hitex - nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c) -@@ -4758,11 +4758,11 @@ libluasocket_sources = \ - luatexdir/luasocket/src/timeout.h \ - luatexdir/luasocket/src/udp.c \ - luatexdir/luasocket/src/udp.h \ -- luatexdir/luasocket/src/usocket.h -+ luatexdir/luasocket/src/usocket.h - --libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a --#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a --libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a -+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a -+#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a -+libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a - libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES) - #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES) - libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \ -@@ -4892,8 +4892,8 @@ LUA_DEPEND = $(LUA53_DEPEND) - LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES) - LUA_LIBS = $(LUA53_LIBS) - LUA_DEPEND = $(LUA53_DEPEND) --libluatex_a_DEPENDENCIES = libff.a libluamisc.a --libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a -+libluatex_a_DEPENDENCIES = libff.a libluamisc.a -+libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a - libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ - $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \ - -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \ -@@ -4914,7 +4914,7 @@ dist_libluatex_a_SOURCES = \ - dist_libluatex_a_SOURCES = \ - luatexdir/lua/lstrlibext.c \ - luatexdir/lua/helpers.c \ -- luatexdir/lua/texluac.c -+ luatexdir/lua/texluac.c - - nodist_libluatex_a_SOURCES = \ - $(dist_libluatex_sources) \ -@@ -4932,7 +4932,7 @@ nodist_libluatexspecific_a_SOURCES = \ - - #dist_libluatexspecific_a_SOURCES = - nodist_libluatexspecific_a_SOURCES = \ -- $(dist_libluatexspecific_sources) -+ $(dist_libluatexspecific_sources) - - #dist_libluajittexspecific_a_SOURCES = - nodist_libluajittexspecific_a_SOURCES = \ -@@ -4940,46 +4940,46 @@ nodist_libluahbtexspecific_a_SOURCES = \ - - #dist_libluahbtexspecific_a_SOURCES = - nodist_libluahbtexspecific_a_SOURCES = \ -- $(dist_libluahbtexspecific_sources) -+ $(dist_libluahbtexspecific_sources) - --#dist_libluajithbtexspecific_a_SOURCES = -+#dist_libluajithbtexspecific_a_SOURCES = - nodist_libluajithbtexspecific_a_SOURCES = \ -- $(dist_libluajithbtexspecific_sources) -+ $(dist_libluajithbtexspecific_sources) - - dist_libluatexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - dist_libluajittexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - --# luatexdir/utils/utils-hb.c -+# luatexdir/utils/utils-hb.c - dist_libluahbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - - --#luatexdir/utils/utils-hb.c -+#luatexdir/utils/utils-hb.c - dist_libluajithbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - --libluatex_web = --nodist_libluatex_sources = -+libluatex_web = -+nodist_libluatex_sources = - - # dist_libluatex_sources += \ - # luatexdir/tex/align.h \ -@@ -5047,7 +5047,7 @@ nodist_libluatex_sources = - # luatexdir/tex/texmath.c \ - # luatexdir/tex/texnodes.c \ - # luatexdir/tex/textcodes.c \ --# luatexdir/tex/textoken.c -+# luatexdir/tex/textoken.c - dist_libluatex_sources = luatexdir/luatexcallbackids.h \ - luatexdir/luatex.h luatexdir/luatex-common.h \ - luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \ -@@ -5180,7 +5180,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src - # luatexdir/lua/luanode.c \ - # luatexdir/lua/luastuff.c \ - # luatexdir/lua/luatoken.c \ --# luatexdir/lua/mplibstuff.c -+# luatexdir/lua/mplibstuff.c - luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) - - ################################################################################ -@@ -5297,16 +5297,16 @@ nodist_call_luatex_SOURCES = callexe.c - - call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" - nodist_call_luatex_SOURCES = callexe.c --call_luatex_LDADD = -+call_luatex_LDADD = - call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\" - nodist_call_luahbtex_SOURCES = callexe.c --call_luahbtex_LDADD = -+call_luahbtex_LDADD = - call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\" - nodist_call_luajittex_SOURCES = callexe.c --call_luajittex_LDADD = -+call_luajittex_LDADD = - call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\" - nodist_call_luajithbtex_SOURCES = callexe.c --call_luajithbtex_LDADD = -+call_luajithbtex_LDADD = - - # LuaTeX/LuaJITTeX Tests - # -@@ -5646,7 +5646,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf - w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status - @rm -f w2c/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h --$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f w2c/stamp-h1 - touch $@ -@@ -5934,7 +5934,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys. - luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \ - luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp) - --libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) -+libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) - $(AM_V_at)-rm -f libff.a - $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD) - $(AM_V_at)$(RANLIB) libff.a -@@ -5949,7 +5949,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_ - ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) -+libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libkanji.a - $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libkanji.a -@@ -5972,7 +5972,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \ - luatexdir/luaffi/$(am__dirstamp) \ - luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp) - --libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) -+libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaffi.a - $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaffi.a -@@ -6025,12 +6025,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) -+libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaharfbuzz.a - $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaharfbuzz.a - --libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) -+libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluahbtexspecific.a - $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluahbtexspecific.a -@@ -6077,12 +6077,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) -+libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitharfbuzz.a - $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitharfbuzz.a - --libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) -+libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajithbtexspecific.a - $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajithbtexspecific.a -@@ -6147,7 +6147,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) -+libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitmisc.a - $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitmisc.a -@@ -6206,7 +6206,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) -+libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitsocket.a - $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitsocket.a -@@ -6613,7 +6613,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) -+libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittex.a - $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittex.a -@@ -6630,7 +6630,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) -+libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittexspecific.a - $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittexspecific.a -@@ -6659,7 +6659,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT): - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) -+libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluamisc.a - $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluamisc.a -@@ -6712,7 +6712,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT): - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) -+libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluasocket.a - $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluasocket.a -@@ -7058,7 +7058,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$ - synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) -+libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatex.a - $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatex.a -@@ -7075,7 +7075,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT): - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) -+libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatexspecific.a - $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatexspecific.a -@@ -7088,12 +7088,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) -+libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmd5.a - $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD) - $(AM_V_at)$(RANLIB) libmd5.a - --libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) -+libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmf.a - $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD) - $(AM_V_at)$(RANLIB) libmf.a -@@ -7109,7 +7109,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d - mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) -+libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflua.a - $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflua.a -@@ -7119,7 +7119,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am - mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) -+libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajit.a - $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajit.a -@@ -7133,7 +7133,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) -+libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajitlpeg.a - $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajitlpeg.a -@@ -7141,7 +7141,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) -+libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflualpeg.a - $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflualpeg.a -@@ -7662,7 +7662,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT - mfluadir/otfcc/lib/table/$(am__dirstamp) \ - mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp) - --libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) -+libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluaotfcc.a - $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluaotfcc.a -@@ -7676,22 +7676,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT): - mfluadir/potrace/$(am__dirstamp) \ - mfluadir/potrace/$(DEPDIR)/$(am__dirstamp) - --libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) -+libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluapotrace.a - $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluapotrace.a - --libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) -+libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibbackends.a - $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibbackends.a - --libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) -+libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibcore.a - $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibcore.a - --libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) -+libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibextramath.a - $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibextramath.a -@@ -7708,7 +7708,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$( - mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) -+libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmputil.a - $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD) - $(AM_V_at)$(RANLIB) libmputil.a -@@ -7779,7 +7779,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \ - pdftexdir/regex/$(am__dirstamp) \ - pdftexdir/regex/$(DEPDIR)/$(am__dirstamp) - --libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) -+libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libpdftex.a - $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD) - $(AM_V_at)$(RANLIB) libpdftex.a -@@ -7790,7 +7790,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT) - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) -+libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libsynctex.a - $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD) - $(AM_V_at)$(RANLIB) libsynctex.a -@@ -7805,7 +7805,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$( - uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) -+libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libukanji.a - $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libukanji.a -@@ -7846,7 +7846,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \ - luatexdir/unilib/$(am__dirstamp) \ - luatexdir/unilib/$(DEPDIR)/$(am__dirstamp) - --libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) -+libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) - $(AM_V_at)-rm -f libunilib.a - $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD) - $(AM_V_at)$(RANLIB) libunilib.a -@@ -7904,7 +7904,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp) - --libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) -+libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libxetex.a - $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD) - $(AM_V_at)$(RANLIB) libxetex.a -@@ -7915,7 +7915,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) -+libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS) - alephdir/$(am__dirstamp): - @$(MKDIR_P) alephdir -@@ -7930,87 +7930,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di - alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \ - alephdir/$(DEPDIR)/$(am__dirstamp) - --aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) -+aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) - @rm -f aleph$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS) - --bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) -+bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) - @rm -f bibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS) - --call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) -+call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) - @rm -f call_luahbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS) - --call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) -+call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) - @rm -f call_luajithbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS) - --call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) -+call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) - @rm -f call_luajittex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS) - --call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) -+call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) - @rm -f call_luatex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS) - --call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) -+call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) - @rm -f call_mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS) - --call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) -+call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) - @rm -f call_mflua$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS) - --call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) -+call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) - @rm -f call_mfluajit$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS) - --call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) -+call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) - @rm -f call_mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS) - --call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) -+call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) - @rm -f call_pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS) - --call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) -+call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) - @rm -f call_upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS) - --ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) -+ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) - @rm -f ctangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS) - --ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) -+ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) - @rm -f ctangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS) - --ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) -+ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) - @rm -f ctie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS) - --ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) -+ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) - @rm -f ctwill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS) - --ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) -+ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) - @rm -f ctwill-refsort$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS) - --ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) -+ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) - @rm -f ctwill-twinx$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS) - --cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) -+cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) - @rm -f cweave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS) - --dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) -+dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) - @rm -f dvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS) - --dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) -+dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) - @rm -f dvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS) - eptexdir/$(am__dirstamp): -@@ -8024,7 +8024,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) -+eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) - @rm -f eptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS) - etexdir/$(am__dirstamp): -@@ -8038,7 +8038,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di - synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) -+etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) - @rm -f etex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS) - euptexdir/$(am__dirstamp): -@@ -8052,23 +8052,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) -+euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) - @rm -f euptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS) - --gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) -+gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) - @rm -f gftodvi$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS) - --gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) -+gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) - @rm -f gftopk$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS) - --gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) -+gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) - @rm -f gftype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS) - --himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) -+himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) - @rm -f himktables$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS) - hitexdir/$(am__dirstamp): -@@ -8082,19 +8082,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d - hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \ - hitexdir/$(DEPDIR)/$(am__dirstamp) - --hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) -+hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) - @rm -f hishrink$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS) - --histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) -+histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) - @rm -f histretch$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS) - --hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) -+hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) - @rm -f hitex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS) - --initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) -+initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) - @rm -f initex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS) - luatexdir/$(am__dirstamp): -@@ -8108,7 +8108,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir - mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) -+luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) - @rm -f luahbtex$(EXEEXT) - $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS) - luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8116,7 +8116,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__ - mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) -+luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) - @rm -f luajithbtex$(EXEEXT) - $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS) - luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8124,7 +8124,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di - mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) -+luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) - @rm -f luajittex$(EXEEXT) - $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS) - luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8132,33 +8132,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst - mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) -+luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) - @rm -f luatex$(EXEEXT) - $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS) - libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) -+md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) - @rm -f md5main$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS) - --mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) -+mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) - @rm -f mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS) - --mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) -+mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) - @rm -f mf-nowin$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS) - mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) -+mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) - @rm -f mflua$(EXEEXT) - $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS) - mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) -+mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) - @rm -f mflua-nowin$(EXEEXT) - $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS) - mfluajitdir/$(am__dirstamp): -@@ -8171,38 +8171,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) -+mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) - @rm -f mfluajit$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS) - mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) -+mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) - @rm -f mfluajit-nowin$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS) - --mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) -+mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) - @rm -f mft$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS) - --mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) -+mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) - @rm -f mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS) - --odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) -+odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) - @rm -f odvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS) - --odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) -+odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) - @rm -f odvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS) - --otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) -+otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) - @rm -f otangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS) - --patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) -+patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) - @rm -f patgen$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS) - pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8210,67 +8210,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) -+pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) - @rm -f pdftex$(EXEEXT) - $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS) - pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) -+pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) - @rm -f pdftosrc$(EXEEXT) - $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS) - --pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) -+pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) - @rm -f pktogf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS) - --pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) -+pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) - @rm -f pktype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS) - --pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) -+pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) - @rm -f pltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS) - --pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) -+pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) - @rm -f pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS) - --pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) -+pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) - @rm -f pooltype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS) - ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) -+ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) - @rm -f ptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS) - synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) -+synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) - @rm -f synctex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS) - --tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) -+tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) - @rm -f tangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS) - --tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) -+tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) - @rm -f tangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS) - synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) -+tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) - @rm -f tex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS) - --tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) -+tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) - @rm -f tftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS) - --tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) -+tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) - @rm -f tie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS) - pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8278,65 +8278,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__ - pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) -+ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) - @rm -f ttf2afm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS) - --twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) -+twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) - @rm -f twill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS) - --upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) -+upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) - @rm -f upbibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS) - --updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) -+updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) - @rm -f updvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS) - --upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) -+upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) - @rm -f upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS) - --uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) -+uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) - @rm -f uppltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS) - uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) -+uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) - @rm -f uptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS) - --uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) -+uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) - @rm -f uptftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS) - --vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) -+vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) - @rm -f vftovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS) - --vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) -+vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) - @rm -f vptovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS) - --weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) -+weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) - @rm -f weave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS) - --wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) -+wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) - @rm -f wofm2opl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS) - --wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) -+wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) - @rm -f wopl2ofm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS) - --wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) -+wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) - @rm -f wovf2ovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS) - --wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) -+wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) - @rm -f wovp2ovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS) - xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \ -@@ -8344,7 +8344,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) -+xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) - @rm -f xetex$(EXEEXT) - $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS) - -@@ -19275,7 +19275,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) - fi; \ - $$success || exit 1 - --check-TESTS: -+check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) -@@ -19285,7 +19285,7 @@ check-TESTS: - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; --recheck: all -+recheck: all - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ -@@ -21636,7 +21636,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND) - - #EXTRA_DIST += - --#EXTRA_DIST += -+#EXTRA_DIST += - - $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND) - -@@ -21801,7 +21801,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w - $(mp_ctangle) tfmin.w - - # Creating several files: need stamp file and two rules with identical recipes --$(mp_c_h): mp-tangle -+$(mp_c_h): mp-tangle - $(mp_ctangle_sh) mp - mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh - $(mp_ctangle_sh) mp -@@ -21848,7 +21848,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) - - $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h) - --$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) -+$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) - $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND) - $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) - -@@ -22099,7 +22099,7 @@ hitables.c: himktables$(EXEEXT) - hitables.c: himktables$(EXEEXT) - ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; } - --# hitex, histretch, and hishrink all need (at least) some -+# hitex, histretch, and hishrink all need (at least) some - # of the sources generated from hiformat.w. - # - $(hitex_OBJECTS): hiformat-tangle -@@ -22166,36 +22166,36 @@ $(libff_a_OBJECTS): libunilib.a - - $(libff_a_OBJECTS): libunilib.a - --$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - - utils-hb.c: luatexdir/utils/utils.c - $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c - --luatex-api-hb.h: luatexdir/lua/luatex-api.h -+luatex-api-hb.h: luatexdir/lua/luatex-api.h - $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h - - luastuff-hb.c: luatexdir/lua/luastuff.c -- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c -+ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c - - luainit-hb.c: luatexdir/lua/luainit.c - $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c - --printing-hb.c: luatexdir/tex/printing.c -- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c -+printing-hb.c: luatexdir/tex/printing.c -+ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c - - #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND) - - $(libluaffi_a_OBJECTS): $(LUA_DEPEND) - - #liblua53ffi_sources = $(libluaffi_sources) --#EXTRA_DIST -+#EXTRA_DIST - - $(luatex_OBJECTS): libluatex.a - $(luajittex_OBJECTS): libluajittex.a diff --git a/devel/tex-web2c/files/patch-man-Makefile.in b/devel/tex-web2c/files/patch-man_Makefile.in similarity index 74% rename from devel/tex-web2c/files/patch-man-Makefile.in rename to devel/tex-web2c/files/patch-man_Makefile.in index 4d18d6082340..b2fed6e25432 100644 --- a/devel/tex-web2c/files/patch-man-Makefile.in +++ b/devel/tex-web2c/files/patch-man_Makefile.in @@ -1,15 +1,15 @@ ---- man/Makefile.in.orig 2023-04-06 19:09:14 UTC +--- man/Makefile.in.orig 2024-05-13 11:29:09 UTC +++ man/Makefile.in -@@ -478,11 +478,7 @@ otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp. +@@ -483,11 +483,7 @@ otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp. pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man -misc_man_sources = \ - amstex.man \ - latex.man \ - latex-dev.man \ - pdfetex.man +misc_man_sources = SUFFIXES = .1 .man .ps .dvi man_files = $(man_sources:.man=.1) diff --git a/japanese/tex-ptex/Makefile b/japanese/tex-ptex/Makefile index 417e3c9859fe..ae03b0325bac 100644 --- a/japanese/tex-ptex/Makefile +++ b/japanese/tex-ptex/Makefile @@ -1,106 +1,106 @@ PORTNAME= ptex -PORTVERSION= 3.6 -PORTREVISION= 4 +DISTVERSION= 3.6 +PORTREVISION= 5 CATEGORIES= japanese print MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/:source \ LOCAL/tex:texmf PKGNAMEPREFIX= ja-tex- DISTFILES= texlive-${TEXLIVE_VERSION}-source${EXTRACT_SUFX}:source \ texlive-${TEXLIVE_VERSION}-texmf-japanese_tex-ptex-freebsd${EXTRACT_SUFX}:texmf DIST_SUBDIR= TeX EXTRACT_ONLY= texlive-${TEXLIVE_VERSION}-source${EXTRACT_SUFX} MAINTAINER= tex@FreeBSD.org COMMENT= ASCII Japanese pTeX WWW= https://ctan.org/pkg/ptex USES= localbase perl5 pkgconfig tar:xz tex USE_TEX= fmtutil formats kpathsea ptexenc web2c GNU_CONFIGURE= yes CONFIGURE_ARGS= ${EXCLUDE_ENGINES:S/^/--disable-/} \ --enable-eptex \ --enable-euptex \ --enable-ptex \ --enable-uptex \ --with-system-zlib \ --without-x .for L in kpathsea ptexenc CONFIGURE_ARGS+= --with-$L-include=${LOCALBASE}/include \ --with-$L-libdir=${LOCALBASE}/lib \ --with-system-$L .endfor MAKE_JOBS_UNSAFE= yes EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${_DISTNAME_SOURCE}/,} EXTRACT_FILES= build-aux libs/xpdf texk/web2c WRKSRC= ${WRKDIR}/${_DISTNAME_SOURCE}/texk/web2c EXCLUDE_ENGINES= aleph etex pdftex luatex luajittex mf mf-nowin \ otangle mp pmp upmp web2c web-progs xetex tex \ synctex mflua mfluajit luahbtex luajithbtex _DISTNAME_SOURCE= texlive-${TEXLIVE_VERSION}-source TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFVARDIR} TEX_FORMATS= ptex uptex -#post-extract: -# @${FIND} ${WRKSRC} -name '*.orig' -delete - pre-configure: cd ${WRKDIR}/${_DISTNAME_SOURCE}/libs/xpdf && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \ ${CONFIGURE_ARGS}; \ pre-install: ${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf-japanese_tex-ptex-freebsd${EXTRACT_SUFX} \ -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner post-install: ${FIND} -s ${STAGEDIR}${PREFIX}/share -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/share -type d -empty | ${SORT} -r | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST} .if defined(MAINTAINER_MODE) _MAINTAINER_DISTNAME= ${DISTNAME_TEXMF}${EXTRACT_SUFX} _EXTRACT_TARGETDIR= texlive-${TEXLIVE_VERSION}-texmf-japanese_tex-ptex-freebsd EXTRACT_FILES_TEXMF= doc/ptex doc/platex doc/uptex doc/uplatex \ doc/fonts/japanese-otf fonts/vf/public/japanese-otf \ fonts/tfm/public/japanese-otf source/uplatex tex/ptex \ - fonts/ofm/public/japanese-otf source/platex \ + source/platex \ tex/uplatex source/fonts/japanese-otf tex/uptex \ tex/platex tex/generic/hyph-utf8/patterns/ptex \ fonts/map/dvipdfmx/updmap/kanjix.map _maintainer-extract: ${MAKE} clean ${MKDIR} ${WRKDIR}/${_EXTRACT_TARGETDIR} ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \ -C ${WRKDIR}/${_EXTRACT_TARGETDIR} \ --strip-components 1 --no-same-permission --no-same-owner \ ${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/texmf-dist/,} + @${FIND} ${WRKDIR} -name '*.orig' -delete _maintainer-patch: _maintainer-extract ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/mkjvf \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkcidvf.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkjp04tfmvf.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkmlcidvf.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mktfm.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkutfvf.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl \ ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/umkjvf _maintainer-dist: _maintainer-patch ${TAR} --options xz:compression-level=9 -Jcvf \ ${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX} \ -C ${WRKDIR} ${_EXTRACT_TARGETDIR} + scp ${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX} \ + bofh@freefall.freebsd.org://home/tex/public_distfiles/ .endif .include diff --git a/japanese/tex-ptex/distinfo b/japanese/tex-ptex/distinfo index 90691924fdd0..646b4aac0b3a 100644 --- a/japanese/tex-ptex/distinfo +++ b/japanese/tex-ptex/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1698325900 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 -SHA256 (TeX/texlive-20230313-texmf-japanese_tex-ptex-freebsd.tar.xz) = b02128975b6653060bd656b7733439e1a10f2e51e6e89e8eb52d0373e4ddc652 -SIZE (TeX/texlive-20230313-texmf-japanese_tex-ptex-freebsd.tar.xz) = 9401208 +TIMESTAMP = 1716939066 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 +SHA256 (TeX/texlive-20240312-texmf-japanese_tex-ptex-freebsd.tar.xz) = fc298354a27d80a96d3894d32183bde6a344d5616dacddbe1465ab883c5b9be9 +SIZE (TeX/texlive-20240312-texmf-japanese_tex-ptex-freebsd.tar.xz) = 9518364 diff --git a/japanese/tex-ptex/files/patch-Makefile.in b/japanese/tex-ptex/files/patch-Makefile.in index df80777cdb98..94d1916e834f 100644 --- a/japanese/tex-ptex/files/patch-Makefile.in +++ b/japanese/tex-ptex/files/patch-Makefile.in @@ -1,1352 +1,67 @@ ---- Makefile.in.orig 2023-03-08 17:05:16 UTC +--- Makefile.in.orig 2024-02-28 04:19:31 UTC +++ Makefile.in -@@ -101,18 +101,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE +@@ -102,18 +102,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \ md5main$(EXEEXT) -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \ - ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \ - ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \ - $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ - $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \ - $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \ - $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \ - $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \ - $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \ - $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \ - $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \ - $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) +bin_PROGRAMS = $(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) euptex$(EXEEXT) \ + ptex$(EXEEXT) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \ $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \ -@@ -488,7 +478,7 @@ am__v_AR_0 = @echo " AR " $@; - AM_V_AR = $(am__v_AR_@AM_V@) - am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) - am__v_AR_0 = @echo " AR " $@; --am__v_AR_1 = -+am__v_AR_1 = - libff_a_AR = $(AR) $(ARFLAGS) - libff_a_LIBADD = - am__dirstamp = $(am__leading_dot)dirstamp -@@ -1234,7 +1224,7 @@ am__v_lt_0 = --silent - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent --am__v_lt_1 = -+am__v_lt_1 = - libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@ -@@ -1699,11 +1689,11 @@ am__v_GEN_0 = @echo " GEN " $@; - AM_V_GEN = $(am__v_GEN_@AM_V@) - am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) - am__v_GEN_0 = @echo " GEN " $@; --am__v_GEN_1 = -+am__v_GEN_1 = - AM_V_at = $(am__v_at_@AM_V@) - am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) - am__v_at_0 = @ --am__v_at_1 = -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c - depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp - am__maybe_remake_depfiles = depfiles -@@ -2395,7 +2385,7 @@ am__v_CC_0 = @echo " CC " $@; - AM_V_CC = $(am__v_CC_@AM_V@) - am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) - am__v_CC_0 = @echo " CC " $@; --am__v_CC_1 = -+am__v_CC_1 = - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -2403,7 +2393,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; - AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; --am__v_CCLD_1 = -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -@@ -2413,14 +2403,14 @@ am__v_CXX_0 = @echo " CXX " $@; - AM_V_CXX = $(am__v_CXX_@AM_V@) - am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) - am__v_CXX_0 = @echo " CXX " $@; --am__v_CXX_1 = -+am__v_CXX_1 = - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) - am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) - am__v_CXXLD_0 = @echo " CXXLD " $@; --am__v_CXXLD_1 = -+am__v_CXXLD_1 = - OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) - LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ -@@ -2430,7 +2420,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@; - AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@) - am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@) - am__v_OBJCXX_0 = @echo " OBJCXX " $@; --am__v_OBJCXX_1 = -+am__v_OBJCXX_1 = - OBJCXXLD = $(OBJCXX) - OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \ -@@ -2438,7 +2428,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; - AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@) - am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@) - am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; --am__v_OBJCXXLD_1 = -+am__v_OBJCXXLD_1 = - SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ - $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \ - $(nodist_libluahbtexspecific_a_SOURCES) \ -@@ -3105,14 +3095,14 @@ version = $(WEB2CVERSION) +@@ -3124,7 +3114,7 @@ version = $(WEB2CVERSION) AM_CXXFLAGS = ## $(WARNING_CXXFLAGS) AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS) version = $(WEB2CVERSION) -SUBDIRS = doc lib man web2c . window omegafonts otps +SUBDIRS = . proglib = lib/lib.a #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a - - #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a - --#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a -+#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a - EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \ -@@ -3128,7 +3118,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/m - lib_LIBRARIES = $(am__append_126) - lib_LTLIBRARIES = $(am__append_125) - dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 --nodist_man_MANS = -+nodist_man_MANS = +@@ -3146,7 +3136,7 @@ lib_LTLIBRARIES = $(am__append_127) + EXTRA_LTLIBRARIES = libsynctex.la + lib_LIBRARIES = $(am__append_128) + lib_LTLIBRARIES = $(am__append_127) +-dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 ++dist_man_MANS = + nodist_man_MANS = TEST_EXTENSIONS = .pl .test # - # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for -@@ -3631,13 +3621,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe +@@ -3652,14 +3642,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe $(am__append_35) $(am__append_43) $(am__append_59) \ $(am__append_63) $(am__append_69) $(am__append_74) \ - $(am__append_80) + $(am__append_82) -bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \ - $(am__append_24) $(am__append_33) $(am__append_41) \ - $(am__append_49) $(am__append_54) $(am__append_67) \ - upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \ - uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \ -- $(am__append_78) $(am__append_92) $(am__append_97) \ -- $(am__append_102) $(am__append_107) +- $(am__append_78) $(am__append_79) $(am__append_80) \ +- $(am__append_94) $(am__append_99) $(am__append_104) \ +- $(am__append_109) +bin_links = install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \ $(am__append_39) $(am__append_47) $(am__append_52) \ - $(am__append_90) $(am__append_95) $(am__append_100) \ -@@ -3711,19 +3695,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si - tangle_silent = $(tangle_silent_@AM_V@) - tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@) - tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ # --tangle_silent_1 = -+tangle_silent_1 = - # - ctangle = $(buildenv) $(CTANGLE) - ctangle_silent = $(ctangle_silent_@AM_V@) - ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@) - ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ # --ctangle_silent_1 = -+ctangle_silent_1 = - # - tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE) - tie_silent = $(tie_silent_@AM_V@) - tie_silent_ = $(tie_silent_@AM_DEFAULT_V@) - tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ # --tie_silent_1 = -+tie_silent_1 = - tie_c = $(tie) -c $@ - tie_m = $(tie) -m $@ - -@@ -3732,7 +3716,7 @@ DIFF = diff - - # For trip, trap, and other tests - DIFF = diff --DIFFFLAGS = -+DIFFFLAGS = - AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \ - DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \ - DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \ -@@ -3740,29 +3724,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor - - # To run, e.g., just the original trip test, in the build directory: - # make -C $ww TRIPTRAP=trip.diffs triptrap --# where $ww is the web2c build directory. --# -+# where $ww is the web2c build directory. -+# - # This will run the triptrap-sh script - # which then runs make TEST=triptest.test check-am, - # which then runs the (srcdir file) triptest.test script; - # its output will be in (builddir file) trip.diffs, --# and triptest.out if the test failed, -+# and triptest.out if the test failed, - # plus various created files in the tripdir/ subdirectory. - # The triptest.diffs file will have the actual abs_srcdir value replaced - # with the constant string "SRCDIR" to minimize differences, and "../" - # replaced with "./" to match the canonical output. Confusing. For the - # real output, see triptest.log. --# -+# - # To build only tex, make -C $ww tex (i.e., in builddir) should do it. - # Unfortunately the check-am target depends on all-am, so all engines - # are built before any tests are run. If this is a problem, just have to - # edit the generated Makefile in builddir to remove the dependency. --# -+# - # Other per-engine invocations (see triptrap-sh for complete list): - # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap --# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap --# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap --# -+# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap -+# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap -+# - triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh - - # The environment for making dumps. -@@ -3773,7 +3757,7 @@ cp_silent_0 = @echo " COPY " $@; - cp_silent = $(cp_silent_@AM_V@) - cp_silent_ = $(cp_silent_@AM_DEFAULT_V@) - cp_silent_0 = @echo " COPY " $@; --cp_silent_1 = -+cp_silent_1 = - nodist_tangle_SOURCES = tangle.c tangle.h - nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h - tangleboot_DEPENDENCIES = $(default_dependencies) -@@ -3820,7 +3804,7 @@ nodist_initex_SOURCES = callexe.c - tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C - initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" - nodist_initex_SOURCES = callexe.c --initex_LDADD = -+initex_LDADD = - tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130) - - # With --enable-ipc, TeX may need to link with -lsocket. -@@ -3848,7 +3832,7 @@ nodist_call_mf_SOURCES = callexe.c - tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test - call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\" - nodist_call_mf_SOURCES = callexe.c --call_mf_LDADD = -+call_mf_LDADD = - dist_mf_SOURCES = mfextra.c - mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) - mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) -@@ -3880,7 +3864,7 @@ nodist_call_mflua_SOURCES = callexe.c - mf_tests = mftraptest.test - call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\" - nodist_call_mflua_SOURCES = callexe.c --call_mflua_LDADD = -+call_mflua_LDADD = - dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h - mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES) - mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS) -@@ -3912,7 +3896,7 @@ libmfluaotfcc_a_CPPFLAGS = \ - -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \ - -I$(top_srcdir)/mfluadir/otfcc/include \ - -I$(top_srcdir)/mfluadir/otfcc/include/dep \ -- -I$(top_srcdir)/mfluadir/otfcc/lib -+ -I$(top_srcdir)/mfluadir/otfcc/lib - - libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS) - -@@ -4174,7 +4158,7 @@ libmfluaotfcc_a_SOURCES = \ - mfluadir/otfcc/lib/table/VDMX.h \ - mfluadir/otfcc/lib/table/SVG.c \ - mfluadir/otfcc/lib/table/head.h \ -- mfluadir/otfcc/lib/table/TSI5.c -+ mfluadir/otfcc/lib/table/TSI5.c - - libmfluapotrace_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/potrace \ -@@ -4185,7 +4169,7 @@ libmfluapotrace_a_SOURCES = \ - #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources) - libmfluapotrace_a_SOURCES = \ - mfluadir/potrace/luafunc.c \ -- mfluadir/potrace/luafunc.h -+ mfluadir/potrace/luafunc.h - - libmflualpeg_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/luapeg \ -@@ -4194,11 +4178,11 @@ libmflualpeg_a_SOURCES = \ - libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmflualpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\" - nodist_call_mfluajit_SOURCES = callexe.c --call_mfluajit_LDADD = -+call_mfluajit_LDADD = - dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h - mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES) - mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS) -@@ -4234,7 +4218,7 @@ libmfluajitlpeg_a_SOURCES = \ - libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmfluajitlpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir - mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ -@@ -4242,7 +4226,7 @@ nodist_call_mpost_SOURCES = callexe.c - - call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" - nodist_call_mpost_SOURCES = callexe.c --call_mpost_LDADD = -+call_mpost_LDADD = - - # Creating one file: just one rule - mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) -@@ -4254,10 +4238,10 @@ nodist_call_pmpost_SOURCES = callexe.c - mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test - call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\" - nodist_call_pmpost_SOURCES = callexe.c --call_pmpost_LDADD = -+call_pmpost_LDADD = - call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\" - nodist_call_upmpost_SOURCES = callexe.c --call_upmpost_LDADD = -+call_upmpost_LDADD = - pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - -@@ -4311,7 +4295,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - - nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \ -- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) -+ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) - - nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h) - nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h) -@@ -4605,7 +4589,7 @@ hiformat_c_h_l_y = \ - hiskip.c \ - histretch.c - --hitex_c = hitex.c -+hitex_c = hitex.c - - # hitex - nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c) -@@ -4758,11 +4742,11 @@ libluasocket_sources = \ - luatexdir/luasocket/src/timeout.h \ - luatexdir/luasocket/src/udp.c \ - luatexdir/luasocket/src/udp.h \ -- luatexdir/luasocket/src/usocket.h -+ luatexdir/luasocket/src/usocket.h - --libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a --#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a --libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a -+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a -+#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a -+libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a - libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES) - #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES) - libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \ -@@ -4892,8 +4876,8 @@ LUA_DEPEND = $(LUA53_DEPEND) - LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES) - LUA_LIBS = $(LUA53_LIBS) - LUA_DEPEND = $(LUA53_DEPEND) --libluatex_a_DEPENDENCIES = libff.a libluamisc.a --libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a -+libluatex_a_DEPENDENCIES = libff.a libluamisc.a -+libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a - libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ - $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \ - -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \ -@@ -4914,7 +4898,7 @@ dist_libluatex_a_SOURCES = \ - dist_libluatex_a_SOURCES = \ - luatexdir/lua/lstrlibext.c \ - luatexdir/lua/helpers.c \ -- luatexdir/lua/texluac.c -+ luatexdir/lua/texluac.c - - nodist_libluatex_a_SOURCES = \ - $(dist_libluatex_sources) \ -@@ -4932,7 +4916,7 @@ nodist_libluatexspecific_a_SOURCES = \ - - #dist_libluatexspecific_a_SOURCES = - nodist_libluatexspecific_a_SOURCES = \ -- $(dist_libluatexspecific_sources) -+ $(dist_libluatexspecific_sources) - - #dist_libluajittexspecific_a_SOURCES = - nodist_libluajittexspecific_a_SOURCES = \ -@@ -4940,46 +4924,46 @@ nodist_libluahbtexspecific_a_SOURCES = \ - - #dist_libluahbtexspecific_a_SOURCES = - nodist_libluahbtexspecific_a_SOURCES = \ -- $(dist_libluahbtexspecific_sources) -+ $(dist_libluahbtexspecific_sources) - --#dist_libluajithbtexspecific_a_SOURCES = -+#dist_libluajithbtexspecific_a_SOURCES = - nodist_libluajithbtexspecific_a_SOURCES = \ -- $(dist_libluajithbtexspecific_sources) -+ $(dist_libluajithbtexspecific_sources) - - dist_libluatexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - dist_libluajittexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - --# luatexdir/utils/utils-hb.c -+# luatexdir/utils/utils-hb.c - dist_libluahbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - - --#luatexdir/utils/utils-hb.c -+#luatexdir/utils/utils-hb.c - dist_libluajithbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - --libluatex_web = --nodist_libluatex_sources = -+libluatex_web = -+nodist_libluatex_sources = - - # dist_libluatex_sources += \ - # luatexdir/tex/align.h \ -@@ -5047,7 +5031,7 @@ nodist_libluatex_sources = - # luatexdir/tex/texmath.c \ - # luatexdir/tex/texnodes.c \ - # luatexdir/tex/textcodes.c \ --# luatexdir/tex/textoken.c -+# luatexdir/tex/textoken.c - dist_libluatex_sources = luatexdir/luatexcallbackids.h \ - luatexdir/luatex.h luatexdir/luatex-common.h \ - luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \ -@@ -5180,7 +5164,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src - # luatexdir/lua/luanode.c \ - # luatexdir/lua/luastuff.c \ - # luatexdir/lua/luatoken.c \ --# luatexdir/lua/mplibstuff.c -+# luatexdir/lua/mplibstuff.c - luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) - - ################################################################################ -@@ -5297,16 +5281,16 @@ nodist_call_luatex_SOURCES = callexe.c - - call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" - nodist_call_luatex_SOURCES = callexe.c --call_luatex_LDADD = -+call_luatex_LDADD = - call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\" - nodist_call_luahbtex_SOURCES = callexe.c --call_luahbtex_LDADD = -+call_luahbtex_LDADD = - call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\" - nodist_call_luajittex_SOURCES = callexe.c --call_luajittex_LDADD = -+call_luajittex_LDADD = - call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\" - nodist_call_luajithbtex_SOURCES = callexe.c --call_luajithbtex_LDADD = -+call_luajithbtex_LDADD = - - # LuaTeX/LuaJITTeX Tests - # -@@ -5646,7 +5630,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf - w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status - @rm -f w2c/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h --$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f w2c/stamp-h1 - touch $@ -@@ -5934,7 +5918,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys. - luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \ - luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp) - --libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) -+libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) - $(AM_V_at)-rm -f libff.a - $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD) - $(AM_V_at)$(RANLIB) libff.a -@@ -5949,7 +5933,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_ - ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) -+libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libkanji.a - $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libkanji.a -@@ -5972,7 +5956,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \ - luatexdir/luaffi/$(am__dirstamp) \ - luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp) - --libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) -+libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaffi.a - $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaffi.a -@@ -6025,12 +6009,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) -+libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaharfbuzz.a - $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaharfbuzz.a - --libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) -+libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluahbtexspecific.a - $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluahbtexspecific.a -@@ -6077,12 +6061,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) -+libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitharfbuzz.a - $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitharfbuzz.a - --libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) -+libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajithbtexspecific.a - $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajithbtexspecific.a -@@ -6147,7 +6131,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) -+libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitmisc.a - $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitmisc.a -@@ -6206,7 +6190,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) -+libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitsocket.a - $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitsocket.a -@@ -6613,7 +6597,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) -+libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittex.a - $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittex.a -@@ -6630,7 +6614,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) -+libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittexspecific.a - $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittexspecific.a -@@ -6659,7 +6643,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT): - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) -+libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluamisc.a - $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluamisc.a -@@ -6712,7 +6696,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT): - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) -+libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluasocket.a - $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluasocket.a -@@ -7058,7 +7042,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$ - synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) -+libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatex.a - $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatex.a -@@ -7075,7 +7059,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT): - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) -+libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatexspecific.a - $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatexspecific.a -@@ -7088,12 +7072,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) -+libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmd5.a - $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD) - $(AM_V_at)$(RANLIB) libmd5.a - --libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) -+libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmf.a - $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD) - $(AM_V_at)$(RANLIB) libmf.a -@@ -7109,7 +7093,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d - mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) -+libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflua.a - $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflua.a -@@ -7119,7 +7103,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am - mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) -+libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajit.a - $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajit.a -@@ -7133,7 +7117,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) -+libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajitlpeg.a - $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajitlpeg.a -@@ -7141,7 +7125,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) -+libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflualpeg.a - $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflualpeg.a -@@ -7662,7 +7646,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT - mfluadir/otfcc/lib/table/$(am__dirstamp) \ - mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp) - --libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) -+libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluaotfcc.a - $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluaotfcc.a -@@ -7676,22 +7660,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT): - mfluadir/potrace/$(am__dirstamp) \ - mfluadir/potrace/$(DEPDIR)/$(am__dirstamp) - --libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) -+libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluapotrace.a - $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluapotrace.a - --libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) -+libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibbackends.a - $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibbackends.a - --libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) -+libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibcore.a - $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibcore.a - --libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) -+libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibextramath.a - $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibextramath.a -@@ -7708,7 +7692,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$( - mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) -+libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmputil.a - $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD) - $(AM_V_at)$(RANLIB) libmputil.a -@@ -7779,7 +7763,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \ - pdftexdir/regex/$(am__dirstamp) \ - pdftexdir/regex/$(DEPDIR)/$(am__dirstamp) - --libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) -+libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libpdftex.a - $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD) - $(AM_V_at)$(RANLIB) libpdftex.a -@@ -7790,7 +7774,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT) - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) -+libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libsynctex.a - $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD) - $(AM_V_at)$(RANLIB) libsynctex.a -@@ -7805,7 +7789,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$( - uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) -+libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libukanji.a - $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libukanji.a -@@ -7846,7 +7830,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \ - luatexdir/unilib/$(am__dirstamp) \ - luatexdir/unilib/$(DEPDIR)/$(am__dirstamp) - --libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) -+libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) - $(AM_V_at)-rm -f libunilib.a - $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD) - $(AM_V_at)$(RANLIB) libunilib.a -@@ -7904,7 +7888,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp) - --libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) -+libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libxetex.a - $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD) - $(AM_V_at)$(RANLIB) libxetex.a -@@ -7915,7 +7899,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) -+libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS) - alephdir/$(am__dirstamp): - @$(MKDIR_P) alephdir -@@ -7930,87 +7914,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di - alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \ - alephdir/$(DEPDIR)/$(am__dirstamp) - --aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) -+aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) - @rm -f aleph$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS) - --bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) -+bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) - @rm -f bibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS) - --call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) -+call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) - @rm -f call_luahbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS) - --call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) -+call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) - @rm -f call_luajithbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS) - --call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) -+call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) - @rm -f call_luajittex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS) - --call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) -+call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) - @rm -f call_luatex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS) - --call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) -+call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) - @rm -f call_mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS) - --call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) -+call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) - @rm -f call_mflua$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS) - --call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) -+call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) - @rm -f call_mfluajit$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS) - --call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) -+call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) - @rm -f call_mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS) - --call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) -+call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) - @rm -f call_pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS) - --call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) -+call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) - @rm -f call_upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS) - --ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) -+ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) - @rm -f ctangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS) - --ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) -+ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) - @rm -f ctangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS) - --ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) -+ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) - @rm -f ctie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS) - --ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) -+ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) - @rm -f ctwill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS) - --ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) -+ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) - @rm -f ctwill-refsort$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS) - --ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) -+ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) - @rm -f ctwill-twinx$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS) - --cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) -+cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) - @rm -f cweave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS) - --dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) -+dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) - @rm -f dvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS) - --dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) -+dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) - @rm -f dvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS) - eptexdir/$(am__dirstamp): -@@ -8024,7 +8008,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) -+eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) - @rm -f eptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS) - etexdir/$(am__dirstamp): -@@ -8038,7 +8022,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di - synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) -+etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) - @rm -f etex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS) - euptexdir/$(am__dirstamp): -@@ -8052,23 +8036,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) -+euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) - @rm -f euptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS) - --gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) -+gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) - @rm -f gftodvi$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS) - --gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) -+gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) - @rm -f gftopk$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS) - --gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) -+gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) - @rm -f gftype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS) - --himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) -+himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) - @rm -f himktables$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS) - hitexdir/$(am__dirstamp): -@@ -8082,19 +8066,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d - hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \ - hitexdir/$(DEPDIR)/$(am__dirstamp) - --hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) -+hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) - @rm -f hishrink$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS) - --histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) -+histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) - @rm -f histretch$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS) - --hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) -+hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) - @rm -f hitex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS) - --initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) -+initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) - @rm -f initex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS) - luatexdir/$(am__dirstamp): -@@ -8108,7 +8092,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir - mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) -+luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) - @rm -f luahbtex$(EXEEXT) - $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS) - luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8116,7 +8100,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__ - mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) -+luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) - @rm -f luajithbtex$(EXEEXT) - $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS) - luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8124,7 +8108,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di - mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) -+luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) - @rm -f luajittex$(EXEEXT) - $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS) - luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8132,33 +8116,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst - mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) -+luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) - @rm -f luatex$(EXEEXT) - $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS) - libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) -+md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) - @rm -f md5main$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS) - --mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) -+mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) - @rm -f mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS) - --mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) -+mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) - @rm -f mf-nowin$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS) - mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) -+mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) - @rm -f mflua$(EXEEXT) - $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS) - mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) -+mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) - @rm -f mflua-nowin$(EXEEXT) - $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS) - mfluajitdir/$(am__dirstamp): -@@ -8171,38 +8155,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) -+mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) - @rm -f mfluajit$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS) - mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) -+mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) - @rm -f mfluajit-nowin$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS) - --mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) -+mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) - @rm -f mft$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS) - --mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) -+mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) - @rm -f mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS) - --odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) -+odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) - @rm -f odvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS) - --odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) -+odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) - @rm -f odvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS) - --otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) -+otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) - @rm -f otangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS) - --patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) -+patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) - @rm -f patgen$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS) - pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8210,67 +8194,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) -+pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) - @rm -f pdftex$(EXEEXT) - $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS) - pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) -+pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) - @rm -f pdftosrc$(EXEEXT) - $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS) - --pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) -+pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) - @rm -f pktogf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS) - --pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) -+pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) - @rm -f pktype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS) - --pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) -+pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) - @rm -f pltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS) - --pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) -+pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) - @rm -f pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS) - --pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) -+pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) - @rm -f pooltype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS) - ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) -+ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) - @rm -f ptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS) - synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) -+synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) - @rm -f synctex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS) - --tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) -+tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) - @rm -f tangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS) - --tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) -+tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) - @rm -f tangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS) - synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) -+tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) - @rm -f tex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS) - --tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) -+tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) - @rm -f tftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS) - --tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) -+tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) - @rm -f tie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS) - pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8278,65 +8262,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__ - pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) -+ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) - @rm -f ttf2afm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS) - --twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) -+twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) - @rm -f twill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS) - --upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) -+upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) - @rm -f upbibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS) - --updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) -+updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) - @rm -f updvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS) - --upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) -+upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) - @rm -f upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS) - --uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) -+uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) - @rm -f uppltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS) - uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) -+uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) - @rm -f uptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS) - --uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) -+uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) - @rm -f uptftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS) - --vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) -+vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) - @rm -f vftovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS) - --vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) -+vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) - @rm -f vptovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS) - --weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) -+weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) - @rm -f weave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS) - --wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) -+wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) - @rm -f wofm2opl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS) - --wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) -+wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) - @rm -f wopl2ofm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS) - --wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) -+wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) - @rm -f wovf2ovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS) - --wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) -+wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) - @rm -f wovp2ovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS) - xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \ -@@ -8344,7 +8328,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) -+xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) - @rm -f xetex$(EXEEXT) - $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS) - -@@ -19275,7 +19259,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) - fi; \ - $$success || exit 1 - --check-TESTS: -+check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) -@@ -19285,7 +19269,7 @@ check-TESTS: - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; --recheck: all -+recheck: all - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ -@@ -19546,7 +19530,7 @@ install-am: all-am - uninstall: uninstall-recursive - - install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am - - installcheck: installcheck-recursive - install-strip: -@@ -21636,7 +21620,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND) - - #EXTRA_DIST += - --#EXTRA_DIST += -+#EXTRA_DIST += - - $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND) - -@@ -21801,7 +21785,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w - $(mp_ctangle) tfmin.w - - # Creating several files: need stamp file and two rules with identical recipes --$(mp_c_h): mp-tangle -+$(mp_c_h): mp-tangle - $(mp_ctangle_sh) mp - mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh - $(mp_ctangle_sh) mp -@@ -21848,7 +21832,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) - - $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h) - --$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) -+$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) - $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND) - $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) - -@@ -22099,7 +22083,7 @@ hitables.c: himktables$(EXEEXT) - hitables.c: himktables$(EXEEXT) - ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; } - --# hitex, histretch, and hishrink all need (at least) some -+# hitex, histretch, and hishrink all need (at least) some - # of the sources generated from hiformat.w. - # - $(hitex_OBJECTS): hiformat-tangle -@@ -22166,36 +22150,36 @@ $(libff_a_OBJECTS): libunilib.a - - $(libff_a_OBJECTS): libunilib.a - --$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - - utils-hb.c: luatexdir/utils/utils.c - $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c - --luatex-api-hb.h: luatexdir/lua/luatex-api.h -+luatex-api-hb.h: luatexdir/lua/luatex-api.h - $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h - - luastuff-hb.c: luatexdir/lua/luastuff.c -- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c -+ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c - - luainit-hb.c: luatexdir/lua/luainit.c - $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c - --printing-hb.c: luatexdir/tex/printing.c -- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c -+printing-hb.c: luatexdir/tex/printing.c -+ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c - - #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND) - - $(libluaffi_a_OBJECTS): $(LUA_DEPEND) - - #liblua53ffi_sources = $(libluaffi_sources) --#EXTRA_DIST -+#EXTRA_DIST - - $(luatex_OBJECTS): libluatex.a - $(luajittex_OBJECTS): libluajittex.a + $(am__append_92) $(am__append_97) $(am__append_102) \ +@@ -4622,8 +4605,7 @@ euptex_tests = \ + # At the moment, these are the only man pages handled in the + # conglomerated web2c/Makefile[.am]. (All the others are in man/.) + # If that changes, have to set at top level and use +=. +-@HITEX_TRUE@man1_MANS = hitexdir/man/hishrink.man hitexdir/man/histretch.man \ +-@HITEX_TRUE@ hitexdir/man/hitex.man ++@HITEX_TRUE@man1_MANS = + + hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 \ + -DINIT -DSTAT -DWEB2CVERSION="\"${WEB2CVERSION}\"" diff --git a/japanese/tex-ptex/files/patch-configure b/japanese/tex-ptex/files/patch-configure index 5ff153617eff..c937c9cbe20b 100644 --- a/japanese/tex-ptex/files/patch-configure +++ b/japanese/tex-ptex/files/patch-configure @@ -1,929 +1,940 @@ ---- configure.orig 2023-04-06 16:57:57 UTC +--- configure.orig 2024-05-29 12:01:58 UTC +++ configure -@@ -27067,428 +27067,6 @@ esac +@@ -27496,434 +27496,6 @@ esac ;; esac -##tldbg _KPSE_LIB_FLAGS: Setup lua53 (-ltexlua53) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua53, libname=texlua53, options=lt tree, tlincl=-IBLD/libs/lua53/include, tllib=BLD/libs/lua53/libtexlua53.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua53/include/lua.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: lua53 (texlua53) lt tree. - LUA53_INCLUDES="-I$kpse_BLD/libs/lua53/include" - LUA53_LIBS="$kpse_BLD/libs/lua53/libtexlua53.la" - LUA53_DEPEND='${top_builddir}/../../libs/lua53/libtexlua53.la' - LUA53_RULE='# Rebuild libtexlua53 -$(LUA53_DEPEND): ${top_builddir}/../../libs/lua53/include/lua.h - cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/lua53/include/lua.h: - cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild' - -##tldbg _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua52, libname=texlua52, options=lt tree, tlincl=-IBLD/libs/lua52/include, tllib=BLD/libs/lua52/libtexlua52.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua52/include/lua.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: lua52 (texlua52) lt tree. - LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include" - LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la" - LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la' - LUA52_RULE='# Rebuild libtexlua52 -$(LUA52_DEPEND): ${top_builddir}/../../libs/lua52/include/lua.h - cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/lua52/include/lua.h: - cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild' - -echo 'tldbg:KPSE_LUAJIT_FLAGS called.' >&5 -##tldbg _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=luajit, libname=texluajit, options=lt tree, tlincl=-IBLD/libs/luajit/include, tllib=BLD/libs/luajit/libtexluajit.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/luajit/include/luajit.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: luajit (texluajit) lt tree. - LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include" - LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la" - LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la' - LUAJIT_RULE='# Rebuild libtexluajit -$(LUAJIT_DEPEND): ${top_builddir}/../../libs/luajit/include/luajit.h - cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/luajit/include/luajit.h: - cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild' -# -# checking for openbsd for additional jit libraries needed, which is the -# case for clang; no point in going to the trouble elsewhere since no -# other system needs it. -case $build_os in -openbsd*) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking on openbsd if additional jit libraries are needed" >&5 -printf %s "checking on openbsd if additional jit libraries are needed... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "stdint.h" - typedef struct _Unwind_Context _Unwind_Context; - extern uintptr_t _Unwind_GetCFA(_Unwind_Context *); -int -main (void) -{ -_Unwind_Context *ctx; - _Unwind_GetCFA(ctx); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } --else $as_nop -- +-else case e in #( +- e) - jitlibs="-lc++abi -lpthread" - save_LIBS=$LIBS - LIBS="$LIBS $jitlibs" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "stdint.h" - typedef struct _Unwind_Context _Unwind_Context; - extern uintptr_t _Unwind_GetCFA(_Unwind_Context *); -int -main (void) -{ -_Unwind_Context *ctx; - _Unwind_GetCFA(ctx); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5 -printf "%s\n" "\"$jitlibs\"" >&6; } - LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs" - --else $as_nop -- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +-else case e in #( +- e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} -as_fn_error $? "luajit could not be linked --See \`config.log' for more details" "$LINENO" 5; } -- +-See 'config.log' for more details" "$LINENO" 5; } +- ;; +-esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$save_LIBS - -- +- ;; +-esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - ;; -esac -echo 'tldbg:KPSE_LUAJIT_FLAGS done.' >&5 - -##tldbg _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpng, libname=png, options=, tlincl=-IBLD/libs/libpng/include, tllib=BLD/libs/libpng/libpng.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpng/include/png.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) . - -# Check whether --with-system-libpng was given. -if test ${with_system_libpng+y} -then : - withval=$with_system_libpng; -fi -if test "x$with_system_libpng" = xyes; then - if $PKG_CONFIG libpng; then - LIBPNG_INCLUDES=`$PKG_CONFIG libpng --cflags` - LIBPNG_LIBS=`$PKG_CONFIG libpng --libs` -elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then - as_fn_error $? "did not find libpng" "$LINENO" 5 -fi -else - LIBPNG_INCLUDES="-I$kpse_BLD/libs/libpng/include" - LIBPNG_LIBS="$kpse_BLD/libs/libpng/libpng.a" - LIBPNG_DEPEND='${top_builddir}/../../libs/libpng/libpng.a' - LIBPNG_RULE='# Rebuild libpng -$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h - cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/libpng/include/png.h: - cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - -##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) . - -# Check whether --with-system-freetype2 was given. -if test ${with_system_freetype2+y} -then : - withval=$with_system_freetype2; -fi -if test "x$with_system_freetype2" = xyes; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}freetype-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_FT2_CONFIG+y} -then : - printf %s "(cached) " >&6 --else $as_nop -- if test -n "$FT2_CONFIG"; then +-else case e in #( +- e) if test -n "$FT2_CONFIG"; then - ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - --fi +-fi ;; +-esac -fi -FT2_CONFIG=$ac_cv_prog_FT2_CONFIG -if test -n "$FT2_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5 -printf "%s\n" "$FT2_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_FT2_CONFIG"; then - ac_ct_FT2_CONFIG=$FT2_CONFIG - # Extract the first word of "freetype-config", so it can be a program name with args. -set dummy freetype-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_FT2_CONFIG+y} -then : - printf %s "(cached) " >&6 --else $as_nop -- if test -n "$ac_ct_FT2_CONFIG"; then +-else case e in #( +- e) if test -n "$ac_ct_FT2_CONFIG"; then - ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - --fi +-fi ;; +-esac -fi -ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG -if test -n "$ac_ct_FT2_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5 -printf "%s\n" "$ac_ct_FT2_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_FT2_CONFIG" = x; then - FT2_CONFIG="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - FT2_CONFIG=$ac_ct_FT2_CONFIG - fi -else - FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" -fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 --else $as_nop -- if test -n "$PKG_CONFIG"; then +-else case e in #( +- e) if test -n "$PKG_CONFIG"; then - ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - --fi +-fi ;; +-esac -fi -PKG_CONFIG=$ac_cv_prog_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -printf "%s\n" "$PKG_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_PKG_CONFIG"; then - ac_ct_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 --else $as_nop -- if test -n "$ac_ct_PKG_CONFIG"; then +-else case e in #( +- e) if test -n "$ac_ct_PKG_CONFIG"; then - ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - --fi +-fi ;; +-esac -fi -ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG -if test -n "$ac_ct_PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 -printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_PKG_CONFIG" = x; then - PKG_CONFIG="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_ct_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" -fi -if $FT2_CONFIG --ftversion >/dev/null 2>&1; then - FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` - FREETYPE2_LIBS=`$FT2_CONFIG --libs` -elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then - FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` - FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` -elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then - as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 -fi -else - FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2" - FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" - FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' - FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h - cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: - cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - -##tldbg _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pixman, libname=pixman, options=, tlincl=-IBLD/libs/pixman/include, tllib=BLD/libs/pixman/libpixman.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/pixman/include/pixman.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) . - -# Check whether --with-system-pixman was given. -if test ${with_system_pixman+y} -then : - withval=$with_system_pixman; -fi -if test "x$with_system_pixman" = xyes; then - if $PKG_CONFIG pixman-1 --atleast-version=0.18; then - PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags` - PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs` -elif test "x$need_pixman:$with_system_pixman" = xyes:yes; then - as_fn_error $? "did not find pixman-1 0.18 or better" "$LINENO" 5 -fi -else - PIXMAN_INCLUDES="-I$kpse_BLD/libs/pixman/include" - PIXMAN_LIBS="$kpse_BLD/libs/pixman/libpixman.a" - PIXMAN_DEPEND='${top_builddir}/../../libs/pixman/libpixman.a' - PIXMAN_RULE='# Rebuild libpixman -$(PIXMAN_DEPEND): ${top_builddir}/../../libs/pixman/include/pixman.h - cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/pixman/include/pixman.h: - cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - -##tldbg _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=cairo, libname=cairo, options=, tlincl=-IBLD/libs/cairo/cairo, tllib=BLD/libs/cairo/libcairo.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/cairo/cairo/cairo.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: cairo (cairo) . - -# Check whether --with-system-cairo was given. -if test ${with_system_cairo+y} -then : - withval=$with_system_cairo; -fi -if test "x$with_system_cairo" = xyes; then - if $PKG_CONFIG cairo --atleast-version=1.12; then - CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags` - CAIRO_LIBS=`$PKG_CONFIG cairo --libs` -elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then - as_fn_error $? "did not find cairo 1.12 or better" "$LINENO" 5 -fi -else - CAIRO_INCLUDES="-I$kpse_BLD/libs/cairo/cairo" - CAIRO_LIBS="$kpse_BLD/libs/cairo/libcairo.a" - CAIRO_DEPEND='${top_builddir}/../../libs/cairo/libcairo.a' - CAIRO_RULE='# Rebuild libcairo -$(CAIRO_DEPEND): ${top_builddir}/../../libs/cairo/cairo/cairo.h - cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/cairo/cairo/cairo.h: - cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - ##tldbg _KPSE_LIB_FLAGS: Setup potrace (-lpotrace) flags. echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=potrace, libname=potrace, options=, tlincl=-IBLD/libs/potrace/include, tllib=BLD/libs/potrace/libpotrace.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/potrace/include/potrace.h.' >&5 ##tldbg _KPSE_LIB_FLAGS_TL: potrace (potrace) . -@@ -27530,491 +27108,6 @@ fi +@@ -27965,88 +27537,6 @@ fi cd ${top_builddir}/../../libs/potrace && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi -##tldbg _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=gmp, libname=gmp, options=, tlincl=-IBLD/libs/gmp/include, tllib=BLD/libs/gmp/libgmp.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/gmp/include/gmp.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: gmp (gmp) . - -# Check whether --with-system-gmp was given. -if test ${with_system_gmp+y} -then : - withval=$with_system_gmp; -fi - -# Check whether --with-gmp-includes was given. -if test ${with_gmp_includes+y} -then : - withval=$with_gmp_includes; -fi - -# Check whether --with-gmp-libdir was given. -if test ${with_gmp_libdir+y} -then : - withval=$with_gmp_libdir; -fi -if test "x$with_system_gmp" = xyes; then - ##tldbg _KPSE_LIB_FLAGS_SYSTEM: gmp (gmp). -if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then - GMP_INCLUDES="-I$with_gmp_includes" -fi -GMP_LIBS="-lgmp" -if test "x$with_gmp_libdir" != x && test "x$with_gmp_libdir" != xyes; then - GMP_LIBS="-L$with_gmp_libdir $GMP_LIBS" -fi -else - GMP_INCLUDES="-I$kpse_BLD/libs/gmp/include" - GMP_LIBS="$kpse_BLD/libs/gmp/libgmp.a" - GMP_DEPEND='${top_builddir}/../../libs/gmp/libgmp.a' - GMP_RULE='# Rebuild libgmp -$(GMP_DEPEND): ${top_builddir}/../../libs/gmp/include/gmp.h - cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/gmp/include/gmp.h: - cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - -##tldbg _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=mpfr, libname=mpfr, options=, tlincl=-IBLD/libs/mpfr/include, tllib=BLD/libs/mpfr/libmpfr.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/mpfr/include/mpfr.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: mpfr (mpfr) . - -# Check whether --with-system-mpfr was given. -if test ${with_system_mpfr+y} -then : - withval=$with_system_mpfr; -fi - -# Check whether --with-mpfr-includes was given. -if test ${with_mpfr_includes+y} -then : - withval=$with_mpfr_includes; -fi - -# Check whether --with-mpfr-libdir was given. -if test ${with_mpfr_libdir+y} -then : - withval=$with_mpfr_libdir; -fi -if test "x$with_system_mpfr" = xyes; then - ##tldbg _KPSE_LIB_FLAGS_SYSTEM: mpfr (mpfr). -if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then - MPFR_INCLUDES="-I$with_mpfr_includes" -fi -MPFR_LIBS="-lmpfr" -if test "x$with_mpfr_libdir" != x && test "x$with_mpfr_libdir" != xyes; then - MPFR_LIBS="-L$with_mpfr_libdir $MPFR_LIBS" -fi -else - MPFR_INCLUDES="-I$kpse_BLD/libs/mpfr/include" - MPFR_LIBS="$kpse_BLD/libs/mpfr/libmpfr.a" - MPFR_DEPEND='${top_builddir}/../../libs/mpfr/libmpfr.a' - MPFR_RULE='# Rebuild libmpfr -$(MPFR_DEPEND): ${top_builddir}/../../libs/mpfr/include/mpfr.h - cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/mpfr/include/mpfr.h: - cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi +- + ##tldbg _KPSE_LIB_FLAGS: Setup mpfi (-lmpfi) flags. + echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=mpfi, libname=mpfi, options=, tlincl=-IBLD/libs/mpfi/include, tllib=BLD/libs/mpfi/libmpfi.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/mpfi/include/mpfi.h.' >&5 + ##tldbg _KPSE_LIB_FLAGS_TL: mpfi (mpfi) . +@@ -28087,413 +27577,6 @@ fi + ${top_builddir}/../../libs/mpfi/include/mpfi.h: + cd ${top_builddir}/../../libs/mpfi && $(MAKE) $(AM_MAKEFLAGS) rebuild' + fi - -##tldbg _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=xpdf, libname=xpdf, options=, tlincl=-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf, tllib=BLD/libs/xpdf/libxpdf.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/xpdf/xpdf/Stream.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: xpdf (xpdf) . -: "kpse_xpdf_options - no-op" -if test "x$with_system_xpdf" = xyes; then - : "kpse_xpdf_system_flags - no-op" -else - XPDF_INCLUDES="-DPDF_PARSER_ONLY -I$kpse_BLD/libs/xpdf -I$kpse_BLD/libs/xpdf/goo -I$kpse_BLD/libs/xpdf/xpdf" - XPDF_LIBS="$kpse_BLD/libs/xpdf/libxpdf.a" - XPDF_DEPEND='${top_builddir}/../../libs/xpdf/libxpdf.a' - XPDF_RULE='# Rebuild libxpdf -$(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h - cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/xpdf/xpdf/Stream.h: - cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi -test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32" - -##tldbg _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zziplib, libname=zzip, options=, tlincl=-IBLD/libs/zziplib/include, tllib=BLD/libs/zziplib/libzzip.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zziplib/include/zzip/zzip.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: zziplib (zzip) . - -# Check whether --with-system-zziplib was given. -if test ${with_system_zziplib+y} -then : - withval=$with_system_zziplib; -fi -if test "x$with_system_zziplib" = xyes; then - if $PKG_CONFIG zziplib --atleast-version=0.12; then - ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags` - ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs` -elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then - as_fn_error $? "did not find zziplib 0.12 or better" "$LINENO" 5 -fi -else - ZZIPLIB_INCLUDES="-I$kpse_BLD/libs/zziplib/include" - ZZIPLIB_LIBS="$kpse_BLD/libs/zziplib/libzzip.a" - ZZIPLIB_DEPEND='${top_builddir}/../../libs/zziplib/libzzip.a' - ZZIPLIB_RULE='# Rebuild libzzip -$(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h - cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zziplib/include/zzip/zzip.h: - cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - -##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) . - -# Check whether --with-system-teckit was given. -if test ${with_system_teckit+y} -then : - withval=$with_system_teckit; -fi -if test "x$with_system_teckit" = xyes; then - 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 -fi -else - TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include" - TECKIT_LIBS="$kpse_BLD/libs/teckit/libTECkit.a" - TECKIT_DEPEND='${top_builddir}/../../libs/teckit/libTECkit.a' - TECKIT_RULE='# Rebuild libTECkit -$(TECKIT_DEPEND): ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h - cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h: - cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - - -# LuaTeX and XeTeX need harfbuzz. -if test "x$enable_xetex" = xyes \ - || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then - ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) . - -# Check whether --with-system-graphite2 was given. -if test ${with_system_graphite2+y} -then : - withval=$with_system_graphite2; -fi -if test "x$with_system_graphite2" = xyes; then - if $PKG_CONFIG graphite2; then - GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags` - GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs` -elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then - as_fn_error $? "did not find graphite2" "$LINENO" 5 -fi -else - GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC" - GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a" - GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a' - GRAPHITE2_RULE='# Rebuild libgraphite2 -$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h - cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/graphite2/include/graphite2/Font.h: - cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - -##tldbg _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=harfbuzz, libname=harfbuzz, options=, tlincl=-IBLD/libs/harfbuzz/include, tllib=BLD/libs/harfbuzz/libharfbuzz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/harfbuzz/include/hb.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (harfbuzz) . - -# Check whether --with-system-harfbuzz was given. -if test ${with_system_harfbuzz+y} -then : - withval=$with_system_harfbuzz; -fi -if test "x$with_system_harfbuzz" = xyes; then - if $PKG_CONFIG harfbuzz; then - HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags` - HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs` -elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then - as_fn_error $? "did not find harfbuzz" "$LINENO" 5 -fi -else - HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include" - HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a" - HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a' - HARFBUZZ_RULE='# Rebuild libharfbuzz -$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h - cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/harfbuzz/include/hb.h: - cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - -fi # end xetex/luatex for harfbuzz - -# XeTeX, but not LuaTeX, needs icu and graphite. -if test "x$enable_xetex" = xyes; then - echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=, icu-config-args=.' >&5 -##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib= BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) . - -# Check whether --with-system-icu was given. -if test ${with_system_icu+y} -then : - withval=$with_system_icu; -fi -if test "x$with_system_icu" = xyes; then - echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5 -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}icu-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ICU_CONFIG+y} -then : - printf %s "(cached) " >&6 --else $as_nop -- if test -n "$ICU_CONFIG"; then +-else case e in #( +- e) if test -n "$ICU_CONFIG"; then - ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ICU_CONFIG="${ac_tool_prefix}icu-config" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - --fi +-fi ;; +-esac -fi -ICU_CONFIG=$ac_cv_prog_ICU_CONFIG -if test -n "$ICU_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5 -printf "%s\n" "$ICU_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_ICU_CONFIG"; then - ac_ct_ICU_CONFIG=$ICU_CONFIG - # Extract the first word of "icu-config", so it can be a program name with args. -set dummy icu-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_ICU_CONFIG+y} -then : - printf %s "(cached) " >&6 --else $as_nop -- if test -n "$ac_ct_ICU_CONFIG"; then +-else case e in #( +- e) if test -n "$ac_ct_ICU_CONFIG"; then - ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_ICU_CONFIG="icu-config" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - --fi +-fi ;; +-esac -fi -ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG -if test -n "$ac_ct_ICU_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5 -printf "%s\n" "$ac_ct_ICU_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_ICU_CONFIG" = x; then - ICU_CONFIG="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - ICU_CONFIG=$ac_ct_ICU_CONFIG - fi -else - ICU_CONFIG="$ac_cv_prog_ICU_CONFIG" -fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 --else $as_nop -- if test -n "$PKG_CONFIG"; then +-else case e in #( +- e) if test -n "$PKG_CONFIG"; then - ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - --fi +-fi ;; +-esac -fi -PKG_CONFIG=$ac_cv_prog_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -printf "%s\n" "$PKG_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_PKG_CONFIG"; then - ac_ct_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 --else $as_nop -- if test -n "$ac_ct_PKG_CONFIG"; then +-else case e in #( +- e) if test -n "$ac_ct_PKG_CONFIG"; then - ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - --fi +-fi ;; +-esac -fi -ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG -if test -n "$ac_ct_PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 -printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_PKG_CONFIG" = x; then - PKG_CONFIG="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_ct_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" -fi -if $ICU_CONFIG --version >/dev/null 2>&1; then - ICU_INCLUDES=`$ICU_CONFIG --cppflags` - ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system` -elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then - ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io` - ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io` -elif test "x$need_icu:$with_system_icu" = xyes:yes; then - as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5 -fi -else - ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include" - ICU_LIBS=" $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a" - ICU_DEPEND=' ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a' - ICU_RULE='# Rebuild libicuxxx -$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h - cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/icu/include/unicode/uversion.h: - cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi -# checking for openbsd to add -lpthread for icu. -case $build_os in -openbsd*) - eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\" - ;; -esac - - ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) . - -# Check whether --with-system-graphite2 was given. -if test ${with_system_graphite2+y} -then : - withval=$with_system_graphite2; -fi -if test "x$with_system_graphite2" = xyes; then - if $PKG_CONFIG graphite2; then - GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags` - GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs` -elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then - as_fn_error $? "did not find graphite2" "$LINENO" 5 -fi -else - GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC" - GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a" - GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a' - GRAPHITE2_RULE='# Rebuild libgraphite2 -$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h - cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/graphite2/include/graphite2/Font.h: - cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - -fi # end xetex for icu/graphite -- + # Check size of off_t (using ) eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" - eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" -@@ -31534,5 +30627,3 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 - printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi -- -- diff --git a/print/tex-basic-engines/Makefile b/print/tex-basic-engines/Makefile index 408d9d46f523..094fe4b1f620 100644 --- a/print/tex-basic-engines/Makefile +++ b/print/tex-basic-engines/Makefile @@ -1,61 +1,60 @@ PORTNAME= basic-engines -PORTVERSION= ${TEXLIVE_VERSION} -PORTREVISION= 1 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR} PKGNAMEPREFIX= tex- DISTNAME= texlive-${PORTVERSION}-source DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= Basic TeX Engines WWW= https://tug.org/texlive/ LIB_DEPENDS= libpng.so:graphics/png USES= libtool localbase pkgconfig tar:xz tex USE_TEX= kpathsea web2c GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= ${EXCLUDE_ENGINES:S/^/--disable-/} \ --disable-missing \ --with-system-kpathsea \ --with-system-zlib \ --with-x=no \ --without-mf-x-toolkit .for L in libpng CONFIGURE_ARGS+= --with-$L-include=${LOCALBASE}/include \ --with-$L-libdir=${LOCALBASE}/lib \ --with-system-$L .endfor INSTALL_TARGET= install-strip EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux libs/xpdf texk/web2c WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c EXCLUDE_ENGINES= aleph luatex luajittex mf mf-nowin ptex eptex uptex \ euptex xetex otangle mp pmp upmp web2c web-progs \ synctex hitex \ luahbtex \ luajithbtex \ mflua \ mfluajit \ latex post-extract: @${FIND} ${WRKSRC} -name '*.orig' -delete post-configure: cd ${WRKDIR}/${DISTNAME}/libs/xpdf && \ ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ LIBS="${LIBS}" \ ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \ ${CONFIGURE_ARGS} .include diff --git a/print/tex-basic-engines/distinfo b/print/tex-basic-engines/distinfo index 6847675b4134..10ad481af928 100644 --- a/print/tex-basic-engines/distinfo +++ b/print/tex-basic-engines/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680574061 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 +TIMESTAMP = 1715600831 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 diff --git a/print/tex-basic-engines/files/patch-Makefile.in b/print/tex-basic-engines/files/patch-Makefile.in index 07afcca8731c..03363b0e01d8 100644 --- a/print/tex-basic-engines/files/patch-Makefile.in +++ b/print/tex-basic-engines/files/patch-Makefile.in @@ -1,1329 +1,40 @@ ---- Makefile.in.orig 2023-03-08 17:05:16 UTC +--- Makefile.in.orig 2024-02-28 04:19:31 UTC +++ Makefile.in -@@ -101,9 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE +@@ -102,9 +102,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \ md5main$(EXEEXT) -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \ - ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \ - ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \ +bin_PROGRAMS = $(am__EXEEXT_4) \ $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \ $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \ -@@ -488,7 +486,7 @@ am__v_AR_0 = @echo " AR " $@; - AM_V_AR = $(am__v_AR_@AM_V@) - am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) - am__v_AR_0 = @echo " AR " $@; --am__v_AR_1 = -+am__v_AR_1 = - libff_a_AR = $(AR) $(ARFLAGS) - libff_a_LIBADD = - am__dirstamp = $(am__leading_dot)dirstamp -@@ -1234,7 +1232,7 @@ am__v_lt_0 = --silent - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent --am__v_lt_1 = -+am__v_lt_1 = - libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@ -@@ -1699,11 +1697,11 @@ am__v_GEN_0 = @echo " GEN " $@; - AM_V_GEN = $(am__v_GEN_@AM_V@) - am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) - am__v_GEN_0 = @echo " GEN " $@; --am__v_GEN_1 = -+am__v_GEN_1 = - AM_V_at = $(am__v_at_@AM_V@) - am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) - am__v_at_0 = @ --am__v_at_1 = -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c - depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp - am__maybe_remake_depfiles = depfiles -@@ -2395,7 +2393,7 @@ am__v_CC_0 = @echo " CC " $@; - AM_V_CC = $(am__v_CC_@AM_V@) - am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) - am__v_CC_0 = @echo " CC " $@; --am__v_CC_1 = -+am__v_CC_1 = - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -2403,7 +2401,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; - AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; --am__v_CCLD_1 = -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -@@ -2413,14 +2411,14 @@ am__v_CXX_0 = @echo " CXX " $@; - AM_V_CXX = $(am__v_CXX_@AM_V@) - am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) - am__v_CXX_0 = @echo " CXX " $@; --am__v_CXX_1 = -+am__v_CXX_1 = - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) - am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) - am__v_CXXLD_0 = @echo " CXXLD " $@; --am__v_CXXLD_1 = -+am__v_CXXLD_1 = - OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) - LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ -@@ -2430,7 +2428,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@; - AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@) - am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@) - am__v_OBJCXX_0 = @echo " OBJCXX " $@; --am__v_OBJCXX_1 = -+am__v_OBJCXX_1 = - OBJCXXLD = $(OBJCXX) - OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \ -@@ -2438,7 +2436,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; - AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@) - am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@) - am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; --am__v_OBJCXXLD_1 = -+am__v_OBJCXXLD_1 = - SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ - $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \ - $(nodist_libluahbtexspecific_a_SOURCES) \ -@@ -3105,14 +3103,14 @@ version = $(WEB2CVERSION) +@@ -3124,7 +3122,7 @@ version = $(WEB2CVERSION) AM_CXXFLAGS = ## $(WARNING_CXXFLAGS) AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS) version = $(WEB2CVERSION) -SUBDIRS = doc lib man web2c . window omegafonts otps +SUBDIRS = lib man web2c . proglib = lib/lib.a #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a - - #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a - --#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a -+#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a - EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \ -@@ -3127,8 +3125,8 @@ lib_LTLIBRARIES = $(am__append_125) +@@ -3146,7 +3144,7 @@ lib_LTLIBRARIES = $(am__append_127) EXTRA_LTLIBRARIES = libsynctex.la - lib_LIBRARIES = $(am__append_126) - lib_LTLIBRARIES = $(am__append_125) + lib_LIBRARIES = $(am__append_128) + lib_LTLIBRARIES = $(am__append_127) -dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 --nodist_man_MANS = +dist_man_MANS = -+nodist_man_MANS = + nodist_man_MANS = TEST_EXTENSIONS = .pl .test # - # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for -@@ -3634,8 +3632,6 @@ bin_links = $(am__append_5) $(am__append_14) $(am__app +@@ -3655,8 +3653,6 @@ bin_links = $(am__append_5) $(am__append_14) $(am__app bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \ $(am__append_24) $(am__append_33) $(am__append_41) \ $(am__append_49) $(am__append_54) $(am__append_67) \ - upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \ - uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \ - $(am__append_78) $(am__append_92) $(am__append_97) \ - $(am__append_102) $(am__append_107) - install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \ -@@ -3711,19 +3707,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si - tangle_silent = $(tangle_silent_@AM_V@) - tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@) - tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ # --tangle_silent_1 = -+tangle_silent_1 = - # - ctangle = $(buildenv) $(CTANGLE) - ctangle_silent = $(ctangle_silent_@AM_V@) - ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@) - ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ # --ctangle_silent_1 = -+ctangle_silent_1 = - # - tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE) - tie_silent = $(tie_silent_@AM_V@) - tie_silent_ = $(tie_silent_@AM_DEFAULT_V@) - tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ # --tie_silent_1 = -+tie_silent_1 = - tie_c = $(tie) -c $@ - tie_m = $(tie) -m $@ - -@@ -3732,7 +3728,7 @@ DIFF = diff - - # For trip, trap, and other tests - DIFF = diff --DIFFFLAGS = -+DIFFFLAGS = - AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \ - DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \ - DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \ -@@ -3740,29 +3736,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor - - # To run, e.g., just the original trip test, in the build directory: - # make -C $ww TRIPTRAP=trip.diffs triptrap --# where $ww is the web2c build directory. --# -+# where $ww is the web2c build directory. -+# - # This will run the triptrap-sh script - # which then runs make TEST=triptest.test check-am, - # which then runs the (srcdir file) triptest.test script; - # its output will be in (builddir file) trip.diffs, --# and triptest.out if the test failed, -+# and triptest.out if the test failed, - # plus various created files in the tripdir/ subdirectory. - # The triptest.diffs file will have the actual abs_srcdir value replaced - # with the constant string "SRCDIR" to minimize differences, and "../" - # replaced with "./" to match the canonical output. Confusing. For the - # real output, see triptest.log. --# -+# - # To build only tex, make -C $ww tex (i.e., in builddir) should do it. - # Unfortunately the check-am target depends on all-am, so all engines - # are built before any tests are run. If this is a problem, just have to - # edit the generated Makefile in builddir to remove the dependency. --# -+# - # Other per-engine invocations (see triptrap-sh for complete list): - # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap --# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap --# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap --# -+# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap -+# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap -+# - triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh - - # The environment for making dumps. -@@ -3773,7 +3769,7 @@ cp_silent_0 = @echo " COPY " $@; - cp_silent = $(cp_silent_@AM_V@) - cp_silent_ = $(cp_silent_@AM_DEFAULT_V@) - cp_silent_0 = @echo " COPY " $@; --cp_silent_1 = -+cp_silent_1 = - nodist_tangle_SOURCES = tangle.c tangle.h - nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h - tangleboot_DEPENDENCIES = $(default_dependencies) -@@ -3820,7 +3816,7 @@ nodist_initex_SOURCES = callexe.c - tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C - initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" - nodist_initex_SOURCES = callexe.c --initex_LDADD = -+initex_LDADD = - tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130) - - # With --enable-ipc, TeX may need to link with -lsocket. -@@ -3848,7 +3844,7 @@ nodist_call_mf_SOURCES = callexe.c - tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test - call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\" - nodist_call_mf_SOURCES = callexe.c --call_mf_LDADD = -+call_mf_LDADD = - dist_mf_SOURCES = mfextra.c - mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) - mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) -@@ -3880,7 +3876,7 @@ nodist_call_mflua_SOURCES = callexe.c - mf_tests = mftraptest.test - call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\" - nodist_call_mflua_SOURCES = callexe.c --call_mflua_LDADD = -+call_mflua_LDADD = - dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h - mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES) - mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS) -@@ -3912,7 +3908,7 @@ libmfluaotfcc_a_CPPFLAGS = \ - -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \ - -I$(top_srcdir)/mfluadir/otfcc/include \ - -I$(top_srcdir)/mfluadir/otfcc/include/dep \ -- -I$(top_srcdir)/mfluadir/otfcc/lib -+ -I$(top_srcdir)/mfluadir/otfcc/lib - - libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS) - -@@ -4174,7 +4170,7 @@ libmfluaotfcc_a_SOURCES = \ - mfluadir/otfcc/lib/table/VDMX.h \ - mfluadir/otfcc/lib/table/SVG.c \ - mfluadir/otfcc/lib/table/head.h \ -- mfluadir/otfcc/lib/table/TSI5.c -+ mfluadir/otfcc/lib/table/TSI5.c - - libmfluapotrace_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/potrace \ -@@ -4185,7 +4181,7 @@ libmfluapotrace_a_SOURCES = \ - #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources) - libmfluapotrace_a_SOURCES = \ - mfluadir/potrace/luafunc.c \ -- mfluadir/potrace/luafunc.h -+ mfluadir/potrace/luafunc.h - - libmflualpeg_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/luapeg \ -@@ -4194,11 +4190,11 @@ libmflualpeg_a_SOURCES = \ - libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmflualpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\" - nodist_call_mfluajit_SOURCES = callexe.c --call_mfluajit_LDADD = -+call_mfluajit_LDADD = - dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h - mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES) - mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS) -@@ -4234,7 +4230,7 @@ libmfluajitlpeg_a_SOURCES = \ - libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmfluajitlpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir - mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ -@@ -4242,7 +4238,7 @@ nodist_call_mpost_SOURCES = callexe.c - - call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" - nodist_call_mpost_SOURCES = callexe.c --call_mpost_LDADD = -+call_mpost_LDADD = - - # Creating one file: just one rule - mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) -@@ -4254,10 +4250,10 @@ nodist_call_pmpost_SOURCES = callexe.c - mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test - call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\" - nodist_call_pmpost_SOURCES = callexe.c --call_pmpost_LDADD = -+call_pmpost_LDADD = - call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\" - nodist_call_upmpost_SOURCES = callexe.c --call_upmpost_LDADD = -+call_upmpost_LDADD = - pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - -@@ -4311,7 +4307,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - - nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \ -- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) -+ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) - - nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h) - nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h) -@@ -4605,7 +4601,7 @@ hiformat_c_h_l_y = \ - hiskip.c \ - histretch.c - --hitex_c = hitex.c -+hitex_c = hitex.c - - # hitex - nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c) -@@ -4758,11 +4754,11 @@ libluasocket_sources = \ - luatexdir/luasocket/src/timeout.h \ - luatexdir/luasocket/src/udp.c \ - luatexdir/luasocket/src/udp.h \ -- luatexdir/luasocket/src/usocket.h -+ luatexdir/luasocket/src/usocket.h - --libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a --#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a --libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a -+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a -+#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a -+libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a - libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES) - #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES) - libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \ -@@ -4892,8 +4888,8 @@ LUA_DEPEND = $(LUA53_DEPEND) - LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES) - LUA_LIBS = $(LUA53_LIBS) - LUA_DEPEND = $(LUA53_DEPEND) --libluatex_a_DEPENDENCIES = libff.a libluamisc.a --libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a -+libluatex_a_DEPENDENCIES = libff.a libluamisc.a -+libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a - libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ - $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \ - -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \ -@@ -4914,7 +4910,7 @@ dist_libluatex_a_SOURCES = \ - dist_libluatex_a_SOURCES = \ - luatexdir/lua/lstrlibext.c \ - luatexdir/lua/helpers.c \ -- luatexdir/lua/texluac.c -+ luatexdir/lua/texluac.c - - nodist_libluatex_a_SOURCES = \ - $(dist_libluatex_sources) \ -@@ -4932,7 +4928,7 @@ nodist_libluatexspecific_a_SOURCES = \ - - #dist_libluatexspecific_a_SOURCES = - nodist_libluatexspecific_a_SOURCES = \ -- $(dist_libluatexspecific_sources) -+ $(dist_libluatexspecific_sources) - - #dist_libluajittexspecific_a_SOURCES = - nodist_libluajittexspecific_a_SOURCES = \ -@@ -4940,46 +4936,46 @@ nodist_libluahbtexspecific_a_SOURCES = \ - - #dist_libluahbtexspecific_a_SOURCES = - nodist_libluahbtexspecific_a_SOURCES = \ -- $(dist_libluahbtexspecific_sources) -+ $(dist_libluahbtexspecific_sources) - --#dist_libluajithbtexspecific_a_SOURCES = -+#dist_libluajithbtexspecific_a_SOURCES = - nodist_libluajithbtexspecific_a_SOURCES = \ -- $(dist_libluajithbtexspecific_sources) -+ $(dist_libluajithbtexspecific_sources) - - dist_libluatexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - dist_libluajittexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - --# luatexdir/utils/utils-hb.c -+# luatexdir/utils/utils-hb.c - dist_libluahbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - - --#luatexdir/utils/utils-hb.c -+#luatexdir/utils/utils-hb.c - dist_libluajithbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - --libluatex_web = --nodist_libluatex_sources = -+libluatex_web = -+nodist_libluatex_sources = - - # dist_libluatex_sources += \ - # luatexdir/tex/align.h \ -@@ -5047,7 +5043,7 @@ nodist_libluatex_sources = - # luatexdir/tex/texmath.c \ - # luatexdir/tex/texnodes.c \ - # luatexdir/tex/textcodes.c \ --# luatexdir/tex/textoken.c -+# luatexdir/tex/textoken.c - dist_libluatex_sources = luatexdir/luatexcallbackids.h \ - luatexdir/luatex.h luatexdir/luatex-common.h \ - luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \ -@@ -5180,7 +5176,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src - # luatexdir/lua/luanode.c \ - # luatexdir/lua/luastuff.c \ - # luatexdir/lua/luatoken.c \ --# luatexdir/lua/mplibstuff.c -+# luatexdir/lua/mplibstuff.c - luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) - - ################################################################################ -@@ -5297,16 +5293,16 @@ nodist_call_luatex_SOURCES = callexe.c - - call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" - nodist_call_luatex_SOURCES = callexe.c --call_luatex_LDADD = -+call_luatex_LDADD = - call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\" - nodist_call_luahbtex_SOURCES = callexe.c --call_luahbtex_LDADD = -+call_luahbtex_LDADD = - call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\" - nodist_call_luajittex_SOURCES = callexe.c --call_luajittex_LDADD = -+call_luajittex_LDADD = - call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\" - nodist_call_luajithbtex_SOURCES = callexe.c --call_luajithbtex_LDADD = -+call_luajithbtex_LDADD = - - # LuaTeX/LuaJITTeX Tests - # -@@ -5646,7 +5642,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf - w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status - @rm -f w2c/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h --$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f w2c/stamp-h1 - touch $@ -@@ -5934,7 +5930,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys. - luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \ - luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp) - --libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) -+libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) - $(AM_V_at)-rm -f libff.a - $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD) - $(AM_V_at)$(RANLIB) libff.a -@@ -5949,7 +5945,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_ - ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) -+libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libkanji.a - $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libkanji.a -@@ -5972,7 +5968,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \ - luatexdir/luaffi/$(am__dirstamp) \ - luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp) - --libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) -+libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaffi.a - $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaffi.a -@@ -6025,12 +6021,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) -+libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaharfbuzz.a - $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaharfbuzz.a - --libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) -+libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluahbtexspecific.a - $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluahbtexspecific.a -@@ -6077,12 +6073,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) -+libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitharfbuzz.a - $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitharfbuzz.a - --libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) -+libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajithbtexspecific.a - $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajithbtexspecific.a -@@ -6147,7 +6143,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) -+libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitmisc.a - $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitmisc.a -@@ -6206,7 +6202,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) -+libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitsocket.a - $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitsocket.a -@@ -6613,7 +6609,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) -+libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittex.a - $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittex.a -@@ -6630,7 +6626,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) -+libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittexspecific.a - $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittexspecific.a -@@ -6659,7 +6655,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT): - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) -+libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluamisc.a - $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluamisc.a -@@ -6712,7 +6708,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT): - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) -+libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluasocket.a - $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluasocket.a -@@ -7058,7 +7054,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$ - synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) -+libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatex.a - $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatex.a -@@ -7075,7 +7071,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT): - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) -+libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatexspecific.a - $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatexspecific.a -@@ -7088,12 +7084,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) -+libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmd5.a - $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD) - $(AM_V_at)$(RANLIB) libmd5.a - --libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) -+libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmf.a - $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD) - $(AM_V_at)$(RANLIB) libmf.a -@@ -7109,7 +7105,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d - mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) -+libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflua.a - $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflua.a -@@ -7119,7 +7115,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am - mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) -+libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajit.a - $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajit.a -@@ -7133,7 +7129,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) -+libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajitlpeg.a - $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajitlpeg.a -@@ -7141,7 +7137,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) -+libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflualpeg.a - $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflualpeg.a -@@ -7662,7 +7658,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT - mfluadir/otfcc/lib/table/$(am__dirstamp) \ - mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp) - --libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) -+libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluaotfcc.a - $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluaotfcc.a -@@ -7676,22 +7672,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT): - mfluadir/potrace/$(am__dirstamp) \ - mfluadir/potrace/$(DEPDIR)/$(am__dirstamp) - --libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) -+libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluapotrace.a - $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluapotrace.a - --libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) -+libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibbackends.a - $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibbackends.a - --libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) -+libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibcore.a - $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibcore.a - --libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) -+libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibextramath.a - $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibextramath.a -@@ -7708,7 +7704,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$( - mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) -+libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmputil.a - $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD) - $(AM_V_at)$(RANLIB) libmputil.a -@@ -7779,7 +7775,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \ - pdftexdir/regex/$(am__dirstamp) \ - pdftexdir/regex/$(DEPDIR)/$(am__dirstamp) - --libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) -+libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libpdftex.a - $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD) - $(AM_V_at)$(RANLIB) libpdftex.a -@@ -7790,7 +7786,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT) - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) -+libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libsynctex.a - $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD) - $(AM_V_at)$(RANLIB) libsynctex.a -@@ -7805,7 +7801,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$( - uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) -+libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libukanji.a - $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libukanji.a -@@ -7846,7 +7842,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \ - luatexdir/unilib/$(am__dirstamp) \ - luatexdir/unilib/$(DEPDIR)/$(am__dirstamp) - --libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) -+libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) - $(AM_V_at)-rm -f libunilib.a - $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD) - $(AM_V_at)$(RANLIB) libunilib.a -@@ -7904,7 +7900,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp) - --libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) -+libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libxetex.a - $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD) - $(AM_V_at)$(RANLIB) libxetex.a -@@ -7915,7 +7911,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) -+libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS) - alephdir/$(am__dirstamp): - @$(MKDIR_P) alephdir -@@ -7930,87 +7926,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di - alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \ - alephdir/$(DEPDIR)/$(am__dirstamp) - --aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) -+aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) - @rm -f aleph$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS) - --bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) -+bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) - @rm -f bibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS) - --call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) -+call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) - @rm -f call_luahbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS) - --call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) -+call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) - @rm -f call_luajithbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS) - --call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) -+call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) - @rm -f call_luajittex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS) - --call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) -+call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) - @rm -f call_luatex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS) - --call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) -+call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) - @rm -f call_mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS) - --call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) -+call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) - @rm -f call_mflua$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS) - --call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) -+call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) - @rm -f call_mfluajit$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS) - --call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) -+call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) - @rm -f call_mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS) - --call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) -+call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) - @rm -f call_pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS) - --call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) -+call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) - @rm -f call_upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS) - --ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) -+ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) - @rm -f ctangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS) - --ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) -+ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) - @rm -f ctangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS) - --ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) -+ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) - @rm -f ctie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS) - --ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) -+ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) - @rm -f ctwill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS) - --ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) -+ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) - @rm -f ctwill-refsort$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS) - --ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) -+ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) - @rm -f ctwill-twinx$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS) - --cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) -+cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) - @rm -f cweave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS) - --dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) -+dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) - @rm -f dvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS) - --dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) -+dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) - @rm -f dvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS) - eptexdir/$(am__dirstamp): -@@ -8024,7 +8020,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) -+eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) - @rm -f eptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS) - etexdir/$(am__dirstamp): -@@ -8038,7 +8034,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di - synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) -+etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) - @rm -f etex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS) - euptexdir/$(am__dirstamp): -@@ -8052,23 +8048,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) -+euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) - @rm -f euptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS) - --gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) -+gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) - @rm -f gftodvi$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS) - --gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) -+gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) - @rm -f gftopk$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS) - --gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) -+gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) - @rm -f gftype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS) - --himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) -+himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) - @rm -f himktables$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS) - hitexdir/$(am__dirstamp): -@@ -8082,19 +8078,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d - hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \ - hitexdir/$(DEPDIR)/$(am__dirstamp) - --hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) -+hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) - @rm -f hishrink$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS) - --histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) -+histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) - @rm -f histretch$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS) - --hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) -+hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) - @rm -f hitex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS) - --initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) -+initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) - @rm -f initex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS) - luatexdir/$(am__dirstamp): -@@ -8108,7 +8104,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir - mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) -+luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) - @rm -f luahbtex$(EXEEXT) - $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS) - luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8116,7 +8112,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__ - mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) -+luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) - @rm -f luajithbtex$(EXEEXT) - $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS) - luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8124,7 +8120,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di - mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) -+luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) - @rm -f luajittex$(EXEEXT) - $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS) - luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8132,33 +8128,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst - mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) -+luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) - @rm -f luatex$(EXEEXT) - $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS) - libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) -+md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) - @rm -f md5main$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS) - --mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) -+mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) - @rm -f mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS) - --mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) -+mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) - @rm -f mf-nowin$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS) - mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) -+mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) - @rm -f mflua$(EXEEXT) - $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS) - mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) -+mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) - @rm -f mflua-nowin$(EXEEXT) - $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS) - mfluajitdir/$(am__dirstamp): -@@ -8171,38 +8167,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) -+mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) - @rm -f mfluajit$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS) - mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) -+mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) - @rm -f mfluajit-nowin$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS) - --mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) -+mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) - @rm -f mft$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS) - --mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) -+mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) - @rm -f mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS) - --odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) -+odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) - @rm -f odvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS) - --odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) -+odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) - @rm -f odvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS) - --otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) -+otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) - @rm -f otangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS) - --patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) -+patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) - @rm -f patgen$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS) - pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8210,67 +8206,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) -+pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) - @rm -f pdftex$(EXEEXT) - $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS) - pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) -+pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) - @rm -f pdftosrc$(EXEEXT) - $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS) - --pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) -+pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) - @rm -f pktogf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS) - --pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) -+pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) - @rm -f pktype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS) - --pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) -+pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) - @rm -f pltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS) - --pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) -+pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) - @rm -f pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS) - --pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) -+pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) - @rm -f pooltype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS) - ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) -+ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) - @rm -f ptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS) - synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) -+synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) - @rm -f synctex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS) - --tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) -+tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) - @rm -f tangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS) - --tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) -+tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) - @rm -f tangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS) - synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) -+tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) - @rm -f tex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS) - --tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) -+tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) - @rm -f tftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS) - --tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) -+tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) - @rm -f tie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS) - pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8278,65 +8274,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__ - pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) -+ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) - @rm -f ttf2afm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS) - --twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) -+twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) - @rm -f twill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS) - --upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) -+upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) - @rm -f upbibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS) - --updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) -+updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) - @rm -f updvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS) - --upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) -+upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) - @rm -f upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS) - --uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) -+uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) - @rm -f uppltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS) - uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) -+uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) - @rm -f uptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS) - --uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) -+uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) - @rm -f uptftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS) - --vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) -+vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) - @rm -f vftovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS) - --vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) -+vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) - @rm -f vptovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS) - --weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) -+weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) - @rm -f weave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS) - --wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) -+wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) - @rm -f wofm2opl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS) - --wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) -+wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) - @rm -f wopl2ofm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS) - --wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) -+wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) - @rm -f wovf2ovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS) - --wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) -+wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) - @rm -f wovp2ovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS) - xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \ -@@ -8344,7 +8340,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) -+xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) - @rm -f xetex$(EXEEXT) - $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS) - -@@ -19275,7 +19271,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) - fi; \ - $$success || exit 1 - --check-TESTS: -+check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) -@@ -19285,7 +19281,7 @@ check-TESTS: - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; --recheck: all -+recheck: all - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ -@@ -21636,7 +21632,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND) - - #EXTRA_DIST += - --#EXTRA_DIST += -+#EXTRA_DIST += - - $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND) - -@@ -21801,7 +21797,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w - $(mp_ctangle) tfmin.w - - # Creating several files: need stamp file and two rules with identical recipes --$(mp_c_h): mp-tangle -+$(mp_c_h): mp-tangle - $(mp_ctangle_sh) mp - mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh - $(mp_ctangle_sh) mp -@@ -21848,7 +21844,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) - - $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h) - --$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) -+$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) - $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND) - $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) - -@@ -22099,7 +22095,7 @@ hitables.c: himktables$(EXEEXT) - hitables.c: himktables$(EXEEXT) - ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; } - --# hitex, histretch, and hishrink all need (at least) some -+# hitex, histretch, and hishrink all need (at least) some - # of the sources generated from hiformat.w. - # - $(hitex_OBJECTS): hiformat-tangle -@@ -22166,36 +22162,36 @@ $(libff_a_OBJECTS): libunilib.a - - $(libff_a_OBJECTS): libunilib.a - --$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - - utils-hb.c: luatexdir/utils/utils.c - $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c - --luatex-api-hb.h: luatexdir/lua/luatex-api.h -+luatex-api-hb.h: luatexdir/lua/luatex-api.h - $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h - - luastuff-hb.c: luatexdir/lua/luastuff.c -- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c -+ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c - - luainit-hb.c: luatexdir/lua/luainit.c - $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c - --printing-hb.c: luatexdir/tex/printing.c -- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c -+printing-hb.c: luatexdir/tex/printing.c -+ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c - - #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND) - - $(libluaffi_a_OBJECTS): $(LUA_DEPEND) - - #liblua53ffi_sources = $(libluaffi_sources) --#EXTRA_DIST -+#EXTRA_DIST - - $(luatex_OBJECTS): libluatex.a - $(luajittex_OBJECTS): libluajittex.a + $(am__append_78) $(am__append_79) $(am__append_80) \ + $(am__append_94) $(am__append_99) $(am__append_104) \ + $(am__append_109) diff --git a/print/tex-basic-engines/files/patch-man-Makefile.in b/print/tex-basic-engines/files/patch-man_Makefile.in similarity index 50% rename from print/tex-basic-engines/files/patch-man-Makefile.in rename to print/tex-basic-engines/files/patch-man_Makefile.in index f54bd8c5e720..f5ce95730286 100644 --- a/print/tex-basic-engines/files/patch-man-Makefile.in +++ b/print/tex-basic-engines/files/patch-man_Makefile.in @@ -1,51 +1,37 @@ ---- man/Makefile.in.orig 2023-03-08 17:05:16 UTC +--- man/Makefile.in.orig 2024-02-25 17:08:15 UTC +++ man/Makefile.in -@@ -171,11 +171,11 @@ am__v_GEN_0 = @echo " GEN " $@; - AM_V_GEN = $(am__v_GEN_@AM_V@) - am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) - am__v_GEN_0 = @echo " GEN " $@; --am__v_GEN_1 = -+am__v_GEN_1 = - AM_V_at = $(am__v_at_@AM_V@) - am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) - am__v_at_0 = @ --am__v_at_1 = -+am__v_at_1 = - SOURCES = - DIST_SOURCES = - am__can_run_installinfo = \ -@@ -461,28 +461,17 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source +@@ -466,28 +466,18 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source mf.man mpost.man etex.man $(pdftex_man_sources) ptex.man \ ppltotf.man ptftopl.man pbibtex.man luatex.man xetex.man \ $(otangle_man_sources) aleph.man $(misc_man_sources) spell.add -bootstrap_man_sources = ctie.man cweb.man ctwill.man tangle.man tie.man +bootstrap_man_sources = # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 --man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \ -- ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \ -+man1_links = $(am__append_3) $(am__append_5) \ - $(am__append_6) $(am__append_10) $(am__append_12) \ -- $(am__append_14) $(am__append_17) latex-dev:pdflatex-dev \ -- latex-dev:xelatex-dev latex-dev:lualatex-dev \ -- latex-dev:dvilualatex-dev latex-dev:platex-dev \ -- latex-dev:uplatex-dev +-man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-proofsort \ +- ctwill:ctwill-refsort ctwill:ctwill-twinx $(am__append_2) \ ++man1_links = $(am__append_2) \ + $(am__append_4) $(am__append_6) $(am__append_7) \ + $(am__append_11) $(am__append_13) $(am__append_15) \ +- $(am__append_18) latex-dev:pdflatex-dev latex-dev:xelatex-dev \ +- latex-dev:lualatex-dev latex-dev:dvilualatex-dev \ +- latex-dev:platex-dev latex-dev:uplatex-dev -web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \ - gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \ - pltotf.man pooltype.man tftopl.man twill.man \ - vftovp.man vptovf.man weave.man -+ $(am__append_14) $(am__append_17) ++ $(am__append_18) +web_man_sources = pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man -otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man -misc_man_sources = \ - amstex.man \ - latex.man \ - latex-dev.man \ - pdfetex.man +otangle_man_sources = +misc_man_sources = SUFFIXES = .1 .man .ps .dvi man_files = $(man_sources:.man=.1) diff --git a/print/tex-dvipdfmx/Makefile b/print/tex-dvipdfmx/Makefile index d8a33f164e1c..600cc1fe7110 100644 --- a/print/tex-dvipdfmx/Makefile +++ b/print/tex-dvipdfmx/Makefile @@ -1,71 +1,70 @@ PORTNAME= dvipdfmx -PORTVERSION= ${TEXLIVE_VERSION} -PORTREVISION= 1 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${TEXLIVE_VERSION}-source DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DISTNAME_TEXMF}${EXTRACT_SUFX} DIST_SUBDIR= TeX EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= tex@FreeBSD.org COMMENT= DVI Previewer(kpathsearch) for X WWW= http://project.ktug.or.kr/dvipdfmx/ LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ libpaper.so:print/libpaper RUN_DEPENDS= ${LOCALBASE}/share/fonts/adobe-cmaps/ai0/CMap/Identity-H:print/adobe-cmaps USES= localbase:ldflags pkgconfig tar:xz tex USE_TEX= kpathsea web2c dvipsk luatex texhash GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --with-system-kpathsea \ --with-kpathsea-includes=${LOCALBASE}/include \ --with-kpathsea-libdir=${LOCALBASE}/lib \ --with-system-libpaper \ --with-libpaper-includes=${LOCALBASE}/include \ --with-libpaper-libdir=${LOCALBASE}/lib \ --with-system-libpng \ --with-system-zlib EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= am \ m4 \ build-aux \ texk/dvipdfm-x EXTRACT_AFTER_ARGS_TEXMF= \ | ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner \ ${EXCLUDE_FILES_TEXMF:S,^,--exclude ${DISTNAME_TEXMF}/,} \ ${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,} EXCLUDE_FILES_TEXMF= \ texmf-dist/fonts/map/dvipdfmx/jfontmaps \ texmf-dist/fonts/map/dvipdfmx/japanese-otf \ texmf-dist/fonts/map/dvipdfmx/ptex \ texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map EXTRACT_FILES_TEXMF= \ texmf-dist/doc/dvipdfmx/ \ texmf-dist/dvipdfmx/ \ texmf-dist/fonts/cmap/dvipdfmx/ \ texmf-dist/fonts/map/dvipdfmx/ \ texmf-dist/fonts/map/dvipdfm/ WRKSRC= ${WRKDIR}/${DISTNAME}/texk/dvipdfm-x TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFDIR} pre-install: ${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS_TEXMF} post-install: ${LN} -f -s ${LOCALBASE}/share/fonts/adobe-cmaps \ ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/fonts/cmap/adobe-cmaps .include diff --git a/print/tex-dvipdfmx/distinfo b/print/tex-dvipdfmx/distinfo index 77ebcd18ba9f..5475fd10fc03 100644 --- a/print/tex-dvipdfmx/distinfo +++ b/print/tex-dvipdfmx/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1680899460 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 -SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253 -SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744 +TIMESTAMP = 1716922521 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 +SHA256 (TeX/texlive-20240312-texmf.tar.xz) = c8eae2deaaf51e86d93baa6bbcc4e94c12aa06a0d92893df474cc7d2a012c7a7 +SIZE (TeX/texlive-20240312-texmf.tar.xz) = 4270954732 diff --git a/print/tex-dvipsk/Makefile b/print/tex-dvipsk/Makefile index c70dd41ee952..9bdf1ff6bc0a 100644 --- a/print/tex-dvipsk/Makefile +++ b/print/tex-dvipsk/Makefile @@ -1,80 +1,78 @@ PORTNAME= dvipsk -PORTVERSION= ${TEXLIVE_YEAR}.1 -PORTREVISION= 1 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/:source \ LOCAL/tex:texmf PKGNAMEPREFIX= tex- DISTNAME= texlive-${TEXLIVE_VERSION}-source DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source \ ${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd${EXTRACT_SUFX}:texmf DIST_SUBDIR= TeX EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= tex@FreeBSD.org COMMENT= Convert a TeX DVI file to PostScript LICENSE= GPLv2 LIB_DEPENDS= libpaper.so:print/libpaper USES= gmake localbase:ldflags pkgconfig tar:xz tex USE_TEX= kpathsea texhash web2c GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --with-kpathsea-includes=${LOCALBASE}/include \ --with-kpathsea-libdir=${LOCALBASE}/lib \ --with-paper \ --with-system-kpathsea \ --with-system-libpng \ --with-system-zlib EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} -EXTRACT_FILES= am m4 build-aux texk/dvipsk texk/lcdf-typetools -WRKSRC= ${WRKDIR}/${DISTNAME}/texk/dvipsk +EXTRACT_FILES= am m4 build-aux texk/dvipsk texk/lcdf-typetools +WRKSRC= ${WRKDIR}/${DISTNAME}/texk/dvipsk INFO= dvips PLIST_FILES= bin/afm2tfm \ bin/dvips \ share/man/man1/afm2tfm.1.gz \ share/man/man1/dvips.1.gz pre-install: ${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd${EXTRACT_SUFX} \ -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner post-install: ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST} .if defined(MAINTAINER_MODE) -_EXTRACT_FILES= texmf-dist/doc/dvips/ texmf-dist/dvips/ \ - texmf-dist/fonts/map/dvips/ \ - texmf-dist/fonts/enc/dvips/ \ - texmf-dist/tex/generic/dvips/ -_EXCLUDE_FILES= texmf-dist/dvips/xdvi +_EXTRACT_FILES= texmf-dist/doc/dvips/ texmf-dist/dvips/ \ + texmf-dist/fonts/map/dvips/ \ + texmf-dist/fonts/enc/dvips/ \ + texmf-dist/tex/generic/dvips/ +_EXCLUDE_FILES= texmf-dist/dvips/xdvi _WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION} _maintainer-extract: ${MAKE} clean ${MKDIR} ${_WRKSRC} ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME_TEXMF}${EXTRACT_SUFX} \ -C ${_WRKSRC}$ \ --strip-components 1 --no-same-permission --no-same-owner \ ${_EXCLUDE_FILES:S,^,--exclude ,} \ ${_EXTRACT_FILES:S,^,${DISTNAME_TEXMF}/,} _maintainer-dist: _maintainer-extract ${TAR} --options xz:compression-level=9 -Jcvf \ ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd.tar.xz \ -C ${WRKDIR} ${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION} scp ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd.tar.xz \ bofh@freefall.freebsd.org://home/tex/public_distfiles/ .endif .include diff --git a/print/tex-dvipsk/distinfo b/print/tex-dvipsk/distinfo index b92e36a9e759..a57af7ed2a36 100644 --- a/print/tex-dvipsk/distinfo +++ b/print/tex-dvipsk/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1698419926 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 -SHA256 (TeX/tex-dvipsk-20230313-freebsd.tar.xz) = 8356e2ebcd561de3afdc778bcdbd0f0f5cfaa9249a9415988aebb764fe3f107e -SIZE (TeX/tex-dvipsk-20230313-freebsd.tar.xz) = 2728208 +TIMESTAMP = 1716888992 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 +SHA256 (TeX/tex-dvipsk-20240312-freebsd.tar.xz) = 847e70fcb2614969632522125c770a32418af00cba64b1d76edd285d7848c918 +SIZE (TeX/tex-dvipsk-20240312-freebsd.tar.xz) = 2833992 diff --git a/print/tex-dvipsk/files/patch-configure b/print/tex-dvipsk/files/patch-configure index cf0a71e99ef7..f3047874378a 100644 --- a/print/tex-dvipsk/files/patch-configure +++ b/print/tex-dvipsk/files/patch-configure @@ -1,121 +1,120 @@ ---- configure.orig 2015-03-15 17:54:49 UTC +--- configure.orig 2024-02-05 17:23:27 UTC +++ configure -@@ -778,6 +778,7 @@ with_sysroot +@@ -804,6 +804,7 @@ with_system_kpathsea enable_libtool_lock enable_largefile with_system_kpathsea +with_paper + enable_year2038 ' ac_precious_vars='build_alias - host_alias -@@ -1440,6 +1441,7 @@ Optional Packages: +@@ -1476,6 +1477,7 @@ Optional Packages: compiler's sysroot if not specified). --with-system-kpathsea use installed kpathsea headers and library (requires pkg-config) + --with-paper=DIR use paper include/library files from DIR Some influential environment variables: CC C compiler command -@@ -15151,6 +15153,102 @@ fi - ac_config_files="$ac_config_files Makefile" - +@@ -14940,6 +14942,102 @@ fi + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + fi ++ ++ +eval CPPFLAGS=\"$LIBPAPER_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$LIBPAPER_LIBS \$LIBS\" + +_cppflags=$CPPFLAGS _ldflags=$LDFLAGS + +# Check whether --with-paper was given. +if test "${with_paper+set}" = set; then : + withval=$with_paper; if test -d "$withval"; then + CPPFLAGS="$CPPFLAGS -I$withval/include" + LDFLAGS="$LDFLAGS -L$withval/lib" + fi +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for paper header files" >&5 +$as_echo_n "checking for paper header files... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +struct paper *p; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing paperpswidth" >&5 +$as_echo_n "checking for library containing paperpswidth... " >&6; } +if ${ac_cv_search_paperpswidth+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char paperpswidth (); +int +main () +{ +return paperpswidth (); + ; + return 0; +} +_ACEOF +for ac_lib in '' paper; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib LIBS="-lpaper $LIBS" $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_paperpswidth=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_paperpswidth+:} false; then : + break +fi +done +if ${ac_cv_search_paperpswidth+:} false; then : + +else + ac_cv_search_paperpswidth=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_paperpswidth" >&5 +$as_echo "$ac_cv_search_paperpswidth" >&6; } +ac_res=$ac_cv_search_paperpswidth +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h + +fi + +else + CPPFLAGS=$_cppflags + LDDFLAGS=$_ldflags + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ - subdirs="$subdirs squeeze" diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile index 1167e5ddc4b7..3972229ff2da 100644 --- a/print/tex-jadetex/Makefile +++ b/print/tex-jadetex/Makefile @@ -1,53 +1,52 @@ PORTNAME= jadetex -PORTVERSION= 3.13 -PORTREVISION= 5 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= LOCAL/tex PKGNAMEPREFIX= tex- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd DIST_SUBDIR= TeX EXTRACT_ONLY= MAINTAINER= tex@FreeBSD.org COMMENT= TeX backend for Jade, DSSSL processor for SGML/XML documents WWW= https://jadetex.sourceforge.net/ USES= tar:xz tex USE_TEX= fmtutil pdftex xmltex NO_ARCH= yes NO_BUILD= yes TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFVARDIR} TEX_FORMATS= jadetex do-install: ${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner .if defined(MAINTAINER_MODE) _EXTRACT_FILES= \ texmf-dist/doc/otherformats/jadetex \ texmf-dist/source/jadetex/base \ texmf-dist/tex/jadetex/base _WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION} _maintainer-extract: ${MAKE} clean ${MKDIR} ${_WRKSRC} ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME_TEXMF}${EXTRACT_SUFX} \ -C ${_WRKSRC}$ \ --strip-components 1 --no-same-permission --no-same-owner \ ${_EXTRACT_FILES:S,^,${DISTNAME_TEXMF}/,} _maintainer-dist: _maintainer-extract ${TAR} --options xz:compression-level=9 -Jcvf \ ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd.tar.xz \ -C ${WRKDIR} ${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION} scp ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd.tar.xz \ bofh@freefall.freebsd.org://home/tex/public_distfiles/ .endif .include diff --git a/print/tex-jadetex/distinfo b/print/tex-jadetex/distinfo index fe4150612a85..e43227e16672 100644 --- a/print/tex-jadetex/distinfo +++ b/print/tex-jadetex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698415087 -SHA256 (TeX/tex-jadetex-20230313-freebsd.tar.xz) = 5f030ba979e46131818cc2c21cfac856712de1dc0bee22361f8b1753bbc2366e -SIZE (TeX/tex-jadetex-20230313-freebsd.tar.xz) = 55920 +TIMESTAMP = 1716917463 +SHA256 (TeX/tex-jadetex-20240312-freebsd.tar.xz) = 1e53e1143a6b244655cb0d8ad9ce6d8fec954f19d5cf3626c60b9c957aebc923 +SIZE (TeX/tex-jadetex-20240312-freebsd.tar.xz) = 55972 diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile index f5e215626440..287fe6391ded 100644 --- a/print/tex-luatex/Makefile +++ b/print/tex-luatex/Makefile @@ -1,105 +1,102 @@ PORTNAME= luatex -PORTVERSION= 1.16.0 -PORTREVISION= 1 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${TEXLIVE_VERSION}-source DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DISTNAME_TEXMF}${EXTRACT_SUFX} DIST_SUBDIR= TeX EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= tex@FreeBSD.org COMMENT= Extended version of pdfTeX using Lua LIB_DEPENDS= libfreetype.so:print/freetype2 \ libgmp.so:math/gmp \ libgraphite2.so:graphics/graphite2 \ libharfbuzz.so:print/harfbuzz \ libmpfr.so:math/mpfr \ libpng.so:graphics/png \ libTECkit.so:textproc/teckit \ libzzip.so:devel/zziplib USES= gnome libtool localbase pkgconfig tar:xz tex xorg USE_GNOME= cairo USE_LDCONFIG= yes USE_TEX= fmtutil formats kpathsea texlua texluajit web2c USE_XORG= pixman GNU_CONFIGURE= yes CONFIGURE_ARGS+= ${EXCLUDE_ENGINES:S/^/--disable-/} \ --enable-luajittex \ --enable-luatex \ --enable-luahbtex \ --enable-luajithbtex \ --with-system-zlib \ --with-system-zziplib \ CC="${CC}" \ CXX="${CXX}" .for L in cairo freetype2 gmp graphite2 harfbuzz kpathsea libpng mpfr pixman ptexenc teckit CONFIGURE_ARGS+= --with-$L-include=${LOCALBASE}/include \ --with-$L-libdir=${LOCALBASE}/lib \ --with-system-$L .endfor MAKE_JOBS_UNSAFE= yes EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux libs/xpdf libs/lua53 libs/luajit \ libs/pplib texk/web2c EXTRACT_AFTER_ARGS_TEXMF= | ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission \ --no-same-owner \ ${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,} EXTRACT_FILES_TEXMF= texmf-dist/doc/lualatex texmf-dist/doc/luatex \ texmf-dist/scripts/context/lua \ texmf-dist/source/luatex \ texmf-dist/source/lualatex \ texmf-dist/fonts/map/luatex \ texmf-dist/tex/luatex \ texmf-dist/tex/generic/config/luatex-unicode-letters.tex \ - texmf-dist/tex/generic/config/luatexiniconfig.tex \ texmf-dist/tex/generic/context/luatex \ - texmf-dist/tex/latex/latexconfig/lualatexquotejobname.tex \ texmf-dist/tex/latex/latexconfig/lualatexiniconfig.tex \ texmf-dist/tex/lualatex WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c EXCLUDE_ENGINES= aleph etex pdftex mf mf-nowin ptex eptex uptex \ euptex otangle mp pmp upmp web2c web-progs \ xetex tex synctex mflua mfluajit TEX_FORMATS= luatex TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFVARDIR} # buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF. post-extract: @${FIND} ${WRKSRC} -name '*.orig' -delete cd ${WRKSRC}/.. && \ ${LN} -s -f ${LOCALBASE}/${TEXMFDISTDIR}/web2c kpathsea pre-configure: for D in libs/xpdf libs/pplib; do \ cd ${WRKDIR}/${DISTNAME}/$$D && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \ ${CONFIGURE_ARGS}; \ done cd ${WRKDIR}/${DISTNAME}/libs/pplib && \ ${MAKE} pre-install: ${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS_TEXMF} ${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/lualatex/wallcalendar/doc/examples/diff-cal.sh post-install: ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST} ${ECHO_CMD} "share/texmf-var/web2c/luatex/lollipop.log" >> ${TMPPLIST} ${ECHO_CMD} "share/texmf-var/web2c/luatex/lollipop.fmt" >> ${TMPPLIST} .include diff --git a/print/tex-luatex/distinfo b/print/tex-luatex/distinfo index 8e206b821b6d..e6f4f284c4db 100644 --- a/print/tex-luatex/distinfo +++ b/print/tex-luatex/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1680829257 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 -SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253 -SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744 +TIMESTAMP = 1716918225 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 +SHA256 (TeX/texlive-20240312-texmf.tar.xz) = c8eae2deaaf51e86d93baa6bbcc4e94c12aa06a0d92893df474cc7d2a012c7a7 +SIZE (TeX/texlive-20240312-texmf.tar.xz) = 4270954732 diff --git a/print/tex-luatex/files/patch-Makefile.in b/print/tex-luatex/files/patch-Makefile.in index 6951d7ddf0c9..8b32438e6f29 100644 --- a/print/tex-luatex/files/patch-Makefile.in +++ b/print/tex-luatex/files/patch-Makefile.in @@ -1,1394 +1,90 @@ ---- Makefile.in.orig 2023-03-08 17:05:16 UTC +--- Makefile.in.orig 2024-02-28 04:19:31 UTC +++ Makefile.in -@@ -101,18 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE +@@ -102,18 +102,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \ md5main$(EXEEXT) -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \ - ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \ - ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \ - $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ - $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \ - $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \ - $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \ - $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \ - $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \ - $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \ - $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \ - $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) +bin_PROGRAMS = luahbtex$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \ $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \ -@@ -488,7 +477,7 @@ ARFLAGS = cru - AM_V_AR = $(am__v_AR_@AM_V@) - am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) - am__v_AR_0 = @echo " AR " $@; --am__v_AR_1 = -+am__v_AR_1 = - libff_a_AR = $(AR) $(ARFLAGS) - libff_a_LIBADD = - am__dirstamp = $(am__leading_dot)dirstamp -@@ -1234,7 +1223,7 @@ libsynctex_la_OBJECTS = $(am_libsynctex_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent --am__v_lt_1 = -+am__v_lt_1 = - libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@ -@@ -1699,11 +1688,11 @@ am__v_P_1 = : - AM_V_GEN = $(am__v_GEN_@AM_V@) - am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) - am__v_GEN_0 = @echo " GEN " $@; --am__v_GEN_1 = -+am__v_GEN_1 = - AM_V_at = $(am__v_at_@AM_V@) - am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) - am__v_at_0 = @ --am__v_at_1 = -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c - depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp - am__maybe_remake_depfiles = depfiles -@@ -2395,7 +2384,7 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOO - AM_V_CC = $(am__v_CC_@AM_V@) - am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) - am__v_CC_0 = @echo " CC " $@; --am__v_CC_1 = -+am__v_CC_1 = - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -2403,7 +2392,7 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG - AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; --am__v_CCLD_1 = -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -@@ -2413,14 +2402,14 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LI - AM_V_CXX = $(am__v_CXX_@AM_V@) - am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) - am__v_CXX_0 = @echo " CXX " $@; --am__v_CXX_1 = -+am__v_CXX_1 = - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) - am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) - am__v_CXXLD_0 = @echo " CXXLD " $@; --am__v_CXXLD_1 = -+am__v_CXXLD_1 = - OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) - LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ -@@ -2430,7 +2419,7 @@ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFL - AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@) - am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@) - am__v_OBJCXX_0 = @echo " OBJCXX " $@; --am__v_OBJCXX_1 = -+am__v_OBJCXX_1 = - OBJCXXLD = $(OBJCXX) - OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \ -@@ -2438,7 +2427,7 @@ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) - AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@) - am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@) - am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; --am__v_OBJCXXLD_1 = -+am__v_OBJCXXLD_1 = - SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ - $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \ - $(nodist_libluahbtexspecific_a_SOURCES) \ -@@ -2959,14 +2948,16 @@ LUA52_DEPEND = @LUA52_DEPEND@ +@@ -2975,14 +2964,16 @@ LUA53_DEFINES = @LUA53_DEFINES@ LUA52_INCLUDES = @LUA52_INCLUDES@ LUA52_LIBS = @LUA52_LIBS@ LUA53_DEFINES = @LUA53_DEFINES@ -LUA53_DEPEND = @LUA53_DEPEND@ -LUA53_INCLUDES = @LUA53_INCLUDES@ -LUA53_LIBS = @LUA53_LIBS@ +LUA53_DEPEND = +LUA53_INCLUDES = -I${LOCALBASE}/include/texlua53 \ -+ -I@top_srcdir@/../../libs/lua53/lua53-src/src ++ -I@top_srcdir@/../../libs/lua53/lua53-src/src +LUA53_LIBS = -L${LOCALBASE}/lib -ltexlua53 LUAJIT_DEFINES = @LUAJIT_DEFINES@ -LUAJIT_DEPEND = @LUAJIT_DEPEND@ -LUAJIT_INCLUDES = @LUAJIT_INCLUDES@ +LUAJIT_DEPEND = +LUAJIT_INCLUDES = -I${LOCALBASE}/include/texluajit \ -+ -I@top_srcdir@/../../libs/luajit/LuaJIT-src/src ++ -I@top_srcdir@/../../libs/luajit/LuaJIT-src/src LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@ -LUAJIT_LIBS = @LUAJIT_LIBS@ +LUAJIT_LIBS = -L${LOCALBASE}/lib -ltexluajit MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -3000,7 +2991,8 @@ POTRACE_DEPEND = @POTRACE_DEPEND@ - POTRACE_INCLUDES = @POTRACE_INCLUDES@ - POTRACE_LIBS = @POTRACE_LIBS@ - PPLIB_DEPEND = @PPLIB_DEPEND@ --PPLIB_INCLUDES = @PPLIB_INCLUDES@ -+PPLIB_INCLUDES = -I@top_srcdir@/../../libs/pplib/pplib-src/src/util \ -+ -I@top_srcdir@/../../libs/pplib/pplib-src/src +@@ -3022,7 +3013,8 @@ PTEXENC_DEPEND = @PTEXENC_DEPEND@ + PPLIB_INCLUDES = @PPLIB_INCLUDES@ PPLIB_LIBS = @PPLIB_LIBS@ PTEXENC_DEPEND = @PTEXENC_DEPEND@ - PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -@@ -3105,14 +3097,14 @@ AM_CFLAGS = $(WARNING_CFLAGS) +-PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ ++PTEXENC_INCLUDES = -I@top_srcdir@/../../libs/pplib/pplib-src/src/util \ ++ -I@top_srcdir@/../../libs/pplib/pplib-src/src + PTEXENC_LIBS = @PTEXENC_LIBS@ + RANLIB = @RANLIB@ + SED = @SED@ +@@ -3124,7 +3116,7 @@ version = $(WEB2CVERSION) AM_CXXFLAGS = ## $(WARNING_CXXFLAGS) AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS) version = $(WEB2CVERSION) -SUBDIRS = doc lib man web2c . window omegafonts otps +SUBDIRS = . proglib = lib/lib.a #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a - - #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a - --#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a -+#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a - EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \ -@@ -3128,7 +3120,7 @@ EXTRA_LTLIBRARIES = libsynctex.la - lib_LIBRARIES = $(am__append_126) - lib_LTLIBRARIES = $(am__append_125) - dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 --nodist_man_MANS = -+nodist_man_MANS = - TEST_EXTENSIONS = .pl .test - # - # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for -@@ -3631,13 +3623,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe +@@ -3652,14 +3644,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe $(am__append_35) $(am__append_43) $(am__append_59) \ $(am__append_63) $(am__append_69) $(am__append_74) \ - $(am__append_80) + $(am__append_82) -bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \ - $(am__append_24) $(am__append_33) $(am__append_41) \ - $(am__append_49) $(am__append_54) $(am__append_67) \ - upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \ - uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \ -- $(am__append_78) $(am__append_92) $(am__append_97) \ -- $(am__append_102) $(am__append_107) +- $(am__append_78) $(am__append_79) $(am__append_80) \ +- $(am__append_94) $(am__append_99) $(am__append_104) \ +- $(am__append_109) +bin_links = $(am__append_75) $(am__append_81) install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \ $(am__append_39) $(am__append_47) $(am__append_52) \ - $(am__append_90) $(am__append_95) $(am__append_100) \ -@@ -3711,19 +3697,19 @@ tangleboot = $(tangle_silent)WEBINPUTS=.:$(srcdir) $(b - tangle_silent = $(tangle_silent_@AM_V@) - tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@) - tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ # --tangle_silent_1 = -+tangle_silent_1 = - # - ctangle = $(buildenv) $(CTANGLE) - ctangle_silent = $(ctangle_silent_@AM_V@) - ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@) - ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ # --ctangle_silent_1 = -+ctangle_silent_1 = - # - tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE) - tie_silent = $(tie_silent_@AM_V@) - tie_silent_ = $(tie_silent_@AM_DEFAULT_V@) - tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ # --tie_silent_1 = -+tie_silent_1 = - tie_c = $(tie) -c $@ - tie_m = $(tie) -m $@ - -@@ -3732,7 +3718,7 @@ texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) - - # For trip, trap, and other tests - DIFF = diff --DIFFFLAGS = -+DIFFFLAGS = - AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \ - DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \ - DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \ -@@ -3740,29 +3726,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor - - # To run, e.g., just the original trip test, in the build directory: - # make -C $ww TRIPTRAP=trip.diffs triptrap --# where $ww is the web2c build directory. --# -+# where $ww is the web2c build directory. -+# - # This will run the triptrap-sh script - # which then runs make TEST=triptest.test check-am, - # which then runs the (srcdir file) triptest.test script; - # its output will be in (builddir file) trip.diffs, --# and triptest.out if the test failed, -+# and triptest.out if the test failed, - # plus various created files in the tripdir/ subdirectory. - # The triptest.diffs file will have the actual abs_srcdir value replaced - # with the constant string "SRCDIR" to minimize differences, and "../" - # replaced with "./" to match the canonical output. Confusing. For the - # real output, see triptest.log. --# -+# - # To build only tex, make -C $ww tex (i.e., in builddir) should do it. - # Unfortunately the check-am target depends on all-am, so all engines - # are built before any tests are run. If this is a problem, just have to - # edit the generated Makefile in builddir to remove the dependency. --# -+# - # Other per-engine invocations (see triptrap-sh for complete list): - # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap --# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap --# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap --# -+# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap -+# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap -+# - triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh - - # The environment for making dumps. -@@ -3773,7 +3759,7 @@ dumpenv = TEXMFCNF=../kpathsea - cp_silent = $(cp_silent_@AM_V@) - cp_silent_ = $(cp_silent_@AM_DEFAULT_V@) - cp_silent_0 = @echo " COPY " $@; --cp_silent_1 = -+cp_silent_1 = - nodist_tangle_SOURCES = tangle.c tangle.h - nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h - tangleboot_DEPENDENCIES = $(default_dependencies) -@@ -3820,7 +3806,7 @@ nodist_tie_SOURCES = tie.c - tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C - initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" - nodist_initex_SOURCES = callexe.c --initex_LDADD = -+initex_LDADD = - tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130) - - # With --enable-ipc, TeX may need to link with -lsocket. -@@ -3848,7 +3834,7 @@ tex_ch_srcs = \ - tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test - call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\" - nodist_call_mf_SOURCES = callexe.c --call_mf_LDADD = -+call_mf_LDADD = - dist_mf_SOURCES = mfextra.c - mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) - mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) -@@ -3880,7 +3866,7 @@ mf_ch_src = \ - mf_tests = mftraptest.test - call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\" - nodist_call_mflua_SOURCES = callexe.c --call_mflua_LDADD = -+call_mflua_LDADD = - dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h - mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES) - mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS) -@@ -3912,7 +3898,7 @@ libmfluaotfcc_a_CPPFLAGS = \ - -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \ - -I$(top_srcdir)/mfluadir/otfcc/include \ - -I$(top_srcdir)/mfluadir/otfcc/include/dep \ -- -I$(top_srcdir)/mfluadir/otfcc/lib -+ -I$(top_srcdir)/mfluadir/otfcc/lib - - libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS) - -@@ -4174,7 +4160,7 @@ libmfluaotfcc_a_SOURCES = \ - mfluadir/otfcc/lib/table/VDMX.h \ - mfluadir/otfcc/lib/table/SVG.c \ - mfluadir/otfcc/lib/table/head.h \ -- mfluadir/otfcc/lib/table/TSI5.c -+ mfluadir/otfcc/lib/table/TSI5.c - - libmfluapotrace_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/potrace \ -@@ -4185,7 +4171,7 @@ libmfluapotrace_a_CFLAGS = # $(WARNING_CFLAGS) - #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources) - libmfluapotrace_a_SOURCES = \ - mfluadir/potrace/luafunc.c \ -- mfluadir/potrace/luafunc.h -+ mfluadir/potrace/luafunc.h - - libmflualpeg_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/luapeg \ -@@ -4194,11 +4180,11 @@ libmflualpeg_a_CPPFLAGS = \ - libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmflualpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\" - nodist_call_mfluajit_SOURCES = callexe.c --call_mfluajit_LDADD = -+call_mfluajit_LDADD = - dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h - mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES) - mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS) -@@ -4234,7 +4220,7 @@ libmfluajitlpeg_a_CPPFLAGS = \ - libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmfluajitlpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir - mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ -@@ -4242,7 +4228,7 @@ mpost_LDADD = libmplibcore.a libmplibextramath.a libmp - - call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" - nodist_call_mpost_SOURCES = callexe.c --call_mpost_LDADD = -+call_mpost_LDADD = - - # Creating one file: just one rule - mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) -@@ -4254,10 +4240,10 @@ mpost_web = mplibdir/mpost.w mplibdir/mpxout.w - mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test - call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\" - nodist_call_pmpost_SOURCES = callexe.c --call_pmpost_LDADD = -+call_pmpost_LDADD = - call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\" - nodist_call_upmpost_SOURCES = callexe.c --call_upmpost_LDADD = -+call_upmpost_LDADD = - pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - -@@ -4311,7 +4297,7 @@ libmplibbackends_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_I - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - - nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \ -- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) -+ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) - - nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h) - nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h) -@@ -4605,7 +4591,7 @@ hiformat_c_h_l_y = \ - hiskip.c \ - histretch.c - --hitex_c = hitex.c -+hitex_c = hitex.c - - # hitex - nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c) -@@ -4758,11 +4744,11 @@ libluasocket_sources = \ - luatexdir/luasocket/src/timeout.h \ - luatexdir/luasocket/src/udp.c \ - luatexdir/luasocket/src/udp.h \ -- luatexdir/luasocket/src/usocket.h -+ luatexdir/luasocket/src/usocket.h - --libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a --#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a --libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a -+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a -+#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a -+libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a - libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES) - #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES) - libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \ -@@ -4892,8 +4878,8 @@ libff_a_SOURCES = \ - LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES) - LUA_LIBS = $(LUA53_LIBS) - LUA_DEPEND = $(LUA53_DEPEND) --libluatex_a_DEPENDENCIES = libff.a libluamisc.a --libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a -+libluatex_a_DEPENDENCIES = libff.a libluamisc.a -+libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a - libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ - $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \ - -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \ -@@ -4914,7 +4900,7 @@ libluajithbtexspecific_a_CPPFLAGS = -DLUATEX_HARFBUZZ_ - dist_libluatex_a_SOURCES = \ - luatexdir/lua/lstrlibext.c \ - luatexdir/lua/helpers.c \ -- luatexdir/lua/texluac.c -+ luatexdir/lua/texluac.c - - nodist_libluatex_a_SOURCES = \ - $(dist_libluatex_sources) \ -@@ -4932,7 +4918,7 @@ nodist_libluajittex_a_SOURCES = \ - - #dist_libluatexspecific_a_SOURCES = - nodist_libluatexspecific_a_SOURCES = \ -- $(dist_libluatexspecific_sources) -+ $(dist_libluatexspecific_sources) - - #dist_libluajittexspecific_a_SOURCES = - nodist_libluajittexspecific_a_SOURCES = \ -@@ -4940,46 +4926,46 @@ nodist_libluajittexspecific_a_SOURCES = \ - - #dist_libluahbtexspecific_a_SOURCES = - nodist_libluahbtexspecific_a_SOURCES = \ -- $(dist_libluahbtexspecific_sources) -+ $(dist_libluahbtexspecific_sources) - --#dist_libluajithbtexspecific_a_SOURCES = -+#dist_libluajithbtexspecific_a_SOURCES = - nodist_libluajithbtexspecific_a_SOURCES = \ -- $(dist_libluajithbtexspecific_sources) -+ $(dist_libluajithbtexspecific_sources) - - dist_libluatexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - dist_libluajittexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - --# luatexdir/utils/utils-hb.c -+# luatexdir/utils/utils-hb.c - dist_libluahbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - - --#luatexdir/utils/utils-hb.c -+#luatexdir/utils/utils-hb.c - dist_libluajithbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - --libluatex_web = --nodist_libluatex_sources = -+libluatex_web = -+nodist_libluatex_sources = - - # dist_libluatex_sources += \ - # luatexdir/tex/align.h \ -@@ -5047,7 +5033,7 @@ nodist_libluatex_sources = - # luatexdir/tex/texmath.c \ - # luatexdir/tex/texnodes.c \ - # luatexdir/tex/textcodes.c \ --# luatexdir/tex/textoken.c -+# luatexdir/tex/textoken.c - dist_libluatex_sources = luatexdir/luatexcallbackids.h \ - luatexdir/luatex.h luatexdir/luatex-common.h \ - luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \ -@@ -5180,7 +5166,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src - # luatexdir/lua/luanode.c \ - # luatexdir/lua/luastuff.c \ - # luatexdir/lua/luatoken.c \ --# luatexdir/lua/mplibstuff.c -+# luatexdir/lua/mplibstuff.c - luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) - - ################################################################################ -@@ -5297,16 +5283,16 @@ luatex_sources = \ - - call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" - nodist_call_luatex_SOURCES = callexe.c --call_luatex_LDADD = -+call_luatex_LDADD = - call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\" - nodist_call_luahbtex_SOURCES = callexe.c --call_luahbtex_LDADD = -+call_luahbtex_LDADD = - call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\" - nodist_call_luajittex_SOURCES = callexe.c --call_luajittex_LDADD = -+call_luajittex_LDADD = - call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\" - nodist_call_luajithbtex_SOURCES = callexe.c --call_luajithbtex_LDADD = -+call_luajithbtex_LDADD = - - # LuaTeX/LuaJITTeX Tests - # -@@ -5646,7 +5632,7 @@ w2c/c-auto.h: w2c/stamp-h1 - w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status - @rm -f w2c/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h --$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f w2c/stamp-h1 - touch $@ -@@ -5934,7 +5920,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys. - luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \ - luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp) - --libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) -+libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) - $(AM_V_at)-rm -f libff.a - $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD) - $(AM_V_at)$(RANLIB) libff.a -@@ -5949,7 +5935,7 @@ ptexdir/libkanji_a-kanji.$(OBJEXT): ptexdir/$(am__dirs - ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) -+libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libkanji.a - $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libkanji.a -@@ -5972,7 +5958,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \ - luatexdir/luaffi/$(am__dirstamp) \ - luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp) - --libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) -+libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaffi.a - $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaffi.a -@@ -6025,12 +6011,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) -+libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaharfbuzz.a - $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaharfbuzz.a - --libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) -+libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluahbtexspecific.a - $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluahbtexspecific.a -@@ -6077,12 +6063,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) -+libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitharfbuzz.a - $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitharfbuzz.a - --libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) -+libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajithbtexspecific.a - $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajithbtexspecific.a -@@ -6147,7 +6133,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) -+libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitmisc.a - $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitmisc.a -@@ -6206,7 +6192,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) -+libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitsocket.a - $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitsocket.a -@@ -6613,7 +6599,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) -+libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittex.a - $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittex.a -@@ -6630,7 +6616,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) -+libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittexspecific.a - $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittexspecific.a -@@ -6659,7 +6645,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT): - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) -+libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluamisc.a - $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluamisc.a -@@ -6712,7 +6698,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT): - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) -+libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluasocket.a - $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluasocket.a -@@ -7058,7 +7044,7 @@ luatexdir/utils/libluatex_a-unistring.$(OBJEXT): \ - synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) -+libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatex.a - $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatex.a -@@ -7075,7 +7061,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT): - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) -+libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatexspecific.a - $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatexspecific.a -@@ -7088,12 +7074,12 @@ libmd5/$(DEPDIR)/$(am__dirstamp): - libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) -+libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmd5.a - $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD) - $(AM_V_at)$(RANLIB) libmd5.a - --libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) -+libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmf.a - $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD) - $(AM_V_at)$(RANLIB) libmf.a -@@ -7109,7 +7095,7 @@ mfluadir/$(DEPDIR)/$(am__dirstamp): - mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) -+libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflua.a - $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflua.a -@@ -7119,7 +7105,7 @@ luatexdir/lua/libmfluajit_a-lkpselib.$(OBJEXT): \ - mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) -+libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajit.a - $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajit.a -@@ -7133,7 +7119,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) -+libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajitlpeg.a - $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajitlpeg.a -@@ -7141,7 +7127,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) -+libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflualpeg.a - $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflualpeg.a -@@ -7662,7 +7648,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT - mfluadir/otfcc/lib/table/$(am__dirstamp) \ - mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp) - --libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) -+libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluaotfcc.a - $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluaotfcc.a -@@ -7676,22 +7662,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT): - mfluadir/potrace/$(am__dirstamp) \ - mfluadir/potrace/$(DEPDIR)/$(am__dirstamp) - --libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) -+libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluapotrace.a - $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluapotrace.a - --libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) -+libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibbackends.a - $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibbackends.a - --libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) -+libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibcore.a - $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibcore.a - --libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) -+libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibextramath.a - $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibextramath.a -@@ -7708,7 +7694,7 @@ mplibdir/libmputil_a-decNumber.$(OBJEXT): mplibdir/$(a - mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) -+libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmputil.a - $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD) - $(AM_V_at)$(RANLIB) libmputil.a -@@ -7779,7 +7765,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \ - pdftexdir/regex/$(am__dirstamp) \ - pdftexdir/regex/$(DEPDIR)/$(am__dirstamp) - --libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) -+libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libpdftex.a - $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD) - $(AM_V_at)$(RANLIB) libpdftex.a -@@ -7790,7 +7776,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT) - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) -+libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libsynctex.a - $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD) - $(AM_V_at)$(RANLIB) libsynctex.a -@@ -7805,7 +7791,7 @@ uptexdir/libukanji_a-kanji.$(OBJEXT): uptexdir/$(am__d - uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) -+libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libukanji.a - $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libukanji.a -@@ -7846,7 +7832,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \ - luatexdir/unilib/$(am__dirstamp) \ - luatexdir/unilib/$(DEPDIR)/$(am__dirstamp) - --libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) -+libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) - $(AM_V_at)-rm -f libunilib.a - $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD) - $(AM_V_at)$(RANLIB) libunilib.a -@@ -7904,7 +7890,7 @@ xetexdir/libxetex_a-XeTeX_mac.$(OBJEXT): xetexdir/$(am - xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp) - --libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) -+libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libxetex.a - $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD) - $(AM_V_at)$(RANLIB) libxetex.a -@@ -7915,7 +7901,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) -+libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS) - alephdir/$(am__dirstamp): - @$(MKDIR_P) alephdir -@@ -7930,87 +7916,87 @@ alephdir/aleph-alephbis.$(OBJEXT): alephdir/$(am__dirs - alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \ - alephdir/$(DEPDIR)/$(am__dirstamp) - --aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) -+aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) - @rm -f aleph$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS) - --bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) -+bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) - @rm -f bibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS) - --call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) -+call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) - @rm -f call_luahbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS) - --call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) -+call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) - @rm -f call_luajithbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS) - --call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) -+call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) - @rm -f call_luajittex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS) - --call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) -+call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) - @rm -f call_luatex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS) - --call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) -+call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) - @rm -f call_mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS) - --call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) -+call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) - @rm -f call_mflua$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS) - --call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) -+call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) - @rm -f call_mfluajit$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS) - --call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) -+call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) - @rm -f call_mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS) - --call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) -+call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) - @rm -f call_pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS) - --call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) -+call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) - @rm -f call_upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS) - --ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) -+ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) - @rm -f ctangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS) - --ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) -+ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) - @rm -f ctangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS) - --ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) -+ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) - @rm -f ctie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS) - --ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) -+ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) - @rm -f ctwill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS) - --ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) -+ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) - @rm -f ctwill-refsort$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS) - --ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) -+ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) - @rm -f ctwill-twinx$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS) - --cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) -+cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) - @rm -f cweave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS) - --dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) -+dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) - @rm -f dvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS) - --dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) -+dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) - @rm -f dvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS) - eptexdir/$(am__dirstamp): -@@ -8024,7 +8010,7 @@ eptexdir/eptex-eptexextra.$(OBJEXT): eptexdir/$(am__di - synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) -+eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) - @rm -f eptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS) - etexdir/$(am__dirstamp): -@@ -8038,7 +8024,7 @@ etexdir/etex-etexextra.$(OBJEXT): etexdir/$(am__dirsta - synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) -+etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) - @rm -f etex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS) - euptexdir/$(am__dirstamp): -@@ -8052,23 +8038,23 @@ euptexdir/euptex-euptexextra.$(OBJEXT): euptexdir/$(am - synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) -+euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) - @rm -f euptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS) - --gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) -+gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) - @rm -f gftodvi$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS) - --gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) -+gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) - @rm -f gftopk$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS) - --gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) -+gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) - @rm -f gftype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS) - --himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) -+himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) - @rm -f himktables$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS) - hitexdir/$(am__dirstamp): -@@ -8082,19 +8068,19 @@ hitexdir/hishrink-hilexer.$(OBJEXT): hitexdir/$(am__di - hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \ - hitexdir/$(DEPDIR)/$(am__dirstamp) - --hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) -+hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) - @rm -f hishrink$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS) - --histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) -+histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) - @rm -f histretch$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS) - --hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) -+hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) - @rm -f hitex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS) - --initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) -+initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) - @rm -f initex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS) - luatexdir/$(am__dirstamp): -@@ -8108,7 +8094,7 @@ luatexdir/luahbtex-luatex.$(OBJEXT): luatexdir/$(am__d - mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) -+luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) - @rm -f luahbtex$(EXEEXT) - $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS) - luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8116,7 +8102,7 @@ luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am - mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) -+luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) - @rm -f luajithbtex$(EXEEXT) - $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS) - luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8124,7 +8110,7 @@ luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__ - mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) -+luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) - @rm -f luajittex$(EXEEXT) - $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS) - luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8132,33 +8118,33 @@ luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dir - mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) -+luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) - @rm -f luatex$(EXEEXT) - $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS) - libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) -+md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) - @rm -f md5main$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS) - --mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) -+mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) - @rm -f mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS) - --mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) -+mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) - @rm -f mf-nowin$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS) - mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) -+mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) - @rm -f mflua$(EXEEXT) - $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS) - mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) -+mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) - @rm -f mflua-nowin$(EXEEXT) - $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS) - mfluajitdir/$(am__dirstamp): -@@ -8171,38 +8157,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) -+mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) - @rm -f mfluajit$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS) - mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) -+mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) - @rm -f mfluajit-nowin$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS) - --mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) -+mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) - @rm -f mft$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS) - --mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) -+mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) - @rm -f mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS) - --odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) -+odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) - @rm -f odvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS) - --odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) -+odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) - @rm -f odvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS) - --otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) -+otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) - @rm -f otangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS) - --patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) -+patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) - @rm -f patgen$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS) - pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8210,67 +8196,67 @@ pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am - synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) -+pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) - @rm -f pdftex$(EXEEXT) - $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS) - pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) -+pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) - @rm -f pdftosrc$(EXEEXT) - $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS) - --pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) -+pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) - @rm -f pktogf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS) - --pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) -+pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) - @rm -f pktype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS) - --pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) -+pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) - @rm -f pltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS) - --pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) -+pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) - @rm -f pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS) - --pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) -+pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) - @rm -f pooltype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS) - ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) -+ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) - @rm -f ptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS) - synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) -+synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) - @rm -f synctex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS) - --tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) -+tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) - @rm -f tangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS) - --tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) -+tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) - @rm -f tangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS) - synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) -+tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) - @rm -f tex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS) - --tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) -+tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) - @rm -f tftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS) - --tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) -+tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) - @rm -f tie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS) - pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8278,65 +8264,65 @@ pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__d - pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) -+ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) - @rm -f ttf2afm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS) - --twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) -+twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) - @rm -f twill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS) - --upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) -+upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) - @rm -f upbibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS) - --updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) -+updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) - @rm -f updvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS) - --upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) -+upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) - @rm -f upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS) - --uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) -+uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) - @rm -f uppltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS) - uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) -+uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) - @rm -f uptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS) - --uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) -+uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) - @rm -f uptftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS) - --vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) -+vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) - @rm -f vftovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS) - --vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) -+vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) - @rm -f vptovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS) - --weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) -+weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) - @rm -f weave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS) - --wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) -+wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) - @rm -f wofm2opl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS) - --wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) -+wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) - @rm -f wopl2ofm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS) - --wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) -+wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) - @rm -f wovf2ovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS) - --wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) -+wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) - @rm -f wovp2ovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS) - xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \ -@@ -8344,7 +8330,7 @@ xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__di - synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) -+xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) - @rm -f xetex$(EXEEXT) - $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS) - -@@ -19275,7 +19261,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) - fi; \ - $$success || exit 1 - --check-TESTS: -+check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) -@@ -19285,7 +19271,7 @@ check-TESTS: - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; --recheck: all -+recheck: all - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ -@@ -19546,7 +19532,7 @@ install-data: install-data-recursive - uninstall: uninstall-recursive - - install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am - - installcheck: installcheck-recursive - install-strip: -@@ -21302,9 +21288,6 @@ $(proglib): $(proglib_sources) + $(am__append_92) $(am__append_97) $(am__append_102) \ +@@ -21452,9 +21437,6 @@ $(proglib): $(proglib_sources) @KPATHSEA_RULE@ @PTEXENC_RULE@ @ZLIB_RULE@ -@LUA52_RULE@ -@LUA53_RULE@ -@LUAJIT_RULE@ @LIBPNG_RULE@ @FREETYPE2_RULE@ @PIXMAN_RULE@ -@@ -21636,7 +21619,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND) - - #EXTRA_DIST += - --#EXTRA_DIST += -+#EXTRA_DIST += - - $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND) - -@@ -21801,7 +21784,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w - $(mp_ctangle) tfmin.w - - # Creating several files: need stamp file and two rules with identical recipes --$(mp_c_h): mp-tangle -+$(mp_c_h): mp-tangle - $(mp_ctangle_sh) mp - mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh - $(mp_ctangle_sh) mp -@@ -21848,7 +21831,7 @@ svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tang - - $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h) - --$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) -+$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) - $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND) - $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) - -@@ -22099,7 +22082,7 @@ hitex-tangle: ctangle$(EXEEXT) hitexdir/hitex.w tangle - hitables.c: himktables$(EXEEXT) - ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; } - --# hitex, histretch, and hishrink all need (at least) some -+# hitex, histretch, and hishrink all need (at least) some - # of the sources generated from hiformat.w. - # - $(hitex_OBJECTS): hiformat-tangle -@@ -22166,36 +22149,36 @@ $(libluajitmisc_a_OBJECTS): $(libluajitmisc_a_DEPENDEN - - $(libff_a_OBJECTS): libunilib.a - --$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - - utils-hb.c: luatexdir/utils/utils.c - $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c - --luatex-api-hb.h: luatexdir/lua/luatex-api.h -+luatex-api-hb.h: luatexdir/lua/luatex-api.h - $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h - - luastuff-hb.c: luatexdir/lua/luastuff.c -- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c -+ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c - - luainit-hb.c: luatexdir/lua/luainit.c - $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c - --printing-hb.c: luatexdir/tex/printing.c -- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c -+printing-hb.c: luatexdir/tex/printing.c -+ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c - - #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND) - - $(libluaffi_a_OBJECTS): $(LUA_DEPEND) - - #liblua53ffi_sources = $(libluaffi_sources) --#EXTRA_DIST -+#EXTRA_DIST - - $(luatex_OBJECTS): libluatex.a - $(luajittex_OBJECTS): libluajittex.a diff --git a/print/tex-ptexenc/Makefile b/print/tex-ptexenc/Makefile index 794cc64cf839..b214e9e1684b 100644 --- a/print/tex-ptexenc/Makefile +++ b/print/tex-ptexenc/Makefile @@ -1,38 +1,38 @@ PORTNAME= ptexenc -PORTVERSION= 1.4.3 +DISTVERSION= 1.4.6 CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/Source/${TEXLIVE_YEAR} PKGNAMEPREFIX= tex- DISTNAME= texlive-${TEXLIVE_VERSION}-source DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= Library for Japanese pTeX and its tools LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= iconv libtool pathfix pkgconfig tar:xz tex USE_LDCONFIG= yes USE_TEX= kpathsea GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-kanji-iconv \ --with-system-kpathsea \ --with-kpathsea-includes=${LOCALBASE}/include \ --with-kpathsea-libdir=${LOCALBASE}/lib INSTALL_TARGET= install-strip CPPFLAGS+= -I${ICONV_PREFIX}/include LIBS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB} EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S/^/${DISTNAME}\//} WRKSRC= ${WRKDIR}/${DISTNAME}/texk/ptexenc PLIST_SUB= VERSION=${PORTVERSION} EXTRACT_FILES= build-aux texk/ptexenc .include diff --git a/print/tex-ptexenc/distinfo b/print/tex-ptexenc/distinfo index 7529ce9d886e..71891df8f5bc 100644 --- a/print/tex-ptexenc/distinfo +++ b/print/tex-ptexenc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680474710 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 +TIMESTAMP = 1715472906 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 diff --git a/print/tex-ptexenc/files/patch-Makefile.in b/print/tex-ptexenc/files/patch-Makefile.in index 3c7682343701..1409fcb8b11a 100644 --- a/print/tex-ptexenc/files/patch-Makefile.in +++ b/print/tex-ptexenc/files/patch-Makefile.in @@ -1,12 +1,12 @@ ---- Makefile.in.orig 2023-04-02 22:35:25 UTC +--- Makefile.in.orig 2024-05-12 00:15:23 UTC +++ Makefile.in -@@ -404,7 +404,8 @@ nobase_include_HEADERS = \ +@@ -591,7 +591,8 @@ nobase_include_HEADERS = \ libptexenc_la_LIBADD = $(KPATHSEA_LIBS) nobase_include_HEADERS = \ ptexenc/ptexenc.h \ - ptexenc/unicode.h + ptexenc/unicode.h \ + ptexenc/unicode-jp.h pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = ptexenc.pc diff --git a/print/tex-ptexenc/files/patch-configure b/print/tex-ptexenc/files/patch-configure index c9be2825b406..0014cccd8055 100644 --- a/print/tex-ptexenc/files/patch-configure +++ b/print/tex-ptexenc/files/patch-configure @@ -1,44 +1,44 @@ ---- configure.orig 2023-04-02 22:35:55 UTC +--- configure.orig 2024-02-11 08:19:52 UTC +++ configure -@@ -15940,7 +15940,7 @@ else $as_nop +@@ -16100,7 +16100,7 @@ else case e in #( printf %s "(cached) " >&6 - else $as_nop - ac_check_lib_save_LIBS=$LIBS + else case e in #( + e) ac_check_lib_save_LIBS=$LIBS -LIBS="-liconv $LIBS" +LIBS="$LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -15972,7 +15972,7 @@ then : +@@ -16140,7 +16140,7 @@ then : then : printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h - LIBS="-liconv $LIBS" + LIBS="$LIBS" - else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5 -@@ -15982,7 +15982,7 @@ else $as_nop + else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5 +@@ -16150,7 +16150,7 @@ else case e in #( printf %s "(cached) " >&6 - else $as_nop - ac_check_lib_save_LIBS=$LIBS + else case e in #( + e) ac_check_lib_save_LIBS=$LIBS -LIBS="-liconv $LIBS" +LIBS="$LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -16014,7 +16014,7 @@ then : +@@ -16190,7 +16190,7 @@ then : then : printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h - LIBS="-liconv $LIBS" + LIBS="$LIBS" fi - -@@ -18360,5 +18360,3 @@ fi + ;; +@@ -18551,5 +18551,3 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - - diff --git a/print/tex-xdvik/Makefile b/print/tex-xdvik/Makefile index 6c95f841c973..2a4e77297e71 100644 --- a/print/tex-xdvik/Makefile +++ b/print/tex-xdvik/Makefile @@ -1,64 +1,66 @@ PORTNAME= xdvik -PORTVERSION= 22.87.06 -PORTREVISION= 3 +DISTVERSION= 22.87.06 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= SF/xdvi/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= tex- DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= DVI Previewer(kpathsearch) for X WWW= https://xdvi.sourceforge.net/ LICENSE= GPLv2 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpaper.so:print/libpaper RUN_DEPENDS= tex-dvipsk>=5.995:print/tex-dvipsk USES= autoreconf iconv libtool:build motif pkgconfig tex xorg USE_TEX= kpathsea texhash web2c USE_XORG= ice sm x11 xext xi xmu xpm xt -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/texk/xdvik GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --datarootdir=${LOCALBASE}/share \ --enable-shared \ --enable-xi2-scrolling \ --with-default-dvips-path=${LOCALBASE}/bin/dvips \ --with-default-gs-lib-path=${LOCALBASE}/lib \ --with-default-ps2pdf-path=${LOCALBASE}/bin/ps2pdf \ --with-iconv \ --with-kpathsea-includes=${LOCALBASE}/include/kpathsea \ --with-kpathsea-libdir=${LOCALBASE}/lib \ --with-system-freetype2 \ --with-system-kpathsea \ --with-system-libgs \ --with-system-zlib \ --with-xdvi-x-toolkit=motif \ --with-xpm CONFIGURE_ENV= INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" CFLAGS+= -I${LOCALBASE}/include -DHAVE_LIBPAPER -g -O0 + BINARY_ALIAS= freetype-config=true + +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/${DISTNAME}/texk/xdvik + PLIST_SUB= TEXMFDISTDIR=${TEXMFDISTDIR} PORTDOCS= BUGS CHANGES ChangeLog INSTALL README* TODO OPTIONS_DEFINE= DOCS TEXHASHDIRS= ${TEXMFDISTDIR} post-install: cd ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/xdvi && ${MV} XDvi XDvi.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKDIR}/${DISTNAME} && \ ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile index 4cedb6abe51e..f926c97df2da 100644 --- a/print/tex-xetex/Makefile +++ b/print/tex-xetex/Makefile @@ -1,117 +1,116 @@ PORTNAME= xetex -PORTVERSION= 0.99993 -PORTREVISION= 5 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ +MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${TEXLIVE_VERSION}-source DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DISTNAME_TEXMF}${EXTRACT_SUFX} DIST_SUBDIR= TeX EXTRACT_ONLY= texlive-${TEXLIVE_VERSION}-source${EXTRACT_SUFX} MAINTAINER= tex@FreeBSD.org COMMENT= TeX System with Unicode and Modern Font Technologies LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ libicuio.so:devel/icu \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libpng.so:graphics/png \ libTECkit.so:textproc/teckit USES= compiler:c++11-lib localbase gnome perl5 pkgconfig \ python:build tar:xz tex xorg USE_CXXSTD= gnu++11 USE_GNOME= cairo USE_PERL5= build USE_TEX= kpathsea web2c formats fmtutil dvipdfmx USE_XORG= pixman GNU_CONFIGURE= yes CONFIGURE_ARGS+=CC="${CC}" \ CXX="${CXX}" \ ${EXCLUDE_ENGINES:S/^/--disable-/} \ --enable-xetex \ --with-system-freetype2 \ --with-freetype2-includes=${LOCALBASE}/include/freetype2 \ --with-freetype2-libdir=${LOCALBASE}/lib \ --with-system-graphite2 \ --with-graphite2-includes=${LOCALBASE}/include/graphite2 \ --with-graphite2-libdir=${LOCALBASE}/lib \ --with-system-harfbuzz \ --with-system-teckit \ --with-teckit-includes=${LOCALBASE}/include/teckit \ --with-teckit-libdir=${LOCALBASE}/lib \ --with-system-zziplib \ --with-system-zlib .for L in cairo gmp kpathsea libpng mpfr pixman ptexenc icu CONFIGURE_ARGS+=--with-system-$L \ --with-$L-include=${LOCALBASE}/include \ --with-$L-libdir=${LOCALBASE}/lib .endfor MAKE_JOBS_UNSAFE= yes CPPFLAGS= -I${LOCALBASE}/include/harfbuzz EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux \ libs/pplib \ libs/xpdf \ texk/web2c EXTRACT_AFTER_ARGS_TEXMF= \ | ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner \ ${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,} EXTRACT_FILES_TEXMF= \ texmf-dist/doc/xelatex \ texmf-dist/doc/xetex \ texmf-dist/fonts/misc/xetex \ texmf-dist/source/xelatex \ texmf-dist/tex/xelatex \ texmf-dist/tex/xetex EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin \ mflua mfluajit luahbtex luajithbtex ptex eptex uptex euptex \ otangle mp pmp upmp web2c web-progs tex synctex WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFVARDIR} TEX_FORMATS= xetex post-extract: @${FIND} ${WRKSRC} -name '*.orig' -delete pre-configure: for D in libs/xpdf libs/pplib; do \ cd ${WRKDIR}/${DISTNAME}/$$D && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \ ${CONFIGURE_ARGS}; \ done cd ${WRKDIR}/${DISTNAME}/libs/pplib && \ ${MAKE} pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share ${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS_TEXMF} post-stage: ${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/hanzibox/build.sh ${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python|${PYTHON_CMD}|g' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/dkun-0.3.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/dkun-0.4.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/undk-0.6.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/unldk-0.2.py ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/source/xelatex/arabxetex/makemaps.pl ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST} .include diff --git a/print/tex-xetex/distinfo b/print/tex-xetex/distinfo index 2efa46e0a39a..0070f5115bbe 100644 --- a/print/tex-xetex/distinfo +++ b/print/tex-xetex/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1680912912 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 -SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253 -SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744 +TIMESTAMP = 1716937886 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 +SHA256 (TeX/texlive-20240312-texmf.tar.xz) = c8eae2deaaf51e86d93baa6bbcc4e94c12aa06a0d92893df474cc7d2a012c7a7 +SIZE (TeX/texlive-20240312-texmf.tar.xz) = 4270954732 diff --git a/print/tex-xetex/files/patch-Makefile.in b/print/tex-xetex/files/patch-Makefile.in index 274935e147ac..81f59109b014 100644 --- a/print/tex-xetex/files/patch-Makefile.in +++ b/print/tex-xetex/files/patch-Makefile.in @@ -1,1354 +1,58 @@ ---- Makefile.in.orig 2023-04-08 00:33:55 UTC +--- Makefile.in.orig 2024-02-28 04:19:31 UTC +++ Makefile.in -@@ -101,18 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE +@@ -102,18 +102,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \ md5main$(EXEEXT) -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \ - ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \ - ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \ - $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ - $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \ - $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \ - $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \ - $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \ - $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \ - $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \ - $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \ - $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) +bin_PROGRAMS = xetex$(EXEEXT) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \ $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \ -@@ -488,7 +477,7 @@ am__v_AR_0 = @echo " AR " $@; - AM_V_AR = $(am__v_AR_@AM_V@) - am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) - am__v_AR_0 = @echo " AR " $@; --am__v_AR_1 = -+am__v_AR_1 = - libff_a_AR = $(AR) $(ARFLAGS) - libff_a_LIBADD = - am__dirstamp = $(am__leading_dot)dirstamp -@@ -1234,7 +1223,7 @@ am__v_lt_0 = --silent - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent --am__v_lt_1 = -+am__v_lt_1 = - libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@ -@@ -1699,11 +1688,11 @@ am__v_GEN_0 = @echo " GEN " $@; - AM_V_GEN = $(am__v_GEN_@AM_V@) - am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) - am__v_GEN_0 = @echo " GEN " $@; --am__v_GEN_1 = -+am__v_GEN_1 = - AM_V_at = $(am__v_at_@AM_V@) - am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) - am__v_at_0 = @ --am__v_at_1 = -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c - depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp - am__maybe_remake_depfiles = depfiles -@@ -2395,7 +2384,7 @@ am__v_CC_0 = @echo " CC " $@; - AM_V_CC = $(am__v_CC_@AM_V@) - am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) - am__v_CC_0 = @echo " CC " $@; --am__v_CC_1 = -+am__v_CC_1 = - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -2403,7 +2392,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; - AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; --am__v_CCLD_1 = -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -@@ -2413,14 +2402,14 @@ am__v_CXX_0 = @echo " CXX " $@; - AM_V_CXX = $(am__v_CXX_@AM_V@) - am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) - am__v_CXX_0 = @echo " CXX " $@; --am__v_CXX_1 = -+am__v_CXX_1 = - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) - am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) - am__v_CXXLD_0 = @echo " CXXLD " $@; --am__v_CXXLD_1 = -+am__v_CXXLD_1 = - OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) - LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ -@@ -2430,7 +2419,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@; - AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@) - am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@) - am__v_OBJCXX_0 = @echo " OBJCXX " $@; --am__v_OBJCXX_1 = -+am__v_OBJCXX_1 = - OBJCXXLD = $(OBJCXX) - OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \ -@@ -2438,7 +2427,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; - AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@) - am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@) - am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; --am__v_OBJCXXLD_1 = -+am__v_OBJCXXLD_1 = - SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ - $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \ - $(nodist_libluahbtexspecific_a_SOURCES) \ -@@ -3000,7 +2989,8 @@ PPLIB_DEPEND = @PPLIB_DEPEND@ +@@ -3019,7 +3008,8 @@ PPLIB_DEPEND = @PPLIB_DEPEND@ POTRACE_INCLUDES = @POTRACE_INCLUDES@ POTRACE_LIBS = @POTRACE_LIBS@ PPLIB_DEPEND = @PPLIB_DEPEND@ -PPLIB_INCLUDES = @PPLIB_INCLUDES@ +PPLIB_INCLUDES = -I@top_srcdir@/../../libs/pplib/pplib-src/src/util \ + -I@top_srcdir@/../../libs/pplib/pplib-src/src PPLIB_LIBS = @PPLIB_LIBS@ PTEXENC_DEPEND = @PTEXENC_DEPEND@ PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -@@ -3105,14 +3095,14 @@ version = $(WEB2CVERSION) +@@ -3124,7 +3114,7 @@ version = $(WEB2CVERSION) AM_CXXFLAGS = ## $(WARNING_CXXFLAGS) AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS) version = $(WEB2CVERSION) -SUBDIRS = doc lib man web2c . window omegafonts otps +SUBDIRS = . proglib = lib/lib.a #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a - - #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a - --#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a -+#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a - EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \ - libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \ -@@ -3128,7 +3118,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/m - lib_LIBRARIES = $(am__append_126) - lib_LTLIBRARIES = $(am__append_125) - dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 --nodist_man_MANS = -+nodist_man_MANS = - TEST_EXTENSIONS = .pl .test - # - # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for -@@ -3711,19 +3701,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si - tangle_silent = $(tangle_silent_@AM_V@) - tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@) - tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ # --tangle_silent_1 = -+tangle_silent_1 = - # - ctangle = $(buildenv) $(CTANGLE) - ctangle_silent = $(ctangle_silent_@AM_V@) - ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@) - ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ # --ctangle_silent_1 = -+ctangle_silent_1 = - # - tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE) - tie_silent = $(tie_silent_@AM_V@) - tie_silent_ = $(tie_silent_@AM_DEFAULT_V@) - tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ # --tie_silent_1 = -+tie_silent_1 = - tie_c = $(tie) -c $@ - tie_m = $(tie) -m $@ - -@@ -3732,7 +3722,7 @@ DIFF = diff - - # For trip, trap, and other tests - DIFF = diff --DIFFFLAGS = -+DIFFFLAGS = - AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \ - DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \ - DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \ -@@ -3740,29 +3730,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor - - # To run, e.g., just the original trip test, in the build directory: - # make -C $ww TRIPTRAP=trip.diffs triptrap --# where $ww is the web2c build directory. --# -+# where $ww is the web2c build directory. -+# - # This will run the triptrap-sh script - # which then runs make TEST=triptest.test check-am, - # which then runs the (srcdir file) triptest.test script; - # its output will be in (builddir file) trip.diffs, --# and triptest.out if the test failed, -+# and triptest.out if the test failed, - # plus various created files in the tripdir/ subdirectory. - # The triptest.diffs file will have the actual abs_srcdir value replaced - # with the constant string "SRCDIR" to minimize differences, and "../" - # replaced with "./" to match the canonical output. Confusing. For the - # real output, see triptest.log. --# -+# - # To build only tex, make -C $ww tex (i.e., in builddir) should do it. - # Unfortunately the check-am target depends on all-am, so all engines - # are built before any tests are run. If this is a problem, just have to - # edit the generated Makefile in builddir to remove the dependency. --# -+# - # Other per-engine invocations (see triptrap-sh for complete list): - # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap --# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap --# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap --# -+# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap -+# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap -+# - triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh - - # The environment for making dumps. -@@ -3773,7 +3763,7 @@ cp_silent_0 = @echo " COPY " $@; - cp_silent = $(cp_silent_@AM_V@) - cp_silent_ = $(cp_silent_@AM_DEFAULT_V@) - cp_silent_0 = @echo " COPY " $@; --cp_silent_1 = -+cp_silent_1 = - nodist_tangle_SOURCES = tangle.c tangle.h - nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h - tangleboot_DEPENDENCIES = $(default_dependencies) -@@ -3820,7 +3810,7 @@ nodist_initex_SOURCES = callexe.c - tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C - initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" - nodist_initex_SOURCES = callexe.c --initex_LDADD = -+initex_LDADD = - tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130) - - # With --enable-ipc, TeX may need to link with -lsocket. -@@ -3848,7 +3838,7 @@ nodist_call_mf_SOURCES = callexe.c - tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test - call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\" - nodist_call_mf_SOURCES = callexe.c --call_mf_LDADD = -+call_mf_LDADD = - dist_mf_SOURCES = mfextra.c - mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) - mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) -@@ -3880,7 +3870,7 @@ nodist_call_mflua_SOURCES = callexe.c - mf_tests = mftraptest.test - call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\" - nodist_call_mflua_SOURCES = callexe.c --call_mflua_LDADD = -+call_mflua_LDADD = - dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h - mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES) - mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS) -@@ -3912,7 +3902,7 @@ libmfluaotfcc_a_CPPFLAGS = \ - -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \ - -I$(top_srcdir)/mfluadir/otfcc/include \ - -I$(top_srcdir)/mfluadir/otfcc/include/dep \ -- -I$(top_srcdir)/mfluadir/otfcc/lib -+ -I$(top_srcdir)/mfluadir/otfcc/lib - - libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS) - -@@ -4174,7 +4164,7 @@ libmfluaotfcc_a_SOURCES = \ - mfluadir/otfcc/lib/table/VDMX.h \ - mfluadir/otfcc/lib/table/SVG.c \ - mfluadir/otfcc/lib/table/head.h \ -- mfluadir/otfcc/lib/table/TSI5.c -+ mfluadir/otfcc/lib/table/TSI5.c - - libmfluapotrace_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/potrace \ -@@ -4185,7 +4175,7 @@ libmfluapotrace_a_SOURCES = \ - #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources) - libmfluapotrace_a_SOURCES = \ - mfluadir/potrace/luafunc.c \ -- mfluadir/potrace/luafunc.h -+ mfluadir/potrace/luafunc.h - - libmflualpeg_a_CPPFLAGS = \ - -I$(top_srcdir)/mfluadir/luapeg \ -@@ -4194,11 +4184,11 @@ libmflualpeg_a_SOURCES = \ - libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmflualpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\" - nodist_call_mfluajit_SOURCES = callexe.c --call_mfluajit_LDADD = -+call_mfluajit_LDADD = - dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h - mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES) - mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS) -@@ -4234,7 +4224,7 @@ libmfluajitlpeg_a_SOURCES = \ - libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS) - libmfluajitlpeg_a_SOURCES = \ - mfluadir/luapeg/lpeg.c \ -- mfluadir/luapeg/lpeg.h -+ mfluadir/luapeg/lpeg.h - - mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir - mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ -@@ -4242,7 +4232,7 @@ nodist_call_mpost_SOURCES = callexe.c - - call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" - nodist_call_mpost_SOURCES = callexe.c --call_mpost_LDADD = -+call_mpost_LDADD = - - # Creating one file: just one rule - mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) -@@ -4254,10 +4244,10 @@ nodist_call_pmpost_SOURCES = callexe.c - mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test - call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\" - nodist_call_pmpost_SOURCES = callexe.c --call_pmpost_LDADD = -+call_pmpost_LDADD = - call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\" - nodist_call_upmpost_SOURCES = callexe.c --call_upmpost_LDADD = -+call_upmpost_LDADD = - pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - -@@ -4311,7 +4301,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir - - nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \ -- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) -+ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) - - nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h) - nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h) -@@ -4605,7 +4595,7 @@ hiformat_c_h_l_y = \ - hiskip.c \ - histretch.c - --hitex_c = hitex.c -+hitex_c = hitex.c - - # hitex - nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c) -@@ -4758,11 +4748,11 @@ libluasocket_sources = \ - luatexdir/luasocket/src/timeout.h \ - luatexdir/luasocket/src/udp.c \ - luatexdir/luasocket/src/udp.h \ -- luatexdir/luasocket/src/usocket.h -+ luatexdir/luasocket/src/usocket.h - --libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a --#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a --libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a -+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a -+#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a -+libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a - libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES) - #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES) - libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \ -@@ -4892,8 +4882,8 @@ LUA_DEPEND = $(LUA53_DEPEND) - LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES) - LUA_LIBS = $(LUA53_LIBS) - LUA_DEPEND = $(LUA53_DEPEND) --libluatex_a_DEPENDENCIES = libff.a libluamisc.a --libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a -+libluatex_a_DEPENDENCIES = libff.a libluamisc.a -+libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a - libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ - $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \ - -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \ -@@ -4914,7 +4904,7 @@ dist_libluatex_a_SOURCES = \ - dist_libluatex_a_SOURCES = \ - luatexdir/lua/lstrlibext.c \ - luatexdir/lua/helpers.c \ -- luatexdir/lua/texluac.c -+ luatexdir/lua/texluac.c - - nodist_libluatex_a_SOURCES = \ - $(dist_libluatex_sources) \ -@@ -4932,7 +4922,7 @@ nodist_libluatexspecific_a_SOURCES = \ - - #dist_libluatexspecific_a_SOURCES = - nodist_libluatexspecific_a_SOURCES = \ -- $(dist_libluatexspecific_sources) -+ $(dist_libluatexspecific_sources) - - #dist_libluajittexspecific_a_SOURCES = - nodist_libluajittexspecific_a_SOURCES = \ -@@ -4940,46 +4930,46 @@ nodist_libluahbtexspecific_a_SOURCES = \ - - #dist_libluahbtexspecific_a_SOURCES = - nodist_libluahbtexspecific_a_SOURCES = \ -- $(dist_libluahbtexspecific_sources) -+ $(dist_libluahbtexspecific_sources) - --#dist_libluajithbtexspecific_a_SOURCES = -+#dist_libluajithbtexspecific_a_SOURCES = - nodist_libluajithbtexspecific_a_SOURCES = \ -- $(dist_libluajithbtexspecific_sources) -+ $(dist_libluajithbtexspecific_sources) - - dist_libluatexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - dist_libluajittexspecific_sources = \ - luatexdir/utils/utils.c \ - luatexdir/lua/luatex-api.h \ - luatexdir/lua/luastuff.c \ - luatexdir/lua/luainit.c \ -- luatexdir/tex/printing.c -+ luatexdir/tex/printing.c - - --# luatexdir/utils/utils-hb.c -+# luatexdir/utils/utils-hb.c - dist_libluahbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - - --#luatexdir/utils/utils-hb.c -+#luatexdir/utils/utils-hb.c - dist_libluajithbtexspecific_sources = \ - utils-hb.c \ - luatex-api-hb.h \ - luastuff-hb.c \ - luainit-hb.c \ -- printing-hb.c -+ printing-hb.c - --libluatex_web = --nodist_libluatex_sources = -+libluatex_web = -+nodist_libluatex_sources = - - # dist_libluatex_sources += \ - # luatexdir/tex/align.h \ -@@ -5047,7 +5037,7 @@ nodist_libluatex_sources = - # luatexdir/tex/texmath.c \ - # luatexdir/tex/texnodes.c \ - # luatexdir/tex/textcodes.c \ --# luatexdir/tex/textoken.c -+# luatexdir/tex/textoken.c - dist_libluatex_sources = luatexdir/luatexcallbackids.h \ - luatexdir/luatex.h luatexdir/luatex-common.h \ - luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \ -@@ -5180,7 +5170,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src - # luatexdir/lua/luanode.c \ - # luatexdir/lua/luastuff.c \ - # luatexdir/lua/luatoken.c \ --# luatexdir/lua/mplibstuff.c -+# luatexdir/lua/mplibstuff.c - luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) - - ################################################################################ -@@ -5297,16 +5287,16 @@ nodist_call_luatex_SOURCES = callexe.c - - call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" - nodist_call_luatex_SOURCES = callexe.c --call_luatex_LDADD = -+call_luatex_LDADD = - call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\" - nodist_call_luahbtex_SOURCES = callexe.c --call_luahbtex_LDADD = -+call_luahbtex_LDADD = - call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\" - nodist_call_luajittex_SOURCES = callexe.c --call_luajittex_LDADD = -+call_luajittex_LDADD = - call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\" - nodist_call_luajithbtex_SOURCES = callexe.c --call_luajithbtex_LDADD = -+call_luajithbtex_LDADD = - - # LuaTeX/LuaJITTeX Tests - # -@@ -5646,7 +5636,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf - w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status - @rm -f w2c/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h --$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f w2c/stamp-h1 - touch $@ -@@ -5934,7 +5924,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys. - luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \ - luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp) - --libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) -+libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES) - $(AM_V_at)-rm -f libff.a - $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD) - $(AM_V_at)$(RANLIB) libff.a -@@ -5949,7 +5939,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_ - ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) -+libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libkanji.a - $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libkanji.a -@@ -5972,7 +5962,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \ - luatexdir/luaffi/$(am__dirstamp) \ - luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp) - --libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) -+libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaffi.a - $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaffi.a -@@ -6025,12 +6015,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) -+libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluaharfbuzz.a - $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluaharfbuzz.a - --libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) -+libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluahbtexspecific.a - $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluahbtexspecific.a -@@ -6077,12 +6067,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz - luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \ - luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp) - --libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) -+libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitharfbuzz.a - $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitharfbuzz.a - --libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) -+libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajithbtexspecific.a - $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajithbtexspecific.a -@@ -6147,7 +6137,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) -+libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitmisc.a - $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitmisc.a -@@ -6206,7 +6196,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) -+libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajitsocket.a - $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajitsocket.a -@@ -6613,7 +6603,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) -+libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittex.a - $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittex.a -@@ -6630,7 +6620,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) -+libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluajittexspecific.a - $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluajittexspecific.a -@@ -6659,7 +6649,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT): - luatexdir/slnunicode/$(am__dirstamp) \ - luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp) - --libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) -+libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluamisc.a - $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD) - $(AM_V_at)$(RANLIB) libluamisc.a -@@ -6712,7 +6702,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT): - luatexdir/luasocket/src/$(am__dirstamp) \ - luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp) - --libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) -+libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluasocket.a - $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD) - $(AM_V_at)$(RANLIB) libluasocket.a -@@ -7058,7 +7048,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$ - synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) -+libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatex.a - $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatex.a -@@ -7075,7 +7065,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT): - luatexdir/tex/$(am__dirstamp) \ - luatexdir/tex/$(DEPDIR)/$(am__dirstamp) - --libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) -+libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES) - $(AM_V_at)-rm -f libluatexspecific.a - $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD) - $(AM_V_at)$(RANLIB) libluatexspecific.a -@@ -7088,12 +7078,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) -+libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmd5.a - $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD) - $(AM_V_at)$(RANLIB) libmd5.a - --libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) -+libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmf.a - $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD) - $(AM_V_at)$(RANLIB) libmf.a -@@ -7109,7 +7099,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d - mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) -+libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflua.a - $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflua.a -@@ -7119,7 +7109,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am - mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) -+libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajit.a - $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajit.a -@@ -7133,7 +7123,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) -+libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluajitlpeg.a - $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluajitlpeg.a -@@ -7141,7 +7131,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \ - mfluadir/luapeg/$(am__dirstamp) \ - mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp) - --libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) -+libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmflualpeg.a - $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD) - $(AM_V_at)$(RANLIB) libmflualpeg.a -@@ -7662,7 +7652,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT - mfluadir/otfcc/lib/table/$(am__dirstamp) \ - mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp) - --libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) -+libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluaotfcc.a - $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluaotfcc.a -@@ -7676,22 +7666,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT): - mfluadir/potrace/$(am__dirstamp) \ - mfluadir/potrace/$(DEPDIR)/$(am__dirstamp) - --libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) -+libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmfluapotrace.a - $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD) - $(AM_V_at)$(RANLIB) libmfluapotrace.a - --libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) -+libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibbackends.a - $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibbackends.a - --libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) -+libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibcore.a - $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibcore.a - --libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) -+libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplibextramath.a - $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplibextramath.a -@@ -7708,7 +7698,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$( - mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) -+libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmputil.a - $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD) - $(AM_V_at)$(RANLIB) libmputil.a -@@ -7779,7 +7769,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \ - pdftexdir/regex/$(am__dirstamp) \ - pdftexdir/regex/$(DEPDIR)/$(am__dirstamp) - --libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) -+libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libpdftex.a - $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD) - $(AM_V_at)$(RANLIB) libpdftex.a -@@ -7790,7 +7780,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT) - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) -+libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libsynctex.a - $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD) - $(AM_V_at)$(RANLIB) libsynctex.a -@@ -7805,7 +7795,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$( - uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) -+libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES) - $(AM_V_at)-rm -f libukanji.a - $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD) - $(AM_V_at)$(RANLIB) libukanji.a -@@ -7846,7 +7836,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \ - luatexdir/unilib/$(am__dirstamp) \ - luatexdir/unilib/$(DEPDIR)/$(am__dirstamp) - --libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) -+libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES) - $(AM_V_at)-rm -f libunilib.a - $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD) - $(AM_V_at)$(RANLIB) libunilib.a -@@ -7904,7 +7894,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \ - xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp) - --libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) -+libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) - $(AM_V_at)-rm -f libxetex.a - $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD) - $(AM_V_at)$(RANLIB) libxetex.a -@@ -7915,7 +7905,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \ - synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) -+libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS) - alephdir/$(am__dirstamp): - @$(MKDIR_P) alephdir -@@ -7930,87 +7920,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di - alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \ - alephdir/$(DEPDIR)/$(am__dirstamp) - --aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) -+aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES) - @rm -f aleph$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS) - --bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) -+bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES) - @rm -f bibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS) - --call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) -+call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES) - @rm -f call_luahbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS) - --call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) -+call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES) - @rm -f call_luajithbtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS) - --call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) -+call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES) - @rm -f call_luajittex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS) - --call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) -+call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES) - @rm -f call_luatex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS) - --call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) -+call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES) - @rm -f call_mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS) - --call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) -+call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES) - @rm -f call_mflua$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS) - --call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) -+call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES) - @rm -f call_mfluajit$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS) - --call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) -+call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES) - @rm -f call_mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS) - --call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) -+call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) - @rm -f call_pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS) - --call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) -+call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) - @rm -f call_upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS) - --ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) -+ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) - @rm -f ctangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS) - --ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) -+ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES) - @rm -f ctangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS) - --ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) -+ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES) - @rm -f ctie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS) - --ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) -+ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES) - @rm -f ctwill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS) - --ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) -+ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES) - @rm -f ctwill-refsort$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS) - --ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) -+ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES) - @rm -f ctwill-twinx$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS) - --cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) -+cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES) - @rm -f cweave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS) - --dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) -+dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES) - @rm -f dvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS) - --dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) -+dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) - @rm -f dvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS) - eptexdir/$(am__dirstamp): -@@ -8024,7 +8014,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) -+eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) - @rm -f eptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS) - etexdir/$(am__dirstamp): -@@ -8038,7 +8028,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di - synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) -+etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES) - @rm -f etex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS) - euptexdir/$(am__dirstamp): -@@ -8052,23 +8042,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) -+euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES) - @rm -f euptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS) - --gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) -+gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES) - @rm -f gftodvi$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS) - --gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) -+gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES) - @rm -f gftopk$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS) - --gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) -+gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES) - @rm -f gftype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS) - --himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) -+himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES) - @rm -f himktables$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS) - hitexdir/$(am__dirstamp): -@@ -8082,19 +8072,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d - hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \ - hitexdir/$(DEPDIR)/$(am__dirstamp) - --hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) -+hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES) - @rm -f hishrink$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS) - --histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) -+histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES) - @rm -f histretch$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS) - --hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) -+hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES) - @rm -f hitex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS) - --initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) -+initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) - @rm -f initex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS) - luatexdir/$(am__dirstamp): -@@ -8108,7 +8098,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir - mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) -+luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES) - @rm -f luahbtex$(EXEEXT) - $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS) - luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8116,7 +8106,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__ - mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) -+luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES) - @rm -f luajithbtex$(EXEEXT) - $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS) - luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8124,7 +8114,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di - mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) -+luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) - @rm -f luajittex$(EXEEXT) - $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS) - luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \ -@@ -8132,33 +8122,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst - mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \ - mplibdir/$(DEPDIR)/$(am__dirstamp) - --luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) -+luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) - @rm -f luatex$(EXEEXT) - $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS) - libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \ - libmd5/$(DEPDIR)/$(am__dirstamp) - --md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) -+md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES) - @rm -f md5main$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS) - --mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) -+mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES) - @rm -f mf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS) - --mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) -+mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) - @rm -f mf-nowin$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS) - mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) -+mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) - @rm -f mflua$(EXEEXT) - $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS) - mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \ - mfluadir/$(DEPDIR)/$(am__dirstamp) - --mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) -+mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) - @rm -f mflua-nowin$(EXEEXT) - $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS) - mfluajitdir/$(am__dirstamp): -@@ -8171,38 +8161,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) -+mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) - @rm -f mfluajit$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS) - mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \ - mfluajitdir/$(am__dirstamp) \ - mfluajitdir/$(DEPDIR)/$(am__dirstamp) - --mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) -+mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) - @rm -f mfluajit-nowin$(EXEEXT) - $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS) - --mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) -+mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) - @rm -f mft$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS) - --mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) -+mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES) - @rm -f mpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS) - --odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) -+odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES) - @rm -f odvicopy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS) - --odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) -+odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES) - @rm -f odvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS) - --otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) -+otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES) - @rm -f otangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS) - --patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) -+patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES) - @rm -f patgen$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS) - pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8210,67 +8200,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__ - synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) -+pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES) - @rm -f pdftex$(EXEEXT) - $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS) - pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) -+pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES) - @rm -f pdftosrc$(EXEEXT) - $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS) - --pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) -+pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES) - @rm -f pktogf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS) - --pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) -+pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES) - @rm -f pktype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS) - --pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) -+pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES) - @rm -f pltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS) - --pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) -+pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) - @rm -f pmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS) - --pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) -+pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) - @rm -f pooltype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS) - ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \ - ptexdir/$(DEPDIR)/$(am__dirstamp) - --ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) -+ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) - @rm -f ptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS) - synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) -+synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES) - @rm -f synctex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS) - --tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) -+tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES) - @rm -f tangle$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS) - --tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) -+tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES) - @rm -f tangleboot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS) - synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) -+tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES) - @rm -f tex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS) - --tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) -+tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES) - @rm -f tftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS) - --tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) -+tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES) - @rm -f tie$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS) - pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \ -@@ -8278,65 +8268,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__ - pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \ - pdftexdir/$(DEPDIR)/$(am__dirstamp) - --ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) -+ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES) - @rm -f ttf2afm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS) - --twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) -+twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES) - @rm -f twill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS) - --upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) -+upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES) - @rm -f upbibtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS) - --updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) -+updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES) - @rm -f updvitype$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS) - --upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) -+upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) - @rm -f upmpost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS) - --uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) -+uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) - @rm -f uppltotf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS) - uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \ - uptexdir/$(DEPDIR)/$(am__dirstamp) - --uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) -+uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) - @rm -f uptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS) - --uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) -+uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES) - @rm -f uptftopl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS) - --vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) -+vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES) - @rm -f vftovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS) - --vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) -+vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES) - @rm -f vptovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS) - --weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) -+weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES) - @rm -f weave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS) - --wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) -+wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES) - @rm -f wofm2opl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS) - --wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) -+wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES) - @rm -f wopl2ofm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS) - --wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) -+wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES) - @rm -f wovf2ovp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS) - --wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) -+wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES) - @rm -f wovp2ovf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS) - xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \ -@@ -8344,7 +8334,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d - synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - --xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) -+xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES) - @rm -f xetex$(EXEEXT) - $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS) - -@@ -19275,7 +19265,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) - fi; \ - $$success || exit 1 - --check-TESTS: -+check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) -@@ -19285,7 +19275,7 @@ check-TESTS: - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; --recheck: all -+recheck: all - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ -@@ -19546,7 +19536,7 @@ install-am: all-am +@@ -19689,7 +19679,7 @@ install-am: all-am uninstall: uninstall-recursive install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am installcheck: installcheck-recursive install-strip: -@@ -20475,7 +20465,6 @@ install-exec-am: install-binPROGRAMS install-libLIBRAR - install-exec-am: install-binPROGRAMS install-libLIBRARIES \ - install-libLTLIBRARIES +@@ -20621,7 +20611,6 @@ install-exec-am: install-binPROGRAMS install-dist_binS + install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS \ + install-libLIBRARIES install-libLTLIBRARIES @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-html: install-html-recursive install-html-am: -@@ -21636,7 +21625,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND) - - #EXTRA_DIST += - --#EXTRA_DIST += -+#EXTRA_DIST += - - $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND) - -@@ -21801,7 +21790,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w - $(mp_ctangle) tfmin.w - - # Creating several files: need stamp file and two rules with identical recipes --$(mp_c_h): mp-tangle -+$(mp_c_h): mp-tangle - $(mp_ctangle_sh) mp - mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh - $(mp_ctangle_sh) mp -@@ -21848,7 +21837,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) - - $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h) - --$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) -+$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) - $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND) - $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) - -@@ -22099,7 +22088,7 @@ hitables.c: himktables$(EXEEXT) - hitables.c: himktables$(EXEEXT) - ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; } - --# hitex, histretch, and hishrink all need (at least) some -+# hitex, histretch, and hishrink all need (at least) some - # of the sources generated from hiformat.w. - # - $(hitex_OBJECTS): hiformat-tangle -@@ -22166,36 +22155,36 @@ $(libff_a_OBJECTS): libunilib.a - - $(libff_a_OBJECTS): libunilib.a - --$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - --$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a --$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a -+$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a -+$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a - - utils-hb.c: luatexdir/utils/utils.c - $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c - --luatex-api-hb.h: luatexdir/lua/luatex-api.h -+luatex-api-hb.h: luatexdir/lua/luatex-api.h - $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h - - luastuff-hb.c: luatexdir/lua/luastuff.c -- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c -+ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c - - luainit-hb.c: luatexdir/lua/luainit.c - $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c - --printing-hb.c: luatexdir/tex/printing.c -- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c -+printing-hb.c: luatexdir/tex/printing.c -+ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c - - #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND) - - $(libluaffi_a_OBJECTS): $(LUA_DEPEND) - - #liblua53ffi_sources = $(libluaffi_sources) --#EXTRA_DIST -+#EXTRA_DIST - - $(luatex_OBJECTS): libluatex.a - $(luajittex_OBJECTS): libluajittex.a diff --git a/print/tex-xetex/files/patch-configure b/print/tex-xetex/files/patch-configure index bbcbc2496147..117c710f222d 100644 --- a/print/tex-xetex/files/patch-configure +++ b/print/tex-xetex/files/patch-configure @@ -1,218 +1,214 @@ ---- configure.orig 2023-03-08 17:05:16 UTC +--- configure.orig 2024-02-01 22:56:12 UTC +++ configure -@@ -1105,6 +1105,8 @@ with_system_teckit - with_mpfr_libdir +@@ -1098,6 +1098,8 @@ with_system_teckit + with_mpfi_libdir with_system_zziplib with_system_teckit +with_teckit_includes +with_teckit_libdir with_system_graphite2 with_system_harfbuzz with_system_icu -@@ -26977,11 +26979,6 @@ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pplib, libn +@@ -27404,11 +27406,6 @@ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pplib, libn PPLIB_INCLUDES="-I$kpse_BLD/libs/pplib/include" PPLIB_LIBS="$kpse_BLD/libs/pplib/libpplib.a" PPLIB_DEPEND='${top_builddir}/../../libs/pplib/libpplib.a' - PPLIB_RULE='# Rebuild libpplib -$(PPLIB_DEPEND): ${top_builddir}/../../libs/pplib/include/pplib.h - cd ${top_builddir}/../../libs/pplib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/pplib/include/pplib.h: - cd ${top_builddir}/../../libs/pplib && $(MAKE) $(AM_MAKEFLAGS) rebuild' ##tldbg _KPSE_LIB_FLAGS: Setup zlib (-lz) flags. echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zlib, libname=z, options=, tlincl=-IBLD/libs/zlib/include, tllib=BLD/libs/zlib/libz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zlib/include/zconf.h.' >&5 -@@ -27067,115 +27064,6 @@ esac +@@ -27496,117 +27493,6 @@ esac ;; esac -##tldbg _KPSE_LIB_FLAGS: Setup lua53 (-ltexlua53) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua53, libname=texlua53, options=lt tree, tlincl=-IBLD/libs/lua53/include, tllib=BLD/libs/lua53/libtexlua53.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua53/include/lua.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: lua53 (texlua53) lt tree. - LUA53_INCLUDES="-I$kpse_BLD/libs/lua53/include" - LUA53_LIBS="$kpse_BLD/libs/lua53/libtexlua53.la" - LUA53_DEPEND='${top_builddir}/../../libs/lua53/libtexlua53.la' - LUA53_RULE='# Rebuild libtexlua53 -$(LUA53_DEPEND): ${top_builddir}/../../libs/lua53/include/lua.h - cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/lua53/include/lua.h: - cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild' - -##tldbg _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua52, libname=texlua52, options=lt tree, tlincl=-IBLD/libs/lua52/include, tllib=BLD/libs/lua52/libtexlua52.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua52/include/lua.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: lua52 (texlua52) lt tree. - LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include" - LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la" - LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la' - LUA52_RULE='# Rebuild libtexlua52 -$(LUA52_DEPEND): ${top_builddir}/../../libs/lua52/include/lua.h - cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/lua52/include/lua.h: - cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild' - -echo 'tldbg:KPSE_LUAJIT_FLAGS called.' >&5 -##tldbg _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=luajit, libname=texluajit, options=lt tree, tlincl=-IBLD/libs/luajit/include, tllib=BLD/libs/luajit/libtexluajit.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/luajit/include/luajit.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: luajit (texluajit) lt tree. - LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include" - LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la" - LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la' - LUAJIT_RULE='# Rebuild libtexluajit -$(LUAJIT_DEPEND): ${top_builddir}/../../libs/luajit/include/luajit.h - cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/luajit/include/luajit.h: - cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild' -# -# checking for openbsd for additional jit libraries needed, which is the -# case for clang; no point in going to the trouble elsewhere since no -# other system needs it. -case $build_os in -openbsd*) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking on openbsd if additional jit libraries are needed" >&5 -printf %s "checking on openbsd if additional jit libraries are needed... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "stdint.h" - typedef struct _Unwind_Context _Unwind_Context; - extern uintptr_t _Unwind_GetCFA(_Unwind_Context *); -int -main (void) -{ -_Unwind_Context *ctx; - _Unwind_GetCFA(ctx); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } --else $as_nop -- +-else case e in #( +- e) - jitlibs="-lc++abi -lpthread" - save_LIBS=$LIBS - LIBS="$LIBS $jitlibs" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "stdint.h" - typedef struct _Unwind_Context _Unwind_Context; - extern uintptr_t _Unwind_GetCFA(_Unwind_Context *); -int -main (void) -{ -_Unwind_Context *ctx; - _Unwind_GetCFA(ctx); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5 -printf "%s\n" "\"$jitlibs\"" >&6; } - LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs" - --else $as_nop -- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +-else case e in #( +- e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} -as_fn_error $? "luajit could not be linked --See \`config.log' for more details" "$LINENO" 5; } -- +-See 'config.log' for more details" "$LINENO" 5; } +- ;; +-esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$save_LIBS - -- +- ;; +-esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - ;; -esac -echo 'tldbg:KPSE_LUAJIT_FLAGS done.' >&5 - ##tldbg _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags. echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpng, libname=png, options=, tlincl=-IBLD/libs/libpng/include, tllib=BLD/libs/libpng/libpng.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpng/include/png.h.' >&5 ##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) . -@@ -27630,49 +27518,38 @@ test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_ +@@ -28106,49 +27992,38 @@ test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_ fi test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32" -##tldbg _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags. -echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zziplib, libname=zzip, options=, tlincl=-IBLD/libs/zziplib/include, tllib=BLD/libs/zziplib/libzzip.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zziplib/include/zzip/zzip.h.' >&5 -##tldbg _KPSE_LIB_FLAGS_TL: zziplib (zzip) . - -# Check whether --with-system-zziplib was given. -if test ${with_system_zziplib+y} -then : - withval=$with_system_zziplib; -fi -if test "x$with_system_zziplib" = xyes; then - if $PKG_CONFIG zziplib --atleast-version=0.12; then - ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags` - ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs` -elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then - as_fn_error $? "did not find zziplib 0.12 or better" "$LINENO" 5 -fi -else - ZZIPLIB_INCLUDES="-I$kpse_BLD/libs/zziplib/include" - ZZIPLIB_LIBS="$kpse_BLD/libs/zziplib/libzzip.a" - ZZIPLIB_DEPEND='${top_builddir}/../../libs/zziplib/libzzip.a' - ZZIPLIB_RULE='# Rebuild libzzip -$(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h - cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zziplib/include/zzip/zzip.h: - cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - ##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags. echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5 ##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) . -# Check whether --with-system-teckit was given. +# 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 if test ${with_system_teckit+y} then : withval=$with_system_teckit; fi if test "x$with_system_teckit" = xyes; then - 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 -fi + if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then + TECKIT_INCLUDES="-I$with_mpfr_includes" + fi + if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then + TECKIT_LIBS="-L$with_teckit_libdir -lTECkit" + fi + if test "x$TECKIT_INCLUDES" = x && test "x$TECKIT_LIBS" = x; then + 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 + fi + fi else TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include" TECKIT_LIBS="$kpse_BLD/libs/teckit/libTECkit.a" -@@ -31534,5 +31411,3 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 - printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi -- -- diff --git a/print/tex-xmltex/Makefile b/print/tex-xmltex/Makefile index ce6957975453..158eed186a09 100644 --- a/print/tex-xmltex/Makefile +++ b/print/tex-xmltex/Makefile @@ -1,51 +1,50 @@ PORTNAME= xmltex -PORTVERSION= 1.9 -PORTREVISION= 4 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= LOCAL/tex PKGNAMEPREFIX= tex- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd DIST_SUBDIR= TeX EXTRACT_ONLY= MAINTAINER= tex@FreeBSD.org COMMENT= Non-validating XML parser, written in TeX USES= tar:xz tex USE_TEX= pdftex fmtutil NO_ARCH= yes NO_BUILD= yes TEX_FORMATS= xmltex TEXHASHDIRS= ${TEXMFDISTDIR} do-install: ${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner .if defined(MAINTAINER_MODE) _EXTRACT_FILES= \ texmf-dist/tex/xmltex \ texmf-dist/doc/otherformats/xmltex _WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION} _maintainer-extract: ${MAKE} clean ${MKDIR} ${_WRKSRC} ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME_TEXMF}${EXTRACT_SUFX} \ -C ${_WRKSRC}$ \ --strip-components 1 --no-same-permission --no-same-owner \ ${_EXTRACT_FILES:S,^,${DISTNAME_TEXMF}/,} _maintainer-dist: _maintainer-extract ${TAR} --options xz:compression-level=9 -Jcvf \ ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd.tar.xz \ -C ${WRKDIR} ${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION} scp ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}-freebsd.tar.xz \ bofh@freefall.freebsd.org://home/tex/public_distfiles/ .endif .include diff --git a/print/tex-xmltex/distinfo b/print/tex-xmltex/distinfo index d302d70fb1cb..6f0eea032253 100644 --- a/print/tex-xmltex/distinfo +++ b/print/tex-xmltex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698416956 -SHA256 (TeX/tex-xmltex-20230313-freebsd.tar.xz) = fb8e6ce06d88b18743a3e22617454caf5a23559ea4aff2843adde0311a955b4f -SIZE (TeX/tex-xmltex-20230313-freebsd.tar.xz) = 75824 +TIMESTAMP = 1716912788 +SHA256 (TeX/tex-xmltex-20240312-freebsd.tar.xz) = 517995171ffcf169cb371bf6ec6fe1a475daf69fba4eae540a81982ef449781f +SIZE (TeX/tex-xmltex-20240312-freebsd.tar.xz) = 75848 diff --git a/print/tex-xmltex/pkg-plist b/print/tex-xmltex/pkg-plist index 8ec61954ac58..6a8f2e500699 100644 --- a/print/tex-xmltex/pkg-plist +++ b/print/tex-xmltex/pkg-plist @@ -1,39 +1,37 @@ %%TEXMFDISTDIR%%/tex/xmltex/base/iso-8859-1.xmt %%TEXMFDISTDIR%%/tex/xmltex/base/utf-16.xmt %%TEXMFDISTDIR%%/tex/xmltex/base/iso-8859-2.xmt %%TEXMFDISTDIR%%/tex/xmltex/base/xmltex.cfg %%TEXMFDISTDIR%%/tex/xmltex/base/xmltex.tex %%TEXMFDISTDIR%%/tex/xmltex/base/langtest.xmt %%TEXMFDISTDIR%%/tex/xmltex/base/koi8-r.xmt %%TEXMFDISTDIR%%/tex/xmltex/base/mathml2.xmt %%TEXMFDISTDIR%%/tex/xmltex/base/sec.xmt %%TEXMFDISTDIR%%/tex/xmltex/base/windows-1250.xmt -%%TEXMFDISTDIR%%/tex/xmltex/xmltexconfig/pdfxmltex.ini -%%TEXMFDISTDIR%%/tex/xmltex/xmltexconfig/xmltex.ini %%TEXMFDISTDIR%%/tex/xmltex/passivetex/mlnames.sty %%TEXMFDISTDIR%%/tex/xmltex/passivetex/teislides.xmt %%TEXMFDISTDIR%%/tex/xmltex/passivetex/fotex.xmt %%TEXMFDISTDIR%%/tex/xmltex/passivetex/ucharacters.sty %%TEXMFDISTDIR%%/tex/xmltex/passivetex/unicode.sty %%TEXMFDISTDIR%%/tex/xmltex/passivetex/teiprintslides.xmt %%TEXMFDISTDIR%%/tex/xmltex/passivetex/tei.xmt %%TEXMFDISTDIR%%/tex/xmltex/passivetex/teixml.sty %%TEXMFDISTDIR%%/tex/xmltex/passivetex/dummyels.sty %%TEXMFDISTDIR%%/tex/xmltex/passivetex/teixmlslides.sty %%TEXMFDISTDIR%%/tex/xmltex/passivetex/fotex.sty %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/readme.txt %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/manual.xsl %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/manual.xml %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/manual.html %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/testsec.tex %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/englishutf8.xml %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/russianutf8.xml %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/testascii.cfg %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/testascii.xml %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/testascii.tex %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/russiankoi8.xml %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/manual.tex %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/englishutf16.xml %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/portugeselatin1.xml %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/langtest.xml %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base/testsec.xml diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 20c2d830512a..3f4e36f8e886 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -1,166 +1,164 @@ PORTNAME= texlive -PORTVERSION= ${TEXLIVE_VERSION} -PORTREVISION= 8 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR} PKGNAMESUFFIX= -base DISTNAME= ${PORTNAME}-${PORTVERSION}-source DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= TeX Live Typesetting System, base binaries WWW= https://tug.org/texlive/ LIB_DEPENDS= libicuio.so:devel/icu \ libt1.so:devel/t1lib \ libTECkit.so:textproc/teckit \ libgd.so:graphics/gd \ libgraphite2.so:graphics/graphite2 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libpng.so:graphics/png \ libzzip.so:devel/zziplib \ libpoppler.so:graphics/poppler \ libpotrace.so:graphics/libpotrace RUN_DEPENDS= p5-File-HomeDir>=0:devel/p5-File-HomeDir \ p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \ psbook:print/psutils USES= compiler:c++11-lib cpe ghostscript gnome localbase pkgconfig perl5 \ python:run shebangfix tar:xz tex xorg CPE_VENDOR= tug USE_CXXSTD= gnu++11 USE_GNOME= cairo USE_PERL5= run USE_TEX= web2c kpathsea ptexenc tlmgr texhash-bootstrap USE_XORG=x11 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/bibcop/bibcop.pl \ 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/ebong/*.py \ texk/texlive/linked_scripts/dtxgen/dtxgen \ texk/texlive/linked_scripts/dviasm/*.py \ texk/texlive/linked_scripts/exceltex/exceltex \ texk/texlive/linked_scripts/findhyph/findhyph \ texk/texlive/linked_scripts/fragmaster/fragmaster.pl \ texk/texlive/linked_scripts/git-latexdiff/git-latexdiff \ 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/lilyglyphs/*.py \ texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \ 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/optexcount/optexcount \ texk/texlive/linked_scripts/pygmentex/*.py \ texk/texlive/linked_scripts/pythontex/*.py \ texk/texlive/linked_scripts/rubik/rubikrotation.pl \ texk/texlive/linked_scripts/spix/spix.py \ 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/texliveonfly/texliveonfly.py \ texk/texlive/linked_scripts/ulqda/ulqda.pl \ texk/texlive/linked_scripts/urlbst/urlbst \ texk/texlive/linked_scripts/yplan/yplan \ texk/texlive/linked_scripts/webquiz/webquiz.py \ texk/texlive/linked_scripts/petri-nets/pn2pdf \ texk/texlive/linked_scripts/pdflatexpicscale/pdflatexpicscale.pl \ texk/texlive/linked_scripts/pdfxup/pdfxup \ texk/texlive/linked_scripts/tlcockpit/tlcockpit.sh \ texk/texlive/linked_scripts/ctan-o-mat/ctan-o-mat.pl \ texk/texlive/linked_scripts/pdftex-quiet/pdftex-quiet \ texk/texlive/linked_scripts/clojure-pamphlet/pamphletangler \ texk/texlive/linked_scripts/latex-papersize/latex-papersize.py \ texk/texlive/linked_scripts/makedtx/makedtx.pl \ texk/texlive/linked_scripts/pdfbook2/pdfbook2 # during build phase gnu configure is run a lot GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --disable-native-texlive-build \ --disable-web-progs \ --disable-psutils \ --enable-shared \ --disable-t1utils \ --disable-dvipdfmx \ --disable-dvipdfm-x \ --disable-xdvipdfmx \ --enable-build-in-source-tree \ --datarootdir=${LOCALBASE}/share \ --with-system-freetype2 \ --with-freetype2-includes=${LOCALBASE}/include/freetype2 \ --with-freetype2-libdir=${LOCALBASE}/lib \ --with-system-gd \ --with-system-cairo \ --with-system-harfbuzz \ --with-system-graphite2 \ --with-system-pixman \ --with-system-t1lib \ --without-system-xpdf \ --with-system-zziplib \ --with-system-zlib .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 MAKE_ENV= CONFIG_SITE=${CONFIG_SITE} INSTALL_TARGET= install-strip CONFLICTS_INSTALL= detex dvi2tty ps2eps BINARY_ALIAS= freetype-config=true EXTRACT_AFTER_ARGS= ${EXCLUDE_FILES:S,^,--exclude ,} INFO= dvipng tlbuild PLIST_SUB= INSTALL_DATA="${INSTALL_DATA}" OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= TEX=xpdfopen:run EXCLUDE_FILES= ${DISTNAME}/texk/web2c \ ${DISTNAME}/texk/kpathsea \ ${DISTNAME}/texk/ptexenc \ ${DISTNAME}/texk/xdvik \ ${DISTNAME}/texk/dvipdfm-x \ ${DISTNAME}/texk/dvipsk \ ${DISTNAME}/utils/t1utils \ ${DISTNAME}/utils/xpdfopen post-extract: @${FIND} ${WRKSRC} -name '*.orig' -delete post-patch: ${REINPLACE_CMD} -e 's|/usr/bin/python -O|${python_CMD}|' \ ${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro ${REINPLACE_CMD} -e 's|exec texconfig|exec ${PREFIX}/bin/texconfig|' \ ${WRKSRC}/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh ${REINPLACE_CMD} -e 's|exec fmtutil|exec ${PREFIX}/bin/fmtutil|' \ ${WRKSRC}/texk/texlive/linked_scripts/texlive/fmtutil-sys.sh ${REINPLACE_CMD} -e 's|exec updmap|exec ${PREFIX}/bin/updmap|' \ ${WRKSRC}/texk/texlive/linked_scripts/texlive/updmap-sys.sh ${REINPLACE_CMD} -e '/tlmgr/d' \ ${WRKSRC}/texk/texlive/linked_scripts/Makefile.in post-install-fmtutil: for D in ${TEXHASHDIRS}; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/$$D; \ done ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/fmtutil.cnf \ ${STAGEDIR}${PREFIX}/${FMTUTIL_CNF} post-install: post-install-fmtutil .ORDER: post-install-fmtutil do-texhash .include diff --git a/print/texlive-base/distinfo b/print/texlive-base/distinfo index 74a97b8d94bf..e3b76a45c7e2 100644 --- a/print/texlive-base/distinfo +++ b/print/texlive-base/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680575442 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 +TIMESTAMP = 1715601909 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 diff --git a/print/texlive-base/files/patch-Makefile.in b/print/texlive-base/files/patch-Makefile.in index 3b01373c109e..68ab63563674 100644 --- a/print/texlive-base/files/patch-Makefile.in +++ b/print/texlive-base/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2023-03-01 22:59:32 UTC +--- Makefile.in.orig 2024-02-01 22:56:12 UTC +++ Makefile.in -@@ -494,7 +494,7 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' +@@ -497,7 +497,7 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' # Files not to be distributed -SUBDIRS = . doc $(MAKE_SUBDIRS) libs utils texk +SUBDIRS = . doc $(MAKE_SUBDIRS) utils texk DIST_SUBDIRS = auxdir/auxsub doc $(CONF_SUBDIRS) libs utils texk recurse_this = recurse_top = diff --git a/print/texlive-base/files/patch-configure b/print/texlive-base/files/patch-configure index 2266b3531ce0..2fb5efe129e9 100644 --- a/print/texlive-base/files/patch-configure +++ b/print/texlive-base/files/patch-configure @@ -1,48 +1,48 @@ ---- configure.orig 2023-03-09 23:07:06 UTC +--- configure.orig 2024-03-10 21:37:05 UTC +++ configure -@@ -6840,7 +6840,16 @@ fi +@@ -6926,7 +6926,16 @@ fi 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 } -@@ -23067,8 +23076,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +@@ -23616,8 +23625,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" fi if $FT2_CONFIG --ftversion >/dev/null 2>&1; then - FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` - FREETYPE2_LIBS=`$FT2_CONFIG --libs` + FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags` + FREETYPE2_LIBS=`pkg-config freetype2 --libs` elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` -@@ -23133,11 +23142,12 @@ fi +@@ -23691,11 +23700,12 @@ fi 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 echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5 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 70340b49e611..da5e1a99f1a2 100644 --- a/print/texlive-base/files/patch-texk_bibtex-x_Makefile.in +++ b/print/texlive-base/files/patch-texk_bibtex-x_Makefile.in @@ -1,131 +1,131 @@ ---- texk/bibtex-x/Makefile.in.orig 2023-03-01 22:59:32 UTC +--- texk/bibtex-x/Makefile.in.orig 2023-12-16 06:51:56 UTC +++ texk/bibtex-x/Makefile.in @@ -123,9 +123,7 @@ CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES = @BIBTEX8_TRUE@am__EXEEXT_1 = bibtex8$(EXEEXT) @BIBTEXU_TRUE@am__EXEEXT_2 = bibtexu$(EXEEXT) -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(btudocdir)" \ - "$(DESTDIR)$(btuexdir)" "$(DESTDIR)$(csfdir)" +am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am__objects_1 = bibtex8-bibtex-1.$(OBJEXT) bibtex8-bibtex-2.$(OBJEXT) \ bibtex8-bibtex-3.$(OBJEXT) bibtex8-bibtex-4.$(OBJEXT) \ @@ -137,7 +135,7 @@ am__v_lt_0 = --silent AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent -am__v_lt_1 = +am__v_lt_1 = am__objects_2 = bibtexu-bibtex-1.$(OBJEXT) bibtexu-bibtex-2.$(OBJEXT) \ bibtexu-bibtex-3.$(OBJEXT) bibtexu-bibtex-4.$(OBJEXT) \ bibtexu-bibtex.$(OBJEXT) bibtexu-utils.$(OBJEXT) @@ -152,11 +150,11 @@ am__v_GEN_0 = @echo " GEN " $@; AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__maybe_remake_depfiles = depfiles @@ -179,7 +177,7 @@ am__v_CC_0 = @echo " CC " $@; AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -187,7 +185,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ @@ -197,14 +195,14 @@ am__v_CXX_0 = @echo " CXX " $@; AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) am__v_CXX_0 = @echo " CXX " $@; -am__v_CXX_1 = +am__v_CXX_1 = CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; -am__v_CXXLD_1 = +am__v_CXXLD_1 = SOURCES = $(bibtex8_SOURCES) $(bibtexu_SOURCES) \ $(nodist_EXTRA_bibtexu_SOURCES) DIST_SOURCES = $(bibtex8_SOURCES) $(bibtexu_SOURCES) -@@ -774,7 +772,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config +@@ -775,7 +773,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ -@@ -831,11 +829,11 @@ clean-binPROGRAMS: +@@ -832,11 +830,11 @@ clean-binPROGRAMS: echo " rm -f" $$list; \ rm -f $$list -bibtex8$(EXEEXT): $(bibtex8_OBJECTS) $(bibtex8_DEPENDENCIES) $(EXTRA_bibtex8_DEPENDENCIES) +bibtex8$(EXEEXT): $(bibtex8_OBJECTS) $(bibtex8_DEPENDENCIES) $(EXTRA_bibtex8_DEPENDENCIES) @rm -f bibtex8$(EXEEXT) $(AM_V_CCLD)$(LINK) $(bibtex8_OBJECTS) $(bibtex8_LDADD) $(LIBS) -bibtexu$(EXEEXT): $(bibtexu_OBJECTS) $(bibtexu_DEPENDENCIES) $(EXTRA_bibtexu_DEPENDENCIES) +bibtexu$(EXEEXT): $(bibtexu_OBJECTS) $(bibtexu_DEPENDENCIES) $(EXTRA_bibtexu_DEPENDENCIES) @rm -f bibtexu$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(bibtexu_OBJECTS) $(bibtexu_LDADD) $(LIBS) -@@ -1408,7 +1406,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) +@@ -1409,7 +1407,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) -@@ -1418,7 +1416,7 @@ check-TESTS: +@@ -1419,7 +1417,7 @@ check-TESTS: log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ exit $$?; -recheck: all +recheck: all @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @set +e; $(am__set_TESTS_bases); \ bases=`for i in $$bases; do echo $$i; done \ -@@ -1620,7 +1618,7 @@ installdirs: +@@ -1621,7 +1619,7 @@ installdirs: check: check-am all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(btudocdir)" "$(DESTDIR)$(btuexdir)" "$(DESTDIR)$(csfdir)"; do \ + for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1692,8 +1690,7 @@ info-am: +@@ -1693,8 +1691,7 @@ info-am: info-am: -install-data-am: install-dist_btdocDATA install-dist_btudocDATA \ - install-dist_btuexDATA install-dist_csfDATA install-man +install-data-am: install-dist_csfDATA install-dvi: install-dvi-am diff --git a/print/texlive-base/files/patch-texk_dvipng_configure b/print/texlive-base/files/patch-texk_dvipng_configure index dd8412d2463d..1a5700c36189 100644 --- a/print/texlive-base/files/patch-texk_dvipng_configure +++ b/print/texlive-base/files/patch-texk_dvipng_configure @@ -1,13 +1,13 @@ ---- texk/dvipng/configure.orig 2023-03-08 17:05:16 UTC +--- texk/dvipng/configure.orig 2023-12-23 16:57:39 UTC +++ texk/dvipng/configure -@@ -17556,8 +17556,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +@@ -17725,8 +17725,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" fi if $FT2_CONFIG --ftversion >/dev/null 2>&1; then - FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` - FREETYPE2_LIBS=`$FT2_CONFIG --libs` + FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags` + FREETYPE2_LIBS=`pkg-config freetype2 --libs` elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` diff --git a/print/texlive-base/files/patch-texk_dvisvgm_configure b/print/texlive-base/files/patch-texk_dvisvgm_configure index 67177b979034..560a930eff35 100644 --- a/print/texlive-base/files/patch-texk_dvisvgm_configure +++ b/print/texlive-base/files/patch-texk_dvisvgm_configure @@ -1,13 +1,13 @@ ---- texk/dvisvgm/configure.orig 2023-03-01 22:59:32 UTC +--- texk/dvisvgm/configure.orig 2024-03-07 22:55:09 UTC +++ texk/dvisvgm/configure -@@ -23282,8 +23282,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +@@ -23288,8 +23288,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" fi if $FT2_CONFIG --ftversion >/dev/null 2>&1; then - FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` - FREETYPE2_LIBS=`$FT2_CONFIG --libs` + FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags` + FREETYPE2_LIBS=`pkg-config freetype2 --libs` elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` diff --git a/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in index b07c6ae0af76..55d7c9d20ee5 100644 --- a/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in +++ b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in @@ -1,22 +1,22 @@ ---- texk/lcdf-typetools/lcdf-typetools-src/Makefile.in.orig 2020-11-19 18:31:09 UTC +--- texk/lcdf-typetools/lcdf-typetools-src/Makefile.in.orig 2023-08-31 23:02:37 UTC +++ texk/lcdf-typetools/lcdf-typetools-src/Makefile.in @@ -163,8 +163,8 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)" -DATA = $(enc_DATA) $(glyphlist_DATA) +am__installdirs = +DATA = RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ -@@ -717,7 +717,7 @@ info: info-recursive +@@ -721,7 +721,7 @@ info-am: info-am: -install-data-am: install-encDATA install-glyphlistDATA +install-data-am: install-dvi: install-dvi-recursive diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in b/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in index 6ddfca35edc9..d107819d3406 100644 --- a/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in +++ b/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in @@ -1,20 +1,28 @@ ---- texk/texlive/linked_scripts/Makefile.in.orig 2022-02-14 21:00:19 UTC +--- texk/texlive/linked_scripts/Makefile.in.orig 2024-02-10 23:22:21 UTC +++ texk/texlive/linked_scripts/Makefile.in -@@ -290,8 +290,6 @@ texmf_shell_scripts = \ +@@ -296,8 +296,6 @@ texmf_shell_scripts = \ texlive-extra/dvi2fax.sh \ texlive-extra/dvired.sh \ texlive-extra/fontinst.sh \ - texlive-extra/kpsetool.sh \ - texlive-extra/kpsewhere.sh \ texlive-extra/ps2frag.sh \ texlive-extra/pslatex.sh \ texlive-extra/rubibtex.sh \ -@@ -471,8 +469,6 @@ bin_links = \ +@@ -459,7 +457,6 @@ texmf_other_scripts = \ + texlive/mktexpk \ + texlive/mktextfm \ + texlive/rungs.lua \ +- texlive/tlmgr.pl \ + texlive/updmap-sys.sh \ + texlive/updmap-user.sh \ + texlive/updmap.pl \ +@@ -489,8 +486,6 @@ bin_links = \ cluttex:cllualatex \ epstopdf:repstopdf \ fmtutil:mktexfmt \ - kpsetool:kpsexpand \ - kpsetool:kpsepath \ mktexlsr:texhash \ pdfcrop:rpdfcrop \ texdef:latexdef diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl b/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl index c850adce6115..ec28d398f713 100644 --- a/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl +++ b/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl @@ -1,41 +1,41 @@ ---- texk/texlive/linked_scripts/latexmk/latexmk.pl.orig 2023-03-20 14:47:33 UTC +--- texk/texlive/linked_scripts/latexmk/latexmk.pl.orig 2024-02-01 21:05:56 UTC +++ texk/texlive/linked_scripts/latexmk/latexmk.pl -@@ -1107,17 +1107,17 @@ else { +@@ -1156,17 +1156,17 @@ else { # # The following works on Solaris, LINUX, HP-UX, IRIX # Use -f to get full listing, including command line arguments. - # Use -u $ENV{USER} to get all processes started by current user (not just + # Use -U $ENV{USER} to get all processes started by current user (not just # those associated with current terminal), but none of other users' # processes. # However, the USER environment variable may not exist. Windows uses # USERNAME instead. (And this propagates to a situation of # unix-emulation software running under Windows.) if ( exists $ENV{USER} ) { - $pscmd = "ps -f -u $ENV{USER}"; + $pscmd = "ps -f -U $ENV{USER}"; } elsif ( exists $ENV{USERNAME} ) { - $pscmd = "ps -f -u $ENV{USERNAME}"; + $pscmd = "ps -f -U $ENV{USERNAME}"; } else { $pscmd = "ps -f"; -@@ -1134,7 +1134,7 @@ else { +@@ -1183,7 +1183,7 @@ else { # But (19 Aug 2010), the truncation doesn't happen on RHEL4 and 5, # unless the output is written to a terminal. So the --width # option is now unnecessary - # $pscmd = "ps --width 200 -f -u $ENV{USER}"; + # $pscmd = "ps --width 200 -f -U $ENV{USER}"; } elsif ( $^O eq "darwin" ) { # OS-X on Macintosh -@@ -1155,7 +1155,7 @@ else { +@@ -1206,7 +1206,7 @@ else { $ps_previewer = $ps_previewer_landscape = 'NONE'; # Others $lpr_pdf = 'lpr %O %S'; - $pscmd = "ps -ww -u $ENV{USER}"; + $pscmd = "ps -ww -U $ENV{USER}"; } } diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam b/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam deleted file mode 100644 index 66293932d296..000000000000 --- a/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam +++ /dev/null @@ -1,26 +0,0 @@ ---- texk/texlive/linked_scripts/pdfjam/pdfjam.orig 2019-11-19 00:11:53 UTC -+++ texk/texlive/linked_scripts/pdfjam/pdfjam -@@ -1189,19 +1189,19 @@ EndTemplate - ) > "$texFile" - if test "$hyperref" = false; then ## we don't need hyperref - cp "$texFile" "$tempFile" -- sed '/\\\usepackage{hyperref}/d' "$tempFile" | \ -- sed '/\\\hypersetup.*/d' > "${texFile}" -+ sed '/\\usepackage{hyperref}/d' "$tempFile" | \ -+ sed '/\\hypersetup.*/d' > "${texFile}" - rm "$tempFile" - fi - if test -z "$geometry" ; then geometry=false ; fi - if test "$geometry" = false; then ## geometry package is not to be used - cp "$texFile" "$tempFile" -- sed '/\\\usepackage.*{geometry}/d' "$tempFile" > "$texFile" -+ sed '/\\usepackage.*{geometry}/d' "$tempFile" > "$texFile" - rm "$tempFile" - fi - if test -z "$pagecolor"; then ## color package is not needed - cp "$texFile" "$tempFile" -- sed '/\\\usepackage.*{color}/d' "$tempFile" > "$texFile" -+ sed '/\\usepackage.*{color}/d' "$tempFile" > "$texFile" - rm "$tempFile" - fi - (cat < tex) - # is generated by the "texlinks" script. --# -+# - # 4) usual comments start with "# ", whereas disabled configurations - # start with "#! " in this file. - # -@@ -41,114 +41,114 @@ +@@ -41,10 +41,10 @@ # AddFormat directives in (ultimately) the *.tlpsrc files. Don't edit here. # # from aleph: -aleph aleph - *aleph.ini +#aleph aleph - *aleph.ini # # from amstex: -amstex pdftex - -translate-file=cp227.tcx *amstex.ini +#amstex pdftex - -translate-file=cp227.tcx *amstex.ini # - # from cslatex: --cslatex pdftex - -etex cslatex.ini --pdfcslatex pdftex - -etex cslatex.ini -+#cslatex pdftex - -etex cslatex.ini -+#pdfcslatex pdftex - -etex cslatex.ini + # from context-legacy: + cont-en pdftex - -8bit *cont-en.mkii +@@ -55,104 +55,104 @@ cont-en xetex - -8bit *cont-en.mkii + #! pdfcslatex pdftex - -etex cslatex.ini # # from csplain: -csplain pdftex - -etex -enc csplain-utf8.ini -luacsplain luatex - -etex csplain.ini -pdfcsplain luatex - -etex csplain.ini -pdfcsplain pdftex - -etex -enc csplain-utf8.ini -pdfcsplain xetex - -etex csplain.ini +#csplain pdftex - -etex -enc csplain-utf8.ini +#luacsplain luatex - -etex csplain.ini +#pdfcsplain luatex - -etex csplain.ini +#pdfcsplain pdftex - -etex -enc csplain-utf8.ini +#pdfcsplain xetex - -etex csplain.ini # # from eplain: -eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini +#eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini # # from hitex: -hilatex hitex language.dat -etex -ltx hilatex.ini -hitex hitex language.def -etex -ltx hitex.ini +#hilatex hitex language.dat -etex -ltx hilatex.ini +#hitex hitex language.def -etex -ltx hitex.ini # # from jadetex: -jadetex pdftex language.dat *jadetex.ini -pdfjadetex pdftex language.dat *pdfjadetex.ini +#jadetex pdftex language.dat *jadetex.ini +#pdfjadetex pdftex language.dat *pdfjadetex.ini # # from latex-bin: -dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini -latex pdftex language.dat -translate-file=cp227.tcx *latex.ini -lualatex luahbtex language.dat,language.dat.lua lualatex.ini -pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini +#dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini +#latex pdftex language.dat -translate-file=cp227.tcx *latex.ini +#lualatex luahbtex language.dat,language.dat.lua lualatex.ini +#pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini # # from latex-bin-dev: -dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini -latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini -lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini -pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini +#dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini +#latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini +#lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini +#pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini # # from lollipop: -lollipop tex - lollipop.ini +#lollipop tex - lollipop.ini # # from luahbtex: -luahbtex luahbtex language.def,language.dat.lua luatex.ini +#luahbtex luahbtex language.def,language.dat.lua luatex.ini # # from luajittex: -luajithbtex luajithbtex language.def,language.dat.lua luatex.ini -luajittex luajittex language.def,language.dat.lua luatex.ini +#luajithbtex luajithbtex language.def,language.dat.lua luatex.ini +#luajittex luajittex language.def,language.dat.lua luatex.ini # # from luatex: -dviluatex luatex language.def,language.dat.lua dviluatex.ini -luatex luatex language.def,language.dat.lua luatex.ini +#dviluatex luatex language.def,language.dat.lua dviluatex.ini +#luatex luatex language.def,language.dat.lua luatex.ini # # from metafont: -mf mf-nowin - -translate-file=cp227.tcx mf.ini +#mf mf-nowin - -translate-file=cp227.tcx mf.ini # # from mex: -mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini -pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini -utf8mex pdftex mexconf.tex -enc *utf8mex.ini +#mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini +#pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini +#utf8mex pdftex mexconf.tex -enc *utf8mex.ini # # from mflua: #! mflua mflua-nowin - mf.ini # # from mltex: -mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini -mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini +#mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini +#mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini # # from mptopdf: -mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex +#mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex # # from optex: -optex luatex - optex.ini +#optex luatex - optex.ini # # from pdftex: -etex pdftex language.def -translate-file=cp227.tcx *etex.ini -pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini -pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini +#etex pdftex language.def -translate-file=cp227.tcx *etex.ini +#pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini +#pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini # # from platex: --platex eptex language.dat *platex.ini +-platex euptex language.dat *platex.ini -platex-dev euptex language.dat *platex.ini -+#platex eptex language.dat *platex.ini ++#platex euptex language.dat *platex.ini +#platex-dev euptex language.dat *platex.ini # # from ptex: --eptex eptex language.def *eptex.ini --ptex eptex - ptex.ini -+#eptex eptex language.def *eptex.ini -+#ptex eptex - ptex.ini +-eptex euptex language.def *eptex.ini +-ptex euptex - ptex.ini ++#eptex euptex language.def *eptex.ini ++#ptex euptex - ptex.ini # # from tex: -tex tex - tex.ini +#tex tex - tex.ini # # from texsis: -texsis pdftex - -translate-file=cp227.tcx texsis.ini +#texsis pdftex - -translate-file=cp227.tcx texsis.ini # # from uplatex: -uplatex euptex language.dat *uplatex.ini -uplatex-dev euptex language.dat *uplatex.ini +#uplatex euptex language.dat *uplatex.ini +#uplatex-dev euptex language.dat *uplatex.ini # # from uptex: -euptex euptex language.def *euptex.ini -uptex euptex - uptex.ini +#euptex euptex language.def *euptex.ini +#uptex euptex - uptex.ini # # from xelatex-dev: -xelatex-dev xetex language.dat -etex xelatex.ini +#xelatex-dev xetex language.dat -etex xelatex.ini # # from xetex: -xelatex xetex language.dat -etex xelatex.ini -xetex xetex language.def -etex xetex.ini +#xelatex xetex language.dat -etex xelatex.ini +#xetex xetex language.def -etex xetex.ini # # from xmltex: -pdfxmltex pdftex language.dat *pdfxmltex.ini -xmltex pdftex language.dat *xmltex.ini +#pdfxmltex pdftex language.dat *pdfxmltex.ini +#xmltex pdftex language.dat *xmltex.ini diff --git a/print/texlive-base/files/patch-texk_ttf2pk2_configure b/print/texlive-base/files/patch-texk_ttf2pk2_configure index c4ac27f563ce..186ffc2d57ee 100644 --- a/print/texlive-base/files/patch-texk_ttf2pk2_configure +++ b/print/texlive-base/files/patch-texk_ttf2pk2_configure @@ -1,13 +1,13 @@ ---- texk/ttf2pk2/configure.orig 2019-03-25 17:27:50 UTC +--- texk/ttf2pk2/configure.orig 2023-12-23 16:57:39 UTC +++ texk/ttf2pk2/configure -@@ -15266,8 +15266,8 @@ else +@@ -16465,8 +16465,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" fi if $FT2_CONFIG --ftversion >/dev/null 2>&1; then - FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` - FREETYPE2_LIBS=`$FT2_CONFIG --libs` + FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags` + FREETYPE2_LIBS=`pkg-config freetype2 --libs` elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` diff --git a/print/texlive-base/pkg-plist b/print/texlive-base/pkg-plist index b129a125d84c..49134349047a 100644 --- a/print/texlive-base/pkg-plist +++ b/print/texlive-base/pkg-plist @@ -1,610 +1,608 @@ bin/a2ping bin/a5toa4 bin/adhocfilelist bin/afm2afm bin/afm2pl bin/albatross bin/allcm bin/allec bin/allneeded bin/arara bin/arlatex bin/authorindex bin/autoinst bin/autosp bin/axohelp bin/bbl2bib bin/bbox bin/bg5+latex bin/bg5+pdflatex bin/bg5conv bin/bg5latex bin/bg5pdflatex bin/bib2gls bin/bibcop bin/bibdoiadd bin/bibexport bin/bibmradd bin/bibtex8 bin/bibtexu bin/biburl2doi bin/bibzbladd bin/bundledoc bin/cachepic bin/cef5conv bin/cef5latex bin/cef5pdflatex bin/cefconv bin/ceflatex bin/cefpdflatex bin/cefsconv bin/cefslatex bin/cefspdflatex bin/cfftot1 bin/checkcites bin/checklistings bin/chkdvifont bin/chklref bin/chktex bin/chkweb bin/citeproc-lua bin/cjk-gs-integrate bin/cllualatex bin/cluttex bin/clxelatex bin/convbkmk bin/convertgls2bib bin/ctan-o-mat bin/ctanbib bin/ctanify bin/ctanupload bin/de-macro bin/depythontex bin/detex bin/devnag bin/deweb bin/diadia bin/digestif bin/disdvi bin/dosepsbin bin/dt2dv bin/dtxgen bin/dv2dt bin/dvi2fax bin/dvi2tty bin/dviasm bin/dvibook bin/dviconcat bin/dvidvi bin/dvigif bin/dvihp bin/dviinfox bin/dvilj bin/dvilj2p bin/dvilj4 bin/dvilj4l bin/dvilj6 bin/dvipng bin/dvipos bin/dvired bin/dviselect bin/dvispc bin/dvisvgm bin/dvitodvi bin/e2pall bin/ebong bin/epspdf bin/epspdftk bin/epstopdf bin/exceltex bin/extconv bin/fig4latex bin/findhyph bin/fmtutil bin/fmtutil-sys bin/fmtutil-user bin/fontinst bin/fragmaster bin/gbklatex bin/gbkpdflatex bin/getmapdl bin/git-latexdiff bin/gregorio bin/gsftopk bin/hbf2gf bin/ht -bin/htcontext bin/htlatex bin/htmex bin/httex bin/httexi bin/htxelatex bin/htxetex bin/hyperxmp-add-bytecount bin/installfont-tl bin/jamo-normalize bin/jfmutil bin/kanji-config-updmap bin/kanji-config-updmap-sys bin/kanji-config-updmap-user bin/kanji-fontmap-creator bin/ketcindy bin/komkindex bin/l3build bin/lacheck bin/latex-git-log bin/latex-papersize bin/latex2man bin/latex2nemeth bin/latexdef bin/latexdiff bin/latexdiff-vc bin/latexfileversion bin/latexindent bin/latexmk bin/latexpand bin/latexrevise bin/lily-glyph-commands bin/lily-image-commands bin/lily-rebuild-pdfs bin/listbib bin/listings-ext.sh bin/llmk bin/ltx2crossrefxml bin/ltxfileinfo bin/ltximg bin/luafindfont bin/luaotfload-tool bin/lwarpmk bin/m-tx bin/mag bin/make4ht bin/makedtx bin/makeglossaries bin/makeglossaries-lite bin/makeindex bin/makejvf bin/match_parens bin/mathspic bin/mendex bin/mf2pt1 bin/mk4ht bin/mkgrkindex bin/mkindex bin/mkjobtexmf bin/mkpic bin/mkt1font bin/mktexfmt bin/mktexlsr bin/mktexmf bin/mktexpk bin/mktextfm bin/mmafm bin/mmpfb bin/mptopdf bin/msxlint bin/multibibliography bin/musixflx bin/musixtex bin/optexcount bin/ot2kpx bin/otfinfo bin/otftotfm bin/pagelayoutapi bin/pamphletangler bin/pdfannotextractor bin/pdfatfi bin/pdfbook2 bin/pdfcrop bin/pdfjam bin/pdflatexpicscale bin/pdftex-quiet bin/pdfxup bin/pedigree bin/perltex bin/pfarrei bin/pfb2pfa bin/pk2bm bin/pkfix bin/pkfix-helper bin/pmxab bin/pmxchords bin/pn2pdf bin/prepmx bin/ps2eps bin/ps2frag bin/ps2pk bin/ps4pdf bin/pslatex bin/pst2pdf bin/ptex2pdf bin/purifyeps bin/pygmentex bin/pythontex bin/repstopdf bin/rpdfcrop bin/rubibtex bin/rubikrotation bin/rumakeindex bin/rungs bin/scor2prt bin/simpdftex bin/sjisconv bin/sjislatex bin/sjispdflatex bin/spix bin/splitindex bin/srcredact bin/sty2dtx bin/svn-multi bin/t1dotlessj bin/t1lint bin/t1rawafm bin/t1reencode bin/t1testpage bin/t4ht bin/tex2aspc bin/tex4ebook bin/tex4ht bin/texaccents bin/texconfig bin/texconfig-dialog bin/texconfig-sys bin/texcount bin/texdef bin/texdiff bin/texdirflatten bin/texdoc bin/texdoctk bin/texfot bin/texhash bin/texlinks bin/texliveonfly bin/texloganalyser bin/texlogfilter bin/texlogsieve bin/texosquery bin/texosquery-jre5 bin/texosquery-jre8 bin/texplate bin/textestvis bin/thumbpdf bin/tikztosvg bin/tlcockpit bin/tlshell bin/tpic2pdftex bin/ttf2kotexfont bin/ttf2pk bin/ttf2tfm bin/ttfdump bin/ttftotype42 bin/typeoutfileinfo bin/ulqda bin/updmap bin/updmap-sys bin/updmap-user bin/upmendex bin/urlbst bin/vlna bin/vpe bin/vpl2ovp bin/vpl2vpl bin/webquiz bin/wordcount bin/xelatex-unsafe bin/xetex-unsafe bin/xhlatex bin/xindex bin/xml2pmx bin/yplan share/man/man1/afm2pl.1.gz share/man/man1/allcm.1.gz share/man/man1/allec.1.gz share/man/man1/allneeded.1.gz share/man/man1/autosp.1.gz share/man/man1/axohelp.1.gz share/man/man1/bbox.1.gz share/man/man1/bg5conv.1.gz share/man/man1/cef5conv.1.gz share/man/man1/cefconv.1.gz share/man/man1/cefsconv.1.gz share/man/man1/cfftot1.1.gz share/man/man1/chkdvifont.1.gz share/man/man1/chktex.1.gz share/man/man1/chkweb.1.gz share/man/man1/detex.1.gz share/man/man1/devnag.1.gz share/man/man1/deweb.1.gz share/man/man1/disdvi.1.gz share/man/man1/dt2dv.1.gz share/man/man1/dv2dt.1.gz share/man/man1/dvi2fax.1.gz share/man/man1/dvi2tty.1.gz share/man/man1/dvibook.1.gz share/man/man1/dviconcat.1.gz share/man/man1/dvidvi.1.gz share/man/man1/dvigif.1.gz share/man/man1/dvihp.1.gz share/man/man1/dvilj.1.gz share/man/man1/dvilj2p.1.gz share/man/man1/dvilj4.1.gz share/man/man1/dvilj4l.1.gz share/man/man1/dvilj6.1.gz share/man/man1/dvipng.1.gz share/man/man1/dvipos.1.gz share/man/man1/dvired.1.gz share/man/man1/dviselect.1.gz share/man/man1/dvispc.1.gz share/man/man1/dvisvgm.1.gz share/man/man1/dvitodvi.1.gz share/man/man1/e2pall.1.gz share/man/man1/extconv.1.gz share/man/man1/fmtutil-sys.1.gz share/man/man1/fmtutil.1.gz share/man/man1/fontinst.1.gz share/man/man1/gsftopk.1.gz share/man/man1/hbf2gf.1.gz share/man/man1/lacheck.1.gz share/man/man1/mag.1.gz share/man/man1/makeindex.1.gz share/man/man1/makejvf.1.gz share/man/man1/mendex.1.gz share/man/man1/mkindex.1.gz share/man/man1/mktexfmt.1.gz share/man/man1/mktexlsr.1.gz share/man/man1/mktexmf.1.gz share/man/man1/mktexpk.1.gz share/man/man1/mktextfm.1.gz share/man/man1/mmafm.1.gz share/man/man1/mmpfb.1.gz share/man/man1/msxlint.1.gz share/man/man1/otfinfo.1.gz share/man/man1/otftotfm.1.gz share/man/man1/pfb2pfa.1.gz share/man/man1/pk2bm.1.gz share/man/man1/pmxab.1.gz share/man/man1/prepmx.1.gz share/man/man1/ps2eps.1.gz share/man/man1/ps2frag.1.gz share/man/man1/ps2pk.1.gz share/man/man1/pslatex.1.gz share/man/man1/rubibtex.1.gz share/man/man1/rumakeindex.1.gz share/man/man1/scor2prt.1.gz share/man/man1/sjisconv.1.gz share/man/man1/t1dotlessj.1.gz share/man/man1/t1lint.1.gz share/man/man1/t1rawafm.1.gz share/man/man1/t1reencode.1.gz share/man/man1/t1testpage.1.gz share/man/man1/tex2aspc.1.gz share/man/man1/texconfig-sys.1.gz share/man/man1/texconfig.1.gz share/man/man1/texdoctk.1.gz share/man/man1/texhash.1.gz share/man/man1/texlinks.1.gz share/man/man1/tpic2pdftex.1.gz share/man/man1/ttf2pk.1.gz share/man/man1/ttf2tfm.1.gz share/man/man1/ttfdump.1.gz share/man/man1/ttftotype42.1.gz share/man/man1/updmap-sys.1.gz share/man/man1/updmap.1.gz share/man/man1/vlna.1.gz share/man/man1/xml2pmx.1.gz share/man/man5/fmtutil.cnf.5.gz share/man/man5/updmap.cfg.5.gz %%FMTUTIL_CNF%% %%TEXMFDISTDIR%%/bibtex/csf/base/88591lat.csf %%TEXMFDISTDIR%%/bibtex/csf/base/88591sca.csf %%TEXMFDISTDIR%%/bibtex/csf/base/ascii.csf %%TEXMFDISTDIR%%/bibtex/csf/base/cp437lat.csf %%TEXMFDISTDIR%%/bibtex/csf/base/cp850lat.csf %%TEXMFDISTDIR%%/bibtex/csf/base/cp850sca.csf %%TEXMFDISTDIR%%/bibtex/csf/base/cp866rus.csf %%TEXMFDISTDIR%%/bibtex/csf/base/csfile.txt %%TEXMFDISTDIR%%/scripts/a2ping/a2ping.pl %%TEXMFDISTDIR%%/scripts/accfonts/mkt1font %%TEXMFDISTDIR%%/scripts/accfonts/vpl2ovp %%TEXMFDISTDIR%%/scripts/accfonts/vpl2vpl %%TEXMFDISTDIR%%/scripts/adhocfilelist/adhocfilelist.sh %%TEXMFDISTDIR%%/scripts/albatross/albatross.sh %%TEXMFDISTDIR%%/scripts/arara/arara.sh %%TEXMFDISTDIR%%/scripts/attachfile2/pdfatfi.pl %%TEXMFDISTDIR%%/scripts/authorindex/authorindex %%TEXMFDISTDIR%%/scripts/bib2gls/bib2gls.sh %%TEXMFDISTDIR%%/scripts/bib2gls/convertgls2bib.sh %%TEXMFDISTDIR%%/scripts/bibcop/bibcop.pl %%TEXMFDISTDIR%%/scripts/bibexport/bibexport.sh %%TEXMFDISTDIR%%/scripts/bundledoc/arlatex %%TEXMFDISTDIR%%/scripts/bundledoc/bundledoc %%TEXMFDISTDIR%%/scripts/cachepic/cachepic.tlu %%TEXMFDISTDIR%%/scripts/checkcites/checkcites.lua %%TEXMFDISTDIR%%/scripts/checklistings/checklistings.sh %%TEXMFDISTDIR%%/scripts/chklref/chklref.pl %%TEXMFDISTDIR%%/scripts/citation-style-language/citeproc-lua.lua %%TEXMFDISTDIR%%/scripts/cjk-gs-integrate/cjk-gs-integrate.pl %%TEXMFDISTDIR%%/scripts/clojure-pamphlet/pamphletangler %%TEXMFDISTDIR%%/scripts/cluttex/cluttex.lua %%TEXMFDISTDIR%%/scripts/context/perl/mptopdf.pl %%TEXMFDISTDIR%%/scripts/convbkmk/convbkmk.rb %%TEXMFDISTDIR%%/scripts/crossrefware/bbl2bib.pl %%TEXMFDISTDIR%%/scripts/crossrefware/bibdoiadd.pl %%TEXMFDISTDIR%%/scripts/crossrefware/bibmradd.pl %%TEXMFDISTDIR%%/scripts/crossrefware/biburl2doi.pl %%TEXMFDISTDIR%%/scripts/crossrefware/bibzbladd.pl %%TEXMFDISTDIR%%/scripts/crossrefware/ltx2crossrefxml.pl %%TEXMFDISTDIR%%/scripts/ctan-o-mat/ctan-o-mat.pl %%TEXMFDISTDIR%%/scripts/ctanbib/ctanbib %%TEXMFDISTDIR%%/scripts/ctanify/ctanify %%TEXMFDISTDIR%%/scripts/ctanupload/ctanupload.pl %%TEXMFDISTDIR%%/scripts/de-macro/de-macro %%TEXMFDISTDIR%%/scripts/diadia/diadia.lua %%TEXMFDISTDIR%%/scripts/digestif/digestif.texlua %%TEXMFDISTDIR%%/scripts/dosepsbin/dosepsbin.pl %%TEXMFDISTDIR%%/scripts/dtxgen/dtxgen %%TEXMFDISTDIR%%/scripts/dviasm/dviasm.py %%TEXMFDISTDIR%%/scripts/dviinfox/dviinfox.pl %%TEXMFDISTDIR%%/scripts/ebong/ebong.py %%TEXMFDISTDIR%%/scripts/epspdf/epspdf.tlu %%TEXMFDISTDIR%%/scripts/epspdf/epspdftk.tcl %%TEXMFDISTDIR%%/scripts/epstopdf/epstopdf.pl %%TEXMFDISTDIR%%/scripts/exceltex/exceltex %%TEXMFDISTDIR%%/scripts/fig4latex/fig4latex %%TEXMFDISTDIR%%/scripts/findhyph/findhyph %%TEXMFDISTDIR%%/scripts/fontools/afm2afm %%TEXMFDISTDIR%%/scripts/fontools/autoinst %%TEXMFDISTDIR%%/scripts/fontools/ot2kpx %%TEXMFDISTDIR%%/scripts/fragmaster/fragmaster.pl %%TEXMFDISTDIR%%/scripts/getmap/getmapdl.lua %%TEXMFDISTDIR%%/scripts/git-latexdiff/git-latexdiff %%TEXMFDISTDIR%%/scripts/glossaries/makeglossaries %%TEXMFDISTDIR%%/scripts/glossaries/makeglossaries-lite.lua %%TEXMFDISTDIR%%/scripts/hyperxmp/hyperxmp-add-bytecount.pl %%TEXMFDISTDIR%%/scripts/installfont/installfont-tl %%TEXMFDISTDIR%%/scripts/jfmutil/jfmutil.pl %%TEXMFDISTDIR%%/scripts/ketcindy/ketcindy.pl %%TEXMFDISTDIR%%/scripts/kotex-utils/jamo-normalize.pl %%TEXMFDISTDIR%%/scripts/kotex-utils/komkindex.pl %%TEXMFDISTDIR%%/scripts/kotex-utils/ttf2kotexfont.pl %%TEXMFDISTDIR%%/scripts/l3build/l3build.lua %%TEXMFDISTDIR%%/scripts/latex-git-log/latex-git-log %%TEXMFDISTDIR%%/scripts/latex-papersize/latex-papersize.py %%TEXMFDISTDIR%%/scripts/latex2man/latex2man %%TEXMFDISTDIR%%/scripts/latex2nemeth/latex2nemeth %%TEXMFDISTDIR%%/scripts/latexdiff/latexdiff-vc.pl %%TEXMFDISTDIR%%/scripts/latexdiff/latexdiff.pl %%TEXMFDISTDIR%%/scripts/latexdiff/latexrevise.pl %%TEXMFDISTDIR%%/scripts/latexfileversion/latexfileversion %%TEXMFDISTDIR%%/scripts/latexindent/latexindent.pl %%TEXMFDISTDIR%%/scripts/latexmk/latexmk.pl %%TEXMFDISTDIR%%/scripts/latexpand/latexpand %%TEXMFDISTDIR%%/scripts/light-latex-make/llmk.lua %%TEXMFDISTDIR%%/scripts/lilyglyphs/lily-glyph-commands.py %%TEXMFDISTDIR%%/scripts/lilyglyphs/lily-image-commands.py %%TEXMFDISTDIR%%/scripts/lilyglyphs/lily-rebuild-pdfs.py %%TEXMFDISTDIR%%/scripts/listbib/listbib %%TEXMFDISTDIR%%/scripts/listings-ext/listings-ext.sh %%TEXMFDISTDIR%%/scripts/ltxfileinfo/ltxfileinfo %%TEXMFDISTDIR%%/scripts/ltximg/ltximg.pl %%TEXMFDISTDIR%%/scripts/luafindfont/luafindfont.lua %%TEXMFDISTDIR%%/scripts/luaotfload/luaotfload-tool.lua %%TEXMFDISTDIR%%/scripts/lwarp/lwarpmk.lua %%TEXMFDISTDIR%%/scripts/m-tx/m-tx.lua %%TEXMFDISTDIR%%/scripts/make4ht/make4ht %%TEXMFDISTDIR%%/scripts/makedtx/makedtx.pl %%TEXMFDISTDIR%%/scripts/match_parens/match_parens %%TEXMFDISTDIR%%/scripts/mathspic/mathspic.pl %%TEXMFDISTDIR%%/scripts/mf2pt1/mf2pt1.pl %%TEXMFDISTDIR%%/scripts/mkgrkindex/mkgrkindex %%TEXMFDISTDIR%%/scripts/mkjobtexmf/mkjobtexmf.pl %%TEXMFDISTDIR%%/scripts/mkpic/mkpic %%TEXMFDISTDIR%%/scripts/multibibliography/multibibliography.pl %%TEXMFDISTDIR%%/scripts/musixtex/musixflx.lua %%TEXMFDISTDIR%%/scripts/musixtex/musixtex.lua %%TEXMFDISTDIR%%/scripts/optexcount/optexcount %%TEXMFDISTDIR%%/scripts/pagelayout/pagelayoutapi %%TEXMFDISTDIR%%/scripts/pagelayout/textestvis %%TEXMFDISTDIR%%/scripts/pax/pdfannotextractor.pl %%TEXMFDISTDIR%%/scripts/pdfbook2/pdfbook2 %%TEXMFDISTDIR%%/scripts/pdfcrop/pdfcrop.pl %%TEXMFDISTDIR%%/scripts/pdfjam/pdfjam %%TEXMFDISTDIR%%/scripts/pdflatexpicscale/pdflatexpicscale.pl %%TEXMFDISTDIR%%/scripts/pdftex-quiet/pdftex-quiet %%TEXMFDISTDIR%%/scripts/pdfxup/pdfxup %%TEXMFDISTDIR%%/scripts/pedigree-perl/pedigree.pl %%TEXMFDISTDIR%%/scripts/perltex/perltex.pl %%TEXMFDISTDIR%%/scripts/petri-nets/pn2pdf %%TEXMFDISTDIR%%/scripts/pfarrei/a5toa4.tlu %%TEXMFDISTDIR%%/scripts/pfarrei/pfarrei.tlu %%TEXMFDISTDIR%%/scripts/pkfix-helper/pkfix-helper %%TEXMFDISTDIR%%/scripts/pkfix/pkfix.pl %%TEXMFDISTDIR%%/scripts/pmxchords/pmxchords.lua %%TEXMFDISTDIR%%/scripts/ps2eps/ps2eps.pl %%TEXMFDISTDIR%%/scripts/pst-pdf/ps4pdf %%TEXMFDISTDIR%%/scripts/pst2pdf/pst2pdf.pl %%TEXMFDISTDIR%%/scripts/ptex-fontmaps/kanji-config-updmap-sys.sh %%TEXMFDISTDIR%%/scripts/ptex-fontmaps/kanji-config-updmap-user.sh %%TEXMFDISTDIR%%/scripts/ptex-fontmaps/kanji-config-updmap.pl %%TEXMFDISTDIR%%/scripts/ptex-fontmaps/kanji-fontmap-creator.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 %%TEXMFDISTDIR%%/scripts/simpdftex/simpdftex %%TEXMFDISTDIR%%/scripts/spix/spix.py %%TEXMFDISTDIR%%/scripts/splitindex/splitindex.pl %%TEXMFDISTDIR%%/scripts/srcredact/srcredact.pl %%TEXMFDISTDIR%%/scripts/sty2dtx/sty2dtx.pl %%TEXMFDISTDIR%%/scripts/svn-multi/svn-multi.pl %%TEXMFDISTDIR%%/scripts/tex4ebook/tex4ebook %%TEXMFDISTDIR%%/scripts/tex4ht/ht.sh -%%TEXMFDISTDIR%%/scripts/tex4ht/htcontext.sh %%TEXMFDISTDIR%%/scripts/tex4ht/htlatex.sh %%TEXMFDISTDIR%%/scripts/tex4ht/htmex.sh %%TEXMFDISTDIR%%/scripts/tex4ht/httex.sh %%TEXMFDISTDIR%%/scripts/tex4ht/httexi.sh %%TEXMFDISTDIR%%/scripts/tex4ht/htxelatex.sh %%TEXMFDISTDIR%%/scripts/tex4ht/htxetex.sh %%TEXMFDISTDIR%%/scripts/tex4ht/mk4ht.pl %%TEXMFDISTDIR%%/scripts/tex4ht/xhlatex.sh %%TEXMFDISTDIR%%/scripts/texaccents/texaccents.sno %%TEXMFDISTDIR%%/scripts/texcount/texcount.pl %%TEXMFDISTDIR%%/scripts/texdef/texdef.pl %%TEXMFDISTDIR%%/scripts/texdiff/texdiff %%TEXMFDISTDIR%%/scripts/texdirflatten/texdirflatten %%TEXMFDISTDIR%%/scripts/texdoc/texdoc.tlu %%TEXMFDISTDIR%%/scripts/texdoctk/texdoctk.pl %%TEXMFDISTDIR%%/scripts/texfot/texfot.pl %%TEXMFDISTDIR%%/scripts/texlive-extra/allcm.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/allneeded.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/dvi2fax.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/dvired.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/e2pall.pl %%TEXMFDISTDIR%%/scripts/texlive-extra/fontinst.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/ps2frag.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/pslatex.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/rubibtex.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/rumakeindex.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/texconfig-dialog.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/texconfig-sys.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/texconfig.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/texlinks.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/xelatex-unsafe.sh %%TEXMFDISTDIR%%/scripts/texlive-extra/xetex-unsafe.sh %%TEXMFDISTDIR%%/scripts/texlive/fmtutil-sys.sh %%TEXMFDISTDIR%%/scripts/texlive/fmtutil-user.sh %%TEXMFDISTDIR%%/scripts/texlive/fmtutil.pl %%TEXMFDISTDIR%%/scripts/texlive/mktexlsr %%TEXMFDISTDIR%%/scripts/texlive/mktexmf %%TEXMFDISTDIR%%/scripts/texlive/mktexpk %%TEXMFDISTDIR%%/scripts/texlive/mktextfm %%TEXMFDISTDIR%%/scripts/texlive/rungs.lua %%TEXMFDISTDIR%%/scripts/texlive/updmap-sys.sh %%TEXMFDISTDIR%%/scripts/texlive/updmap-user.sh %%TEXMFDISTDIR%%/scripts/texlive/updmap.pl %%TEXMFDISTDIR%%/scripts/texliveonfly/texliveonfly.py %%TEXMFDISTDIR%%/scripts/texloganalyser/texloganalyser %%TEXMFDISTDIR%%/scripts/texlogfilter/texlogfilter %%TEXMFDISTDIR%%/scripts/texlogsieve/texlogsieve %%TEXMFDISTDIR%%/scripts/texosquery/texosquery-jre5.sh %%TEXMFDISTDIR%%/scripts/texosquery/texosquery-jre8.sh %%TEXMFDISTDIR%%/scripts/texosquery/texosquery.sh %%TEXMFDISTDIR%%/scripts/texplate/texplate.sh %%TEXMFDISTDIR%%/scripts/thumbpdf/thumbpdf.pl %%TEXMFDISTDIR%%/scripts/tikztosvg/tikztosvg %%TEXMFDISTDIR%%/scripts/tlcockpit/tlcockpit.sh %%TEXMFDISTDIR%%/scripts/tlshell/tlshell.tcl %%TEXMFDISTDIR%%/scripts/typeoutfileinfo/typeoutfileinfo.sh %%TEXMFDISTDIR%%/scripts/ulqda/ulqda.pl %%TEXMFDISTDIR%%/scripts/urlbst/urlbst %%TEXMFDISTDIR%%/scripts/vpe/vpe.pl %%TEXMFDISTDIR%%/scripts/webquiz/webquiz.py %%TEXMFDISTDIR%%/scripts/wordcount/wordcount.sh %%TEXMFDISTDIR%%/scripts/xindex/xindex.lua %%TEXMFDISTDIR%%/scripts/yplan/yplan %%TEXMFDISTDIR%%/texconfig/tcfmgr %%TEXMFDISTDIR%%/texconfig/tcfmgr.map %%TEXMFDISTDIR%%/web2c/fmtutil.cnf diff --git a/print/texlive-docs/Makefile b/print/texlive-docs/Makefile index 739e6f2ffa22..f02cab4662f4 100644 --- a/print/texlive-docs/Makefile +++ b/print/texlive-docs/Makefile @@ -1,117 +1,117 @@ PORTNAME= texlive -PORTVERSION= ${TEXLIVE_VERSION} +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ PKGNAMESUFFIX= -docs DISTNAME= ${PORTNAME}-${PORTVERSION}-texmf DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= TeX Live Typesetting System, documentation WWW= https://tug.org/texlive/ USES= perl5 tar:xz tex EXTRACT_AFTER_ARGS= | ${TAR} xf - \ ${EXCLUDE_FILES:S,^,--exclude ${DISTNAME}/,} NO_BUILD= yes EXCLUDE_FILES= \*/doc/man texmf-dist/doc/aleph texmf-dist/doc/lualatex \ texmf-dist/doc/luatex texmf-dist/doc/xelatex \ texmf-dist/doc/xetex texmf-dist/doc/otherformats/jadetex \ texmf-dist/doc/otherformats/xmltex texmf-dist/doc/ptex \ texmf-dist/doc/platex texmf-dist/doc/uptex \ texmf-dist/doc/uplatex texmf-dist/doc/fonts/japanese-otf \ texmf-dist/doc/fonts/japanese-otf-uptex \ texmf-dist/doc/fonts/jfontmaps texmf-dist/doc/dvips \ texmf-dist/doc/dvipdfmx NO_ARCH= yes do-extract: @${MKDIR} ${WRKDIR} do-install: ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner \ ${DISTNAME}/texmf-dist/doc ${REINPLACE_CMD} -i '' -e 's|/usr/bin/fontforge|${PREFIX}/bin/fontforge|g' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/aesupp/genfonts.pe \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/berenisadf/ff-ybd.pe \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/report/kernclasses.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/metafont/bulk_eps_import.py ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl -w|${PERL}|g' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/aesupp/ggen.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/abs2rel.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html1.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html2.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html3.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/txt2qq.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/makeunidef.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/ctan-o-mat/lib/md2ltx.pl ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl -T|${PERL}|g' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/discovermacro.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/latexout.pl ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/dad/dad-to-utf8.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/dad/utf8-to-dad.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/KerningNumerals.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/CheckConformance.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/phaistos/getglyphs \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/pst-mirror/createEPS/scripts/filtre.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/gridslides/compile.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/latex-web-companion/ch7/sgmlspl.pl \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/unsupported/u2ps \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/gustprog/porzadki.pl ${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/hex_range.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/xcharter/altone.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/aramaic-serto/serto.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/scanpages/replicate.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/songproj/song2tex.py ${REINPLACE_CMD} -i '' -e 's|/usr/bin/python|${PYTHO_CMD}|g' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/unicode_joining.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/arabic_test.py \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/generate_arabic_shaping.py ${REINPLACE_CMD} -i '' -e 's|/usr/bin/texlua|${PREFIX}/bin/texlua|g' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua ${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|g' \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/cstex/cspsfonts-gen/mkfc \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/cstex/cspsfonts-gen/mkf \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/drm/allfonts.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/e-french/bin/linux/makefrindex \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/bardiag/example/compile.all \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/beamerappendixnote/build.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-abnt/test.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-software/mkbiblatexstubs.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/chinesechess/build.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/circledtext/build.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/codebox/build.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ctable/inst \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/gamebooklib/gamebooklib_countpagesperseed.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hepnames/mkmacrotables \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runAll.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runEXA.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pascaltriangle/build.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfreview.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfshrink.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/seminar/run.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shdoc/shreformat.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/termsim/build.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/tlc-article/bin/deploy \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/uspace/uspace-ctanify.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/COMPILE.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/laproof.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/makehtmlindex.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/plain/transparent-io/TrIO.org \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/chklref/release.sh \ ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/latexdiff/contrib/latexdiff-wrap ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST} .include diff --git a/print/texlive-docs/distinfo b/print/texlive-docs/distinfo index 7e83018ec3ea..b229bd3501e4 100644 --- a/print/texlive-docs/distinfo +++ b/print/texlive-docs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680719111 -SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253 -SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744 +TIMESTAMP = 1715387737 +SHA256 (TeX/texlive-20240312-texmf.tar.xz) = c8eae2deaaf51e86d93baa6bbcc4e94c12aa06a0d92893df474cc7d2a012c7a7 +SIZE (TeX/texlive-20240312-texmf.tar.xz) = 4270954732 diff --git a/print/texlive-texmf-source/Makefile b/print/texlive-texmf-source/Makefile index f5fc96aa9aa6..6e36a56218cd 100644 --- a/print/texlive-texmf-source/Makefile +++ b/print/texlive-texmf-source/Makefile @@ -1,85 +1,84 @@ PORTNAME= texlive -PORTVERSION= ${TEXLIVE_VERSION} +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= LOCAL/tex PKGNAMESUFFIX= -texmf-source -DISTNAME= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}-freebsd +DISTNAME= ${PORTNAME}-${DISTVERSION}${PKGNAMESUFFIX}-freebsd DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= TeX Live Typesetting System, texmf Tree (source) WWW= https://tug.org/texlive/ USES= cpe perl5 python:build tar:xz tex CPE_VENDOR= tug USE_PERL5= build CONFLICTS_INSTALL= texlive-base-202[0-9]* NO_BUILD= yes TEXHASHDIRS= ${TEXMFDISTDIR} do-extract: @${MKDIR} ${WRKDIR} do-install: ${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST} - .if defined(MAINTAINER_MODE) _INCLUDE_FILES= source _EXCLUDE_FILES= source/fonts/japanese-otf source/luatex source/platex \ source/fonts/japanese-otf-uptex source/xmltex \ source/fonts/uptex source/jadetex \ source/lambda source/lualatex source/uplatex source/xelatex -_WRKSRC= ${WRKDIR}/texlive-20230313-texmf-source +_WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}${PKGNAMESUFFIX} _maintainer-extract: ${MAKE} clean ${MKDIR} ${_WRKSRC} ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME_TEXMF}${EXTRACT_SUFX} \ -C ${_WRKSRC}$ \ --strip-components 1 --no-same-permission --no-same-owner \ ${_INCLUDE_FILES:S,^,--include ${DISTNAME_TEXMF}/texmf-dist/,} \ ${_EXCLUDE_FILES:S,^,--exclude ${DISTNAME_TEXMF}/texmf-dist/,} _maintainer-patch: _maintainer-extract ${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|g' \ ${_WRKSRC}/texmf-dist/source/fonts/ae/clean \ ${_WRKSRC}/texmf-dist/source/fonts/ae/install \ ${_WRKSRC}/texmf-dist/source/latex/avremu/test-suite/test-suite \ ${_WRKSRC}/texmf-dist/source/latex/fifinddo-info/makevars/bashvars.sh \ ${_WRKSRC}/texmf-dist/source/latex/fifinddo-info/makevars/texvars.sh \ ${_WRKSRC}/texmf-dist/source/latex/nwafuthesis/build.sh \ ${_WRKSRC}/texmf-dist/source/support/optexcount/install.sh ${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|' \ ${_WRKSRC}/texmf-dist/source/fonts/gentium-tug/type1/kerncorrection.py \ ${_WRKSRC}/texmf-dist/source/fonts/gentium-tug/type1/afmcreator.py \ ${_WRKSRC}/texmf-dist/source/fonts/gentium-tug/type1/greekcorrection.py \ ${_WRKSRC}/texmf-dist/source/latex/wargame/utils/wgexport.py \ ${_WRKSRC}/texmf-dist/source/latex/wargame/utils/wgsvg2tikz.py \ ${_WRKSRC}/texmf-dist/source/support/optexcount/optexcount.py ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \ ${_WRKSRC}/texmf-dist/source/generic/hyph-utf8/contributed/make-exhyph.pl \ ${_WRKSRC}/texmf-dist/source/generic/ruhyphen/sorthyph \ ${_WRKSRC}/texmf-dist/source/generic/ruhyphen/reduce-patt \ ${_WRKSRC}/texmf-dist/source/latex/proposal/bin/checksum \ ${_WRKSRC}/texmf-dist/source/latex/proposal/bin/filedate _maintainer-dist: _maintainer-patch ${TAR} --options xz:compression-level=9 -Jcvf \ - ${WRKDIR}/texlive-20230313-texmf-source-freebsd.tar.xz \ - -C ${WRKDIR} ${PORTNAME}-${TEXLIVE_VERSION}${PKGNAMESUFFIX} - scp ${WRKDIR}/texlive-20230313-texmf-freebsd.tar.xz \ + ${WRKDIR}/${DISTFILES} \ + -C ${WRKDIR} ${PORTNAME}-${DISTVERSION}${PKGNAMESUFFIX} + scp ${WRKDIR}/${DISTFILES} \ bofh@freefall.freebsd.org://home/tex/public_distfiles/ .endif .include diff --git a/print/texlive-texmf-source/distinfo b/print/texlive-texmf-source/distinfo index 6fb03d4a2257..aceee83f7222 100644 --- a/print/texlive-texmf-source/distinfo +++ b/print/texlive-texmf-source/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698350280 -SHA256 (TeX/texlive-20230313-texmf-source-freebsd.tar.xz) = 35449f930ad7213021b3fa1dcf04a2c88d56da12b2c94e24ae8c26ebd41dc78a -SIZE (TeX/texlive-20230313-texmf-source-freebsd.tar.xz) = 66013568 +TIMESTAMP = 1715404475 +SHA256 (TeX/texlive-20240312-texmf-source-freebsd.tar.xz) = 2fd450d4c951d8bce31064b96ee8cd601d915b439132075ebb980d1d51ac113e +SIZE (TeX/texlive-20240312-texmf-source-freebsd.tar.xz) = 71434480 diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile index a4f00b0f8d3e..01e9be77278e 100644 --- a/print/texlive-texmf/Makefile +++ b/print/texlive-texmf/Makefile @@ -1,138 +1,136 @@ PORTNAME= texlive -PORTVERSION= ${TEXLIVE_VERSION} +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= LOCAL/tex PKGNAMESUFFIX= -texmf -DISTNAME= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}-freebsd +DISTNAME= ${PORTNAME}-${DISTVERSION}${PKGNAMESUFFIX}-freebsd DIST_SUBDIR= TeX EXTRACT_ONLY= MAINTAINER= tex@FreeBSD.org COMMENT= TeX Live Typesetting System, texmf Tree WWW= https://tug.org/texlive/ # Reduce DEPENDS temporarily -#USES= cpe python:run tar:xz tex USES= cpe tar:xz tex CPE_VENDOR= tug -#USE_TEX= base basic:extract texhash tlmgr:run USE_TEX= texhash tlmgr:run NO_ARCH= yes NO_BUILD= yes NO_WRKSUBDIR= yes PKG_CREATE_VERBOSE= yes TEXHASHDIRS= ${TEXMFDIR} ${TEXMFDISTDIR} do-install: ${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST} .if defined(MAINTAINER_MODE) EXCLUDE_FILES= \*/doc/man ls-R doc dvipdfm dvipdfmx dvips \ fonts/cmap/dvipdfmx fonts/cmap/uptex fonts/enc/dvips \ fonts/map/dvipdfm fonts/map/dvipdfmx fonts/map/dvips \ fonts/map/luatex fonts/misc/xetex fonts/source/ptex \ fonts/tfm/ptex fonts/ofm/public/japanese-otf tex/jadetex \ tex/lambda fonts/ovp/public/japanese-otf-uptex source \ fonts/tfm/public/japanese-otf fonts/vf/ptex xdvi \ fonts/tfm/public/japanese-otf-uptex tex/generic/dvips \ tex/latex/base fonts/tfm/uptex fonts/type1/ptex \ fonts/vf/public/japanese-otf tex/lualatex tex/luatex \ fonts/vf/public/japanese-otf-uptex fonts/vf/uptex \ tex/generic/config/luatex-unicode-letters.tex \ tex/generic/config/luatexiniconfig.tex scripts/xetex \ tex/generic/context/luatex tex/generic/xetexconfig \ tex/generic/hyph-utf8/patterns/ptex tex/platex tex/ptex \ tex/latex/latexconfig/dvilualatex.ini tex/uplatex \ tex/uptex tex/latex/latexconfig/lualatex-patch-kernel.tex \ tex/latex/latexconfig/lualatex-reset-codes.tex tex/xelatex \ tex/xetex tex/latex/latexconfig/lualatex.ini \ tex/latex/latexconfig/lualatexiniconfig.tex \ tex/latex/latexconfig/lualatexquotejobname.tex \ tex/latex/latexconfig/xelatex.ini scripts/context/lua \ tex/plain/config/aleph.ini web2c/updmap-hdr.cfg \ tex/plain/config/dviluatex.ini web2c/updmap.cfg \ tex/plain/config/luatex.ini tex/plain/config/xetex.ini \ tex/xmltex web2c/fmtutil-hdr.cnf tex/cslatex \ web2c/texmf.cnf scripts/context/stubs/unix/context \ scripts/context/stubs/unix/contextjit \ scripts/context/stubs/unix/luatools \ scripts/context/stubs/unix/mtxrun \ scripts/context/stubs/unix/mtxrunjit \ scripts/context/stubs/unix/texexec \ scripts/context/stubs/unix/texmfstart \ scripts/jfontmaps/kanji-config-updmap-sys.sh \ scripts/jfontmaps/kanji-config-updmap.pl \ scripts/jfontmaps/kanji-fontmap-creator.pl \ scripts/lua2dox/lua2dox_filter scripts/pdfjam/pdfflip \ scripts/pdfjam/pdf180 scripts/pdfjam/pdf270 \ scripts/pdfjam/pdf90 scripts/pdfjam/pdfbook \ scripts/pdfjam/pdfjam-pocketmod scripts/pdfjam/pdfjoin \ scripts/pdfjam/pdfjam-slides3up scripts/pdfjam/pdfnup \ scripts/pdfjam/pdfjam-slides6up scripts/pdfjam/pdfpun \ scripts/pmx/pmx2pdf.lua scripts/texlive/allcm.sh \ scripts/texlive/allneeded.sh scripts/texlive/dvi2fax.sh \ scripts/texlive/dvired.sh scripts/texlive/e2pall.pl \ scripts/texlive/fontinst.sh scripts/texlive/kpsetool.sh \ scripts/texlive/kpsewhere.sh scripts/texlive/ps2frag.sh \ scripts/texlive/pslatex.sh scripts/texlive/rubibtex.sh \ scripts/texlive/rumakeindex.sh scripts/texlive/rungs.tlu \ scripts/texlive/texconfig-dialog.sh \ scripts/texlive/texconfig-sys.sh scripts/texlive/tlmgr.pl \ scripts/texlive/texconfig.sh scripts/texlive/texlinks.sh \ scripts/texliveonfly/texliveonfly.py \ scripts/crossrefware/bbl2bib.pl \ scripts/crossrefware/bibmradd.pl \ scripts/crossrefware/biburl2doi.pl \ ${TEXLIVE_BASE_PLIST} TEXLIVE_BASE_PLIST!= grep TEXMFDISTDIR ${.CURDIR}/../texlive-base/pkg-plist | sed 's|%%TEXMFDISTDIR%%/||g' EXTRACT_AFTER_ARGS= | ${TAR} xf - \ ${EXCLUDE_FILES:S,^,--exclude ${DISTNAME_TEXMF}/texmf-dist/,} _maintainer-extract: ${MAKE} clean ${MKDIR} ${WRKSRC} ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME_TEXMF}${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}$ \ --strip-components 1 --no-same-permission --no-same-owner _maintainer-patch: _maintainer-extract ${MKDIR} ${WRKSRC}/texmf-dist/tex/latex/base ${REINPLACE_CMD} -i '' \ 's/\\def\\magyar@sugg@ie@low#1#2#3/\\def\\magyar@sugg@ie@low\\protect #1#2#3/' \ ${WRKSRC}/texmf-dist/tex/generic/babel-hungarian/magyar.ldf ${REINPLACE_CMD} -i '' -e '1s|/bin/bash|${bash_CMD}|' \ ${WRKSRC}/texmf-dist/scripts/logicpuzzle/createlpsudoku \ ${WRKSRC}/texmf-dist/scripts/logicpuzzle/lpsmag ${REINPLACE_CMD} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' \ ${WRKSRC}/texmf-dist/scripts/mycv/mycv_split_contents.pl @${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|; \ 1s|/usr/bin/python|${python_CMD}|;' \ ${WRKSRC}/texmf-dist/asymptote/GUI/*.py \ ${WRKSRC}/texmf-dist/scripts/webquiz/webquiz \ ${WRKSRC}/texmf-dist/scripts/*/*.py \ ${WRKSRC}/texmf-dist/tex/latex/wargame/*.py @${REINPLACE_CMD} -i '' -E -e '/ec\.tex/d' \ ${WRKSRC}/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex \ ${WRKSRC}/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-la-x-liturgic.tex @${REINPLACE_CMD} -i '' -e '1s|/usr/bin/luatex|${LOCALBASE}/bin/luatex|' \ ${WRKSRC}/texmf-dist/tex/generic/pgfplots/lua/*.lua _maintainer-dist: _maintainer-patch ${TAR} --options xz:compression-level=9 -Jcvf \ - ${WRKDIR}/texlive-20230313-texmf-freebsd.tar.xz \ + ${WRKDIR}/texlive-${TEXLIVE_VERSION}-texmf-freebsd.tar.xz \ -C ${WRKDIR} ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} - scp ${WRKDIR}/texlive-20230313-texmf-freebsd.tar.xz \ + scp ${WRKDIR}/texlive-${TEXLIVE_VERSION}-texmf-freebsd.tar.xz \ bofh@freefall.freebsd.org://home/tex/public_distfiles/ .endif .include diff --git a/print/texlive-texmf/distinfo b/print/texlive-texmf/distinfo index 69250f9fa894..5cfe80cc7487 100644 --- a/print/texlive-texmf/distinfo +++ b/print/texlive-texmf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698318970 -SHA256 (TeX/texlive-20230313-texmf-freebsd.tar.xz) = e6f08943da37b8626aae296fc6f2829283b72a9af043c10f8b65607ac953c4b1 -SIZE (TeX/texlive-20230313-texmf-freebsd.tar.xz) = 1168123096 +TIMESTAMP = 1716892949 +SHA256 (TeX/texlive-20240312-texmf-freebsd.tar.xz) = 5fa47a49c92800a57bb1f71e14eadfc058b10601c7cd5db438fd1b3a67f9eb97 +SIZE (TeX/texlive-20240312-texmf-freebsd.tar.xz) = 1301584808 diff --git a/print/texlive-tlmgr/Makefile b/print/texlive-tlmgr/Makefile index bdda383582e8..b8fa65a677ad 100644 --- a/print/texlive-tlmgr/Makefile +++ b/print/texlive-tlmgr/Makefile @@ -1,66 +1,62 @@ PORTNAME= texlive -PORTVERSION= ${TEXLIVE_VERSION} +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print perl5 MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ PKGNAMESUFFIX= -tlmgr -DISTFILES= ${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX} \ - ${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \ - ${TLPKG_FILE}.tar.gz +DISTFILES= ${PORTNAME}-${DISTVERSION}-extra${EXTRACT_SUFX} \ + ${PORTNAME}-${DISTVERSION}-source${EXTRACT_SUFX} DIST_SUBDIR= TeX -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}-extra${EXTRACT_SUFX} MAINTAINER= tex@FreeBSD.org COMMENT= TeXLive manager modules LICENSE= GPLv2 USES= cpe perl5 tar:xz tex CPE_VENDOR= tug USE_PERL5= run USE_TEX= kpathsea NO_ARCH= yes NO_BUILD= yes -TLPKG_FILE= ${PORTNAME}-${TEXLIVE_YEAR}0311-tlpdb-full EXTRACT_AFTER_ARGS_SOURCE= | ${TAR} -xf - -C ${WRKDIR} \ --no-same-permission --no-same-owner \ - ${PORTNAME}-${PORTVERSION}-source/texk/texlive/linked_scripts/texlive \ - ${PORTNAME}-${PORTVERSION}-source/build-aux/config.guess + ${PORTNAME}-${DISTVERSION}-source/texk/texlive/linked_scripts/texlive \ + ${PORTNAME}-${DISTVERSION}-source/build-aux/config.guess PATCH_WRKSRC= ${WRKDIR} post-extract: - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \ + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-source${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS_SOURCE} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/scripts/texlive ${INSTALL_SCRIPT} \ - ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source/texk/texlive/linked_scripts/texlive/tlmgr.pl \ + ${WRKDIR}/${PORTNAME}-${DISTVERSION}-source/texk/texlive/linked_scripts/texlive/tlmgr.pl \ ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/scripts/texlive cd ${STAGEDIR}${PREFIX}/bin && \ ${LN} -s ../${TEXMFDISTDIR}/scripts/texlive/tlmgr.pl tlmgr - # texlive-20230313-source/build-aux/config.guess - # /usr/local/share/tlpkg/installer/config.guess @${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}-extra/tlpkg/TeXLive/*.pm \ + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${DISTVERSION}-extra/tlpkg/TeXLive/*.pm \ ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}-extra/tlpkg/TeXLive/trans.pl \ + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${DISTVERSION}-extra/tlpkg/TeXLive/trans.pl \ ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive @${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR} ${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/.texlive-tlmgr ${MKDIR} ${STAGEDIR}/var/db/tlpkg/installer ${TOUCH} ${STAGEDIR}/var/db/tlpkg/tlmgr.log - ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${TLPKG_FILE}.tar.gz -C \ - ${STAGEDIR}/var/db/tlpkg/ texlive.tlpdb + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${DISTVERSION}-extra/tlpkg/texlive.tlpdb \ + ${STAGEDIR}/var/db/tlpkg ${INSTALL_SCRIPT} \ - ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source/build-aux/config.guess \ + ${WRKDIR}/${PORTNAME}-${DISTVERSION}-source/build-aux/config.guess \ ${STAGEDIR}/var/db/tlpkg/installer/ ${INSTALL_DATA} ${LOCALBASE}/share/texmf-dist/web2c/texmf.cnf \ ${STAGEDIR}/var/db/tlpkg ${MKDIR} ${STAGEDIR}/var/db/tlpkg/backups ${MKDIR} ${STAGEDIR}/var/db/tlpkg/tlpobj ${LN} -s /var/db/tlpkg ${STAGEDIR}${PREFIX}/share/tlpkg .include diff --git a/print/texlive-tlmgr/distinfo b/print/texlive-tlmgr/distinfo index 6a8ed4058078..8acec07d6903 100644 --- a/print/texlive-tlmgr/distinfo +++ b/print/texlive-tlmgr/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1680098317 -SHA256 (TeX/texlive-20230313-extra.tar.xz) = 80a676facc174e6853550c87898a982c96dfc63ac30de19e6fcaa7635edb38c2 -SIZE (TeX/texlive-20230313-extra.tar.xz) = 1893692 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 -SHA256 (TeX/texlive-20230311-tlpdb-full.tar.gz) = bf3360ebe897dac8424425ba3a87dbd41433aa92924c04be1e47285f264f6c8a -SIZE (TeX/texlive-20230311-tlpdb-full.tar.gz) = 3295736 +TIMESTAMP = 1715388073 +SHA256 (TeX/texlive-20240312-extra.tar.xz) = 770f1946cdcd1b5ddada2ea328bb37294174f70a2be28b33f38ce14717bc5496 +SIZE (TeX/texlive-20240312-extra.tar.xz) = 1990624 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588 diff --git a/print/texlive-tlmgr/files/patch-texlive-20230313-source_texk_texlive_linked__scripts_texlive_tlmgr.pl b/print/texlive-tlmgr/files/patch-texlive-20230313-source_texk_texlive_linked__scripts_texlive_tlmgr.pl deleted file mode 100644 index 52e5db4a9117..000000000000 --- a/print/texlive-tlmgr/files/patch-texlive-20230313-source_texk_texlive_linked__scripts_texlive_tlmgr.pl +++ /dev/null @@ -1,1294 +0,0 @@ ---- texlive-20230313-source/texk/texlive/linked_scripts/texlive/tlmgr.pl.orig 2023-04-02 15:07:53 UTC -+++ texlive-20230313-source/texk/texlive/linked_scripts/texlive/tlmgr.pl -@@ -3,7 +3,7 @@ - # Copyright 2008-2023 Norbert Preining - # This file is licensed under the GNU General Public License version 2 - # or any later version. --# -+# - # TeX Live Manager. - - use strict; use warnings; -@@ -125,7 +125,7 @@ our $FLAG_REINSTALL = "I"; - our $FLAG_REINSTALL = "I"; - - # keep in sync with install-tl. --our $common_fmtutil_args = -+our $common_fmtutil_args = - "--no-error-if-no-engine=$TeXLive::TLConfig::PartialEngineSupport"; - - # option variables -@@ -137,7 +137,7 @@ my %action_specification = ( - "run-post" => 0, - "function" => \&action_include_tlpobj - }, -- "backup" => { -+ "backup" => { - "options" => { - "all" => 1, - "backupdir" => "=s", -@@ -151,25 +151,25 @@ my %action_specification = ( - "run-post" => 0, - "function" => \&action_candidates - }, -- "check" => { -+ "check" => { - "options" => { "use-svn" => 1 }, - "run-post" => 1, - "function" => \&action_check - }, - "conf" => { -- "options" => { -+ "options" => { - "conffile" => "=s", - "delete" => 1, - }, - "run-post" => 0, - "function" => \&action_conf - }, -- "dump-tlpdb" => { -+ "dump-tlpdb" => { - "options" => { local => 1, remote => 1 }, - "run-post" => 0, - "function" => \&action_dumptlpdb - }, -- "generate" => { -+ "generate" => { - "options" => { - "dest" => "=s", - "localcfg" => "=s", -@@ -182,7 +182,7 @@ my %action_specification = ( - "run-post" => 0, - "function" => \&action_get_mirror - }, -- "gui" => { -+ "gui" => { - "options" => { - "load" => 1, - # Tk::CmdLine options -@@ -203,11 +203,11 @@ my %action_specification = ( - "run-post" => 1, - "function" => \&action_gui - }, -- "info" => { -- "options" => { -+ "info" => { -+ "options" => { - "data" => "=s", - "all" => 1, -- "list" => 1, -+ "list" => 1, - "only-installed" => 1, - "only-remote" => 1 - }, -@@ -236,11 +236,11 @@ my %action_specification = ( - "run-post" => 0, - "function" => \&action_key - }, -- "option" => { -+ "option" => { - "run-post" => 1, - "function" => \&action_option - }, -- "paper" => { -+ "paper" => { - "options" => { "list" => 1 }, - "run-post" => 1, - "function" => \&action_paper -@@ -250,12 +250,12 @@ my %action_specification = ( - "run-post" => 0, - "function" => \&action_path - }, -- "pinning" => { -+ "pinning" => { - "options" => { "all" => 1 }, - "run-post" => 1, - "function" => \&action_pinning - }, -- "platform" => { -+ "platform" => { - "options" => { "dry-run|n" => 1 }, - "run-post" => 1, - "function" => \&action_platform -@@ -269,12 +269,12 @@ my %action_specification = ( - "run-post" => 0, - "function" => \&action_postaction - }, -- "recreate-tlpdb" => { -+ "recreate-tlpdb" => { - "options" => { "platform|arch" => "=s" }, - "run-post" => 0, - "function" => \&action_recreate_tlpdb - }, -- "remove" => { -+ "remove" => { - "options" => { - "all" => 1, - "backup" => 1, -@@ -471,7 +471,7 @@ sub main { - - # unify arguments so that the $action contains paper in all cases - # and push the first arg back to @ARGV for action_paper processing -- if (defined $action -+ if (defined $action - && $action =~ /^(paper|xdvi|psutils|pdftex|dvips|dvipdfmx?|context)$/) { - unshift(@ARGV, $action); - $action = "paper"; -@@ -542,7 +542,7 @@ sub main { - # less can break control characters and thus the output of pod2usage - # is broken. We add/set LESS=-R in the environment and unset - # LESSPIPE and LESSOPEN to try to help. -- # -+ # - if (defined($ENV{'LESS'})) { - $ENV{'LESS'} .= " -R"; - } else { -@@ -582,7 +582,7 @@ for the full story.\n"; - } - - # --machine-readable is only supported by update. -- if ($::machinereadable && -+ if ($::machinereadable && - $action ne "update" && $action ne "install" && $action ne "option" && $action ne "shell" && $action ne "remove") { - tlwarn("$prg: --machine-readable output not supported for $action\n"); - } -@@ -638,6 +638,9 @@ for the full story.\n"; - # besides doing normal logging if -logfile is specified, we try to log - # package related actions (install, remove, update) to - # the package-log file TEXMFSYSVAR/web2c/tlmgr.log -+ # -+ # *** FreeBSD specific: FreeBSD port uses /var/db/tlpkg/tlmgr.log. -+ # - $packagelogged = 0; # how many msgs we logged - $commandslogged = 0; - chomp (my $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR`); -@@ -646,7 +649,7 @@ for the full story.\n"; - if ($opts{"usermode"}) { - $packagelogfile ||= "$texmfvar/web2c/tlmgr.log"; - } else { -- $packagelogfile ||= "$texmfsysvar/web2c/tlmgr.log"; -+ $packagelogfile ||= "/var/db/tlpkg/tlmgr.log"; - } - # - # Try to open the packagelog file, but do NOT die when that does not work -@@ -719,13 +722,13 @@ for the full story.\n"; - # being run (e.g., untar fails). F_WARNING continues on, including - # postactions (e.g., user tries to install 10 packages and the - # checksum fails for one, but the others are ok), but still ends the -- # program by exiting unsuccessfully. So call them both "errors" -+ # program by exiting unsuccessfully. So call them both "errors" - # as far as the user is concerned. - if ($ret & ($F_ERROR | $F_WARNING)) { - tlwarn("$prg: An error has occurred. See above messages. Exiting.\n"); - } - -- # end of main program, returns also error codes -+ # end of main program, returns also error codes - exit ($ret); - - } # end main -@@ -736,9 +739,9 @@ sub give_version { - $::mrversion = ""; - $::version_string .= "tlmgr revision $tlmgrversion\n"; - $::mrversion .= "revision $tlmgrrevision\n"; -- $::version_string .= "tlmgr using installation: $Master\n"; -- $::mrversion .= "installation $Master\n"; -- if (open (REL_TL, "$Master/release-texlive.txt")) { -+ $::version_string .= "tlmgr using installation: $Master/tlpkg\n"; -+ $::mrversion .= "installation $Master/tlpkg\n"; -+ if (open (REL_TL, "$Master/tlpkg/release-texlive.txt")) { - # print first, which has the TL version info. - my $rel_tl = ; - $::version_string .= $rel_tl; -@@ -831,7 +834,7 @@ sub execute_action { - - # run CMD with notice to the user and if exit status is nonzero, complain. - # return exit status. --# -+# - sub do_cmd_and_check { - my $cmd = shift; - # we output the pre-running notice on a separate line so that -@@ -920,7 +923,7 @@ sub handle_execute_actions { - for my $m (keys %{$::execute_actions{'disable'}{'maps'}}) { - $updmap_run_needed = 1; - } -- my $dest = $opts{"usermode"} ? "$::maintree/web2c/updmap.cfg" -+ my $dest = $opts{"usermode"} ? "$::maintree/web2c/updmap.cfg" - : "$TEXMFDIST/web2c/updmap.cfg"; - if ($updmap_run_needed) { - TeXLive::TLUtils::create_updmap($localtlpdb, $dest); -@@ -929,7 +932,7 @@ sub handle_execute_actions { - } - - # format relevant things -- # we first have to check if the config files, that is fmtutil.cnf -+ # we first have to check if the config files, that is fmtutil.cnf - # or one of the language* files have changed, regenerate them - # if necessary, and then run the necessary fmtutil calls. - { -@@ -990,7 +993,7 @@ sub handle_execute_actions { - "$TEXMFDIST/web2c/fmtutil.cnf"); - } - if (!$::regenerate_all_formats) { -- # first regenerate all formats --byengine -+ # first regenerate all formats --byengine - for my $e (keys %updated_engines) { - debug ("updating formats based on $e\n"); - $errors += do_cmd_and_check -@@ -1098,7 +1101,7 @@ sub action_get_mirror { - # - # just return a mirror - sub action_get_mirror { -- my $loc = give_ctan_mirror(); -+ my $loc = give_ctan_mirror(); - print "$loc\n"; - return ($F_OK | $F_NOPOSTACTION); - } -@@ -1188,7 +1191,7 @@ sub backup_and_remove_package { - } - if ($opts{"backup"}) { - $tlp->make_container($::progs{'compressor'}, $localtlpdb->root, -- destdir => $opts{"backupdir"}, -+ destdir => $opts{"backupdir"}, - relative => $tlp->relocated, - user => 1); - if ($autobackup) { -@@ -1253,7 +1256,7 @@ sub action_remove { - # - # remove all .ARCH dependencies, too, unless $opts{"no-depends-at-all"} - @packs = $localtlpdb->expand_dependencies("-only-arch", $localtlpdb, @packs) -- unless $opts{"no-depends-at-all"}; -+ unless $opts{"no-depends-at-all"}; - # remove deps unless $opts{"no-depends"} - @packs = $localtlpdb->expand_dependencies("-no-collections", $localtlpdb, @packs) unless $opts{"no-depends"}; - my %allpacks; -@@ -1293,7 +1296,7 @@ sub action_remove { - my $currnr = 1; - my $starttime = time(); - my $donesize = 0; -- -+ - print "total-bytes\t$sizes{'__TOTAL__'}\n" if $::machinereadable; - print "end-of-header\n" if $::machinereadable; - -@@ -1382,7 +1385,7 @@ sub action_remove { - - - # PAPER --# -+# - # ARGV can look like: - # paper a4 - # paper letter -@@ -1612,11 +1615,11 @@ sub action_dumptlpdb { - # - sub action_dumptlpdb { - init_local_db(); -- -+ - # we are basically doing machine-readable output. - my $savemr = $::machinereadable; - $::machinereadable = 1; -- -+ - if ($opts{"local"} && !$opts{"remote"}) { - if ($opts{"json"}) { - print $localtlpdb->as_json; -@@ -1639,11 +1642,11 @@ sub action_dumptlpdb { - tlwarn("$prg dump-tlpdb: need exactly one of --local and --remote.\n"); - return ($F_ERROR); - } -- -+ - $::machinereadable = $savemr; - return ($F_OK | $F_NOPOSTACTION); - } -- -+ - # INFO - # - sub action_info { -@@ -1711,7 +1714,7 @@ sub action_info { - # tlmgr info - # tlmgr info collection - # tlmgr info scheme -- # these commands just list the packages/collections/schemes installed with -+ # these commands just list the packages/collections/schemes installed with - # a short list - my @whattolist; - $what = ($what || "-all"); -@@ -1790,11 +1793,11 @@ sub action_search { - $tlpdb = $localtlpdb; - } - -- my ($foundfile, $founddesc) = search_tlpdb($tlpdb, $r, -- $opts{'file'} || $opts{'all'}, -- (!$opts{'file'} || $opts{'all'}), -+ my ($foundfile, $founddesc) = search_tlpdb($tlpdb, $r, -+ $opts{'file'} || $opts{'all'}, -+ (!$opts{'file'} || $opts{'all'}), - $opts{'word'}); -- -+ - print $founddesc; - print $foundfile; - -@@ -1807,7 +1810,7 @@ sub search_tlpdb { - my $retdesc = ''; - foreach my $pkg ($tlpdb->list_packages) { - my $tlp = $tlpdb->get_package($pkg); -- -+ - # --file or --all -> search (full) file names - if ($dofile) { - my @ret = search_pkg_files($tlp, $what); -@@ -1902,7 +1905,7 @@ sub get_available_backups { - # for more on that please see man perlport - my $usedt = $ctime; - if (!$usedt) { -- # can happen on -+ # can happen on - $usedt = $mtime; - } - if (!$usedt) { -@@ -1923,8 +1926,8 @@ sub restore_one_package { - # first remove the package, then reinstall it - # this way we get rid of useless files - my $restore_file; -- for my $ext (map {$Compressors{$_}{'extension'}} -- sort {$Compressors{$a}{'priority'} <=> $Compressors{$a}{'priority'}} -+ for my $ext (map {$Compressors{$_}{'extension'}} -+ sort {$Compressors{$a}{'priority'} <=> $Compressors{$a}{'priority'}} - keys %Compressors) { - if (-r "$bd/${pkg}.r${rev}.tar.$ext") { - $restore_file = "$bd/${pkg}.r${rev}.tar.$ext"; -@@ -1996,7 +1999,7 @@ sub setup_backup_directory { - my $saving_verb = $opts{"dry-run"} || $opts{"list"} ? "would save" :"saving"; - info("$prg: $saving_verb backups to $opts{'backupdir'}\n") - if $opts{"backup"} && !$::machinereadable; -- -+ - return ($ret, $autobackup); - } - -@@ -2103,7 +2106,7 @@ sub action_restore { - my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = - localtime($revs{$rs}); - # localtime returns dates starting from 1900, and the month is 0..11 -- $dstr = sprintf "%04d-%02d-%02d %02d:%02d", -+ $dstr = sprintf "%04d-%02d-%02d %02d:%02d", - $year+1900, $mon+1, $mday, $hour, $min; - } - if ($mode eq "json") { -@@ -2233,7 +2236,7 @@ sub action_backup { - } - - # if we do --clean --all we also want to remove packages that -- # are not present anymore in the tlpdb, so use the readdir mode -+ # are not present anymore in the tlpdb, so use the readdir mode - # to determine backups - if ($opts{"all"} && $clean_mode) { - # initialize the hash(packages) of hash(revisions) -@@ -2304,15 +2307,15 @@ sub action_backup { - # * write_w32_updater subroutine in tlmgr.pl prepares the update - # and writes the updater script. Packages in .xz archives are - # downloaded/copied and uncompressed to .tar files. Also .tar --# backups of the current packages are made. If everything is --# successful, the update script is created from the template. -+# backups of the current packages are made. If everything is -+# successful, the update script is created from the template. - # Otherwise the update is aborted. --# * updater-w32[.bat] batch script, triggers and executes the actual --# update. It first restarts itself in a separate instance of cmd.exe --# (and in a new console window in gui mode) and runs the update --# from there. The update is run with echo on and all output is --# logged to a file (or stderr in verbose mode). After successful --# infrastructure update, tlmgr is optionally restarted if update -+# * updater-w32[.bat] batch script, triggers and executes the actual -+# update. It first restarts itself in a separate instance of cmd.exe -+# (and in a new console window in gui mode) and runs the update -+# from there. The update is run with echo on and all output is -+# logged to a file (or stderr in verbose mode). After successful -+# infrastructure update, tlmgr is optionally restarted if update - # of other packages is asked for. - # The infrastructure update itself proceeds as follows: - # (1) untar all package archives -@@ -2323,9 +2326,9 @@ sub action_backup { - # (2) untar all package backups - # (3) include .tlpobj files (from backup) into tlpdb - # (4) print restore info to console --# Any error during (2) or (3) and we go into panic state. At this --# point there is no guarantee that the installation is still working. --# There is not much we can do but to print failed restore info and -+# Any error during (2) or (3) and we go into panic state. At this -+# point there is no guarantee that the installation is still working. -+# There is not much we can do but to print failed restore info and - # give instructions to download and run 'update-tlmgr-latest.exe' - # to repair the installation. - # ===================================================================== -@@ -2343,7 +2346,7 @@ sub write_w32_updater { - my $opt_src = $localtlpdb->option("install_srcfiles"); - my $opt_doc = $localtlpdb->option("install_docfiles"); - my $root = $localtlpdb->root; -- my $temp = "$root/temp"; -+ my $temp = "$root/tlpkg/temp"; - TeXLive::TLUtils::mkdirhier($temp); - tlwarn("$prg: Backup option not implemented for infrastructure update.\n") if ($opts{"backup"}); - if ($media eq 'local_uncompressed') { -@@ -2360,7 +2363,7 @@ sub write_w32_updater { - $media = $remotetlpdb->media; - if ($media eq "virtual") { - my $maxtlpdb; -- (undef, undef, $mediatlp, $maxtlpdb) = -+ (undef, undef, $mediatlp, $maxtlpdb) = - $remotetlpdb->virtual_candidate($pkg); - $repo = $maxtlpdb->root . "/$Archive"; - # update the media type of the used tlpdb -@@ -2422,7 +2425,7 @@ sub write_w32_updater { - unlink($dlcontainer); # we don't need that archive anymore - } - } -- -+ - # prepare updater script - my $respawn_cmd = "cmd.exe /e:on/v:off/d/c"; - $respawn_cmd = "start /wait $respawn_cmd" if ($::gui_mode); -@@ -2440,8 +2443,8 @@ sub write_w32_updater { - } - my $batch_script = <<"EOF"; - :: This file is part of an automated update process of --:: infrastructure files and should not be run standalone. --:: For more details about the update process see comments -+:: infrastructure files and should not be run standalone. -+:: For more details about the update process see comments - :: in tlmgr.pl (subroutine write_w32_updater). - - if [%1]==[:doit] goto :doit -@@ -2466,10 +2469,10 @@ sub write_w32_updater { - if not errorlevel 1 goto :update - >con echo Could not change working directory to "%~dp0.." - >con echo Aborting infrastructure update, no changes have been made. -- >con $gui_pause -+ >con $gui_pause - popd - exit /b 1 -- -+ - :update - for %%I in (@upd_tar) do ( - temp\\tar.exe -xmf temp\\%%I -@@ -2479,10 +2482,10 @@ sub write_w32_updater { - if errorlevel 1 goto :rollback - >>$pkg_log echo [%date% %time%] self update: @upd_info - >con echo self update: @upd_info -- del "%~dp0*.tar" "%~dp0tar.exe" -+ del "%~dp0*.tar" "%~dp0tar.exe" - >con echo Infrastructure update finished successfully. - >con echo $post_update_msg -- >con $gui_pause -+ >con $gui_pause - popd - exit /b 0 - -@@ -2499,7 +2502,7 @@ sub write_w32_updater { - >>$pkg_log echo [%date% %time%] self restore: @rst_info - >con echo self restore: @rst_info - >con echo Infrastructure update failed. Previous version has been restored. -- >con $gui_pause -+ >con $gui_pause - popd - exit /b 1 - -@@ -2510,7 +2513,7 @@ sub write_w32_updater { - >con echo Infrastructure update failed and backup recovery failed too. - >con echo To repair your TeX Live installation download and run: - >con echo $TeXLive::TLConfig::TeXLiveURL/update-tlmgr-latest.exe -- >con $gui_pause -+ >con $gui_pause - popd - exit /b 666 - EOF -@@ -2537,7 +2540,7 @@ EOF - - # UPDATE - --# compute the list of auto-install, auto-remove, forcibly-removed -+# compute the list of auto-install, auto-remove, forcibly-removed - # packages from the list of packages to be installed - # the list of packages passed in is already expanded - sub auto_remove_install_force_packages { -@@ -2582,7 +2585,7 @@ sub auto_remove_install_force_packages { - delete($removals_full{$p}); - } - # in a first round we check only for forcibly removed collections -- # this is necessary to NOT declare a package that is contained -+ # this is necessary to NOT declare a package that is contained - # in a forcibly removed collections as auto-install since it appears - # in the @remoteexpansion_full, but not in @localexpansion_full. - for my $p (@localexpansion_full) { -@@ -2608,9 +2611,9 @@ sub auto_remove_install_force_packages { - # now we have in %forcermpkgs_full only collections that have been - # forcibly removed. Again, expand those against the remote tlpdb - # and remove the expanded packages from the list of localexpansion. -- my @pkgs_from_forcerm_colls = -+ my @pkgs_from_forcerm_colls = - $remotetlpdb->expand_dependencies($localtlpdb, keys %forcermpkgs_full); -- # -+ # - # the package in @pkgs_from_forcerm_colls would be auto-installed, so - # check for that: - for my $p (keys %newpkgs_full) { -@@ -2735,9 +2738,9 @@ sub action_update { - $opts{"no-depends"} = 1 if $opts{"no-depends-at-all"}; - - # make a quick check on command line arguments to avoid loading -- # the remote db uselessly. -+ # the remote db uselessly. - # we require: -- # if no --list is given: either --self or --all or -+ # if no --list is given: either --self or --all or - # if --list is given: nothing - # other options just change the behavior - if (!($opts{"list"} || @ARGV || $opts{"all"} || $opts{"self"})) { -@@ -2837,8 +2840,8 @@ sub action_update { - @todo = grep (!m/$CriticalPackagesRegexp/, @todo) - unless $opts{"list"}; - } -- -- my ($remref, $newref, $forref, $new_due_to_forcerm_coll_ref) = -+ -+ my ($remref, $newref, $forref, $new_due_to_forcerm_coll_ref) = - auto_remove_install_force_packages(@todo); - my %removals = %$remref; - my %forcermpkgs = %$forref; -@@ -2888,7 +2891,7 @@ sub action_update { - tlwarn("$prg: Please resolve these conflicts!\n"); - return ($F_ERROR); - } -- -+ - # - # we first collect the list of packages to be actually updated or installed - my %updated; -@@ -3075,7 +3078,7 @@ sub action_update { - } - # - # the idea of suppressing warnings is simply that if a file is present -- # in more than one package either in the beginning or after a full -+ # in more than one package either in the beginning or after a full - # update then this should give a warning. In all other cases - # the warning should be suppressed. - for my $f (keys %old_files_to_pkgs) { -@@ -3097,7 +3100,7 @@ sub action_update { - # 2. updates - # 3. auto-install - # that way if a file has been moved from one to another package it -- # removing the old version after the new package has been installed -+ # removing the old version after the new package has been installed - # will not give a warning about files being included somewhere else - # - -@@ -3166,7 +3169,7 @@ sub action_update { - my $totalsize = $sizes{'__TOTAL__'}; - - -- # -+ # - # UPDATES AND NEW PACKAGES - # - # order: -@@ -3178,10 +3181,10 @@ sub action_update { - # - install new schemes (? will not happen?) - # - # this makes sure that only if all depending packages are installed -- # the collection is updated, which in turn makes sure that -+ # the collection is updated, which in turn makes sure that - # if the installation of a new package does break it will not be - # counted as forcibly removed later on. -- # -+ # - my @inst_packs; - my @inst_colls; - my @inst_schemes; -@@ -3215,7 +3218,7 @@ sub action_update { - for my $pkg (@new_packs, @new_colls, @new_schemes) { - $is_new{$pkg} = 1; - } -- -+ - # - # TODO idea - # currently this big loop contains a long if then for new packages -@@ -3225,7 +3228,7 @@ sub action_update { - # and following it after the change would make it much harder - # - foreach my $pkg (@inst_packs, @new_packs, @inst_colls, @new_colls, @inst_schemes, @new_schemes) { -- -+ - if (!$is_new{$pkg}) { - # skip this loop if infra update on w32 - next if ($pkg =~ m/^00texlive/); -@@ -3304,9 +3307,9 @@ sub action_update { - $updated{$pkg} = 1; - next; - } -- -+ - # older tlmgr forgot to clear the relocated bit when saving a tlpobj -- # into the local tlpdb, although the paths were rewritten. -+ # into the local tlpdb, although the paths were rewritten. - # We have to clear this bit otherwise the make_container calls below - # for creating an unwind container will create some rubbish - # TODO for user mode we should NOT clear this bit! -@@ -3323,19 +3326,19 @@ sub action_update { - user => 1); - $unwind_package = - "$opts{'backupdir'}/${pkg}.r" . $tlp->revision . ".tar.$compressorextension"; -- -+ - if ($autobackup) { - # in case we do auto backups we remove older backups - clear_old_backups($pkg, $opts{"backupdir"}, $autobackup); - } - } -- -+ - my ($estrem, $esttot); - if (!$opts{"list"}) { - ($estrem, $esttot) = TeXLive::TLUtils::time_estimate($totalsize, - $donesize, $starttime); - } -- -+ - if ($::machinereadable) { - machine_line($pkg, $FLAG_UPDATE, $rev, $mediarev, $sizes{$pkg}, $estrem, $esttot, @addargs); - } else { -@@ -3345,7 +3348,7 @@ sub action_update { - } - $donesize += $sizes{$pkg}; - $currnr++; -- -+ - if ($opts{"dry-run"}) { - info("\n") unless $::machinereadable; - $updated{$pkg} = 1; -@@ -3353,7 +3356,7 @@ sub action_update { - } else { - info(" ... ") unless $::machinereadable; # more to come - } -- -+ - if (!$unwind_package) { - # no backup was made, so let us create a temporary .tar file - # of the package -@@ -3382,7 +3385,7 @@ sub action_update { - if ($pkg =~ m/$CriticalPackagesRegexp/) { - debug("Not removing critical package $pkg\n"); - } else { -- $localtlpdb->remove_package($pkg, -+ $localtlpdb->remove_package($pkg, - "remove-warn-files" => \%do_warn_on_move); - } - if ($remotetlpdb->install_package($pkg, $localtlpdb)) { -@@ -3457,7 +3460,7 @@ sub action_update { - } - info("done\n") unless $::machinereadable; - } else { # $is_new{$pkg} is true!!! -- # -+ # - # NEW PACKAGES - # - if ($opts{"no-auto-install"}) { -@@ -3571,7 +3574,7 @@ sub action_update { - if ($#found_pkgs == 0 && $found_pkgs[0] =~ m/^$pkg:/) { - # only one package has been returned and it - # matches the current package followed by a colon -- # remember the TLPDB->find_file returns -+ # remember the TLPDB->find_file returns - # $pkg:$file - # in this case we can ignore it - $bad_file = 0; -@@ -3596,7 +3599,7 @@ sub action_update { - #unlink("$Master/$f"); - debug("removing disappearing file $f\n"); - } -- } -+ } - } # end of if ($opts{"list"}) ... else part - - # check if any additional updates are asked for -@@ -3626,7 +3629,7 @@ sub action_update { - for my $f (@infra_files_to_be_removed) { - debug("file scheduled for removal $f\n"); - } -- my $ret = write_w32_updater($restart_tlmgr, -+ my $ret = write_w32_updater($restart_tlmgr, - \@infra_files_to_be_removed, @critical); - if ($ret) { - tlwarn ("$prg: Aborting infrastructure update.\n"); -@@ -3647,8 +3650,8 @@ sub action_update { - return($F_ERROR); - } - -- # for --dry-run we cannot restart tlmgr (no way to fake successful -- # infra update) instead we call action_update() again and signal this -+ # for --dry-run we cannot restart tlmgr (no way to fake successful -+ # infra update) instead we call action_update() again and signal this - # by $opts{"dry-run"} = -1 - if ($opts{"dry-run"} && !$opts{"list"} && $restart_tlmgr) { - $opts{"self"} = 0; -@@ -3659,7 +3662,7 @@ sub action_update { - $ret |= action_update(); - return ($ret); - } -- -+ - # if a real update from default disk location didn't find anything, - # warn if nothing is updated. Unless they said --self, in which case - # we've already reported it. -@@ -3691,7 +3694,7 @@ sub check_announce_format_triggers { - - - sub check_announce_format_triggers { -- # we treat new and updated packages the same as updated -+ # we treat new and updated packages the same as updated - # when it comes to triggers - my %updpacks = map { $_ => 1 } @_; - -@@ -3875,7 +3878,7 @@ sub action_install { - defined($sizes{'__TOTAL__'}) || ($sizes{'__TOTAL__'} = 0); - my $totalsize = $sizes{'__TOTAL__'}; - my $donesize = 0; -- -+ - print "total-bytes\t$sizes{'__TOTAL__'}\n" if $::machinereadable; - print "end-of-header\n" if $::machinereadable; - -@@ -3986,7 +3989,7 @@ sub show_one_package_json { - my $tlp = ($is_installed ? $loctlp : $remtlp); - #my $tlp = ($is_available ? $remtlp : $loctlp); - # add available, installed, lrev, rrev fields and remove revision field -- my $str = $tlp->as_json(available => ($is_available ? TeXLive::TLUtils::True() : TeXLive::TLUtils::False()), -+ my $str = $tlp->as_json(available => ($is_available ? TeXLive::TLUtils::True() : TeXLive::TLUtils::False()), - installed => ($is_installed ? TeXLive::TLUtils::True() : TeXLive::TLUtils::False()), - lrev => ($is_installed ? $loctlp->revision : 0), - rrev => ($is_available ? $remtlp->revision : 0), -@@ -4288,14 +4291,14 @@ sub show_one_package_detail { - my $sizestr = ""; - if ($tlp->category ne "Collection" && $tlp->category ne "Scheme") { - my $srcsize = $tlp->srcsize * $TeXLive::TLConfig::BlockSize; -- $sizestr = sprintf("%ssrc: %dk", $sizestr, int($srcsize / 1024) + 1) -+ $sizestr = sprintf("%ssrc: %dk", $sizestr, int($srcsize / 1024) + 1) - if ($srcsize > 0); - my $docsize = $tlp->docsize * $TeXLive::TLConfig::BlockSize; -- $sizestr .= sprintf("%sdoc: %dk", -+ $sizestr .= sprintf("%sdoc: %dk", - ($sizestr ? ", " : ""), int($docsize / 1024) + 1) - if ($docsize > 0); - my $runsize = $tlp->runsize * $TeXLive::TLConfig::BlockSize; -- $sizestr .= sprintf("%srun: %dk", -+ $sizestr .= sprintf("%srun: %dk", - ($sizestr ? ", " : ""), int($runsize / 1024) + 1) - if ($runsize > 0); - # check for .ARCH expansions -@@ -4624,7 +4627,7 @@ sub action_repository { - return ($F_ERROR); - } - # check if it is either url or absolute path -- if (($p !~ m!^(https?|ftp)://!i) && ($p !~ m!$TeXLive::TLUtils::SshURIRegex!) && -+ if (($p !~ m!^(https?|ftp)://!i) && ($p !~ m!$TeXLive::TLUtils::SshURIRegex!) && - !File::Spec->file_name_is_absolute($p)) { - tlwarn("$prg: neither https?/ftp/ssh/scp/file URI nor absolute path, no action: $p\n"); - return ($F_ERROR); -@@ -4697,7 +4700,7 @@ sub action_repository { - } - if (!$remotetlpdb->is_virtual) { - my $verstat = $remotetlpdb->verification_status; -- print "main ", $remotetlpdb->location, " ", -+ print "main ", $remotetlpdb->location, " ", - ($::machinereadable ? "$verstat " : ""), - $VerificationStatusDescription{$verstat}, "\n"; - return ($F_OK); -@@ -5179,7 +5182,7 @@ sub action_generate { - ("fmtutil-sys $common_fmtutil_args --byhyphen \"$dest\""); - } else { - info("To make the newly-generated language.dat.lua take effect," -- . " run fmtutil-sys --byhyphen $dest.\n"); -+ . " run fmtutil-sys --byhyphen $dest.\n"); - } - } - if ($what =~ m/^language(\.dat)?$/i) { -@@ -5195,7 +5198,7 @@ sub action_generate { - ("fmtutil-sys $common_fmtutil_args --byhyphen \"$dest\""); - } else { - info("To make the newly-generated language.dat take effect," -- . " run fmtutil-sys --byhyphen $dest.\n"); -+ . " run fmtutil-sys --byhyphen $dest.\n"); - } - } - if ($what =~ m/^language(\.def)?$/i) { -@@ -5230,7 +5233,7 @@ sub action_generate { - do_cmd_and_check("fmtutil-sys $common_fmtutil_args --all"); - } else { - info("To make the newly-generated fmtutil.cnf take effect," -- . " run fmtutil-sys --all.\n"); -+ . " run fmtutil-sys --all.\n"); - } - - } elsif ($what =~ m/^updmap$/i) { -@@ -5320,7 +5323,7 @@ Error message from creating MainWindow: - - # UNINSTALL - # Return zero if successful, nonzero if failure. --# -+# - sub uninstall_texlive { - if (wndws()) { - printf STDERR "Please use \"Add/Remove Programs\" from the Control Panel " -@@ -5348,7 +5351,7 @@ sub uninstall_texlive { - } - } - print "Ok, removing the whole TL installation under: $tlroot\n"; -- -+ - # Must use kpsewhich before removing it. - chomp (my $texmfsysconfig = `kpsewhich -var-value=TEXMFSYSCONFIG`); - chomp (my $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR`); -@@ -5372,24 +5375,23 @@ sub uninstall_texlive { - system("rm", "-rf", "$Master/bin"); - - # In case SYS{VAR,CONFIG} were configured with different values. -- # Above we remove the hardwired $Master/texmf-{config,var} -+ # Above we remove the hardwired $Master/texmf-{config,var} - # if present, assuming the user did not pathologically configure things. - system("rm", "-rf", "$texmfsysconfig"); - system("rm", "-rf", "$texmfsysvar"); - - print "misc... "; -- system("rm", "-rf", "$Master/readme-html.dir"); -- system("rm", "-rf", "$Master/readme-txt.dir"); -+ system("rm", "-rf", "$Master/tlpkg/readme-html.dir"); -+ system("rm", "-rf", "$Master/tlpkg/readme-txt.dir"); - for my $f (qw/doc.html index.html install-tl install-tl.log - LICENSE.CTAN LICENSE.TL README README.usergroups - release-texlive.txt texmf.cnf texmfcnf.lua - /) { -- system("rm", "-f", "$Master/$f"); -+ system("rm", "-f", "$Master/tlpkg/$f"); - } -- finddepth(sub { rmdir; }, $Master); - rmdir($Master); - print "done.\n"; -- -+ - # don't remove user dirs, which may have been abused. - if (-d $texmfconfig || -d $texmfvar) { - print <platform(); - if ($arch eq "windows") { - tldie("$prg: sorry, cannot check this on Windows.\n"); -@@ -5656,7 +5658,7 @@ sub check_files { - } - - # Check for runtime files with the same name but different contents. --# -+# - sub check_runfiles { - my $Master = $localtlpdb->root; - -@@ -5673,7 +5675,7 @@ sub check_runfiles { - my $tlp = $localtlpdb->get_package($tlpn); - my @files = $tlp->runfiles; - if ($tlp->relocated) { -- for (@files) { -+ for (@files) { - s!^$TeXLive::TLConfig::RelocPrefix/!$TeXLive::TLConfig::RelocTree/!; - } - } -@@ -5909,7 +5911,7 @@ sub check_executes { - if (",$TeXLive::TLConfig::PartialEngineSupport," =~ /,$engine,/) { - # luajit[hb]tex is special since it is not available on all architectures - # due to inherent reasons (machine code); -- # -+ # - # We do not want to have error messages here, so we do the following: - # * if tlpkg/tlpsrc/luajittex.tlpsrc is available, then load it - # and filter away those archs that are excluded with f/!... -@@ -6146,10 +6148,10 @@ sub check_texmfdbs { - } - - # POSTACTION --# -+# - # explicitly run the various post actions, e.g., - # on a client system or overriding global settings. --# -+# - # tlmgr postaction [--windowsmode=user|admin] [--fileassocmode=1|2] [--all] - # [install|remove] [shortcut|fileassoc|script] [...] - -@@ -6256,7 +6258,7 @@ sub action_postaction { - - - # INIT-USERTREE --# -+# - # sets up the user tree for tlmgr in user mode - sub action_init_usertree { - # init_local_db but do not die if localtlpdb is not found! -@@ -6300,7 +6302,7 @@ sub action_init_usertree { - - - # CONF --# -+# - # tries to mimic texconfig conf but can also set values for both tlmgr - # and texmf conf files. - # -@@ -6325,7 +6327,7 @@ sub action_conf { - $fn || ( $fn = "$TEXMFCONFIG/tlmgr/config" ) ; - $cf = TeXLive::TLConfFile->new($fn, "#", "="); - } elsif ($arg eq "texmf" || $arg eq "auxtrees") { -- $fn || ( $fn = "$Master/texmf.cnf" ) ; -+ $fn || ( $fn = "$Master/tlpkg/texmf.cnf" ) ; - $cf = TeXLive::TLConfFile->new($fn, "[%#]", "="); - } elsif ($arg eq "updmap") { - $fn || ( chomp ($fn = `kpsewhich updmap.cfg`) ) ; -@@ -6437,7 +6439,7 @@ sub action_conf { - if (defined($opts{'delete'})) { - if (defined($cf->value($key))) { - info("$prg: removing setting $arg $key value: " . $cf->value($key) -- . "from $fn\n"); -+ . "from $fn\n"); - $cf->delete_key($key); - } else { - info("$prg: $arg $key not defined, cannot remove ($fn)\n"); -@@ -6535,7 +6537,7 @@ sub texconfig_conf_mimic { - # tlmgr key list - # tlmgr key add - # tlmgr key remove --# -+# - sub action_key { - my $arg = shift @ARGV; - -@@ -6569,7 +6571,7 @@ sub action_key { - return $F_ERROR; - } - debug("running: $::gpg --primary-keyring repository-keys.gpg --delete-key $what\n"); -- my ($out, $ret) = -+ my ($out, $ret) = - TeXLive::TLUtils::run_cmd("$::gpg --primary-keyring repository-keys.gpg --delete-key \"$what\" 2>&1"); - if ($ret == 0) { - info("$prg: key successfully removed\n"); -@@ -6578,7 +6580,7 @@ sub action_key { - tlwarn("$prg: key removal failed, output:\n$out\n"); - return $F_ERROR; - } -- -+ - } elsif ($arg eq 'add') { - my $what = shift @ARGV; - if (!$what) { -@@ -6591,7 +6593,7 @@ sub action_key { - close(FOO); - } - debug("running: $::gpg --primary-keyring repository-keys.gpg --import $what\n"); -- my ($out, $ret) = -+ my ($out, $ret) = - TeXLive::TLUtils::run_cmd("$::gpg --primary-keyring repository-keys.gpg --import \"$what\" 2>&1"); - if ($ret == 0) { - info("$prg: key successfully imported\n"); -@@ -6603,7 +6605,7 @@ sub action_key { - } else { - tldie("$prg: should not be reached: tlmgr key $arg\n"); - } -- -+ - } else { - tlwarn("$prg: unknown directive `$arg' to action `key'\n"); - return $F_ERROR; -@@ -6614,14 +6616,14 @@ sub action_key { - - # SHELL - # interactive shell. --# -+# - sub action_shell { - my $protocol = 1; - my $default_prompt = "tlmgr>"; - # keys which can be set/get and are also settable via global cmdline opts - my @valid_bool_keys - = qw/debug-translation machine-readable no-execute-actions -- verify-repo json/; -+ verify-repo json/; - my @valid_string_keys = qw/repository prompt/; - my @valid_keys = (@valid_bool_keys, @valid_string_keys); - # set auto flush unconditionally in action shell -@@ -6931,7 +6933,7 @@ sub init_local_db { - # we normalize the path only if it is - # - a url starting with neither http or ftp - # - if we are on Windows, it does not start with Drive:[\/] -- if (! ( $location =~ m!^(https?|ftp)://!i || -+ if (! ( $location =~ m!^(https?|ftp)://!i || - $location =~ m!$TeXLive::TLUtils::SshURIRegex!i || - (wndws() && (!(-e $location) || ($location =~ m!^.:[\\/]!) ) ) ) ) { - # seems to be a local path, try to normalize it -@@ -7102,7 +7104,7 @@ END_NO_CHECKSUMS - $verstat = ": "; - $verstat .= $VerificationStatusDescription{$remotetlpdb->virtual_get_tlpdb('main')->verification_status}; - } -- info("\tmain = " . $repos{'main'} . " (" . -+ info("\tmain = " . $repos{'main'} . " (" . - ($remotetlpdb->virtual_get_tlpdb('main')->is_verified ? "" : "not ") . - "verified$verstat)\n"); - for my $t (@tags) { -@@ -7132,7 +7134,7 @@ sub _init_tlmedia { - my $silent = shift; - # if we are already initialized to the same location, nothing - # needs to be done. -- # if we are initialized to a virtual tlpdb, then we have to -+ # if we are initialized to a virtual tlpdb, then we have to - # do in any case an initialization - if (defined($remotetlpdb) && !$remotetlpdb->is_virtual && - ($remotetlpdb->root eq $location)) { -@@ -7167,7 +7169,7 @@ sub _init_tlmedia { - $verstat = ": "; - $verstat .= $VerificationStatusDescription{$remotetlpdb->verification_status}; - } -- info("$prg: package repository $location (" . -+ info("$prg: package repository $location (" . - ($remotetlpdb->is_verified ? "" : "not ") . "verified$verstat)\n"); - } - return 1; -@@ -7204,7 +7206,7 @@ sub setup_one_remotetlpdb { - # first check that the saved tlpdb is present at all - my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location); - my $loc_copy_of_remote_tlpdb = -- ($is_main ? -+ ($is_main ? - "$Master/$InfraLocation/texlive.tlpdb.main.$loc_digest" : - "$Master/$InfraLocation/texlive.tlpdb.$loc_digest"); - ddebug("loc_digest = $loc_digest\n"); -@@ -7369,7 +7371,7 @@ FROZEN - if (!$local_copy_tlpdb_used && $location =~ m;^(https?|ftp)://;) { - my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location); - my $loc_copy_of_remote_tlpdb = -- ($is_main ? -+ ($is_main ? - "$Master/$InfraLocation/texlive.tlpdb.main.$loc_digest" : - "$Master/$InfraLocation/texlive.tlpdb.$loc_digest"); - my $tlfh; -@@ -7439,7 +7441,7 @@ sub load_config_file { - chomp (my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`); - my $fnsys = "$TEXMFSYSCONFIG/tlmgr/config"; - my $tlmgr_sys_config_file = TeXLive::TLConfFile->new($fnsys, "#", "="); -- load_options_from_config($tlmgr_sys_config_file, 'sys') -+ load_options_from_config($tlmgr_sys_config_file, 'sys') - if $tlmgr_sys_config_file; - - chomp (my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); -@@ -7652,12 +7654,12 @@ sub logcommand { - } - - --# resolve relative paths from tlpdb wrt tlroot -+# resolve relative paths from tlpdb wrt tlroot - sub norm_tlpdb_path { - my ($path) = @_; - return if (!defined($path)); - $path =~ s!\\!/!; -- # just return if absolute path -+ # just return if absolute path - return $path if ($path =~ m!^/|:!); - init_local_db() unless defined($localtlpdb); - return $localtlpdb->root . "/$path"; -@@ -7960,7 +7962,7 @@ If the repository is on the network, trailing C cha - =back - - If the repository is on the network, trailing C characters and/or --trailing C and/or C components are ignored. -+trailing C and/or C components are ignored. - - =item B<--gui> [I] - -@@ -7979,7 +7981,7 @@ TeX Live's Perl distribution for Windows. You may find - - However, the native GUI requires Perl/TK, which is no longer included in - TeX Live's Perl distribution for Windows. You may find C or --C easier to work with. -+C easier to work with. - - - =for comment Keep language list in sync with install-tl. -@@ -8246,7 +8248,7 @@ out). - the given configuration file is entirely removed (not just commented - out). - --If I is given in addition, I is set to I in the -+If I is given in addition, I is set to I in the - respective file. I - - The C value shown by C is as used by C. The -@@ -8256,7 +8258,7 @@ enabled during installation, you can disable it afterw - Here is a practical example of changing configuration values. If the - execution of (some or all) system commands via C<\write18> was left - enabled during installation, you can disable it afterwards: -- -+ - tlmgr conf texmf shell_escape 0 - - The subcommand C allows adding and removing arbitrary -@@ -8371,7 +8373,7 @@ one of these: - %!NAME - --!NAME - --where C and C use C<%>, -+where C and C use C<%>, - and C use C<-->. In all cases, the I is - the respective format name or hyphenation pattern identifier. - Examples: -@@ -8502,7 +8504,7 @@ C<--only-installed> and C<--only-remote> cannot both b - - =item B<--data C> - --If the option C<--data> is given, its argument must be a comma or colon -+If the option C<--data> is given, its argument must be a comma or colon - separated list of field names from: C, C, C, - C, C, C, C, C, - C, C, C, C, C, -@@ -8827,7 +8829,7 @@ is issued that the caller does not have enough privile - - =back - --=head2 pinning -+=head2 pinning - - The C action manages the pinning file, see L below. - -@@ -8870,8 +8872,8 @@ I to the installation from the repository. - C I... adds the executables for each given platform - I to the installation from the repository. - --C I... removes the executables for each given --platform I from the installation, but keeps the currently -+C I... removes the executables for each given -+platform I from the installation, but keeps the currently - running platform in any case. - - C I switches TeX Live to always use the given -@@ -8879,7 +8881,7 @@ C switches TeX Live to auto detecti - - C switches TeX Live to auto detection mode for platform. - --Platform detection is needed to select the proper C and -+Platform detection is needed to select the proper C and - C binaries that are shipped with TeX Live. - - C is a synonym for C. -@@ -9061,7 +9063,7 @@ extending to the end of line. - = a textual description of the verification status, as the last field - extending to the end of line. - --=back -+=back - - That is, in normal (not machine-readable) output, the third field - (numeric verification status) is not present. -@@ -9081,7 +9083,7 @@ Restore a package from a previously-made backup. - - Restore a package from a previously-made backup. - --If C<--all> is given, try to restore the latest revision of all -+If C<--all> is given, try to restore the latest revision of all - package backups found in the backup directory. - - Otherwise, if neither I nor I are given, list the available -@@ -9314,7 +9316,7 @@ Concisely list the packages which would be updated, ne - =item B<--list> [I] - - Concisely list the packages which would be updated, newly installed, or --removed, without actually changing anything. -+removed, without actually changing anything. - If C<--all> is also given, all available updates are listed. - If C<--self> is given, but not C<--all>, only updates to the - critical packages (tlmgr, texlive infrastructure, perl on Windows, etc.) -@@ -9343,7 +9345,7 @@ supported in these circumstances. - removed package, C quits with an error message. Excludes are not - supported in these circumstances. - --This option can also be set permanently in the tlmgr config file with -+This option can also be set permanently in the tlmgr config file with - the key C. - - =item B<--no-auto-remove> [I...] -@@ -9426,7 +9428,7 @@ See above under L...] I - --Force update of normal packages, without updating C itself -+Force update of normal packages, without updating C itself - (unless the C<--self> option is also given). Not recommended. - - Also, C is still performed regardless of this option. -@@ -9658,7 +9660,7 @@ just as in normal mode. - In user mode, these actions check that all packages to be acted on are - installed in the user tree before proceeding; otherwise, they behave - just as in normal mode. -- -+ - =head2 User mode generate, option, paper - - In user mode, these actions operate only on the user tree's -@@ -9666,7 +9668,7 @@ configuration files and/or C. - - =head2 User mode logs - --In user mode, C and are written in the -+In user mode, C and are written in the - C directlry instead of C. - - =head1 MULTIPLE REPOSITORIES -@@ -10006,7 +10008,7 @@ information it needs by reading stdout. - written to stdout). The idea is that a program can get all the - information it needs by reading stdout. - --Currently this option only applies to the -+Currently this option only applies to the - L...] [I...]>, - L...] I...>, and - L actions. -@@ -10031,7 +10033,7 @@ downloaded, i.e., the size of the compressed tar file - revision numbers in the local installation and server repository, - respectively. The I field is the number of bytes to be - downloaded, i.e., the size of the compressed tar file for a network --installation, not the unpacked size. The runtime and esttot fields -+installation, not the unpacked size. The runtime and esttot fields - are only present for updated and auto-install packages, and contain - the currently passed time since start of installation/updates - and the estimated total time. -@@ -10179,7 +10181,7 @@ If xz is available (either from the system or TL) and - =item 4. - - If xz is available (either from the system or TL) and working, use that. -- -+ - =back - - lz4 and gzip are faster in creating tlmgr's local backups, hence they diff --git a/print/texlive-tlmgr/files/patch-texlive-20240312-source_texk_texlive_linked__scripts_texlive_tlmgr.pl b/print/texlive-tlmgr/files/patch-texlive-20240312-source_texk_texlive_linked__scripts_texlive_tlmgr.pl new file mode 100644 index 000000000000..fe9a0f42d4d4 --- /dev/null +++ b/print/texlive-tlmgr/files/patch-texlive-20240312-source_texk_texlive_linked__scripts_texlive_tlmgr.pl @@ -0,0 +1,71 @@ +--- texlive-20240312-source/texk/texlive/linked_scripts/texlive/tlmgr.pl.orig 2024-05-11 00:46:18 UTC ++++ texlive-20240312-source/texk/texlive/linked_scripts/texlive/tlmgr.pl +@@ -644,6 +644,9 @@ for the full story.\n"; + # besides doing normal logging if -logfile is specified, we try to log + # package related actions (install, remove, update) to + # the package-log file TEXMFSYSVAR/web2c/tlmgr.log ++ # ++ # *** FreeBSD specific: FreeBSD port uses /var/db/tlpkg/tlmgr.log. ++ # + $packagelogged = 0; # how many msgs we logged + $commandslogged = 0; + chomp (my $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR`); +@@ -652,7 +655,7 @@ for the full story.\n"; + if ($opts{"usermode"}) { + $packagelogfile ||= "$texmfvar/web2c/tlmgr.log"; + } else { +- $packagelogfile ||= "$texmfsysvar/web2c/tlmgr.log"; ++ $packagelogfile ||= "/var/db/tlpkg/tlmgr.log"; + } + # + # Try to open the packagelog file, but do NOT die when that does not work +@@ -744,9 +747,9 @@ sub give_version { + $::mrversion = ""; + $::version_string .= "tlmgr revision $tlmgrversion\n"; + $::mrversion .= "revision $tlmgrrevision\n"; +- $::version_string .= "tlmgr using installation: $Master\n"; +- $::mrversion .= "installation $Master\n"; +- if (open (REL_TL, "$Master/release-texlive.txt")) { ++ $::version_string .= "tlmgr using installation: $Master/tlpkg\n"; ++ $::mrversion .= "installation $Master/tlpkg\n"; ++ if (open (REL_TL, "$Master/tlpkg/release-texlive.txt")) { + # print first, which has the TL version info. + my $rel_tl = ; + $::version_string .= $rel_tl; +@@ -2409,7 +2412,7 @@ sub write_w32_updater { + my $opt_src = $localtlpdb->option("install_srcfiles"); + my $opt_doc = $localtlpdb->option("install_docfiles"); + my $root = $localtlpdb->root; +- my $temp = "$root/temp"; ++ my $temp = "$root/tlpkg/temp"; + TeXLive::TLUtils::mkdirhier($temp); + tlwarn("$prg: warning: backup option not implemented for infrastructure " + . " update on Windows; continuing anyway.\n") +@@ -5449,15 +5452,14 @@ sub uninstall_texlive { + system("rm", "-rf", "$texmfsysvar"); + + print "misc... "; +- system("rm", "-rf", "$Master/readme-html.dir"); +- system("rm", "-rf", "$Master/readme-txt.dir"); ++ system("rm", "-rf", "$Master/tlpkg/readme-html.dir"); ++ system("rm", "-rf", "$Master/tlpkg/readme-txt.dir"); + for my $f (qw/doc.html index.html install-tl install-tl.log + LICENSE.CTAN LICENSE.TL README README.usergroups + release-texlive.txt texmf.cnf texmfcnf.lua + /) { +- system("rm", "-f", "$Master/$f"); ++ system("rm", "-f", "$Master/tlpkg/$f"); + } +- finddepth(sub { rmdir; }, $Master); + rmdir($Master); + print "done.\n"; + +@@ -6397,7 +6399,7 @@ sub action_conf { + $fn || ( $fn = "$TEXMFCONFIG/tlmgr/config" ) ; + $cf = TeXLive::TLConfFile->new($fn, "#", "="); + } elsif ($arg eq "texmf" || $arg eq "auxtrees") { +- $fn || ( $fn = "$Master/texmf.cnf" ) ; ++ $fn || ( $fn = "$Master/tlpkg/texmf.cnf" ) ; + $cf = TeXLive::TLConfFile->new($fn, "[%#]", "="); + } elsif ($arg eq "updmap") { + $fn || ( chomp ($fn = `kpsewhich updmap.cfg`) ) ; diff --git a/print/xpdfopen/Makefile b/print/xpdfopen/Makefile index 02fef94a8296..7f924a718c21 100644 --- a/print/xpdfopen/Makefile +++ b/print/xpdfopen/Makefile @@ -1,28 +1,26 @@ PORTNAME= xpdfopen -PORTVERSION= 0.86 -PORTREVISION= 3 +DISTVERSION= ${TEXLIVE_VERSION} CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ DISTNAME= texlive-${TEXLIVE_VERSION}-source DIST_SUBDIR= TeX MAINTAINER= tex@FreeBSD.org COMMENT= Command line utility for PDF viewers USES= localbase:ldflags tar:xz tex xorg USE_XORG= x11 xmu EXTRACT_FILES= build-aux utils/xpdfopen GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} WRKSRC= ${WRKDIR}/${DISTNAME}/utils/xpdfopen PLIST_FILES= bin/pdfclose \ bin/pdfopen \ share/man/man1/pdfclose.1.gz \ share/man/man1/pdfopen.1.gz .include diff --git a/print/xpdfopen/distinfo b/print/xpdfopen/distinfo index 634257780f8b..dcb4706821c7 100644 --- a/print/xpdfopen/distinfo +++ b/print/xpdfopen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681270572 -SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 -SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 +TIMESTAMP = 1715455436 +SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 +SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588