svn merge ^/branches/released .

12 files changed, 86 insertions, 59 deletions

diff --git a/libXau/Makefile.am b/libXau/Makefile.am
index 3ff7c03a9..f74f1bf93 100644
--- a/libXau/Makefile.am
+++ b/libXau/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=man

+

 lib_LTLIBRARIES = libXau.la

 

 AM_CFLAGS = $(XAU_CFLAGS) $(CWARNFLAGS)

@@ -48,39 +50,8 @@ $(LINTLIB): $(libXau_la_SOURCES)
 	$(LINT) -y -oXau -x $(ALL_LINT_FLAGS) $(libXau_la_SOURCES)

 endif MAKE_LINT_LIB

 

-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)

-

-libmandir = $(LIB_MAN_DIR)

-libman_PRE = Xau.man

-BUILT_SOURCES = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)

-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA)

-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \

-	      $(Xau_shadows:=.@LIB_MAN_SUFFIX@)

-

+CLEANFILES = $(lintlib_DATA)

 MAINTAINERCLEANFILES = ChangeLog INSTALL

-EXTRA_DIST = $(libman_PRE)

-

-Xau_shadows =                               \

-    XauFileName                             \

-    XauReadAuth                             \

-    XauLockAuth                             \

-    XauUnlockAuth                           \

-    XauWriteAuth                            \

-    XauDisposeAuth                          \

-    XauGetAuthByAddr                        \

-    XauGetBestAuthByAddr

-

-Xau_shadows_man = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)

-$(Xau_shadows_man):

-	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $@

-

-XORGRELSTRING = @PACKAGE_STRING@

-  XORGMANNAME = X Version 11

-

-Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man

-	$(AM_V_GEN)$(SED) \

-		-e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \

-	< $(srcdir)/Xau.man > Xau.$(LIB_MAN_SUFFIX)

 

 .PHONY: ChangeLog INSTALL

 

diff --git a/libXau/configure.ac b/libXau/configure.ac
index 98e0184d6..ae37e62b3 100644
--- a/libXau/configure.ac
+++ b/libXau/configure.ac
@@ -28,10 +28,10 @@ AM_MAINTAINER_MODE
 

 AM_CONFIG_HEADER(config.h)

 

-# Require xorg-macros: XORG_DEFAULT_OPTIONS

+# Require X.Org 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.4 or later before running autoconf/autogen])])

-XORG_MACROS_VERSION(1.4)

+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])

+XORG_MACROS_VERSION(1.8)

 XORG_DEFAULT_OPTIONS

 

 AC_PROG_CC

@@ -75,4 +75,5 @@ LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}"
 

 

 AC_OUTPUT([Makefile

+           man/Makefile

            xau.pc])

diff --git a/libXau/man/Makefile.am b/libXau/man/Makefile.am
new file mode 100644
index 000000000..694c376b0
--- /dev/null
+++ b/libXau/man/Makefile.am
@@ -0,0 +1,47 @@
+#

+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.

+#

+# Permission is hereby granted, free of charge, to any person obtaining a

+# copy of this software and associated documentation files (the "Software"),

+# to deal in the Software without restriction, including without limitation

+# the rights to use, copy, modify, merge, publish, distribute, sublicense,

+# and/or sell copies of the Software, and to permit persons to whom the

+# Software is furnished to do so, subject to the following conditions:

+#

+# The above copyright notice and this permission notice (including the next

+# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+# DEALINGS IN THE SOFTWARE.

+#

+

+libmandir = $(LIB_MAN_DIR)

+

+libman_PRE =				\

+	Xau.man				\

+	XauDisposeAuth.man		\

+	XauFileName.man			\

+	XauGetAuthByAddr.man		\

+	XauGetBestAuthByAddr.man	\

+	XauLockAuth.man			\

+	XauReadAuth.man			\

+	XauUnlockAuth.man		\

+	XauWriteAuth.man

+

+libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX))

+

+EXTRA_DIST = $(libman_PRE)

+

+CLEANFILES = $(libman_DATA)

+

+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

+SUFFIXES = .$(LIB_MAN_SUFFIX) .man

+

+.man.$(LIB_MAN_SUFFIX):

+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

diff --git a/libXau/Xau.man b/libXau/man/Xau.man
index 2cea88c22..0688f49ef 100644
--- a/libXau/Xau.man
+++ b/libXau/man/Xau.man
@@ -2,33 +2,33 @@
 .\" $XdotOrg$

 .\"

 .\" Copyright (c) 1994  X Consortium

-.\" 

+.\"

 .\" Permission is hereby granted, free of charge, to any person obtaining a

-.\" copy of this software and associated documentation files (the "Software"), 

-.\" to deal in the Software without restriction, including without limitation 

-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, 

-.\" and/or sell copies of the Software, and to permit persons to whom the 

+.\" copy of this software and associated documentation files (the "Software"),

+.\" to deal in the Software without restriction, including without limitation

+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,

+.\" and/or sell copies of the Software, and to permit persons to whom the

 .\" Software furnished to do so, subject to the following conditions:

