Update to xman 1.1.0

app/xman/ChangeLog

@@ -1,63 +1,578 @@
-2006-04-01  Adam Jackson  <ajax@freedesktop.org>
+commit b82eb1279acc60f9ebb93730ac002dfde2118a4b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Oct 16 14:10:04 2009 -0700
 
-	* configure.ac:
+    xman 1.1.0
-	Bump to 1.0.2.
     
-2006-01-06  Alan Coopersmith  <alan.coopersmith@sun.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 
-	* main.c (ArgError): 
+commit 2983ab485ff3fd68ff33d81f9fa46977ec724ac6
-	<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6240826>
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
-	Sun bug 6240826: xman typo: 'geometery' in usage message (Sam Lau)
+Date:   Thu Oct 15 18:20:41 2009 -0700
 
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
     
-	* configure.ac:
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-	Update package version for X11R7 release.
 
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 6c4d017430014699b5e108f10765e89bcc3f41cf
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date:   Thu Oct 15 16:09:44 2009 -0500
 
-	* version.h:
+    Cygwin uses Linux-style man
-	Bump hardcoded version number.
     
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
 
-	* configure.ac:
+commit 44334f70b6623395bbef78513f712dbbf5cbfba0
-	Update package version number for final X11R7 release candidate.
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Oct 1 14:54:27 2009 -0700
 
-2005-12-08  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Add README with pointers to mailing lists, bugzilla, & git
     
-	* Makefile.am:
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-	* configure.ac:
-	Add configure options to allow hard-coded paths to be changed.
 
-2005-12-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 86e63ab1821387f6fcf3fce506357f76ad8dd194
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Thu Jan 17 17:42:12 2008 -0200
 
-	* Makefile.am:
+    Add lzma manpage extension support.
-	* configure.ac:
-	Change to use the app-defaults default dir configured in libXt.
     
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    This should really be handled by the existing code to handle multiple
+    extension formats...
 
-	* Makefile.am:
+commit e4b0097161ec84b288ca480149ed0185e742d7a3
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Tue Jan 13 18:16:03 2009 -0200
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Ansification and compile warning fixes.
     
-	* configure.ac:
+      This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, and corrects
-	Update package version number for X11R7 RC3 release.
+    make distcheck.
 
-2005-11-19  Alan Coopersmith  <alan.coopersmith@sun.com>
+commit 3afab6ff3cd896514d3bb733244e3bb9640d1e7c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Nov 8 15:03:18 2008 -0800
 
-	* configure.ac: 
+    Apple: Added Tiger's man.conf location to the search path
-	Add dependency on xp module when building with Xprint support.
 
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 5722ca728763e7ec57088593e76ba84db61a726c
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Thu Aug 21 00:38:27 2008 +0200
 
-	* configure.ac:
+    Remove xprint remnants
-	Update package version number for X11R7 RC2 release.
 
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit f3579250f8aa332f2015cb1352ed8b7373eb10db
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Wed Aug 20 10:32:52 2008 -0400
 
-	* configure.ac:
+    xaw8 is gone, use xaw7
-	Update package version number for RC1 release.
 
