CVS commit: pkgsrc/print/tex-texlive-scripts

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Jan 12 10:46:59 UTC 2023

Modified Files:
        pkgsrc/print/tex-texlive-scripts: Makefile PLIST
Added Files:
        pkgsrc/print/tex-texlive-scripts/files: 09-texlive-fonts.conf

Log Message:
tex-texlive-scripts: add TeX's opentype and truetype directory trees
to fontconfig search path so that fontspec works.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/tex-texlive-scripts/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-texlive-scripts/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/tex-texlive-scripts/files/09-texlive-fonts.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/tex-texlive-scripts/Makefile
diff -u pkgsrc/print/tex-texlive-scripts/Makefile:1.25 pkgsrc/print/tex-texlive-scripts/Makefile:1.26
--- pkgsrc/print/tex-texlive-scripts/Makefile:1.25      Tue Jun 28 11:35:32 2022
+++ pkgsrc/print/tex-texlive-scripts/Makefile   Thu Jan 12 10:46:59 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2022/06/28 11:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2023/01/12 10:46:59 markd Exp $
 
 DISTNAME=      texlive-scripts
 PKGNAME=       tex-${DISTNAME}-2022
-PKGREVISION=   1
+PKGREVISION=   2
 TEXLIVE_REV=   63029
 
 MAINTAINER=    minskim%NetBSD.org@localhost
@@ -23,9 +23,19 @@ REPLACE_TEXLUA=      bin/rungs
 
 PKG_SYSCONFSUBDIR=     texmf
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${X11_TYPE} == "native"
+_FONTCONFDIR=  /etc/fonts/conf.d
+.else
+_FONTCONFDIR=  ${PKG_SYSCONFBASE}/fontconfig/conf.d
+.endif
+
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/web2c
 CONF_FILES+=   ${PREFIX}/share/texmf-dist/web2c/updmap.cfg \
                ${PKG_SYSCONFDIR}/web2c/updmap.cfg
+CONF_FILES+=   ${PREFIX}/share/fontconfig/conf.avail/09-texlive-fonts.conf \
+               ${_FONTCONFDIR}/09-texlive-fonts.conf
 
 TEX_TEXMF_DIRS+=       ${PKG_SYSCONFDIR} ${PREFIX}/share/texmf-dist
 
@@ -62,9 +72,15 @@ post-extract:
        ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \
                ${WRKSRC}/bin/${script:S/.pl//}
 .endfor
+       ${SED} ${FILES_SUBST_SED} ${FILESDIR}/09-texlive-fonts.conf \
+                >${WRKDIR}/09-texlive-fonts.conf
+
+INSTALLATION_DIRS+=    share/fontconfig/conf.avail/
 
 post-install:
        ${LN} -sf fmtutil ${DESTDIR}${PREFIX}/bin/mktexfmt
        ${LN} -sf mktexlsr ${DESTDIR}${PREFIX}/bin/texhash
+       ${INSTALL_DATA} ${WRKDIR}/09-texlive-fonts.conf \
+               ${DESTDIR}${PREFIX}/share/fontconfig/conf.avail/09-texlive-fonts.conf
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-texlive-scripts/PLIST
diff -u pkgsrc/print/tex-texlive-scripts/PLIST:1.3 pkgsrc/print/tex-texlive-scripts/PLIST:1.4
--- pkgsrc/print/tex-texlive-scripts/PLIST:1.3  Sun May 10 03:56:44 2020
+++ pkgsrc/print/tex-texlive-scripts/PLIST      Thu Jan 12 10:46:59 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/10 03:56:44 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/01/12 10:46:59 markd Exp $
 bin/fmtutil
 bin/fmtutil-sys
 bin/fmtutil-user
@@ -11,6 +11,7 @@ bin/texhash
 bin/updmap
 bin/updmap-sys
 bin/updmap-user
+share/fontconfig/conf.avail/09-texlive-fonts.conf
 share/texmf-dist/dvips/tetex/config.builtin35
 share/texmf-dist/dvips/tetex/config.dfaxhigh
 share/texmf-dist/dvips/tetex/config.dfaxlo

Added files:

Index: pkgsrc/print/tex-texlive-scripts/files/09-texlive-fonts.conf
diff -u /dev/null pkgsrc/print/tex-texlive-scripts/files/09-texlive-fonts.conf:1.1
--- /dev/null   Thu Jan 12 10:46:59 2023
+++ pkgsrc/print/tex-texlive-scripts/files/09-texlive-fonts.conf        Thu Jan 12 10:46:59 2023
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <dir>@PREFIX@/share/texmf-dist/fonts/opentype</dir>
+  <dir>@PREFIX@/share/texmf-dist/fonts/truetype</dir>
+</fontconfig>
+