[xsrc/trunk]: xsrc/external/mit merge libX11 1.6.9, libXfont2 2.0.4, libXpm 3...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/d0ee62eb83f7
branches:  trunk
changeset: 10444:d0ee62eb83f7
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 23 09:05:16 2020 +0000

description:
merge libX11 1.6.9, libXfont2 2.0.4, libXpm 3.5.13, and libXvMC 1.0.12.

diffstat:

 external/mit/libX11/dist/m4/libtool.m4     |   24 +-
 external/mit/libX11/dist/man/XCreateGC.man |  597 +++++++++++++---------------
 external/mit/libX11/dist/src/XlibInt.c     |    4 +-
 external/mit/libXfont2/dist/README         |   89 ----
 external/mit/libXpm/dist/README            |   25 -
 5 files changed, 292 insertions(+), 447 deletions(-)

diffs (truncated from 1452 to 300 lines):

diff -r 376eae42205b -r d0ee62eb83f7 external/mit/libX11/dist/m4/libtool.m4
--- a/external/mit/libX11/dist/m4/libtool.m4    Sun Feb 23 09:01:48 2020 +0000
+++ b/external/mit/libX11/dist/m4/libtool.m4    Sun Feb 23 09:05:16 2020 +0000
@@ -1417,10 +1417,10 @@
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
            ;;
-         powerpcle-*linux*|powerpc64le-*linux*)
+         powerpcle-*linux*)
            LD="${LD-ld} -m elf64lppc"
            ;;
-         powerpc-*linux*|powerpc64-*linux*)
+         powerpc-*linux*)
            LD="${LD-ld} -m elf64ppc"
            ;;
          s390*-*linux*|s390*-*tpf*)
@@ -2666,14 +2666,7 @@
     *) objformat=elf ;;
     esac
   fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
+  version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
@@ -2685,12 +2678,6 @@
       library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
@@ -2880,6 +2867,9 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Ideally, we could use ldconfig to report *all* directores which are
   # searched for libraries, however this is still not possible.  Aside from not
   # being certain /sbin/ldconfig is available, command
@@ -2888,7 +2878,7 @@
   # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[       
 ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff -r 376eae42205b -r d0ee62eb83f7 external/mit/libX11/dist/man/XCreateGC.man
--- a/external/mit/libX11/dist/man/XCreateGC.man        Sun Feb 23 09:01:48 2020 +0000
+++ b/external/mit/libX11/dist/man/XCreateGC.man        Sun Feb 23 09:05:16 2020 +0000
@@ -39,46 +39,13 @@
 .\" to this documentation without specific, written prior permission.
 .\" Digital and Tektronix makes no representations about the suitability
 .\" of this documentation for any purpose.
-.\" It is provided ``as is'' without express or implied warranty.
-.\" 
+.\" It is provided "as is" without express or implied warranty.
+.\"
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
 .ds xL Xlib \- C Language X Interface
 .ds xC Inter-Client Communication Conventions Manual
-.na
-.de Ds
-.nf
-.\\$1D \\$2 \\$1
-.ft CW
-.\".ps \\n(PS
-.\".if \\n(VS>=40 .vs \\n(VSu
-.\".if \\n(VS<=39 .vs \\n(VSp
-..
-.de De
-.ce 0
-.if \\n(BD .DF
-.nr BD 0
-.in \\n(OIu
-.if \\n(TM .ls 2
-.sp \\n(DDu
-.fi
-..
-.de IN         \" send an index entry to the stderr
-..
-.de Pn
-.ie t \\$1\fB\^\\$2\^\fR\\$3
-.el \\$1\fI\^\\$2\^\fP\\$3
-..
-.de ZN
-.ie t \fB\^\\$1\^\fR\\$2
-.el \fI\^\\$1\^\fP\\$2
-..
-.de hN
-.ie t <\fB\\$1\fR>\\$2
-.el <\fI\\$1\fP>\\$2
-..
-.ny0
 '\" t
 .TH XCreateGC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
@@ -86,23 +53,23 @@
 .SH SYNTAX
 .HP
 GC XCreateGC\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, unsigned long
-\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); 
+\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^);
 .HP
 int XCopyGC\^(\^Display *\fIdisplay\fP\^, GC \fIsrc\fP\^,
-unsigned long \fIvaluemask\fP\^, GC \fIdest\fP\^); 
+unsigned long \fIvaluemask\fP\^, GC \fIdest\fP\^);
 .HP
 int XChangeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
-\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); 
+\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^);
 .HP
 Status XGetGCValues\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
-\fIvaluemask\fP\^, XGCValues *\fIvalues_return\fP\^); 
+\fIvaluemask\fP\^, XGCValues *\fIvalues_return\fP\^);
 .HP
-int XFreeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^); 
+int XFreeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^);
 .HP
-GContext XGContextFromGC\^(\^GC \fIgc\fP\^); 
+GContext XGContextFromGC\^(\^GC \fIgc\fP\^);
 .SH ARGUMENTS
 .IP \fId\fP 1i
