Module Name: xsrc
Committed By: mrg
Date: Wed Mar 19 23:45:22 UTC 2014
Modified Files:
xsrc/external/mit/xorg-cf-files/dist: Imake.cf NetBSD.cf X11.tmpl
Removed Files:
xsrc/external/mit/xkbutils/dist: xkbbell.man xkbvleds.man xkbwatch.man
xsrc/external/mit/xkill/dist: AUTHORS NEWS xkill.man
xsrc/external/mit/xorg-cf-files/dist: xprint_host.def
Log Message:
merge util-macros 1.18.0, xkbutils 1.0.4, xkill 1.0.4, and
xorg-cf-files 1.0.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbutils/dist/xkbbell.man \
xsrc/external/mit/xkbutils/dist/xkbvleds.man \
xsrc/external/mit/xkbutils/dist/xkbwatch.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkill/dist/AUTHORS \
xsrc/external/mit/xkill/dist/NEWS xsrc/external/mit/xkill/dist/xkill.man
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-cf-files/dist/Imake.cf \
xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorg-cf-files/dist/xprint_host.def
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-cf-files/dist/Imake.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.4 xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.5
--- xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.4 Mon Feb 21 04:09:07 2011
+++ xsrc/external/mit/xorg-cf-files/dist/Imake.cf Wed Mar 19 23:45:21 2014
@@ -2,14 +2,14 @@ XCOMM $XdotOrg: xc/config/cf/Imake.cf,v
XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
/*
* To add support for another platform:
- *
- * 1. Identify a machine-specific cpp symbol. If your preprocessor
+ *
+ * 1. Identify a machine-specific cpp symbol. If your preprocessor
* does not have any built in, you will need to add the symbol to the
* cpp_argv table in config/imake/imakemdep.h and rebuild imake with
* the BOOTSTRAPCFLAGS variable set (see the macII for an example).
*
* 2. Add all machine-specific cpp symbols (either defined by you or by
- * the preprocessor or compiler) to the predefs table in
+ * the preprocessor or compiler) to the predefs table in
* config/imake/imakemdep.h.
*
* 3. But a new #ifdef block below that defines MacroIncludeFile and
@@ -174,7 +174,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# define Mvme68kArchitecture
# undef mvme68k
# endif
-# if defined(sun3)
+# if defined(sun3)
# define Sun3Architecture
# undef sun3
# endif
@@ -623,7 +623,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
#ifdef MOTOROLA
# define MacroIncludeFile <moto.cf>
# define MacroFile moto.cf
-# undef MOTOROLA
+# undef MOTOROLA
# ifdef SYSV
# define MotoR3Architecture
# endif
@@ -651,8 +651,8 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# ifdef i386
# undef i386
# ifdef ISC
-# define i386Architecture
-# define i386SVR3Architecture
+# define i386Architecture
+# define i386SVR3Architecture
# define MacroIncludeFile <isc.cf>
# define MacroFile isc.cf
# define i386IscArchitecture
@@ -694,8 +694,8 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# undef SVR4
# else /* ! SVR4 */
# ifdef ISC
-# define i386Architecture
-# define i386SVR3Architecture
+# define i386Architecture
+# define i386SVR3Architecture
# define MacroIncludeFile <isc.cf>
# define MacroFile isc.cf
# define i386IscArchitecture
@@ -950,9 +950,9 @@ XCOMM Keep cpp from replacing path eleme
# endif
# undef __sparc__
# endif
-# ifdef ia64
+# ifdef ia64
# define ia64Architecture
-# undef ia64
+# undef ia64
# endif
# ifdef __ia64__
# ifndef ia64Architecture
@@ -1027,6 +1027,10 @@ XCOMM Keep cpp from replacing path eleme
# define AMD64Architecture
# endif
# endif
+# if defined(__aarch64__)
+# define AArch64Architecture
+# undef __aarch64__
+# endif
#endif /* linux || __GLIBC__ */
#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
@@ -1098,7 +1102,7 @@ XCOMM Keep cpp from replacing path eleme
# define NecArchitecture
#endif
-#ifdef minix
+#ifdef minix
#define MacroIncludeFile <minix.cf>
#define MacroFile minix.cf
#undef minix
Index: xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
diff -u xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.4 xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.5
--- xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.4 Mon Feb 21 04:09:07 2011
+++ xsrc/external/mit/xorg-cf-files/dist/X11.tmpl Wed Mar 19 23:45:21 2014
@@ -65,7 +65,7 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v
# define XOrgWebSupportAddress http://wiki.X.Org
#endif
-XORGRELSTRING = XorgManVersionString
+XORGRELSTRING = XorgManVersionString
XORGMANNAME = XOrgManNameString
#ifndef XOrgManDefs
@@ -118,11 +118,11 @@ XORGRELSTRING = XorgManVersionString
#ifndef HasXServer
#define HasXServer YES
#endif
-/* xorg.cf sets XorgServer to YES - to build Xorg you must include xorg.cf
+/* xorg.cf sets XorgServer to YES - to build Xorg you must include xorg.cf
* from the .cf file for your platform.
*/
#ifndef XorgServer
-#define XorgServer NO
+#define XorgServer NO
#endif
#ifndef BuildServer
#define BuildServer HasXServer
@@ -1757,7 +1757,7 @@ XCOMM X Window System make variables; th
TRANSCOMMSRC = $(LIBSRC)/xtrans
TRANS_INCLUDES = -I$(TRANSCOMMSRC)
CONNECTION_FLAGS = ConnectionFlags ExtraConnectionDefs
-XTRANS_FAILDEFINES = XtransFailDefine
+XTRANS_FAILDEFINES = XtransFailDefine
#ifdef X11ProjectRoot
XPROJECTROOT = X11ProjectRoot
#endif
@@ -1775,7 +1775,7 @@ VENDORSUPPORTDEFS = VendorSupportDefines
XKBDEFRULES = XkbDefaultRulesFile
XKBDEFRULESDEFS = XkbDefRulesDefines
-
+
XCONFIGFILE = XConfigFile
XCONFIGDIR = XConfigDir
XLOGFILE = XLogFile
@@ -2427,7 +2427,7 @@ ProjectUnsharedLibReferences(XONLY,X11,$
#define ProfileLibGlx NO
#endif
/*
- * Only make a shared GLw library on systems with Weak symbols
+ * Only make a shared GLw library on systems with Weak symbols
* because it depends on Motif. See xc/lib/GLw/README.txt for details
*/
#if BuildGLwLibrary
@@ -3432,7 +3432,7 @@ MOTIFLIB = -L$(MOTIFLIBDIR) LinkerRuntim
#endif
#if MotifIncDirStandard
-MOTIFINCLUDES =
+MOTIFINCLUDES =
#else
MOTIFINCLUDES = -I$(MOTIFINCDIR)
#endif
@@ -3922,7 +3922,7 @@ ProjectUnsharedLibReferences(XKBUI,xkbui
#ifndef SharedxrxRev
# define SharedxrxRev 6.8
-#endif
+#endif
#ifndef SharedxrxnestRev
# define SharedxrxnestRev 6.8
@@ -4376,7 +4376,7 @@ clean:: @@\
#endif
#endif
-/*
+/*
* InstallXpPMFLink - install link for a Xprint PMF "font" from one
* print model to another
*/
@@ -4384,7 +4384,7 @@ clean:: @@\
#define InstallXpPMFLink(fontfilename,srcmodelfontdir,destmodelfontdir) @@\
InstallLink(install,srcmodelfontdir/fontfilename,fontfilename,destmodelfontdir)
#endif /* InstallXpPMFLink */
-/*
+/*
* InstallXpMultiplePMFLinks - install multiple links for PMF fonts
* from one print model to another
*/
Index: xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.7 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.8
--- xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.7 Thu Jan 5 19:27:36 2012
+++ xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf Wed Mar 19 23:45:21 2014
@@ -71,7 +71,7 @@ XCOMM operating system: OSName (OSMajor
#endif
/* Mkstemp is there since 1.2 (at least) */
#if (!(OSMajorVersion == 0 || \
- (OSMajorVersion == 1 && OSMinorVersion < 2)))
+ (OSMajorVersion == 1 && OSMinorVersion < 2)))
#define HasMkstemp YES
#endif
/* But the standalone mktemp doesn't exist before NetBSD 1.5*/
@@ -87,7 +87,7 @@ XCOMM operating system: OSName (OSMajor
# endif
#endif
-#if (OSMajorVersion == 1 && OSMinorVersion >= 5 || OSMajorVersion > 1)
+#if (OSMajorVersion == 1 && OSMinorVersion >= 5 || OSMajorVersion > 1)
#define HasGetIfAddrs YES
#endif
@@ -130,7 +130,7 @@ XCOMM operating system: OSName (OSMajor
# endif
# define SystemMTDefines -D_REENTRANT
# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-#else
+#else
# define ThreadedX NO
#endif
@@ -192,7 +192,7 @@ XCOMM operating system: OSName (OSMajor
* XXX May not be correct on NetBSD/pmax (ELF, but might not have
* working shared libs).
*
- * Disabled for NetBSD/vax until I figure out the scheme. --CS
+ * Disabled for NetBSD/vax until I figure out the scheme. --CS
*/
#if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
defined(PpcArchitecture) || defined(AMD64Architecture)
@@ -212,7 +212,7 @@ XCOMM operating system: OSName (OSMajor
#endif
/* All ELF NetBSD systems support Weak symbols */
-#define HasWeakSymbols UseElfFormat
+#define HasWeakSymbols UseElfFormat
#ifdef i386Architecture
# ifndef DefaultGcc2i386Opt
@@ -254,7 +254,7 @@ XCOMM operating system: OSName (OSMajor
# ifndef XFree86ConsoleDefines
# if (OSMajorVersion == 1 && ((OSMinorVersion == 3 && OSTeenyVersion >= 6) \
|| OSMinorVersion >= 4) \
- || OSMajorVersion >= 2)
+ || OSMajorVersion >= 2)
# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT -DWSCONS_SUPPORT
# else
# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
@@ -327,7 +327,7 @@ XCOMM operating system: OSName (OSMajor
#ifndef HasZlib
#define HasZlib YES
#endif
-#endif
+#endif
#define AdmDir /var/log
@@ -336,7 +336,7 @@ XCOMM operating system: OSName (OSMajor
/* NetBSD doesn't have gperf in the base install */
#define DontRebuildGperfOutput YES
-/*
+/*
* NetBSD doesn't have perl in default system
* you may override this in host.def if you installed perl from the packages
*/
@@ -453,8 +453,8 @@ XCOMM operating system: OSName (OSMajor
/*
* ForceSubdirs - force make to build subdirectories
- *
- * For BSD 4.4 make
+ *
+ * For BSD 4.4 make
*/
#define ForceSubdirs(dirs) @@\
dirs: .EXEC @@\
@@ -577,7 +577,7 @@ InstallManPageAliasesBase(file,destdir,a
#ifndef HasSharedLibraries
#define HasSharedLibraries NO
-#endif
+#endif
/*
* Unresolved references are fatal on NetBSD 1.5 for libGL, which is
@@ -614,9 +614,9 @@ InstallManPageAliasesBase(file,destdir,a
#endif
/*
- * XFree86 uses its own (more portable) database routines to speed up
+ * XFree86 uses its own (more portable) database routines to speed up
* the RGB database lookups
- * However, if you want to use ndbm anyway, you can set that to NO in
+ * However, if you want to use ndbm anyway, you can set that to NO in
* site.def
*/
#ifndef UseRgbTxt
@@ -670,9 +670,9 @@ sed 's/\.[0-9]*$$//'`
#define BuildServer NO
#endif
-/*
- * General settings for all platforms
- */
+/*
+ * General settings for all platforms
+ */
#ifndef SharedLibXdmGreet
#define SharedLibXdmGreet NO
#endif
