From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 23:26:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F36A21C; Fri, 27 Jun 2014 23:26:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C527291D; Fri, 27 Jun 2014 23:26:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5RNQQ2D074589; Fri, 27 Jun 2014 23:26:26 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5RNQQIR074588; Fri, 27 Jun 2014 23:26:26 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406272326.s5RNQQIR074588@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Jun 2014 23:26:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359629 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 23:26:26 -0000 Author: bapt Date: Fri Jun 27 23:26:25 2014 New Revision: 359629 URL: http://svnweb.freebsd.org/changeset/ports/359629 QAT: https://qat.redports.org/buildarchive/r359629/ Log: First bit of staging support for bsd.tex.mk Modified: head/Mk/bsd.tex.mk Modified: head/Mk/bsd.tex.mk ============================================================================== --- head/Mk/bsd.tex.mk Fri Jun 27 23:10:28 2014 (r359628) +++ head/Mk/bsd.tex.mk Fri Jun 27 23:26:25 2014 (r359629) @@ -186,9 +186,11 @@ do-texhash: ${ECHO_CMD} "@unexec ${RMDIR} %D/$$D 2> /dev/null || ${TRUE}"; \ done >> ${TMPPLIST} . else +.if defined(NO_STAGE) @for D in ${TEXHASHDIRS:S,^,${PREFIX}/,}; do \ if [ -r $$D/ls-R ]; then ${LOCALBASE}/bin/mktexlsr $$D; fi; \ done +.endif @${ECHO_CMD} "@exec for D in ${TEXHASHDIRS:S,^,${PREFIX}/,}; do " \ "if [ -r \$$D/ls-R ]; then " \ "${LOCALBASE}/bin/mktexlsr \$$D; " \ @@ -207,6 +209,7 @@ post-install-script: do-texhash . for F in ${TEX_FORMATS} do-fmtutil: do-fmtutil-$F post-install-$F do-fmtutil-$F: +.if defined(NO_STAGE) @${TEST} -n '${TEX_FORMAT_${F:tu}}' @${TEST} -r ${LOCALBASE}/${FMTUTIL_CNF} @exec < ${LOCALBASE}/${FMTUTIL_CNF} && \ @@ -221,6 +224,7 @@ do-fmtutil-$F: ${LOCALBASE}/bin/fmtutil-sys --byfmt $$format; \ done @${LOCALBASE}/bin/mktexlsr ${TEXMFVARDIR:S,^,${PREFIX}/,} +.endif @${ECHO_CMD} "@exec exec < ${LOCALBASE}/${FMTUTIL_CNF} && " \ "${RM} ${LOCALBASE}/${FMTUTIL_CNF} && " \ "(${GREP} -v \"\#$F\$$\"; ${PRINTF} \"%%s\t\#$F\n\" " \ @@ -280,7 +284,7 @@ TEX_FORMAT_AMSTEX_FILES= \ TEX_FORMAT_AMSTEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-amstex: - ${LN} -fs pdftex ${PREFIX}/bin/amstex + ${LN} -fs pdftex ${STAGEDIR}${PREFIX}/bin/amstex TEX_FORMAT_CONTEXT?= \ "cont-en pdftex cont-usr.tex -8bit *cont-en.ini" @@ -309,8 +313,8 @@ TEX_FORMAT_CSLATEX_FILES= \ TEX_FORMAT_CSLATEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-cslatex: - ${LN} -sf pdftex ${PREFIX}/bin/cslatex - ${LN} -sf pdftex ${PREFIX}/bin/pdfcslatex + ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/cslatex + ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfcslatex TEX_FORMAT_EPLAIN?= \ "eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini" @@ -321,7 +325,7 @@ TEX_FORMAT_EPLAIN_FILES= \ TEX_FORMAT_EPLAIN_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-eplain: - ${LN} -sf pdftex ${PREFIX}/bin/eplain + ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/eplain TEX_FORMAT_JADETEX?= \ "jadetex pdftex language.dat *jadetex.ini" \ @@ -336,8 +340,8 @@ TEX_FORMAT_JADETEX_FILES= \ TEX_FORMAT_JADETEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-jadetex: - ${LN} -sf pdftex ${PREFIX}/bin/jadetex - ${LN} -sf pdftex ${PREFIX}/bin/pdfjadetex + ${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" \ @@ -352,8 +356,8 @@ TEX_FORMAT_LATEX-BIN_FILES= \ TEX_FORMAT_LATEX-BIN_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-latex-bin: - ${LN} -sf pdftex ${PREFIX}/bin/latex - ${LN} -sf pdftex ${PREFIX}/bin/pdflatex + ${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" \ @@ -375,9 +379,9 @@ TEX_FORMAT_LUATEX_FILES= \ TEX_FORMAT_LUATEX_DIRS= \ ${TEXMFVARDIR}/web2c/luatex post-install-luatex: - ${LN} -sf luatex ${PREFIX}/bin/dviluatex - ${LN} -sf luatex ${PREFIX}/bin/dvilualatex - ${LN} -sf luatex ${PREFIX}/bin/lualatex + ${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/dviluatex + ${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/dvilualatex + ${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/lualatex TEX_FORMAT_METAFONT?= \ "mf mf-nowin - -translate-file=cp227.tcx mf.ini" @@ -406,9 +410,9 @@ TEX_FORMAT_MEX_FILES= \ TEX_FORMAT_MEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-mex: - ${LN} -sf pdftex ${PREFIX}/bin/mex - ${LN} -sf pdftex ${PREFIX}/bin/pdfmex - ${LN} -sf pdftex ${PREFIX}/bin/utf8mex + ${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" \ @@ -423,8 +427,8 @@ TEX_FORMAT_MLTEX_FILES= \ TEX_FORMAT_MLTEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-mltex: - ${LN} -sf pdftex ${PREFIX}/bin/mltex - ${LN} -sf pdftex ${PREFIX}/bin/mllatex + ${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" @@ -451,7 +455,7 @@ TEX_FORMAT_PDFTEX_FILES= \ TEX_FORMAT_PDFTEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-pdftex: - ${LN} -sf pdftex ${PREFIX}/bin/pdfetex + ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfetex TEX_FORMAT_PTEX?= \ "ptex ptex - ptex.ini" \ @@ -469,7 +473,7 @@ TEX_FORMAT_PTEX_DIRS= \ ${TEXMFVARDIR}/web2c/ptex \ ${TEXMFVARDIR}/web2c/eptex post-install-ptex: - ${LN} -sf eptex ${PREFIX}/bin/platex + ${LN} -sf eptex ${STAGEDIR}${PREFIX}/bin/platex TEX_FORMAT_TEX?= \ "tex tex - tex.ini" @@ -490,7 +494,7 @@ TEX_FORMAT_TEXSIS_FILES= \ TEX_FORMAT_TEXSIS_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-texsis: - ${LN} -sf pdftex ${PREFIX}/bin/texsis + ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/texsis TEX_FORMAT_UPTEX?= \ "uptex uptex - uptex.ini" \ @@ -508,7 +512,7 @@ TEX_FORMAT_UPTEX_DIRS= \ ${TEXMFVARDIR}/web2c/euptex \ ${TEXMFVARDIR}/web2c/uptex post-install-uptex: - ${LN} -sf euptex ${PREFIX}/bin/uplatex + ${LN} -sf euptex ${STAGEDIR}${PREFIX}/bin/uplatex TEX_FORMAT_XETEX?= \ "xetex xetex language.def -etex xetex.ini" \ @@ -525,7 +529,7 @@ TEX_FORMAT_XETEX_FILES= \ TEX_FORMAT_XETEX_DIRS= \ ${TEXMFVARDIR}/web2c/xetex post-install-xetex: - ${LN} -sf xetex ${PREFIX}/bin/xelatex + ${LN} -sf xetex ${STAGEDIR}${PREFIX}/bin/xelatex TEX_FORMAT_XMLTEX?= \ "xmltex pdftex language.dat *xmltex.ini" \ @@ -540,5 +544,5 @@ TEX_FORMAT_XMLTEX_FILES= \ TEX_FORMAT_XMLTEX_DIRS= \ ${TEXMFVARDIR}/web2c/pdftex post-install-xmltex: - ${LN} -sf pdftex ${PREFIX}/bin/xmltex - ${LN} -sf pdftex ${PREFIX}/bin/pdfxmltex + ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/xmltex + ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfxmltex