import rgb 1.0.3

2008-11-16 20:22:52 +01:00 · 2008-11-16 20:22:52 +01:00 · c665e83050
parent a40f466af3
commit c665e83050
20 changed files with 3490 additions and 2074 deletions
--- a/rgb/COPYING
+++ b/rgb/COPYING
@ -21,3 +21,30 @@ 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 1994, 2008 Sun Microsystems, Inc.  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"), to deal in the Software without restriction, including
 without limitation the rights to use, copy, modify, merge, publish,
 distribute, and/or sell copies of the Software, and to permit persons
 to whom the Software is furnished to do so, provided that the above
 copyright notice(s) and this permission notice appear in all copies of
 the Software and that both the above copyright notice(s) and this
 permission notice appear in supporting documentation.
 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
 OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
 HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
 INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
 FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
 NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 Except as contained in this notice, the name of a copyright holder
 shall not be used in advertising or otherwise to promote the sale, use
 or other dealings in this Software without prior written authorization
 of the copyright holder.
--- a/rgb/ChangeLog
+++ b/rgb/ChangeLog
@ -1,53 +1,276 @@
-2006-05-15  Adam Jackson  <ajax@freedesktop.org>
+commit f0c7399100f25d2c512ee7c922cf13a4bd9c507e
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu Jun 5 20:17:09 2008 -0700
-	* configure.ac:
+    rgb version 1.0.3
-	Bump to 1.0.1
+    
    Don't you hate it when you push out a new version and then realize minutes
    later than you've got a manpage in your distro that's not in upstream you
    could have included?
-2006-04-28  Jeremy C. Reed  <reed@reedmedia.net>
+commit 2e8b928b2176a67a0d533748f385078ad8829cc3
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu Jun 5 20:13:35 2008 -0700
-	reviewed by: Adam Jackson
+    Include rgb(1) man page from Solaris
-	* configure.ac:
+commit bd94a52404b0e23a61e6ca330b759fdd82a59996
-	pkg-config check for xproto instead of x11.
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu Jun 5 18:25:47 2008 -0700
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    rgb version 1.0.2
-	* configure.ac:
+commit 7bb6478c651dcb576e2a0ff756365f52d9db04e4
-	Update package version number for final X11R7 release candidate.
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Jun 4 20:24:05 2008 -0700
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Update showrgb man page to better match current implementation
-	* Makefile.am:
+commit 749182c37cb455939ba327e9420dd652c0ff58a1
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Jun 4 20:16:12 2008 -0700
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Nuke CVS version tags
-	* configure.ac:
+commit 11193caceaa02f639d1e8a701ed92947e7eaad36
-	Update package version number for X11R7 RC3 release.
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Jun 4 20:09:01 2008 -0700
-2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Fix build to work with --with-rgb-db-type=dbm
-	* configure.ac:
+commit 0351f14a999264c152d7c585fc91ad4901e3c776
-	Change the default rgb dir to be the same path as the X server.
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Jun 4 19:40:44 2008 -0700
-2005-11-23  Alan Coopersmith  <alan.coopersmith@sun.com>
+    Fix build to work with --with-rgb-db-type=ndbm
    Also remove #includes of unused headers & convert K&R to ANSI C
-	* configure.ac: 
+commit 7a327431337875e81094aaed0002c89041a0f570
-	Fix --with-rgb-dir help string to give the right flag name.
+Author: James Cloos <cloos@jhcloos.com>
 Date:   Thu Dec 6 16:37:05 2007 -0500
