CVS commit: pkgsrc/fonts/uw-ttyp0

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/fonts/uw-ttyp0
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sun, 26 Oct 2025 12:03:29 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct 26 12:03:29 UTC 2025

Modified Files:
        pkgsrc/fonts/uw-ttyp0: DESCR Makefile PLIST distinfo
        pkgsrc/fonts/uw-ttyp0/patches: patch-Makefile.in

Log Message:
uw-ttyp0: Update to 2.1

The most notable changes are that the font now includes extra-high-res
bitmap fonts for higher DPI displays, as well as console fonts for
NetBSD and Linux - although the NetBSD fonts are in the in-kernel
rather than runtime loadable format, so the kernel needs to be rebuilt
with them.

verified to package on just about everything by drecklypkg ci. A todo
item is to get the openbsd and freebsd console fonts packaged.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/uw-ttyp0/DESCR
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/uw-ttyp0/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/uw-ttyp0/PLIST \
    pkgsrc/fonts/uw-ttyp0/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/uw-ttyp0/patches/patch-Makefile.in

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/DESCR
diff -u pkgsrc/fonts/uw-ttyp0/DESCR:1.1 pkgsrc/fonts/uw-ttyp0/DESCR:1.2
--- pkgsrc/fonts/uw-ttyp0/DESCR:1.1     Wed Jun 17 11:06:28 2020
+++ pkgsrc/fonts/uw-ttyp0/DESCR Sun Oct 26 12:03:28 2025
@@ -1,9 +1,9 @@
-UW ttyp0 is a family of bitmap programmer's fonts in bdf format. It covers
-most of the Latin and Cyrillic alphabet, Greek, Armenian, Georgian (only
-Mkhedruli), Hebrew (without cantillation marks), Thai, most of IPA (but no
-UPA), standard punctuation, common symbols, some mathematics, line graphics,
-a few dingbats, and Powerline delimiter symbols.
+UW ttyp0 is a family of monospaced bitmap fonts. It covers most of the Latin
+and Cyrillic alphabet, Greek, Armenian, Georgian (only Mkhedruli), Hebrew
+(without cantillation marks), Tifinagh, Thai, Braille, most of IPA (but no
+UPA), standard punctuation, common symbols, some mathematics, line graphics
+a few dingbats, and Powerline delimiter symbols (about 3800 Unicode characters).
 
-UW ttyp0 comes in nine sizes from 6x11 to 11x22. In all of the sizes there
-are regular and bold versions; for some there is also a (somewhat experimental)
-italic.
+The UW ttyp0 fonts are available in bdf and pcf format for X11, and as
+console fonts for Linux and NetBSD. In addition to Unicode (ISO 10646-1),
+UW ttyp0 supports more than 50 8-bit encodings (code pages).

Index: pkgsrc/fonts/uw-ttyp0/Makefile
diff -u pkgsrc/fonts/uw-ttyp0/Makefile:1.8 pkgsrc/fonts/uw-ttyp0/Makefile:1.9
--- pkgsrc/fonts/uw-ttyp0/Makefile:1.8  Fri Jan 24 14:51:19 2025
+++ pkgsrc/fonts/uw-ttyp0/Makefile      Sun Oct 26 12:03:28 2025
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2025/01/24 14:51:19 riastradh Exp $
+# $NetBSD: Makefile,v 1.9 2025/10/26 12:03:28 nia Exp $
 
-DISTNAME=      uw-ttyp0-1.3
-PKGREVISION=   6
+DISTNAME=      uw-ttyp0-2.1
 CATEGORIES=    fonts
 MASTER_SITES=  https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    nia%NetBSD.org@localhost
 HOMEPAGE=      https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/
 COMMENT=       Monospace bitmap screen fonts for X11
 LICENSE=       ttyp0-license AND mit
 
-TOOL_DEPENDS+= bdftopcf-[0-9]*:../../fonts/bdftopcf
-
-USE_TOOLS+=    mkfontscale gmake perl gzip
+USE_TOOLS+=    gmake perl gzip
 USE_LANGUAGES= # none
 
 HAS_CONFIGURE= yes
@@ -20,7 +17,26 @@ 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
+# seems to segfault
+MAKE_FLAGS+=   GEN_OTB=0
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "native"
+TOOL_DEPENDS+= bdftopcf-[0-9]*:../../fonts/bdftopcf
+TOOL_DEPENDS+= mkfontscale-[0-9]*:../../fonts/mkfontscale
+.endif
+
+.if ${OPSYS} == "Linux"
+TOOL_DEPENDS+= bdf2psf-[0-9]*:../../converters/bdf2psf
+MAKE_FLAGS+=   GEN_CONS_LINUX=1
+
+CONFIGURE_ARGS+=       --conslinuxnaming=console-setup
+CONFIGURE_ARGS+=       --conslinuxdir=${PREFIX}/share/consolefonts
+.endif
+
+MAKE_FLAGS.NetBSD+=    GEN_CONS_NETBSD=1
+
+CONFIGURE_ARGS.NetBSD+=        --consnbsddir=${PREFIX}/share/examples/wsfont
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/uw-ttyp0/PLIST
diff -u pkgsrc/fonts/uw-ttyp0/PLIST:1.3 pkgsrc/fonts/uw-ttyp0/PLIST:1.4
--- pkgsrc/fonts/uw-ttyp0/PLIST:1.3     Wed Sep 23 11:59:18 2020
+++ pkgsrc/fonts/uw-ttyp0/PLIST Sun Oct 26 12:03:28 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/09/23 11:59:18 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/10/26 12:03:28 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
@@ -23,3 +23,9 @@ share/fonts/X11/uw-ttyp0/t0-18b-uni.pcf.
 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