-Specifies the drawable. 
+Specifies the drawable.
 .IP \fIdest\fP 1i
 Specifies the destination GC.
 .IP \fIdisplay\fP 1i
@@ -111,264 +78,263 @@
 Specifies the GC.
 .IP \fIsrc\fP 1i
 Specifies the components of the source GC.
-.ds Vm set, copied, changed, or returned 
 .IP \fIvaluemask\fP 1i
-Specifies which components in the GC are to be \*(Vm. 
+Specifies which components in the GC are to be set, copied, changed, or returned.
 This argument is the bitwise inclusive OR of zero or more of the valid
 GC component mask bits.
 .IP \fIvalues\fP 1i
 Specifies any values as specified by the valuemask.
 .IP \fIvalues_return\fP 1i
 Returns the GC values in the specified
-.ZN XGCValues 
+.B XGCValues
 structure.
 .SH DESCRIPTION
 The
-.ZN XCreateGC
+.B XCreateGC
 function creates a graphics context and returns a GC.
 The GC can be used with any destination drawable having the same root
 and depth as the specified drawable.
 Use with other drawables results in a
-.ZN BadMatch
+.B BadMatch
 error.
 .LP
-.ZN XCreateGC
+.B XCreateGC
 can generate
-.ZN BadAlloc ,
-.ZN BadDrawable ,
-.ZN BadFont ,
-.ZN BadMatch ,
-.ZN BadPixmap ,
+.BR BadAlloc ,
+.BR BadDrawable ,
+.BR BadFont ,
+.BR BadMatch ,
+.BR BadPixmap ,
 and
-.ZN BadValue 
+.B BadValue
 errors.
 .LP
 The
-.ZN XCopyGC
+.B XCopyGC
 function copies the specified components from the source GC
 to the destination GC.
 The source and destination GCs must have the same root and depth,
 or a
-.ZN BadMatch
+.B BadMatch
 error results.
 The valuemask specifies which component to copy, as for
-.ZN XCreateGC .
+.BR XCreateGC .
 .LP
-.ZN XCopyGC
+.B XCopyGC
 can generate
-.ZN BadAlloc ,
-.ZN BadGC ,
+.BR BadAlloc ,
+.BR BadGC ,
 and
-.ZN BadMatch
+.B BadMatch
 errors.
 .LP
 The
-.ZN XChangeGC
+.B XChangeGC
 function changes the components specified by valuemask for
 the specified GC.
 The values argument contains the values to be set.
-The values and restrictions are the same as for 
-.ZN XCreateGC .
-Changing the clip-mask overrides any previous 
-.ZN XSetClipRectangles
-request on the context. 
+The values and restrictions are the same as for
+.BR XCreateGC .
+Changing the clip-mask overrides any previous
+.B XSetClipRectangles
+request on the context.
 Changing the dash-offset or dash-list
-overrides any previous 
-.ZN XSetDashes
+overrides any previous
+.B XSetDashes
 request on the context.
 The order in which components are verified and altered is server dependent.
 If an error is generated, a subset of the components may have been altered.
 .LP
-.ZN XChangeGC
+.B XChangeGC
 can generate
-.ZN BadAlloc ,
-.ZN BadFont ,
-.ZN BadGC ,
-.ZN BadMatch ,
-.ZN BadPixmap ,
+.BR BadAlloc ,
+.BR BadFont ,
+.BR BadGC ,
+.BR BadMatch ,
+.BR BadPixmap ,
 and
-.ZN BadValue 
+.B BadValue
 errors.
 .LP
 The
-.ZN XGetGCValues
+.B XGetGCValues
 function returns the components specified by valuemask for the specified GC.
 If the valuemask contains a valid set of GC mask bits
 .Pn ( GCFunction ,
-.ZN GCPlaneMask ,
-.ZN GCForeground ,
-.ZN GCBackground ,
-.ZN GCLineWidth ,
-.ZN GCLineStyle ,
-.ZN GCCapStyle ,
-.ZN GCJoinStyle ,
-.ZN GCFillStyle ,
-.ZN GCFillRule ,
-.ZN GCTile ,
-.ZN GCStipple ,
-.ZN GCTileStipXOrigin ,
-.ZN GCTileStipYOrigin ,
-.ZN GCFont ,
-.ZN GCSubwindowMode ,
-.ZN GCGraphicsExposures ,
-.ZN GCClipXOrigin ,
-.ZN GCCLipYOrigin ,
-.ZN GCDashOffset ,
+.BR GCPlaneMask ,
+.BR GCForeground ,
+.BR GCBackground ,
+.BR GCLineWidth ,
+.BR GCLineStyle ,
+.BR GCCapStyle ,
+.BR GCJoinStyle ,
+.BR GCFillStyle ,
+.BR GCFillRule ,
+.BR GCTile ,
+.BR GCStipple ,
+.BR GCTileStipXOrigin ,