-.\" 

+.\"

 .\" The above copyright notice and this permission notice shall be included in

 .\" all copies or substantial portions of the Software.

-.\" 

+.\"

 .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 .\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 

-.\" THE X CONSORTIUM 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 

+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+.\" THE X CONSORTIUM 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 X Consortium shall not 

-.\" be used in advertising or otherwise to promote the sale, use or other 

-.\" dealing in this Software without prior written authorization from the 

+.\"

+.\" Except as contained in this notice, the name of the X Consortium shall not

+.\" be used in advertising or otherwise to promote the sale, use or other

+.\" dealing in this Software without prior written authorization from the

 .\" X Consortium.

 .\"

 .\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.2 2001/01/27 18:20:19 dawes Exp $

 .\"

-.TH Xau 3 __xorgversion__

+.TH Xau __libmansuffix__ __xorgversion__

 .SH NAME

 Xau library: XauFileName, XauReadAuth, XauLockAuth, XauUnlockAuth,

 XauWriteAuth, XauDisposeAuth,

@@ -51,11 +51,11 @@ typedef struct xauth {
 } Xauth;

 

 .HP

-char *XauFileName (void); 

+char *XauFileName (void);

 .HP

-Xauth *XauReadAuth (FILE *\fIauth_file\fP\^); 

+Xauth *XauReadAuth (FILE *\fIauth_file\fP\^);

 .HP

-int XauWriteAuth (FILE *\fIauth_file\fP, Xauth *\fIauth\fP\^); 

+int XauWriteAuth (FILE *\fIauth_file\fP, Xauth *\fIauth\fP\^);

 .HP

 Xauth *XauGetAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short

 \fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short

@@ -65,14 +65,14 @@ Xauth *XauGetAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short
 Xauth *XauGetBestAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short

 \fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short

 \fInumber_length\fP\^, const char *\fInumber\fP\^, int \fItypes_length\fP\^,

-char **\fItypes\fR\^, const int *\fItype_lengths\fR\^); 

+char **\fItypes\fR\^, const int *\fItype_lengths\fR\^);

 .HP

 int XauLockAuth (const char *\fIfile_name\fP\^, int \fIretries\fP\^, int

-\fItimeout\fP\^, long \fIdead\fP\^); 

+\fItimeout\fP\^, long \fIdead\fP\^);

 .HP

-int XauUnlockAuth (const char *\fIfile_name\fP\^); 

+int XauUnlockAuth (const char *\fIfile_name\fP\^);

 .HP

-int XauDisposeAuth (Xauth *\fIauth\fP\^); 

+int XauDisposeAuth (Xauth *\fIauth\fP\^);

 .ft R

 .SH DESCRIPTION

 .PP

@@ -124,7 +124,7 @@ results:
 

 .fi

 .PP

-\fBXauUnlockAuth\fP undoes the work of \fIXauLockAuth\fP by unlinking both 

+\fBXauUnlockAuth\fP undoes the work of \fIXauLockAuth\fP by unlinking both

 the ``-c'' and ``-l'' file names.

 .PP

 \fBXauDisposeAuth\fP frees storage allocated to hold an authorization entry.

diff --git a/libXau/man/XauDisposeAuth.man b/libXau/man/XauDisposeAuth.man
new file mode 100644
index 000000000..d20306a06
--- /dev/null
+++ b/libXau/man/XauDisposeAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__

diff --git a/libXau/man/XauFileName.man b/libXau/man/XauFileName.man
new file mode 100644
index 000000000..d20306a06
--- /dev/null
+++ b/libXau/man/XauFileName.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__

diff --git a/libXau/man/XauGetAuthByAddr.man b/libXau/man/XauGetAuthByAddr.man
new file mode 100644
index 000000000..d20306a06
--- /dev/null
+++ b/libXau/man/XauGetAuthByAddr.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__

diff --git a/libXau/man/XauGetBestAuthByAddr.man b/libXau/man/XauGetBestAuthByAddr.man
new file mode 100644
index 000000000..d20306a06
--- /dev/null
+++ b/libXau/man/XauGetBestAuthByAddr.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__

diff --git a/libXau/man/XauLockAuth.man b/libXau/man/XauLockAuth.man
new file mode 100644
index 000000000..d20306a06
--- /dev/null
+++ b/libXau/man/XauLockAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__

diff --git a/libXau/man/XauReadAuth.man b/libXau/man/XauReadAuth.man
new file mode 100644
index 000000000..d20306a06
--- /dev/null
+++ b/libXau/man/XauReadAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__

diff --git a/libXau/man/XauUnlockAuth.man b/libXau/man/XauUnlockAuth.man
new file mode 100644
index 000000000..d20306a06
--- /dev/null
+++ b/libXau/man/XauUnlockAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__

diff --git a/libXau/man/XauWriteAuth.man b/libXau/man/XauWriteAuth.man
new file mode 100644
index 000000000..d20306a06
--- /dev/null
+++ b/libXau/man/XauWriteAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__