luit 1.0.3

author: Matthieu Herrb <matthieu@cvs.openbsd.org> 2008-10-13 20:34:12 +0000
committer: Matthieu Herrb <matthieu@cvs.openbsd.org> 2008-10-13 20:34:12 +0000
commit: 28c1518dc93984a96b373daafef1ff07c88d62fb (patch)
tree: f8d74df9df20bd9cb18d9ee1ed12645a73ce3633 /app/luit
parent: 2b0b095090d200dbb52cedaf835e295aa928bcd3 (diff)
14 files changed, 468 insertions, 398 deletions
diff --git a/app/luit/ChangeLog b/app/luit/ChangeLog
index c236a2596..1daa2aebd 100644
--- a/app/luit/ChangeLog
+++ b/app/luit/ChangeLog
@@ -1,31 +1,322 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 2547b637ab615884ea51458dfb793f1a70bc5201
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri Feb 1 00:08:27 2008 +0100
 
-	* configure.ac:
-	Update package version for X11R7 release.
+    Bump to 1.0.3.
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit bde6425192d06d4168048c32ca92abbade085869
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri Feb 1 00:05:56 2008 +0100
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    Make ChangeLog hook safer.
 
-2005-12-08  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit e1a002217cabdb0806f28a0530a9cb972f370312
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Tue Jan 29 21:45:35 2008 +0100
 
-	* Makefile.am:
-	* configure.ac:
-	Add configure options to allow hard-coded paths to be changed.
+    Define _XOPEN_SOURCE to 500 on linux
+    
+    strdup() is only exposed by glibc headers if _XOPEN_SOURCE is defined to
+    a value >= 500.
 
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit abca524c0298e629810bd98d18b73eceb0eca8d9
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jan 28 18:23:40 2008 -0800
 
-	* Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    Set locale.alias file in man page to match the one set by configure
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit bada8600b282d453727c6202ab69f3cb2c8fc7fb
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jan 28 16:19:05 2008 -0800
 
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    Constify a bit
 
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 673fd4184c005909db20035006f6b98eb6210bd4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jan 28 15:54:55 2008 -0800
 
-	* configure.ac:
-	Update package version number for RC1 release.
+    Replace malloc/strcpy pairs with strdup
 
