[Midnightbsd-cvs] mports [20345] trunk/Mk/extensions/tex.mk: switch to dir

[laffer1 at midnightbsd.org]

Revision: 20345
          http://svnweb.midnightbsd.org/mports/?rev=20345
Author:   laffer1
Date:     2015-09-30 22:03:12 -0400 (Wed, 30 Sep 2015)
Log Message:
-----------
switch to dir

Modified Paths:
--------------
    trunk/Mk/extensions/tex.mk

Modified: trunk/Mk/extensions/tex.mk
===================================================================
--- trunk/Mk/extensions/tex.mk	2015-09-28 15:17:30 UTC (rev 20344)
+++ trunk/Mk/extensions/tex.mk	2015-10-01 02:03:12 UTC (rev 20345)
@@ -22,7 +22,11 @@
 #  web2c:	WEB2C toolchain and TeX engines
 #  kpathsea:	kpathsea library
 #  ptexenc:	character code conversion library for pTeX
-#  infra:	tlmgr dependency (Perl modules)
+#  basic:	basic TeX engines including tex and pdftex
+#  tlmgr:	tlmgr dependency (Perl modules)
+#  texlua:	texlua52 library
+#  texluajit:	texluajit library
+#  synctex:	synctex library
 #
 #  dvipsk:	dvipsk
 #  dvipdfmx:	DVIPDFMx
@@ -92,9 +96,9 @@
 _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_INFRA_DEP=	${LOCALBASE}/${TEXMFDISTDIR}/web2c/fmtutil-hdr.cnf
-_USE_TEX_INFRA_PORT=	print/${_USE_TEX_INFRA_PKGNAME}
-_USE_TEX_INFRA_PKGNAME=	texlive-infra
+_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
@@ -104,6 +108,9 @@
 _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}
@@ -127,9 +134,18 @@
 _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=	libtexlua52.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_ALEPH_DEP=	aleph
 _USE_TEX_ALEPH_PORT=	print/${_USE_TEX_ALEPH_PKGNAME}
 _USE_TEX_ALEPH_PKGNAME=	tex-aleph
@@ -140,11 +156,11 @@
 _USE_TEX_XETEX_PORT=	print/${_USE_TEX_XETEX_PKGNAME}
 _USE_TEX_XETEX_PKGNAME=	tex-xetex
 
-_USE_TEX_FULLLIST=	texmf>=20140525_2 base>=20140525_1 \
-		web2c infra \
-		formats aleph xetex jadetex luatex xmltex ptex \
+_USE_TEX_FULLLIST=	texmf>=20150523 base>=20150521 \
+		web2c tlmgr:run \
+		basic formats aleph xetex jadetex luatex xmltex ptex \
 		dvipsk dvipdfmx xdvik \
-		kpathsea:lib ptexenc:lib
+		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}
@@ -153,7 +169,17 @@
 .for _UU in ${USE_TEX:tu}
 _U:=	${_UU}	# ugly but necessary in for loop
 _VOP:=
-. if !empty(_U:tu:MKPATHSEA) || !empty(_U:tu:MPTEXENC)
+. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXMF) && empty(_U:M*[<>=]*)
+_U:=	${_U}>=20150523
+. endif
+. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MBASE) && empty(_U:M*[<>=]*)
+_U:=	${_U}>=20150521
+. 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*[<>=]*)
@@ -162,8 +188,9 @@
 . if empty(_U:M*\:*)
 _C:=	BUILD RUN
 . else
-_C:=	${_U:C/.*://}
+_C:=	${_U:C/.*://:S/,/ /g:C/[<>=][^\:]*//g}
 . endif
+#. warning DEBUG: ${_U}: _VOP=${_VOP}, _C=${_C}
 . for _CC in ${_C:tu}
 _V:=${_UU:C/[<>=][^\:]*//:C/\:.*$//}
 .  if defined(_USE_TEX_${_V}_PORT)
@@ -197,7 +224,7 @@
 		"${TEXHASHDIRS:S,^,%D/,}" >> ${TMPPLIST}
 	@for D in ${TEXHASHDIRS}; do \
 		${ECHO_CMD} "@rmtry $$D/ls-R"; \
-		${ECHO_CMD} "@dirrmtry $$D"; \
+		${ECHO_CMD} "@dir $$D"; \
 	done >> ${TMPPLIST}
 . else
 	@${ECHO_CMD} "@exec for D in ${TEXHASHDIRS:S,^,${PREFIX}/,}; do " \
@@ -242,6 +269,7 @@
 	${RM} ${TEXHASHDIRS:S,^,${PREFIX}/,:S,$,/ls-R,} \
 	    ${PREFIX}/${TEXMFDISTDIR}/web2c/texmf.cnf
 	${RMDIR} ${PREFIX}/${TEXMFDISTDIR}/web2c || ${TRUE}
+	${RMDIR} ${PREFIX}/${TEXMFDISTDIR} || ${TRUE}
 _PLIST_FILES+=	${TEX_FORMAT_${F:tu}_FILES}
 _PLIST_DIRSTRY+=${TEX_FORMAT_${F:tu}_DIRS}
 _PLIST_FILES+=	${TEX_FORMAT_${F:tu}_BIN}