[src/netbsd-6]: src/sys/dev/wsfont Pull up revisions:

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bda8f1321d95
branches:  netbsd-6
changeset: 774300:bda8f1321d95
user:      jdc <jdc%NetBSD.org@localhost>
date:      Wed Jul 04 21:02:42 2012 +0000

description:
Pull up revisions:
  src/sys/dev/wsfont/Droid_Sans_Mono_12x22.h revision 1.2
  src/sys/dev/wsfont/Droid_Sans_Mono_9x18.h revision 1.2
  src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h revision 1.2
(requested by macallan in ticket #389).

add license headers
I need to find a way to extract at least the copyright notice from
the .ttf
file so ttf2wsfont can do this mostly automatically.

add license header

diffstat:

 sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h |  85 +++++++++++++++++++++++++++++++++
 sys/dev/wsfont/Droid_Sans_Mono_12x22.h  |  16 ++++++
 sys/dev/wsfont/Droid_Sans_Mono_9x18.h   |  16 ++++++
 3 files changed, 117 insertions(+), 0 deletions(-)

diffs (138 lines):

diff -r 8cd6248d1e63 -r bda8f1321d95 sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h
--- a/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h   Wed Jul 04 20:58:27 2012 +0000
+++ b/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h   Wed Jul 04 21:02:42 2012 +0000
@@ -1,3 +1,88 @@
+/*
+ * Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
+ * Bitstream Vera is a trademark of Bitstream, Inc. 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of the fonts accompanying this license ("Fonts") and associated
+ * documentation files (the "Font Software"), to reproduce and distribute the
+ * Font Software, including without limitation the rights to use, copy, merge,
+ * publish, distribute, and/or sell copies of the Font Software, and to permit
+ * persons to whom the Font Software is furnished to do so, subject to the
+ * following conditions: 
+ *
+ * - The above copyright and trademark notices and this permission notice shall
+ *   be included in all copies of one or more of the Font Software typefaces. 
+ *
+ * - The Font Software may be modified, altered, or added to, and in particular
+ *   the designs of glyphs or characters in the Fonts may be modified and
+ *   additional glyphs or characters may be added to the Fonts, only if the
+ *   fonts are renamed to names not containing either the words "Bitstream" or
+ *   the word "Vera".
+ *
+ * This License becomes null and void to the extent applicable to Fonts or Font
+ * Software that has been modified and is distributed under the "Bitstream
+ * Vera" names. 
+ *
+ * The Font Software may be sold as part of a larger software package but no
+ * copy of one or more of the Font Software typefaces may be sold by itself. 
+ *
+ * THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+ * TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+ * FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ * ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+ * FONT SOFTWARE. 
+ *
+ * Except as contained in this notice, the names of Gnome, the Gnome
+ * Foundation, and Bitstream Inc., shall not be used in advertising or
+ * otherwise to promote the sale, use or other dealings in this Font Software
+ * without prior written authorization from the Gnome Foundation or
+ * Bitstream Inc., respectively. For further information, contact:
+ * fonts at gnome dot org.
+ *
+ * Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of the fonts accompanying this license ("Fonts") and associated
+ * documentation files (the "Font Software"), to reproduce and distribute the
+ * modifications to the Bitstream Vera Font Software, including without
+ * limitation the rights to use, copy, merge, publish, distribute, and/or sell
+ * copies of the Font Software, and to permit persons to whom the Font Software
+ * is furnished to do so, subject to the following conditions: 
+ *
+ * - The above copyright and trademark notices and this permission notice shall
+ *   be included in all copies of one or more of the Font Software typefaces. 
+ * - The Font Software may be modified, altered, or added to, and in particular
+ *   the designs of glyphs or characters in the Fonts may be modified and
+ *   additional glyphs or characters may be added to the Fonts, only if the
+ *   fonts are renamed to names not containing either the words "Tavmjong Bah"
+ *   or the word "Arev". 
+ *
+ * This License becomes null and void to the extent applicable to Fonts or Font
+ * Software that has been modified and is distributed under the "Tavmjong Bah
+ * Arev" names. 
+ *
+ * The Font Software may be sold as part of a larger software package but no
+ * copy of one or more of the Font Software typefaces may be sold by itself. 
+ *
+ * THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+ * TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL TAVMJONG BAH BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT,
+ * INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+ * SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. 
+ *
+ * Except as contained in this notice, the name of Tavmjong Bah shall not be
+ * used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Font Software without prior written authorization from
+ * Tavmjong Bah. For further information, contact: tavmjong @ free . fr.
+ */
+
 static u_char DejaVu_Sans_Mono_12x22_data[];
 
 static struct wsdisplay_font DejaVu_Sans_Mono_12x22 = {
diff -r 8cd6248d1e63 -r bda8f1321d95 sys/dev/wsfont/Droid_Sans_Mono_12x22.h
--- a/sys/dev/wsfont/Droid_Sans_Mono_12x22.h    Wed Jul 04 20:58:27 2012 +0000
+++ b/sys/dev/wsfont/Droid_Sans_Mono_12x22.h    Wed Jul 04 21:02:42 2012 +0000
@@ -1,3 +1,19 @@
+/*
+   Copyright 2010 Ascender Corporation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 static u_char Droid_Sans_Mono_12x22_data[];
 
 static struct wsdisplay_font Droid_Sans_Mono_12x22 = {
diff -r 8cd6248d1e63 -r bda8f1321d95 sys/dev/wsfont/Droid_Sans_Mono_9x18.h
--- a/sys/dev/wsfont/Droid_Sans_Mono_9x18.h     Wed Jul 04 20:58:27 2012 +0000
+++ b/sys/dev/wsfont/Droid_Sans_Mono_9x18.h     Wed Jul 04 21:02:42 2012 +0000
@@ -1,3 +1,19 @@
+/*
+   Copyright 2010 Ascender Corporation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 static u_char Droid_Sans_Mono_9x18_data[];
 
 static struct wsdisplay_font Droid_Sans_Mono_9x18 = {