Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

13 files changed, 1013 insertions, 935 deletions

diff --git a/libXau/.gitignore b/libXau/.gitignore
new file mode 100644
index 000000000..668956753
--- /dev/null
+++ b/libXau/.gitignore
@@ -0,0 +1,78 @@
+#

+#		X.Org module default exclusion patterns

+#		The next section if for module specific patterns

+#

+#	Do not edit the following section

+# 	GNU Build System (Autotools)

+aclocal.m4

+autom4te.cache/

+autoscan.log

+ChangeLog

+compile

+config.guess

+config.h

+config.h.in

+config.log

+config-ml.in

+config.py

+config.status

+config.status.lineno

+config.sub

+configure

+configure.scan

+depcomp

+.deps/

+INSTALL

+install-sh

+.libs/

+libtool

+libtool.m4

+ltmain.sh

+lt~obsolete.m4

+ltoptions.m4

+ltsugar.m4

+ltversion.m4

+Makefile

+Makefile.in

+mdate-sh

+missing

+mkinstalldirs

+*.pc

+py-compile

+stamp-h?

+symlink-tree

+texinfo.tex

+ylwrap

+

+#	Do not edit the following section

+# 	Edit Compile Debug Document Distribute

+*~

+*.[0-9]

+*.[0-9]x

+*.bak

+*.bin

+core

+*.dll

+*.exe

+*-ISO*.bdf

+*-JIS*.bdf

+*-KOI8*.bdf

+*.kld

+*.ko

+*.ko.cmd

+*.lai

+*.l[oa]

+*.[oa]

+*.obj

+*.patch

+*.so

+*.pcf.gz

+*.pdb

+*.tar.bz2

+*.tar.gz

+#

+#		Add & Override patterns for libXau 

+#

+#		Edit the following section as needed

+# For example, !report.pc overrides *.pc. See 'man gitignore'

+# 

diff --git a/libXau/AUTHORS b/libXau/AUTHORS
index a49197556..772f33a5b 100644
--- a/libXau/AUTHORS
+++ b/libXau/AUTHORS
@@ -1,3 +1,3 @@
-Keith Packard, X Consortium
-
-Some bug fixes, but not clear from where.
+Keith Packard, X Consortium

+

+Some bug fixes, but not clear from where.

diff --git a/libXau/AuDispose.c b/libXau/AuDispose.c
index 164fe947d..2a9b2f145 100644
--- a/libXau/AuDispose.c
+++ b/libXau/AuDispose.c
@@ -1,47 +1,47 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/Xauth.h>

-#include <stdlib.h>

-

-void

-XauDisposeAuth (Xauth *auth)

-{

-    if (auth) {

-	if (auth->address) (void) free (auth->address);

-	if (auth->number) (void) free (auth->number);

-	if (auth->name) (void) free (auth->name);

-	if (auth->data) {

-	    (void) bzero (auth->data, auth->data_length);

-	    (void) free (auth->data);

-	}

-	free ((char *) auth);

-    }

-    return;

-}

+/*
+
+Copyright 1988, 1998  The Open Group
+
+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
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xauth.h>
+#include <stdlib.h>
+
+void
+XauDisposeAuth (Xauth *auth)
+{
+    if (auth) {
+	if (auth->address) (void) free (auth->address);
+	if (auth->number) (void) free (auth->number);
+	if (auth->name) (void) free (auth->name);
+	if (auth->data) {
+	    (void) bzero (auth->data, auth->data_length);
+	    (void) free (auth->data);
+	}
+	free ((char *) auth);
+    }
+    return;
+}
diff --git a/libXau/AuGetAddr.c b/libXau/AuGetAddr.c
index f26c58ba4..897d8b565 100644
--- a/libXau/AuGetAddr.c
+++ b/libXau/AuGetAddr.c
@@ -1,109 +1,109 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/Xauth.h>

-#include <X11/Xos.h>

-

-static int

-binaryEqual (_Xconst char *a, _Xconst char *b, int len)

-{

-    while (len--)

-	if (*a++ != *b++)

-	    return 0;

-    return 1;

-}

-

-Xauth *

-XauGetAuthByAddr (

-#if NeedWidePrototypes

-unsigned int	family,

-unsigned int	address_length,

-#else

-unsigned short	family,

-unsigned short	address_length,

-#endif

-_Xconst char*	address,

-#if NeedWidePrototypes

-unsigned int	number_length,

-#else

-unsigned short	number_length,

-#endif

-_Xconst char*	number,

-#if NeedWidePrototypes

-unsigned int	name_length,

-#else

-unsigned short	name_length,

-#endif

-_Xconst char*	name)

-{

-    FILE    *auth_file;

-    char    *auth_name;

-    Xauth   *entry;

-

-    auth_name = XauFileName ();

-    if (!auth_name)

-	return NULL;

-    if (access (auth_name, R_OK) != 0)		/* checks REAL id */

-	return NULL;

-    auth_file = fopen (auth_name, "rb");

-    if (!auth_file)

-	return NULL;

-    for (;;) {

-	entry = XauReadAuth (auth_file);

-	if (!entry)

-	    break;

-	/*

-	 * Match when:

-	 *   either family or entry->family are FamilyWild or

-	 *    family and entry->family are the same and

-	 *     address and entry->address are the same

-	 *  and

-	 *   either number or entry->number are empty or

-	 *    number and entry->number are the same

-	 *  and

-	 *   either name or entry->name are empty or

-	 *    name and entry->name are the same

-	 */

-

-	if ((family == FamilyWild || entry->family == FamilyWild ||

-	     (entry->family == family &&

-	      address_length == entry->address_length &&

-	      binaryEqual (entry->address, address, (int)address_length))) &&

-	    (number_length == 0 || entry->number_length == 0 ||

-	     (number_length == entry->number_length &&

-	      binaryEqual (entry->number, number, (int)number_length))) &&

-	    (name_length == 0 || entry->name_length == 0 ||

-	     (entry->name_length == name_length &&

- 	      binaryEqual (entry->name, name, (int)name_length))))

-	    break;

-	XauDisposeAuth (entry);

-    }

-    (void) fclose (auth_file);

-    return entry;

-}

+/*
+
+Copyright 1988, 1998  The Open Group
+
+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
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xauth.h>
+#include <X11/Xos.h>
+
+static int
+binaryEqual (_Xconst char *a, _Xconst char *b, int len)
+{
+    while (len--)
+	if (*a++ != *b++)
+	    return 0;
+    return 1;
+}
+
+Xauth *
+XauGetAuthByAddr (
+#if NeedWidePrototypes
+unsigned int	family,
+unsigned int	address_length,
+#else
+unsigned short	family,
+unsigned short	address_length,
+#endif
+_Xconst char*	address,
+#if NeedWidePrototypes
+unsigned int	number_length,
+#else
+unsigned short	number_length,
+#endif
+_Xconst char*	number,
+#if NeedWidePrototypes
+unsigned int	name_length,
+#else
+unsigned short	name_length,
+#endif
+_Xconst char*	name)
+{
+    FILE    *auth_file;
+    char    *auth_name;
+    Xauth   *entry;
+
+    auth_name = XauFileName ();
+    if (!auth_name)
+	return NULL;
+    if (access (auth_name, R_OK) != 0)		/* checks REAL id */
+	return NULL;
+    auth_file = fopen (auth_name, "rb");
+    if (!auth_file)
+	return NULL;
+    for (;;) {
+	entry = XauReadAuth (auth_file);
+	if (!entry)
+	    break;
+	/*
+	 * Match when:
+	 *   either family or entry->family are FamilyWild or
+	 *    family and entry->family are the same and
+	 *     address and entry->address are the same
+	 *  and
+	 *   either number or entry->number are empty or
+	 *    number and entry->number are the same
+	 *  and
+	 *   either name or entry->name are empty or
+	 *    name and entry->name are the same
+	 */
+
+	if ((family == FamilyWild || entry->family == FamilyWild ||
+	     (entry->family == family &&
+	      address_length == entry->address_length &&
+	      binaryEqual (entry->address, address, (int)address_length))) &&
+	    (number_length == 0 || entry->number_length == 0 ||
+	     (number_length == entry->number_length &&
+	      binaryEqual (entry->number, number, (int)number_length))) &&
+	    (name_length == 0 || entry->name_length == 0 ||
+	     (entry->name_length == name_length &&
+ 	      binaryEqual (entry->name, name, (int)name_length))))
+	    break;
+	XauDisposeAuth (entry);
+    }
+    (void) fclose (auth_file);
+    return entry;
+}
diff --git a/libXau/AuGetBest.c b/libXau/AuGetBest.c
index 7d001526f..673ee406a 100644
--- a/libXau/AuGetBest.c
+++ b/libXau/AuGetBest.c
@@ -1,170 +1,170 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/Xauth.h>

-#include <X11/Xos.h>

-#ifdef XTHREADS

-#include <X11/Xthreads.h>

-#endif

-#ifdef hpux

-#define X_INCLUDE_NETDB_H

-#define XOS_USE_NO_LOCKING

-#include <X11/Xos_r.h>

-#endif

-

-static int

-binaryEqual (_Xconst char *a, _Xconst char *b, int len)

-{

-    while (len--)

-	if (*a++ != *b++)

-	    return 0;

-    return 1;

-}

-

-Xauth *

-XauGetBestAuthByAddr (

-#if NeedWidePrototypes

-    unsigned int	family,

-    unsigned int	address_length,

-#else

-    unsigned short	family,

-    unsigned short	address_length,

-#endif

-    _Xconst char*	address,

-#if NeedWidePrototypes

-    unsigned int	number_length,

-#else

-    unsigned short	number_length,

-#endif

-    _Xconst char*	number,

-    int			types_length,

-    char**		types,

-    _Xconst int*	type_lengths)

-{

-    FILE    *auth_file;

-    char    *auth_name;

-    Xauth   *entry;

-    Xauth   *best;

-    int	    best_type;

-    int	    type;

-#ifdef hpux

-    char		*fully_qual_address;

-    unsigned short	fully_qual_address_length;

-#endif

-

-    auth_name = XauFileName ();

-    if (!auth_name)

-	return NULL;

-    if (access (auth_name, R_OK) != 0)		/* checks REAL id */

-	return NULL;

-    auth_file = fopen (auth_name, "rb");

-    if (!auth_file)

-	return NULL;

-

-#ifdef hpux

-    if (family == FamilyLocal) {

-#ifdef XTHREADS_NEEDS_BYNAMEPARAMS

-	_Xgethostbynameparams hparams;

-#endif

-	struct hostent *hostp;

-

-	/* make sure we try fully-qualified hostname */

-	if ((hostp = _XGethostbyname(address,hparams)) != NULL) {

-	    fully_qual_address = hostp->h_name;

-	    fully_qual_address_length = strlen(fully_qual_address);

-	}

-	else

-	{

-	    fully_qual_address = NULL;

-	    fully_qual_address_length = 0;

-	}

-    }

-#endif /* hpux */

-

-    best = NULL;

-    best_type = types_length;

-    for (;;) {

-	entry = XauReadAuth (auth_file);

-	if (!entry)

-	    break;

-	/*

-	 * Match when:

-	 *   either family or entry->family are FamilyWild or

-	 *    family and entry->family are the same and

-	 *     address and entry->address are the same

-	 *  and

-	 *   either number or entry->number are empty or

-	 *    number and entry->number are the same

-	 *  and

-	 *   either name or entry->name are empty or

-	 *    name and entry->name are the same

-	 */

-

-	if ((family == FamilyWild || entry->family == FamilyWild ||

-	     (entry->family == family &&

-	     ((address_length == entry->address_length &&

-	      binaryEqual (entry->address, address, (int)address_length))

-#ifdef hpux

-	     || (family == FamilyLocal &&

-		fully_qual_address_length == entry->address_length &&

-	     	binaryEqual (entry->address, fully_qual_address,

-		    (int) fully_qual_address_length))

-#endif

-	    ))) &&

-	    (number_length == 0 || entry->number_length == 0 ||

-	     (number_length == entry->number_length &&

-	      binaryEqual (entry->number, number, (int)number_length))))

-	{

-	    if (best_type == 0)

-	    {

-		best = entry;

-		break;

-	    }

-	    for (type = 0; type < best_type; type++)

-		if (type_lengths[type] == entry->name_length &&

-		    !(strncmp (types[type], entry->name, entry->name_length)))

-		{

-		    break;

-		}

-	    if (type < best_type)

-	    {

-		if (best)

-		    XauDisposeAuth (best);

-		best = entry;

-		best_type = type;

-		if (type == 0)

-		    break;

-		continue;

-	    }

-	}

-	XauDisposeAuth (entry);

-    }

-    (void) fclose (auth_file);

-    return best;

-}

+/*
+
+Copyright 1988, 1998  The Open Group
+
+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
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xauth.h>
+#include <X11/Xos.h>
+#ifdef XTHREADS
+#include <X11/Xthreads.h>
+#endif
+#ifdef hpux
+#define X_INCLUDE_NETDB_H
+#define XOS_USE_NO_LOCKING
+#include <X11/Xos_r.h>
+#endif
+
+static int
+binaryEqual (_Xconst char *a, _Xconst char *b, int len)
+{
+    while (len--)
+	if (*a++ != *b++)
+	    return 0;
+    return 1;
+}
+
+Xauth *
+XauGetBestAuthByAddr (
+#if NeedWidePrototypes
+    unsigned int	family,
+    unsigned int	address_length,
+#else
+    unsigned short	family,
+    unsigned short	address_length,
+#endif
+    _Xconst char*	address,
+#if NeedWidePrototypes
+    unsigned int	number_length,
+#else
+    unsigned short	number_length,
+#endif
+    _Xconst char*	number,
+    int			types_length,
+    char**		types,
+    _Xconst int*	type_lengths)
+{
+    FILE    *auth_file;
+    char    *auth_name;
+    Xauth   *entry;
+    Xauth   *best;
+    int	    best_type;
+    int	    type;
+#ifdef hpux
+    char		*fully_qual_address;
+    unsigned short	fully_qual_address_length;
+#endif
+
+    auth_name = XauFileName ();
+    if (!auth_name)
+	return NULL;
+    if (access (auth_name, R_OK) != 0)		/* checks REAL id */
+	return NULL;
+    auth_file = fopen (auth_name, "rb");
+    if (!auth_file)
+	return NULL;
+
+#ifdef hpux
+    if (family == FamilyLocal) {
+#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
+	_Xgethostbynameparams hparams;
+#endif
+	struct hostent *hostp;
+
+	/* make sure we try fully-qualified hostname */
+	if ((hostp = _XGethostbyname(address,hparams)) != NULL) {
+	    fully_qual_address = hostp->h_name;
+	    fully_qual_address_length = strlen(fully_qual_address);
+	}
+	else
+	{
+	    fully_qual_address = NULL;
+	    fully_qual_address_length = 0;
+	}
+    }
+#endif /* hpux */
+
+    best = NULL;
+    best_type = types_length;
+    for (;;) {
+	entry = XauReadAuth (auth_file);
+	if (!entry)
+	    break;
+	/*
+	 * Match when:
+	 *   either family or entry->family are FamilyWild or
+	 *    family and entry->family are the same and
+	 *     address and entry->address are the same
+	 *  and
+	 *   either number or entry->number are empty or
+	 *    number and entry->number are the same
+	 *  and
+	 *   either name or entry->name are empty or
+	 *    name and entry->name are the same
+	 */
+
+	if ((family == FamilyWild || entry->family == FamilyWild ||
+	     (entry->family == family &&
+	     ((address_length == entry->address_length &&
+	      binaryEqual (entry->address, address, (int)address_length))
+#ifdef hpux
+	     || (family == FamilyLocal &&
+		fully_qual_address_length == entry->address_length &&
+	     	binaryEqual (entry->address, fully_qual_address,
+		    (int) fully_qual_address_length))
+#endif
+	    ))) &&
+	    (number_length == 0 || entry->number_length == 0 ||
+	     (number_length == entry->number_length &&
+	      binaryEqual (entry->number, number, (int)number_length))))
+	{
+	    if (best_type == 0)
+	    {
+		best = entry;
+		break;
+	    }
+	    for (type = 0; type < best_type; type++)
+		if (type_lengths[type] == entry->name_length &&
+		    !(strncmp (types[type], entry->name, entry->name_length)))
+		{
+		    break;
+		}
+	    if (type < best_type)
+	    {
+		if (best)
+		    XauDisposeAuth (best);
+		best = entry;
+		best_type = type;
+		if (type == 0)
+		    break;
+		continue;
+	    }
+	}
+	XauDisposeAuth (entry);
+    }
+    (void) fclose (auth_file);
+    return best;
+}
diff --git a/libXau/AuRead.c b/libXau/AuRead.c
index 09e454336..3c59632de 100644
--- a/libXau/AuRead.c
+++ b/libXau/AuRead.c
@@ -1,107 +1,107 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/Xauth.h>

-#include <stdlib.h>

-

-static int

-read_short (unsigned short *shortp, FILE *file)

-{

-    unsigned char   file_short[2];

-

-    if (fread ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)

-	return 0;

-    *shortp = file_short[0] * 256 + file_short[1];

-    return 1;

-}

-

-static int

-read_counted_string (unsigned short *countp, char **stringp, FILE *file)

-{

-    unsigned short  len;

-    char	    *data;

-

-    if (read_short (&len, file) == 0)

-	return 0;

-    if (len == 0) {

-	data = NULL;

-    } else {

-    	data = malloc ((unsigned) len);

-    	if (!data)

-	    return 0;

-    	if (fread (data, (int) sizeof (char), (int) len, file) != len) {

-	    bzero (data, len);

-	    free (data);

-	    return 0;

-    	}

-    }

-    *stringp = data;

-    *countp = len;

-    return 1;

-}

-

-Xauth *

-XauReadAuth (FILE *auth_file)

-{

-    Xauth   local;

-    Xauth   *ret;

-

-    if (read_short (&local.family, auth_file) == 0)

-	return NULL;

-    if (read_counted_string (&local.address_length, &local.address, auth_file) == 0)

-	return NULL;

-    if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) {

-	if (local.address) free (local.address);

-	return NULL;

-    }

-    if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) {

-	if (local.address) free (local.address);

-	if (local.number) free (local.number);

-	return NULL;

-    }

-    if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) {

-	if (local.address) free (local.address);

-	if (local.number) free (local.number);

-	if (local.name) free (local.name);

-	return NULL;

-    }

-    ret = (Xauth *) malloc (sizeof (Xauth));

-    if (!ret) {

-	if (local.address) free (local.address);

-	if (local.number) free (local.number);

-	if (local.name) free (local.name);

-	if (local.data) {

-	    bzero (local.data, local.data_length);

-	    free (local.data);

-	}

-	return NULL;

-    }

-    *ret = local;

-    return ret;

-}

+/*
+
+Copyright 1988, 1998  The Open Group
+
+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
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xauth.h>
+#include <stdlib.h>
+
+static int
+read_short (unsigned short *shortp, FILE *file)
+{
+    unsigned char   file_short[2];
+
+    if (fread ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)
+	return 0;
+    *shortp = file_short[0] * 256 + file_short[1];
+    return 1;
+}
+
+static int
+read_counted_string (unsigned short *countp, char **stringp, FILE *file)
+{
+    unsigned short  len;
+    char	    *data;
+
+    if (read_short (&len, file) == 0)
+	return 0;
+    if (len == 0) {
+	data = NULL;
+    } else {
+    	data = malloc ((unsigned) len);
+    	if (!data)
+	    return 0;
+    	if (fread (data, (int) sizeof (char), (int) len, file) != len) {
+	    bzero (data, len);
+	    free (data);
+	    return 0;
+    	}
+    }
+    *stringp = data;
+    *countp = len;
+    return 1;
+}
+
+Xauth *
+XauReadAuth (FILE *auth_file)
+{
+    Xauth   local;
+    Xauth   *ret;
+
+    if (read_short (&local.family, auth_file) == 0)
+	return NULL;
+    if (read_counted_string (&local.address_length, &local.address, auth_file) == 0)
+	return NULL;
+    if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) {
+	if (local.address) free (local.address);
+	return NULL;
+    }
+    if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) {
+	if (local.address) free (local.address);
+	if (local.number) free (local.number);
+	return NULL;
+    }
+    if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) {
+	if (local.address) free (local.address);
+	if (local.number) free (local.number);
+	if (local.name) free (local.name);
+	return NULL;
+    }
+    ret = (Xauth *) malloc (sizeof (Xauth));
+    if (!ret) {
+	if (local.address) free (local.address);
+	if (local.number) free (local.number);
+	if (local.name) free (local.name);
+	if (local.data) {
+	    bzero (local.data, local.data_length);
+	    free (local.data);
+	}
+	return NULL;
+    }
+    *ret = local;
+    return ret;
+}
diff --git a/libXau/AuUnlock.c b/libXau/AuUnlock.c
index 072331e34..ddbe7db9e 100644
--- a/libXau/AuUnlock.c
+++ b/libXau/AuUnlock.c
@@ -1,59 +1,59 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/Xauth.h>

-#include <X11/Xos.h>

-

-int

-XauUnlockAuth (

-_Xconst char *file_name)

-{

-#ifndef WIN32

-    char	creat_name[1025];

-#endif

-    char	link_name[1025];

-

-    if (strlen (file_name) > 1022)

-	return 0;

-#ifndef WIN32

-    (void) strcpy (creat_name, file_name);

-    (void) strcat (creat_name, "-c");

-#endif

-    (void) strcpy (link_name, file_name);

-    (void) strcat (link_name, "-l");

-    /*

-     * I think this is the correct order

-     */

-#ifndef WIN32

-    (void) unlink (creat_name);

-#endif

-    (void) unlink (link_name);

-

-    return 1;

-}

+/*
+
+Copyright 1988, 1998  The Open Group
+
+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
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xauth.h>
+#include <X11/Xos.h>
+
+int
+XauUnlockAuth (
+_Xconst char *file_name)
+{
+#ifndef WIN32
+    char	creat_name[1025];
+#endif
+    char	link_name[1025];
+
+    if (strlen (file_name) > 1022)
+	return 0;
+#ifndef WIN32
+    (void) strcpy (creat_name, file_name);
+    (void) strcat (creat_name, "-c");
+#endif
+    (void) strcpy (link_name, file_name);
+    (void) strcat (link_name, "-l");
+    /*
+     * I think this is the correct order
+     */
+#ifndef WIN32
+    (void) unlink (creat_name);
+#endif
+    (void) unlink (link_name);
+
+    return 1;
+}
diff --git a/libXau/AuWrite.c b/libXau/AuWrite.c
index 2ad7a07af..0924f8d06 100644
--- a/libXau/AuWrite.c
+++ b/libXau/AuWrite.c
@@ -1,68 +1,68 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/Xauth.h>

-

-static int

-write_short (unsigned short s, FILE *file)

-{

-    unsigned char   file_short[2];

-

-    file_short[0] = (s & (unsigned)0xff00) >> 8;

-    file_short[1] = s & 0xff;

-    if (fwrite ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)

-	return 0;

-    return 1;

-}

-

-static int

-write_counted_string (unsigned short count, char *string, FILE *file)

-{

-    if (write_short (count, file) == 0)

-	return 0;

-    if (fwrite (string, (int) sizeof (char), (int) count, file) != count)

-	return 0;

-    return 1;

-}

-

-int

-XauWriteAuth (FILE *auth_file, Xauth *auth)

-{

-    if (write_short (auth->family, auth_file) == 0)

-	return 0;

-    if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)

-	return 0;

-    if (write_counted_string (auth->number_length, auth->number, auth_file) == 0)

-	return 0;

-    if (write_counted_string (auth->name_length, auth->name, auth_file) == 0)

-	return 0;

-    if (write_counted_string (auth->data_length, auth->data, auth_file) == 0)

-	return 0;

-    return 1;

-}

+/*
+
+Copyright 1988, 1998  The Open Group
+
+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
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xauth.h>
+
+static int
+write_short (unsigned short s, FILE *file)
+{
+    unsigned char   file_short[2];
+
+    file_short[0] = (s & (unsigned)0xff00) >> 8;
+    file_short[1] = s & 0xff;
+    if (fwrite ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)
+	return 0;
+    return 1;
+}
+
+static int
+write_counted_string (unsigned short count, char *string, FILE *file)
+{
+    if (write_short (count, file) == 0)
+	return 0;
+    if (fwrite (string, (int) sizeof (char), (int) count, file) != count)
+	return 0;
+    return 1;
+}
+
+int
+XauWriteAuth (FILE *auth_file, Xauth *auth)
+{
+    if (write_short (auth->family, auth_file) == 0)
+	return 0;
+    if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)
+	return 0;
+    if (write_counted_string (auth->number_length, auth->number, auth_file) == 0)
+	return 0;
+    if (write_counted_string (auth->name_length, auth->name, auth_file) == 0)
+	return 0;
+    if (write_counted_string (auth->data_length, auth->data, auth_file) == 0)
+	return 0;
+    return 1;
+}
diff --git a/libXau/Autest.c b/libXau/Autest.c
index 966e0d13f..efb3da8c6 100644
--- a/libXau/Autest.c
+++ b/libXau/Autest.c
@@ -1,74 +1,74 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/Xauth.h>

-#include <stdio.h>

-#include <stdlib.h>

-

-int

-main (int argc, char **argv)

-{

-    Xauth   test_data;

-    char    *name = "XAU-TEST-1";

-    char    *data = "Do not begin the test until instructed to do so.";

-    char    *file = NULL;

-    int	    state = 0;

-    FILE    *output;

-

-    while (*++argv) {

-	if (!strcmp (*argv, "-file"))

-	    file = *++argv;

-	else if (state == 0) {

-	    name = *argv;

-	    ++state;

-	} else if (state == 1) {

-	    data = *argv;

-	    ++state;

-	}

-    }

-    test_data.family = 0;

-    test_data.address_length = 0;

-    test_data.address = "";

-    test_data.number_length = 0;

-    test_data.number = "";

-    test_data.name_length = strlen (name);

-    test_data.name = name;

-    test_data.data_length = strlen (data);

-    test_data.data = data;

-    if (!file) {

-	output = tmpfile();

-    } else {

-	output = fopen (file, "w");

-    }

-    if (output) {

-	state = XauWriteAuth (output, &test_data);

-	fclose (output);

-    }

-    return (state = 1) ? 0 : 1;

-}

+/*
+
+Copyright 1988, 1998  The Open Group
+
+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
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xauth.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main (int argc, char **argv)
+{
+    Xauth   test_data;
+    char    *name = "XAU-TEST-1";
+    char    *data = "Do not begin the test until instructed to do so.";
+    char    *file = NULL;
+    int	    state = 0;
+    FILE    *output;
+
+    while (*++argv) {
+	if (!strcmp (*argv, "-file"))
+	    file = *++argv;
+	else if (state == 0) {
+	    name = *argv;
+	    ++state;
+	} else if (state == 1) {
+	    data = *argv;
+	    ++state;
+	}
+    }
+    test_data.family = 0;
+    test_data.address_length = 0;
+    test_data.address = "";
+    test_data.number_length = 0;
+    test_data.number = "";
+    test_data.name_length = strlen (name);
+    test_data.name = name;
+    test_data.data_length = strlen (data);
+    test_data.data = data;
+    if (!file) {
+	output = tmpfile();
+    } else {
+	output = fopen (file, "w");
+    }
+    if (output) {
+	state = XauWriteAuth (output, &test_data);
+	fclose (output);
+    }
+    return (state = 1) ? 0 : 1;
+}
diff --git a/libXau/COPYING b/libXau/COPYING
index 64492ad80..e893a82a7 100644
--- a/libXau/COPYING
+++ b/libXau/COPYING
@@ -1,21 +1,21 @@
-Copyright 1988, 1993, 1994, 1998  The Open Group
-
-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
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
+Copyright 1988, 1993, 1994, 1998  The Open Group

+

+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

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

diff --git a/libXau/include/X11/Xauth.h b/libXau/include/X11/Xauth.h
index ec8375a35..f57a1b375 100644
--- a/libXau/include/X11/Xauth.h
+++ b/libXau/include/X11/Xauth.h
@@ -1,137 +1,137 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifndef _Xauth_h

-#define _Xauth_h

-

-typedef struct xauth {

-    unsigned short   family;

-    unsigned short   address_length;

-    char    	    *address;

-    unsigned short   number_length;

-    char    	    *number;

-    unsigned short   name_length;

-    char    	    *name;

-    unsigned short   data_length;

-    char   	    *data;

-} Xauth;

-

-#ifndef _XAUTH_STRUCT_ONLY

-

-# include   <X11/Xfuncproto.h>

-# include   <X11/Xfuncs.h>

-

-# include   <stdio.h>

-

-# define FamilyLocal (256)	/* not part of X standard (i.e. X.h) */

