- updated xman-paths and xfs-logger patches

- moved _wmpropsdir to /usr/share/wm-properties (more pros than for previous
  location now)
- -xft1 obsoletes only pre-4.3 -xft, updated -xft1 description
- added version to fontconfig provides

Changed files:
    XFree86-xfs-logger.patch -> 1.3
    XFree86-xman-manpaths.patch -> 1.2

diff --git a/XFree86-xfs-logger.patch b/XFree86-xfs-logger.patch
index b980b7b5a009193d6795a5442240d78011ea0623..c54b41caeefe65087adb98f27656fbeefc86c28e 100644 (file)
--- a/XFree86-xfs-logger.patch
+++ b/XFree86-xfs-logger.patch
@@ -46,11 +46,11 @@ diff -Nur xc/programs/xfs.org/os/utils.c xc/programs/xfs/os/utils.c
  static void
  usage(void)
  {
--    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name]\n",
-+    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-d debug_level]\n",
+-    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket]\n",
++    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket] [-d debug_level]\n",
            progname);
      exit(1);
- 
+ }
 @@ -295,6 +296,8 @@
                ProcessLSoption (argv[++i]);
            else

diff --git a/XFree86-xman-manpaths.patch b/XFree86-xman-manpaths.patch
index 0c3e2db7f4505f8483388d5efdeee99ac2876215..08ff60c2f5536a8b74e4888fef36f553c2306312 100644 (file)
--- a/XFree86-xman-manpaths.patch
+++ b/XFree86-xman-manpaths.patch
@@ -1,11 +1,11 @@
---- XFree86-4.2.0/xc/programs/xman/vendor.h.orig       Sun Mar 17 01:50:17 2002
-+++ XFree86-4.2.0/xc/programs/xman/vendor.h    Sun Mar 17 01:54:57 2002
+--- XFree86-4.2.99.901/xc/programs/xman/vendor.h.orig  Sun Mar 17 01:50:17 2002
++++ XFree86-4.2.99.901/xc/programs/xman/vendor.h       Sun Mar 17 01:54:57 2002
 @@ -77,7 +77,7 @@
  #  define SYSMANPATH "/usr/catman/u_man:/usr/catman/a_man"
  #elif defined(__bsdi__)
  #  define SYSMANPATH "/usr/share/man:/usr/contrib/man:/usr/contrib/isode/man:/usr/local/man"
--#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) || defined(linux)
+-#elif defined(__OpenBSD__) || defined(__DARWIN__)
++#elif defined(__OpenBSD__) || defined(__DARWIN__) || defined(linux)
  #  define SYSMANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man"
  #elif defined(SVR4) || defined(__osf__) || (defined(BSD) && (BSD >= 199103))
  #  define SYSMANPATH "/usr/share/man"