CVS commit: pkgsrc/fonts/spleen

["Frederic Cambus" <fcambus%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fcambus
Date:           Wed Mar 11 15:11:17 UTC 2020

Modified Files:
        pkgsrc/fonts/spleen: Makefile PLIST

Log Message:
spleen: also install PSF versions of the fonts, for the Linux console.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/fonts/spleen/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/spleen/PLIST

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

Modified files:

Index: pkgsrc/fonts/spleen/Makefile
diff -u pkgsrc/fonts/spleen/Makefile:1.10 pkgsrc/fonts/spleen/Makefile:1.11
--- pkgsrc/fonts/spleen/Makefile:1.10   Wed Mar  4 09:09:59 2020
+++ pkgsrc/fonts/spleen/Makefile        Wed Mar 11 15:11:17 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2020/03/04 09:09:59 fcambus Exp $
+# $NetBSD: Makefile,v 1.11 2020/03/11 15:11:17 fcambus Exp $
 
 DISTNAME=      spleen-1.7.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    fonts
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fcambus/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -15,16 +15,19 @@ USE_LANGUAGES=      # none
 USE_TOOLS+=    gzip
 
 FONTDIR=               ${PREFIX}/share/fonts/X11/spleen
+CONSOLEFONTSDIR=       ${PREFIX}/share/fonts/consolefonts
 FONTS_DIRS.x11+=       ${FONTDIR}
-INSTALLATION_DIRS=     ${FONTDIR}
+INSTALLATION_DIRS=     ${FONTDIR} ${CONSOLEFONTSDIR}
 
 do-build:
        ${GZIP_CMD} ${WRKSRC}/*.pcf
+       ${GZIP_CMD} ${WRKSRC}/*.psfu
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/fonts.alias-spleen    \
          ${DESTDIR}${FONTDIR}/fonts.alias
        ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${DESTDIR}${FONTDIR}
        ${INSTALL_DATA} ${WRKSRC}/*.otf ${DESTDIR}${FONTDIR}
+       ${INSTALL_DATA} ${WRKSRC}/*.psfu.gz ${DESTDIR}${CONSOLEFONTSDIR}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/spleen/PLIST
diff -u pkgsrc/fonts/spleen/PLIST:1.2 pkgsrc/fonts/spleen/PLIST:1.3
--- pkgsrc/fonts/spleen/PLIST:1.2       Wed Mar  4 09:09:59 2020
+++ pkgsrc/fonts/spleen/PLIST   Wed Mar 11 15:11:17 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/03/04 09:09:59 fcambus Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/03/11 15:11:17 fcambus Exp $
 share/fonts/X11/spleen/fonts.alias
 share/fonts/X11/spleen/spleen-12x24.otf
 share/fonts/X11/spleen/spleen-12x24.pcf.gz
@@ -9,3 +9,8 @@ share/fonts/X11/spleen/spleen-32x64.pcf.
 share/fonts/X11/spleen/spleen-5x8.pcf.gz
 share/fonts/X11/spleen/spleen-8x16.otf
 share/fonts/X11/spleen/spleen-8x16.pcf.gz
+share/fonts/consolefonts/spleen-12x24.psfu.gz
+share/fonts/consolefonts/spleen-16x32.psfu.gz
+share/fonts/consolefonts/spleen-32x64.psfu.gz
+share/fonts/consolefonts/spleen-5x8.psfu.gz
+share/fonts/consolefonts/spleen-8x16.psfu.gz