diff --git a/lib/libXaw/COPYING b/lib/libXaw/COPYING index 7f33cbfd2..19233ef8c 100644 --- a/lib/libXaw/COPYING +++ b/lib/libXaw/COPYING @@ -1,12 +1,132 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1985-1990, 1994, 1998 The Open Group +Copyright 2003-2004 Roland Mainz -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + + +Copyright (c) 1998-1999 by The XFree86 Project, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project 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 +XFree86 Project. + + +Copyright 1991 by OMRON Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of OMRON not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. OMRON makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +OMRON BE LIABLE FOR 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 TORTUOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 1987-1998 by Digital Equipment Corporation, Maynard, Massachusetts. +All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR 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. + + +Copyright 1989 Prentice Hall + +Permission to use, copy, modify, and distribute this software for any +purpose and without fee is hereby granted, provided that the above +copyright notice appear in all copies and that both the copyright notice +and this permission notice appear in supporting documentation. + +Prentice Hall and the authors disclaim all warranties with regard +to this software, including all implied warranties of merchantability and +fitness. In no event shall Prentice Hall or the authors be liable +for any special, indirect or cosequential 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. + + +(c) Copyright 2003 Danny Backx +(c) Copyright 2003-2004 Roland Mainz + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the names of the copyright holders shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from said +copyright holders. -http://lists.freedesktop.org/mailman/listinfo/xorg diff --git a/lib/libXaw/ChangeLog b/lib/libXaw/ChangeLog index 44b1b8563..8b9c7fd53 100644 --- a/lib/libXaw/ChangeLog +++ b/lib/libXaw/ChangeLog @@ -1,261 +1,516 @@ -2006-04-28 Adam Jackson +commit 857781383ef123a31a84a766507a8e11b9e3f778 +Author: Alan Coopersmith +Date: Tue Aug 21 13:19:01 2007 -0700 - * configure.ac: - Bump to 1.0.2 + Version bump: 1.0.4 -2006-04-03 Adam Jackson +commit cf90924541fe9af09c582ddd60953c4a08ceb004 +Author: Eric S. Raymond +Date: Sun Jan 14 10:34:00 2007 -0800 - * Makefile.am: - * configure.ac: - * src/Makefile.am: - Bug #6404: Cygwin build fixes (Yaakov Selkowitz) + Bug #9649: Bad markup on XAw.3x + + X.Org Bugzilla #9649 -2005-12-20 Kevin E. Martin +commit 0515e29cfc0ed99b06dcf9399a0504bde7c81d93 +Author: Daniel Drake +Date: Tue May 29 12:21:00 2007 -0800 - * configure.ac: - Update package version for X11R7 release. + Bug #11091: libXaw COPYING file + + X.Org Bugzilla #11091 + Attachment #10122 -2005-12-14 Kevin E. Martin +commit ee6e61225943ec77c8b97ae8115ce37c42e8c16e +Author: Alan Coopersmith +Date: Wed Apr 11 20:15:00 2007 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + Use iswalnum() if it's present as a function, not just if it's #defined + + Also fixes X.Org bugzilla #8564 -2005-12-08 Kevin E. Martin +commit eccdec2bf4680b42036f03a7ce0ae9bfe5ef5374 +Author: Alan Coopersmith +Date: Wed Jan 3 21:30:22 2007 -0800 - * src/Makefile.am: - Add configure options to allow hard-coded paths to be changed. + Version bump: 1.0.3 -2005-12-06 Kevin E. Martin +commit a2d3487dd5422ef273acae83cc20078a1a9f37c6 +Author: Alan Coopersmith +Date: Wed Jan 3 21:19:37 2007 -0800 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Replace static ChangeLog with dist-hook to generate from git log -2005-12-05 Kevin E. Martin +commit c653eb5742b0ef50570a8371d7787eeb1e7b5667 +Author: Alan Coopersmith +Date: Wed Jan 3 21:12:07 2007 -0800 - * configure.ac: - Fix libtool hack to work with older libtools. + Add call to PKG_PROG_PKG_CONFIG so configure doesn't break with --disable-xaw6 -2005-12-03 Kevin E. Martin +commit 32d0891b982b4cea322bdc2d8ecd32e912c70f54 +Author: Alan Coopersmith +Date: Wed Jan 3 21:09:36 2007 -0800 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add *~ to .gitignore to skip over patch/emacs droppings -2005-11-20 Alan Coopersmith +commit 21a1c92130ef304607b696c8e5db2185a89a4ba7 +Author: Alan Coopersmith +Date: Thu Jul 13 14:58:49 2006 -0700 - * configure.ac: - libXaw6 shouldn't depend on libXpm, only Xaw7 & Xaw8 should + renamed: .cvsignore -> .gitignore -2005-11-19 Kevin E. Martin +commit e487a686b1e251936c0926ff124c1b754814c7f5 +Author: Adam Jackson +Date: Thu Apr 27 00:03:33 2006 +0000 - * xaw6.pc.in: - * xaw7.pc.in: - * xaw8.pc.in: - Update pkgconfig files to separate library build-time dependencies - from application build-time dependencies. - * configure.ac: - Update dependencies to work with separate build roots. + Bump to 1.0.2 -2005-11-09 Kevin E. Martin +commit 580c3f12423e15192f4eff456ebf2f6246318bd9 +Author: Adam Jackson +Date: Mon Apr 3 19:23:16 2006 +0000 - * configure.ac: - Update package version number for X11R7 RC2 release. + Bug #6404: Cygwin build fixes (Yaakov Selkowitz) -2005-10-28 Alan Coopersmith +commit 735d010ee2c6dc2a6279dc16d1c9a1128c59d91a +Author: Kevin E Martin +Date: Wed Dec 21 02:30:05 2005 +0000 - * src/Makefile.am: - Add libXaw.so.N -> libXawN.so.N links for platforms where - ldconfig doesn't add them automatically for you. + Update package version for X11R7 release. -2005-10-24 Alan Coopersmith +commit 3b81b8af98277206eea791f0f9e7cf5a617a4b20 +Author: Adam Jackson +Date: Mon Dec 19 16:28:26 2005 +0000 - * src/Makefile.am: - Add -DOLDXAW to flags for building libXaw6 to disable features - that are only supposed to be in the newer versions. + Stub COPYING files -2005-10-21 Adam Jackson +commit 7f10a61e2cb38bbfee07fed4596ae176be3b7bb4 +Author: Kevin E Martin +Date: Thu Dec 15 00:24:28 2005 +0000 - * configure.ac: - Add xext check. + Update package version number for final X11R7 release candidate. -2005-10-18 Kevin E. Martin +commit 12566cf69c51989ee932e812db0f2186c64b540b +Author: Kevin E Martin +Date: Thu Dec 8 17:55:18 2005 +0000 - * configure.ac: - Update package version number for RC1 release. + Add configure options to allow hard-coded paths to be changed. -2005-10-12 Alan Coopersmith +commit a108ef7e6a7864179bdf16b3adf08428dd66f4ad +Author: Kevin E Martin +Date: Tue Dec 6 22:48:42 2005 +0000 - * man/Makefile.am: - * configure.ac: - Use sed to fill in variables in man page + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. -2005-10-05 Kevin E. Martin +commit 570029e344a36d8d0bcab5b2ea5b4f87ea508535 +Author: Kevin E Martin +Date: Mon Dec 5 17:48:19 2005 +0000 - * Makefile.am: - Add old-doc files to EXTRA_DIST + Fix libtool hack to work with older libtools. - * include/Makefile.am: - Add Template.c to install list +commit 28645b0df40bcd428d98eb18aeb8d0875f12f4e3 +Author: Kevin E Martin +Date: Sat Dec 3 05:49:42 2005 +0000 - * src/Makefile.am: - Add sharedlib.c to EXTRA_DIST + Update package version number for X11R7 RC3 release. - * Xaw6/Makefile.am: - * Xaw7/Makefile.am: - * Xaw8/Makefile.am: - Remove the unneeded Makefile.am's +commit 80a520a1a1724e0ba00c94139ca871f1944b4be1 +Author: Alan Coopersmith +Date: Mon Nov 28 22:03:05 2005 +0000 -2005-07-08 Keith Packard + 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) - * .cvsignore: - * include/.cvsignore: - * man/.cvsignore: - * src/.cvsignore: - Add .cvsignore files - - * Makefile.am: - * configure.ac: - * src/Makefile.am: - Build all three versions in src. Hack libtool to set SONAME in the - libtool output to match old libXaw file names. Still missing is the - creation of appropriate symlinks from libXaw.so.6 -> libXaw6.so.6 et - al so that libraries not yet installed will work properly. +commit 651a3e0a2dcead0aad75734b438bf900de4f7c5c +Author: Kevin E Martin +Date: Sun Nov 27 16:44:43 2005 +0000 -2005-01-22 Daniel Stone + Fix Xaw6 to build without Xpm. - * configure.ac: - Remove AC_CONFIG_AUX_DIR. +commit 1c36da4ef2e308cb5b7a80b1e914fd637d622fae +Author: Alan Coopersmith +Date: Mon Nov 21 03:24:10 2005 +0000 -2004-05-10 Eric Anholt + libXaw6 shouldn't depend on libXpm, only Xaw7 & Xaw8 should - * Makefile.am: - * configure.ac: - Link to libXpm as well. - Bump to version 7.0.2. - Properly include LIBS/CFLAGS in .pc and linking. +commit 7cec5bf0ee960356821bea08a30feb92dcbf186e +Author: Kevin E Martin +Date: Sat Nov 19 07:15:40 2005 +0000 -2004-04-13 Daniel Stone + Update pkgconfig files to separate library build-time dependencies from + application build-time dependencies, and update package deps to work + with separate build roots. - * TextSink.c: - * Vendor.c: - * Actions.c: - * Text.c: - * XawI18n.h: - * Xaw.man: - * include/X11/Xaw/XawInit.h: - Sync with X11R6.7, including fixing a wrong number of arguments to - XmuSnprintf, adding better Cygwin support, and cleaning up OLDXAW - semantics. +commit cb243066d12834c2f63a82f9695761a01400e26f +Author: Kevin E Martin +Date: Wed Nov 9 21:19:12 2005 +0000 - * Bump version to 7.0.1 for xlibs 1.0.1. + Update package version number for X11R7 RC2 release. -2004-01-25 Eric Anholt +commit db01f1c4c84768e818dbfa28556f246b91c1391d +Author: Kean Johnson +Date: Tue Nov 8 06:33:25 2005 +0000 - * Makefile.am: - Fix Xaw manpage section. + See ChangeLog entry 2005-11-07 for details. -2004-01-25 Eric Anholt +commit ca1c1425e53143899f212c6e783eec1eeb59e481 +Author: Alan Coopersmith +Date: Fri Oct 28 17:28:50 2005 +0000 - * Makefile.am: - Change an XT_CFLAGS to XAW_CFLAGS, which should fix the FreeBSD - build. + Add libXaw.so.N -> libXawN.so.N links for platforms where ldconfig doesn't + add them automatically for you. -2004-01-25 Eric Anholt +commit 6f7e7194574ef1bed6ba7db4304d9e064c4f24c7 +Author: Alan Coopersmith +Date: Mon Oct 24 17:33:04 2005 +0000 - * CHANGES: - * Changelog: - Remove some very dated changelogs. + Add -DOLDXAW to flags for building libXaw6 to disable features that are + only supposed to be in the newer versions. -2004-01-25 Eric Anholt +commit 7801c38f76000d4b93cc2208ad80e04505c6ff85 +Author: Adam Jackson +Date: Sun Oct 23 00:50:43 2005 +0000 - * CHANGES: - * Changelog: - * Makefile.am: + Add xext check -2004-01-24 Eric Anholt +commit 8c7f3e277321213fc2798a73a88e222f145c3b59 +Author: Kevin E Martin +Date: Wed Oct 19 02:48:09 2005 +0000 - reviewed by: daniel + Update package version number for RC1 release. - * CHANGES: - * Changelog: - Remove old changelogs, which are a bit dated. +commit 4836a84ebcc266c35be110c7f708d0b221360e91 +Author: Alan Coopersmith +Date: Tue Oct 18 00:00:08 2005 +0000 -2004-01-24 Eric Anholt + Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to + work better with BSD make - * Makefile.am: - Fix distcheck (missing header files). +commit 0f4847e12e3a3b7ce3cbfaaf282a92e3f1be2073 +Author: Alan Coopersmith +Date: Thu Oct 13 04:26:32 2005 +0000 -2003-12-23 Jeremy C. Reed + Missed changelog - * ChangeLog - Catch up on all my changes for Dec. 23, 2003 UTC. (Also - notice that older CHANGES and Changelog also exist.) +commit ec0fdd5646ab4f4642a73860b24a155560c94616 +Author: Alan Coopersmith +Date: Thu Oct 13 04:25:46 2005 +0000 -2003-12-23 Jeremy C. Reed + Add generated man pages to .cvsignores - * .cvsignore - Add ltcf-c.sh and ltconfig to list of files for CVS to ignore. +commit 7b0d5f78d4e853014b6110066208ba237bd8c2a3 +Author: Alan Coopersmith +Date: Thu Oct 13 04:07:32 2005 +0000 -2003-12-23 Jeremy C. Reed + Use sed to fill in variables in man page - * COPYING - * INSTALL - Add INSTALL and COPYING documents. (COPYING is empty and - needs licenses added to it.) +commit 2692d1b40d46d3d97526664c2bc0130eb1900197 +Author: Kevin E Martin +Date: Wed Oct 5 21:34:53 2005 +0000 -2003-12-23 Jeremy C. Reed + Add old-doc files to EXTRA_DIST + Add Template.c to install list + Add sharedlib.c to EXTRA_DIST + Remove the unneeded Makefile.am's - * README - Start README. +commit bb18f5fb61626da0a5422a36830e57cd070981c2 +Author: Alan Coopersmith +Date: Sat Jul 30 19:53:03 2005 +0000 -2003-12-23 Jeremy C. Reed + Check for headers used by XawI18N.h and define the needed HAS_*_H symbols. - * Makefile.am - Install Xaw man page. +commit 223c18dd13a524d144b856118b6f2ec036ae106d +Author: Kevin E Martin +Date: Fri Jul 29 21:22:50 2005 +0000 -2003-12-23 Jeremy C. Reed + 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 - * configure.ac - * xaw.pc.in - Make sure CFLAGS and LIBS are right for pkgconfig file. +commit 3ce58da9ecd5337738b8b35cdeaab64b32b521cd +Author: Alan Coopersmith +Date: Wed Jul 27 23:59:16 2005 +0000 -2003-12-23 Jeremy C. Reed + Set build_v8=yes when using autodetection to decide whether or not to build + Xaw8 and libXp is found, so that it actually is built. - * Makefile.am - * configure.ac - Use 7.0.0 for version for libtool version-info and for - autoconf AC_INIT. +commit b4e81526a0013ebdc8aa8c0dfb427db850213a7b +Author: Daniel Stone +Date: Fri Jul 22 07:19:44 2005 +0000 -2003-12-23 Jeremy C. Reed + Fix autodetection of Xprint and quote arguments properly. - * Makefile.am - * configure.ac - * include/Makefile.am - Added Makefile.am for include headers. Added support for - include headers. (I moved header files to include/X11/Xaw/ - on CVS server itself.) Add more pkg-config files to use. +commit e4ea145e991e947483054d85412002e64aeb08ea +Author: Daniel Stone +Date: Sat Jul 16 06:30:43 2005 +0000 -2003-12-23 Jeremy C. Reed + Set version numbers to 6.1.0, 7.0.0 and 8.0.0 with -version-number. - * include/.cvsignore - Add list of files for CVS to ignore. +commit cf08b572fb22334e29ec56930f3cecba1dc18629 +Author: Adam Jackson +Date: Thu Jul 14 05:56:32 2005 +0000 -2003-12-23 Jeremy C. Reed - * AUTHORS - * ChangeLog - * Makefile.am - * NEWS - * README - * autogen.sh - * configure.ac - * xaw.pc.in - Add initial files for automake/autoconf support. + style fix. don't use +=, just do conditionally defined variables. fixes + build on a particularly picky platform. -2003-12-23 Jeremy C. Reed +commit 3608270b1d1685082d9dab401d0e7d1aa9c91ba8 +Author: Alan Coopersmith +Date: Sun Jul 10 19:53:50 2005 +0000 - * .cvsignore - Fix .pc (pkg-config) files to ignore. + grep -q is sadly not universally supported, use grep > /dev/null instead -2003-12-23 Jeremy C. Reed +commit c22f98ed4fae3ccde3ff9a272b019a67fbc78c55 +Author: Keith Packard +Date: Sat Jul 9 06:11:58 2005 +0000 - * .cvsignore - Add list of files for CVS to ignore. + Add .cvsignore files + Build all three versions in src. Hack libtool to set SONAME in the libtool + output to match old libXaw file names. Still missing is the creation of + appropriate symlinks from libXaw.so.6 -> libXaw6.so.6 et al so that + libraries not yet installed will work properly. + +commit 5fc8851308321a65a6987aedea6618d056ff7879 +Author: Søren Sandmann Pedersen +Date: Wed Jul 6 19:26:27 2005 +0000 + + - Xaw/xaw.m4: Change help string to say "enable xprint" instead of "disable + xprint" + - symlink.sh: Rename Bitmap-co.ad to Bitmap-color.ad. Add bitmaps for the + bitmap application. Add xdbedizzy.sgml. + - xc/programs/xdbedizzy/: Conditionalize use of xprint + - remove font/arabic-misc/README and font/mutt-misc/README + +commit d4f214b6255184a2cbf571c02409a0e3f4405fb0 +Author: Søren Sandmann Pedersen +Date: Tue Jul 5 22:51:11 2005 +0000 + + Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage, + xmh, xmore. lib/Xaw/xaw.m4: Add an AM_CONDITIONAL and a shell variable + xaw_use_xprint symlink.sh: add some extra files for xgc, xinit, + xkbcomp, xlogo, xmb, and xmodmap xc/programs/xmore/xmore.c: + Conditionalize use of xprint + +commit 0e08a2ffb4b063b96d25dd7490caf91cb5bb6126 +Author: Daniel Stone +Date: Sun Jul 3 07:00:56 2005 +0000 + + Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings. + Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. + Add #include or , as appropriate, to all + source files in the xserver/xorg tree, predicated on defines of + HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to + . + +commit f8e7a4ec6117006123dfdc7c970f9f1392bf7d84 +Author: Søren Sandmann Pedersen +Date: Tue Jun 28 13:30:15 2005 +0000 + + lib/Xaw/Makefile.am: install the libXaw.so symlink in $(DESTDIR)$(libdir) - + pointed out by Stefan Dirsch + lib/Xaw/man/Makefile.am: add Xaw.man to EXTRA_DIST to make it distcheck. + +commit c35ec1561bfc9bf8d79b68a071619f4904764002 +Author: Søren Sandmann Pedersen +Date: Mon Jun 27 21:35:04 2005 +0000 + + - Fix string test in lib/Xaw/xaw.m4 + - Xaw/Xaw7/Makefile.am: add -DXAW7 + - add build system for editres + +commit f6c298f70e13ecf37b4824f6ac01007b876dd3cb +Author: Søren Sandmann Pedersen +Date: Fri Jun 24 22:54:24 2005 +0000 + + Add m4 macro to check for versions of the Xaw library + +commit e3e78cd7815716d8af729c19833bec51d7e3f19c +Author: Søren Sandmann Pedersen +Date: Fri Jun 24 21:20:32 2005 +0000 + + Change the so names to libXaw{6,7,8}.so and install a symlink from + libXaw.so to the newest version installed + +commit cc658b573a13f36868c5a2263e0b3ff8d0230b86 +Author: Søren Sandmann Pedersen +Date: Mon May 23 21:47:37 2005 +0000 + + Conditionally include config.h in xc/lib/Xaw/*.c + +commit 62b680d868fbe4bfdf1af6e6067d0ef27f773559 +Author: Søren Sandmann Pedersen +Date: Mon May 23 20:01:46 2005 +0000 + + Check in build system for Xaw + +commit f9faf0399180abbc89e44d5077b9070294c2f507 +Author: Egbert Eich +Date: Thu Jan 27 10:22:11 2005 +0000 + + Muffle gcc4 sentinel (trailing NULL in varargs list) check (Marcus + Meissner, Bugzilla #2392). + +commit 33f42c97af49095dd9a735c747c79b844e6afc25 +Author: Markus Kuhn +Date: Sat Dec 4 00:42:47 2004 +0000 + + Encoding of numerous files changed to UTF-8 + +commit 4904540c4399fed01ce0d1977a0b5d3af173b66c +Author: Egbert Eich +Date: Tue Sep 21 17:57:36 2004 +0000 + + Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and + Alan Coopersmith from release 6.8.1. + Fail during initialization with error if font/fontset is not set for + widget. This prevents a sig11 later when the non-existent font/fontset + structs are referenced. + Check if xf86Info.kbdProc pointer is really set before calling it on abort + as this pointer won't be set if the new modular keyboard driver is used + (Matthias Hopf). + Added new libs to the bindist control files. + Removed inclusion of unnecessary kernel header on Linux. This may fail in + an -ansi environment. + +commit c7f720ae3f0dea94bc6e9eb9bdbbf00e6bb16b24 +Author: Kevin E Martin +Date: Thu Sep 2 01:10:29 2004 +0000 + + Bump major version number of libXaw (Bug #1273). + +commit 93df4ff66635ea936d57723d317d0a0cdaa55e62 +Author: Kristian Høgsberg +Date: Mon Aug 16 16:36:14 2004 +0000 + + As discussed and agreed on on the release-wranglers meeting of August 16, + I'm committing the patch from bug #1060 to back out unconditional + Xprint functionality. + Back out Xprint changes. + Revert xman to CVS of June 5, revert xlogo to CVS of May 8, revert xedit to + CVS of April 25, to back out unconditional Xprint support. + Fix up Xprint config logic to be like the rest of the extensions: + BuildXprint is a one-stop option for disabling everything Xprint + related. XprtServer controls building Xprt, BuildXprintLib controls + building Xprint libs and BuildXprintClients controls building clients + related to Xprint. BuiltXprint defaults to YES and the other options + respects relevant settings, i.e. BuildServer and BuildServersOnly. + Build Xaw regardless of BuildXprintLib setting. + Only build xphelloworld, xplsprinters and xprehashprinterlist when + BuildXprintClients it YES. Disable building xmore, it has always + supported XawPrintShell. + Make Xprint support depend on BuildXprintLib. + +commit c0753d383d2b610863873fda5a1d2c65674e37b0 +Author: Roland Mainz +Date: Thu Jul 29 00:40:34 2004 +0000 + + Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=938 - Update + XawPrintShell per feedback and review comments. + +commit 021dac1e5b9394a228dfe69f10307a2596c48135 +Author: Alexander Gottwald +Date: Tue Jun 29 15:53:10 2004 +0000 + + #Bug 806: undefined reference to xawPrintShellWidgetClass in Xaw6 for + cygwin. Wrap references to xawPrintShellWidgetClass with #ifndef + OLDXAW. + +commit fcb62987b01b7166a4b1aceb677a2a777e6ba482 +Author: Egbert Eich +Date: Thu May 6 17:31:17 2004 +0000 + + BugZilla #601: Fixing makedepend choking on floating point exception + because CHAR_BIT is defined to __CHAR_BIT__ which is a compiler + intrinsic define. BugZilla #605: Fixing build on IA64 which is broken + due to the inclusion of the kernel header asm/page.h. Kernel headers + however don't work with + -ansi. The inclusion of asm/page.h can however savely be removed as it + there are plenty of other ways to determine the page size. + +commit 39c07a5fa73bcbb48d5de8985d5f2540b65e470b +Author: Egbert Eich +Date: Fri Apr 23 18:43:38 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 5aa2c5d2169757ae410f1d13c5279fd4030b72f0 +Author: Roland Mainz +Date: Tue Apr 13 23:32:21 2004 +0000 + + file PrintShell.c was initially added on branch XPRINT. + +commit 31c961a93829b50fa0694a431fd1574cc2c67ea2 +Author: Roland Mainz +Date: Tue Apr 13 23:32:21 2004 +0000 + + file PrintSP.h was initially added on branch XPRINT. + +commit 04af3b0444e8514173c44fac44864f15119f93b4 +Author: Roland Mainz +Date: Tue Apr 13 23:32:21 2004 +0000 + + file Print.h was initially added on branch XPRINT. + +commit f601320d34173365050a04d8f1ec661ee1f541dd +Author: Egbert Eich +Date: Sun Mar 14 08:32:04 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit d01cf1b69fd5444606b9183db6114a2972dcba0c +Author: Egbert Eich +Date: Wed Mar 3 12:11:23 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 0f9ae1ce47cc2271cb61887136c9a6b56b9ec4ba +Author: Egbert Eich +Date: Thu Feb 26 13:35:32 2004 +0000 + + readding XFree86's cvs IDs + +commit 0011f36c334046cce1126d4e3b45fead8fac551c +Author: Egbert Eich +Date: Thu Feb 26 09:22:42 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit c75f90ead1132640b2848babda6625c800528a8c +Author: Egbert Eich +Date: Thu Jan 29 08:08:05 2004 +0000 + + Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 + +commit 04a6533a94a1e0800c1806617b6dda48f30f9e6f +Author: Kaleb Keithley +Date: Fri Dec 19 20:54:35 2003 +0000 + + XFree86 4.3.99.902 (RC 2) + +commit ffc55826a7c787dd65d3dd577fa0ac7a111540e3 +Author: Kaleb Keithley +Date: Tue Nov 25 19:28:09 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 384ac455a6cd5d23dfa24f9939f3ec04f1e5de46 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:48 2003 +0000 + + XFree86 4.3.0.1 + +commit 81ad93fde745d556aaa3880deabf3674bb3db49e +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:48 2003 +0000 + + Initial revision + +commit b6e0280a57c4dfa572770241a42fe6a476109516 +Author: Kaleb Keithley +Date: Fri Nov 14 15:54:38 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/lib/libXaw/depcomp b/lib/libXaw/depcomp index 04701da53..ca5ea4e1e 100644 --- a/lib/libXaw/depcomp +++ b/lib/libXaw/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 diff --git a/lib/libXaw/include/X11/Xaw/XawInit.h b/lib/libXaw/include/X11/Xaw/XawInit.h index 3ce4e3577..1953f616c 100644 --- a/lib/libXaw/include/X11/Xaw/XawInit.h +++ b/lib/libXaw/include/X11/Xaw/XawInit.h @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/Xaw/XawInit.h,v 1.12 2001/01/17 19:42:36 dawes Exp $ */ -/* $XdotOrg: lib/Xaw/include/X11/Xaw/XawInit.h,v 1.3 2005/07/03 07:00:56 daniels Exp $ */ +/* $XdotOrg: xc/lib/Xaw/XawInit.h,v 1.2 2004/04/23 18:43:38 eich Exp $ */ #ifndef _XawInit_h #define _XawInit_h diff --git a/lib/libXaw/install-sh b/lib/libXaw/install-sh index 4d4a9519e..4fbbae7b7 100644 --- a/lib/libXaw/install-sh +++ b/lib/libXaw/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 -# shared with many OS's install programs. +# from scratch. + +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. - # 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 + --) shift 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= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? 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. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + obsolete_mkdir_used=false - # 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. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + 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 - pathcomp=$pathcomp$1 + if (umask $mkdir_umask && + 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 - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit + $posix_glob && set +f + IFS=$oIFS + + prefixes= + + 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/ - done + fi fi if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 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 - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 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" } - } - fi || { (exit 1); exit 1; } -done + } || exit 1 -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} + trap '' 0 + fi +done # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/lib/libXaw/man/Xaw.man b/lib/libXaw/man/Xaw.man index 8803f10f9..288da221c 100644 --- a/lib/libXaw/man/Xaw.man +++ b/lib/libXaw/man/Xaw.man @@ -28,8 +28,18 @@ .\" .\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.7 2001/11/04 21:16:39 paulo Exp $ .\" +.de EX +.sp +.nf +.ft CW +.. +.de EE +.ft R +.fi +.sp +.. .de TQ -.br +.\".br .ns .TP \\$1 .. @@ -67,32 +77,36 @@ a variable, otherwise, they indicate a resource name. This action allows the evaluation of a boolean expression in the first parameter before calling a action procedure. The procedure is only called if the expression evaluates as true. Example: -.br -.I call-proc("$inside & $pressed", notify) +.EX +call-proc("$inside & $pressed", notify) +.EE .TP 8 .B declare \fP(\fIboolean-expression\fP, \fIvariable\fP, \fIvalue\fP, ...) This action is used to create new variables or change their values. Any number of variable-value tuples may be specified. Example: -.br -.I declare(1, $pressed, 1) +.EX +declare(1, $pressed, 1) +.EE .TP 8 .B get-values \fP(\fIboolean-expression\fP, \fIvariable\fP, \fIvalue\fP, ...) This action reads a widget resource value into a variable. Any number of variable-value tuples may be specified. Example: -.br -.I get-values(1, $fg, foreground, $bg, background) +.EX +get-values(1, $fg, foreground, $bg, background) +.EE .TP 8 .B set-values \fP(\fIboolean-expression\fP, \fIvariable\fP, \fIvalue\fP, ...) This action sets a widget resource to the given value, which may be a variable. Any number of variable-value tuples may be specified. Example: -.br -.I set-values(1, foreground, $bg, background, $fg) +.EX +set-values(1, foreground, $bg, background, $fg) +.EE .PP Here is a sample translation to make a label widget behave like a button: .PP .nf -: get-values(1, $fg, foreground, $bg, background)\\n\\ -: set-values(1, foreground, yellow, background, gray30)\\n\\ +: get-values(1, $fg, foreground, $bg, background)\en\e +: set-values(1, foreground, yellow, background, gray30)\en\e : set-values(1, foreground, $fg, background, $bg) .fi .SH DISPLAY LISTS @@ -101,7 +115,7 @@ All of the \fBXaw\fP widgets have now the additional resource using commands embedded in a resource string. The displayList resource has the syntax: .PP -\fI[class-name:]function-name arguments[[{;\\n}]...]\fP +\fI[class-name:]function-name arguments[[{;\en}]...]\fP .PP \fBClass-name\fP is any registered set of functions to draw in the widget. Currently the only existing class is \fIxlib\fP, which provides access to @@ -123,35 +137,40 @@ called. When the function requires a coordinate, the syntax is .B arc-mode \fPmode Sets the arc mode. Accepted \fImode\fPs are "pieslice" and "chord", which set the arc to ArcPieSlice or ArcChord, respectively. Example: -.br -.I arc-mode chord +.EX +arc-mode chord +.EE .TP 8 .B bg \fPcolor-spec .TQ .B background \fPcolor-spec Sets the background color. \fIcolor-spec\fP must a valid color specification. Example: -.br -.I background red +.EX +background red +.EE .TP 8 .B cap-style \fPstyle Sets the cap style. Accepted \fIstyle\fPs are "notlast", "butt", "round", and "projecting", which set the cap style to CapNotLast, CapBut, CapRound or CapProjecting, respectively. Example: -.br -.I cap-style round +.EX +cap-style round +.EE .TP 8 .B clip-mask \fPpixmap-spec Sets the pixmap for the clip mask. Requires a pixmap parameter, as described in the \fBPIXMAPS\fP section below. Example: -.br -.I clip-mask xlogo11 +.EX +clip-mask xlogo11 +.EE .TP 8 .B clip-origin \fPx,y Sets the clip x and y origin. Requires two arguments, the x and y coordinates. Example: -.br -.I clip-origin 10,10 +.EX +clip-origin 10,10 +.EE .TP 8 .B clip-rects \fPx1,y1,x2,y2 [...,xn,yn] .TQ @@ -159,16 +178,18 @@ coordinates. Example: Sets a list of rectangles to the clip mask. The number of arguments must be a multiple of four. The arguments are coordinates. The parser calculates the width and height of the rectangles. Example: -.br -.I clip-rects 0,0,10,20, 20,10,30,30 +.EX +clip-rects 0,0,10,20, 20,10,30,30 +.EE .TP 8 .B coord-mode \fPmode Changes the coord mode for \fIfill-polygon\fP, \fIdraw-lines\fP, and \fIdraw-points\fP. Accepted parameters are "modeorigin" and "previous", that sets the coord mode to CoordModeOrigin or CoordModePrevious, respectively. Example: -.br -.I coord-mode previous +.EX +coord-mode previous +.EE .TP 8 .B copy-area \fP{pixmap-spec|.},dstx,dsty[,x2,y2,srcx,srcy] Calls XCopyArea. The character \fI.\fP means copy the window contents; @@ -176,8 +197,9 @@ pixmap-spec is as defined in the \fBPIXMAPS\fP section below. \fIX2\fP and \fIy2\fP are the coordinates of the end copy, not the width and height; if not defined, the parser calculates them. \fIsrc_x\fP and \fIsrc_y\fP default to zero. Example: -.br -.I copy-area Term,10,10 +.EX +copy-area Term,10,10 +.EE .TP 8 .B copy-plane \fP{pixmap-spec|.},dstx,dsty[,x2,y2,srcx,srcy,plane] Calls XCopyPlane. The character \fI.\fP means copy the window contents; @@ -185,90 +207,102 @@ pixmap-spec is as defined in the \fBPIXMAPS\fP section below. \fIX2\fP and \fIy2\fP are the coordinates of the end copy, not the width and height; if not defined, the parser calculates them. \fIsrc_x\fP and \fIsrc_y\fP default to zero. \fIPlane\fP defaults to one. Example: -.br -.I copy-plane star,10,10 +.EX +copy-plane star,10,10 +.EE .TP 8 .B dashes \fPi1[...,in] Sets the dashes for line drawing. Accepts up to 127 arguments. Example: -.br -.I dashes 3,7 9,10 +.EX +dashes 3,7 9,10 +.EE .TP 8 .B draw-arc \fPx1,y1,x2,y2[,start-angle,end-angle] Draws an arc. The four first arguments are the rectangle enclosing the arc. The two remaining arguments, if specified, are the start and end angle, in degrees. Example: -.br -.I draw-arc +0,+0,-1,-1,0,90 +.EX +draw-arc +0,+0,-1,-1,0,90 +.EE .TP 8 .B draw-rect \fPx1,y1,x2,y2 .TQ .B draw-rectangle \fPx1,y1,x2,y2 Draws a rectangle. Requires four arguments, which are the start and end coordinate pairs. Example: -.br -.I draw-rect +1,+1,-5,-5 +.EX +draw-rect +1,+1,-5,-5 +.EE .TP 8 .B draw-string \fPx,y,"string" Draws a text string. Requires three arguments, a x coordinate, a y coordinate, and a string. Strings that have white space can be quoted with -the \fI"\fP character; the backslash character \fI\\\fP can also be used, +the \fI"\fP character; the backslash character \fI\e\fP can also be used, but it will be necessary escape it twice. Example: -.br -\fI draw-string 10,10, "Hello world!"\fP +.EX + draw-string 10,10, "Hello world!"\fP +.EE .TP 8 .B exposures \fPboolean Sets graphics exposures in the GC. Allowed parameters are a integer or the strings "true", "false", "on" and "off". Example: -.br -.I exposures true +.EX +exposures true +.EE .TP 8 .B fill-arc \fPx1,y1,x2,y2[,start-angle,end-angle] Like \fIdraw-arc\fP, but fills the contents of the arc with the currently selected foreground. Example: -.br -.I fill-arc +0,+0,-1,-1,0,180 +.EX +fill-arc +0,+0,-1,-1,0,180 +.EE .TP 8 .B fill-poly \fPx1,y1 [...,xn,yn] .TQ .B fill-polygon \fPx1,y1 [...,xn,yn] Like \fIdraw-lines\fP, but fills the enclosed polygon and joins the first and last point, if they are not at the same position. Example: -.br -.I fill-poly +0,+10, +10,+20, +30,+0 +.EX +fill-poly +0,+10, +10,+20, +30,+0 +.EE .TP .B fill-rect \fPx1,y1,x2,y2 .TQ .B fill-rectangle \fPx1,y1,x2,y2 Like \fIdraw-rect\fP, but fills the contents of the rectangle with the selected foreground color. Example: -.br -.I fill-rect +10,+10,-20,-20 +.EX +fill-rect +10,+10,-20,-20 +.EE .TP 8 .B fill-rule \fPrule Sets the fill rule. Accepted parameters are "evenodd" and "winding", which set the fill rule to EvenOddRule or WindingRule, respectively. Example: -.br -.I +.EX fill-rule winding +.EE .TP 8 .B fill-style \fPstyle Sets the fill style. Allowed parameters are "solid", "tiled", "stippled" and "opaquestippled", which set the fill style to FillSolid, FillTiled, FillStippled or FillOpaqueStippled, respectively. Example: -.br -.I fill-style tiled +.EX +fill-style tiled +.EE .TP 8 .B font \fPfont-spec Sets the font for text functions. Example: -.br -.I font -*-*-*-R-*-*-*-120-*-*-*-*-ISO8859-1 +.EX +font -*-*-*-R-*-*-*-120-*-*-*-*-ISO8859-1 +.EE .TP 8 .B fg \fPcolor-spec .TQ .B foreground \fPcolor-spec Like \fIbackground\fP, but sets the current foreground color. Example: -.br -.I foreground blue +.EX +foreground blue +.EE .TP 8 .B mask This command is useful when you want to draw only in the region that really @@ -281,15 +315,17 @@ Sets the specific GC function. Allowed parameters are "set", "clear", "and", GXset, GXclear, GXand, GXandReverse, GXcopy, GXandInverted, GXnoop, GXxor, GXor, GXnor, GXequiv, GXinvert, GXorReverse, GXcopyInverted or GXnand, respectively. Example: -.br -.I function xor +.EX +function xor +.EE .TP 8 .B join-style \fPstyle Sets the join style. Allowed parameters are "miter", "round" and "bevel", which set the join style to JoinMiter, JoinRound and JoinBevel, respectively. Example: -.br -.I join-style round +.EX +join-style round +.EE .TP 8 .B image \fP{pixmap-spec},xs,ys,[xe,ye] This function is implemented as a way to quickly compose complex @@ -298,112 +334,127 @@ decorations in widgets. \fIPixmap-spec\fP is as defined in the where to start copying the pixmap; \fIxe\fP and \fIye\fP are optional (they default to xs + pixmap.width and ys + pixmap.height, respectively). If the pixmap has a mask, the copy is masked accordingly. Example: -.br -.I image pixmap.xpm,0,0,20,20 +.EX +image pixmap.xpm,0,0,20,20 +.EE .TP 8 .B line \fPx1,y1,x2,y2 .TQ .B draw-line \fPx1,y1,x2,y2 Draws a line with the current foreground color. Requires four arguments, the starting and ending coordinate pairs. Example: -.br -.I line +0,+0, -1,-1 +.EX +line +0,+0, -1,-1 +.EE .TP 8 .B line-width \fPinteger Selects a line width for drawing. Example: -.br -.I line-width 2 +.EX +line-width 2 +.EE .TP 8 .B line-style \fPstyle Sets the line style. Accepted parameters are "solid", "onoffdash" and "doubledash", which set the line style to LineSolid, LineOnOffDash or LineDoubleDash, respectively. Example: -.br -.I line-style onoffdash +.EX +line-style onoffdash +.EE .TP 8 .B lines \fPx1,y1,x2,y2 [...,xn,yn] .TQ .B draw-lines \fPx1,y1,x2,y2 [...,xn,yn] Draws a list of lines. Any number of argument pairs may be supplied. Example: -.br -.I lines +0,-1, -1,-1, -1,+0 +.EX +lines +0,-1, -1,-1, -1,+0 +.EE .TP 8 .B paint-string \fPx,y,"string" Identical to draw-string, but also uses the background color. Example: -.br -\fI paint-string 10,20, "Sample text"\fP +.EX + paint-string 10,20, "Sample text"\fP +.EE .TP 8 .B point \fPx,y .TQ .B draw-point \fPx,y Draws a point. Requires two arguments, a coordinate pair. Example: -.br -.I point +10,+10 +.EX +point +10,+10 +.EE .TP 8 .B plane-mask \fPinteger Sets the plane mask. Requires an integer parameter. Example: -.br -.I plane-mask -1 +.EX +plane-mask -1 +.EE .TP 8 .B points \fPx1,y1 [...,xn,yn] .TQ .B draw-points \fPx1,y1 [...,xn,yn] Draws a list of points at the specified coordinates. Example: -.br -.I points +1,+2, +1,+4, +1,+6 +.EX +points +1,+2, +1,+4, +1,+6 +.EE .TP 8 .B segments \fPx1,y1,x2,y2 [...,xn,yn] .TQ .B draw-segments \fPx1,y1,x2,y2 [...,xn,yn] Draws a list of segment lines. The number of parameters must be multiple of 4. Example: -.br -.I segments +1,+2,+1,-3, +2,-2,-3,-2 +.EX +segments +1,+2,+1,-3, +2,-2,-3,-2 +.EE .TP 8 .B shape-mode \fPmode Sets the shape mode used in \fIfill-polygon\fP. Accepted parameters are "complex", "convex" or "nonconvex", which set the shape mode to Complex, Convex or Nonconvex, accordingly. Example: -.br -.I shape-mode convex +.EX +shape-mode convex +.EE .TP 8 .B stipple \fPpixmap-spec Sets the pixmap for a stipple. Requires a pixmap parameter, as described in the \fBPIXMAPS\fP section below. Example: -.br -.I stipple plaid +.EX +stipple plaid +.EE .TP 8 .B subwindow-mode \fPmode Sets the subwindow mode in the GC. Accepted parameters are "includeinferiors" and "clipbychildren", which set the subwindow mode to IncludeInferiors or ClipByChildren, respectively. Example: -.br -.I subwindow-mode includeinferiors +.EX +subwindow-mode includeinferiors +.EE .TP 8 .B tile \fPpixmap-spec Sets the pixmap for a tile. Requires a pixmap parameter, as described in the \fBPIXMAPS\fP section below. Example: -.br -.I tile xlogo11?foreground=red&background=gray80 +.EX +tile xlogo11?foreground=red&background=gray80 +.EE .TP 8 .B ts-origin \fPx,y Sets the tile stipple x and y origin. Requires two arguments, a x and y coordinate. Example: -.br -.I ts-origin 10,10 +.EX +ts-origin 10,10 +.EE .TP 8 .B umask Disables the GC mask, if it has been set with the command \fImask\fP. Requires no arguments. .PP Example for drawing a shadow effect in a widget: -.nf -foreground gray30;\\ -draw-lines +1,-1,-1,-1,-1,+1;\\ -foreground gray85;\\ +.EX +foreground gray30;\e +draw-lines +1,-1,-1,-1,-1,+1;\e +foreground gray85;\e draw-lines -1,+0,+0,+0,+0,-1 -.fi +.EE .SH PIXMAPS A String to Pixmap converter has been added to \fBXaw\fP. This converter is meant to be extended, and has enough abstraction to allow loading diff --git a/lib/libXaw/missing b/lib/libXaw/missing index 894e786e1..1c8ff7049 100644 --- a/lib/libXaw/missing +++ b/lib/libXaw/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 , 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'` - test -z "$file" && 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 -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'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -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 diff --git a/lib/libXaw/src/XawI18n.c b/lib/libXaw/src/XawI18n.c index ca95866e5..345bc7d87 100644 --- a/lib/libXaw/src/XawI18n.c +++ b/lib/libXaw/src/XawI18n.c @@ -96,9 +96,13 @@ _Xaw_iswspace(wchar_t w) int _Xaw_iswalnum(wchar_t ch) { - unsigned char mb[sizeof(wchar_t)]; +#ifdef HAVE_ISWALNUM + return iswalnum(ch); +#else + unsigned char mb[MB_LEN_MAX]; wctomb((char*)mb, ch); return (isalnum(*mb)); +#endif } diff --git a/lib/libXaw/src/XawI18n.h b/lib/libXaw/src/XawI18n.h index ab8f264ea..45cb9a54a 100644 --- a/lib/libXaw/src/XawI18n.h +++ b/lib/libXaw/src/XawI18n.h @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/Xaw/src/XawI18n.h,v 1.4 2005/11/08 06:33:25 jkj Exp $ */ +/* $XdotOrg: xc/lib/Xaw/XawI18n.h,v 1.2 2004/04/23 18:43:38 eich Exp $ */ /* $Xorg: XawI18n.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /************************************************************ @@ -113,7 +113,7 @@ wchar_t _Xaw_atowc #endif #endif -#ifndef iswalnum +#if !defined(iswalnum) && !defined(HAVE_ISWALNUM) #define iswalnum(c) _Xaw_iswalnum(c) int _Xaw_iswalnum (