From 861283c870152f8751633edad7f2c4eaf5d42981 Mon Sep 17 00:00:00 2001 From: hrs Date: Tue, 7 May 2013 08:44:32 +0000 Subject: - Separate print/tex-dvipdfmx from print/texlive-base and add libpaper support. dvipdfmx's default paper size can be set by ${LOCALBASE}/etc/papersize and/or PAPERSIZE environment variable as other programs like print/psutils do. - Use absolute pathname in {fmtutil,texconfig,updmap}-sys programs because manually-installed and/or old TeXLive files can prevent them from working. [1] - Fix pkg-plist in print/texlive-texmf. - Remove DIST_SUBDIR from Mk/bsd.tex.mk. Reported by: bsam, Stephen Montgomery-Smith [1] --- Mk/bsd.tex.mk | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'Mk/bsd.tex.mk') diff --git a/Mk/bsd.tex.mk b/Mk/bsd.tex.mk index 9824c51a89ce..71527316f6b1 100644 --- a/Mk/bsd.tex.mk +++ b/Mk/bsd.tex.mk @@ -41,13 +41,13 @@ TEX_MAINTAINER= hrs@FreeBSD.org # updmap: font map regeneration # fmtutil: format regeneration # -.if empty(USE_TEX:Mtetex-texmf) && \ - empty(USE_TEX:Mtetex-base) && \ - empty(USE_TEX:Mtetex) -.if defined(MASTER_SITES) && !empty(MASTER_SITES) -DIST_SUBDIR?= TeX -.endif -.endif + +# default TeX distribution. "tetex" or "texlive" +TEX_DEFAULT?= tetex +#TEX_DEFAULT?= texlive + +# normalize +TEX_DEFAULT:= ${TEX_DEFAULT:L} TEXMFDIR?= share/texmf TEXMFDISTDIR?= share/texmf-dist @@ -125,9 +125,8 @@ _USE_TEX_XDVIK= xdvi:${PORTSDIR}/print/tex-xdvik CONFLICTS_INSTALL+= ${CONFLICTS_TETEX} .endif .if !empty(USE_TEX:Mxdvipdfmx) || !empty(USE_TEX:Mtexlive) -# XXX -#_USE_TEX_DVIPDFMX= dvipdfmx:${PORTSDIR}/print/tex-dvipdfmx -#CONFLICTS_INSTALL+= ${CONFLICTS_TETEX} +_USE_TEX_DVIPDFMX= dvipdfmx:${PORTSDIR}/print/tex-dvipdfmx +CONFLICTS_INSTALL+= ${CONFLICTS_TETEX} .endif .if !empty(USE_TEX:Mbase) || !empty(USE_TEX:Mtexlive) _USE_TEXLIVE_BASE= tlmgr:${PORTSDIR}/print/texlive-base -- cgit