-2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Replace static ChangeLog with dist-hook to generate from git log
-	* Makefile.am:
+commit 42c6e9a89d45c897c82f7ec1973f66aa1190d241
-	* configure.ac:
+Author: James Cloos <cloos@jhcloos.com>
-	Update dependencies to work with separate build roots.
+Date:   Mon Sep 3 05:51:08 2007 -0400
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Add *~ to .gitignore to skip patch/emacs droppings
-	* configure.ac:
+commit 654ea29b1abed12d88e5a38abbf538779c679922
-	Update package version number for X11R7 RC2 release.
+Author: James Cloos <cloos@jhcloos.com>
 Date:   Thu Aug 23 19:24:33 2007 -0400
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Rename .cvsignore to .gitignore
-	* configure.ac:
+commit d96f362956d9e58cbb46740f825d5bad50f0fbf1
-	Update package version number for RC1 release.
+Author: Adam Jackson <ajax@nwnk.net>
 Date:   Fri May 19 18:30:39 2006 +0000
    Bump to 1.0.1
 commit 808ad54d56095cc09138e2d25580009daed47c8f
 Author: Jeremy C. Reed <reed@reedmedia.net>
 Date:   Fri Apr 28 17:13:37 2006 +0000
    pkg-config check for xproto instead of x11.
 commit 4a9b01708d7d0ea08534e0699311a41e8b55a9d7
 Author: Kevin E Martin <kem@kem.org>
 Date:   Thu Dec 15 00:24:03 2005 +0000
    Update package version number for final X11R7 release candidate.
 commit a5dfa8230f98bf7f21046f9217cee5461587e620
 Author: Kevin E Martin <kem@kem.org>
 Date:   Tue Dec 6 22:48:18 2005 +0000
    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
 commit 159ab1fbe0dbb05699cc847862f135a216cfa8a0
 Author: Kevin E Martin <kem@kem.org>
 Date:   Sat Dec 3 05:49:17 2005 +0000
    Update package version number for X11R7 RC3 release.
 commit f1226de089929e89ed0e77535ae129373935f4b5
 Author: Kevin E Martin <kem@kem.org>
 Date:   Fri Dec 2 01:40:06 2005 +0000
    Change the default rgb dir to be the same path as the X server.
 commit 93b6b4cda7a0a2323a10405bb8b7af0e4a1a6110
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Nov 28 22:01:38 2005 +0000
    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
 commit 7b13cbbdbd82403fff16fbbde0c0150f051ebdfa
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Thu Nov 24 00:25:59 2005 +0000
    Fix --with-rgb-dir help string to give the right flag name.
 commit 191f46bdd6a7ed44e22d5a8a095939697649e669
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Mon Nov 21 10:34:57 2005 +0000
    Another pass at .cvsignores for apps.
 commit 46f1e5df56048a5d93aca3cb800e78dbba084846
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Sun Nov 20 22:08:49 2005 +0000
    Add/improve .cvsignore files for apps.
 commit f9fe12f84b6f774b696cc3075ec22b9605fdbb65
 Author: Kevin E Martin <kem@kem.org>
 Date:   Sat Nov 19 07:15:35 2005 +0000
    Update pkgconfig files to separate library build-time dependencies from
        application build-time dependencies, and update package deps to work
        with separate build roots.
 commit 3a2f377dbbea0b5aca6986f90e92b54ddc106dfb
 Author: Kevin E Martin <kem@kem.org>
 Date:   Wed Nov 9 21:09:20 2005 +0000
    Update package version number for X11R7 RC2 release.
 commit 93b884959f2a9ef4c893ffa3d26ecef13c1ca4e8
 Author: Kean Johnson <kean@armory.com>
 Date:   Tue Nov 8 06:33:31 2005 +0000
    See ChangeLog entry 2005-11-07 for details.
 commit cb599821a3c8dd2136b3d207911c74c2e5ad571c
 Author: Kevin E Martin <kem@kem.org>
 Date:   Wed Oct 19 02:47:49 2005 +0000
    Update package version number for RC1 release.
 commit e6ddb673f5835bf7b9804fa29e62edd20419ea47
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Oct 17 23:56:20 2005 +0000
    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
        work better with BSD make
 commit 15bccd547d6038edb9cbc4f9ad02dfbed6f9dcb8
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Fri Oct 14 00:25:42 2005 +0000
    Use sed to fill in variables in man page
 commit 9ee0a8cb83cfcf475441e393bfa04ea4fcbf49f9
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Aug 1 22:35:37 2005 +0000
    Change default install dir for rgb.txt from libdir to libdir/X11, since
        that's where Xorg looks for it
 commit fbb5f013d40c7a0ea26ac33a5abce1e9dd0ccadc
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Aug 1 20:25:28 2005 +0000
    Install man pages to section 1 instead of section m (Patch from Donnie
        Berkholz)
 commit 321c5f16ba1851a96a12bc5bafa832c3b9ac08e9
 Author: Kevin E Martin <kem@kem.org>
 Date:   Fri Jul 29 21:22:30 2005 +0000
    Various changes preparing packages for RC0:
    - Verify and update package version numbers as needed
    - Implement versioning scheme
    - Change bug address to point to bugzilla bug entry form
    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
        reenable it)
    - Fix makedepend to use pkgconfig and pass distcheck
    - Update build script to build macros first
    - Update modular Xorg version
 commit 1dda7081659c8d5eacbfed77ee0aa594b17440a0
 Author: Kevin E Martin <kem@kem.org>
 Date:   Thu Jul 28 15:57:12 2005 +0000
    Fix distcheck for remaining apps
 commit 794993251c8700061f84246f87ec3c060f2ffb37
 Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
 Date:   Wed Jul 27 19:40:28 2005 +0000
    Check for xproto
 commit 4531a95fde3e9e0dac1e24c0e140094d24503ce2
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Sat Jul 23 15:32:50 2005 +0000
    Don't link in -lucb on Solaris
    #ifdef HAVE_CONFIG_H/#include "config.h" for modularization
 commit d468fba83ec0d963f70ac0f6be47c41ce4080803
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Thu Jul 21 04:21:06 2005 +0000
    oops, forgot to cvs add autogen.sh
 commit ab0ad07c8529ee5d5da88de28956f81b9ecf833c
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Thu Jul 21 04:20:35 2005 +0000
    Initial autotooling of rgb/showrgb (Defaults to flat text file - dbm/ndbm
        support partially implemented, but not yet buildable since it requires
        site.h & rgb.h from Xserver/includes)
 commit 7a676fdf168ed250baef3b99393f3dccbda91a7e
 Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
 Date:   Wed Jun 29 18:20:16 2005 +0000
    Add build system for rgb symlink.sh: Link pmconfig.cpp, link various text
        files for rgb xc/programs/rgb/showrgb.c: Don't include rgb.h and site.h
        when USE_RGB_TXT is defined
 commit ad45da26f8f399bad12c6af78cc211f1dc563e58
 Author: Egbert Eich <eich@suse.de>
 Date:   Fri Apr 23 19:54:36 2004 +0000
    Merging XORG-CURRENT into trunk
 commit a1edb12b592188781e4a18898fb1cd3fab472e4f
 Author: Egbert Eich <eich@suse.de>
 Date:   Sun Mar 14 08:34:55 2004 +0000
    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
 commit 2c7849cf40d3f24e14a9668110a93e35a9120cd9
 Author: Egbert Eich <eich@suse.de>
 Date:   Wed Mar 3 12:12:53 2004 +0000
    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
 commit 3798295f9b9e66543233d7fd44e95a244f0f8b06
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 13:36:15 2004 +0000
    readding XFree86's cvs IDs
 commit 3bfe5e286e3ca975e1a0e12bbb527f73bbf443aa
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 09:23:57 2004 +0000
    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
 commit da58b20fd4fd40bccb34ce2e8f1401fc994c973c
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 16:48:58 2003 +0000
    XFree86 4.3.0.1
 commit 1f2079d6943e2c85edbeeb4309f7ec5e216ee640
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 15:54:53 2003 +0000
    R6.6 is the Xorg base-line