+share/fonts/X11/uw-ttyp0/t0-30-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-30b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-30i-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-40-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-40b-uni.pcf.gz
+share/fonts/X11/uw-ttyp0/t0-40i-uni.pcf.gz
Index: pkgsrc/fonts/uw-ttyp0/distinfo
diff -u pkgsrc/fonts/uw-ttyp0/distinfo:1.3 pkgsrc/fonts/uw-ttyp0/distinfo:1.4
--- pkgsrc/fonts/uw-ttyp0/distinfo:1.3  Tue Oct 26 10:28:40 2021
+++ pkgsrc/fonts/uw-ttyp0/distinfo      Sun Oct 26 12:03:28 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:28:40 nia Exp $
+$NetBSD: distinfo,v 1.4 2025/10/26 12:03:28 nia Exp $
 
-BLAKE2s (uw-ttyp0-1.3.tar.gz) = d9f36e412822a2548397cf252cbb3ab9594a482af20ca14217c0bd258566b902
-SHA512 (uw-ttyp0-1.3.tar.gz) = 193966b826cafa313384f20e225d4a0b0057364ed23c2beaf27a59095fdb9079281fdc1d292592038512a56ec0387e531a28449344e2960f0ecd3e64c7a6f6e7
-Size (uw-ttyp0-1.3.tar.gz) = 702217 bytes
-SHA1 (patch-Makefile.in) = 7e1e8b9da1035b604f4da1a5ad8884dfce887d33
+BLAKE2s (uw-ttyp0-2.1.tar.gz) = 008644b7a0246db039b485f399de4c02b8dd3d30306f7d3bdfd230bbb28787ae
+SHA512 (uw-ttyp0-2.1.tar.gz) = 18cb64afd73f64ccfaad5b6b01eef4e50c7d13165a20a14e47e2d66523f80941e3fdf01aeb3c0061ba197d0664123824647e250253f0bf2049055846c5d5d98c
+Size (uw-ttyp0-2.1.tar.gz) = 2658507 bytes
+SHA1 (patch-Makefile.in) = 881b5a2111a20e84d76874f12d23fba16752b356

Index: pkgsrc/fonts/uw-ttyp0/patches/patch-Makefile.in
diff -u pkgsrc/fonts/uw-ttyp0/patches/patch-Makefile.in:1.1 pkgsrc/fonts/uw-ttyp0/patches/patch-Makefile.in:1.2
--- pkgsrc/fonts/uw-ttyp0/patches/patch-Makefile.in:1.1 Wed Jun 17 11:06:28 2020
+++ pkgsrc/fonts/uw-ttyp0/patches/patch-Makefile.in     Sun Oct 26 12:03:29 2025
@@ -1,29 +1,92 @@
-$NetBSD: patch-Makefile.in,v 1.1 2020/06/17 11:06:28 nia Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2025/10/26 12:03:29 nia Exp $
 
-The install usage is not portable, replace it with BSD_INSTALL_*.
+- The install usage is not portable, replace it with BSD_INSTALL_*.
+- Fix spacing issues with sed usage.
 
---- Makefile.in.orig   2013-07-19 20:40:39.000000000 +0000
+--- Makefile.in.orig   2025-09-14 12:43:51.000000000 +0000
 +++ Makefile.in
-@@ -193,16 +193,16 @@ genbdf/%-sym.bdf : genbdf/%-uni.bdf mgl/
-       $(BDFMANGLE) $< mgl/adobe-symbol.mgl > $@
- 
- install : $(pcf)
+@@ -792,65 +792,60 @@ endif
+ install : $(pcf) $(otb) $(conslinux) $(consfreebsdvt) $(consfreebsdsc) $(consnetbsd) $(consopenbsd)
+ ifeq ($(strip $(GEN_PCF)),1)
+ ifneq ($(strip $(pcf)),)
 -      install -m0755 -d $(DESTDIR)$(PCFDIR)
 -      install -m0644 -p $(pcf) $(DESTDIR)$(PCFDIR)
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PCFDIR)
 +      $(BSD_INSTALL_DATA) $(pcf) $(DESTDIR)$(PCFDIR)
        mkfontscale $(DESTDIR)$(PCFDIR)
        mkfontdir $(DESTDIR)$(PCFDIR)
