CVS commit: pkgsrc/fonts/dejavu-ttf

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Jul 23 12:25:59 UTC 2021

Modified Files:
        pkgsrc/fonts/dejavu-ttf: Makefile

Log Message:
X11 option change undone, as requested by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/fonts/dejavu-ttf/Makefile

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

Modified files:

Index: pkgsrc/fonts/dejavu-ttf/Makefile
diff -u pkgsrc/fonts/dejavu-ttf/Makefile:1.25 pkgsrc/fonts/dejavu-ttf/Makefile:1.26
--- pkgsrc/fonts/dejavu-ttf/Makefile:1.25       Fri Jul 23 10:20:30 2021
+++ pkgsrc/fonts/dejavu-ttf/Makefile    Fri Jul 23 12:25:59 2021
@@ -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}