-# define FamilyWild  (65535)

-# define FamilyNetname    (254)   /* not part of X standard */

-# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */

-# define FamilyLocalHost (252)	/* for local non-net authentication */

-

-

-_XFUNCPROTOBEGIN

-

-char *XauFileName(void);

-

-Xauth *XauReadAuth(

-FILE*	/* auth_file */

-);

-

-int XauLockAuth(

-_Xconst char*	/* file_name */,

-int		/* retries */,

-int		/* timeout */,

-long		/* dead */

-);

-

-int XauUnlockAuth(

-_Xconst char*	/* file_name */

-);

-

-int XauWriteAuth(

-FILE*		/* auth_file */,

-Xauth*		/* auth */

-);

-

-Xauth *XauGetAuthByAddr(

-#if NeedWidePrototypes

-unsigned int	/* family */,

-unsigned int	/* address_length */,

-#else

-unsigned short	/* family */,

-unsigned short	/* address_length */,

-#endif

-_Xconst char*	/* address */,

-#if NeedWidePrototypes

-unsigned int	/* number_length */,

-#else

-unsigned short	/* number_length */,

-#endif

-_Xconst char*	/* number */,

-#if NeedWidePrototypes

-unsigned int	/* name_length */,

-#else

-unsigned short	/* name_length */,

-#endif

-_Xconst char*	/* name */

-);

-

-Xauth *XauGetBestAuthByAddr(

-#if NeedWidePrototypes

-unsigned int	/* family */,

-unsigned int	/* address_length */,

-#else

-unsigned short	/* family */,

-unsigned short	/* address_length */,

-#endif

-_Xconst char*	/* address */,

-#if NeedWidePrototypes

-unsigned int	/* number_length */,

-#else

-unsigned short	/* number_length */,

-#endif

-_Xconst char*	/* number */,

-int		/* types_length */,

-char**		/* type_names */,

-_Xconst int*	/* type_lengths */

-);

-

-void XauDisposeAuth(

-Xauth*		/* auth */

-);

-

-_XFUNCPROTOEND

-

-/* Return values from XauLockAuth */

-

-# define LOCK_SUCCESS	0	/* lock succeeded */

-# define LOCK_ERROR	1	/* lock unexpectely failed, check errno */

-# define LOCK_TIMEOUT	2	/* lock failed, timeouts expired */

-

-#endif /* _XAUTH_STRUCT_ONLY */

-

-#endif /* _Xauth_h */

+/*
+
+Copyright 1988, 1998  The Open Group
+
+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
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifndef _Xauth_h
+#define _Xauth_h
+
+typedef struct xauth {
+    unsigned short   family;
+    unsigned short   address_length;
+    char    	    *address;
+    unsigned short   number_length;
+    char    	    *number;
+    unsigned short   name_length;
+    char    	    *name;
+    unsigned short   data_length;
+    char   	    *data;
+} Xauth;
+
+#ifndef _XAUTH_STRUCT_ONLY
+
+# include   <X11/Xfuncproto.h>
+# include   <X11/Xfuncs.h>
+
+# include   <stdio.h>
+
+# define FamilyLocal (256)	/* not part of X standard (i.e. X.h) */
+# define FamilyWild  (65535)
+# define FamilyNetname    (254)   /* not part of X standard */
+# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */
+# define FamilyLocalHost (252)	/* for local non-net authentication */
+
+
+_XFUNCPROTOBEGIN
+
+char *XauFileName(void);
+
+Xauth *XauReadAuth(
+FILE*	/* auth_file */
+);
+
+int XauLockAuth(
+_Xconst char*	/* file_name */,
+int		/* retries */,
+int		/* timeout */,
+long		/* dead */
+);
+
+int XauUnlockAuth(
+_Xconst char*	/* file_name */
+);
+
+int XauWriteAuth(
+FILE*		/* auth_file */,
+Xauth*		/* auth */
+);
+
+Xauth *XauGetAuthByAddr(
+#if NeedWidePrototypes
+unsigned int	/* family */,
+unsigned int	/* address_length */,
+#else
+unsigned short	/* family */,
+unsigned short	/* address_length */,
+#endif
+_Xconst char*	/* address */,
+#if NeedWidePrototypes
+unsigned int	/* number_length */,
+#else
+unsigned short	/* number_length */,
+#endif
+_Xconst char*	/* number */,
+#if NeedWidePrototypes
+unsigned int	/* name_length */,
+#else
+unsigned short	/* name_length */,
+#endif
+_Xconst char*	/* name */
+);
+
+Xauth *XauGetBestAuthByAddr(
+#if NeedWidePrototypes
+unsigned int	/* family */,
+unsigned int	/* address_length */,
+#else
+unsigned short	/* family */,
+unsigned short	/* address_length */,
+#endif
+_Xconst char*	/* address */,
+#if NeedWidePrototypes
+unsigned int	/* number_length */,
+#else
+unsigned short	/* number_length */,
+#endif
+_Xconst char*	/* number */,
+int		/* types_length */,
+char**		/* type_names */,
+_Xconst int*	/* type_lengths */
+);
+
+void XauDisposeAuth(
+Xauth*		/* auth */
+);
+
+_XFUNCPROTOEND
+
+/* Return values from XauLockAuth */
+
+# define LOCK_SUCCESS	0	/* lock succeeded */
+# define LOCK_ERROR	1	/* lock unexpectely failed, check errno */
+# define LOCK_TIMEOUT	2	/* lock failed, timeouts expired */
+
+#endif /* _XAUTH_STRUCT_ONLY */
+
+#endif /* _Xauth_h */
diff --git a/libXau/man/Xau.man b/libXau/man/Xau.man
index 12deda077..46d4a195c 100644
--- a/libXau/man/Xau.man
+++ b/libXau/man/Xau.man
@@ -1,129 +1,129 @@
-.\" Copyright (c) 1994  X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining a