--- a/rgb/INSTALL
+++ b/rgb/INSTALL
@ -1,236 +0,0 @@
 Installation Instructions
 *************************
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
 Software Foundation, Inc.
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
 These are generic installation instructions.
   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
 you can run in the future to recreate the current configuration, and a
 file `config.log' containing compiler output (useful mainly for
 debugging `configure').
   It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
 the results of its tests to speed up reconfiguring.  (Caching is
 disabled by default to prevent problems with accidental use of stale
 cache files.)
   If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If you are using the cache, and at
 some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
   The file `configure.ac' (or `configure.in') is used to create
 `configure' by a program called `autoconf'.  You only need
 `configure.ac' if you want to change it or regenerate `configure' using
 a newer version of `autoconf'.
 The simplest way to compile this package is:
  1. `cd' to the directory containing the package's source code and type
     `./configure' to configure the package for your system.  If you're
     using `csh' on an old version of System V, you might need to type
     `sh ./configure' instead to prevent `csh' from trying to execute
     `configure' itself.
     Running `configure' takes awhile.  While running, it prints some
     messages telling which features it is checking for.
  2. Type `make' to compile the package.
  3. Optionally, type `make check' to run any self-tests that come with
     the package.
  4. Type `make install' to install the programs and any data files and
     documentation.
  5. You can remove the program binaries and object files from the
     source code directory by typing `make clean'.  To also remove the
     files that `configure' created (so you can compile the package for
     a different kind of computer), type `make distclean'.  There is
     also a `make maintainer-clean' target, but that is intended mainly
     for the package's developers.  If you use it, you may have to get
     all sorts of other programs in order to regenerate files that came
     with the distribution.
 Compilers and Options
 =====================
 Some systems require unusual options for compilation or linking that the
 `configure' script does not know about.  Run `./configure --help' for
 details on some of the pertinent environment variables.
   You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
   *Note Defining Variables::, for more details.
 Compiling For Multiple Architectures
 ====================================
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
   If you have to use a `make' that does not support the `VPATH'
 variable, you have to compile the package for one architecture at a
 time in the source code directory.  After you have installed the
 package for one architecture, use `make distclean' before reconfiguring
 for another architecture.
 Installation Names
 ==================
 By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
   You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
 pass the option `--exec-prefix=PREFIX' to `configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
   In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
   If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
 `README' should mention any `--enable-' and `--with-' options that the
 package recognizes.
   For packages that use the X Window System, `configure' can usually
 find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 Specifying the System Type
 ==========================
 There may be some features `configure' cannot figure out automatically,
 but needs to determine by the type of machine the package will run on.
 Usually, assuming the package is built to be run on the _same_
 architectures, `configure' can figure that out, but if it prints a
 message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
     CPU-COMPANY-SYSTEM
 where SYSTEM can have one of these forms:
     OS KERNEL-OS
   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
 need to know the machine type.
   If you are _building_ compiler tools for cross-compiling, you should
 use the option `--target=TYPE' to select the type of system they will
 produce code for.
   If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
 eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 If you want to set default values for `configure' scripts to share, you
 can create a site shell script called `config.site' that gives default
 values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
 them in the `configure' command line, using `VAR=value'.  For example:
     ./configure CC=/usr/local2/bin/gcc
 causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).  Here is a another example:
     /bin/bash ./configure CONFIG_SHELL=/bin/bash
 Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
 configuration-related scripts to be executed by `/bin/bash'.
 `configure' Invocation
 ======================
 `configure' recognizes the following options to control how it operates.
 `--help'
 `-h'
     Print a summary of the options to `configure', and exit.
 `--version'
 `-V'
     Print the version of Autoconf used to generate the `configure'
     script, and exit.
 `--cache-file=FILE'
     Enable the cache: use and save the results of the tests in FILE,
     traditionally `config.cache'.  FILE defaults to `/dev/null' to
     disable caching.
 `--config-cache'
 `-C'
     Alias for `--cache-file=config.cache'.
 `--quiet'
 `--silent'
 `-q'
     Do not print messages saying which checks are being made.  To
     suppress all normal output, redirect it to `/dev/null' (any error
     messages will still be shown).
 `--srcdir=DIR'
     Look for the package's source code in directory DIR.  Usually
     `configure' can determine that directory automatically.
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
--- a/rgb/Makefile.am
+++ b/rgb/Makefile.am
@ -1,4 +1,4 @@
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@ -27,24 +27,28 @@
 # 
 if RGB_TXT
 bin_PROGRAMS = showrgb
 else
 bin_PROGRAMS = rgb showrgb
-rgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
+showrgb_SOURCES =  showrgb.c
 appman_PRE = showrgb.man
 if RGB_DB
 bin_PROGRAMS += rgb
 rgb_SOURCES = rgb.c 
 appman_PRE += rgb.man
 $(RGB_DB_FILES): rgb rgb.txt
 	-rm -f $(RGB_DB_FILES)
 	./rgb rgb < $(srcdir)/rgb.txt
 endif
 rgbdir = $(db_dir)
 rgb_DATA = $(db_file).txt $(RGB_DB_FILES)
 RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\"
-
+AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
 showrgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
 showrgb_SOURCES =  showrgb.c
 appman_PRE = \
        showrgb.man
 EXTRA_DIST= \
 	rgb.txt \
@ -58,7 +62,7 @@ appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 EXTRA_DIST += $(appman_PRE)
-CLEANFILES = $(appman_DATA)
+CLEANFILES = $(appman_DATA) $(RGB_DB_FILES)
 SED = sed
@ -67,6 +71,10 @@ XORGRELSTRING = @PACKAGE_STRING@
  XORGMANNAME = X Version 11
 MAN_SUBSTS = \
 	-e 's|__RGB_DB__|$(db_dir)/$(db_file)|' \
 	-e 's|__RGB_DB_DIR__|$(db_dir)|' \
 	-e 's|__RGB_DB_TYPE__|$(RGB_DB_TYPE)|' \
 	-e 's|__RGB_DB_FILES__|$(RGB_DB_FILES)|' \
 	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xservername__|Xorg|g' \
@ -83,3 +91,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
 EXTRA_DIST += ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 ChangeLog:
 	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 dist-hook: ChangeLog
--- a/rgb/Makefile.in
+++ b/rgb/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -14,7 +14,7 @@
@SET_MAKE@
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@ -43,15 +43,11 @@
 # 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@ -65,34 +61,36 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@RGB_TXT_FALSE@bin_PROGRAMS = rgb$(EXEEXT) showrgb$(EXEEXT)
+bin_PROGRAMS = showrgb$(EXEEXT) $(am__EXEEXT_1)
-@RGB_TXT_TRUE@bin_PROGRAMS = showrgb$(EXEEXT)
+@RGB_DB_TRUE@am__append_1 = rgb
@RGB_DB_TRUE@am__append_2 = rgb.man
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh missing
+	config.guess config.sub depcomp install-sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
@RGB_DB_TRUE@am__EXEEXT_1 = rgb$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
 	"$(DESTDIR)$(rgbdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am__rgb_SOURCES_DIST = rgb.c
-@RGB_TXT_FALSE@am_rgb_OBJECTS = rgb-rgb.$(OBJEXT)
+@RGB_DB_TRUE@am_rgb_OBJECTS = rgb.$(OBJEXT)
 rgb_OBJECTS = $(am_rgb_OBJECTS)
 rgb_LDADD = $(LDADD)
-am_showrgb_OBJECTS = showrgb-showrgb.$(OBJEXT)
+am_showrgb_OBJECTS = showrgb.$(OBJEXT)
 showrgb_OBJECTS = $(am_showrgb_OBJECTS)
 showrgb_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -126,8 +124,6 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@ -138,6 +134,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@ -147,9 +144,12 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -161,11 +161,10 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -177,16 +176,19 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RGB_CFLAGS = @RGB_CFLAGS@
 RGB_DB_FILES = @RGB_DB_FILES@
 RGB_DB_TYPE = @RGB_DB_TYPE@
 RGB_LIBS = @RGB_LIBS@
 RGB_TXT_FALSE = @RGB_TXT_FALSE@
 RGB_TXT_TRUE = @RGB_TXT_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -198,6 +200,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 db_dir = @db_dir@
@ -227,29 +230,33 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@RGB_TXT_FALSE@rgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
+top_builddir = @top_builddir@
-@RGB_TXT_FALSE@rgb_SOURCES = rgb.c 
+top_srcdir = @top_srcdir@
 showrgb_SOURCES = showrgb.c
 appman_PRE = showrgb.man $(am__append_2)
@RGB_DB_TRUE@rgb_SOURCES = rgb.c 
 rgbdir = $(db_dir)
 rgb_DATA = $(db_file).txt $(RGB_DB_FILES)
 RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\"
-showrgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
+AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
 showrgb_SOURCES = showrgb.c
 appman_PRE = \
        showrgb.man
 EXTRA_DIST = rgb.txt others/README others/old-rgb.txt \
-	others/raveling.txt others/thomas.txt $(appman_PRE)
+	others/raveling.txt others/thomas.txt $(appman_PRE) ChangeLog
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-CLEANFILES = $(appman_DATA)
+CLEANFILES = $(appman_DATA) $(RGB_DB_FILES)
 SED = sed
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
 XORGMANNAME = X Version 11
 MAN_SUBSTS = \
 	-e 's|__RGB_DB__|$(db_dir)/$(db_file)|' \
 	-e 's|__RGB_DB_DIR__|$(db_dir)|' \
 	-e 's|__RGB_DB_TYPE__|$(RGB_DB_TYPE)|' \
 	-e 's|__RGB_DB_FILES__|$(RGB_DB_FILES)|' \
 	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xservername__|Xorg|g' \
@ -263,6 +270,7 @@ MAN_SUBSTS = \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 MAINTAINERCLEANFILES = ChangeLog
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@ -305,7 +313,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@ -320,7 +328,7 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@ -343,10 +351,10 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 rgb$(EXEEXT): $(rgb_OBJECTS) $(rgb_DEPENDENCIES) 
 	@rm -f rgb$(EXEEXT)
-	$(LINK) $(rgb_LDFLAGS) $(rgb_OBJECTS) $(rgb_LDADD) $(LIBS)
+	$(LINK) $(rgb_OBJECTS) $(rgb_LDADD) $(LIBS)
 showrgb$(EXEEXT): $(showrgb_OBJECTS) $(showrgb_DEPENDENCIES) 
 	@rm -f showrgb$(EXEEXT)
-	$(LINK) $(showrgb_LDFLAGS) $(showrgb_OBJECTS) $(showrgb_LDADD) $(LIBS)
+	$(LINK) $(showrgb_OBJECTS) $(showrgb_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -354,54 +362,25 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb-rgb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showrgb-showrgb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showrgb.Po@am__quote@
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 rgb-rgb.o: rgb.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -MT rgb-rgb.o -MD -MP -MF "$(DEPDIR)/rgb-rgb.Tpo" -c -o rgb-rgb.o `test -f 'rgb.c' || echo '$(srcdir)/'`rgb.c; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/rgb-rgb.Tpo" "$(DEPDIR)/rgb-rgb.Po"; else rm -f "$(DEPDIR)/rgb-rgb.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rgb.c' object='rgb-rgb.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -c -o rgb-rgb.o `test -f 'rgb.c' || echo '$(srcdir)/'`rgb.c
 rgb-rgb.obj: rgb.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -MT rgb-rgb.obj -MD -MP -MF "$(DEPDIR)/rgb-rgb.Tpo" -c -o rgb-rgb.obj `if test -f 'rgb.c'; then $(CYGPATH_W) 'rgb.c'; else $(CYGPATH_W) '$(srcdir)/rgb.c'; fi`; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/rgb-rgb.Tpo" "$(DEPDIR)/rgb-rgb.Po"; else rm -f "$(DEPDIR)/rgb-rgb.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rgb.c' object='rgb-rgb.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -c -o rgb-rgb.obj `if test -f 'rgb.c'; then $(CYGPATH_W) 'rgb.c'; else $(CYGPATH_W) '$(srcdir)/rgb.c'; fi`
 showrgb-showrgb.o: showrgb.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -MT showrgb-showrgb.o -MD -MP -MF "$(DEPDIR)/showrgb-showrgb.Tpo" -c -o showrgb-showrgb.o `test -f 'showrgb.c' || echo '$(srcdir)/'`showrgb.c; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/showrgb-showrgb.Tpo" "$(DEPDIR)/showrgb-showrgb.Po"; else rm -f "$(DEPDIR)/showrgb-showrgb.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='showrgb.c' object='showrgb-showrgb.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -c -o showrgb-showrgb.o `test -f 'showrgb.c' || echo '$(srcdir)/'`showrgb.c
 showrgb-showrgb.obj: showrgb.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -MT showrgb-showrgb.obj -MD -MP -MF "$(DEPDIR)/showrgb-showrgb.Tpo" -c -o showrgb-showrgb.obj `if test -f 'showrgb.c'; then $(CYGPATH_W) 'showrgb.c'; else $(CYGPATH_W) '$(srcdir)/showrgb.c'; fi`; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/showrgb-showrgb.Tpo" "$(DEPDIR)/showrgb-showrgb.Po"; else rm -f "$(DEPDIR)/showrgb-showrgb.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='showrgb.c' object='showrgb-showrgb.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -c -o showrgb-showrgb.obj `if test -f 'showrgb.c'; then $(CYGPATH_W) 'showrgb.c'; else $(CYGPATH_W) '$(srcdir)/showrgb.c'; fi`
 uninstall-info-am:
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
+	test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
 	@list='$(appman_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@ -418,7 +397,7 @@ uninstall-appmanDATA:
 	done
 install-rgbDATA: $(rgb_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(rgbdir)" || $(mkdir_p) "$(DESTDIR)$(rgbdir)"
+	test -z "$(rgbdir)" || $(MKDIR_P) "$(DESTDIR)$(rgbdir)"
 	@list='$(rgb_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@ -484,24 +463,22 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
+	test -d $(distdir) || mkdir $(distdir)
-	$(mkdir_p) $(distdir)/others
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	  case $$file in \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	case $$dist_files in \
-	  esac; \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -512,10 +489,13 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@ -590,7 +570,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@ -614,7 +594,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(DATA) config.h
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(rgbdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@ -641,6 +621,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@ -664,12 +645,20 @@ info-am:
 install-data-am: install-appmanDATA install-rgbDATA
 install-dvi: install-dvi-am
 install-exec-am: install-binPROGRAMS
 install-html: install-html-am
 install-info: install-info-am
 install-man:
 install-pdf: install-pdf-am
 install-ps: install-ps-am
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@ -692,26 +681,41 @@ ps: ps-am
 ps-am:
 uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-rgbDATA
+	uninstall-rgbDATA
 .MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
-	distclean-compile distclean-generic distclean-hdr \
+	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-appmanDATA install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
-	install-info-am install-man install-rgbDATA install-strip \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-rgbDATA install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-rgbDATA
+	uninstall-rgbDATA
@RGB_DB_TRUE@$(RGB_DB_FILES): rgb rgb.txt
@RGB_DB_TRUE@	-rm -f $(RGB_DB_FILES)
@RGB_DB_TRUE@	./rgb rgb < $(srcdir)/rgb.txt
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
 .PHONY: ChangeLog
 ChangeLog:
 	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 dist-hook: ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/rgb/aclocal.m4
+++ b/rgb/aclocal.m4
--- a/rgb/compile
+++ b/rgb/compile
@ -1,142 +0,0 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 scriptversion=2005-05-14.22
 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # This file is maintained in Automake, please report
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 case $1 in
  '')
     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
     exit 1;
     ;;
  -h | --h*)
    cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 Wrapper for compilers which do not understand `-c -o'.
 Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 If you are trying to build a whole package this is not the
 right script to run: please start by reading the file `INSTALL'.
 Report bugs to <bug-automake@gnu.org>.
 EOF
    exit $?
    ;;
  -v | --v*)
    echo "compile $scriptversion"
    exit $?
    ;;
 esac
 ofile=
 cfile=
 eat=
 for arg
 do
  if test -n "$eat"; then
    eat=
  else
    case $1 in
      -o)
 	# configure might choose to run compile as `compile cc -o foo foo.c'.
 	# So we strip `-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
 	    ofile=$2
 	    ;;
 	  *)
 	    set x "$@" -o "$2"
 	    shift
 	    ;;
 	esac
 	;;
      *.c)
 	cfile=$1
 	set x "$@" "$1"
 	shift
 	;;
      *)
 	set x "$@" "$1"
 	shift
 	;;
    esac
  fi
  shift
 done
 if test -z "$ofile" || test -z "$cfile"; then
  # If no `-o' option was seen then we might have been invoked from a
  # pattern rule where we don't need one.  That is ok -- this is a
  # normal compilation that the losing compiler can handle.  If no
  # `.c' file was seen then we are probably linking.  That is also
  # ok.
  exec "$@"
 fi
 # Name of file we expect compiler to create.
 cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
 # Create the lock directory.
 # Note: use `[/.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
 while true; do
  if mkdir "$lockdir" >/dev/null 2>&1; then
    break
  fi
  sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
 trap "rmdir '$lockdir'; exit 1" 1 2 15
 # Run the compile.
 "$@"
 ret=$?
 if test -f "$cofile"; then
  mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
  mv "${cofile}bj" "$ofile"
 fi
 rmdir "$lockdir"
 exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/rgb/config.guess