+commit 74dbdc66607017cd9ba3c2c3dba4a5536332fabb
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri Mar 28 11:53:13 2008 +0100
+
+    Use AM_CFLAGS instead of xman_CFLAGS and remove AM_PROG_CC_C_O
+
+commit 6c9f3307ba95604654d0f0227b7e0457ef4bc47f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Mar 27 20:15:54 2008 -0700
+
+    Build fix for case insensitive file systems
+    Also added AM_PROG_CC_C_O
+
+commit dbfa16889ae66d5880e23c9a63f8385896512020
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Feb 9 21:53:14 2008 -0500
+
+    Allow xman to use bzip2 to decompress man pages
+    
+    Patch is from Mandriva as posted to bugzilla bug 14400.
+    
+    Use bunzip2(1) to decompress man pages, akin to the current
+    support for gzip(1)ed pages.
+
+commit 2d03acacffae87865201991fc9ef44a7208ccb8f
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:37:24 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit 137a0fd2e258d9337049263895b1d6142af3a464
+Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
+Date:   Thu Aug 16 11:45:37 2007 -0500
+
+    Allow xman to be cross build by adding a ./configure
+    --with-manconfig=<filename> option.
+    (Based on discussion on xorg list at end of July.)
+
+commit 8077ab96dbb30ec5b5b4bbc67124fc6f2681cdb5
+Author: Matthieu Herrb <matthieu@localhost.localdomain>
+Date:   Fri Aug 10 16:19:58 2007 +0200
+
+    Bump version for release
+
+commit 112a1b17708c8213cb19f31934458c19dd31f360
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jan 3 20:26:26 2007 -0800
+
+    renamed: .cvsignore -> .gitignore
+
+commit bede0f3651f51ce5bc99a2d6543664e3817d14f4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jan 3 20:25:54 2007 -0800
+
+    Sun Bug 6504978: xman on Solaris x86 does not render correctly, nroff visible
+    
+    <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6504978>
+
+commit 7e0441a748aa62459bc74b08196e48e89860123e
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Sun Apr 2 01:13:58 2006 +0000
+
+    Bump to 1.0.2.
+
+commit d76e42586ff3032b1427b9c130ed65c09078f4e4
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Jan 6 22:39:24 2006 +0000
+
+    <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6240826> Sun
+        bug 6240826: xman typo: 'geometery' in usage message (Sam Lau)
+
+commit d0b90cd56262986a6b8a57d91f1f833d3039bc9e
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:52 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit e8eb7902e02e7ccad9ddd32eb517d989f90b3fa3
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 20 21:54:20 2005 +0000
+
+    Bump hardcoded version number.
+
+commit cf34c7ba82f1aa7d25d1d7e9ad70aea39c05d780
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:46 2005 +0000
+
+    Stub COPYING files
+
+commit 4676f39901599df979f6a5da84234e76a713b583
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:09 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 28b5296571c67d70d8808e2f80d2c3f51fba15b6
+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 898dc25befe1d90e36e3735b011039745176e861
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 7 16:18:01 2005 +0000
+
+    Change to use the app-defaults default dir configured in libXt.
+
+commit 60093efc850bea280c2931f81b90ee8d83a21df6
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:24 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 3863a37b310d213e58732d6a5c9c7c878cdf1a8d
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:26 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit e0dfbe139da41143cdfc3c222110db790f160f3e
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:44 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 e4156c926662a13bea5c59ecfc128dfd5b5f988c
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:35:02 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit 1a530f943936c8fe145e00567406a6c321dd9176
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:54 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit d373967af861fb2c97dde15e56f13f575acc48da
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sun Nov 20 04:13:45 2005 +0000
+
+    Add dependency on xp module when building with Xprint support.
+
+commit 4b7d00e52f22d0c98152bc47f47a317619175ae9
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Nov 9 21:09:22 2005 +0000
+
+    Update package version number for X11R7 RC2 release.
+
+commit aaca206527e4fe4e3a825daae4261554681cec58
+Author: Kean Johnson <kean@armory.com>
+Date:   Tue Nov 8 06:33:33 2005 +0000
+
+    See ChangeLog entry 2005-11-07 for details.
+
+commit 61785b3b0421ab82f88671dd5d515579cd5d8243
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:47:56 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 4c5fda0874b94edf9189eb84839e9ae46df99df6
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Oct 18 00:32:54 2005 +0000
+
+    Change default install dir for app-default files from
+        $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
+        the monolith & allow localization
+
+commit 009cf19ab0940f771eb5967a8f6528f20333b597
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:24 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit 58076d1a51b69c6ef84258b2e3c4361fd6ac30e8
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:47 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit 41f684bf50fea4b96ebea38e728bb771b83dc736
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Aug 1 20:25:30 2005 +0000
+
+    Install man pages to section 1 instead of section m (Patch from Donnie
+        Berkholz)
+
+commit f1b20d6d1578c6c57eed9fb81fd8d28282fc8bcc
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:36 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 c42be410ac62efc0252fae37b4ed1fb9d30bd457
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Thu Jul 28 23:16:55 2005 +0000
+
+    Set default man path for Solaris.
+
+commit f4f185f8700de48dcb5b888cd113dcb9aff91829
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Thu Jul 28 22:47:57 2005 +0000
+
+    Install xman.help Attempt to determine man page configuration file location
+        and format (based on Imake MANCONFIGSTYLE and MANCONF settings - needs
+        testing on various Linux & BSD flavors to see if I translated
+        correctly)
+
+commit 7a3bd9a41a227ad0590d4104fd8ecc21e2099cd0
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sat Jul 23 16:48:10 2005 +0000
+
+    fix remainig DEP_{CFLAGS,LIBS} references
+
+commit caa0a44964149cdbe1e3585b7799540e0827b4fc
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Jul 20 19:32:02 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 0423e9c256b9fd808e09f306e9b7b668c799ed45
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 16 22:07:13 2005 +0000
+
+    Add #ifdef HAVE_CONFIG_H/#include "config.h" to files that need it to get
+        HAS_MKSTEMP defined in modular builds.
+
+commit eb70952e2e8c3d103f8fcb3012328e542337c87a
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 16 21:59:14 2005 +0000
+
+    Define HAS_MKSTEMP if mkstemp() is present (needed for improved protection
+        against tempfile race conditions in many places)
+
+commit 622dfb510ce2896a79418a6227a8af634827b796
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Thu Jul 14 22:40:16 2005 +0000
+
+    Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch
+
+commit 6698505ac69196e38e1187c54204fb84ff6effe2
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed Jul 6 14:14:10 2005 +0000
+
+    Make Xman build again.
+    - Use $xaw_use_xprint instead of $XAW_USE_XPRINT
+    - Generate Xman by linking from either Xman-xprint.ad or Xman-noxprint.ad
+        Both pointed out by Stefan Dirsch.
+
+commit fb0ffe45044025c82e1597b9cff7f8e1b2f216e6
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+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 feaa900afe02312131f4f6f503fe6efa85a41eba
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date:   Mon Apr 11 01:06:15 2005 +0000
+
+    xc/programs/Xserver/Xprint/attributes.c
+    xc/programs/glxgears/glxgears.c
+    xc/programs/xdbedizzy/xdbedizzy.c
+    xc/programs/xedit/Imakefile
+    xc/programs/xedit/Xedit-xprint.ad
+    xc/programs/xedit/util.c
+    xc/programs/xedit/xedit.h
+    xc/programs/xlogo/print.c
+    xc/programs/xlogo/xlogo.c
+    xc/programs/xlogo/xlogo.h
+    xc/programs/xman/Imakefile
+    xc/programs/xman/print.h
+    xc/programs/xmore/Imakefile
+    xc/programs/xmore/print.c
+    xc/programs/xmore/print.h
+    xc/programs/xmore/printdialog.c
+    xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c
+    xc/programs/xphelloworld/xphelloworld/xphelloworld.c
+    xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c
+    xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c
+    //bugs.freedesktop.org/show_bug.cgi?id=790) attachment #2379
+        (https://bugs.freedesktop.org/attachment.cgi?id=2379) Implement support
+        client+Xserver support for passing output (stdout+stderr) of the
+        spooler command started by the Xprint server back to the application
+        using the "xp-spooler-command-results" XPJobAttr attribute
+        (applications can fetch the attribute value after the XPEndJobNotify
+        event was received; more details can be found in
+        http://xprint.mozdev.org/docs/dtprint_fspec.ps).
+
+commit 821677f646bcaee8b5e4759d97909d05120de4d2
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date:   Sat Apr 9 06:42:15 2005 +0000
+
+    //bugs.freedesktop.org/show_bug.cgi?id=2942) attachment #2360
+        (https://bugs.freedesktop.org/attachment.cgi?id=2360) Fix possible
+        crash due uninitalised structure when "xman" opens the print dialog.
+
+commit a42a211aba369513bf31d6d34c966c36c1ccc714
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date:   Mon Jan 3 01:06:35 2005 +0000
+
+    xc/lib/XprintAppUtil/xpapputil.c
+    xc/lib/XprintAppUtil/xpapputil.h
+    xc/lib/XprintUtil/xprintutil.c
+    xc/lib/XprintUtil/xprintutil.h
+    xc/programs/glxgears/glxgears.c
+    xc/programs/xdbedizzy/xdbedizzy.c
+    xc/programs/xedit/Xedit-xprint.ad
+    xc/programs/xedit/commands.c
+    xc/programs/xlogo/print.c
+    xc/programs/xlsfonts/xlsfonts.c
+    xc/programs/xlsfonts/xlsfonts.man
+    xc/programs/xlsfonts/xlsfonts.sgml
+    xc/programs/xman/Xman-xprint.ad
+    xc/programs/xman/handler.c
+    xc/programs/xman/print.c
+    xc/programs/xman/print.h
+    xc/programs/xmore/XMore.ad
+    xc/programs/xmore/print.c
+    xc/programs/xmore/print.h
+    xc/programs/xmore/printdialog.c
+    xc/programs/xmore/printdialog.h
+    xc/programs/xmore/printdialogprivates.h
+    xc/programs/xmore/xmore.c
+    xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c
+    xc/programs/xphelloworld/xphelloworld/xphelloworld.c
+    xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c
+    xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c
+    xc/programs/xphelloworld/xpxthelloworld/xpxthelloworld.c
+    xc/programs/xplsprinters/xplsprinters.c
+    //bugs.freedesktop.org/show_bug.cgi?id=1706) attachment #1615
+        (https://bugs.freedesktop.org/attachment.cgi?id=1615): XprintUtils
+        2004/Q3 update. This adds various new features to the XprintUtils
+        library including support for page resolutions where
+        X_resolution!=Y_resolution, listfonts-mode control and initial
+        framework for the COLORSPACE extension. Patch by Roland Mainz
+        <roland.mainz@nrubsig.org> and Julien Lafon <julien.lafon@gmail.com>.
+
+commit 6abedd2bce33d244546a3efed44beb95c6571157
+Author: Egbert Eich <eich@suse.de>
+Date:   Mon Oct 18 14:21:47 2004 +0000
+
+    Made handling of DevelDrivers for x86-64 more conformant to other
+        platforms.
+    Compress all font encodings (Stefan Dirsch).
+    Fixed warnings.
+    Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and
+        Root mode (bugzilla #1580, James Su).
+    Added another compose key combination for the Euro symbol (Stefan Dirsch).
+    Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian).
+    Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian).
+        This is the encoding that is also used by glibc. We may break other
+        libcs - lets see who complains.
+    Added explanation for DESTDIR to install to a different directory than /.
+    Added some early bailouts to atiprobe if PCI structure pointer is NULL to
+        prevent sig11.
+    XV support doesn't depend on 2D acceleration any more. This patch removes
+        this limitation from the NSC driver. This is a patch that I have
+        committed to XFree86 a while ago but never ported over to X.Org.
+        Matthieu Herrb contributed some build fixes.
+    Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate
+        timer. This takes advantage of the fact that TimerSet() with a timeout
+        argument 0 behaves like TimerCanel().
+    Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink).
+    Create missing links for backward compatibility to XFree86 (Stefan Dirsch).
+    Changed comment to mention xorg.
+    Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If
+        you don't like it we can change it back (original author unkown).
+    Added 'pic' to the man page rendering command pipeline (Werner Fink).
+    Added missing return value (Stefan Dirsch, Roland Mainz)
+
+commit 4cf1c874d8ea1eb2222e10ca92c2c5afa30e1326
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date:   Tue Oct 12 22:46:40 2004 +0000
+
+    Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1601 - Fix
+        problems with wrong page counts in xedit&co. when a global "*geometry"
+        resource was overriding the internal geometry management used by
+        XawPrintShell(=usually adjust to current page size, the resource was
+        turning this into a static value). (Original patch by Felix Schulte
+        <felix.schulte@gmail.com>)
+
+commit b9b8f24095964cdfe21b52a5f2667a42fdc6220d
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Wed Sep 29 20:04:57 2004 +0000
+
+    Avoid several buffer overflows if search string is too long. Bugzilla
+        #1481.
+
+commit 545064318591f8c27701da0af0ebc5d9fd1b2ec5
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Sep 2 08:40:33 2004 +0000
+
+    Restore xman and xedit changes that were previously reverted, and make
+        Xprint support optional (Bug #1273, Roland Mainz).
+
+commit 50a3e1e4269fe2ef6c97ff40a6dc02d074e7ba95
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Mon Aug 16 16:36:26 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 6b0d9917116797e38b554397b815c555bf55a721
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date:   Thu Jul 29 00:40:35 2004 +0000
+
+    Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=938 - Update
+        XawPrintShell per feedback and review comments.
+
+commit 24ffc96e3347125c213090d9c9550fbf48756459
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date:   Thu Jul 1 13:54:46 2004 +0000
+
+    DoSearch is defined in search.c
+
+commit 7cf0973ed5076c513b3a970a8250066a05b0473e
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date:   Tue Jun 8 02:44:35 2004 +0000
+
+    Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=668 - Add print
+        support to xman
+
+commit 113139a1b202d0b94dcd24facc7b2c584faf294e
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat May 22 19:20:06 2004 +0000
+
+    Set HasMkstemp to YES on Solaris
+    xc/programs/xman/man.c
+    xc/programs/xman/man.h
+    xc/programs/xman/misc.c
+    xman cannot display SGML man pages on Solaris
+
+commit 313f95249e4621b9002bdd054106b8b743ff64ae
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:54:58 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 0b24854cbc017733d4e782db65912a473ec053be
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:35:40 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 7093a5ad5e15f7c2a7bb8feb6f3255f9a4f8983a
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:13:15 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 471b69d7053fb225fee8a2ff987c789d421aedfa
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:26 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 31f5f6a32ae09278b3bb6f8aecc18793d66b3437
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:24:14 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 06d8bbebd1daa587dc5509d9d464646a9ae07c45
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:29:15 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 1504e01d61c573156fe82c2395362f0567102d8a
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:23 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 36fca7804971e1b209138fcf82aee2d74cb2583e
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:23 2003 +0000
+
+    Initial revision

app/xman/Makefile.am

@@ -24,7 +24,8 @@ bin_PROGRAMS = xman
 helpdir=@HELPDIR@
 dist_help_DATA = xman.help
 
-xman_CFLAGS = $(XMAN_CFLAGS) -D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\"
+AM_CFLAGS = $(CWARNFLAGS) $(XMAN_CFLAGS) \
+	-D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\"
 xman_LDADD = $(XMAN_LIBS)
 
 xman_SOURCES =	\
@@ -50,39 +51,23 @@ xman_SOURCES =	\
         vendor.h \
         version.h
 
-if XAW_USE_XPRINT
-xman_SOURCES += \
-        print.c \
-        print.h
-endif
-
 appman_PRE = \
         xman.man
 
-# App default files  (*.ad)
+# App default files
+
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
 
 appdefaultdir = @appdefaultdir@
 
-if XAW_USE_XPRINT
+dist_appdefault_DATA = app-defaults/Xman
-Xman: Xman-xprint.ad
-	ln -s $(top_srcdir)/Xman-xprint.ad Xman
-else
-Xman: Xman-noxprint.ad
-	ln -s $(top_srcdir)/Xman-noxprint.ad Xman
-endif
-
-appdefault_DATA = Xman
-
-EXTRA_DIST = Xman-xprint.ad Xman-noxprint.ad
-
-CLEANFILES = Xman
 
 appmandir = $(APP_MAN_DIR)
 
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
-EXTRA_DIST += $(appman_PRE)
+EXTRA_DIST = $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+CLEANFILES = $(appman_DATA)
 
 SED = sed
 
@@ -106,4 +91,14 @@ MAN_SUBSTS = \
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog

app/xman/Makefile.in

@@ -59,14 +59,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = xman$(EXEEXT)
-@XAW_USE_XPRINT_TRUE@am__append_1 = \
+DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
-@XAW_USE_XPRINT_TRUE@        print.c \
+	$(dist_help_DATA) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@XAW_USE_XPRINT_TRUE@        print.h
-
-DIST_COMMON = README $(am__configure_deps) $(dist_help_DATA) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
+	ChangeLog INSTALL NEWS config.guess config.sub depcomp \
 	install-sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -78,20 +74,14 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" \
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
-	"$(DESTDIR)$(appmandir)" "$(DESTDIR)$(helpdir)"
+	"$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(helpdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am__xman_SOURCES_DIST = buttons.c defs.h globals.c globals.h handler.c \
+am_xman_OBJECTS = buttons.$(OBJEXT) globals.$(OBJEXT) \
-	help.c iconclosed.h icon_help.h icon_open.h main.c man.c man.h \
+	handler.$(OBJEXT) help.$(OBJEXT) main.$(OBJEXT) man.$(OBJEXT) \
-	misc.c ScrollByL.c ScrollByL.h ScrollByLP.h search.c tkfuncs.c \
+	misc.$(OBJEXT) ScrollByL.$(OBJEXT) search.$(OBJEXT) \
-	vendor.c vendor.h version.h print.c print.h
+	tkfuncs.$(OBJEXT) vendor.$(OBJEXT)
-@XAW_USE_XPRINT_TRUE@am__objects_1 = xman-print.$(OBJEXT)
-am_xman_OBJECTS = xman-buttons.$(OBJEXT) xman-globals.$(OBJEXT) \
-	xman-handler.$(OBJEXT) xman-help.$(OBJEXT) xman-main.$(OBJEXT) \
-	xman-man.$(OBJEXT) xman-misc.$(OBJEXT) \
-	xman-ScrollByL.$(OBJEXT) xman-search.$(OBJEXT) \
-	xman-tkfuncs.$(OBJEXT) xman-vendor.$(OBJEXT) $(am__objects_1)
 xman_OBJECTS = $(am_xman_OBJECTS)
 am__DEPENDENCIES_1 =
 xman_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -103,17 +93,17 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(xman_SOURCES)
-DIST_SOURCES = $(am__xman_SOURCES_DIST)
+DIST_SOURCES = $(xman_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-appdefaultDATA_INSTALL = $(INSTALL_DATA)
 appmanDATA_INSTALL = $(INSTALL_DATA)
+dist_appdefaultDATA_INSTALL = $(INSTALL_DATA)
 dist_helpDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(appdefault_DATA) $(appman_DATA) $(dist_help_DATA)
+DATA = $(appman_DATA) $(dist_appdefault_DATA) $(dist_help_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -126,7 +116,6 @@ am__remove_distdir = \
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@@ -144,7 +133,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -153,9 +145,11 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 HELPDIR = @HELPDIR@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -185,18 +179,10 @@ PKG_CONFIG = @PKG_CONFIG@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-TMP_XAW_CFLAGS = @TMP_XAW_CFLAGS@
-TMP_XAW_LIBS = @TMP_XAW_LIBS@
 VERSION = @VERSION@
-XAW_USE_XPRINT_FALSE = @XAW_USE_XPRINT_FALSE@
-XAW_USE_XPRINT_TRUE = @XAW_USE_XPRINT_TRUE@
 XMAN_CFLAGS = @XMAN_CFLAGS@
 XMAN_LIBS = @XMAN_LIBS@
-XPRINT_UTIL_CFLAGS = @XPRINT_UTIL_CFLAGS@
-XPRINT_UTIL_LIBS = @XPRINT_UTIL_LIBS@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@@ -204,8 +190,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-
-# App default files  (*.ad)
 appdefaultdir = @appdefaultdir@
 bindir = @bindir@
 build = @build@
@@ -214,43 +198,75 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 helpdir = @HELPDIR@
 dist_help_DATA = xman.help
-xman_CFLAGS = $(XMAN_CFLAGS) -D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\"
+AM_CFLAGS = $(CWARNFLAGS) $(XMAN_CFLAGS) \
+	-D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\"
+
 xman_LDADD = $(XMAN_LIBS)
-xman_SOURCES = buttons.c defs.h globals.c globals.h handler.c help.c \
+xman_SOURCES = \
-	iconclosed.h icon_help.h icon_open.h main.c man.c man.h misc.c \
+        buttons.c \
-	ScrollByL.c ScrollByL.h ScrollByLP.h search.c tkfuncs.c \
+        defs.h \
-	vendor.c vendor.h version.h $(am__append_1)
+        globals.c \
+        globals.h \
+        handler.c \
+        help.c \
+        iconclosed.h \
+        icon_help.h \
+        icon_open.h \
+        main.c \
+        man.c \
+        man.h \
+        misc.c \
+        ScrollByL.c \
+        ScrollByL.h \
+        ScrollByLP.h \
+        search.c \
+        tkfuncs.c \
+        vendor.c \
+        vendor.h \
+        version.h
+
 appman_PRE = \
         xman.man
 
-appdefault_DATA = Xman
+
-EXTRA_DIST = Xman-xprint.ad Xman-noxprint.ad $(appman_PRE)
+# App default files
-CLEANFILES = Xman $(appman_DATA)
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
+dist_appdefault_DATA = app-defaults/Xman
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+EXTRA_DIST = $(appman_PRE) ChangeLog
+CLEANFILES = $(appman_DATA)
 SED = sed
 
 # Strings to replace in man pages
@@ -270,6 +286,7 @@ MAN_SUBSTS = \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
+MAINTAINERCLEANFILES = ChangeLog
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -358,18 +375,17 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-ScrollByL.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ScrollByL.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-buttons.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buttons.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-globals.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-handler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-help.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-man.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/man.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-misc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-print.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-search.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tkfuncs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-tkfuncs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vendor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xman-vendor.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -384,192 +400,7 @@ 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) '$<'`
-
-xman-buttons.o: buttons.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-buttons.o -MD -MP -MF "$(DEPDIR)/xman-buttons.Tpo" -c -o xman-buttons.o `test -f 'buttons.c' || echo '$(srcdir)/'`buttons.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-buttons.Tpo" "$(DEPDIR)/xman-buttons.Po"; else rm -f "$(DEPDIR)/xman-buttons.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='buttons.c' object='xman-buttons.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-buttons.o `test -f 'buttons.c' || echo '$(srcdir)/'`buttons.c
-
-xman-buttons.obj: buttons.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-buttons.obj -MD -MP -MF "$(DEPDIR)/xman-buttons.Tpo" -c -o xman-buttons.obj `if test -f 'buttons.c'; then $(CYGPATH_W) 'buttons.c'; else $(CYGPATH_W) '$(srcdir)/buttons.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-buttons.Tpo" "$(DEPDIR)/xman-buttons.Po"; else rm -f "$(DEPDIR)/xman-buttons.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='buttons.c' object='xman-buttons.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-buttons.obj `if test -f 'buttons.c'; then $(CYGPATH_W) 'buttons.c'; else $(CYGPATH_W) '$(srcdir)/buttons.c'; fi`
-
-xman-globals.o: globals.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-globals.o -MD -MP -MF "$(DEPDIR)/xman-globals.Tpo" -c -o xman-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-globals.Tpo" "$(DEPDIR)/xman-globals.Po"; else rm -f "$(DEPDIR)/xman-globals.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='globals.c' object='xman-globals.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c
-
-xman-globals.obj: globals.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-globals.obj -MD -MP -MF "$(DEPDIR)/xman-globals.Tpo" -c -o xman-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-globals.Tpo" "$(DEPDIR)/xman-globals.Po"; else rm -f "$(DEPDIR)/xman-globals.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='globals.c' object='xman-globals.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi`
-
-xman-handler.o: handler.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-handler.o -MD -MP -MF "$(DEPDIR)/xman-handler.Tpo" -c -o xman-handler.o `test -f 'handler.c' || echo '$(srcdir)/'`handler.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-handler.Tpo" "$(DEPDIR)/xman-handler.Po"; else rm -f "$(DEPDIR)/xman-handler.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='handler.c' object='xman-handler.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-handler.o `test -f 'handler.c' || echo '$(srcdir)/'`handler.c
-
-xman-handler.obj: handler.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-handler.obj -MD -MP -MF "$(DEPDIR)/xman-handler.Tpo" -c -o xman-handler.obj `if test -f 'handler.c'; then $(CYGPATH_W) 'handler.c'; else $(CYGPATH_W) '$(srcdir)/handler.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-handler.Tpo" "$(DEPDIR)/xman-handler.Po"; else rm -f "$(DEPDIR)/xman-handler.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='handler.c' object='xman-handler.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-handler.obj `if test -f 'handler.c'; then $(CYGPATH_W) 'handler.c'; else $(CYGPATH_W) '$(srcdir)/handler.c'; fi`
-
-xman-help.o: help.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-help.o -MD -MP -MF "$(DEPDIR)/xman-help.Tpo" -c -o xman-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-help.Tpo" "$(DEPDIR)/xman-help.Po"; else rm -f "$(DEPDIR)/xman-help.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='help.c' object='xman-help.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c
-
-xman-help.obj: help.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-help.obj -MD -MP -MF "$(DEPDIR)/xman-help.Tpo" -c -o xman-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-help.Tpo" "$(DEPDIR)/xman-help.Po"; else rm -f "$(DEPDIR)/xman-help.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='help.c' object='xman-help.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi`
-
-xman-main.o: main.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-main.o -MD -MP -MF "$(DEPDIR)/xman-main.Tpo" -c -o xman-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-main.Tpo" "$(DEPDIR)/xman-main.Po"; else rm -f "$(DEPDIR)/xman-main.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='xman-main.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-
-xman-main.obj: main.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-main.obj -MD -MP -MF "$(DEPDIR)/xman-main.Tpo" -c -o xman-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-main.Tpo" "$(DEPDIR)/xman-main.Po"; else rm -f "$(DEPDIR)/xman-main.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='xman-main.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-
-xman-man.o: man.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-man.o -MD -MP -MF "$(DEPDIR)/xman-man.Tpo" -c -o xman-man.o `test -f 'man.c' || echo '$(srcdir)/'`man.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-man.Tpo" "$(DEPDIR)/xman-man.Po"; else rm -f "$(DEPDIR)/xman-man.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='man.c' object='xman-man.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-man.o `test -f 'man.c' || echo '$(srcdir)/'`man.c
-
-xman-man.obj: man.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-man.obj -MD -MP -MF "$(DEPDIR)/xman-man.Tpo" -c -o xman-man.obj `if test -f 'man.c'; then $(CYGPATH_W) 'man.c'; else $(CYGPATH_W) '$(srcdir)/man.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-man.Tpo" "$(DEPDIR)/xman-man.Po"; else rm -f "$(DEPDIR)/xman-man.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='man.c' object='xman-man.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-man.obj `if test -f 'man.c'; then $(CYGPATH_W) 'man.c'; else $(CYGPATH_W) '$(srcdir)/man.c'; fi`
-
-xman-misc.o: misc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-misc.o -MD -MP -MF "$(DEPDIR)/xman-misc.Tpo" -c -o xman-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-misc.Tpo" "$(DEPDIR)/xman-misc.Po"; else rm -f "$(DEPDIR)/xman-misc.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='xman-misc.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
-
-xman-misc.obj: misc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-misc.obj -MD -MP -MF "$(DEPDIR)/xman-misc.Tpo" -c -o xman-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-misc.Tpo" "$(DEPDIR)/xman-misc.Po"; else rm -f "$(DEPDIR)/xman-misc.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='xman-misc.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`
-
-xman-ScrollByL.o: ScrollByL.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-ScrollByL.o -MD -MP -MF "$(DEPDIR)/xman-ScrollByL.Tpo" -c -o xman-ScrollByL.o `test -f 'ScrollByL.c' || echo '$(srcdir)/'`ScrollByL.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-ScrollByL.Tpo" "$(DEPDIR)/xman-ScrollByL.Po"; else rm -f "$(DEPDIR)/xman-ScrollByL.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ScrollByL.c' object='xman-ScrollByL.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-ScrollByL.o `test -f 'ScrollByL.c' || echo '$(srcdir)/'`ScrollByL.c
-
-xman-ScrollByL.obj: ScrollByL.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-ScrollByL.obj -MD -MP -MF "$(DEPDIR)/xman-ScrollByL.Tpo" -c -o xman-ScrollByL.obj `if test -f 'ScrollByL.c'; then $(CYGPATH_W) 'ScrollByL.c'; else $(CYGPATH_W) '$(srcdir)/ScrollByL.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-ScrollByL.Tpo" "$(DEPDIR)/xman-ScrollByL.Po"; else rm -f "$(DEPDIR)/xman-ScrollByL.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ScrollByL.c' object='xman-ScrollByL.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-ScrollByL.obj `if test -f 'ScrollByL.c'; then $(CYGPATH_W) 'ScrollByL.c'; else $(CYGPATH_W) '$(srcdir)/ScrollByL.c'; fi`
-
-xman-search.o: search.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-search.o -MD -MP -MF "$(DEPDIR)/xman-search.Tpo" -c -o xman-search.o `test -f 'search.c' || echo '$(srcdir)/'`search.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-search.Tpo" "$(DEPDIR)/xman-search.Po"; else rm -f "$(DEPDIR)/xman-search.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search.c' object='xman-search.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-search.o `test -f 'search.c' || echo '$(srcdir)/'`search.c
-
-xman-search.obj: search.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-search.obj -MD -MP -MF "$(DEPDIR)/xman-search.Tpo" -c -o xman-search.obj `if test -f 'search.c'; then $(CYGPATH_W) 'search.c'; else $(CYGPATH_W) '$(srcdir)/search.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-search.Tpo" "$(DEPDIR)/xman-search.Po"; else rm -f "$(DEPDIR)/xman-search.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search.c' object='xman-search.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-search.obj `if test -f 'search.c'; then $(CYGPATH_W) 'search.c'; else $(CYGPATH_W) '$(srcdir)/search.c'; fi`
-
-xman-tkfuncs.o: tkfuncs.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-tkfuncs.o -MD -MP -MF "$(DEPDIR)/xman-tkfuncs.Tpo" -c -o xman-tkfuncs.o `test -f 'tkfuncs.c' || echo '$(srcdir)/'`tkfuncs.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-tkfuncs.Tpo" "$(DEPDIR)/xman-tkfuncs.Po"; else rm -f "$(DEPDIR)/xman-tkfuncs.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tkfuncs.c' object='xman-tkfuncs.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-tkfuncs.o `test -f 'tkfuncs.c' || echo '$(srcdir)/'`tkfuncs.c
-
-xman-tkfuncs.obj: tkfuncs.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-tkfuncs.obj -MD -MP -MF "$(DEPDIR)/xman-tkfuncs.Tpo" -c -o xman-tkfuncs.obj `if test -f 'tkfuncs.c'; then $(CYGPATH_W) 'tkfuncs.c'; else $(CYGPATH_W) '$(srcdir)/tkfuncs.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-tkfuncs.Tpo" "$(DEPDIR)/xman-tkfuncs.Po"; else rm -f "$(DEPDIR)/xman-tkfuncs.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tkfuncs.c' object='xman-tkfuncs.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-tkfuncs.obj `if test -f 'tkfuncs.c'; then $(CYGPATH_W) 'tkfuncs.c'; else $(CYGPATH_W) '$(srcdir)/tkfuncs.c'; fi`
-
-xman-vendor.o: vendor.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-vendor.o -MD -MP -MF "$(DEPDIR)/xman-vendor.Tpo" -c -o xman-vendor.o `test -f 'vendor.c' || echo '$(srcdir)/'`vendor.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-vendor.Tpo" "$(DEPDIR)/xman-vendor.Po"; else rm -f "$(DEPDIR)/xman-vendor.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='vendor.c' object='xman-vendor.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-vendor.o `test -f 'vendor.c' || echo '$(srcdir)/'`vendor.c
-
-xman-vendor.obj: vendor.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-vendor.obj -MD -MP -MF "$(DEPDIR)/xman-vendor.Tpo" -c -o xman-vendor.obj `if test -f 'vendor.c'; then $(CYGPATH_W) 'vendor.c'; else $(CYGPATH_W) '$(srcdir)/vendor.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-vendor.Tpo" "$(DEPDIR)/xman-vendor.Po"; else rm -f "$(DEPDIR)/xman-vendor.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='vendor.c' object='xman-vendor.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-vendor.obj `if test -f 'vendor.c'; then $(CYGPATH_W) 'vendor.c'; else $(CYGPATH_W) '$(srcdir)/vendor.c'; fi`
-
-xman-print.o: print.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-print.o -MD -MP -MF "$(DEPDIR)/xman-print.Tpo" -c -o xman-print.o `test -f 'print.c' || echo '$(srcdir)/'`print.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-print.Tpo" "$(DEPDIR)/xman-print.Po"; else rm -f "$(DEPDIR)/xman-print.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='print.c' object='xman-print.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-print.o `test -f 'print.c' || echo '$(srcdir)/'`print.c
-
-xman-print.obj: print.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xman_CFLAGS) $(CFLAGS) -MT xman-print.obj -MD -MP -MF "$(DEPDIR)/xman-print.Tpo" -c -o xman-print.obj `if test -f 'print.c'; then $(CYGPATH_W) 'print.c'; else $(CYGPATH_W) '$(srcdir)/print.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xman-print.Tpo" "$(DEPDIR)/xman-print.Po"; else rm -f "$(DEPDIR)/xman-print.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='print.c' object='xman-print.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) $(xman_CFLAGS) $(CFLAGS) -c -o xman-print.obj `if test -f 'print.c'; then $(CYGPATH_W) 'print.c'; else $(CYGPATH_W) '$(srcdir)/print.c'; fi`
 uninstall-info-am:
-install-appdefaultDATA: $(appdefault_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
-	@list='$(appdefault_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
-	  $(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
-	done
-
-uninstall-appdefaultDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(appdefault_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
-	done
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
@@ -587,6 +418,23 @@ uninstall-appmanDATA:
 	  echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(appmandir)/$$f"; \
 	done
+install-dist_appdefaultDATA: $(dist_appdefault_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
+	@list='$(dist_appdefault_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
+	  $(dist_appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
+	done
+
+uninstall-dist_appdefaultDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_appdefault_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
+	done
 install-dist_helpDATA: $(dist_help_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(helpdir)" || $(mkdir_p) "$(DESTDIR)$(helpdir)"
@@ -656,6 +504,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/app-defaults
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -682,6 +531,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 \
@@ -783,7 +635,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(helpdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(helpdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -811,6 +663,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
@@ -832,7 +685,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-appdefaultDATA install-appmanDATA \
+install-data-am: install-appmanDATA install-dist_appdefaultDATA \
 	install-dist_helpDATA
 
 install-exec-am: install-binPROGRAMS
@@ -862,34 +715,37 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
+uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
-	uninstall-binPROGRAMS uninstall-dist_helpDATA \
+	uninstall-dist_appdefaultDATA uninstall-dist_helpDATA \
 	uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
-	distclean-compile distclean-generic distclean-hdr \
+	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-appdefaultDATA install-appmanDATA install-binPROGRAMS \
+	install-appmanDATA install-binPROGRAMS install-data \
-	install-data install-data-am install-dist_helpDATA \
+	install-data-am install-dist_appdefaultDATA \
-	install-exec install-exec-am install-info install-info-am \
+	install-dist_helpDATA install-exec install-exec-am \
-	install-man install-strip installcheck installcheck-am \
+	install-info install-info-am install-man install-strip \
-	installdirs maintainer-clean maintainer-clean-generic \
+	installcheck installcheck-am installdirs maintainer-clean \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	ps ps-am tags uninstall uninstall-am uninstall-appdefaultDATA \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-appmanDATA uninstall-binPROGRAMS \
+	uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
-	uninstall-dist_helpDATA uninstall-info-am
+	uninstall-dist_appdefaultDATA uninstall-dist_helpDATA \
+	uninstall-info-am
 
 
-@XAW_USE_XPRINT_TRUE@Xman: Xman-xprint.ad
-@XAW_USE_XPRINT_TRUE@	ln -s $(top_srcdir)/Xman-xprint.ad Xman
-@XAW_USE_XPRINT_FALSE@Xman: Xman-noxprint.ad
-@XAW_USE_XPRINT_FALSE@	ln -s $(top_srcdir)/Xman-noxprint.ad Xman
-
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

app/xman/README

@@ -0,0 +1,25 @@
+xman is a graphical manual page browser using the Athena Widgets (Xaw) toolkit.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/app/xman
+
+        http://cgit.freedesktop.org/xorg/app/xman
+
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
+

app/xman/ScrollByL.c

@@ -30,10 +30,6 @@ from the X Consortium.
 */
 /* $XFree86: xc/programs/xman/ScrollByL.c,v 1.6tsi Exp $ */
 
-#if !defined(lint) && !defined(SABER) && 0
-  static char rcs_version[] = "$Athena: ScrollByL.c,v 4.5 88/12/19 13:46:04 kit Exp $";
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include <X11/Xos.h>

app/xman/Xman-xprint.ad

@@ -1,294 +0,0 @@
-*input:				True
-
-*topBox:			True
-*topBox.Title:			Xman
-*topBox.IconName:		Xman
-
-*manualBrowser.Title:		Manual Page
-*manualBrowser.IconName:	Manual Page
-*manualBrowser.geometry:	600x600
-
-*manualFontBold:		-*-courier-bold-r-*-*-*-120-*-*-*-*-*-*
-*manualFontItalic:		-*-courier-medium-o-*-*-*-120-*-*-*-*-*-*
-*manualFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
-*manualFontSymbol:		-*-symbol-*-*-*-*-*-120-*-*-*-*-*-*
-!*directoryFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
-*directoryFontNormal:		-*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
-!*directoryFontNormal:		-*-lucida-bold-r-*-*-*-120-*-*-*-*-*-*
-
-!*SimpleMenu.BackingStore:	Always
-!*SimpleMenu.SaveUnder:		Off
-
-*horizPane.orientation: 	horizontal
-*horizPane*showGrip:		False
-*horizPane.min:			22
-*horizPane.max:			22
-*topLabel.BorderWidth:		0
-*search*label.BorderWidth:	0
-
-*search*dialog*value:		Xman
-
-!*optionMenu.Label:		Options
-!*sectionMenu.Label:		Sections
-
-*horizPane*options.Label:	Options
-*horizPane*sections.Label:	Sections
-
-*helpButton.Label:		Help
-*helpButton.Tip:		Open help browser
-
-*quitButton.Label:		Quit
-*quitButton.Tip:		Quit Xman
-
-*manpageButton.Label:		Manual Page
-*manpageButton.Tip:		Open new manpage browser
-
-*topLabel.Label:		Manual Browser
-
-!*SimpleMenu*menuLabel*vertSpace: 100
-!*SimpleMenu*menuLabel*leftMargin: 20
-
-*displayDirectory.Label:	Display Directory 
-*displayManualPage.Label:	Display Manual Page
-*help.Label:			Help
-*help.geometry:			600x600
-*search.Label:			Search
-*removeThisManpage.Label:	Remove This Manpage
-*help*removeThisManpage.Label:	Remove Help
-*openNewManpage.Label:		Open New Manpage
-*printManualPage.Label:		Print This Manpage
-*showVersion.Label:		Show Version
-*quit.Label:			Quit
-
-*pleaseStandBy*Label:		Formatting Manual Page, Please Stand By...
-
-*search*dialog.Label:		Type string to search for:
-*search*apropos.Label:		Apropos
-*search*manualPage.Label:	Manual Page
-*search*cancel.Label:		Cancel
-
-*likeToSave*dialog.Label:	Would you like to save this formatted Manual Page?
-*likeToSave*yes.Label:		Yes
-*likeToSave*no.Label:		No
-
-*translations: 		#override \
-		Ctrl<Key>q: Quit() \n\
-		Ctrl<Key>c: Quit() \n\
-		Ctrl<Key>n: CreateNewManpage() \n\
-		Ctrl<Key>h: PopupHelp() \n\
-		Ctrl<Key>s: PopupSearch()
-
-*help*Paned.manualPage.translations:#override \
-		Ctrl<Btn1Down>: \
-			XawPositionSimpleMenu(optionMenu) \
-			MenuPopup(optionMenu) \n\
-		Ctrl<Key>q: Quit() \n\
-		Ctrl<Key>c: Quit() \n\
-		Ctrl<Key>r: RemoveThisManpage() \n\
-		Ctrl<Key>n: CreateNewManpage() \n\
-		Ctrl<Key>h: PopupHelp() \n\
-		Ctrl<Key>d: GotoPage(Directory) \n\
-		Ctrl<Key>m: GotoPage(ManualPage) \n\
-                Ctrl<Key>p: PrintThisManpage() \n\
-		Ctrl<Key>v: ShowVersion() \n\
-		<Key>Prior: Page(Back) \n\
-		<Key>Next : Page(Forward) \n\
-		Shift<Btn4Down>,<Btn4Up>: Page(Line,-1) \n\
-	        Shift<Btn5Down>,<Btn5Up>: Page(Line,1) \n\
-	        Ctrl<Btn4Down>,<Btn4Up>: Page(Back) \n\
-		Ctrl<Btn5Down>,<Btn5Up>: Page(Forward) \n\
-		None<Btn4Down>,<Btn4Up>: Page(Line,-5) \n\
-		None<Btn5Down>,<Btn5Up>: Page(Line,5)
-
-*manualBrowser*manualPage.translations:  #override \
-		Ctrl<Btn1Down>: \
-			XawPositionSimpleMenu(optionMenu) \
-			MenuPopup(optionMenu) \n\
-		Ctrl<Btn2Down>: \
-			XawPositionSimpleMenu(sectionMenu) \
-			MenuPopup(sectionMenu) \n\
-		Shift<Btn2Down>,<Btn2Up>:GotoPage(Directory)\n\
-		Ctrl<Key>q: Quit() \n\
-		Ctrl<Key>c: Quit() \n\
-		Ctrl<Key>r: RemoveThisManpage() \n\
-		Ctrl<Key>n: CreateNewManpage() \n\
-		Ctrl<Key>h: PopupHelp() \n\
-		Ctrl<Key>d: GotoPage(Directory) \n\
-		Ctrl<Key>m: GotoPage(ManualPage) \n\
-                Ctrl<Key>p: PrintThisManpage() \n\
-		Ctrl<Key>v: ShowVersion() \n\
-		<Key>Prior: Page(Back) \n\
-		<Key>Next : Page(Forward) \n\
-		Shift<Btn4Down>,<Btn4Up>: Page(Line,-1) \n\
-	        Shift<Btn5Down>,<Btn5Up>: Page(Line,1) \n\
-	        Ctrl<Btn4Down>,<Btn4Up>: Page(Back) \n\
-		Ctrl<Btn5Down>,<Btn5Up>: Page(Forward) \n\
-		None<Btn4Down>,<Btn4Up>: Page(Line,-5) \n\
-		None<Btn5Down>,<Btn5Up>: Page(Line,5) \n\
-		Ctrl<Key>s: PopupSearch()
-
-!*manualBrowser*directory.background: Grey80
-*manualBrowser*directory.translations:   #override \
-		Ctrl<Btn1Down>: \
-			XawPositionSimpleMenu(optionMenu) \
-			MenuPopup(optionMenu) \n\
-		Ctrl<Btn2Down>: \
-			XawPositionSimpleMenu(sectionMenu) \
-			MenuPopup(sectionMenu) \n\
-		Shift<Btn2Down>,<Btn2Up>: GotoPage(Manpage) \n\
-		Ctrl<Key>q: Quit() \n\
-		Ctrl<Key>c: Quit() \n\
-		Ctrl<Key>r: RemoveThisManpage() \n\
-		Ctrl<Key>n: CreateNewManpage() \n\
-		Ctrl<Key>h: PopupHelp() \n\
-		Ctrl<Key>d: GotoPage(Directory) \n\
-		Ctrl<Key>m: GotoPage(ManualPage) \n\
-		Ctrl<Key>v: ShowVersion() \n\
-		Ctrl<Key>s: PopupSearch()
-
-*manualBrowser*search*manualPage.translations: 	#augment \
-		<Btn1Down>,<Btn1Up>: Search(Manpage) reset()
-
-*manualBrowser*search*apropos.translations:		#augment \
-		<Btn1Down>,<Btn1Up>: Search(Apropos) reset()
-
-*manualBrowser*search*cancel*translations:  	#augment \
-		<Btn1Down>,<Btn1Up>: Search(Cancel) reset()
-
-*manualBrowser*search*value*translations:		#override \
-		<Key>Return: Search(Manpage) \n\
-		Ctrl<Key>m:  Search(Manpage)
-
-*topBox*search*manualPage.translations: 		#augment \
-		<Btn1Down>,<Btn1Up>: Search(Manpage, Open) reset()
-
-*topBox*search*apropos.translations:		#augment \
-		<Btn1Down>,<Btn1Up>: Search(Apropos, Open) reset()
-
-*topBox*search*cancel*translations:  		#augment \
-		<Btn1Down>,<Btn1Up>: Search(Cancel, Open) reset()
-
-*topBox*search*value*translations:			#override \
-		<Key>Return: Search(Manpage, Open) \n\
-		Ctrl<Key>m:  Search(Manpage, Open)
-
-*manualBrowser*likeToSave*yes.translations:	#override \
-		<Btn1Down>,<Btn1Up>: SaveFormattedPage(Save) reset() \n\
-		<Key>y:   SaveFormattedPage(Save) \n\
-		<Key>n:   SaveFormattedPage(Cancel) 
-
-*manualBrowser*likeToSave*no.translations:	#override \
-		<Btn1Down>,<Btn1Up>: SaveFormattedPage(Cancel) reset() \n\
-		<Key>y:	  SaveFormattedPage(Save) \n\
-		<Key>n:	  SaveFormattedPage(Cancel) 
-
-*manualBrowser*likeToSave*translations:	#override \
-		<Key>y:	  SaveFormattedPage(Save) \n\
-		<Key>n:	  SaveFormattedPage(Cancel) 
-
-*helpButton.translations:	#augment \
-		<Btn1Down>,<Btn1Up>: PopupHelp() reset()
-
-*quitButton.translations:	#augment \
-		<Btn1Down>,<Btn1Up>: Quit() reset()
-
-*manpageButton.translations: #augment \
-		<Btn1Down>,<Btn1Up>: CreateNewManpage() reset()
-
-! Use "white" as background for printing
-*printshell*background:   white
-
-! Print dialog
-*printdialogshell*geometry:                       600x120
-*printdialogshell*title:                          Print
-*printdialogshell*main*ok.fromVert:               innerform
-*printdialogshell*main*ok.label:                  Print
-*printdialogshell*main*ok.tip:                    Print
-*printdialogshell*main*setup.fromHoriz:           ok
-*printdialogshell*main*setup.fromVert:            innerform
-*printdialogshell*main*setup.label:               Setup...
-*printdialogshell*main*setup.tip:                 Configure print job options (page size, orientation, etc.)
-*printdialogshell*main*cancel.fromHoriz:          setup
-*printdialogshell*main*cancel.fromVert:           innerform
-*printdialogshell*main*cancel.label:              Cancel
-*printdialogshell*main*cancel.tip:                Cancel printing
-*printdialogshell*main*desclabel.label:           Printer Description:
-*printdialogshell*main*desclabel.tip:             Short description of printer
-*printdialogshell*main*desc.fromHoriz:            desclabel
-*printdialogshell*main*desc.tip:                  Short description of printer
-*printdialogshell*main*info.fromHoriz:            desc
-*printdialogshell*main*info.label:                Printer info...
-*printdialogshell*main*info.tip:                  Display additional information about this printer
-*printdialogshell*main*namelabel.fromVert:        desclabel
-*printdialogshell*main*namelabel.label:           Printer Name:
-*printdialogshell*main*namelabel.tip:             Name of selected printer
-*printdialogshell*main*name.fromHoriz:            namelabel
-*printdialogshell*main*name.fromVert:             desclabel
-*printdialogshell*main*name.tip:                  Name of selected printer
-*printdialogshell*main*selectprinter.fromHoriz:   name
-*printdialogshell*main*selectprinter.fromVert:    desclabel
-*printdialogshell*main*selectprinter.label:       Select Printer...
-*printdialogshell*main*selectprinter.label:       Select Printer...
-*printdialogshell*main*selectprinter.tip:         Select a different printer
-*printdialogshell*main*filenamelabel.fromVert:    namelabel
-*printdialogshell*main*filenamelabel.label:       File Name:
-*printdialogshell*main*filenamelabel.tip:         File where the output should be stored
-*printdialogshell*main*filename.fromHoriz:        filenamelabel
-*printdialogshell*main*filename.fromVert:         namelabel
-*printdialogshell*main*filename.tip:              File where the output should be stored
-*printdialogshell*main*selectfile.fromHoriz:      filename
-*printdialogshell*main*selectfile.fromVert:       namelabel
-*printdialogshell*main*selectfile.label:          Select File...
-*printdialogshell*main*selectfile.tip:            Select file where the output should be stored
-*printdialogshell*main*printtoprinter.fromVert:   filenamelabel
-*printdialogshell*main*printtoprinter.label:      Print to Printer
-*printdialogshell*main*printtoprinter.tip:        Send print job to printer
-*printdialogshell*main*printtofile.fromVert:      filenamelabel
-*printdialogshell*main*printtofile.fromHoriz:     printtoprinter
-*printdialogshell*main*printtofile.label:         Print to File
-*printdialogshell*main*printtofile.tip:           Save print job in a file
-
-! Print job options dialog
-*printdialogshell*setup*geometry:                     600x400
-*printdialogshell*setup*title:                        Print: Print job options
-*printdialogshell*setup*ok.fromVert:                  list
-*printdialogshell*setup*ok.label:                     OK
-*printdialogshell*setup*ok.tip:                       Commit changes
-*printdialogshell*setup*cancel.fromHoriz:             ok
-*printdialogshell*setup*cancel.fromVert:              list
-*printdialogshell*setup*cancel.label:                 Cancel
-*printdialogshell*setup*cancel.tip:                   Cancel and reset to defaults
-*printdialogshell*setup*paperlist.tip:                Select paper size
-*printdialogshell*setup*resolutionlist.fromHoriz:     paperlist
-*printdialogshell*setup*resolutionlist.tip:           Select page resolution
-*printdialogshell*setup*orientationlist.fromHoriz:    resolutionlist
-*printdialogshell*setup*orientationlist.tip:          Select page orientation
-*printdialogshell*setup*plexlist.fromHoriz:           orientationlist
-*printdialogshell*setup*plexlist.tip:                 Select page plex mode (simplex, duplex, etc.)
-*printdialogshell*setup*colorspacelist.fromHoriz:     plexlist
-*printdialogshell*setup*colorspacelist.tip:           Select color space (color, grayscale, CYMK, etc.)
-*printdialogshell*setup*jobcopieslabel.fromVert:      paperlist
-*printdialogshell*setup*jobcopieslabel.tip:           Set number of job copies
-*printdialogshell*setup*jobcopieslabel.label:         Job Copies:
-*printdialogshell*setup*jobcopies.fromHoriz:          jobcopieslabel
-*printdialogshell*setup*jobcopies.fromVert:           paperlist
-*printdialogshell*setup*jobcopies.tip:                Set number of job copies
-
-! Printer selection
-*printdialogshell*printerselection*geometry:          400x150
-*printdialogshell*printerselection*title:             Print: Select printer
-*printdialogshell*printerselection*ok.fromVert:       list
-*printdialogshell*printerselection*ok.label:          OK
-*printdialogshell*printerselection*ok.tip:            Switch printer
-*printdialogshell*printerselection*cancel.fromHoriz:  ok
-*printdialogshell*printerselection*cancel.fromVert:   list
-*printdialogshell*printerselection*cancel.label:      Cancel
-*printdialogshell*printerselection*cancel.tip:        Cancel printer selection
-*printdialogshell*printerselection*list.tip:          Select printer name from list
-
-! Select job file
-*printdialogshell*selectfile*geometry:          400x80
-*printdialogshell*selectfile*title:             Print: Select job file
-*printdialogshell*selectfile*dialog.label:      Select Filename:
-
-! EOF.

app/xman/aclocal.m4

@@ -995,72 +995,7 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-dnl Copyright 2005 Red Hat, Inc
+dnl xorg-macros.m4.  Generated from xorg-macros.m4.in xorgversion.m4 by configure.
-dnl 
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl 
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl 
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl 
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl 
-
-# XAW_CHECK_XPRINT_SUPPORT()
-# --------------------------
-# Adds --enable/disable-xprint and selects the appropriate version of the Xaw 
-# library. If neither --enable-xprint nor --disable-xprint are given, 
-# the presence of an Xaw with Xprint support will be auto detected
-
-AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT],[
-	AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),
-			[use_xprint=$enableval],[use_xprint=auto])
-	if test "x$use_xprint" = "xyes"; then
-		TMP_CHECK1=xaw8
-		TMP_CHECK2=
-		xaw_use_xprint=yes
-	elif test "x$use_xprint" = "xno"; then
-		TMP_CHECK1=xaw7
-		TMP_CHECK2=
-		xaw_use_xprint=no
-	else
-		TMP_CHECK1=xaw8
-		TMP_CHECK2=xaw7
-		xaw_use_xprint=yes
-	fi
-
-	PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK1, success=yes, success=no)
-	if [[ ! -z $TMP_CHECK2 ]] ; then
-		if test $success = no ; then
-			PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK2, success=yes, success=no)
-			xaw_use_xprint=no
-		fi
-	fi
-
-	if test "x$success" = "xyes"; then
-		$1_CFLAGS=$TMP_XAW_CFLAGS
-		$1_LIBS=$TMP_XAW_LIBS
-
-		AM_CONDITIONAL([XAW_USE_XPRINT], [test "x$xaw_use_xprint" = "xyes"])
-	else
-		AC_MSG_ERROR([No suitable version of Xaw found])
-	fi
-])
-
 dnl
 dnl Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
 dnl 
@@ -1097,27 +1032,24 @@ dnl of the copyright holder.
 # your configure.ac with the minimum required version, such as:
 # XORG_MACROS_VERSION(1.1)
 #
-# To force at least a version with this macro defined, also add:
+# To ensure that this macro is defined, also add:
-# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+# m4_ifndef([XORG_MACROS_VERSION],
+#     [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
 #
 #
 # See the "minimum version" comment for each macro you use to see what 
 # version you require.
-AC_DEFUN([XORG_MACROS_VERSION],[
+m4_defun([XORG_MACROS_VERSION],[
-	[XORG_MACROS_needed_version=$1
+m4_define([vers_have], [1.3.0])
-	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
+m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
-	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
+m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
-	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
+m4_if(m4_cmp(maj_have, maj_needed), 0,,
-	[XORG_MACROS_version=1.1.5
+    [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
-	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
+m4_if(m4_version_compare(vers_have, [$1]), -1,
-	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
+    [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
-	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
+m4_undefine([vers_have])
-		AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
+m4_undefine([maj_have])
-	fi
+m4_undefine([maj_needed])
-	if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
-		AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
-	fi
-	AC_MSG_RESULT([yes, $XORG_MACROS_version])
 ]) # XORG_MACROS_VERSION
 
 # XORG_PROG_RAWCPP()
@@ -1142,6 +1074,10 @@ else
 	if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
 		RAWCPPFLAGS=-undef
 		AC_MSG_RESULT([yes])
+	# under Cygwin unix is still defined even with -undef
+	elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+		RAWCPPFLAGS="-undef -ansi"
+		AC_MSG_RESULT([yes, with -ansi])
 	else
 		AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef.  I don't know what to do.])
 	fi
@@ -1254,10 +1190,16 @@ AC_SUBST([ADMIN_MAN_DIR])
 # Whether or not the necessary tools and files are found can be checked
 # with the AM_CONDITIONAL "BUILD_LINUXDOC"
 AC_DEFUN([XORG_CHECK_LINUXDOC],[
-XORG_SGML_PATH=$prefix/share/sgml
+if test x$XORG_SGML_PATH = x ; then
+    XORG_SGML_PATH=$prefix/share/sgml
+fi
 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)
@@ -1306,7 +1248,9 @@ AC_SUBST(MAKE_HTML)
 # indicates whether the necessary tools and files are found and, if set,
 # $(MAKE_XXX) blah.sgml will produce blah.xxx.
 AC_DEFUN([XORG_CHECK_DOCBOOK],[
-XORG_SGML_PATH=$prefix/share/sgml
+if test x$XORG_SGML_PATH = x ; then
+    XORG_SGML_PATH=$prefix/share/sgml
+fi
 HAVE_DEFS_ENT=
 BUILDTXTDOC=no
 BUILDPDFDOC=no
@@ -1372,7 +1316,7 @@ AC_SUBST(MAKE_HTML)
 # their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
 AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
 AC_ARG_ENABLE(malloc0returnsnull,
-	AC_HELP_STRING([--enable-malloc0returnsnull],
+	AS_HELP_STRING([--enable-malloc0returnsnull],
 		       [malloc(0) returns NULL (default: auto)]),
 	[MALLOC_ZERO_RETURNS_NULL=$enableval],
 	[MALLOC_ZERO_RETURNS_NULL=auto])
@@ -1424,7 +1368,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
 AC_DEFUN([XORG_WITH_LINT],[
 
 # Allow checking code with lint, sparse, etc.
-AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
+AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
 		[Use a lint-style source code checker (default: disabled)])],
 		[use_lint=$withval], [use_lint=no])
 if test "x$use_lint" = "xyes" ; then
@@ -1465,7 +1409,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
 AC_DEFUN([XORG_LINT_LIBRARY],[
 AC_REQUIRE([XORG_WITH_LINT])
 # Build lint "library" for more indepth checks of programs calling this library
-AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
+AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
 	[Create lint library (default: disabled)])],
 	[make_lint_lib=$enableval], [make_lint_lib=no])
 if test "x$make_lint_lib" != "xno" ; then
@@ -1483,6 +1427,75 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
 
 ]) # XORG_LINT_LIBRARY
 
+# XORG_CWARNFLAGS
+# ---------------
+# Minimum version: 1.2.0
+#
+# Defines CWARNFLAGS to enable C compiler warnings.
+#
+AC_DEFUN([XORG_CWARNFLAGS], [
+AC_REQUIRE([AC_PROG_CC])
+if  test "x$GCC" = xyes ; then
+    CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast"
+    case `$CC -dumpversion` in
+    3.4.* | 4.*)
+	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
+	;;
+    esac
+else
+    AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+    if test "x$SUNCC" = "xyes"; then
+	CWARNFLAGS="-v"
+    fi
+fi
+AC_SUBST(CWARNFLAGS)
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+]) # XORG_CWARNFLAGS
+
+# XORG_STRICT_OPTION
+# -----------------------
+# Minimum version: 1.3.0
+#
+# Add configure option to enable strict compilation
+AC_DEFUN([XORG_STRICT_OPTION], [
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_CWARNFLAGS])
+
+AC_ARG_ENABLE(strict-compilation,
+			  AS_HELP_STRING([--enable-strict-compilation],
+			  [Enable all warnings from compiler and make them errors (default: disabled)]),
+			  [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
+if test "x$STRICT_COMPILE" = "xyes"; then
+	AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+	AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
+	if test "x$GCC" = xyes ; then
+		STRICT_CFLAGS="-pedantic -Werror"
+	elif test "x$SUNCC" = "xyes"; then
+		STRICT_CFLAGS="-errwarn"
+    elif test "x$INTELCC" = "xyes"; then
+		STRICT_CFLAGS="-Werror"
+	fi
+fi
+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+AC_SUBST([CWARNFLAGS])
+]) # XORG_STRICT_OPTION
+
+# XORG_DEFAULT_OPTIONS
+# --------------------
+# Minimum version: 1.3.0
+#
+# Defines default options for X.Org modules.
+#
+AC_DEFUN([XORG_DEFAULT_OPTIONS], [
+XORG_CWARNFLAGS
+XORG_STRICT_OPTION
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+XORG_MANPAGE_SECTIONS
+]) # XORG_DEFAULT_OPTIONS
 dnl Copyright 2005 Red Hat, Inc
 dnl
 dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -1517,7 +1530,7 @@ dnl
  
 AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_ARG_WITH(release-version,
-			AC_HELP_STRING([--with-release-version=STRING],
+			AS_HELP_STRING([--with-release-version=STRING],
 				[Use release version string in package name]),
 			[RELEASE_VERSION="$withval"],
 			[RELEASE_VERSION=""])
@@ -1529,14 +1542,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
@@ -1545,3 +1558,20 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 		[Patch version of this package])
 ])
 
+# XORG_CHANGELOG()
+# ----------------
+# Minimum version: 1.2.0
+#
+# Defines the variable CHANGELOG_CMD as the command to generate
+# ChangeLog from git.
+#
+# Arrange that distcleancheck ignores ChangeLog left over by distclean.
+#
+AC_DEFUN([XORG_CHANGELOG], [
+CHANGELOG_CMD="(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)"
+AC_SUBST([CHANGELOG_CMD])
+AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
+]) # XORG_CHANGELOG
+

app/xman/buttons.c

@@ -58,8 +58,6 @@ static Widget * ConvertNamesToWidgets(Widget parent, char ** names);
 
 #define TOPARGS 5
 
-extern Atom wm_delete_window;	/* in main.c */
-
 Widget top;			/* needed in PopupWarning, misc.c */
 
 void

app/xman/config.h.in

@@ -1,8 +1,35 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if you have the `mkstemp' function. */
+/* Define to 1 if you have the "mkstemp" function. */
 #undef HAS_MKSTEMP
 
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
 /* Default local man page search path (default: none) */
 #undef LOCALMANPATH
 
@@ -48,6 +75,9 @@
 /* Patch version of this package */
 #undef PACKAGE_VERSION_PATCHLEVEL
 
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
 /* Default system man page search path (default: none) */
 #undef SYSMANPATH
 

app/xman/configure.ac

@@ -22,18 +22,25 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xman,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xman)
+AC_INIT(xman, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xman)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_CANONICAL_HOST
 
+XORG_DEFAULT_OPTIONS
+
 AC_CHECK_FUNC([mkstemp], 
-   AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
+   AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.]))
 
 AC_ARG_WITH(helpdir,
         AC_HELP_STRING([--with-helpdir=<path>],
@@ -61,12 +68,19 @@ if test x$LOCALMANPATH != x; then
 fi
 
 # Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XMAN)
+PKG_CHECK_MODULES(XMAN, xaw7)
 
+AC_ARG_WITH(manconfig,
+        AC_HELP_STRING([--with-manconfig=<filename>],
+                       [Set default system man configuration file]),
+        [MANCONF="$withval"], [])
+if test x$MANCONF = x; then
 # Check for man page config files
-AC_CHECK_FILE([/etc/man.conf], [MANCONF="/etc/man.conf"], 
+    AC_CHECK_FILE([/etc/man.conf], [MANCONF="/etc/man.conf"], 
-    AC_CHECK_FILE([/etc/man.config], [MANCONF="/etc/man.config"], 
+                  AC_CHECK_FILE([/etc/man.config], [MANCONF="/etc/man.config"], 
-	AC_CHECK_FILE([/etc/manpath.config], [MANCONF="/etc/manpath.config"])))
+                                AC_CHECK_FILE([/etc/manpath.config], [MANCONF="/etc/manpath.config"],
+                                              AC_CHECK_FILE([/usr/share/misc/man.conf], [MANCONF="/usr/share/misc/man.conf"]))))
+fi
 
 if test x$MANCONF != x ; then
     AC_DEFINE_UNQUOTED(MANCONF, "$MANCONF", 
@@ -83,10 +97,10 @@ if test x$MANCONF != x ; then
 	*darwin* | *openbsd* | *netbsd* )
 	    MAN_CONFIG_STYLE="OpenBSD"
 	    ;;
-    	*linux* )
+	*linux* | cygwin* )
 	    MAN_CONFIG_STYLE="Linux"
 	    ;;
