Module Name: src
Committed By: riz
Date: Mon Apr 9 18:03:50 UTC 2012
Modified Files:
src/sys/dev/wsfont [netbsd-6]: files.wsfont wsfont.c
Removed Files:
src/sys/dev/wsfont [netbsd-6]: FreeMono_12x22.h
Log Message:
Pull up following revision(s) (requested by macallan in ticket #169):
sys/dev/wsfont/FreeMono_12x22.h: file removal
sys/dev/wsfont/wsfont.c: revision 1.55
sys/dev/wsfont/files.wsfont: revision 1.19
remove the FreeMono font for licensing reasons
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/sys/dev/wsfont/FreeMono_12x22.h
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/dev/wsfont/files.wsfont
cvs rdiff -u -r1.54 -r1.54.2.1 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/files.wsfont
diff -u src/sys/dev/wsfont/files.wsfont:1.18 src/sys/dev/wsfont/files.wsfont:1.18.2.1
--- src/sys/dev/wsfont/files.wsfont:1.18 Wed Dec 28 18:29:48 2011
+++ src/sys/dev/wsfont/files.wsfont Mon Apr 9 18:03:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.wsfont,v 1.18 2011/12/28 18:29:48 macallan Exp $
+# $NetBSD: files.wsfont,v 1.18.2.1 2012/04/09 18:03:50 riz Exp $
defpseudo wsfont
@@ -24,6 +24,5 @@ defflag opt_wsfont.h FONT_BOLD8x16
FONT_DEJAVU_SANS_MONO12x22
FONT_DROID_SANS_MONO12x22
FONT_DROID_SANS_MONO9x18
- FONT_FREEMONO12x22
file dev/wsfont/wsfontdev.c wsfont needs-flag
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.54 src/sys/dev/wsfont/wsfont.c:1.54.2.1
--- src/sys/dev/wsfont/wsfont.c:1.54 Fri Jan 13 16:08:02 2012
+++ src/sys/dev/wsfont/wsfont.c Mon Apr 9 18:03:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.54 2012/01/13 16:08:02 macallan Exp $ */
+/* $NetBSD: wsfont.c,v 1.54.2.1 2012/04/09 18:03:50 riz Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.54 2012/01/13 16:08:02 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.54.2.1 2012/04/09 18:03:50 riz Exp $");
#include "opt_wsfont.h"
@@ -127,10 +127,6 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1
#include <dev/wsfont/Droid_Sans_Mono_9x18.h>
#endif
-#ifdef FONT_FREEMONO12x22
-#include <dev/wsfont/FreeMono_12x22.h>
-#endif
-
/* Make sure we always have at least one bitmap font. */
#ifndef HAVE_FONT
#define HAVE_FONT 1
@@ -220,9 +216,6 @@ static struct font builtin_fonts[] = {
#ifdef FONT_DROID_SANS_MONO9x18
{ { NULL, NULL }, &Droid_Sans_Mono_9x18, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
-#ifdef FONT_FREEMONO12x22
- { { NULL, NULL }, &FreeMono_12x22, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
-#endif
{ { NULL, NULL }, NULL, 0, 0, 0 },
};