+commit 9ca1cdabb4f04cc7e8c437b48821f0672f58af60
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jan 28 14:40:30 2008 -0800
+
+    Man page typo fixes
+
+commit 87a181ce2647225e21e5824104ca1f7b04a221c7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jan 28 14:33:41 2008 -0800
+
+    Fix sparse warnings: non-ANSI function declaration (missing void)
+
+commit 191f62fab880b9aa001a566a95343c4fe5565b40
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jan 28 14:31:31 2008 -0800
+
+    Fix many sparse warnings of Using plain integer as NULL pointer
+
+commit 98cd8b69a5ad042087a7f081482d4fd4d001cc3e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jan 28 14:25:15 2008 -0800
+
+    Change luit_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+    
+    Makefile.am:29: compiling `charset.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+commit a1b53290954cfabfbb28ac0bb932570754e118ae
+Author: Karsten Hilbert <karsten.hilbert@gmx.net>
+Date:   Thu Oct 11 15:44:28 2007 +0200
+
+    Fix typo in luit.man
+    
+    Debian bug#446216.
+
+commit 599d3c2049bc71929c29e864e4d76b2bdfc0c550
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Fri Sep 21 14:52:09 2007 -0400
+
+    Match luit locale.alias location to libX11 default
+    Luit expects to find the locale.alias file in ${libdir}/X11/locale. However,
+    libX11 installs the locale files in ${datadir}/X11/locale, by default.
+
+commit ff27bd043f93ee9505f7f6cd0aed417ef264351e
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:51:03 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 47c5031b9ac3e14e5bffcae9edb4daa6306b754d
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Aug 23 19:24:26 2007 -0400
+
+    Rename .cvsignore to .gitignore
+
+commit 0277a1b8d6f2f1cf8156967862436207a170f111
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Tue Nov 14 16:37:21 2006 +0100
+
+    Include corrected PHONY in Makefile.
+    Thanks to Donnie Berkholz for noticing I'm stupid.
+
+commit 2d4743cac9e2ceb81781586d396ebcc151fd123b
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Tue Nov 14 03:37:14 2006 +0100
+
+    Remove incorrect .PHONY in Makefile.
+
+commit c89bc49b6dc037c6b5177f2c79370257efd54b7e
+Author: Julien Cristau <julien.cristau@ens-lyon.org>
+Date:   Tue Nov 7 17:27:36 2006 +0100
+
+    [PATCH] Add a rule to autogenerate ChangeLog for distribution.
+    
+    The current ChangeLog is not getting updated, so we generate it from git-log
+    instead.  Also clean it in "make maintainer-clean".
+    
+    Signed-off-by: Julien Cristau <julien.cristau@ens-lyon.org>
+    Signed-off-by: Juliusz Chroboczek <jch@pps.jussieu.fr>
+
+commit 0190002a9730185dec0ab8bcf27ce730d295e39d
+Author: Julien Cristau <julien.cristau@ens-lyon.org>
+Date:   Tue Nov 7 17:27:35 2006 +0100
+
+    [PATCH] Delete ChangeLog file.
+    
+    Signed-off-by: Julien Cristau <julien.cristau@ens-lyon.org>
+    Signed-off-by: Juliusz Chroboczek <jch@pps.jussieu.fr>
+
+commit 930c1fb0cce2bdd65553b85e4231fe14ccf7a2e7
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Nov 8 16:24:26 2006 +0200
+
+    bump to 1.0.2
+
+commit 33c99a9408fc236ec68cc027c1caddc805e80efe
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Sun Nov 5 23:43:52 2006 +0100
+
+    Set up parent pty before forking (bug 8490).
+    This avoids a race condition when the child reads the terminal settings
+    before the parent has set the pty up.
+
+commit 605d8b15add136788f1316534c275f0f6d0fe792
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Tue Oct 31 17:05:20 2006 +0100
+
+    Added random IBM codepages to the encodings vector.
+    I didn't modify the locales vector -- people using non-standard encodings
+    should directly set the ISO 2022 state using -gr, -g2 and friends.
+
+commit 0318e87e279527ea0fba6c07b9d3e7ce5598c934
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Tue Oct 31 01:22:36 2006 +0100
+
+    Updated COPYING.
+
+commit a4e6e5a6c618706d5375ff1a9ffc34cce23fcf76
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:43 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit b5e1535b07183305313ec74612525286b11d5deb
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:40 2005 +0000
+
+    Stub COPYING files
+
+commit 899331d63218a9ef190f3575811e76bced5d67e1
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:02 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 9b949814b988ffb0d01bfd945b207bbb8379e573
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 8 17:55:17 2005 +0000
+
+    Add configure options to allow hard-coded paths to be changed.
+
+commit 6f19ff5947590d28e17fd86a47af38f2d3abf90d
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:17 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 7cad59b8eb72df9c6c51c6deff4b353a0ce2f9e8
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:16 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit da7d5db0365ad51888dc262c0ed6b8e63c479af8
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:37 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 0970cf337c42939a1865048aef1a49782de5d3b0
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:34:56 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit aea3251136908221d6547f2dea67ea1e81a94acd
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:48 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit 22f85fed95a41f35410d49452a1ca891807fdf03
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:47:49 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 52cd38a1849b80cdf8f393402061e259250ccee9
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:19 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit 889af994115911897dbaff5d1262275d1a25fc73
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:41 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit 77bdecc7b28208b6a74f80d6ad169e4be81fc311
+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 e751086392e8379b0a92dfdbe7b1effdbbf11b8d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Aug 1 15:11:56 2005 +0000
+
+    Define _XOPEN_SOURCE on Linux (patch from Stefan Dirsch)
+
+commit d235388c5d3130966c8524e041184fd52b668225
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:29 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 d9df2dbe4186d6662c40e364c527b157335d05c0
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Jul 20 19:31:49 2005 +0000
+
+    Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+        configure cache, you cache it, and the cached value is probably wrong.
+
+commit b9846be287e3f5a00b9012af2f060255bed4879f
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed Jul 6 16:30:11 2005 +0000
+
+    Build system for luit
+
+commit 94118c5d40a3b355eeafb95631c741574ba43342
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:54:35 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 52c779f3fe3dd8116e6c54ec1cca05b89cecf0ca
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:34:54 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 86bdb1f20619208e22e27cc91dffc14e0cd91406
+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 5d8090493ad08e657d1a57518ccf98d4b6a3885e
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:15 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit f466b8b816201dd6385e4897fcad7888dae3d502
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:23:55 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit c65c9b70829cf3e7e82729a7756cad05189c31ec
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Jan 29 08:09:01 2004 +0000
+
+    Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 0afe748d654f553771ee2f4b07ab1ccce30b9ddd
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:29:02 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit f0c47a47ea65135be8b78cd215ba4a67ecc44a57
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:57 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 84208ce0135c0376208346d20a76add90d52aae4
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:57 2003 +0000
+
+    Initial revision
diff --git a/app/luit/Makefile.am b/app/luit/Makefile.am
index 705d239da..6299f1678 100644
--- a/app/luit/Makefile.am
+++ b/app/luit/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = luit
 
 LOCALEALIASFILE = @LOCALEALIASFILE@
 
-luit_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
+AM_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
 luit_LDADD = $(LUIT_LIBS)
 
 luit_SOURCES =	\
@@ -49,11 +49,20 @@ appmandir = $(APP_MAN_DIR)
 
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
 CLEANFILES = $(appman_DATA)
 
 SED = sed
 
+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
+
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
   XORGMANNAME = X Version 11
@@ -63,6 +72,7 @@ MAN_SUBSTS = \
 	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xservername__|Xorg|g' \
 	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__localealiasfile__|$(LOCALEALIASFILE)|g' \
 	-e 's|__projectroot__|$(prefix)|g' \
 	-e 's|__apploaddir__|$(appdefaultdir)|' \
 	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
diff --git a/app/luit/Makefile.in b/app/luit/Makefile.in
index 96872aea1..056b170ca 100644
--- a/app/luit/Makefile.in
+++ b/app/luit/Makefile.in
@@ -76,9 +76,8 @@ CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_luit_OBJECTS = luit-charset.$(OBJEXT) luit-iso2022.$(OBJEXT) \
-	luit-locale.$(OBJEXT) luit-luit.$(OBJEXT) luit-other.$(OBJEXT) \
-	luit-parser.$(OBJEXT) luit-sys.$(OBJEXT)
+am_luit_OBJECTS = charset.$(OBJEXT) iso2022.$(OBJEXT) locale.$(OBJEXT) \
+	luit.$(OBJEXT) other.$(OBJEXT) parser.$(OBJEXT) sys.$(OBJEXT)
 luit_OBJECTS = $(am_luit_OBJECTS)
 am__DEPENDENCIES_1 =
 luit_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -209,7 +208,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-luit_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
+AM_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
 luit_LDADD = $(LUIT_LIBS)
 luit_SOURCES = \
         charset.c \
@@ -231,9 +230,10 @@ appman_PRE = \
 
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
 CLEANFILES = $(appman_DATA)
 SED = sed
+MAINTAINERCLEANFILES = ChangeLog
 
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
@@ -243,6 +243,7 @@ MAN_SUBSTS = \
 	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xservername__|Xorg|g' \
 	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__localealiasfile__|$(LOCALEALIASFILE)|g' \
 	-e 's|__projectroot__|$(prefix)|g' \
 	-e 's|__apploaddir__|$(appdefaultdir)|' \
 	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
@@ -340,13 +341,13 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luit-charset.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luit-iso2022.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luit-locale.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luit-luit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luit-other.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luit-parser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luit-sys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iso2022.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locale.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/other.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sys.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -361,104 +362,6 @@ distclean-compile:
 @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) '$<'`
