[PATCH:libXfixes] Fix .TH values in Xfixes.man

[Alan Coopersmith]

Requires xorg-macros 1.8 in order to get the updated XORG_MANPAGE_SECTIONS
that sets $(SED) & $(MAN_SUBSTS) from configure for us.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 configure.ac    |    6 +++---
 man/Makefile.am |   10 +---------
 man/Xfixes.man  |    2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 52d3b5b..fe3ea23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,10 +36,10 @@ AC_INIT(libXfixes, 4.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+	  [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
diff --git a/man/Makefile.am b/man/Makefile.am
index e7bbe54..b54f92a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,15 +31,7 @@ EXTRA_DIST = $(libman_PRE)
 
 CLEANFILES = $(libman_DATA)
 
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-	-e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
-	-e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' 
+# String replacements for man pages now come from xorg-macros.m4 via configure
 
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
diff --git a/man/Xfixes.man b/man/Xfixes.man
index ddc6c46..075b78f 100644
--- a/man/Xfixes.man
+++ b/man/Xfixes.man
@@ -25,7 +25,7 @@
 .ns
 .TP \\$1
 ..
-.TH XFIXES 3 "Version 1.0" "XFree86"
+.TH XFIXES __libmansuffix__ __xorgversion__
 
 .SH NAME
 XFixes \- Augmented versions of core protocol requests
-- 
1.5.6.5