-.\" copy of this software and associated documentation files (the "Software"),

-.\" to deal in the Software without restriction, including without limitation

-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,

-.\" and/or sell copies of the Software, and to permit persons to whom the

-.\" Software furnished to do so, subject to the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included in

-.\" all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

-.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

-.\"

-.\" Except as contained in this notice, the name of the X Consortium shall not

-.\" be used in advertising or otherwise to promote the sale, use or other

-.\" dealing in this Software without prior written authorization from the

-.\" X Consortium.

-.\"

-.TH Xau __libmansuffix__ __xorgversion__

-.SH NAME

-Xau library: XauFileName, XauReadAuth, XauLockAuth, XauUnlockAuth,

-XauWriteAuth, XauDisposeAuth,

-XauGetAuthByAddr, XauGetBestAuthByAddr \- X authority database routines

-.SH SYNOPSIS

-.B "#include <X11/Xauth.h>"

-.PP

-.nf

-.ta .5i 2i

-typedef struct xauth {

-	unsigned short	family;

-	unsigned short	address_length;

-	char	*address;

-	unsigned short	number_length;

-	char	*number;

-	unsigned short	name_length;

-	char	*name;

-	unsigned short	data_length;

-	char	*data;

-} Xauth;

-

-.HP

-char *XauFileName (void);

-.HP

-Xauth *XauReadAuth (FILE *\fIauth_file\fP\^);

-.HP

-int XauWriteAuth (FILE *\fIauth_file\fP, Xauth *\fIauth\fP\^);

-.HP

-Xauth *XauGetAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short

-\fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short

-\fInumber_length\fP\^, const char *\fInumber\fP\^, unsigned short

-\fIname_length\fP\^, const char *\fIname\fP\^);

-.HP

-Xauth *XauGetBestAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short

-\fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short

-\fInumber_length\fP\^, const char *\fInumber\fP\^, int \fItypes_length\fP\^,

-char **\fItypes\fR\^, const int *\fItype_lengths\fR\^);

-.HP

-int XauLockAuth (const char *\fIfile_name\fP\^, int \fIretries\fP\^, int

-\fItimeout\fP\^, long \fIdead\fP\^);

-.HP

-int XauUnlockAuth (const char *\fIfile_name\fP\^);

-.HP

-int XauDisposeAuth (Xauth *\fIauth\fP\^);

-.ft R

-.SH DESCRIPTION

-.PP

-\fBXauFileName\fP generates the default authorization file name by first

-checking the XAUTHORITY environment variable if set, else it returns

-$HOME/.Xauthority.  This name is statically allocated and should

-not be freed.

-.PP

-\fBXauReadAuth\fP reads the next entry from \fIauth_file\fP.  The entry is

-\fBnot\fP statically allocated and should be freed by calling

-\fIXauDisposeAuth\fP.

-.PP

-\fBXauWriteAuth\fP writes an authorization entry to \fIauth_file\fP.  It

-returns 1 on success, 0 on failure.

-.PP

-\fBXauGetAuthByAddr\fP searches for an entry which matches the given network

-address/display number pair.  The entry is \fBnot\fP statically allocated

-and should be freed by calling \fIXauDisposeAuth\fP.

-.PP

-\fBXauGetBestAuthByAddr\fP is similar to \fBXauGetAuthByAddr\fP, except

-that a list of acceptable authentication methods is specified.  Xau will

-choose the file entry which matches the earliest entry in this list (e.g., the

-most secure authentication method).  The \fItypes\fP argument is an array of

-strings, one string for each authentication method.  \fItypes_length\fP

-specifies how many elements are in the \fItypes\fP array.

-\fItypes_lengths\fP is an array of integers representing the length

-of each string.

-.PP

-\fBXauLockAuth\fP does the work necessary to synchronously update an

-authorization file.  First it makes two file names, one with ``-c'' appended

-to \fIfile_name\fP, the other with ``-l'' appended.  If the ``-c'' file

-already exists and is more than \fIdead\fP seconds old, \fIXauLockAuth\fP

-removes it and the associated ``-l'' file.  To prevent possible

-synchronization troubles with NFS, a \fIdead\fP value of zero forces the

-files to be removed.  \fIXauLockAuth\fP makes \fIretries\fP attempts to

-create and link the file names, pausing \fItimeout\fP seconds between each

-attempt.  \fIXauLockAuth\fP returns a collection of values depending on the

-results:

-.nf

-.ta .5i 2i

-

-	LOCK_ERROR	A system error occurred, either a file_name

-		which is too long, or an unexpected failure from

-		a system call.  errno may prove useful.

-

-	LOCK_TIMEOUT	\fIretries\fP attempts failed

-

-	LOCK_SUCCESS	The lock succeeded.

-

-.fi

-.PP

-\fBXauUnlockAuth\fP undoes the work of \fIXauLockAuth\fP by unlinking both

-the ``-c'' and ``-l'' file names.

-.PP

-\fBXauDisposeAuth\fP frees storage allocated to hold an authorization entry.

-.SH "SEE ALSO"