-
-luit-charset.o: charset.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-charset.o -MD -MP -MF "$(DEPDIR)/luit-charset.Tpo" -c -o luit-charset.o `test -f 'charset.c' || echo '$(srcdir)/'`charset.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-charset.Tpo" "$(DEPDIR)/luit-charset.Po"; else rm -f "$(DEPDIR)/luit-charset.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='charset.c' object='luit-charset.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-charset.o `test -f 'charset.c' || echo '$(srcdir)/'`charset.c
-
-luit-charset.obj: charset.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-charset.obj -MD -MP -MF "$(DEPDIR)/luit-charset.Tpo" -c -o luit-charset.obj `if test -f 'charset.c'; then $(CYGPATH_W) 'charset.c'; else $(CYGPATH_W) '$(srcdir)/charset.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-charset.Tpo" "$(DEPDIR)/luit-charset.Po"; else rm -f "$(DEPDIR)/luit-charset.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='charset.c' object='luit-charset.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-charset.obj `if test -f 'charset.c'; then $(CYGPATH_W) 'charset.c'; else $(CYGPATH_W) '$(srcdir)/charset.c'; fi`
-
-luit-iso2022.o: iso2022.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-iso2022.o -MD -MP -MF "$(DEPDIR)/luit-iso2022.Tpo" -c -o luit-iso2022.o `test -f 'iso2022.c' || echo '$(srcdir)/'`iso2022.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-iso2022.Tpo" "$(DEPDIR)/luit-iso2022.Po"; else rm -f "$(DEPDIR)/luit-iso2022.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iso2022.c' object='luit-iso2022.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-iso2022.o `test -f 'iso2022.c' || echo '$(srcdir)/'`iso2022.c
-
-luit-iso2022.obj: iso2022.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-iso2022.obj -MD -MP -MF "$(DEPDIR)/luit-iso2022.Tpo" -c -o luit-iso2022.obj `if test -f 'iso2022.c'; then $(CYGPATH_W) 'iso2022.c'; else $(CYGPATH_W) '$(srcdir)/iso2022.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-iso2022.Tpo" "$(DEPDIR)/luit-iso2022.Po"; else rm -f "$(DEPDIR)/luit-iso2022.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iso2022.c' object='luit-iso2022.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-iso2022.obj `if test -f 'iso2022.c'; then $(CYGPATH_W) 'iso2022.c'; else $(CYGPATH_W) '$(srcdir)/iso2022.c'; fi`
-
-luit-locale.o: locale.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-locale.o -MD -MP -MF "$(DEPDIR)/luit-locale.Tpo" -c -o luit-locale.o `test -f 'locale.c' || echo '$(srcdir)/'`locale.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-locale.Tpo" "$(DEPDIR)/luit-locale.Po"; else rm -f "$(DEPDIR)/luit-locale.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='locale.c' object='luit-locale.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-locale.o `test -f 'locale.c' || echo '$(srcdir)/'`locale.c
-
-luit-locale.obj: locale.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-locale.obj -MD -MP -MF "$(DEPDIR)/luit-locale.Tpo" -c -o luit-locale.obj `if test -f 'locale.c'; then $(CYGPATH_W) 'locale.c'; else $(CYGPATH_W) '$(srcdir)/locale.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-locale.Tpo" "$(DEPDIR)/luit-locale.Po"; else rm -f "$(DEPDIR)/luit-locale.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='locale.c' object='luit-locale.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-locale.obj `if test -f 'locale.c'; then $(CYGPATH_W) 'locale.c'; else $(CYGPATH_W) '$(srcdir)/locale.c'; fi`
-
-luit-luit.o: luit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-luit.o -MD -MP -MF "$(DEPDIR)/luit-luit.Tpo" -c -o luit-luit.o `test -f 'luit.c' || echo '$(srcdir)/'`luit.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-luit.Tpo" "$(DEPDIR)/luit-luit.Po"; else rm -f "$(DEPDIR)/luit-luit.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luit.c' object='luit-luit.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-luit.o `test -f 'luit.c' || echo '$(srcdir)/'`luit.c
-
-luit-luit.obj: luit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-luit.obj -MD -MP -MF "$(DEPDIR)/luit-luit.Tpo" -c -o luit-luit.obj `if test -f 'luit.c'; then $(CYGPATH_W) 'luit.c'; else $(CYGPATH_W) '$(srcdir)/luit.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-luit.Tpo" "$(DEPDIR)/luit-luit.Po"; else rm -f "$(DEPDIR)/luit-luit.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luit.c' object='luit-luit.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-luit.obj `if test -f 'luit.c'; then $(CYGPATH_W) 'luit.c'; else $(CYGPATH_W) '$(srcdir)/luit.c'; fi`
-
-luit-other.o: other.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-other.o -MD -MP -MF "$(DEPDIR)/luit-other.Tpo" -c -o luit-other.o `test -f 'other.c' || echo '$(srcdir)/'`other.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-other.Tpo" "$(DEPDIR)/luit-other.Po"; else rm -f "$(DEPDIR)/luit-other.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='other.c' object='luit-other.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-other.o `test -f 'other.c' || echo '$(srcdir)/'`other.c
-
-luit-other.obj: other.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-other.obj -MD -MP -MF "$(DEPDIR)/luit-other.Tpo" -c -o luit-other.obj `if test -f 'other.c'; then $(CYGPATH_W) 'other.c'; else $(CYGPATH_W) '$(srcdir)/other.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-other.Tpo" "$(DEPDIR)/luit-other.Po"; else rm -f "$(DEPDIR)/luit-other.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='other.c' object='luit-other.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-other.obj `if test -f 'other.c'; then $(CYGPATH_W) 'other.c'; else $(CYGPATH_W) '$(srcdir)/other.c'; fi`
-
-luit-parser.o: parser.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-parser.o -MD -MP -MF "$(DEPDIR)/luit-parser.Tpo" -c -o luit-parser.o `test -f 'parser.c' || echo '$(srcdir)/'`parser.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-parser.Tpo" "$(DEPDIR)/luit-parser.Po"; else rm -f "$(DEPDIR)/luit-parser.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parser.c' object='luit-parser.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-parser.o `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
-
-luit-parser.obj: parser.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-parser.obj -MD -MP -MF "$(DEPDIR)/luit-parser.Tpo" -c -o luit-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-parser.Tpo" "$(DEPDIR)/luit-parser.Po"; else rm -f "$(DEPDIR)/luit-parser.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parser.c' object='luit-parser.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi`
-
-luit-sys.o: sys.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-sys.o -MD -MP -MF "$(DEPDIR)/luit-sys.Tpo" -c -o luit-sys.o `test -f 'sys.c' || echo '$(srcdir)/'`sys.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-sys.Tpo" "$(DEPDIR)/luit-sys.Po"; else rm -f "$(DEPDIR)/luit-sys.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sys.c' object='luit-sys.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-sys.o `test -f 'sys.c' || echo '$(srcdir)/'`sys.c
-
-luit-sys.obj: sys.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(luit_CFLAGS) $(CFLAGS) -MT luit-sys.obj -MD -MP -MF "$(DEPDIR)/luit-sys.Tpo" -c -o luit-sys.obj `if test -f 'sys.c'; then $(CYGPATH_W) 'sys.c'; else $(CYGPATH_W) '$(srcdir)/sys.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/luit-sys.Tpo" "$(DEPDIR)/luit-sys.Po"; else rm -f "$(DEPDIR)/luit-sys.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sys.c' object='luit-sys.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) $(luit_CFLAGS) $(CFLAGS) -c -o luit-sys.obj `if test -f 'sys.c'; then $(CYGPATH_W) 'sys.c'; else $(CYGPATH_W) '$(srcdir)/sys.c'; fi`
 uninstall-info-am:
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
@@ -555,6 +458,9 @@ 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 \
@@ -684,6 +590,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
@@ -739,8 +646,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 
 .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 \
