Update to libXt 1.1.2

7 files changed, 165 insertions, 130 deletions

diff --git a/lib/libXt/util/Makefile.in b/lib/libXt/util/Makefile.in
index fab12b350..3015c4449 100644
--- a/lib/libXt/util/Makefile.in
+++ b/lib/libXt/util/Makefile.in
@@ -42,7 +42,9 @@ subdir = util
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(install_sh) -d
@@ -83,6 +85,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASE_CFLAGS = @BASE_CFLAGS@
 CC = @CC_FOR_BUILD@
 CCDEPMODE = @CCDEPMODE@
 CC_FOR_BUILD = @CC_FOR_BUILD@
@@ -92,32 +95,50 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_SPECS_FALSE = @ENABLE_SPECS_FALSE@
+ENABLE_SPECS_TRUE = @ENABLE_SPECS_TRUE@
+ENABLE_UNIT_TESTS_FALSE = @ENABLE_UNIT_TESTS_FALSE@
+ENABLE_UNIT_TESTS_TRUE = @ENABLE_UNIT_TESTS_TRUE@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FOP = @FOP@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
 GREP = @GREP@
+HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
+HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
+HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
+HAVE_PERL_FALSE = @HAVE_PERL_FALSE@
+HAVE_PERL_TRUE = @HAVE_PERL_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
+HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
+HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS_FOR_BUILD@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LIBOBJS = @LIBOBJS@
@@ -125,18 +146,25 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MALLOC_DEBUG_ENV = @MALLOC_DEBUG_ENV@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -144,28 +172,35 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRICT_CFLAGS = @STRICT_CFLAGS@
 STRINGSABIOPTIONS = @STRINGSABIOPTIONS@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
 XFILESEARCHPATHDEFAULT = @XFILESEARCHPATHDEFAULT@
 XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XMLTO = @XMLTO@
+XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
 XT_CFLAGS = @XT_CFLAGS@
 XT_LIBS = @XT_LIBS@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/lib/libXt/util/Shell.ht b/lib/libXt/util/Shell.ht
index fc78678f3..500e0fd75 100644
--- a/lib/libXt/util/Shell.ht
+++ b/lib/libXt/util/Shell.ht
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -80,7 +80,7 @@ typedef struct _TopLevelShellClassRec *TopLevelShellWidgetClass;
 typedef struct _ApplicationShellClassRec *ApplicationShellWidgetClass;
 typedef struct _SessionShellClassRec *SessionShellWidgetClass;
 
-#ifndef SHELL 
+#ifndef SHELL
 externalref WidgetClass shellWidgetClass;
 externalref WidgetClass overrideShellWidgetClass;
 externalref WidgetClass wmShellWidgetClass;
diff --git a/lib/libXt/util/StrDefs.ct b/lib/libXt/util/StrDefs.ct
index c3b15d861..b597b2051 100644
--- a/lib/libXt/util/StrDefs.ct
+++ b/lib/libXt/util/StrDefs.ct
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/lib/libXt/util/StrDefs.ht b/lib/libXt/util/StrDefs.ht
index b003bb85b..2ce20562f 100644
--- a/lib/libXt/util/StrDefs.ht
+++ b/lib/libXt/util/StrDefs.ht
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/lib/libXt/util/makestrs.c b/lib/libXt/util/makestrs.c
index 902d461c5..a52866ac6 100644
--- a/lib/libXt/util/makestrs.c
+++ b/lib/libXt/util/makestrs.c
@@ -84,7 +84,7 @@ static int   solaris_abi_names = FALSE;
 #define X_MAGIC_STRING "<<<STRING_TABLE_GOES_HERE>>>"
 
 /* Wrapper for fopen()
- * Prepend filename with an includedir which can be specified on the 
+ * Prepend filename with an includedir which can be specified on the
  * commandline. Needed to separate source and build directories.
  */
 static char* includedir = NULL;
