Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

8 files changed, 32 insertions, 21 deletions

diff --git a/env.c b/env.c
index 5d4e567..a5da90c 100644
--- a/env.c
+++ b/env.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  */
 
-/* $XFree86: xc/programs/fonttosfnt/env.c,v 1.1 2003/07/08 15:39:49 tsi Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/env.c,v 1.1 2002/03/05 03:52:34 dawes Exp $ */
 
 
 #include <stdlib.h>
diff --git a/fonttosfnt.c b/fonttosfnt.c
index ca11696..e8e41b0 100644
--- a/fonttosfnt.c
+++ b/fonttosfnt.c
@@ -19,7 +19,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.4 2003/12/19 02:16:36 dawes Exp $ */
+/* $XdotOrg: xc/programs/fonttosfnt/fonttosfnt.c,v 1.4 2003/12/19 02:16:36 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.3 2003/07/08 15:39:49 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fonttosfnt.h b/fonttosfnt.h
index 128d2cc..b7392a7 100644
--- a/fonttosfnt.h
+++ b/fonttosfnt.h
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.h,v 1.5 2003/11/21 05:22:09 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.h,v 1.4 2003/10/24 20:38:11 tsi Exp $ */
 
 #ifndef _FONTTOSFNT_H_
 #define _FONTTOSFNT_H_ 1
diff --git a/fonttosfnt.man b/fonttosfnt.man
index e4c72b1..5bc5ef2 100644
--- a/fonttosfnt.man
+++ b/fonttosfnt.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/fonttosfnt/fonttosfnt.man,v 1.3 2003/07/08 15:39:49 tsi Exp $
+.\" $XFree86$
 .TH FONTTOSFNT 1 __vendorversion__
 .SH NAME
 fonttosfnt \- Wrap a bitmap font in a sfnt (TrueType) wrapper
@@ -69,8 +69,10 @@ Some of the font-level values, notably sub- and superscript positions,
 are dummy values.
 .SH SEE ALSO
 X(7), Xserver(1), Xft(3x).
-.I Fonts in XFree86.
+.I Fonts in X.
 .SH AUTHOR
+The version of
 .B Fonttosfnt
-was written by Juliusz Chroboczek <jch@xfree86.org> for the XFree86
-project.
+included in this X.Org Foundation release
+was originally written by Juliusz Chroboczek <jch@xfree86.org>
+for the XFree86 project.
diff --git a/read.c b/read.c
index b24cc03..abf8d20 100644
--- a/read.c
+++ b/read.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
 Copyright (c) 2002 by Juliusz Chroboczek
 
@@ -19,7 +20,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.6 2003/12/19 02:16:36 dawes Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.5 2003/12/19 02:05:39 dawes Exp $ */
 
 #include <stdio.h>
 
@@ -116,14 +118,17 @@ readFile(char *filename, FontPtr font)
            unique; it only needs to be unique among all installed fonts on a
            Windows system.  We don't bother getting it quite right. */
         if(face->num_fixed_sizes <= 0)
-            unique_name = sprintf_reliable("%s XFree86 bitmap", full_name);
+            unique_name = sprintf_reliable("%s "XVENDORNAMESHORT" bitmap"
+					   , full_name);
         else if(face->available_sizes[0].width == 
                 face->available_sizes[0].height)
-            unique_name = sprintf_reliable("%s XFree86 bitmap size %d",
+            unique_name = sprintf_reliable("%s "XVENDORNAMESHORT
+					   " bitmap size %d",
                                            full_name, 
                                            face->available_sizes[0].height);
         else
-            unique_name = sprintf_reliable("%s XFree86 bitmap size %dx%d",
+            unique_name = sprintf_reliable("%s "XVENDORNAMESHORT
+					   " bitmap size %dx%d",
                                            full_name, 
                                            face->available_sizes[0].width,
                                            face->available_sizes[0].height);
@@ -177,15 +182,17 @@ readFile(char *filename, FontPtr font)
         }
 
         font->names[i].nid = 10;
-        font->names[i].size = 2 * strlen("XFree86 converted bitmap font");
-        font->names[i].value = makeUTF16("XFree86 converted bitmap font");
+        font->names[i].size = 2 * strlen(XVENDORNAMESHORT
+					 " converted bitmap font");
+        font->names[i].value = makeUTF16(XVENDORNAMESHORT
+					 "X converted bitmap font");
         i++;
-
+#ifdef __VENDORWEBSUPPORT__
         font->names[i].nid = 11;
-        font->names[i].size = 2 * strlen("http://www.xfree86.org");
-        font->names[i].value = makeUTF16("http://www.xfree86.org");
+        font->names[i].size = 2 * strlen(__VENDORWEBSUPPORT__);
+        font->names[i].value = makeUTF16(__VENDORWEBSUPPORT__);
         i++;
-
+#endif
         font->numNames = i;
 
         font->flags = faceFlags(face) | (symbol ? FACE_SYMBOL : 0);
diff --git a/struct.c b/struct.c
index 7622e06..2d346e6 100644
--- a/struct.c
+++ b/struct.c
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/struct.c,v 1.4 2003/11/21 05:22:09 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/struct.c,v 1.3 2003/10/24 20:38:11 tsi Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/util.c b/util.c
index d408d70..c40cc32 100644
--- a/util.c
+++ b/util.c
@@ -19,7 +19,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */
+/* $XdotOrg: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.10 2003/12/19 02:05:39 dawes Exp $ */
 
 #include <time.h>
 #include <string.h>
diff --git a/write.c b/write.c
index 9a51d49..42ccec3 100644
--- a/write.c
+++ b/write.c
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/write.c,v 1.5 2003/10/24 20:38:11 tsi Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/write.c,v 1.4tsi Exp $ */
 
 #if defined(linux) && !defined(_GNU_SOURCE)
 /* for fwrite_unlocked and fread_unlocked */
@@ -1030,7 +1030,7 @@ writeOS2(FILE* out, FontPtr font)
 static int 
 writePCLT(FILE* out, FontPtr font)
 {
-    char name[16] = "XFree86 font    ";
+    char name[16] = XVENDORNAME" font    ";
     char filename[6] = "X11R00";
     unsigned char charComplement[8] = 
         {0xFF, 0xFF, 0xFF, 0xFF, 0x0B, 0xFF, 0xFF, 0xFE};