+++ b/rgb/config.guess
@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Inc.
+#   Free Software Foundation, Inc.
-timestamp='2007-03-06'
+timestamp='2008-01-08'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -56,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4*:SunOS:6*:*)
@ -532,7 +532,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@ -793,12 +793,15 @@ EOF
 	exit ;;
    *:Interix*:[3456]*)
    	case ${UNAME_MACHINE} in
-	    x86) 
+	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    EM64T | authenticamd)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
 		echo ia64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@ -833,7 +836,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	fi
 	exit ;;
    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@ -954,8 +964,8 @@ EOF
    x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa:Linux:*:*)
+    xtensa*:Linux:*:*)
-    	echo xtensa-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
--- a/rgb/config.h.in
+++ b/rgb/config.h.in
@ -1,5 +1,35 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 /* Header file to include for dbm functions */
 #undef DBM_HEADER
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 /* Define to 1 if you have ndbm.h interfaces */
 #undef NDBM
@ -30,6 +60,9 @@
 /* Patch version of this package */
 #undef PACKAGE_VERSION_PATCHLEVEL
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 /* Define to 1 to use plain text files for rgb database */
 #undef USE_RGB_TXT
--- a/rgb/config.sub
+++ b/rgb/config.sub
@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Inc.
+#   Free Software Foundation, Inc.
-timestamp='2007-01-18'
+timestamp='2008-01-08'
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -369,10 +369,14 @@ case $basic_machine in
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
 		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@ -443,6 +447,14 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
 	blackfin)
 		basic_machine=bfin-unknown
 		os=-linux
 		;;
 	blackfin-*)
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@ -475,8 +487,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
+	cr16)
-		basic_machine=cr16c-unknown
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@ -668,6 +680,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
 		;;
 	m68knommu-*)
 		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@ -683,6 +703,10 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	mingw32ce)
 		basic_machine=arm-unknown
 		os=-mingw32ce
 		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@ -809,6 +833,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
 	parisc)
 		basic_machine=hppa-unknown
 		os=-linux
 		;;
 	parisc-*)
 		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
