svn commit: r318651 - in head: Mk print/texlive-base

[Hiroki Sato]

Author: hrs
Date: Tue May 21 07:30:16 2013
New Revision: 318651
URL: http://svnweb.freebsd.org/changeset/ports/318651

Log:
  Add USE_TEX=texhash-bootstrap to fix initial ls-R file catalog generation.

Modified:
  head/Mk/bsd.tex.mk
  head/print/texlive-base/Makefile
  head/print/texlive-base/pkg-plist

Modified: head/Mk/bsd.tex.mk
==============================================================================
--- head/Mk/bsd.tex.mk	Tue May 21 07:09:46 2013	(r318650)
+++ head/Mk/bsd.tex.mk	Tue May 21 07:30:16 2013	(r318651)
@@ -168,9 +168,21 @@ ${_C}_DEPENDS+=	${TEX_${_C}_DEPENDS:O:u}
 
 .ORDER: do-texhash do-fmtutil do-updmap
 
-.if !empty(USE_TEX:Mtexhash) || !empty(USE_TEX:Mfmtutil) || !empty(USE_TEX:Mupdmap)
+.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)
+	@${LOCALBASE}/bin/mktexlsr ${TEXHASHDIRS:S,^,${PREFIX}/,}
+	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/mktexlsr " \
+		"${TEXHASHDIRS:S,^,%D/,}" >> ${TMPPLIST}
+	@for D in ${TEXHASHDIRS}; do \
+		${ECHO_CMD} "@unexec ${RM} -f %D/$$D/ls-R"; \
+		${ECHO_CMD} "@unexec ${RMDIR} %D/$$D 2> /dev/null || ${TRUE}"; \
+	done >> ${TMPPLIST}
+. else
 	@for D in ${TEXHASHDIRS:S,^,${PREFIX}/,}; do \
 		if [ -r $$D/ls-R ]; then ${LOCALBASE}/bin/mktexlsr $$D; fi; \
 	done
@@ -182,6 +194,7 @@ do-texhash:
 		"if [ -r \$$D/ls-R ]; then " \
 			"${LOCALBASE}/bin/mktexlsr \$$D; " \
 		"fi; done" >> ${TMPPLIST}
+. endif
 
 post-install: do-texhash
 .endif

Modified: head/print/texlive-base/Makefile
==============================================================================
--- head/print/texlive-base/Makefile	Tue May 21 07:09:46 2013	(r318650)
+++ head/print/texlive-base/Makefile	Tue May 21 07:30:16 2013	(r318651)
@@ -2,7 +2,7 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20120701
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMESUFFIX=	-base
@@ -23,7 +23,7 @@ LIB_DEPENDS=	icuio:${PORTSDIR}/devel/icu
 		png15:${PORTSDIR}/graphics/png \
 		zzip:${PORTSDIR}/devel/zziplib
 
-USE_TEX=	texlive web2c kpathsea ptexenc texhash
+USE_TEX=	texlive web2c kpathsea ptexenc texhash-bootstrap
 USE_XZ=		yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
@@ -116,10 +116,13 @@ post-patch:
 		texk/tetex/texconfig-sys \
 		texk/tetex/updmap-sys.sh
 
-post-install:
+post-install-fmtutil:
 	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/web2c
 	${TOUCH} ${PREFIX}/${TEXMFCONFIGDIR}/web2c/.keep_me
 	${INSTALL_DATA} ${PREFIX}/${TEXMFDIR}/web2c/fmtutil.cnf \
 		${PREFIX}/${FMTUTIL_CNF}
 
+post-install: post-install-fmtutil
+.ORDER: post-install-fmtutil do-texhash
+
 .include <bsd.port.mk>

Modified: head/print/texlive-base/pkg-plist
==============================================================================
--- head/print/texlive-base/pkg-plist	Tue May 21 07:09:46 2013	(r318650)
+++ head/print/texlive-base/pkg-plist	Tue May 21 07:30:16 2013	(r318651)
@@ -329,7 +329,6 @@ bin/xdvipdfmx
 @exec %%INSTALL_DATA%% %D/%%TEXMFDIR%%/web2c/fmtutil.cnf %D/%%FMTUTIL_CNF%%
 @unexec /bin/rm -f %D/%%FMTUTIL_CNF%%
 @dirrmtry %%TEXMFCONFIGDIR%%/web2c
- at unexec /bin/rm -f %D/%%TEXMFCONFIGDIR%%/ls-R
 @dirrmtry %%TEXMFCONFIGDIR%%
 @dirrmtry %%TEXMFDISTDIR%%/scripts/accfonts
 @dirrmtry %%TEXMFDISTDIR%%/scripts/authorindex
@@ -405,5 +404,3 @@ bin/xdvipdfmx
 @dirrmtry %%TEXMFDIR%%/scripts/texdoc
 @dirrmtry %%TEXMFDIR%%/scripts/texlive
 @dirrmtry %%TEXMFDIR%%/scripts
- at exec /bin/rm -f %%TEXMFVARDIR%%/ls-R
- at dirrmtry %%TEXMFVARDIR%%