diff options
| author | hauke <hauke@pkgsrc.org> | 2021-07-23 12:25:59 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2021-07-23 12:25:59 +0000 |
| commit | 2226f43a65ac4981b796d1ebd4a4ff54224a7323 (patch) | |
| tree | a973a46d63fd5d6b8281375078c3f36ec912a34d /fonts | |
| parent | 955fae9c340f9fda8a565661013a440a9557346f (diff) | |
| download | pkgsrc-2226f43a65ac4981b796d1ebd4a4ff54224a7323.tar.gz | |
X11 option change undone, as requested by wiz@
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/dejavu-ttf/Makefile | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/fonts/dejavu-ttf/Makefile b/fonts/dejavu-ttf/Makefile index ebc4430566a..ad35d7692bd 100644 --- a/fonts/dejavu-ttf/Makefile +++ b/fonts/dejavu-ttf/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2021/07/23 10:20:30 hauke Exp $ +# $NetBSD: Makefile,v 1.26 2021/07/23 12:25:59 hauke Exp $ DISTNAME= dejavu-fonts-ttf-2.37 -PKGREVISION= 1 PKGNAME= ${DISTNAME:S/fonts-//} CATEGORIES= fonts MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dejavu/} @@ -15,23 +14,13 @@ COMMENT= DejaVu family of TrueType fonts NO_CONFIGURE= yes NO_BUILD= yes +FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF + EGDIR= ${PREFIX}/share/examples/${PKGBASE} -TTFDIR= ${PREFIX}/share/fonts/X11/TTF FCEGDIR= ${EGDIR}/fontconfig-conf.d FCCFDIR= ${PKG_SYSCONFDIR}/fontconfig/conf.d DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} -PKG_OPTIONS_VAR= PKG_OPTIONS.dejavu-fonts-ttf -PKG_SUPPORTED_OPTIONS+= x11 -PKG_SUGGESTED_OPTIONS+= x11 - -.include "../../mk/bsd.options.mk" - -# Only attempt to register fonts if we have X11 support (mkfontdir) -.if !empty(PKG_OPTIONS:Mx11) -FONTS_DIRS.ttf= ${TTFDIR} -.endif - MAKE_DIRS+= ${FCCFDIR} CONF_FILES= ${FCEGDIR}/20-unhint-small-dejavu-sans-mono.conf \ @@ -54,7 +43,7 @@ REQD_DIRS+= ${FCEGDIR} INSTALLATION_DIRS= share/fonts/X11/TTF ${DOCSDIR} ${FCEGDIR} do-install: - ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${DESTDIR}${TTFDIR} + ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${DESTDIR}${FONTS_DIRS.ttf} ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${DESTDIR}${FCEGDIR} .for docfile in AUTHORS BUGS LICENSE NEWS README.md ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DESTDIR}${DOCSDIR} |