--- a/rgb/configure
+++ b/rgb/configure
--- a/rgb/configure.ac
+++ b/rgb/configure.ac
@ -28,7 +28,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 AC_PREREQ([2.57])
-AC_INIT(rgb,[1.0.1],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],rgb)
+AC_INIT(rgb,[1.0.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],rgb)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
@ -37,6 +37,8 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_PROG_INSTALL
 PKG_CHECK_MODULES(RGB, xproto)
 AC_MSG_CHECKING([for rgb database location])
 AC_ARG_WITH([rgb-db-dir],
 	AC_HELP_STRING([--with-rgb-db-dir=<path>],
@ -56,6 +58,8 @@ AC_ARG_WITH([rgb-db-type],
 	[db_type=$withval], [db_type="text"])
 AC_MSG_RESULT([$db_type])
 RGB_DB_TYPE=$db_type
 case $db_type in
 	text)
 		RGB_DB_FILES=""
@ -63,23 +67,35 @@ case $db_type in
 			[Define to 1 to use plain text files for rgb database])
 		;;
 	dbm)
-		AC_SEARCH_LIBS([dbminit], [db dbm],  [],
+		AC_SEARCH_LIBS([dbminit], [db dbm nsl], [],
 				AC_MSG_ERROR([dbm requested but dbminit() not found in any libraries]))
-		RGB_DB_FILES="$(db_file).dir $(db_file).pag"
+		AC_CHECK_HEADER([dbm.h], [DBM_HEADER='<dbm.h>'],
 		  [AC_CHECK_HEADER([rpcsvc/dbm.h], [DBM_HEADER='<rpcsvc/dbm.h>'],
 		    [AC_MSG_ERROR([dbm requested but dbm.h not found])])])
 		PKG_CHECK_MODULES(XORG, [xorg-server])
 		RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
 		RGB_DB_FILES='$(db_file).dir $(db_file).pag'
 		;;
 	ndbm)
 		# Find a dbm or ndbm implementation