-        *bsd* )
+	*bsd* )
 	    MAN_CONFIG_STYLE="BSD"
 	    ;;
 	*)
@@ -116,22 +130,15 @@ if test x$MANCONF != x ; then
 	    AC_MSG_ERROR([Could not determine man page file config format.])
     esac
 fi
-
-if test "x$xaw_use_xprint" = "xyes" ; then
-   PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil xp)
-
-   XMAN_CFLAGS="$XMAN_CFLAGS $XPRINT_UTIL_CFLAGS"
-   XMAN_LIBS="$XMAN_LIBS $XPRINT_UTIL_LIBS"
-fi
-
 AC_SUBST(XMAN_CFLAGS)
 AC_SUBST(XMAN_LIBS)
 
 PKG_CHECK_MODULES(APPDEFS, xt)
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_ARG_WITH(appdefaultdir,
+	AC_HELP_STRING([--with-appdefaultdir=<pathname>],
+	  [specify directory for app-defaults files (default is autodetected)]),
+	[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
 AC_SUBST(appdefaultdir)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
 AC_OUTPUT([Makefile])

app/xman/globals.h

@@ -30,6 +30,9 @@ from the X Consortium.
 */
 /* $XFree86$ */
 
+#ifndef _globals_h
+#define _globals_h
+
 #include "man.h"
 
 extern Xman_Resources resources;	/* Resource manager sets these. */
@@ -54,3 +57,9 @@ extern Widget initial_widget;	      /* The initial widget, never realized. */
 
 extern char **saved_argv;
 extern int saved_argc;
+
+extern Atom wm_delete_window;
+
+extern Widget top;
+
+#endif /* _globals_h */

app/xman/handler.c

@@ -311,7 +311,7 @@ SaveFormattedPage(Widget w, XEvent * event, String * params, Cardinal * num_para
  * If we are not active then take no action.
  */
 
-  if (man_globals->tempfile == '\0') return;
+  if (man_globals->tempfile == NULL) return;
 
   switch (params[0][0]) {
   case 'S':

app/xman/help.c

@@ -38,8 +38,6 @@ from the X Consortium.
 
 #include "globals.h"
 
-extern Atom wm_delete_window;	/* in main.c */
-
 /*	Function Name: MakeHelpWidget.
  *	Description: This function creates the help widget so that it will be
  *                   ready to be displayed.

app/xman/main.c

@@ -42,10 +42,6 @@ from the X Consortium.
 #include <X11/Xaw/Cardinals.h>
 #endif /* ZERO */
 
-#if !defined(lint) && !defined(SABER)
-  static char version[] = XMAN_VERSION;  /* via strings. */
-#endif
-
 static void ArgError(int argc, char ** argv);
 static void AdjustDefResources(void);
 
@@ -71,7 +67,7 @@ static XtResource my_resources[] = {
   {"pointerColorBackground", XtCBackground, XtRPixel, sizeof(Pixel),
      Offset(cursors.bg_color), XtRString, "XtDefaultBackground"},
   {"help", XtCBoolean, XtRBoolean, sizeof(Boolean),
-     Offset(show_help_syntax), XtRImmediate, FALSE},
+     Offset(show_help_syntax), XtRImmediate, NULL},
   {"helpFile", XtCFile, XtRString, sizeof(char *),
      Offset(help_file), XtRString, HELPFILE},
   {"topBox", XtCBoolean, XtRBoolean, sizeof(Boolean),
@@ -117,7 +113,7 @@ static XrmOptionDescRec xman_options[] = {
 {"-iconic",   "iconic",                  XrmoptionNoArg,  (caddr_t) "True"},
 };
 
-XtActionsRec xman_actions[] = {
+static XtActionsRec xman_actions[] = {
   {"GotoPage",          GotoPage},
   {"Quit",              Quit},
   {"Search",            Search},

app/xman/man.c

@@ -87,7 +87,7 @@ int
 Man(void)
 {
   SectionList *list = NULL;
-  char *ptr, *lang = 0, manpath[BUFSIZ], buf[BUFSIZ], *path, *current_label;
+  char *ptr, *lang = NULL, manpath[BUFSIZ], buf[BUFSIZ], *path, *current_label;
   int sect, num_alloced;
 
 /* 
@@ -127,7 +127,7 @@ Man(void)
 
   for ( path = manpath ; (ptr = index(path , ':')) != NULL ; path = ++ptr) { 
     *ptr = '\0';
-    if (lang != 0) {
+    if (lang != NULL) {
       strcpy(buf, path);
       strcat(buf, "/");
       strncat(buf, lang, sizeof(buf) - strlen(path) + 1);
@@ -136,7 +136,7 @@ Man(void)
     }
     ReadMandescFile(&list, path);
   }
-  if (lang != 0) {
+  if (lang != NULL) {
     strcpy(buf, path);
     strcat(buf, "/");
     strncat(buf, lang, sizeof(buf) - strlen(path) + 1);
@@ -239,10 +239,10 @@ SortList(SectionList ** list)
       head = local;
 
       /* Find end of standard block */
-      for (old = 0 ; (local->next != NULL) && (local->flags) 
+      for (old = NULL ; (local->next != NULL) && (local->flags) 
 	   ; old = local, local = local->next); 
 
-      if (old != 0) {
+      if (old != NULL) {
           last->next = old->next; /* Move the block. */
           old->next = *list;
           *list = head;
@@ -446,6 +446,14 @@ ReadCurrentSection(Manual * local_manual, char * path)
 #ifdef GZIP_EXTENSION
     else if (streq(ptr + 1, GZIP_EXTENSION))
       *ptr = '\0';
+#endif
+#ifdef BZIP2_EXTENSION
+    else if (streq(ptr + 1, BZIP2_EXTENSION))
+      *ptr = '\0';
+#endif
+#ifdef LZMA_EXTENSION
+    else if (streq(ptr + 1, LZMA_EXTENSION))
+      *ptr = '\0';
 #endif
   }
   
@@ -485,6 +493,14 @@ ReadCurrentSection(Manual * local_manual, char * path)
       else if (streq(ptr + 1, GZIP_EXTENSION))
 	*ptr = '\0';
 #endif
+#ifdef BZIP2_EXTENSION
+      else if (streq(ptr + 1, BZIP2_EXTENSION))
+	*ptr = '\0';
+#endif
+#ifdef LZMA_EXTENSION
+      else if (streq(ptr + 1, LZMA_EXTENSION))
+	*ptr = '\0';
+#endif
 #ifdef IGNORE_EXTENSION
       /* skip files with specified extension - they're not real man pages */
       else if (streq(ptr + 1, IGNORE_EXTENSION)) {

app/xman/man.h

@@ -166,6 +166,8 @@ typedef struct _ManpageGlobals{
 				   page from. */
   Boolean compress;		/* Compress file on save? */
   Boolean gzip;			/* Gzip file on save? */
+  Boolean bzip2;		/* Bzip2 file on save? */
+  Boolean lzma;
   Boolean deletetempfile;	/* Need to delete tempfile when done? */
   char ** section_name;		/* The name of each of the sections */
 

app/xman/misc.c

@@ -81,7 +81,6 @@ static char *uncompress_formats[] =
  *	Returns: none
  */
 
-extern Widget top;
 static Widget warnShell, warnDialog;
 
 static void
@@ -255,6 +254,29 @@ FindManualFile(ManpageGlobals * man_globals, int section_num, int entry_num)
       return(file);
   }
 #endif
+#ifdef BZIP2_EXTENSION
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+      /* look in machine subdir first */
+      snprintf(filename, sizeof(filename), "%s/%s%s/%s/%s.%s", path, CAT,
+	      section + len_cat, MACHINE, page, BZIP2_EXTENSION);
+      if ( (file = Uncompress(man_globals, filename)) != NULL)
+	  return(file);
+#endif
+  {
+    sprintf(filename, "%s/%s%s/%s.%s", path, CAT,
+	    section + len_cat, page, BZIP2_EXTENSION);
+    if ( (file = Uncompress(man_globals, filename)) != NULL)
+      return(file);
+  }
+#endif
+#ifdef LZMA_EXTENSION
+  {
+    sprintf(filename, "%s/%s%s/%s.%s", path, CAT,
+	    section + len_cat, page, LZMA_EXTENSION);
+    if ( (file = Uncompress(man_globals, filename)) != NULL)
+      return(file);
+  }
+#endif
 #else
   for(i = 0; i < strlen(COMPRESSION_EXTENSIONS); i++) {
       snprintf(filename, sizeof(filename), "%s/%s%s/%s.%c", path, CAT,
@@ -380,6 +402,18 @@ UncompressNamed(ManpageGlobals * man_globals, char * filename, char * output,
 	    GZIP_EXTENSION))
     snprintf(cmdbuf, sizeof(cmdbuf), GUNZIP_FORMAT, filename, output);
   else
+#endif
+#ifdef BZIP2_EXTENSION
+  if (streq(filename + strlen(filename) - strlen(BZIP2_EXTENSION),
+	    BZIP2_EXTENSION))
+    sprintf(cmdbuf, BUNZIP2_FORMAT, filename, output);
+  else
+#endif
+#ifdef LZMA_EXTENSION
+  if (streq(filename + strlen(filename) - strlen(LZMA_EXTENSION),
+	    LZMA_EXTENSION))
+    sprintf(cmdbuf, UNLZMA_FORMAT, filename, output);
+  else
 #endif
   snprintf(cmdbuf, sizeof(cmdbuf), UNCOMPRESS_FORMAT, filename, output);
   if(system(cmdbuf) == 0) 	/* execute search. */
@@ -807,6 +841,9 @@ UncompressUnformatted(ManpageGlobals * man_globals, char * entry,
 
   ParseEntry(entry, path, section, page);
 
+  man_globals->bzip2 = FALSE;
+  man_globals->lzma = FALSE;
+
 #if defined(__OpenBSD__) || defined(__NetBSD__)
   /*
    * look for uncompressed file in machine subdir first
@@ -856,6 +893,43 @@ UncompressUnformatted(ManpageGlobals * man_globals, char * entry,
   }
 #endif /* GZIP_EXTENSION */
 #endif /* __OpenBSD__ || __NetBSD__ */
+
+#ifdef BZIP2_EXTENSION
+ {
+    sprintf(input, "%s.%s", filename, BZIP2_EXTENSION);
+#ifndef HAS_MKSTEMP
+    if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+    if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+      man_globals->compress = TRUE;
+      man_globals->gzip = FALSE;
+      man_globals->bzip2 = TRUE;
+      sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+	      CAT, section + len_cat, page, BZIP2_EXTENSION);
+      return(TRUE);
+    }
+  }
+#endif /* BZIP2_EXTENSION */
+
+#ifdef LZMA_EXTENSION
+ {
+    sprintf(input, "%s.%s", filename, LZMA_EXTENSION);
+#ifndef HAS_MKSTEMP
+    if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+    if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+      man_globals->compress = TRUE;
+      man_globals->gzip = FALSE;
+      man_globals->lzma = TRUE;
+      sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+	      CAT, section + len_cat, page, LZMA_EXTENSION);
+      return(TRUE);
+    }
+  }
+#endif /* LZMA_EXTENSION */
+
 /*
  * Look for uncompressed file first.
  */
@@ -925,6 +999,41 @@ UncompressUnformatted(ManpageGlobals * man_globals, char * entry,
     }
   }
 #endif
+
+#ifdef BZIP2_EXTENSION
+  {
+    sprintf(input, "%s.%s", filename, BZIP2_EXTENSION);
+#ifndef HAS_MKSTEMP
+    if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+    if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif	
+      man_globals->compress = TRUE;
+      man_globals->gzip = TRUE;
+      sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+	      CAT, section + len_cat, page, BZIP2_EXTENSION);
+      return(TRUE);
+    }
+  }
+#endif
+
+#ifdef LZMA_EXTENSION
+  {
+    sprintf(input, "%s.%s", filename, LZMA_EXTENSION);
+#ifndef HAS_MKSTEMP
+    if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+    if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif	
+      man_globals->compress = TRUE;
+      man_globals->lzma = TRUE;
+      sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+	      CAT, section + len_cat, page, LZMA_EXTENSION);
+      return(TRUE);
+    }
+  }
+#endif
+
 /*
  * And lastly files in a compressed directory.
  */

app/xman/print.c

@@ -1,396 +0,0 @@
-/*
- * $Xorg: print.c,v 1.1 2004/04/30 02:05:54 gisburn Exp $
- *
-Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 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.
- *
- */
-
-/* Turn a NULL pointer string into an empty string */
-#define NULLSTR(x) (((x)!=NULL)?(x):(""))
-
-#define Error(x) { printf x ; exit(EXIT_FAILURE); }
-#define Assertion(expr, msg) { if (!(expr)) { Error msg } }
-#define Log(x)   { if(True) printf x; }
-
-#include "print.h"
-#include "ScrollByL.h"
-#include <X11/Xaw/Form.h>
-#include <X11/Xaw/Label.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-static Widget
-CreatePrintShell(Widget    videoshell,
-                 Screen   *pscreen,
-                 Visual   *pvisual,
-                 String    printshell_name,
-                 ArgList   args,
-                 Cardinal  numargs)
-{
-    String   videoname,
-             videoclass;
-    Widget   pappshell,
-             printshell;
-    Display *pdpy = XDisplayOfScreen(pscreen);
-    int      dummyc = 0;
-    String   dummys = "";
-    Cardinal shell_n;
-    Arg      shell_args[5];
-
-    XtGetApplicationNameAndClass(XtDisplay(videoshell), 
-                                 &videoname, &videoclass);
-
-    /* XXX: Why is the |dummyc|&&|dummys| stuff needed here ? */
-    XtDisplayInitialize(XtWidgetToApplicationContext(videoshell), pdpy,
-                        videoname, videoclass,
-                        NULL, 0,
-                        &dummyc, &dummys);
-
-    shell_n = 0;
-    XtSetArg(shell_args[shell_n], XtNscreen, pscreen); shell_n++;
-    if (pvisual) {
-        XtSetArg(shell_args[shell_n], XtNvisual, pvisual); shell_n++;
-    }
-    pappshell = XtAppCreateShell(videoname, videoclass,
-                                   applicationShellWidgetClass,
-                                   pdpy,
-                                   shell_args, shell_n);
-    printshell = XtCreatePopupShell(printshell_name,
-                                    xawPrintShellWidgetClass,
-                                    pappshell, args, numargs);
-                                
-
-    /* we're mapping/unmapping at start/end page time */
-    XtSetMappedWhenManaged(printshell, False);
-
-    /* We realise the widget when we're done with building the widget tree... */
-    
-    return printshell;
-}
-
-typedef struct
-{
-  const char       *programname;
-  Widget            toplevel;
-  Bool              isPrinting;
-  Widget            printshell;
-  struct
-  {
-      Widget  form;
-      Widget  pageheaderlabel;
-      Widget  manpage;
-  } content; /* content to print */
-  int               numpages;
-  Display          *pdpy;
-  Screen           *pscreen;
-  XPContext         pcontext;
-  XtCallbackProc    pdpyDestroyCallback;
-  void             *printtofile_handle;
-  const char       *jobtitle;
-} AppPrintData;
-
-static AppPrintData  apdx;
-static AppPrintData *apd = &apdx;
-
-/* "Count" pages in a scrollByLineWidgetClass widget */
-static
-long CountPages(Widget sblw)
-{
-    long     num_pages = 0;
-    Cardinal n;
-    Arg      args[3];
-    int      num_total_lines   = 0,
-             num_visible_lines = 0;
-    
-    n = 0;
-    XtSetArg(args[n], XtNNumTotalLines,   &num_total_lines);   n++;
-    XtSetArg(args[n], XtNNumVisibleLines, &num_visible_lines); n++;
-    XtGetValues(sblw, args, n);
-    
-#define DIV_ROUND_UP(a, b) (((a)+((b)-1)) / (b))
-    /* scrollByLineWidgetClass's "Page(forward)" always overlaps by one
-     * line so we use |num_visible_lines-1| instead of |num_visible_lines| */
-    num_pages = DIV_ROUND_UP(num_total_lines, num_visible_lines-1);
-#undef DIV_ROUND_UP
-
-    return num_pages;
-}
-
-static void 
-PageSetupCB(Widget widget, XtPointer client_data, XtPointer call_data)
-{
-    Widget                       pshell = widget;
-    XawPrintShellCallbackStruct *psp    = (XawPrintShellCallbackStruct *)call_data;
-    AppPrintData                *p      = (AppPrintData *)client_data;
-   
-    Log(("--> PageSetupCB\n"));
-
-    if (!psp->last_page_in_job) {
-        int  currpage;
-        char buffer[256];
-
-        XtVaGetValues(pshell, XawNcurrPageNumInJob, &currpage, NULL);
-
-        sprintf(buffer, "Title: %s / Page: %d/%d", p->jobtitle, currpage, p->numpages);
-        XtVaSetValues(apd->content.pageheaderlabel, XtNlabel, buffer, NULL);
-
-        /* Note: XawPrintShell's pagecount starts with '1'
-         * (=first page is page no. '1') */
-        if (currpage > 1) {
-            String params[] = { "Forward" };
-            Log(("pagedown %d\n", currpage));
-            /* "Page(Forward)" is scrollByLineWidgetClass's way to
-             * move one page forward */
-            XtCallActionProc(p->content.manpage, "Page", NULL, params, ONE);
-        }
-        else
-        {
-            Log(("first page\n"));
-        }              
-      
-        if (currpage >= p->numpages) {
-            psp->last_page_in_job = True;
-        }
-    }
-}
-
-static
-void FinishPrinting(AppPrintData *p)
-{
-    /* Wait for the job to finish */
-    if (p->printtofile_handle) {
-        if (XpuWaitForPrintFileChild(p->printtofile_handle) != XPGetDocFinished) {
-            fprintf(stderr, "%s: Error while printing to file.\n", apd->programname);
-        }
-        p->printtofile_handle = NULL;
-    }   
-
-    /* Avoid that the manpage object tries to close the |FILE *|-handle at destruction time */
-    XtVaSetValues(p->content.manpage, XtNfile, NULL, NULL);
-
-    if (p->printshell) {
-        XtDestroyWidget(p->printshell);
-        p->printshell = NULL;
-    }
-  
-    /* Two issues here:
-     * 1. The print display connection is owned by the print dialog
-     *    To avoid any problems with that use a callback back to the main
-     *    application which calls
-     *    |XawPrintDialogClosePrinterConnection(w, False)| to ask the
-     *    print dialog widget to close all print display resources and
-     *    disown the object.
-     * 2. We have to use XpDestroyContext() and XtCloseDisplay()
-     *    instead of XpuClosePrinterDisplay() to make libXt happy...
-     *
-     * Call callback... */
-    (*apd->pdpyDestroyCallback)(p->toplevel, NULL, NULL); /* HACK! */
-
-    /* ... and then get rid of the display */
-    if (p->pcontext != None) {
-        XpDestroyContext(p->pdpy, p->pcontext);
-    }
-    XtCloseDisplay(p->pdpy);
-
-    p->toplevel   = NULL;
-    p->isPrinting = False;
-    p->pdpy       = NULL;
-    p->pscreen    = NULL;
-    p->pcontext   = None;
-}
-
-static
-void PrintEndJobCB(Widget pshell, XtPointer client_data, XtPointer call_data)
-{
-    AppPrintData *p = (AppPrintData *)client_data;
-
-    Log(("--> PrintEndJobCB\n"));
-
-    /* Finish printing and destroy print shell (it's legal to destroy Xt
-     * widgets from within it's own callbacks) */
-    FinishPrinting(p);
-}
-
-static
-XFontStruct *GetPrintTextFont(Display *pdpy, const char *fontprefix, long dpi_x, long dpi_y)
-{
-    XFontStruct *font;
-    char         fontname[1024];
-
-    sprintf(fontname, "%s--*-120-%ld-%ld-*-*-iso8859-1", fontprefix, dpi_x, dpi_y);
-    font = XLoadQueryFont(pdpy, fontname);
-    if (!font) {    
-        sprintf(fontname, "-adobe-courier-medium-r-normal--*-120-%ld-%ld-*-*-iso8859-1", dpi_x, dpi_y);
-        font = XLoadQueryFont(pdpy, fontname);
-    }
-    if (!font) {          
-        sprintf(fontname, "-*-*-*-*-*-*-*-120-%ld-%ld-*-*-iso8859-1", dpi_x, dpi_y);
-        font = XLoadQueryFont(pdpy, fontname);
-    }
-    if (!font)
-        Error(("XLoadQueryFont failure.\n"));
-    return font;
-
-}
-
-void DoPrintManpage(const char *programname,
-                    FILE *manpagefile, Widget toplevel,
-                    Display *pdpy, XPContext pcontext,
-                    XpuColorspaceRec *colorspace,
-                    XtCallbackProc pdpyDestroyCB,
-                    const char *jobtitle, const char *toFile)
-{
-    long               dpi_x = 0L,
-                       dpi_y = 0L;
-    int                n;
-    Arg                args[20];
-    XFontStruct       *printFontNormal;
-    XFontStruct       *printFontBold;
-    XFontStruct       *printFontItalic;
-    XFontStruct       *printFontSymbol;
-
-    if (!manpagefile) {
-        Error(("DoPrintManpage: No FILE given."));
-    }
-       
-    apd->programname         = programname;
-    apd->pdpyDestroyCallback = pdpyDestroyCB;
-  
-    if (apd->isPrinting) {
-        fprintf(stderr, "%s: Already busy with printing.\n", apd->programname);
-        return;
-    } 
-        
-    /* Configure the print context (paper size, title etc.)
-     * We must do this before creating any Xt widgets - otherwise they will
-     * make wrong assuptions about fonts, resultions etc. ...
-     */
-    XpuSetJobTitle(pdpy, pcontext, jobtitle);
-    
-    /* Configuration done, set the context */
-    XpSetContext(pdpy, pcontext);   
-
-    /* Get default printer resolution */   
-    if (XpuGetResolution(pdpy, pcontext, &dpi_x, &dpi_y) != 1) {
-        fprintf(stderr, "%s: No default resolution for printer.\n", apd->programname);
-        XpuClosePrinterDisplay(pdpy, pcontext);
-        return;
-    }
-    
-    apd->toplevel = toplevel;
-    apd->pdpy     = pdpy;
-    apd->pcontext = pcontext;
-    apd->pscreen  = XpGetScreenOfContext(pdpy, pcontext);
-    apd->jobtitle = jobtitle;
-
-    n = 0;
-    /* Override any geometry resource settings as XawPrintShell adjusts it's size
-     * to the current page siue when |XawPrintLAYOUTMODE_DRAWABLEAREA| or
-     * |XawPrintLAYOUTMODE_PAGESIZE| are used. */
-    XtSetArg(args[n], XtNgeometry,    "+0+0");                          n++;
-    XtSetArg(args[n], XawNlayoutMode, XawPrintLAYOUTMODE_DRAWABLEAREA); n++;
-    if (colorspace) {
-        printf("Setting visual to id=0x%lx.\n", colorspace->visualinfo.visualid);
-    }
-    apd->printshell = CreatePrintShell(toplevel, apd->pscreen, 
-                                       (colorspace?(colorspace->visualinfo.visual):(NULL)),
-                                       "printshell", args, n);
-
-    n = 0;
-    XtSetArg(args[n], XtNresizable,            True);            n++;
-    XtSetArg(args[n], XtNright,                XtChainRight);    n++;
-    apd->content.form = XtCreateManagedWidget("form", formWidgetClass, apd->printshell, args, n);
-
-    printFontNormal = GetPrintTextFont(pdpy, "-*-courier-medium-r-*", dpi_x, dpi_y);
-    printFontBold   = GetPrintTextFont(pdpy, "-*-courier-bold-r-*",   dpi_x, dpi_y);
-    printFontItalic = GetPrintTextFont(pdpy, "-*-courier-medium-o-*", dpi_x, dpi_y);
-    printFontSymbol = GetPrintTextFont(pdpy, "-*-symbol-*-*-*",       dpi_x, dpi_y);
-
-    n = 0;
-    XtSetArg(args[n], XtNfromHoriz,            NULL);            n++;
-    XtSetArg(args[n], XtNfromVert,             NULL);            n++;
-    XtSetArg(args[n], XtNtop,                  XtChainTop);      n++;
-    XtSetArg(args[n], XtNright,                XtChainRight);    n++;
-    XtSetArg(args[n], XtNresizable,            True);            n++;
-    XtSetArg(args[n], XtNfont,                 printFontNormal); n++; /* fontset would be better */
-    XtSetArg(args[n], XtNlabel,                "Page: n/n");     n++;
-    XtSetArg(args[n], XtNjustify,              XtJustifyRight);  n++;
-    apd->content.pageheaderlabel = XtCreateManagedWidget("pageinfo", labelWidgetClass, apd->content.form, args, n);
-
-    n = 0;
-    XtSetArg(args[n], XtNfile,             manpagefile);                  n++;
-
-/* Usually I would expect that using |XtNfromVert, apd->content.pageheaderlabel|
- * would be the correct way to place the text widget with the main content below
- * the page header widget - but for an unknown reason this doesn not work: The
- * text widget squishes itself into the bottom half of the page and only occupies
- * 1/2 of the page's with... ;-(( */
-#define WORKAROUND_FOR_SOMETHING_IS_WRONG 1
-#ifdef WORKAROUND_FOR_SOMETHING_IS_WRONG
-    XtSetArg(args[n], XtNtop,              XtChainTop);                   n++;
-    XtSetArg(args[n], XtNright,            XtChainRight);                 n++;
-    XtSetArg(args[n], XtNvertDistance,     (printFontNormal->ascent+printFontNormal->descent+2)*2); n++;    
-#else
-    XtSetArg(args[n], XtNfromHoriz,        NULL);                         n++;
-    XtSetArg(args[n], XtNfromVert,         apd->content.pageheaderlabel); n++;
-#endif
-
-    XtSetArg(args[n], XtNmanualFontNormal, printFontNormal);              n++;
-    XtSetArg(args[n], XtNmanualFontBold,   printFontBold);                n++;
-    XtSetArg(args[n], XtNmanualFontItalic, printFontItalic);              n++;
-    XtSetArg(args[n], XtNmanualFontSymbol, printFontSymbol);              n++;
-    apd->content.manpage = XtCreateManagedWidget("manpage", scrollByLineWidgetClass, apd->content.form, args, n);
-   
-    XtAddCallback(apd->printshell, XawNpageSetupCallback, PageSetupCB,   (XtPointer)apd);
-    XtAddCallback(apd->printshell, XawNendJobCallback,    PrintEndJobCB, (XtPointer)apd);
-
-    /* Realise print shell (which will set position+size of the child
-     * widgets based on the current page size) */
-    XtRealizeWidget(apd->printshell);
-    
-    /* Count number of pages in the manpage widget */
-    apd->numpages = CountPages(apd->content.manpage);
-
-    /* Make sure that the Xt machinery is really using the right screen (assertion) */
-    if (XpGetScreenOfContext(XtDisplay(apd->printshell), apd->pcontext) != XtScreen(apd->printshell))
-        Error(("Widget's screen != print screen. BAD.\n"));
-
-    apd->isPrinting = True;
-
-    if (toFile) {
-        printf("%s: Printing to file '%s'...\n", apd->programname, toFile);
-        apd->printtofile_handle = XpuStartJobToFile(pdpy, pcontext, toFile);
-        if (!apd->printtofile_handle) {
-            perror("XpuStartJobToFile failure");
-            apd->isPrinting = False;
-            return;
-        }
-    }
-    else
-    {
-        printf("%s: Printing to printer...\n", apd->programname);
-        XpuStartJobToSpooler(pdpy);
-    }
-}
-
-

app/xman/print.h

@@ -1,50 +0,0 @@
-/*
- * $Xorg: print.h,v 1.1 2004/04/30 02:05:54 gisburn Exp $
- *
-Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 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.
- *
- */
-
-#ifndef XMAN_PRINT_H
-#define XMAN_PRINT_H 1
-
-#include <X11/Intrinsic.h>
-#include <X11/StringDefs.h>
-#include <X11/Shell.h>
-#include <X11/Xaw/Print.h>
-#include <X11/Xaw/Cardinals.h>
-#include <X11/XprintUtil/xprintutil.h>
-
-#define PrintMsg(x) { printf("xman: "); printf x ; }
-
-/* Prototypes */
-void DoPrintManpage(const char *programname,
-                    FILE *manpage,
-                    Widget toplevel, 
-                    Display *pdpy, XPContext pcontext,
-                    XpuColorspaceRec *colorspace,
-                    XtCallbackProc printDisplayDestroyCallback,
-                    const char *jobTitle,
-                    const char *toFile);
-
-#endif /* !XMAN_PRINT_H */

app/xman/vendor.h

@@ -59,7 +59,7 @@ from the X Consortium.
 #  define SEARCHDIR  MAN
 #endif
 
-#if ( defined(sgi) || (defined(i386) && (defined(SYSV) || defined(SVR4))  && !defined(sun)) || (defined(BSD) && (BSD >= 199103)) || defined(linux) )
+#if ( defined(sgi) || (defined(i386) && (defined(SYSV) || defined(SVR4))  && !defined(sun)) || (defined(BSD) && (BSD >= 199103)) || defined(linux) || defined(__CYGWIN__) )
 # define SEARCHOTHER CAT
 #endif
 
@@ -137,6 +137,17 @@ from the X Consortium.
 #    define GUNZIP_FORMAT "gzip -c -d < %s >> %s"
 #  endif
 #  define GZIP_COMPRESS "gzip"
+#  define BZIP2_EXTENSION "bz2"
+#  define LZMA_EXTENSION "lzma"
+#  ifndef HAS_MKSTEMP
+#    define BUNZIP2_FORMAT "bunzip2 -c -d < %s > %s"
+#    define UNLZMA_FORMAT "unlzma -c -d < %s > %s"
+#  else
+#    define BUNZIP2_FORMAT "bunzip2 -c -d < %s >> %s"
+#    define UNLZMA_FORMAT "unlzma -c -d < %s >> %s"
+#  endif
+#  define BZIP2_COMPRESS "bzip2"
+#  define LZMA_COMPRESS "lzma"
 #endif
 
 
@@ -172,7 +183,7 @@ from the X Consortium.
 #  define FORMAT "| eqn | tbl | nroff -mandoc"
 # elif defined(BSD) && (BSD >= 199103)
 #  define FORMAT "| eqn | tbl | nroff -man"
-# elif defined(linux)
+# elif defined(linux) || defined(__CYGWIN__)
 #  define FORMAT "| pic | eqn | tbl -Tlatin1 | GROFF_NO_SGR= groff -Tlatin1 -mandoc"
 # else
 #  define FORMAT "| neqn | nroff -man"      /* The format command. */