Module Name: src
Committed By: jakllsch
Date: Sun Apr 11 02:41:39 UTC 2010
Modified Files:
src/distrib/sets/lists/xfont: mi
src/external/mit/xorg/share/fonts: Makefile.dpi
src/external/mit/xorg/share/fonts/100dpi: Makefile
src/external/mit/xorg/share/fonts/75dpi: Makefile
Added Files:
src/external/mit/xorg/share/fonts/100dpi/font-adobe-symbol-100dpi:
Makefile
src/external/mit/xorg/share/fonts/75dpi/font-adobe-symbol-75dpi:
Makefile
Log Message:
Install 'symbol' from font-adobe-(75|100)dpi.
Should fix some symbols in xcalc.
To do: transform these and other currently-installed-only-as-bdf fonts
to pcf.gz.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xfont/mi
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/share/fonts/Makefile.dpi
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/share/fonts/100dpi/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/100dpi/font-adobe-symbol-100dpi/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/share/fonts/75dpi/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/75dpi/font-adobe-symbol-75dpi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xfont/mi
diff -u src/distrib/sets/lists/xfont/mi:1.38 src/distrib/sets/lists/xfont/mi:1.39
--- src/distrib/sets/lists/xfont/mi:1.38 Thu Jan 14 13:47:42 2010
+++ src/distrib/sets/lists/xfont/mi Sun Apr 11 02:41:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.38 2010/01/14 13:47:42 wiz Exp $
+# $NetBSD: mi,v 1.39 2010/04/11 02:41:38 jakllsch Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6141,6 +6141,12 @@
./usr/X11R7/lib/X11/fonts/100dpi/ncenR24-ISO8859-4.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/ncenR24-ISO8859-9.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/ncenR24.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb08.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb10.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb12.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb14.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb18.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb24.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/tech14.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/techB14.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/term14.bdf xfont share,xorg,x11fonts
@@ -8033,6 +8039,12 @@
./usr/X11R7/lib/X11/fonts/75dpi/ncenR24-ISO8859-4.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/ncenR24-ISO8859-9.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/ncenR24.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb08.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb10.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb12.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb14.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb18.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb24.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/tech14.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/techB14.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/term14.bdf xfont share,xorg,x11fonts
Index: src/external/mit/xorg/share/fonts/Makefile.dpi
diff -u src/external/mit/xorg/share/fonts/Makefile.dpi:1.1.1.1 src/external/mit/xorg/share/fonts/Makefile.dpi:1.2
--- src/external/mit/xorg/share/fonts/Makefile.dpi:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/share/fonts/Makefile.dpi Sun Apr 11 02:41:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.dpi,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile.dpi,v 1.2 2010/04/11 02:41:38 jakllsch Exp $
# Files installed by both 75dpi and 100dpi packages.
@@ -41,6 +41,10 @@
.endfor
.endfor
+ADOBE_SYMBOL_SRCS= symb08 symb10 symb12 symb14 symb18 symb24
+.for _s in ${ADOBE_SYMBOL_SRCS}
+ADOBE_SYMBOL_FILES+= ${_s}.bdf
+.endfor
BH_SRCS= luBIS08 luBIS10 luBIS12 luBIS14 luBIS18 luBIS19 luBIS24 \
luBS08 luBS10 luBS12 luBS14 luBS18 luBS19 luBS24 \
Index: src/external/mit/xorg/share/fonts/100dpi/Makefile
diff -u src/external/mit/xorg/share/fonts/100dpi/Makefile:1.1.1.1 src/external/mit/xorg/share/fonts/100dpi/Makefile:1.2
--- src/external/mit/xorg/share/fonts/100dpi/Makefile:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/share/fonts/100dpi/Makefile Sun Apr 11 02:41:39 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/04/11 02:41:39 jakllsch Exp $
-SUBDIR= font-adobe-100dpi font-adobe-utopia-100dpi font-bh-100dpi \
- font-bh-lucidatypewriter-100dpi font-bitstream-100dpi
+SUBDIR= font-adobe-100dpi font-adobe-symbol-100dpi font-adobe-utopia-100dpi \
+ font-bh-100dpi font-bh-lucidatypewriter-100dpi font-bitstream-100dpi
FONTSUBDIR= 100dpi
Index: src/external/mit/xorg/share/fonts/75dpi/Makefile
diff -u src/external/mit/xorg/share/fonts/75dpi/Makefile:1.1.1.1 src/external/mit/xorg/share/fonts/75dpi/Makefile:1.2
--- src/external/mit/xorg/share/fonts/75dpi/Makefile:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/share/fonts/75dpi/Makefile Sun Apr 11 02:41:39 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/04/11 02:41:39 jakllsch Exp $
-SUBDIR= font-adobe-75dpi font-adobe-utopia-75dpi font-bh-75dpi \
- font-bh-lucidatypewriter-75dpi font-bitstream-75dpi
+SUBDIR= font-adobe-75dpi font-adobe-symbol-75dpi font-adobe-utopia-75dpi \
+ font-bh-75dpi font-bh-lucidatypewriter-75dpi font-bitstream-75dpi
FONTSUBDIR= 75dpi
Added files:
Index: src/external/mit/xorg/share/fonts/100dpi/font-adobe-symbol-100dpi/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/100dpi/font-adobe-symbol-100dpi/Makefile:1.1
--- /dev/null Sun Apr 11 02:41:39 2010
+++ src/external/mit/xorg/share/fonts/100dpi/font-adobe-symbol-100dpi/Makefile Sun Apr 11 02:41:39 2010
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2010/04/11 02:41:39 jakllsch Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= 100dpi
+FONTSRCPKG= font-adobe-100dpi
+
+.include "../../Makefile.dpi"
+FILES= ${ADOBE_SYMBOL_FILES}
+
+.include "../../Makefile.font"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/fonts/75dpi/font-adobe-symbol-75dpi/Makefile
diff -u /dev/null src/external/mit/xorg/share/fonts/75dpi/font-adobe-symbol-75dpi/Makefile:1.1
--- /dev/null Sun Apr 11 02:41:39 2010
+++ src/external/mit/xorg/share/fonts/75dpi/font-adobe-symbol-75dpi/Makefile Sun Apr 11 02:41:39 2010
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2010/04/11 02:41:39 jakllsch Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR= 75dpi
+FONTSRCPKG= font-adobe-75dpi
+
+.include "../../Makefile.dpi"
+FILES= ${ADOBE_SYMBOL_FILES}
+
+.include "../../Makefile.font"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
