Module Name: src
Committed By: mrg
Date: Sun Sep 22 09:34:57 UTC 2024
Modified Files:
src/external/mit/xorg/share/fonts: Makefile
src/external/mit/xorg/share/fonts/Type1: Makefile
src/external/mit/xorg/share/fonts/misc: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/external/mit/xorg/share/fonts/Type1/font-xfree86-type1: Makefile
src/external/mit/xorg/share/fonts/cyrillic: Makefile
src/external/mit/xorg/share/fonts/cyrillic/font-cronyx-cyrillic:
Makefile
src/external/mit/xorg/share/fonts/cyrillic/font-misc-cyrillic: Makefile
src/external/mit/xorg/share/fonts/cyrillic/font-screen-cyrillic:
Makefile
src/external/mit/xorg/share/fonts/cyrillic/font-winitzki-cyrillic:
Makefile
src/external/mit/xorg/share/fonts/misc/font-arabic-misc: Makefile
src/external/mit/xorg/share/fonts/misc/font-micro-misc: Makefile
src/external/mit/xorg/share/fonts/misc/font-schumacher-misc: Makefile
src/external/mit/xorg/share/fonts/misc/font-sun-misc: Makefile
Log Message:
install several font packages that we used to have with xfree86
this brings in these versions:
font-arabic-misc 1.0.4
font-micro-misc 1.0.4
font-schumacher-misc 1.1.3
font-sun-misc 1.0.4
font-cronyx-cyrillic 1.0.4
font-misc-cyrillic 1.0.4
font-screen-cyrillic 1.0.5
font-winitzki-cyrillic 1.0.4
font-xfree86-type1 1.0.5
fixes problem reported on netbsd 9.2 install.
XXX: pullup-10, pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/share/fonts/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/share/fonts/Type1/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/Type1/font-xfree86-type1/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/fonts/cyrillic/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/cyrillic/font-cronyx-cyrillic/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/cyrillic/font-misc-cyrillic/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/cyrillic/font-screen-cyrillic/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/cyrillic/font-winitzki-cyrillic/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/share/fonts/misc/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/misc/font-arabic-misc/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/misc/font-micro-misc/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/misc/font-schumacher-misc/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/misc/font-sun-misc/Makefile
cvs rdiff -u -r1.1401 -r1.1402 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/share/fonts/Makefile
diff -u src/external/mit/xorg/share/fonts/Makefile:1.6 src/external/mit/xorg/share/fonts/Makefile:1.7
--- src/external/mit/xorg/share/fonts/Makefile:1.6 Thu May 31 09:09:32 2018
+++ src/external/mit/xorg/share/fonts/Makefile Sun Sep 22 09:34:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/05/31 09:09:32 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2024/09/22 09:34:55 mrg Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
SUBDIR= encodings .WAIT \
font-alias font-util \
- 100dpi 75dpi Type1 TTF misc
+ 100dpi 75dpi Type1 TTF misc cyrillic
.endif
Index: src/external/mit/xorg/share/fonts/Type1/Makefile
diff -u src/external/mit/xorg/share/fonts/Type1/Makefile:1.1.1.1 src/external/mit/xorg/share/fonts/Type1/Makefile:1.2
--- src/external/mit/xorg/share/fonts/Type1/Makefile:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/share/fonts/Type1/Makefile Sun Sep 22 09:34:56 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2024/09/22 09:34:56 mrg Exp $
SUBDIR= font-adobe-utopia-type1 font-bh-type1 \
- font-bitstream-type1 font-ibm-type1
+ font-bitstream-type1 font-ibm-type1 font-xfree86-type1
FONTSUBDIR= Type1
Index: src/external/mit/xorg/share/fonts/misc/Makefile
diff -u src/external/mit/xorg/share/fonts/misc/Makefile:1.3 src/external/mit/xorg/share/fonts/misc/Makefile:1.4
--- src/external/mit/xorg/share/fonts/misc/Makefile:1.3 Sat Oct 10 08:33:29 2020
+++ src/external/mit/xorg/share/fonts/misc/Makefile Sun Sep 22 09:34:57 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2020/10/10 08:33:29 nia Exp $
+# $NetBSD: Makefile,v 1.4 2024/09/22 09:34:57 mrg Exp $
SUBDIR= font-cursor-misc font-daewoo-misc font-dec-misc font-isas-misc \
font-jis-misc font-misc-misc font-mutt-misc font-sony-misc \
- font-spleen-misc
+ font-spleen-misc font-arabic-misc font-micro-misc \
+ font-schumacher-misc font-sun-misc
FONTSUBDIR= misc
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1401 src/share/mk/bsd.own.mk:1.1402
--- src/share/mk/bsd.own.mk:1.1401 Sun Sep 15 03:56:57 2024
+++ src/share/mk/bsd.own.mk Sun Sep 22 09:34:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1401 2024/09/15 03:56:57 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.1402 2024/09/22 09:34:55 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1764,7 +1764,10 @@ HAVE_XORG_GLAMOR?= no
font-bitstream-100dpi font-bitstream-75dpi font-bitstream-type1 \
font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 \
font-isas-misc font-jis-misc font-misc-misc font-mutt-misc \
- font-sony-misc font-util ttf-bitstream-vera encodings
+ font-sony-misc font-util ttf-bitstream-vera encodings \
+ font-arabic-misc font-micro-misc font-schumacher-misc \
+ font-sun-misc font-cronyx-cyrillic font-misc-cyrillic \
+ font-screen-cyrillic font-winitzki-cyrillic font-xfree86-type1
X11SRCDIR.${_dir}?= ${X11SRCDIRMIT}/${_dir}/dist
.endfor
Added files:
Index: src/external/mit/xorg/share/fonts/Type1/font-xfree86-type1/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/Type1/font-xfree86-type1/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/Type1/font-xfree86-type1/Makefile Sun Sep 22 09:34:56 2024
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:56 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= Type1
+FONTSRCPKG= font-xfree86-type1
+
+FILES= cursor.pfa
+
+.include "../../Makefile.font"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/fonts/cyrillic/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/cyrillic/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/cyrillic/Makefile Sun Sep 22 09:34:56 2024
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:56 mrg Exp $
+
+SUBDIR= font-cronyx-cyrillic font-misc-cyrillic font-screen-cyrillic \
+ font-winitzki-cyrillic
+
+FONTSUBDIR= cyrillic
+
+.include "../Makefile.fontdir"
+
+.include <bsd.subdir.mk>
Index: src/external/mit/xorg/share/fonts/cyrillic/font-cronyx-cyrillic/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/cyrillic/font-cronyx-cyrillic/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/cyrillic/font-cronyx-cyrillic/Makefile Sun Sep 22 09:34:56 2024
@@ -0,0 +1,77 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:56 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= cyrillic
+FONTSRCPKG= font-cronyx-cyrillic
+
+.PATH: ${X11SRCDIR.${FONTSRCPKG}}
+BDFFILES+= crox1c.bdf \
+ crox1cb.bdf \
+ crox1cbo.bdf \
+ crox1co.bdf \
+ crox1h.bdf \
+ crox1hb.bdf \
+ crox1hbo.bdf \
+ crox1ho.bdf \
+ crox1t.bdf \
+ crox1tb.bdf \
+ crox1tbo.bdf \
+ crox1to.bdf \
+ crox2c.bdf \
+ crox2cb.bdf \
+ crox2cbo.bdf \
+ crox2co.bdf \
+ crox2h.bdf \
+ crox2hb.bdf \
+ crox2hbo.bdf \
+ crox2ho.bdf \
+ crox2t.bdf \
+ crox2tb.bdf \
+ crox2tbo.bdf \
+ crox2to.bdf \
+ crox3c.bdf \
+ crox3cb.bdf \
+ crox3cbo.bdf \
+ crox3co.bdf \
+ crox3h.bdf \
+ crox3hb.bdf \
+ crox3hbo.bdf \
+ crox3ho.bdf \
+ crox3t.bdf \
+ crox3tb.bdf \
+ crox3tbo.bdf \
+ crox3to.bdf \
+ crox4h.bdf \
+ crox4hb.bdf \
+ crox4hbo.bdf \
+ crox4ho.bdf \
+ crox4t.bdf \
+ crox4tb.bdf \
+ crox4tbo.bdf \
+ crox4to.bdf \
+ crox5h.bdf \
+ crox5hb.bdf \
+ crox5hbo.bdf \
+ crox5ho.pcf.gz \
+ crox5t.pcf.gz \
+ crox5tb.pcf.gz \
+ crox5tbo.pcf.gz \
+ crox5to.pcf.gz \
+ crox6h.pcf.gz \
+ crox6hb.pcf.gz \
+ crox6hbo.pcf.gz \
+ crox6ho.pcf.gz \
+ crox6t.pcf.gz \
+ crox6tb.pcf.gz \
+ crox6tbo.pcf.gz \
+ crox6to.pcf.gz \
+ koi10x16b.pcf.gz \
+ koi10x20.pcf.gz \
+ koi6x10.pcf.gz \
+ koinil2.pcf.gz
+
+.include "../../Makefile.bdf"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/fonts/cyrillic/font-misc-cyrillic/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/cyrillic/font-misc-cyrillic/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/cyrillic/font-misc-cyrillic/Makefile Sun Sep 22 09:34:56 2024
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:56 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= cyrillic
+FONTSRCPKG= font-misc-cyrillic
+
+.PATH: ${X11SRCDIR.${FONTSRCPKG}}
+BDFFILES+= koi12x24.bdf \
+ koi12x24b.bdf \
+ koi5x8.bdf \
+ koi6x13.bdf \
+ koi6x13b.bdf \
+ koi6x9.bdf \
+ koi7x14.bdf \
+ koi7x14b.bdf \
+ koi8x13.bdf \
+ koi8x16.bdf \
+ koi8x16b.bdf \
+ koi9x15.bdf \
+ koi9x15b.bdf \
+ koi9x18.bdf \
+ koi9x18b.bdf
+
+.include "../../Makefile.bdf"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/fonts/cyrillic/font-screen-cyrillic/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/cyrillic/font-screen-cyrillic/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/cyrillic/font-screen-cyrillic/Makefile Sun Sep 22 09:34:56 2024
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:56 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= cyrillic
+FONTSRCPKG= font-screen-cyrillic
+
+.PATH: ${X11SRCDIR.${FONTSRCPKG}}
+BDFFILES+= screen8x16.bdf \
+ screen8x16b.bdf
+
+.include "../../Makefile.bdf"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/fonts/cyrillic/font-winitzki-cyrillic/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/cyrillic/font-winitzki-cyrillic/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/cyrillic/font-winitzki-cyrillic/Makefile Sun Sep 22 09:34:56 2024
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:56 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= cyrillic
+FONTSRCPKG= font-winitzki-cyrillic
+
+.PATH: ${X11SRCDIR.${FONTSRCPKG}}
+BDFFILES+= proof9x16.bdf
+
+.include "../../Makefile.bdf"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/fonts/misc/font-arabic-misc/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/misc/font-arabic-misc/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/misc/font-arabic-misc/Makefile Sun Sep 22 09:34:57 2024
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:57 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= misc
+FONTSRCPKG= font-arabic-misc
+
+.PATH: ${X11SRCDIR.${FONTSRCPKG}}
+BDFFILES+= arabic24.bdf
+
+.include "../../Makefile.bdf"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/fonts/misc/font-micro-misc/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/misc/font-micro-misc/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/misc/font-micro-misc/Makefile Sun Sep 22 09:34:57 2024
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:57 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= misc
+FONTSRCPKG= font-micro-misc
+
+.PATH: ${X11SRCDIR.${FONTSRCPKG}}
+BDFFILES+= micro.bdf
+
+.include "../../Makefile.bdf"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/fonts/misc/font-schumacher-misc/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/misc/font-schumacher-misc/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/misc/font-schumacher-misc/Makefile Sun Sep 22 09:34:57 2024
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:57 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= misc
+FONTSRCPKG= font-schumacher-misc
+
+.PATH: ${X11SRCDIR.${FONTSRCPKG}}
+BDFFILES+= clB6x10.bdf \
+ clB6x12.bdf \
+ clB8x10.bdf \
+ clB8x12.bdf \
+ clB8x13.bdf \
+ clB8x14.bdf \
+ clB8x16.bdf \
+ clB8x8.bdf \
+ clB9x15.bdf \
+ clI6x12.bdf \
+ clI8x8.bdf \
+ clR4x6.bdf \
+ clR5x10.bdf \
+ clR5x6.bdf \
+ clR5x8.bdf \
+ clR6x10.bdf \
+ clR6x12.bdf \
+ clR6x13.bdf \
+ clR6x6.bdf \
+ clR6x8.bdf \
+ clR7x10.bdf \
+ clR7x12.bdf \
+ clR7x14.bdf \
+ clR7x8.bdf \
+ clR8x10.bdf \
+ clR8x12.bdf \
+ clR8x13.bdf \
+ clR8x14.bdf \
+ clR8x16.bdf \
+ clR8x8.bdf \
+ clR9x15.bdf
+
+ISOS= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
+ ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 ISO8859-13 \
+ ISO8859-14 ISO8859-15 ISO8859-16 KOI8-R
+.for _l in ${ISOS}
+UCSFILES+= clR6x12 ${_l}
+.endfor
+
+.endif
+
+.include "../../Makefile.bdf"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/fonts/misc/font-sun-misc/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/misc/font-sun-misc/Makefile:1.1
--- /dev/null Sun Sep 22 09:34:57 2024
+++ src/external/mit/xorg/share/fonts/misc/font-sun-misc/Makefile Sun Sep 22 09:34:57 2024
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2024/09/22 09:34:57 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= misc
+FONTSRCPKG= font-sun-misc
+
+.PATH: ${X11SRCDIR.${FONTSRCPKG}}
+BDFFILES+= olcursor.bdf \
+ olgl10.bdf \
+ olgl12.bdf \
+ olgl14.bdf \
+ olgl19.bdf
+
+.include "../../Makefile.bdf"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
