Update to libXfontcache 1.0.5

3 files changed, 33 insertions, 36 deletions

diff --git a/lib/libXfontcache/man/Makefile.am b/lib/libXfontcache/man/Makefile.am
index 4fa33808c..e5700a958 100644
--- a/lib/libXfontcache/man/Makefile.am
+++ b/lib/libXfontcache/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:19:14 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
@@ -31,14 +30,12 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
 
 libman_PRE = Xfontcache.man
 
-BUILT_SOURCES = shadows.DONE
-
 EXTRA_DIST = $(libman_PRE)
 
 CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
 
 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
+	      $(Xfontcache_shadowmen)
 
 SED = sed
 
@@ -57,7 +54,7 @@ MAN_SUBSTS = \
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
 # Generate man page shadow files (Replaces InstallManPageAliases from Imake)
 
@@ -68,8 +65,7 @@ Xfontcache_shadows =                        \
     FontCacheChangeCacheSettings            \
     FontCacheGetCacheStatistics
 
-shadows.DONE:
-	-rm -f $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
-	(for i in $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-	 echo .so man$(LIB_MAN_DIR_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $$i; \
-	 done)
+Xfontcache_shadowmen = $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
+
+$(Xfontcache_shadowmen):
+	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $@
diff --git a/lib/libXfontcache/man/Makefile.in b/lib/libXfontcache/man/Makefile.in
index 3006eb2e4..6b1965226 100644
--- a/lib/libXfontcache/man/Makefile.in
+++ b/lib/libXfontcache/man/Makefile.in
@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:19:14 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
@@ -100,8 +99,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -111,6 +112,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -121,6 +123,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -140,6 +143,7 @@ MAKEINFO = @MAKEINFO@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -150,6 +154,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -158,13 +163,9 @@ XFONTCACHE_CFLAGS = @XFONTCACHE_CFLAGS@
 XFONTCACHE_LIBS = @XFONTCACHE_LIBS@
 XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-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__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -181,23 +182,31 @@ 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@
@@ -205,13 +214,11 @@ target_alias = @target_alias@
 libmandir = $(LIB_MAN_DIR)
 LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
 libman_PRE = Xfontcache.man
-BUILT_SOURCES = shadows.DONE
 EXTRA_DIST = $(libman_PRE)
 CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
+	      $(Xfontcache_shadowmen)
 
-SED = sed
 
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
@@ -234,8 +241,8 @@ Xfontcache_shadows = \
     FontCacheChangeCacheSettings            \
     FontCacheGetCacheStatistics
 
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+Xfontcache_shadowmen = $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .$(LIB_MAN_SUFFIX) .man
@@ -330,15 +337,13 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(libmandir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
+install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -363,7 +368,6 @@ 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 "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -422,13 +426,10 @@ uninstall-am: uninstall-info-am uninstall-libmanDATA
 
 
 .man.$(LIB_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
-shadows.DONE:
-	-rm -f $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
-	(for i in $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-	 echo .so man$(LIB_MAN_DIR_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $$i; \
-	 done)
+$(Xfontcache_shadowmen):
+	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $@
 # 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:
diff --git a/lib/libXfontcache/man/Xfontcache.man b/lib/libXfontcache/man/Xfontcache.man
index 20c52f118..0621b2e75 100644
--- a/lib/libXfontcache/man/Xfontcache.man
+++ b/lib/libXfontcache/man/Xfontcache.man
@@ -58,10 +58,10 @@ typedef struct {
 .fi
 .HP
 Bool FontCacheQueryExtension(Display *\fIdpy\fP, 
-int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
 .HP
-Status FontCacheQueryVersion(Display *\fIdpy\fP, int *\fImajor_versionp\fP,
-int *\fIminor_versionp\fP\^);
+Status FontCacheQueryVersion(Display *\fIdpy\fP, int *\fImajor_version_return\fP,
+int *\fIminor_version_return\fP\^);
 .HP
 Status FontCacheGetCacheSettings(Display *\fIdpy\fP,
 FontCacheSettings *\fIcache info\fP);
@@ -95,9 +95,9 @@ returns
 .B True
 if the request succeeded; the values of the major and minor protocol
 versions supported by the server are returned in 
-.I major_versionp 
+.I major_version_return
 and 
-.I minor_versionp .
+.I minor_version_return .
 .PP
 .B FontCacheGetCacheSettings
 should be documented here.