sync with OpenBSD -current
This commit is contained in:
parent
5d45cd7ee8
commit
155eb8555e
5506 changed files with 1786257 additions and 1416034 deletions
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
#
|
||||
# Copyright 2005 Red Hat, Inc.
|
||||
#
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
# the above copyright notice appear in all copies and that both that
|
||||
|
@ -10,7 +10,7 @@
|
|||
# specific, written prior permission. Red Hat makes no
|
||||
# representations about the suitability of this software for any purpose. It
|
||||
# is provided "as is" without express or implied warranty.
|
||||
#
|
||||
#
|
||||
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
|
|
6
app/fonttosfnt/config.guess
vendored
6
app/fonttosfnt/config.guess
vendored
|
@ -209,9 +209,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:SecBSD:*:*)
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
|
||||
echo ${UNAME_MACHINE_ARCH}-unknown-secbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
|
||||
echo ${UNAME_MACHINE_ARCH}-unknown-secbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:ekkoBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
|
|
|
@ -189,7 +189,7 @@ readFile(char *filename, FontPtr font)
|
|||
if(strcmp(face->style_name, "Regular") == 0)
|
||||
full_name = sprintf_alloc("%s", family_name);
|
||||
else
|
||||
full_name = sprintf_alloc("%s %s",
|
||||
full_name = sprintf_alloc("%s %s",
|
||||
family_name, face->style_name);
|
||||
|
||||
/* The unique name doesn't actually need to be globally
|
||||
|
@ -202,12 +202,12 @@ readFile(char *filename, FontPtr font)
|
|||
face->available_sizes[0].height)
|
||||
unique_name = sprintf_alloc("%s "XVENDORNAMESHORT
|
||||
" bitmap size %d",
|
||||
full_name,
|
||||
full_name,
|
||||
face->available_sizes[0].height);
|
||||
else
|
||||
unique_name = sprintf_alloc("%s "XVENDORNAMESHORT
|
||||
" bitmap size %dx%d",
|
||||
full_name,
|
||||
full_name,
|
||||
face->available_sizes[0].width,
|
||||
face->available_sizes[0].height);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue