CVS commit: pkgsrc/fonts/uw-ttyp0

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Sep 23 11:59:18 UTC 2020

Modified Files:
        pkgsrc/fonts/uw-ttyp0: Makefile PLIST

Log Message:
uw-ttyp0: install to its own fonts directory

this allows the directory to be easily added to the x11 serverside fonts
path with xset while not conflicting with misc-fixed terminus etc

still works as expected with fontconfig/xft


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/uw-ttyp0/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/uw-ttyp0/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/uw-ttyp0/Makefile
diff -u pkgsrc/fonts/uw-ttyp0/Makefile:1.3 pkgsrc/fonts/uw-ttyp0/Makefile:1.4
--- pkgsrc/fonts/uw-ttyp0/Makefile:1.3  Mon Aug 31 18:09:33 2020
+++ pkgsrc/fonts/uw-ttyp0/Makefile      Wed Sep 23 11:59:18 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2020/08/31 18:09:33 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2020/09/23 11:59:18 nia Exp $
 
 DISTNAME=      uw-ttyp0-1.3
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    fonts
 MASTER_SITES=  https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/
 
@@ -18,11 +18,9 @@ USE_LANGUAGES=       # none
 HAS_CONFIGURE= yes
 
 MAKE_FLAGS+=   PREFIX=${PREFIX}
+MAKE_FLAGS+=   PCFDIR=${PREFIX}/share/fonts/X11/uw-ttyp0
 
 # Otherwise fontconfig picks fonts with less character support...
 MAKE_FLAGS+=   ENCODINGS=uni
 
-post-install:
-       ${RM} -f ${DESTDIR}${PREFIX}/share/fonts/X11/misc/fonts.*
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/uw-ttyp0/PLIST
diff -u pkgsrc/fonts/uw-ttyp0/PLIST:1.2 pkgsrc/fonts/uw-ttyp0/PLIST:1.3
--- pkgsrc/fonts/uw-ttyp0/PLIST:1.2     Sat Jun 20 16:13:30 2020
+++ pkgsrc/fonts/uw-ttyp0/PLIST Wed Sep 23 11:59:18 2020
@@ -1,23 +1,25 @@
-@comment $NetBSD: PLIST,v 1.2 2020/06/20 16:13:30 nia Exp $
-share/fonts/X11/misc/t0-11-uni.pcf.gz
-share/fonts/X11/misc/t0-11b-uni.pcf.gz
-share/fonts/X11/misc/t0-12-uni.pcf.gz
-share/fonts/X11/misc/t0-12b-uni.pcf.gz
-share/fonts/X11/misc/t0-13-uni.pcf.gz
-share/fonts/X11/misc/t0-13b-uni.pcf.gz
-share/fonts/X11/misc/t0-14-uni.pcf.gz
-share/fonts/X11/misc/t0-14b-uni.pcf.gz
-share/fonts/X11/misc/t0-15-uni.pcf.gz
-share/fonts/X11/misc/t0-15b-uni.pcf.gz
-share/fonts/X11/misc/t0-15i-uni.pcf.gz
-share/fonts/X11/misc/t0-16-uni.pcf.gz
-share/fonts/X11/misc/t0-16b-uni.pcf.gz
-share/fonts/X11/misc/t0-16i-uni.pcf.gz
-share/fonts/X11/misc/t0-17-uni.pcf.gz
-share/fonts/X11/misc/t0-17b-uni.pcf.gz
-share/fonts/X11/misc/t0-17i-uni.pcf.gz
-share/fonts/X11/misc/t0-18-uni.pcf.gz
-share/fonts/X11/misc/t0-18b-uni.pcf.gz
-share/fonts/X11/misc/t0-18i-uni.pcf.gz
-share/fonts/X11/misc/t0-22-uni.pcf.gz
-share/fonts/X11/misc/t0-22b-uni.pcf.gz
+@comment $NetBSD: PLIST,v 1.3 2020/09/23 11:59:18 nia Exp $
+share/fonts/X11/uw-ttyp0/fonts.dir
+share/fonts/X11/uw-ttyp0/fonts.scale
+share/fonts/X11/uw-ttyp0/t0-11-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-11b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-12-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-12b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-13-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-13b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-14-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-14b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-15-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-15b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-15i-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-16-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-16b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-16i-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-17-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-17b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-17i-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-18-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-18b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-18i-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-22-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-22b-uni.pcf.gz