Merge remote branch 'origin/master' into obsd

33 files changed, 36 insertions, 138 deletions

diff --git a/configure.ac b/configure.ac
index a2907aa..df67282 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,35 +20,36 @@ dnl  PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
 
-AC_PREREQ([2.57])
-AC_INIT(twm,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],twm)
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([twm], [1.0.5],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [twm])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-AM_CONFIG_HEADER(config.h)
-
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-AC_PROG_CC
-AC_PROG_INSTALL
 AC_PROG_YACC
 AC_PATH_PROG([YACC_INST], $YACC)
-AC_CHECK_FILE([$srcdir/gram.c], [],
-              [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile gram.y])])
+if test ! -f "$srcdir/gram.c"; then
+   if test -z "$YACC_INST"; then
+      AC_MSG_ERROR([yacc not found - unable to compile gram.y])
+   fi
+fi
 AC_PROG_LEX
 
-AC_CHECK_FUNC([mkstemp], 
-   AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
+AC_CHECK_FUNCS([mkstemp])
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(TWM, x11 xext xt xmu ice sm)
-AC_SUBST(TWM_CFLAGS)
-AC_SUBST(TWM_LIBS)
-
 
 AC_OUTPUT([Makefile
 	   src/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
index 86316e8..7d45968 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,5 @@
-# $Id$
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -20,7 +19,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
-# 
+#
 
 appmandir = $(APP_MAN_DIR)
 
@@ -32,20 +31,8 @@ EXTRA_DIST = $(appman_PRE)
 
 CLEANFILES = $(appman_DATA)
 
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__projectroot__|$(prefix)|g' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/twm.man b/man/twm.man
index 888e57f..ab23f74 100644
--- a/man/twm.man
+++ b/man/twm.man
@@ -1,4 +1,3 @@
-.\" $Xorg: twm.man,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
 .\" Copyright 1993, 1994, 1998  The Open Group
 .\" Portions copyright 1988 Evans & Sutherland Computer Corporation.
 .\" Portions copyright 1989 Hewlett-Packard Company
@@ -25,8 +24,6 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/twm/twm.man,v 1.9 2001/12/14 20:01:10 dawes Exp $
-.\"
 .de EX		\"Begin example
 .ne 5
 .if n .sp 1
diff --git a/src/Makefile.am b/src/Makefile.am
index dc0fe72..cb6f615 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,14 +71,14 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 gram.h: gram.c
 
 deftwmrc.c:  system.twmrc
-	rm -f $@
-	echo '/* ' >>$@
-	echo ' * This file is generated automatically from the default' >>$@
-	echo ' * twm bindings file system.twmrc by the twm Imakefile.' >>$@
-	echo ' */' >>$@
-	echo '' >>$@
-	echo 'unsigned char *defTwmrc[] = {' >>$@
-	sed -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmrc >>$@
+	$(AM_V_GEN)rm -f $@ ; \
+	echo '/* ' >>$@ ; \
+	echo ' * This file is generated automatically from the default' >>$@ ; \
+	echo ' * twm bindings file system.twmrc by the twm Makefile.' >>$@ ; \
+	echo ' */' >>$@ ; \
+	echo '' >>$@ ; \
+	echo 'unsigned char *defTwmrc[] = {' >>$@ ; \
+	sed -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmrc >>$@ ; \
 	echo '    (unsigned char *) 0 };' >>$@
 
-EXTRA_DIST = system.twmrc deftwmrc.sed siconify.bm
+EXTRA_DIST = deftwmrc.sed siconify.bm
diff --git a/src/add_window.c b/src/add_window.c
index 47610a6..af7e384 100644
--- a/src/add_window.c
+++ b/src/add_window.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/twm/add_window.c,v 1.11 2002/04/04 14:05:58 eich Exp $ */
 /*****************************************************************************/
 /*
 
@@ -53,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /**********************************************************************
  *
- * $Xorg: add_window.c,v 1.5 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Add a new window, put the titlbar and other stuff around
  * the window
  *
diff --git a/src/add_window.h b/src/add_window.h
index 190c9ff..9b883cb 100644
--- a/src/add_window.h
+++ b/src/add_window.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/add_window.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: add_window.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * AddWindow include file
  *
  * 31-Mar-88 Tom LaStrange        Initial Version.
diff --git a/src/cursor.c b/src/cursor.c
index 3c15bd4..83c827e 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -22,12 +22,9 @@ 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.
  * */
-/* $XFree86: xc/programs/twm/cursor.c,v 1.4 2001/01/17 23:45:05 dawes Exp $ */
 
 /***********************************************************************
  *
- * $Xorg: cursor.c,v 1.5 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * cursor creation code
  *
  * 05-Apr-89 Thomas E. LaStrange	File created
diff --git a/src/events.c b/src/events.c
index 57399a1..7df232a 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/twm/events.c,v 1.12 2001/12/14 20:01:06 dawes Exp $ */
 /*****************************************************************************/
 /*
 
@@ -53,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: events.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * twm event handling
  *
  * 17-Nov-87 Thomas E. LaStrange		File created
diff --git a/src/events.h b/src/events.h
index 6bc941e..3ed340b 100644
--- a/src/events.h
+++ b/src/events.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/events.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */
 
 
 /***********************************************************************
  *
- * $Xorg: events.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * twm event handler include file
  *
  * 17-Nov-87 Thomas E. LaStrange		File created
diff --git a/src/gc.c b/src/gc.c
index 65a94f5..a1cb613 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /*    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    */
 /*    OR PERFORMANCE OF THIS SOFTWARE.                                     */
 /*********************************************************************(*****/
-/* $XFree86: xc/programs/twm/gc.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: gc.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Open the fonts and create the GCs
  *
  * 31-Mar-88 Tom LaStrange        Initial Version.
diff --git a/src/gc.h b/src/gc.h
index c0b9566..2d71509 100644
--- a/src/gc.h
+++ b/src/gc.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/gc.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: gc.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * GC related externs
  *
  *  8-Apr-88 Tom LaStrange        Initial Version.
diff --git a/src/iconmgr.c b/src/iconmgr.c
index 9eebf9f..e0fea0a 100644
--- a/src/iconmgr.c
+++ b/src/iconmgr.c
@@ -22,18 +22,14 @@ 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.
  * */
-/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */
 
 /***********************************************************************
  *
- * $Xorg: iconmgr.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Icon Manager routines
  *
  * 09-Mar-89 Tom LaStrange		File Created
  *
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */
 
 #include <stdio.h>
 #include "twm.h"
diff --git a/src/iconmgr.h b/src/iconmgr.h
index eba3dc5..8e8e515 100644
--- a/src/iconmgr.h
+++ b/src/iconmgr.h
@@ -22,12 +22,9 @@ 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.
  * */
-/* $XFree86: xc/programs/twm/iconmgr.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */
 
 /***********************************************************************
  *
- * $Xorg: iconmgr.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Icon Manager includes
  *
  * 09-Mar-89 Tom LaStrange		File Created
diff --git a/src/icons.c b/src/icons.c
index be0410d..d026f4a 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -22,12 +22,9 @@ 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.
  * */
-/* $XFree86: xc/programs/twm/icons.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */
 
 /**********************************************************************
  *
- * $Xorg: icons.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Icon releated routines
  *
  * 10-Apr-89 Tom LaStrange        Initial Version.
diff --git a/src/icons.h b/src/icons.h
index a59e42c..c2fcfb3 100644
--- a/src/icons.h
+++ b/src/icons.h
@@ -22,12 +22,9 @@ 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.
  * */
-/* $XFree86: xc/programs/twm/icons.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */
 
 /**********************************************************************
  *
- * $Xorg: icons.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Icon releated definitions
  *
  * 10-Apr-89 Tom LaStrange        Initial Version.
diff --git a/src/list.c b/src/list.c
index 9a5b4f5..d2ba75a 100644
--- a/src/list.c
+++ b/src/list.c
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/list.c,v 1.8 2002/09/24 21:00:27 tsi Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: list.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * TWM code to deal with the name lists for the NoTitle list and
  * the AutoRaise list
  *
diff --git a/src/list.h b/src/list.h
index 35488f5..c67785d 100644
--- a/src/list.h
+++ b/src/list.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/list.h,v 1.4 2001/01/17 23:45:07 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: list.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * TWM list handling external definitions
  *
  * 11-Apr-88 Tom LaStrange        Initial Version.
diff --git a/src/menus.c b/src/menus.c
index eaf9cf9..4c10ded 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/twm/menus.c,v 1.18tsi Exp $ */
 /*****************************************************************************/
 /*
 
@@ -53,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: menus.c,v 1.6 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * twm menu code
  *
  * 17-Nov-87 Thomas E. LaStrange		File created
diff --git a/src/menus.h b/src/menus.h
index 6e8c31f..0a75622 100644
--- a/src/menus.h
+++ b/src/menus.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/menus.h,v 1.5 2001/08/27 21:11:40 dawes Exp $ */
 
 
 /***********************************************************************
  *
- * $Xorg: menus.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * twm menus include file
  *
  * 17-Nov-87 Thomas E. LaStrange		File created
diff --git a/src/parse.c b/src/parse.c
index c89da98..0734d9e 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: $ */
-/* $XFree86: xc/programs/twm/parse.c,v 1.15 2002/09/24 21:00:28 tsi Exp $ */
 /*****************************************************************************/
 /*
 
@@ -54,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: parse.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * parse the .twmrc file
  *
  * 17-Nov-87 Thomas E. LaStrange       File created
diff --git a/src/parse.h b/src/parse.h
index 1768f10..35ef932 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -1,5 +1,3 @@
-/* $XdotOrg: $ */
-/* $XFree86: xc/programs/twm/parse.h,v 1.10 2001/09/30 17:58:19 herrb Exp $ */
 /*****************************************************************************/
 /*
 
@@ -54,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /**********************************************************************
  *
- * $Xorg: parse.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * .twmrc parsing externs
  *
  *  8-Apr-88 Tom LaStrange        Initial Version.
diff --git a/src/resize.c b/src/resize.c
index a6950d7..cd7550f 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -52,16 +52,12 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: resize.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * window resizing borrowed from the "wm" window manager
  *
  * 11-Dec-87 Thomas E. LaStrange                File created
  *
  ***********************************************************************/
 
-/* $XFree86: xc/programs/twm/resize.c,v 1.7 2001/01/17 23:45:07 dawes Exp $ */
-
 #include <stdio.h>
 #include "twm.h"
 #include "parse.h"
diff --git a/src/resize.h b/src/resize.h
index 4cee8f2..0f4b675 100644
--- a/src/resize.h
+++ b/src/resize.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/resize.h,v 1.4 2001/01/17 23:45:08 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: resize.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * resize function externs
  *
  *  8-Apr-88 Tom LaStrange        Initial Version.
diff --git a/src/screen.h b/src/screen.h
index 2299262..db40be1 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -25,14 +25,11 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: screen.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * twm per-screen data include file
  *
  * 11-3-88 Dave Payne, Apple Computer			File created
  *
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/screen.h,v 1.4 2001/01/17 23:45:08 dawes Exp $ */
 
 #ifndef _SCREEN_
 #define _SCREEN_
diff --git a/src/session.c b/src/session.c
index 87af4e1..c878ea6 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1,5 +1,3 @@
-/* $Xorg: session.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ */
-/* $XdotOrg: app/twm/src/session.c,v 1.3 2005/07/16 22:07:13 alanc Exp $ */
 /******************************************************************************
 
 Copyright 1994, 1998  The Open Group
@@ -26,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 Author:  Ralph Mor, X Consortium
 ******************************************************************************/
-/* $XFree86: xc/programs/twm/session.c,v 3.8 2001/12/14 20:01:10 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -53,7 +50,7 @@ Author:  Ralph Mor, X Consortium
 #endif
 #endif
 #endif /* PATH_MAX */
-#ifdef HAS_MKSTEMP
+#ifdef HAVE_MKSTEMP
 #include <unistd.h>
 #endif
 
@@ -74,7 +71,7 @@ Bool sent_save_done = 0;
 
 #define SAVEFILE_VERSION 2
 
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
 static char *unique_filename ( char *path, char *prefix );
 #else
 static char *unique_filename ( char *path, char *prefix, int *pFd );
@@ -720,7 +717,7 @@ Bool *height_ever_changed_by_user;
 
 
 
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
 static char *
 unique_filename (path, prefix)
 char *path;
@@ -734,7 +731,7 @@ int *pFd;
 #endif
 
 {
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
 #ifndef X_NOT_POSIX
     return ((char *) tempnam (path, prefix));
 #else
@@ -783,7 +780,7 @@ SmPointer clientData;
     char discardCommand[80];
     int numVals, i;
     static int first_time = 1;
-#ifdef HAS_MKSTEMP
+#ifdef HAVE_MKSTEMP
     int fd;
 #endif
 
@@ -830,7 +827,7 @@ SmPointer clientData;
 	if (!path)
 	    path = ".";
     }
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
     if ((filename = unique_filename (path, ".twm")) == NULL)
 	goto bad;
 
diff --git a/src/session.h b/src/session.h
index cc59a7d..21f951a 100644
--- a/src/session.h
+++ b/src/session.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/twm/session.h,v 1.1 1999/02/20 14:55:52 hohndel Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
diff --git a/src/system.twmrc b/src/system.twmrc
index c2fcefa..f346dbe 100644
--- a/src/system.twmrc
+++ b/src/system.twmrc
@@ -1,6 +1,4 @@
 #
-# $Xorg: system.twmrc,v 1.3 2000/08/17 19:54:08 cpqbld Exp $
-# 
 # Default twm configuration file; needs to be kept small to conserve string
 # space in systems whose compilers don't handle medium-sized strings.
 #
@@ -9,8 +7,6 @@
 # users were accustomed to uwm, the defaults could be set up not to decorate
 # any windows and to use meta-keys.
 #
-# $XFree86: xc/programs/twm/system.twmrc,v 1.4 2001/01/17 23:45:08 dawes Exp $
-#
 
 NoGrabServer
 RestartPreviousState
diff --git a/src/twm.c b/src/twm.c
index f0f645e..adbd071 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -53,15 +53,12 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: twm.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * twm - "Tom's Window Manager"
  *
  * 27-Oct-1987 Thomas E. LaStrange    File created
  * 10-Oct-1990 David M. Sternlicht    Storing saved colors on root
  * 19-Feb-2005 Julien Lafon           Handle print screens for unified Xserver
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/twm.c,v 3.13 2003/04/21 08:15:10 herrb Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/src/twm.h b/src/twm.h
index 1998af1..420d6c8 100644
--- a/src/twm.h
+++ b/src/twm.h
@@ -53,14 +53,11 @@ from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: twm.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * twm include file
  *
  * 28-Oct-87 Thomas E. LaStrange	File created
  * 10-Oct-90 David M. Sternlicht        Storeing saved colors on root
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/twm.h,v 3.12 2001/12/14 20:01:10 dawes Exp $ */
 
 #ifndef _TWM_
 #define _TWM_
diff --git a/src/util.c b/src/util.c
index 50675fd..ee30d06 100644
--- a/src/util.c
+++ b/src/util.c
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/util.c,v 1.12 2002/09/19 13:22:05 tsi Exp $ */
 
 
 /***********************************************************************
  *
- * $Xorg: util.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * utility routines for twm
  *
  * 28-Oct-87 Thomas E. LaStrange	File created
diff --git a/src/util.h b/src/util.h
index 4cbd091..216e9d9 100644
--- a/src/util.h
+++ b/src/util.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/util.h,v 1.6 2001/01/17 23:45:08 dawes Exp $ */
 
 
 /***********************************************************************
  *
- * $Xorg: util.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * utility routines header file
  *
  * 28-Oct-87 Thomas E. LaStrange		File created
diff --git a/src/version.c b/src/version.c
index ecd0d71..b50a129 100644
--- a/src/version.c
+++ b/src/version.c
@@ -49,6 +49,5 @@ in this Software without prior written authorization from The Open Group.
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
 
-/* $Xorg: version.c,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ */
 char *Version = XVENDORNAME", "XORG_RELEASE;
 
diff --git a/src/version.h b/src/version.h
index d232190..0239c2b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -51,8 +51,6 @@ in this Software without prior written authorization from The Open Group.
 
 /**********************************************************************
  *
- * $Xorg: version.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * TWM version externs
  *
  *  8-Apr-88 Tom LaStrange        Initial Version.