Fri Jul 23 10:20:30 2021 UTC ()
Registering the fonts via FONTS_DIRS.ttf incurs a dependency on
mkfontdir, which means X11.

Since there are legitimate uses for fonts on sans-X machines
(rrdtool), control the dependency with a (default) x11 option.


(hauke)
diff -r1.24 -r1.25 pkgsrc/fonts/dejavu-ttf/Makefile
cvs diff -r1.24 -r1.25 pkgsrc/fonts/dejavu-ttf/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/dejavu-ttf/Makefile 2017/08/01 17:40:11 1.24
+++ pkgsrc/fonts/dejavu-ttf/Makefile 2021/07/23 10:20:30 1.25
@@ -1,52 +1,63 @@ @@ -1,52 +1,63 @@
1# $NetBSD: Makefile,v 1.24 2017/08/01 17:40:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2021/07/23 10:20:30 hauke Exp $
2 2
3DISTNAME= dejavu-fonts-ttf-2.37 3DISTNAME= dejavu-fonts-ttf-2.37
 4PKGREVISION= 1
4PKGNAME= ${DISTNAME:S/fonts-//} 5PKGNAME= ${DISTNAME:S/fonts-//}
5CATEGORIES= fonts 6CATEGORIES= fonts
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dejavu/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dejavu/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= jakllsch@NetBSD.org 10MAINTAINER= jakllsch@NetBSD.org
10#HOMEPAGE= http://dejavu.sourceforge.net/ 11#HOMEPAGE= http://dejavu.sourceforge.net/
11COMMENT= DejaVu family of TrueType fonts 12COMMENT= DejaVu family of TrueType fonts
12# LICENSE= # complex of severals, see LICENSE file 13# LICENSE= # complex of severals, see LICENSE file
13 14
14NO_CONFIGURE= yes 15NO_CONFIGURE= yes
15NO_BUILD= yes 16NO_BUILD= yes
16 17
17FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF 
18 
19EGDIR= ${PREFIX}/share/examples/${PKGBASE} 18EGDIR= ${PREFIX}/share/examples/${PKGBASE}
 19TTFDIR= ${PREFIX}/share/fonts/X11/TTF
20FCEGDIR= ${EGDIR}/fontconfig-conf.d 20FCEGDIR= ${EGDIR}/fontconfig-conf.d
21FCCFDIR= ${PKG_SYSCONFDIR}/fontconfig/conf.d 21FCCFDIR= ${PKG_SYSCONFDIR}/fontconfig/conf.d
22DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} 22DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
23 23
 24PKG_OPTIONS_VAR= PKG_OPTIONS.dejavu-fonts-ttf
 25PKG_SUPPORTED_OPTIONS+= x11
 26PKG_SUGGESTED_OPTIONS+= x11
 27
 28.include "../../mk/bsd.options.mk"
 29
 30# Only attempt to register fonts if we have X11 support (mkfontdir)
 31.if !empty(PKG_OPTIONS:Mx11)
 32FONTS_DIRS.ttf= ${TTFDIR}
 33.endif
 34
24MAKE_DIRS+= ${FCCFDIR} 35MAKE_DIRS+= ${FCCFDIR}
25 36
26CONF_FILES= ${FCEGDIR}/20-unhint-small-dejavu-sans-mono.conf \ 37CONF_FILES= ${FCEGDIR}/20-unhint-small-dejavu-sans-mono.conf \
27 ${FCCFDIR}/20-unhint-small-dejavu-sans-mono.conf 38 ${FCCFDIR}/20-unhint-small-dejavu-sans-mono.conf
28CONF_FILES+= ${FCEGDIR}/20-unhint-small-dejavu-sans.conf \ 39CONF_FILES+= ${FCEGDIR}/20-unhint-small-dejavu-sans.conf \
29 ${FCCFDIR}/20-unhint-small-dejavu-sans.conf 40 ${FCCFDIR}/20-unhint-small-dejavu-sans.conf
30CONF_FILES+= ${FCEGDIR}/20-unhint-small-dejavu-serif.conf \ 41CONF_FILES+= ${FCEGDIR}/20-unhint-small-dejavu-serif.conf \
31 ${FCCFDIR}/20-unhint-small-dejavu-serif.conf 42 ${FCCFDIR}/20-unhint-small-dejavu-serif.conf
32 43
33CONF_FILES+= ${FCEGDIR}/57-dejavu-sans-mono.conf \ 44CONF_FILES+= ${FCEGDIR}/57-dejavu-sans-mono.conf \
34 ${FCCFDIR}/57-dejavu-sans-mono.conf 45 ${FCCFDIR}/57-dejavu-sans-mono.conf
35CONF_FILES+= ${FCEGDIR}/57-dejavu-sans.conf \ 46CONF_FILES+= ${FCEGDIR}/57-dejavu-sans.conf \
36 ${FCCFDIR}/57-dejavu-sans.conf 47 ${FCCFDIR}/57-dejavu-sans.conf
37CONF_FILES+= ${FCEGDIR}/57-dejavu-serif.conf \ 48CONF_FILES+= ${FCEGDIR}/57-dejavu-serif.conf \
38 ${FCCFDIR}/57-dejavu-serif.conf 49 ${FCCFDIR}/57-dejavu-serif.conf
39 50
40REQD_DIRS= ${EGDIR} 51REQD_DIRS= ${EGDIR}
41REQD_DIRS+= ${FCEGDIR} 52REQD_DIRS+= ${FCEGDIR}
42 53
43INSTALLATION_DIRS= share/fonts/X11/TTF ${DOCSDIR} ${FCEGDIR} 54INSTALLATION_DIRS= share/fonts/X11/TTF ${DOCSDIR} ${FCEGDIR}
44 55
45do-install: 56do-install:
46 ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${DESTDIR}${FONTS_DIRS.ttf} 57 ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${DESTDIR}${TTFDIR}
47 ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${DESTDIR}${FCEGDIR} 58 ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${DESTDIR}${FCEGDIR}
48.for docfile in AUTHORS BUGS LICENSE NEWS README.md 59.for docfile in AUTHORS BUGS LICENSE NEWS README.md
49 ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DESTDIR}${DOCSDIR} 60 ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DESTDIR}${DOCSDIR}
50.endfor 61.endfor
51 62
52.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"