-		AC_SEARCH_LIBS([dbm_open], [db ndbm dbm],  
+		AC_SEARCH_LIBS([dbm_open], [db ndbm dbm],
-				AC_DEFINE([NDBM], [1], 
+				AC_DEFINE([NDBM], [1],
 				 [Define to 1 if you have ndbm.h interfaces]),
 				AC_MSG_ERROR([ndbm requested but dbm_open() not found in any libraries]))
-		RGB_DB_FILES="$(db_file).dir $(db_file).pag"
+		DBM_HEADER='<ndbm.h>'
 		PKG_CHECK_MODULES(XORG, [xorg-server])
 		RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
 		RGB_DB_FILES='$(db_file).dir $(db_file).pag'
 		;;
 esac
 if test x$DBM_HEADER != x ; then
  AC_DEFINE_UNQUOTED([DBM_HEADER], [$DBM_HEADER], 
 		     [Header file to include for dbm functions])
 fi
 AC_SUBST([RGB_DB_TYPE])
 AC_SUBST([RGB_DB_FILES])
-AM_CONDITIONAL(RGB_TXT, [test x$db_type = xtext])
+AM_CONDITIONAL(RGB_DB, [test x$db_type != xtext])
 PKG_CHECK_MODULES(RGB, xproto)
 AC_SUBST(RGB_CFLAGS)
 XORG_MANPAGE_SECTIONS
--- a/rgb/depcomp
+++ b/rgb/depcomp
@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-07-09.11
+scriptversion=2006-10-15.18
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -91,7 +92,20 @@ gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
 ## the command line argument order; so add the flags where they
 ## appear in depend2.am.  Note that the slowdown incurred here
 ## affects only configure: in makefiles, %FASTDEP% shortcuts this.
  for arg
  do
    case $arg in
    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
    *)  set fnord "$@" "$arg" ;;
    esac
    shift # fnord
    shift # $arg
  done
  "$@"
  stat=$?
  if test $stat -eq 0; then :
  else
@ -276,6 +290,46 @@ icc)
  rm -f "$tmpdepfile"
  ;;
 hp2)
  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
  # compilers, which have integrated preprocessors.  The correct option
  # to use with these is +Maked; it writes dependencies to a file named
  # 'foo.d', which lands next to the object file, wherever that
  # happens to be.
  # Much of this is similar to the tru64 case; see comments there.
  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
  test "x$dir" = "x$object" && dir=
  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir.libs/$base.d
    "$@" -Wc,+Maked
  else
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir$base.d
    "$@" +Maked
  fi
  stat=$?
  if test $stat -eq 0; then :
  else
     rm -f "$tmpdepfile1" "$tmpdepfile2"
     exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
    # Add `dependent.h:' lines.
    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
  else
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile" "$tmpdepfile2"
  ;;
 tru64)
   # The Tru64 compiler uses -MD to generate dependencies as a side
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@ -288,13 +342,13 @@ tru64)
   if test "$libtool" = yes; then
      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
      # handle both shared and static libraries in a single compilation.
      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
      #
      # With libtool 1.5 this exception was removed, and libtool now
      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
      # in $dir$base.o.d.  We have to check for both files, because
      # one of the two compilations can be disabled.  We should prefer
      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
--- a/rgb/install-sh
+++ b/rgb/install-sh
@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
-scriptversion=2005-05-14.22
+scriptversion=2006-10-14.15
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@ -39,15 +39,24 @@ scriptversion=2005-05-14.22
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
+# from scratch.
-# shared with many OS's install programs.
+
 nl='
 '
 IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
@ -58,7 +67,13 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
-chmodcmd="$chmodprog 0755"
+posix_glob=
 posix_mkdir=
 # Desired mode of installed file.
 mode=0755
 chmodcmd=$chmodprog
 chowncmd=
 chgrpcmd=
 stripcmd=
@ -95,7 +110,7 @@ Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
-while test -n "$1"; do
+while test $# -ne 0; do
  case $1 in
    -c) shift
        continue;;
@ -111,9 +126,15 @@ while test -n "$1"; do
    --help) echo "$usage"; exit $?;;
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
        shift
        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
        continue;;
    -o) chowncmd="$chownprog $2"
@ -136,25 +157,33 @@ while test -n "$1"; do
    --version) echo "$0 $scriptversion"; exit $?;;
-    *)  # When -d is used, all remaining arguments are directories to create.
+    --)	shift
 	# When -t is used, the destination is already specified.
 	test -n "$dir_arg$dstarg" && break
        # Otherwise, the last argument is the destination.  Remove it from $@.
 	for arg
 	do
          if test -n "$dstarg"; then
 	    # $@ is not empty: it contains at least $arg.
 	    set fnord "$@" "$dstarg"
 	    shift # fnord
 	  fi
 	  shift # arg
 	  dstarg=$arg
 	done
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
 done
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
    if test -n "$dstarg"; then
      # $@ is not empty: it contains at least $arg.
      set fnord "$@" "$dstarg"
      shift # fnord
    fi
    shift # arg
    dstarg=$arg
  done
 fi
 if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
@ -164,6 +193,33 @@ if test -z "$1"; then
  exit 0
 fi
 if test -z "$dir_arg"; then
  trap '(exit $?); exit' 1 2 13 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;
    *[0-7])
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
 fi
 for src
 do
  # Protect names starting with `-'.
@ -173,15 +229,11 @@ do
  if test -n "$dir_arg"; then
    dst=$src
-    src=
+    dstdir=$dst
-
+    test -d "$dstdir"
-    if test -d "$dst"; then
+    dstdir_status=$?
      mkdircmd=:
      chmodcmd=
    else
      mkdircmd=$mkdirprog
    fi
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
@ -208,53 +260,188 @@ do
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
      fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi
-  # This sed command emulates the dirname command.
+  obsolete_mkdir_used=false
  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-  # Make sure that the destination directory exists.
+  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
 	# Create intermediate dirs using mode 755 as modified by the umask.
 	# This is like FreeBSD 'install' as of 1997-10-28.
 	umask=`umask`
 	case $stripcmd.$umask in
 	  # Optimize common cases.
 	  *[2367][2367]) mkdir_umask=$umask;;
 	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-  # Skip lots of stat calls in the usual case.