+ endif
+ endif
+ ifeq ($(strip $(GEN_OTB)),1)
+ ifneq ($(strip $(otb)),)
+-      install -m0755 -d $(DESTDIR)$(OTBDIR)
+-      install -m0644 -p $(otb) $(DESTDIR)$(OTBDIR)
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(OTBDIR)
++      $(BSD_INSTALL_DATA) $(otb) $(DESTDIR)$(OTBDIR)
+       mkfontscale $(DESTDIR)$(OTBDIR)
+       mkfontdir $(DESTDIR)$(OTBDIR)
+ endif
+ endif
+ ifeq ($(strip $(GEN_CONS_LINUX)),1)
+ ifneq ($(strip $(conslinux)),)
+-      install -m0755 -d $(DESTDIR)$(CONSLINUXDIR)
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(CONSLINUXDIR)
+       for oldname in $(conslinux) ; do     \
+-        newname=`echo $$oldname | sed -e ' \
+-          $(keepbasename)                  \
+-          $(optrenamefontsize)             \
+-          $(shuffleweight)                 \
+-          $(renamecodeset)                 \
+-          $(shufflecodeset)'` ;            \
+-        install -m0644 -p $$oldname $(DESTDIR)$(CONSLINUXDIR)/$$newname ; \
++        newname=`echo $$oldname | sed -e '$(keepbasename) $(optrenamefontsize) $(shuffleweight) $(renamecodeset) $(shufflecodeset)'` ;            \
++        $(BSD_INSTALL_DATA) $$oldname $(DESTDIR)$(CONSLINUXDIR)/$$newname ; \
+       done
+ endif
+ endif
+ ifeq ($(strip $(GEN_CONS_FREEBSD_VT)),1)
+ ifneq ($(strip $(consfreebsdvt)),)
+-      install -m0755 -d $(DESTDIR)$(CONSFBSDVTDIR)
+-      install -m0644 -p $(consfreebsdvt) $(DESTDIR)$(CONSFBSDVTDIR)
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(CONSFBSDVTDIR)
++      $(BSD_INSTALL_DATA) $(consfreebsdvt) $(DESTDIR)$(CONSFBSDVTDIR)
+ endif
+ endif
+ ifeq ($(strip $(GEN_CONS_FREEBSD_SC)),1)
+ ifneq ($(strip $(consfreebsdsc)),)
+-      install -m0755 -d $(DESTDIR)$(CONSFBSDSCDIR)
+-      install -m0644 -p $(consfreebsdsc) $(DESTDIR)$(CONSFBSDSCDIR)
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(CONSFBSDSCDIR)
++      $(BSD_INSTALL_DATA) $(consfreebsdsc) $(DESTDIR)$(CONSFBSDSCDIR)
+ endif
+ endif
+ ifeq ($(strip $(GEN_CONS_NETBSD)),1)
+ ifneq ($(strip $(consnetbsd)),)
+-      install -m0755 -d $(DESTDIR)$(CONSNBSDDIR)
+-      install -m0644 -p $(consnetbsd) $(DESTDIR)$(CONSNBSDDIR)
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(CONSNBSDDIR)
++      $(BSD_INSTALL_DATA) $(consnetbsd) $(DESTDIR)$(CONSNBSDDIR)
+ endif
+ endif
+ ifeq ($(strip $(GEN_CONS_OPENBSD)),1)
+ ifneq ($(strip $(consopenbsd)),)
+-      install -m0755 -d $(DESTDIR)$(CONSNBSDDIR)
+-      install -m0644 -p $(consopenbsd) $(DESTDIR)$(CONSOBSDDIR)
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(CONSNBSDDIR)
++      $(BSD_INSTALL_DATA) $(consopenbsd) $(DESTDIR)$(CONSOBSDDIR)
+ endif
+ endif
+ 
  
  install-util :
 -      install -m0755 -d $(DESTDIR)$(BINDIR)
 -      install -m0755 -d $(DESTDIR)$(MANDIR)/man1
 -      install -m0755 -p bin/bdfmangle $(DESTDIR)$(BINDIR)
 -      install -m0644 -p man/man1/bdfmangle.1 $(DESTDIR)$(MANDIR)/man1
-+      $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
++      $(BSD_INSTALL_BIN_DIR) $(DESTDIR)$(BINDIR)
 +      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1
-+      $(BSD_INSTALL_PROGRAM) bin/bdfmangle $(DESTDIR)$(BINDIR)
++      $(BSD_INSTALL_BIN) bin/bdfmangle $(DESTDIR)$(BINDIR)
 +      $(BSD_INSTALL_MAN) man/man1/bdfmangle.1 $(DESTDIR)$(MANDIR)/man1
  
- clean :
-       -rm genbdf/t0-*-???.bdf genpcf/t0-*-???.pcf.gz
+ 
+ install-doc :

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/fonts/uw-ttyp0
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/fonts/uw-ttyp0
Indexes:

Home | Main Index | Thread Index | Old Index