From owner-svn-ports-head@FreeBSD.ORG  Sat Jun 28 00:24:10 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 450E23D5;
 Sat, 28 Jun 2014 00:24:10 +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 3267D2DB3;
 Sat, 28 Jun 2014 00:24:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5S0OAC9003016;
 Sat, 28 Jun 2014 00:24:10 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5S0OArW003015;
 Sat, 28 Jun 2014 00:24:10 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201406280024.s5S0OArW003015@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 28 Jun 2014 00:24:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359635 - 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-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jun 2014 00:24:10 -0000

Author: bapt
Date: Sat Jun 28 00:24:09 2014
New Revision: 359635
URL: http://svnweb.freebsd.org/changeset/ports/359635
QAT: https://qat.redports.org/buildarchive/r359635/

Log:
  still more staging

Modified:
  head/Mk/bsd.tex.mk

Modified: head/Mk/bsd.tex.mk
==============================================================================
--- head/Mk/bsd.tex.mk	Fri Jun 27 23:50:29 2014	(r359634)
+++ head/Mk/bsd.tex.mk	Sat Jun 28 00:24:09 2014	(r359635)
@@ -225,11 +225,16 @@ do-fmtutil-$F:
 		done
 	@${LOCALBASE}/bin/mktexlsr ${TEXMFVARDIR:S,^,${PREFIX}/,}
 .else
+	@exec < ${LOCALBASE}/${FMTUTIL_CNF} && \
+		(${GREP} -v "\#$F\$$"; \
+			${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:tu}}) \
+			> ${WRKDIR}/fmtutil.cnf
 	@${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:tu}} | \
 		while read format dum; do \
-		${SETENV} PATH=${PATH}:${LOCALBASE}/bin \
+		${SETENV} PATH=${PATH}:${LOCALBASE}/bin:${STAGEDIR}/${PREFIX}/bin \
 			TEXMFMAIN=${LOCALBASE}/${TEXMFDIR} \
 			${LOCALBASE}/bin/fmtutil-sys --byfmt $$format \
+			--cnffile ${WRKDIR}/fmtutil.cnf \
 			--fmtdir ${STAGEDIR}${PREFIX}/${TEXMFVARDIR}/web2c; \
 		done
 .endif
@@ -281,7 +286,7 @@ TEX_FORMAT_ALEPH_FILES=	\
 TEX_FORMAT_ALEPH_DIRS=	\
 	${TEXMFVARDIR}/web2c/aleph
 post-install-aleph:
-	${LN} -sf aleph ${PREFIX}/bin/lamed
+	${LN} -sf aleph ${STAGEDIR}${PREFIX}/bin/lamed
 
 TEX_FORMAT_AMSTEX?= \
 	"amstex pdftex - -translate-file=cp227.tcx *amstex.ini"