+	  *[0-7])
-  if test ! -d "$dstdir"; then
+	    mkdir_umask=`expr $umask + 22 \
-    defaultIFS='
+	      - $umask % 100 % 40 + $umask % 20 \
-	 '
+	      - $umask % 10 % 4 + $umask % 2
-    IFS="${IFS-$defaultIFS}"
+	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
-    oIFS=$IFS
+	# With -d, create the new directory with the user-specified mode.
-    # Some sh's can't handle IFS=/ for some reason.
+	# Otherwise, rely on $mkdir_umask.
-    IFS='%'
+	if test -n "$dir_arg"; then
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+	  mkdir_mode=-m$mode
-    shift
+	else
-    IFS=$oIFS
+	  mkdir_mode=
 	fi
-    pathcomp=
+	posix_mkdir=false
 	case $umask in
 	  *[123567][0-7][0-7])
 	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-    while test $# -ne 0 ; do
+	    if (umask $mkdir_umask &&
-      pathcomp=$pathcomp$1
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
 	      # Remove any dirs left behind by ancient mkdir implementations.
 	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
 	    fi
 	    trap '' 0;;
 	esac;;
    esac
    if
      $posix_mkdir && (
 	umask $mkdir_umask &&
 	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
 	/*) prefix=/ ;;
 	-*) prefix=./ ;;
 	*)  prefix= ;;
      esac
      case $posix_glob in
        '')
 	  if (set -f) 2>/dev/null; then
 	    posix_glob=true
 	  else
 	    posix_glob=false
 	  fi ;;
      esac
      oIFS=$IFS
      IFS=/
      $posix_glob && set -f
      set fnord $dstdir
      shift
-      if test ! -d "$pathcomp"; then
+      $posix_glob && set +f
-        $mkdirprog "$pathcomp"
+      IFS=$oIFS
-	# mkdir can fail with a `File exist' error in case several
+
-	# install-sh are creating the directory concurrently.  This
+      prefixes=
-	# is OK.
+
-	test -d "$pathcomp" || exit
+      for d
      do
 	test -z "$d" && continue
 	prefix=$prefix$d
 	if test -d "$prefix"; then
 	  prefixes=
 	else
 	  if $posix_mkdir; then
 	    (umask=$mkdir_umask &&
 	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
 	    # Don't fail if two instances are running concurrently.
 	    test -d "$prefix" || exit 1
 	  else
 	    case $prefix in
 	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
 	      *) qprefix=$prefix;;
 	    esac
 	    prefixes="$prefixes '$qprefix'"
 	  fi
 	fi
 	prefix=$prefix/
      done
      if test -n "$prefixes"; then
 	# Don't fail if two instances are running concurrently.
 	(umask $mkdir_umask &&
 	 eval "\$doit_exec \$mkdirprog $prefixes") ||
 	  test -d "$dstdir" || exit 1
 	obsolete_mkdir_used=true
      fi
-      pathcomp=$pathcomp/
+    fi
    done
  fi
  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
  else
    dstfile=`basename "$dst"`
    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
@ -262,10 +449,9 @@ do
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    trap '(exit $?); exit' 1 2 13 15
    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
@ -276,10 +462,10 @@ do
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
      || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
@ -291,11 +477,12 @@ do
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
-	     if test -f "$dstdir/$dstfile"; then
+	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
 		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
 	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 echo "$0: cannot unlink or rename $dst" >&2
 		 (exit 1); exit 1
 	       }
 	     else
@ -304,16 +491,13 @@ do
 	   } &&
 	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	   $doit $mvcmd "$dsttmp" "$dst"
 	 }
-    }
+    } || exit 1
  fi || { (exit 1); exit 1; }
 done
-# The final little trick to "correctly" pass the exit status to the exit trap.
+    trap '' 0
-{
+  fi
-  (exit 0); exit 0
+done
 }
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- a/rgb/missing
+++ b/rgb/missing
@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@ -33,6 +33,8 @@ if test $# -eq 0; then
 fi
 run=:
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@ -44,7 +46,7 @@ fi
 msg="missing on your system"
-case "$1" in
+case $1 in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
@ -77,6 +79,7 @@ Supported PROGRAM values:
  aclocal      touch file \`aclocal.m4'
  autoconf     touch file \`configure'
  autoheader   touch file \`config.h.in'
  autom4te     touch the output file, or create a stub one
  automake     touch all \`Makefile.in' files
  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
  flex         create \`lex.yy.c', if possible, from existing .c
@ -106,7 +109,7 @@ esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
  lex|yacc)
    # Not GNU programs, they don't have --version.
    ;;
@ -135,7 +138,7 @@ esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
  aclocal*)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@ -164,7 +167,7 @@ WARNING: \`$1' is $msg.  You should only need it if
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
-      case "$f" in
+      case $f in
      *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
         You can get \`$1' as part of \`Autoconf' from any GNU
         archive site."
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -f "$file"; then
 	touch $file
    else
@ -214,25 +217,25 @@ WARNING: \`$1' $msg.  You should only need it if
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
    fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
    fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;
@ -244,18 +247,18 @@ WARNING: \`$1' is $msg.  You should only need it if
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
    fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;
@ -267,11 +270,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    if test -z "$file"; then
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
    fi
    if [ -f "$file" ]; then
 	touch $file
    else
 	test -z "$file" || exec >$file
@ -289,11 +290,17 @@ WARNING: \`$1' is $msg.  You should only need it if
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -z "$file"; then
      # ... or it is the one specified with @setfilename ...
      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
 	/^@setfilename/{
 	  s/.* \([^ ]*\) *$/\1/
 	  p
 	  q
 	}' $infile`
      # ... or it is derived from the source name (dir/f.texi becomes f.info)
      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    fi
