Date: Sat, 23 Aug 2014 17:58:43 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365763 - in head: Mk print/texlive-base print/texlive-full print/texlive-texmf Message-ID: <201408231758.s7NHwhPk052502@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Aug 23 17:58:43 2014 New Revision: 365763 URL: http://svnweb.freebsd.org/changeset/ports/365763 QAT: https://qat.redports.org/buildarchive/r365763/ Log: - Add capability to specify package dependency in USE_TEX. - Make print/texlive-full always depend on the latest packages; currently texmf>=20140525_2 and base>=20140525_1. Modified: head/Mk/bsd.tex.mk head/print/texlive-base/Makefile head/print/texlive-full/Makefile head/print/texlive-texmf/Makefile Modified: head/Mk/bsd.tex.mk ============================================================================== --- head/Mk/bsd.tex.mk Sat Aug 23 17:41:18 2014 (r365762) +++ head/Mk/bsd.tex.mk Sat Aug 23 17:58:43 2014 (r365763) @@ -72,29 +72,68 @@ PLIST_SUB+= $V="${$V}" IGNORE= "texlive" must not be defined in USE_TEX .endif -_USE_TEX_TEXMF= ${LOCALBASE}/${TEXMFDISTDIR}/README:${PORTSDIR}/print/texlive-texmf -_USE_TEX_BASE= tlmgr:${PORTSDIR}/print/texlive-base -_USE_TEX_GBKLATEX= gbklatex:${PORTSDIR}/print/texlive-base -_USE_TEX_DOCS= ${LOCALBASE}/${TEXMFDISTDIR}/doc/texlive/texlive-en/README:${PORTSDIR}/print/texlive-docs -_USE_TEX_INFRA= texlive-infra>=0:${PORTSDIR}/print/texlive-infra -_USE_TEX_DVIPSK= dvips:${PORTSDIR}/print/tex-dvipsk -_USE_TEX_XDVIK= xdvi:${PORTSDIR}/print/tex-xdvik -_USE_TEX_DVIPDFMX= dvipdfmx:${PORTSDIR}/print/tex-dvipdfmx -_USE_TEX_TEX= ${_USE_TEX_FORMATS} -_USE_TEX_LATEX= ${_USE_TEX_FORMATS} -_USE_TEX_PDFTEX= ${_USE_TEX_FORMATS} -_USE_TEX_JADETEX= jadetex:${PORTSDIR}/print/tex-jadetex -_USE_TEX_XMLTEX= xmltex:${PORTSDIR}/print/tex-xmltex -_USE_TEX_PTEX= ptex:${PORTSDIR}/japanese/tex-ptex -_USE_TEX_WEB2C= weave:${PORTSDIR}/devel/tex-web2c -_USE_TEX_KPATHSEA= libkpathsea.so:${PORTSDIR}/devel/tex-kpathsea -_USE_TEX_PTEXENC= libptexenc.so:${PORTSDIR}/print/tex-ptexenc -_USE_TEX_FORMATS= ${LOCALBASE}/${TEXMFVARDIR}/web2c/tex/tex.fmt:${PORTSDIR}/print/tex-formats -_USE_TEX_ALEPH= aleph:${PORTSDIR}/print/tex-aleph -_USE_TEX_LUATEX= luatex:${PORTSDIR}/print/tex-luatex -_USE_TEX_XETEX= xetex:${PORTSDIR}/print/tex-xetex +_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= tlmgr +_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_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_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 +.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_PTEXEC_PKGNAME} +_USE_TEX_PTEXENC_PKGNAME=tex-ptexenc +_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_ALEPH_DEP= aleph +_USE_TEX_ALEPH_PORT= print/${_USE_TEX_ALEPH_PKGNAME} +_USE_TEX_ALEPH_PKGNAME= tex-aleph +_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 base web2c infra \ +_USE_TEX_FULLLIST= texmf>=20140525_2 base>=20140525_1 \ + web2c infra \ formats aleph xetex jadetex luatex xmltex ptex \ dvipsk dvipdfmx xdvik \ kpathsea:lib ptexenc:lib @@ -105,16 +144,31 @@ USE_TEX:= ${USE_TEX:tu:NFULL} ${_USE_TEX .for _UU in ${USE_TEX:tu} _U:= ${_UU} # ugly but necessary in for loop +_VOP:= . if !empty(_U:tu:MKPATHSEA) || !empty(_U:tu:MPTEXENC) _U:= ${_U}:lib . endif +. if !empty(_U:M*[<>=]*) +_VOP:= ${_U:C/^[^<>=]*//:C/\:.*$//} +. endif . if empty(_U:M*\:*) _C:= BUILD RUN . else _C:= ${_U:C/.*://} . endif . for _CC in ${_C:tu} -TEX_${_CC}_DEPENDS+=${_USE_TEX_${_UU:C/:.*$//}} +_V:=${_UU:C/[<>=][^\:]*//:C/\:.*$//} +. if defined(_USE_TEX_${_V}_PORT) +. if !empty(_VOP) +. for _T in ${_USE_TEX_${_V}_PKGNAME}${_VOP}:${PORTSDIR}/${_USE_TEX_${_V}_PORT} +TEX_${_CC}_DEPENDS+= ${_T} +. endfor +. else +. for _T in ${_USE_TEX_${_V}_DEP}:${PORTSDIR}/${_USE_TEX_${_V}_PORT} +TEX_${_CC}_DEPENDS+= ${_T} +. endfor +. endif +. endif . endfor .endfor Modified: head/print/texlive-base/Makefile ============================================================================== --- head/print/texlive-base/Makefile Sat Aug 23 17:41:18 2014 (r365762) +++ head/print/texlive-base/Makefile Sat Aug 23 17:58:43 2014 (r365763) @@ -2,6 +2,7 @@ PORTNAME= texlive PORTVERSION= 20140525 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ PKGNAMESUFFIX= -base @@ -24,6 +25,9 @@ LIB_DEPENDS= libicuio.so:${PORTSDIR}/dev libpoppler.so:${PORTSDIR}/graphics/poppler # XXX # libpotrace.so:${PORTSDIR}/graphics/potrace + +CONFLICTS_INSTALL= texlive-texmf-201[23]* + USE_TEX= web2c kpathsea ptexenc texhash-bootstrap USES= gmake pkgconfig perl5 shebangfix tar:xz USE_AUTOTOOLS= autoconf Modified: head/print/texlive-full/Makefile ============================================================================== --- head/print/texlive-full/Makefile Sat Aug 23 17:41:18 2014 (r365762) +++ head/print/texlive-full/Makefile Sat Aug 23 17:58:43 2014 (r365763) @@ -2,6 +2,7 @@ PORTNAME= texlive DISTVERSION= 20140525 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= #empty PKGNAMESUFFIX= -full Modified: head/print/texlive-texmf/Makefile ============================================================================== --- head/print/texlive-texmf/Makefile Sat Aug 23 17:41:18 2014 (r365762) +++ head/print/texlive-texmf/Makefile Sat Aug 23 17:58:43 2014 (r365763) @@ -2,7 +2,7 @@ PORTNAME= texlive PORTVERSION= 20140525 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= ftp://ftp.tug.org/historic/systems/texlive/2014/ PKGNAMESUFFIX= -texmf @@ -12,6 +12,8 @@ DIST_SUBDIR= TeX MAINTAINER= hrs@FreeBSD.org COMMENT= TeX Live Typesetting System, texmf Tree +CONFLICTS_INSTALL= texlive-base-201[23]* + USES= tar:xz USE_TEX= base texhash TEXHASHDIRS= ${TEXMFDIR} ${TEXMFDISTDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408231758.s7NHwhPk052502>