@@ -93,7 +93,7 @@ static FILE *ifopen(const char *file, const char *mode)
     size_t len;
     char *buffer;
     FILE *ret;
-    
+
     if (includedir == NULL)
         return fopen(file, mode);
 
@@ -101,7 +101,7 @@ static FILE *ifopen(const char *file, const char *mode)
     buffer = (char*)malloc(len + 1);
     if (buffer == NULL)
         return NULL;
-            
+
     strcpy(buffer, includedir);
     strcat(buffer, "/");
     strcat(buffer, file);
@@ -121,11 +121,11 @@ static void WriteHeaderProlog (FILE *f, File *phile)
     for (t = phile->table; t; t = t->next)
 	for (te = t->tableent; te; te = te->next) {
 	    if (strcmp (te->left, "RAtom") == 0) {
-		(void) fprintf (f, 
+		(void) fprintf (f,
 			"#ifndef %s%s\n#define %s%s \"%s\"\n#endif\n",
 			prefixstr, te->left, prefixstr, te->left, te->right);
 	    } else {
-		(void) fprintf (f, 
+		(void) fprintf (f,
 			"#define %s%s \"%s\"\n",
 			prefixstr, te->left, te->right);
 	    }
@@ -141,10 +141,10 @@ static void IntelABIWriteHeader (FILE *f, File *phile)
     WriteHeaderProlog (f, phile);
 
     for (t = phile->table; t; t = t->next) {
-      (void) fprintf (f, "%s %sConst char %s[];\n", 
+      (void) fprintf (f, "%s %sConst char %s[];\n",
 		      externrefstr, conststr ? conststr : fileprotstr, t->name);
 	for (te = t->tableent; te; te = te->next)
-	    (void) fprintf (f, 
+	    (void) fprintf (f,
 		"#ifndef %s%s\n#define %s%s ((char*)&%s[%d])\n#endif\n",
 		prefixstr, te->left, prefixstr, te->left, t->name, te->offset);
     }
@@ -170,15 +170,15 @@ static void FunctionWriteHeader (FILE *f, File *phile)
 
     WriteHeaderProlog (f, phile);
 
-    (void) fprintf (f, "%s %sConst char* %s();\n", 
-		    externrefstr, conststr ? conststr : fileprotstr, 
+    (void) fprintf (f, "%s %sConst char* %s();\n",
+		    externrefstr, conststr ? conststr : fileprotstr,
 		    phile->table->name);
 
     for (t = phile->table; t; t = t->next)
 	for (te = t->tableent; te; te = te->next)
-	    (void) fprintf (f, 
+	    (void) fprintf (f,
 		"#ifndef %s%s\n#define %s%s (%s(%d))\n#endif\n",
-		prefixstr, te->left, prefixstr, te->left, phile->table->name, 
+		prefixstr, te->left, prefixstr, te->left, phile->table->name,
 		te->offset);
 
     (void) fprintf (f, "#endif /* %s */\n", featurestr);
@@ -193,10 +193,10 @@ static void ArrayperWriteHeader (FILE *f, File *phile)
 
     for (t = phile->table; t; t = t->next)
         for (te = t->tableent; te; te = te->next)
-	    (void) fprintf (f, 
+	    (void) fprintf (f,
 			    "#ifndef %s%s\n%s %sConst char %s%s[];\n#endif\n",
-			    prefixstr, te->left, 
-			    externrefstr, conststr ? conststr : fileprotstr, 
+			    prefixstr, te->left,
+			    externrefstr, conststr ? conststr : fileprotstr,
 			    prefixstr, te->left);
 
     (void) fprintf (f, "#endif /* %s */\n", featurestr);
@@ -209,15 +209,15 @@ static void DefaultWriteHeader (FILE *f, File *phile)
 
     WriteHeaderProlog (f, phile);
 
-    (void) fprintf (f, "%s %sConst char %s[];\n", 
-		    externrefstr, conststr ? conststr : fileprotstr, 
+    (void) fprintf (f, "%s %sConst char %s[];\n",
+		    externrefstr, conststr ? conststr : fileprotstr,
 		    phile->table->name);
 
     for (t = phile->table; t; t = t->next)
 	for (te = t->tableent; te; te = te->next)
-	    (void) fprintf (f, 
+	    (void) fprintf (f,
 		"#ifndef %s%s\n#define %s%s ((char*)&%s[%d])\n#endif\n",
-		prefixstr, te->left, prefixstr, te->left, phile->table->name, 
+		prefixstr, te->left, prefixstr, te->left, phile->table->name,
 		te->offset);
 
     (void) fprintf (f, "#endif /* %s */\n", featurestr);
@@ -226,7 +226,7 @@ static void DefaultWriteHeader (FILE *f, File *phile)
 static void CopyTmplProlog (FILE *tmpl, FILE *f)
 {
     char buf[1024];
-    static char* magic_string = X_MAGIC_STRING;
+    static const char* magic_string = X_MAGIC_STRING;
     int magic_string_len = strlen (magic_string);
 
     while (fgets (buf, sizeof buf, tmpl)) {
@@ -245,14 +245,14 @@ static void CopyTmplEpilog (FILE *tmpl, FILE *f)
 	(void) fputs (buf, f);
 }
 
-static char* abistring[] = {
+static const char* abistring[] = {
     "Default", "Array per string", "Intel", "Intel BC", "SPARC", "Function" };
 
 static void WriteHeader (char *tagline, File *phile, int abi)
 {
     FILE* f;
     char* tmp;
-    static void (*headerproc[])(FILE *f, File *phile) = { 
+    static void (*headerproc[])(FILE *f, File *phile) = {
 	DefaultWriteHeader, ArrayperWriteHeader,
 	IntelABIWriteHeader, IntelABIWriteHeader,
 	SPARCABIWriteHeader, FunctionWriteHeader };
@@ -261,8 +261,8 @@ static void WriteHeader (char *tagline, File *phile, int abi)
 
     if (phile->tmpl) CopyTmplProlog (phile->tmpl, f);
 
-    (void) fprintf (f, 
-	"%s\n%s\n/* %s ABI version -- Do not edit */\n", 
+    (void) fprintf (f,
+	"%s\n%s\n/* %s ABI version -- Do not edit */\n",
 	"/* $Xorg: makestrs.c,v 1.6 2001/02/09 02:03:17 xorgcvs Exp $ */",
 	"/* This file is automatically generated. */",
 	abistring[abi]);
@@ -301,7 +301,7 @@ static void WriteSourceLine (TableEnt *te, int abi, int fudge)
     (void) printf ("%s", "\n");
 }
 
-static char* const_string = "%s %sConst char %s[] = {\n";
+static const char* const_string = "%s %sConst char %s[] = {\n";
 
 static void IntelABIWriteSource (int abi)
 {
@@ -312,7 +312,7 @@ static void IntelABIWriteSource (int abi)
 	TableEnt* te;
 
 	for (t = phile->table; t; t = t->next) {
-	    (void) printf (const_string, externdefstr, 
+	    (void) printf (const_string, externdefstr,
 			   conststr ? conststr : "", t->name);
 	    for (te = t->tableent; te; te = te->next)
 		WriteSourceLine (te, abi, 0);
@@ -329,18 +329,18 @@ static void IntelABIBCWriteSource (int abi)
 	Table* t;
 	TableEnt* te;
 
-	(void) printf (const_string, externdefstr, 
+	(void) printf (const_string, externdefstr,
 		       conststr ? conststr : "", phile->table->name);
 
-	for (t = phile->table; t; t = t->next) 
+	for (t = phile->table; t; t = t->next)
 	    for (te = t->tableent; te; te = te->next)
 		WriteSourceLine (te, abi, t->next ? 1 : 0);
 	(void) printf ("%s\n\n", "};");
 
 	if (phile->table->next) {
-	    (void) printf (const_string, externdefstr, 
+	    (void) printf (const_string, externdefstr,
 			   conststr ? conststr : "", phile->table->next->name);
-	    for (t = phile->table->next; t; t = t->next) 
+	    for (t = phile->table->next; t; t = t->next)
 		for (te = t->tableent; te; te = te->next)
 		    WriteSourceLine (te, abi, 0);
 	    (void) printf ("%s\n\n", "};");
@@ -356,16 +356,16 @@ static void FunctionWriteSource (int abi)
 	Table* t;
 	TableEnt* te;
 
-	(void) printf ("static %sConst char _%s[] = {\n", 
+	(void) printf ("static %sConst char _%s[] = {\n",
 		       conststr ? conststr : "", phile->table->name);
 
-	for (t = phile->table; t; t = t->next) 
+	for (t = phile->table; t; t = t->next)
 	    for (te = t->tableent; te; te = te->next)
 		WriteSourceLine (te, abi, t->next ? 1 : 0);
 	(void) printf ("%s\n\n", "};");
 
 	(void) printf ("%sConst char* %s(index)\n    int index;\n{\n    return &_%s[index];\n}\n\n",
-		       conststr ? conststr : "", 
+		       conststr ? conststr : "",
 		       phile->table->name, phile->table->name);
     }
 }
@@ -379,7 +379,7 @@ static void ArrayperWriteSource (int abi)
 	Table* t;
 	TableEnt* te;
 
-	for (t = phile->table; t; t = t->next) 
+	for (t = phile->table; t; t = t->next)
 	    for (te = t->tableent; te; te = te->next) {
 		if (strcmp (te->left, "RAtom") == 0) {
 		    if (done_atom) return;
@@ -387,7 +387,7 @@ static void ArrayperWriteSource (int abi)
 		}
 		(void) printf ("%s %sConst char %s%s[] = \"%s\";\n",
 			       externdefstr, conststr ? conststr : "",
-			       prefixstr, 
+			       prefixstr,
 			       te->left, te->right);
 	    }
     }
@@ -404,7 +404,7 @@ static void DefaultWriteSource (int abi)
 	(void) printf (const_string, externdefstr, conststr ? conststr : "",
 		       phile->table->name);
 
-	for (t = phile->table; t; t = t->next) 
+	for (t = phile->table; t; t = t->next)
 	    for (te = t->tableent; te; te = te->next)
 		WriteSourceLine (te, abi, t->next ? 1 : 0);
 	(void) printf ("%s\n\n", "};");
@@ -413,7 +413,7 @@ static void DefaultWriteSource (int abi)
 
 static void WriteSource(char *tagline, int abi)
 {
-    static void (*sourceproc[])(int) = { 
+    static void (*sourceproc[])(int) = {
 	DefaultWriteSource, ArrayperWriteSource,
 	IntelABIWriteSource, IntelABIBCWriteSource,
 	DefaultWriteSource, FunctionWriteSource };
@@ -433,7 +433,7 @@ static void WriteSource(char *tagline, int abi)
 	tmpl = NULL;
 
 
-    (void) printf ("%s\n%s\n/* %s ABI version -- Do not edit */\n", 
+    (void) printf ("%s\n%s\n/* %s ABI version -- Do not edit */\n",
 		   "/* $Xorg: makestrs.c,v 1.6 2001/02/09 02:03:17 xorgcvs Exp $ */",
 		   "/* This file is automatically generated. */",
 		   abistring[abi]);
@@ -460,33 +460,33 @@ static void DoLine(char *buf)
 
     int token;
     char lbuf[1024];
-    static char* file_str = "#file";
-    static char* table_str = "#table";
-    static char* prefix_str = "#prefix";
-    static char* feature_str = "#feature";
-    static char* externref_str = "#externref";
-    static char* externdef_str = "#externdef";
-    static char* ctmpl_str = "#ctmpl";
-    static char* htmpl_str = "#htmpl";
-    static char* const_str = "#const";
-
-    if (strncmp (buf, file_str, strlen (file_str)) == 0) 
+    static const char* file_str = "#file";
+    static const char* table_str = "#table";
+    static const char* prefix_str = "#prefix";
+    static const char* feature_str = "#feature";
+    static const char* externref_str = "#externref";
+    static const char* externdef_str = "#externdef";
+    static const char* ctmpl_str = "#ctmpl";
+    static const char* htmpl_str = "#htmpl";
+    static const char* const_str = "#const";
+
+    if (strncmp (buf, file_str, strlen (file_str)) == 0)
 	token = X_FILE_TOKEN;
-    else if (strncmp (buf, table_str, strlen (table_str)) == 0) 
+    else if (strncmp (buf, table_str, strlen (table_str)) == 0)
 	token = X_TABLE_TOKEN;
-    else if (strncmp (buf, prefix_str, strlen (prefix_str)) == 0) 
+    else if (strncmp (buf, prefix_str, strlen (prefix_str)) == 0)
 	token = X_PREFIX_TOKEN;
-    else if (strncmp (buf, feature_str, strlen (feature_str)) == 0) 
+    else if (strncmp (buf, feature_str, strlen (feature_str)) == 0)
 	token = X_FEATURE_TOKEN;
-    else if (strncmp (buf, externref_str, strlen (externref_str)) == 0) 
+    else if (strncmp (buf, externref_str, strlen (externref_str)) == 0)
 	token = X_EXTERNREF_TOKEN;
-    else if (strncmp (buf, externdef_str, strlen (externdef_str)) == 0) 
+    else if (strncmp (buf, externdef_str, strlen (externdef_str)) == 0)
 	token = X_EXTERNDEF_TOKEN;
-    else if (strncmp (buf, ctmpl_str, strlen (ctmpl_str)) == 0) 
+    else if (strncmp (buf, ctmpl_str, strlen (ctmpl_str)) == 0)
 	token = X_CTMPL_TOKEN;
-    else if (strncmp (buf, htmpl_str, strlen (htmpl_str)) == 0) 
+    else if (strncmp (buf, htmpl_str, strlen (htmpl_str)) == 0)
 	token = X_HTMPL_TOKEN;
-    else if (strncmp (buf, const_str, strlen (const_str)) == 0) 
+    else if (strncmp (buf, const_str, strlen (const_str)) == 0)
 	token = X_CONST_TOKEN;
     else
         token = X_NO_TOKEN;
@@ -496,9 +496,9 @@ static void DoLine(char *buf)
 	{
 	    File* phile;
 
-	    if ((phile = (File*) malloc (sizeof(File))) == NULL) 
+	    if ((phile = (File*) malloc (sizeof(File))) == NULL)
 		exit(1);
-	    if ((phile->name = malloc (strlen (buf + strlen (file_str)) + 1)) == NULL) 
+	    if ((phile->name = malloc (strlen (buf + strlen (file_str)) + 1)) == NULL)
 		exit(1);
 	    (void) strcpy (phile->name, buf + strlen (file_str) + 1);
 	    phile->table = NULL;
@@ -515,9 +515,9 @@ static void DoLine(char *buf)
     case X_TABLE_TOKEN:
 	{
 	    Table* table;
-	    if ((table = (Table*) malloc (sizeof(Table))) == NULL) 
+	    if ((table = (Table*) malloc (sizeof(Table))) == NULL)
 		exit(1);
-	    if ((table->name = malloc (strlen (buf + strlen (table_str)) + 1)) == NULL) 
+	    if ((table->name = malloc (strlen (buf + strlen (table_str)) + 1)) == NULL)
 		exit(1);
 	    (void) strcpy (table->name, buf + strlen (table_str) + 1);
 	    if (solaris_abi_names) {
@@ -539,33 +539,33 @@ static void DoLine(char *buf)
 	}
 	break;
     case X_PREFIX_TOKEN:
-	if ((prefixstr = malloc (strlen (buf + strlen (prefix_str)) + 1)) == NULL) 
+	if ((prefixstr = malloc (strlen (buf + strlen (prefix_str)) + 1)) == NULL)
 	    exit(1);
 	(void) strcpy (prefixstr, buf + strlen (prefix_str) + 1);
 	break;
     case X_FEATURE_TOKEN:
-	if ((featurestr = malloc (strlen (buf + strlen (feature_str)) + 1)) == NULL) 
+	if ((featurestr = malloc (strlen (buf + strlen (feature_str)) + 1)) == NULL)
 	    exit(1);
 	(void) strcpy (featurestr, buf + strlen (feature_str) + 1);
 	break;
     case X_EXTERNREF_TOKEN:
-	if ((externrefstr = malloc (strlen (buf + strlen (externref_str)) + 1)) == NULL) 
+	if ((externrefstr = malloc (strlen (buf + strlen (externref_str)) + 1)) == NULL)
 	    exit(1);
 	(void) strcpy (externrefstr, buf + strlen (externref_str) + 1);
 	break;
     case X_EXTERNDEF_TOKEN:
-	if ((externdefstr = malloc (strlen (buf + strlen (externdef_str)) + 1)) == NULL) 
+	if ((externdefstr = malloc (strlen (buf + strlen (externdef_str)) + 1)) == NULL)
 	    exit(1);
 	(void) strcpy (externdefstr, buf + strlen (externdef_str) + 1);
 	break;
     case X_CTMPL_TOKEN:
-	if ((ctmplstr = malloc (strlen (buf + strlen (ctmpl_str)) + 1)) == NULL) 
+	if ((ctmplstr = malloc (strlen (buf + strlen (ctmpl_str)) + 1)) == NULL)
 	    exit(1);
 	(void) strcpy (ctmplstr, buf + strlen (ctmpl_str) + 1);
 	break;
     case X_HTMPL_TOKEN:
 	if ((filecurrent->tmpl = ifopen (buf + strlen (htmpl_str) + 1, "r")) == NULL) {
-	    (void) fprintf (stderr, 
+	    (void) fprintf (stderr,
 			    "Expected template %s, not found\n", htmpl_str);
 	    exit (1);
 	}
@@ -683,7 +683,7 @@ int main(int argc, char *argv[])
     File* phile;
     FILE *f;
     char buf[1024];
-    int abi = 
+    int abi =
 #ifndef ARRAYPERSTR
 	X_DEFAULT_ABI;
 #else
@@ -726,7 +726,7 @@ int main(int argc, char *argv[])
 
     if (f == NULL) return 1;
     while (fgets(buf, sizeof buf, f)) {
-	if (!buf[0] || buf[0] == '\n') 
+	if (!buf[0] || buf[0] == '\n')
 	    continue;
 	if (buf[0] == '!') {
 	    if (tagline) continue;
diff --git a/lib/libXt/util/makestrs.man b/lib/libXt/util/makestrs.man
index 0bb1b0ad3..83027fdea 100644
--- a/lib/libXt/util/makestrs.man
+++ b/lib/libXt/util/makestrs.man
@@ -1,24 +1,24 @@
 .\" Copyright (c) 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 
+.\" 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 
+.\"
+.\" 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
 .\" dealing in this Software without prior written authorization from The
 .\" Open Group.
 .\"
@@ -50,40 +50,40 @@ The following options may be specified:
 and
 .I -defaultabi.
 .LP
-.I -sparcabi 
-is used on SPARC platforms conforming to the SPARC 
+.I -sparcabi
+is used on SPARC platforms conforming to the SPARC
 Compliance Definition, i.e. SVR4/Solaris.
 .LP
-.I -intelabi 
-is used on Intel platforms conforming to the System 
+.I -intelabi
+is used on Intel platforms conforming to the System
 V Application Binary Interface, i.e. SVR4.
 .LP
-.I -earlyR6abi 
-may be used in addition to 
-.I -intelabi 
-for situations 
-where the vendor wishes to maintain binary compatibility between 
+.I -earlyR6abi
+may be used in addition to
+.I -intelabi
+for situations
+where the vendor wishes to maintain binary compatibility between
 X11R6 public-patch 11 (and earlier) and X11R6 public-patch 12 (and later).
 .LP
-.I -functionabi 
-generates a functional abi to the string table. This 
-mechanism imposes a severe performance penalty and it's recommended 
+.I -functionabi
+generates a functional abi to the string table. This
+mechanism imposes a severe performance penalty and it's recommended
 that you not use it.
 .LP
-.I -arrayperabi 
-results in a separate array for each string. This is 
-the default behavior if makestrs was compiled with -DARRAYPERSTR 
+.I -arrayperabi
+results in a separate array for each string. This is
+the default behavior if makestrs was compiled with -DARRAYPERSTR
 (it almost never is).
 .LP
-.I -defaultabi 
-forces the generation of the "normal" string table even 
-if makestrs was compiled with -DARRAYPERSTR. Since makestrs is almost 
-never compiled with -DARRAYPERSTR this is the default behavior if 
+.I -defaultabi
+forces the generation of the "normal" string table even
+if makestrs was compiled with -DARRAYPERSTR. Since makestrs is almost
+never compiled with -DARRAYPERSTR this is the default behavior if
 no abioptions are specified.
 .LP
 .I -i includedir
-forces the reading of templates from the includedir instead of the local 
-directory. This is useful to have separate source and build directories. 
+forces the reading of templates from the includedir instead of the local
+directory. This is useful to have separate source and build directories.
 .SH SYNTAX
 The syntax for string-list file is (items in square brackets are optional):
 .RS 4
@@ -169,7 +169,7 @@ and Motif will use "externaldef(_xmstrings).
 The #ctmpl directive determines the name of the file used as a template
 for the C source file that is generated
 .LP
-Each #file <filename> directive will result in a corresponding header 
+Each #file <filename> directive will result in a corresponding header
 file by that name containing the appropriate definitions as specified
 by command line options. A single C source file containing the
 declarations for the definitions in all the headers will be printed
@@ -198,19 +198,19 @@ up. No warning messages are emitted.
 SPARC Compliance Definition 2.2., SPARC International Inc.,
 535 Middlefield Road, Suite 210, Menlo Park, CA  94025
 .LP
-System V Application Binary Interface, Third Edition, 
+System V Application Binary Interface, Third Edition,
 ISBN 0-13-100439-5
-UNIX Press, PTR Prentice Hall, 113 Sylvan Avenue, Englewood Cliffs, 
+UNIX Press, PTR Prentice Hall, 113 Sylvan Avenue, Englewood Cliffs,
 NJ  07632
 .LP
 System V Application Binary Interface, Third Edition, Intel386
 Architecture Processor Supplement
 ISBN 0-13-104670-5
-UNIX Press, PTR Prentice Hall, 113 Sylvan Avenue, Englewood Cliffs, 
+UNIX Press, PTR Prentice Hall, 113 Sylvan Avenue, Englewood Cliffs,
 NJ  07632
 .LP
 System V Application Binary Interface, Third Edition, SPARC
 Architecture Processor Supplement
 ISBN 0-13-104696-9
-UNIX Press, PTR Prentice Hall, 113 Sylvan Avenue, Englewood Cliffs, 
+UNIX Press, PTR Prentice Hall, 113 Sylvan Avenue, Englewood Cliffs,
 NJ  07632
diff --git a/lib/libXt/util/string.list b/lib/libXt/util/string.list
index 5e8d8519f..49ba7476e 100644
--- a/lib/libXt/util/string.list
+++ b/lib/libXt/util/string.list
@@ -7,7 +7,7 @@
 #prefix Xt
 #feature XTSTRINGDEFINES
 #externref extern
-#externdef 
+#externdef
 ! note that the trailing space is required in the #externdef line.
 #ctmpl util/StrDefs.ct