@ -317,13 +324,13 @@ WARNING: \`$1' is $msg.  You should only need it if
    fi
    firstarg="$1"
    if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
--- a/rgb/rgb.c
+++ b/rgb/rgb.c
@ -1,5 +1,3 @@
 /* $Xorg: rgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */
 /* $XdotOrg: app/rgb/rgb.c,v 1.4 2005/11/08 06:33:31 jkj Exp $ */
 /*
 Copyright 1985, 1998  The Open Group
@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 */
 /* $XFree86: xc/programs/rgb/rgb.c,v 3.8tsi Exp $ */
 /* reads from standard input lines of the form:
@ -39,14 +36,8 @@ from The Open Group.
 # include "config.h"
 #endif
-#ifdef NDBM
+#include DBM_HEADER
-#include <ndbm.h>
+#ifndef NDBM
 #else
 #if defined(SVR4)
 #include <rpcsvc/dbm.h>
 #else
 #include <dbm.h>
 #endif
 #define dbm_open(name,flags,mode) (!dbminit(name))
 #define dbm_store(db,key,content,flags) (store(key,content))
 #define dbm_close(db) dbmclose()
@ -57,23 +48,14 @@ from The Open Group.
 #include <stdlib.h>
 #include <X11/Xos.h>
 #include "rgb.h"
 #include "site.h"
 #include <ctype.h>
 #include <errno.h>
-char *ProgramName;
+static char *ProgramName;
 char *SysError ()
 {
    register char *s = strerror(errno);
    return s ? s : "?";
 }
 int
-main(argc, argv)
+main(int argc, char **argv)
    int argc;
    char **argv;
 {
    char *dbname;
    char line[512];
--- a/rgb/rgb.man
+++ b/rgb/rgb.man
@ -0,0 +1,91 @@
 .\" Copyright 1994, 2008 Sun Microsystems, Inc.  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"), to deal in the Software without restriction, including
 .\" without limitation the rights to use, copy, modify, merge, publish,
 .\" distribute, and/or sell copies of the Software, and to permit persons
 .\" to whom the Software is furnished to do so, provided that the above
 .\" copyright notice(s) and this permission notice appear in all copies of
 .\" the Software and that both the above copyright notice(s) and this
 .\" permission notice appear in supporting documentation.
 .\" 
 .\" 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
 .\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
 .\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
 .\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
 .\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
 .\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 .\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" 
 .\" Except as contained in this notice, the name of a copyright holder
 .\" shall not be used in advertising or otherwise to promote the sale, use
 .\" or other dealings in this Software without prior written authorization
 .\" of the copyright holder.
 .\" 
 .TH rgb __appmansuffix__ __xorgversion__
 .IX "rgb" "" "\f3rgb\fP(1) \(em build colorname database" ""
 .IX "color" "build" "color" "building the colorname database \(em \f3rgb\fP(1)" ""
 .SH NAME
 rgb \- build the color name database
 .SH SYNOPSIS
 .B rgb
 [
 .I dbname
 ]
 .SH DESCRIPTION
 .B rgb
 reads from standard input lines of the form:
 .PP
 .nf
 .I
 	red\ \ green\ \ blue\ \ \ \ \ \ name
 .fi
 .PP
 where
 .I red
 /
 .I green
 /
 .I blue
 are decimal values between the range 0 to 255, and
 .I name
 is a description of the color.
 .B rgb
 then builds a color name database in
 .B __RGB_DB_TYPE__
 format.  The color name database provides a mapping between ASCII color
 names and RGB color values.  It is useful for increasing the
 portability of color programs.  The input source for the database is 
 in \fI__RGB_DB__.txt\fP.  \fIrgb.txt\fP
 is compiled into the __RGB_DB_TYPE__ files
 .IR "__RGB_DB_FILES__" .
 When the server first starts up, it consults the contents of these
 files to build an internal representation of their contents.  This
 internal representation is consulted to map color names to color
 values.
 .PP
 .B rgb
 uses the default color name database of \fI__RGB_DB__.txt\fP.
 .SH OPTIONS
 .IP "\fIdbname" 1i
 Color name database.
 .SH EXAMPLES
 example% rgb rgb < __RGB_DB__.txt
 .PP
 example% cat __RGB_DB__.txt
 .SH FILES
 .PD 0
 .TP 30
 .B __RGB_DB__.txt
 color name database source.
 Maps color names to RGB color values.
 .TP
 .B __RGB_DB_DIR__/__RGB_DB_FILES__
 __RGB_DB_TYPE__ files containing color name to RGB mapping.
 .PD
 .SH SEE ALSO
 .BR cat (1),
 .BR __RGB_DB_TYPE__ (3)
--- a/rgb/rgb.txt
+++ b/rgb/rgb.txt
@ -1,4 +1,3 @@
 ! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $
 255 250 250		snow
 248 248 255		ghost white
 248 248 255		GhostWhite
--- a/rgb/showrgb.c
+++ b/rgb/showrgb.c
@ -1,6 +1,4 @@
 /*
 * $Xorg: showrgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $
 * $XdotOrg: app/rgb/showrgb.c,v 1.5 2005/11/08 06:33:31 jkj Exp $
 *
 Copyright 1989, 1998  The Open Group
@ -27,21 +25,13 @@ in this Software without prior written authorization from The Open Group.
 * Author:  Jim Fulton, MIT X Consortium
 */
 /* $XFree86: xc/programs/rgb/showrgb.c,v 3.8 2001/12/14 20:01:04 dawes Exp $ */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 #ifndef USE_RGB_TXT
-#ifdef NDBM
+#include DBM_HEADER
-#include <ndbm.h>
+#ifndef NDBM
 #else
 #if defined(SVR4)
 #include <rpcsvc/dbm.h>
 #else
 #include <dbm.h>
 #endif
 #define dbm_open(name,flags,mode) (!dbminit(name))
 #define dbm_firstkey(db) (firstkey())
 #define dbm_fetch(db,key) (fetch(key))
@ -55,11 +45,10 @@ in this Software without prior written authorization from The Open Group.
 #include <stdlib.h>
 #ifndef USE_RGB_TXT
 #include "rgb.h"			/* off in server/include/ */
 #include "site.h"
 #endif
 #include <X11/Xfuncs.h>
-char *ProgramName;
+static char *ProgramName;
 static void dumprgb(char *filename);
 int
@ -77,8 +66,7 @@ main (int argc, char *argv[])
 #ifndef USE_RGB_TXT
 static void
-dumprgb (filename)
+dumprgb (char *filename)
    char *filename;
 {
 #ifdef NDBM
    DBM *rgb_dbm;
--- a/rgb/showrgb.man
+++ b/rgb/showrgb.man
@ -1,4 +1,3 @@
 .\" $Xorg: showrgb.man,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $
 .\" Copyright 1993, 1998  The Open Group
 .\" 
 .\" Permission to use, copy, modify, distribute, and sell this software and its
@ -23,11 +22,9 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
 .\" $XFree86: xc/programs/rgb/showrgb.man,v 1.7 2001/12/14 20:01:04 dawes Exp $
 .\"
 .TH SHOWRGB 1 __xorgversion__
 .SH NAME
-showrgb \- uncompile an rgb color-name database
+showrgb \- display an rgb color-name database
 .SH SYNOPSIS
 .B showrgb
 [
@ -36,13 +33,13 @@ showrgb \- uncompile an rgb color-name database
 .SH DESCRIPTION
 The
 .I showrgb
-program reads an rgb color-name database compiled for use with the dbm
+program reads an rgb color-name database from a __RGB_DB_TYPE__ file
-database routines and converts it back to source form, printing the
+and converts it back to source form, printing the
 result to standard output.  The default
 database is the one that X was built with, and may be overridden on
 the command line.  Specify the database name without
-the \fI.pag\fP or \fI.dir\fP suffix.
+the \fI.txt\fP, \fI.pag\fP or \fI.dir\fP suffix.
 .SH FILES
 .TP 20
-.I __projectroot__/lib/X11/rgb
+.I __RGB_DB__
 default database.