-xauth(1), xdm(1)

-.SH AUTHOR

-Keith Packard, MIT X Consortium

+.\" Copyright (c) 1994  X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included in
+.\" all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+.\"
+.\" Except as contained in this notice, the name of the X Consortium shall not
+.\" be used in advertising or otherwise to promote the sale, use or other
+.\" dealing in this Software without prior written authorization from the
+.\" X Consortium.
+.\"
+.TH Xau __libmansuffix__ __xorgversion__
+.SH NAME
+Xau library: XauFileName, XauReadAuth, XauLockAuth, XauUnlockAuth,
+XauWriteAuth, XauDisposeAuth,
+XauGetAuthByAddr, XauGetBestAuthByAddr \- X authority database routines
+.SH SYNOPSIS
+.B "#include <X11/Xauth.h>"
+.PP
+.nf
+.ta .5i 2i
+typedef struct xauth {
+	unsigned short	family;
+	unsigned short	address_length;
+	char	*address;
+	unsigned short	number_length;
+	char	*number;
+	unsigned short	name_length;
+	char	*name;
+	unsigned short	data_length;
+	char	*data;
+} Xauth;
+
+.HP
+char *XauFileName (void);
+.HP
+Xauth *XauReadAuth (FILE *\fIauth_file\fP\^);
+.HP
+int XauWriteAuth (FILE *\fIauth_file\fP, Xauth *\fIauth\fP\^);
+.HP
+Xauth *XauGetAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short
+\fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short
+\fInumber_length\fP\^, const char *\fInumber\fP\^, unsigned short
+\fIname_length\fP\^, const char *\fIname\fP\^);
+.HP
+Xauth *XauGetBestAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short
+\fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short
+\fInumber_length\fP\^, const char *\fInumber\fP\^, int \fItypes_length\fP\^,
+char **\fItypes\fR\^, const int *\fItype_lengths\fR\^);
+.HP
+int XauLockAuth (const char *\fIfile_name\fP\^, int \fIretries\fP\^, int
+\fItimeout\fP\^, long \fIdead\fP\^);
+.HP
+int XauUnlockAuth (const char *\fIfile_name\fP\^);
+.HP
+int XauDisposeAuth (Xauth *\fIauth\fP\^);
+.ft R
+.SH DESCRIPTION
+.PP
+\fBXauFileName\fP generates the default authorization file name by first
+checking the XAUTHORITY environment variable if set, else it returns
+$HOME/.Xauthority.  This name is statically allocated and should
+not be freed.
+.PP
+\fBXauReadAuth\fP reads the next entry from \fIauth_file\fP.  The entry is
+\fBnot\fP statically allocated and should be freed by calling
+\fIXauDisposeAuth\fP.
+.PP
+\fBXauWriteAuth\fP writes an authorization entry to \fIauth_file\fP.  It
+returns 1 on success, 0 on failure.
+.PP
+\fBXauGetAuthByAddr\fP searches for an entry which matches the given network
+address/display number pair.  The entry is \fBnot\fP statically allocated
+and should be freed by calling \fIXauDisposeAuth\fP.
+.PP
+\fBXauGetBestAuthByAddr\fP is similar to \fBXauGetAuthByAddr\fP, except
+that a list of acceptable authentication methods is specified.  Xau will
+choose the file entry which matches the earliest entry in this list (e.g., the
+most secure authentication method).  The \fItypes\fP argument is an array of
+strings, one string for each authentication method.  \fItypes_length\fP
+specifies how many elements are in the \fItypes\fP array.
+\fItypes_lengths\fP is an array of integers representing the length
+of each string.
+.PP
+\fBXauLockAuth\fP does the work necessary to synchronously update an
+authorization file.  First it makes two file names, one with ``-c'' appended
+to \fIfile_name\fP, the other with ``-l'' appended.  If the ``-c'' file
+already exists and is more than \fIdead\fP seconds old, \fIXauLockAuth\fP
+removes it and the associated ``-l'' file.  To prevent possible
+synchronization troubles with NFS, a \fIdead\fP value of zero forces the
+files to be removed.  \fIXauLockAuth\fP makes \fIretries\fP attempts to
+create and link the file names, pausing \fItimeout\fP seconds between each
+attempt.  \fIXauLockAuth\fP returns a collection of values depending on the
+results:
+.nf
+.ta .5i 2i
+
+	LOCK_ERROR	A system error occurred, either a file_name
+		which is too long, or an unexpected failure from
+		a system call.  errno may prove useful.
+
+	LOCK_TIMEOUT	\fIretries\fP attempts failed
+
+	LOCK_SUCCESS	The lock succeeded.
+
+.fi
+.PP
+\fBXauUnlockAuth\fP undoes the work of \fIXauLockAuth\fP by unlinking both
+the ``-c'' and ``-l'' file names.
+.PP
+\fBXauDisposeAuth\fP frees storage allocated to hold an authorization entry.
+.SH "SEE ALSO"
+xauth(1), xdm(1)
+.SH AUTHOR
+Keith Packard, MIT X Consortium
diff --git a/libXau/xau.pc.in b/libXau/xau.pc.in
index cda113a27..1c724e4b2 100644
--- a/libXau/xau.pc.in
+++ b/libXau/xau.pc.in
@@ -1,11 +1,11 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Xau
-Description: X authorization file management libary
-Version: @PACKAGE_VERSION@
-Requires: xproto
-Cflags: -I${includedir}
-Libs: -L${libdir} -lXau
+prefix=@prefix@

+exec_prefix=@exec_prefix@

+libdir=@libdir@

+includedir=@includedir@

+

+Name: Xau

+Description: X authorization file management libary

+Version: @PACKAGE_VERSION@

+Requires: xproto

+Cflags: -I${includedir}

+Libs: -L${libdir} -lXau