-	distclean-compile distclean-generic distclean-hdr \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+	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 \
@@ -753,6 +660,13 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 	uninstall-info-am
 
 
+.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
+
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/app/luit/aclocal.m4 b/app/luit/aclocal.m4
index 5419cfb3c..48f9f8de2 100644
--- a/app/luit/aclocal.m4
+++ b/app/luit/aclocal.m4
@@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
 	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=1.1.5
+	[XORG_MACROS_version=1.1.6
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
 XORG_SGML_PATH=$prefix/share/sgml
 HAVE_DEFS_ENT=
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
 		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
 		[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
 		[$PVM],
 		[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
diff --git a/app/luit/charset.c b/app/luit/charset.c
index f8bf69fed..c6bb45701 100644
--- a/app/luit/charset.c
+++ b/app/luit/charset.c
@@ -76,13 +76,13 @@ NullReverse(unsigned int n, CharsetPtr self)
 }
 
 CharsetRec Unknown94Charset = 
-{ "Unknown (94)", T_94, 0, IdentityRecode, NullReverse, 0, 0};
+{ "Unknown (94)", T_94, 0, IdentityRecode, NullReverse, NULL, NULL};
 CharsetRec Unknown96Charset = 
-{ "Unknown (96)", T_96, 0, IdentityRecode, NullReverse, 0, 0};
+{ "Unknown (96)", T_96, 0, IdentityRecode, NullReverse, NULL, NULL};
 CharsetRec Unknown9494Charset = 
-{ "Unknown (94x94)", T_9494, 0, IdentityRecode, NullReverse, 0, 0};
+{ "Unknown (94x94)", T_9494, 0, IdentityRecode, NullReverse, NULL, NULL};
 CharsetRec Unknown9696Charset = 
-{ "Unknown (96x96)", T_9696, 0, IdentityRecode, NullReverse, 0, 0};
+{ "Unknown (96x96)", T_9696, 0, IdentityRecode, NullReverse, NULL, NULL};
 
 typedef struct _FontencCharset {
     char *name;
@@ -95,55 +95,55 @@ typedef struct _FontencCharset {
 } FontencCharsetRec, *FontencCharsetPtr;
 
 FontencCharsetRec fontencCharsets[] = {
-    {"ISO 646 (1973)", T_94, '@', "iso646.1973-0", 0x00, 0, 0},
-    {"ASCII", T_94, 'B', "iso8859-1", 0x00, 0, 0},
-    {"JIS X 0201:GL", T_94, 'J', "jisx0201.1976-0", 0x00, 0, 0},
-    {"JIS X 0201:GR", T_94, 'I', "jisx0201.1976-0", 0x80, 0, 0},
-    {"DEC Special", T_94, '0', "dec-special", 0x00, 0, 0},
-    {"DEC Technical", T_94, '>', "dec-dectech", 0x00, 0, 0},
-
-    {"ISO 8859-1", T_96, 'A', "iso8859-1", 0x80, 0, 0},
-    {"ISO 8859-2", T_96, 'B', "iso8859-2", 0x80, 0, 0},
-    {"ISO 8859-3", T_96, 'C', "iso8859-3", 0x80, 0, 0},
-    {"ISO 8859-4", T_96, 'D', "iso8859-4", 0x80, 0, 0},
-    {"ISO 8859-5", T_96, 'L', "iso8859-5", 0x80, 0, 0},
-    {"ISO 8859-6", T_96, 'G', "iso8859-6", 0x80, 0, 0},
-    {"ISO 8859-7", T_96, 'F', "iso8859-7", 0x80, 0, 0},
-    {"ISO 8859-8", T_96, 'H', "iso8859-8", 0x80, 0, 0},
-    {"ISO 8859-9", T_96, 'M', "iso8859-9", 0x80, 0, 0},
-    {"ISO 8859-10", T_96, 'V', "iso8859-10", 0x80, 0, 0},
-    {"ISO 8859-11", T_96, 'T', "iso8859-11", 0x80, 0, 0},
-    {"TIS 620", T_96, 'T', "iso8859-11", 0x80, 0, 0},
-    {"ISO 8859-13", T_96, 'Y', "iso8859-13", 0x80, 0, 0},
-    {"ISO 8859-14", T_96, '_', "iso8859-14", 0x80, 0, 0},
-    {"ISO 8859-15", T_96, 'b', "iso8859-15", 0x80, 0, 0},
-    {"ISO 8859-16", T_96, 'f', "iso8859-16", 0x80, 0, 0},
-    {"KOI8-E", T_96, '@', "koi8-e", 0x80, 0, 0},
-    {"TCVN", T_96, 'Z', "tcvn-0", 0x80, 0, 0},
-
-    {"GB 2312", T_9494, 'A', "gb2312.1980-0", 0x0000, 0, 0},
-    {"JIS X 0208", T_9494, 'B', "jisx0208.1990-0", 0x0000, 0, 0},
-    {"KSC 5601", T_9494, 'C', "ksc5601.1987-0", 0x0000, 0, 0},
-    {"JIS X 0212", T_9494, 'D', "jisx0212.1990-0", 0x0000, 0, 0},
-
-    {"GB 2312", T_9696, 'A', "gb2312.1980-0", 0x0000, 0, 0},
-    {"JIS X 0208", T_9696, 'B', "jisx0208.1990-0", 0x0000, 0, 0},
-    {"KSC 5601", T_9696, 'C', "ksc5601.1987-0", 0x0000, 0, 0},
-    {"JIS X 0212", T_9696, 'D', "jisx0212.1990-0", 0x0000, 0, 0},
-
-    {"KOI8-R", T_128, 0, "koi8-r", 0x80, 0, 0},
-    {"KOI8-U", T_128, 0, "koi8-u", 0x80, 0, 0},
-    {"KOI8-RU", T_128, 0, "koi8-ru", 0x80, 0, 0},
-    {"CP 1252", T_128, 0, "microsoft-cp1252", 0x80, 0, 0},
-    {"CP 1251", T_128, 0, "microsoft-cp1251", 0x80, 0, 0},
-    {"CP 1250", T_128, 0, "microsoft-cp1250", 0x80, 0, 0},
-
-    {"CP 437", T_128, 0, "ibm-cp437", 0x80, 0, 0},
-    {"CP 850", T_128, 0, "ibm-cp850", 0x80, 0, 0},
-    {"CP 866", T_128, 0, "ibm-cp866", 0x80, 0, 0},
-
-    {"Big 5", T_94192, 0, "big5.eten-0", 0x8000, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0}
+    {"ISO 646 (1973)", T_94, '@', "iso646.1973-0", 0x00, NULL, NULL},
+    {"ASCII", T_94, 'B', "iso8859-1", 0x00, NULL, NULL},
+    {"JIS X 0201:GL", T_94, 'J', "jisx0201.1976-0", 0x00, NULL, NULL},
+    {"JIS X 0201:GR", T_94, 'I', "jisx0201.1976-0", 0x80, NULL, NULL},
+    {"DEC Special", T_94, '0', "dec-special", 0x00, NULL, NULL},
+    {"DEC Technical", T_94, '>', "dec-dectech", 0x00, NULL, NULL},
+
+    {"ISO 8859-1", T_96, 'A', "iso8859-1", 0x80, NULL, NULL},
+    {"ISO 8859-2", T_96, 'B', "iso8859-2", 0x80, NULL, NULL},
+    {"ISO 8859-3", T_96, 'C', "iso8859-3", 0x80, NULL, NULL},
+    {"ISO 8859-4", T_96, 'D', "iso8859-4", 0x80, NULL, NULL},
+    {"ISO 8859-5", T_96, 'L', "iso8859-5", 0x80, NULL, NULL},
+    {"ISO 8859-6", T_96, 'G', "iso8859-6", 0x80, NULL, NULL},
+    {"ISO 8859-7", T_96, 'F', "iso8859-7", 0x80, NULL, NULL},
+    {"ISO 8859-8", T_96, 'H', "iso8859-8", 0x80, NULL, NULL},
+    {"ISO 8859-9", T_96, 'M', "iso8859-9", 0x80, NULL, NULL},
+    {"ISO 8859-10", T_96, 'V', "iso8859-10", 0x80, NULL, NULL},
+    {"ISO 8859-11", T_96, 'T', "iso8859-11", 0x80, NULL, NULL},
+    {"TIS 620", T_96, 'T', "iso8859-11", 0x80, NULL, NULL},
+    {"ISO 8859-13", T_96, 'Y', "iso8859-13", 0x80, NULL, NULL},
+    {"ISO 8859-14", T_96, '_', "iso8859-14", 0x80, NULL, NULL},
+    {"ISO 8859-15", T_96, 'b', "iso8859-15", 0x80, NULL, NULL},
+    {"ISO 8859-16", T_96, 'f', "iso8859-16", 0x80, NULL, NULL},
+    {"KOI8-E", T_96, '@', "koi8-e", 0x80, NULL, NULL},
+    {"TCVN", T_96, 'Z', "tcvn-0", 0x80, NULL, NULL},
+
+    {"GB 2312", T_9494, 'A', "gb2312.1980-0", 0x0000, NULL, NULL},
+    {"JIS X 0208", T_9494, 'B', "jisx0208.1990-0", 0x0000, NULL, NULL},
+    {"KSC 5601", T_9494, 'C', "ksc5601.1987-0", 0x0000, NULL, NULL},
+    {"JIS X 0212", T_9494, 'D', "jisx0212.1990-0", 0x0000, NULL, NULL},
+
+    {"GB 2312", T_9696, 'A', "gb2312.1980-0", 0x0000, NULL, NULL},
+    {"JIS X 0208", T_9696, 'B', "jisx0208.1990-0", 0x0000, NULL, NULL},
+    {"KSC 5601", T_9696, 'C', "ksc5601.1987-0", 0x0000, NULL, NULL},
+    {"JIS X 0212", T_9696, 'D', "jisx0212.1990-0", 0x0000, NULL, NULL},
+
+    {"KOI8-R", T_128, 0, "koi8-r", 0x80, NULL, NULL},
+    {"KOI8-U", T_128, 0, "koi8-u", 0x80, NULL, NULL},
+    {"KOI8-RU", T_128, 0, "koi8-ru", 0x80, NULL, NULL},
+    {"CP 1252", T_128, 0, "microsoft-cp1252", 0x80, NULL, NULL},
+    {"CP 1251", T_128, 0, "microsoft-cp1251", 0x80, NULL, NULL},
+    {"CP 1250", T_128, 0, "microsoft-cp1250", 0x80, NULL, NULL},
+
+    {"CP 437", T_128, 0, "ibm-cp437", 0x80, NULL, NULL},
+    {"CP 850", T_128, 0, "ibm-cp850", 0x80, NULL, NULL},
+    {"CP 866", T_128, 0, "ibm-cp866", 0x80, NULL, NULL},
+
+    {"Big 5", T_94192, 0, "big5.eten-0", 0x8000, NULL, NULL},
+    {NULL, 0, 0, NULL, 0, NULL, NULL}
 };
 
 typedef struct _OtherCharset {
@@ -160,11 +160,11 @@ OtherCharsetRec otherCharsets[] = {
     {"SJIS", init_sjis, mapping_sjis, reverse_sjis, stack_sjis},
     {"BIG5-HKSCS", init_hkscs, mapping_hkscs, reverse_hkscs, stack_hkscs},
     {"GB18030", init_gb18030, mapping_gb18030, reverse_gb18030, stack_gb18030},
-    {0, 0, 0, 0, 0}
+    {NULL, NULL, NULL, NULL, NULL}
 };
 
 static int
-compare(char *s, char *t)
+compare(const char *s, const char *t)
 {
     while(*s || *t) {
         if(*s && (isspace(*s) || *s == '-' || *s == '_'))
@@ -229,7 +229,7 @@ FontencCharsetReverse(unsigned int i, CharsetPtr self)
 static CharsetPtr cachedCharsets = NULL;
 
 static CharsetPtr 
-getCachedCharset(unsigned char final, int type, char *name)
+getCachedCharset(unsigned char final, int type, const char *name)
 {
     CharsetPtr c;
     for(c = cachedCharsets; c; c = c->next) {
@@ -248,7 +248,7 @@ cacheCharset(CharsetPtr c) {
 }
 
 static CharsetPtr
-getFontencCharset(unsigned char final, int type, char *name)
+getFontencCharset(unsigned char final, int type, const char *name)
 {
     FontencCharsetPtr fc;
     CharsetPtr c;
@@ -298,7 +298,7 @@ getFontencCharset(unsigned char final, int type, char *name)
 }
 
 static CharsetPtr
-getOtherCharset(char *name)
+getOtherCharset(const char *name)
 {
     OtherCharsetPtr fc;
     CharsetPtr c;
@@ -371,7 +371,7 @@ getCharset(unsigned char final, int type)
 }
 
 CharsetPtr 
-getCharsetByName(char *name)
+getCharsetByName(const char *name)
 {
     CharsetPtr c;
 
@@ -393,7 +393,7 @@ getCharsetByName(char *name)
     return getUnknownCharset(T_94);
 }
 
-LocaleCharsetRec localeCharsets[] = {
+const LocaleCharsetRec localeCharsets[] = {
     { "C", 0, 2, "ASCII", NULL, "ISO 8859-1", NULL, NULL},
     { "POSIX", 0, 2, "ASCII", NULL, "ISO 8859-1", NULL, NULL},
     { "ISO8859-1", 0, 2, "ASCII", NULL, "ISO 8859-1", NULL, NULL},
@@ -426,13 +426,13 @@ LocaleCharsetRec localeCharsets[] = {
     { "SJIS", 0, 1, NULL, NULL, NULL, NULL, "SJIS"},
     { "Big5-HKSCS", 0, 1, NULL, NULL, NULL, NULL, "BIG5-HKSCS"},
     { "gb18030", 0, 1, NULL, NULL, NULL, NULL, "GB18030"},
-    { 0, 0, 0, 0, 0, 0, 0}
+    { NULL, 0, 0, NULL, NULL, NULL, NULL, NULL}
 };
 
 void
-reportCharsets()
+reportCharsets(void)
 {
-    LocaleCharsetPtr p;
+    const LocaleCharsetRec *p;
     FontencCharsetPtr q;
     printf("Known locale encodings:\n\n");
     for(p = localeCharsets; p->name; p++) {
@@ -455,14 +455,14 @@ reportCharsets()
 }
 
 int
-getLocaleState(char *locale, char *charset,
+getLocaleState(const char *locale, char *charset,
                int *gl_return, int *gr_return,
                CharsetPtr *g0_return, CharsetPtr *g1_return,
                CharsetPtr *g2_return, CharsetPtr *g3_return,
                CharsetPtr *other_return)
 {
-    char *resolved = 0;
-    LocaleCharsetPtr p;
+    char *resolved = NULL;
+    const LocaleCharsetRec *p;
 
     if(!charset) {
         resolved = resolveLocale(locale);
diff --git a/app/luit/charset.h b/app/luit/charset.h
index b2ea592f0..7842ea9ca 100644
--- a/app/luit/charset.h
+++ b/app/luit/charset.h
@@ -50,21 +50,21 @@ typedef struct _Charset {
 } CharsetRec, *CharsetPtr;
 
 typedef struct _LocaleCharset {
-    char *name;
+    const char *name;
     int gl;
     int gr;
-    char *g0;
-    char *g1;
-    char *g2;
-    char *g3;
-    char *other;
+    const char *g0;
+    const char *g1;
+    const char *g2;
+    const char *g3;
+    const char *other;
 } LocaleCharsetRec, *LocaleCharsetPtr;
 
 CharsetPtr getUnknownCharset(int);
 CharsetPtr getCharset(unsigned char, int);
-CharsetPtr getCharsetByName(char*);
+CharsetPtr getCharsetByName(const char*);
 void reportCharsets(void);
-int getLocaleState(char *locale, char *charset,
+int getLocaleState(const char *locale, char *charset,
                    int *gl_return, int *gr_return,
                    CharsetPtr *g0_return, CharsetPtr *g1_return,
                    CharsetPtr *g2_return, CharsetPtr *g3_return,
diff --git a/app/luit/compile b/app/luit/compile
index 1b1d23216..e69de29bb 100644
--- a/app/luit/compile
+++ b/app/luit/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:
diff --git a/app/luit/configure b/app/luit/configure
index 6c82a9728..aca500fb0 100644
--- a/app/luit/configure
+++ b/app/luit/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for luit 1.0.2.
+# Generated by GNU Autoconf 2.59 for luit 1.0.3.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='luit'
 PACKAGE_TARNAME='luit'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='luit 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='luit 1.0.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LOCALEALIASFILE PKG_CONFIG ac_pt_PKG_CONFIG LUIT_CFLAGS LUIT_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
@@ -750,7 +750,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures luit 1.0.2 to adapt to many kinds of systems.
+\`configure' configures luit 1.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -816,7 +816,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of luit 1.0.2:";;
+     short | recursive ) echo "Configuration of luit 1.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -833,7 +833,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-localealiasfile=<path>
                           The locale alias file (default:
-                          ${libdir}/X11/locale/locale.alias)
+                          ${datadir}/X11/locale/locale.alias)
   --with-release-version=STRING
                           Use release version string in package name
 
@@ -947,7 +947,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-luit configure 1.0.2
+luit configure 1.0.3
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -961,7 +961,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by luit $as_me 1.0.2, which was
+It was created by luit $as_me 1.0.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1559,7 +1559,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='luit'
- VERSION='1.0.2'
+ VERSION='1.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3041,7 +3041,7 @@ if test "${with_localealiasfile+set}" = set; then
   withval="$with_localealiasfile"
   LOCALEALIASFILE="$withval"
 else
-  LOCALEALIASFILE=${libdir}/X11/locale/locale.alias
+  LOCALEALIASFILE=${datadir}/X11/locale/locale.alias
 fi;
 
 
@@ -3265,7 +3265,7 @@ fi
 
 case $host_os in
     linux*)
-        OS_CFLAGS="-D_XOPEN_SOURCE"
+        OS_CFLAGS="-D_XOPEN_SOURCE=500"
         ;;
     *)
         OS_CFLAGS=
@@ -3367,7 +3367,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
 _ACEOF
 
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
@@ -3376,7 +3376,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MINOR $PVM
 _ACEOF
 
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
@@ -3771,7 +3771,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by luit $as_me 1.0.2, which was
+This file was extended by luit $as_me 1.0.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3834,7 +3834,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-luit config.status 1.0.2
+luit config.status 1.0.3
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/app/luit/configure.ac b/app/luit/configure.ac
index 1ee5085ca..2fb4fddc9 100644
--- a/app/luit/configure.ac
+++ b/app/luit/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(luit,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],luit)
+AC_INIT(luit,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],luit)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -36,9 +36,9 @@ AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([zlib not found]))
 
 AC_ARG_WITH(localealiasfile,
         AC_HELP_STRING([--with-localealiasfile=<path>],
-                       [The locale alias file (default: ${libdir}/X11/locale/locale.alias)]),
+                       [The locale alias file (default: ${datadir}/X11/locale/locale.alias)]),
         [LOCALEALIASFILE="$withval"],
-        [LOCALEALIASFILE=${libdir}/X11/locale/locale.alias])
+        [LOCALEALIASFILE=${datadir}/X11/locale/locale.alias])
 AC_SUBST([LOCALEALIASFILE])
 
 # Checks for pkg-config packages
@@ -46,7 +46,7 @@ PKG_CHECK_MODULES(LUIT, x11 fontenc)
 
 case $host_os in
     linux*)
-        OS_CFLAGS="-D_XOPEN_SOURCE"
+        OS_CFLAGS="-D_XOPEN_SOURCE=500"
         ;;
     *)
         OS_CFLAGS=
diff --git a/app/luit/luit.c b/app/luit/luit.c
index 99cee82da..5c8d606b8 100644
--- a/app/luit/luit.c
+++ b/app/luit/luit.c
@@ -306,16 +306,12 @@ parseArgs(int argc, char **argv, char *argv0,
         char *shell;
         shell = getenv("SHELL");
         if(shell) {
-            path = malloc(strlen(shell) + 1);
-            if(!path)
-                goto bail;
-            strcpy(path, shell);
+            path = strdup(shell);
         } else {
-            path = malloc(strlen("/bin/sh") + 1);
-            if(!path)
-                goto bail;
-            strcpy(path, "/bin/sh");
+            path = strdup("/bin/sh");
         }
+        if(!path)
+            goto bail;
         child_argv = malloc(2 * sizeof(char*));
         if(!child_argv)
             goto bail;
@@ -325,10 +321,9 @@ parseArgs(int argc, char **argv, char *argv0,
             child_argv[0] = my_basename(path);
         child_argv[1] = NULL;
     } else {
-        path = malloc(strlen(argv[0]) + 1);
+        path = strdup(argv[0]);
         if(!path)
             goto bail;
-        strcpy(path, argv[0]);
         child_argv = malloc((argc + 1) * sizeof(char*));
         if(!child_argv) {
             goto bail;
diff --git a/app/luit/luit.man b/app/luit/luit.man
index a7a4cf4ca..9610c30f2 100644
--- a/app/luit/luit.man
+++ b/app/luit/luit.man
@@ -47,7 +47,7 @@ Function as a simple converter from standard input to standard output.
 .B \-x
 Exit as soon as the child dies.  This may cause
 .B luit
-to loose data at the end of the child's output.
+to lose data at the end of the child's output.
 .TP
 .BI \-argv0 " name"
 Set the child's name (as passed in argv[0]).
@@ -180,7 +180,7 @@ M-x set-terminal-coding-system RET iso-2022-8bit-ss2 RET
 .B __projectroot__/lib/X11/fonts/encodings/encodings.dir
 The system-wide encodings directory.
 .TP
-.B __projectroot__/lib/X11/locale/locale.alias
+.B __localealiasfile__
 The file mapping locales to locale encodings.
 .SH SECURITY
 On systems with SVR4 (``Unix-98'') ptys (Linux version 2.2 and later,
@@ -219,6 +219,6 @@ xterm(1), unicode(7), utf-8(7), charsets(7).
 .SH AUTHOR
 The version of
 .B Luit
-included in this X.org Foundataion release
+included in this X.Org Foundation release
 was originally written by Juliusz Chroboczek <jch@freedesktop.org>
 for the XFree86 Project.
diff --git a/app/luit/parser.c b/app/luit/parser.c
index 2ccd144f0..0c8023fcd 100644
--- a/app/luit/parser.c
+++ b/app/luit/parser.c
@@ -167,7 +167,7 @@ parseTwoTokenLine(FILE *f, char *first, char *second)
 }
 
 char *
-resolveLocale(char *locale)
+resolveLocale(const char *locale)
 {
     FILE *f;
     char first[MAX_KEYWORD_LENGTH], second[MAX_KEYWORD_LENGTH];
@@ -183,19 +183,17 @@ resolveLocale(char *locale)
         if(rc < -1)
             goto bail;
         if(!strcmp(first, locale)) {
-            resolved = malloc(strlen(second) + 1);
+            resolved = strdup(second);
             if(resolved == NULL)
                 goto bail;
-            strcpy(resolved, second);
             break;
         }
     } while(rc >= 0);
 
     if(resolved == NULL) {
-        resolved = malloc(strlen(locale) + 1);
+        resolved = strdup(locale);
         if(resolved == NULL)
             goto bail;
-        strcpy(resolved, locale);
     }
 
     fclose(f);
diff --git a/app/luit/parser.h b/app/luit/parser.h
index 6fceb502f..14b614c63 100644
--- a/app/luit/parser.h
+++ b/app/luit/parser.h
@@ -32,4 +32,4 @@ THE SOFTWARE.
 #define TOK_EQUALS 1
 #define TOK_KEYWORD 2
 
-char *resolveLocale(char *locale);
+char *resolveLocale(const char *locale);
diff --git a/app/luit/sys.c b/app/luit/sys.c
index 1fa8ecbf2..efec546af 100644
--- a/app/luit/sys.c
+++ b/app/luit/sys.c
@@ -361,12 +361,11 @@ allocatePty(int *pty_return, char **line_return)
         close(pty);
         goto bsd;
     }
-    line = malloc(strlen(temp_line) + 1);
+    line = strdup(temp_line);
     if(!line) {
         close(pty);
         return -1;
     }
-    strcpy(line, temp_line);
 
     fix_pty_perms(line);
 
@@ -394,8 +393,9 @@ allocatePty(int *pty_return, char **line_return)
     goto bail;
 
   found:
-    line = malloc(strlen(name) + 1);
-    strcpy(line, name);
+    line = strdup(name);
+    if(!line)
+	goto bail;
     line[5] = 't';
     fix_pty_perms(line);
     *pty_return = pty;
@@ -455,7 +455,7 @@ openTty(char *line)
    saved IDs at all, so there's no issue. */
 #if (defined(BSD) && !defined(_POSIX_SAVED_IDS)) || defined(_MINIX)
 int
-droppriv()
+droppriv(void)
 {
     int rc;
     rc = setuid(getuid());
@@ -465,7 +465,7 @@ droppriv()
 }
 #elif defined(_POSIX_SAVED_IDS)
 int
-droppriv()
+droppriv(void)
 {
     int uid = getuid();
     int euid = geteuid();
@@ -484,7 +484,7 @@ droppriv()
 }
 #else
 int
-droppriv()
+droppriv(void)
 {
     int uid = getuid();
     int euid = geteuid();
author	Matthieu Herrb <matthieu@cvs.openbsd.org>	2008-10-13 20:34:12 +0000
committer	Matthieu Herrb <matthieu@cvs.openbsd.org>	2008-10-13 20:34:12 +0000
commit	28c1518dc93984a96b373daafef1ff07c88d62fb (patch)
tree	f8d74df9df20bd9cb18d9ee1ed12645a73ce3633 /app/luit
parent	2b0b095090d200dbb52cedaf835e295aa928bcd3 (diff)