CVS commit: pkgsrc/x11/libX11

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 10 08:54:44 UTC 2021

Modified Files:
        pkgsrc/x11/libX11: Makefile distinfo
        pkgsrc/x11/libX11/patches: patch-Makefile.in

Log Message:
libX11: update to 1.7.3.1.

This release of libX11 corrects a packaging problem in 1.7.3 which caused
the m4 files needed for autoreconf to not be included in the tarballs.

(ProTip: if you have an ACLOCAL variable set in your environment, and it
 doesn't have "-I m4" ahead of any other -I options, then automake may
 assume that any m4 files found via those other -I options don't need to
 be included in the tarballs when you run "make dist".)

As a bonus, this release also includes one tiny typo fix in the XIM specs.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/libX11/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/libX11/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libX11/patches/patch-Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libX11/Makefile
diff -u pkgsrc/x11/libX11/Makefile:1.60 pkgsrc/x11/libX11/Makefile:1.61
--- pkgsrc/x11/libX11/Makefile:1.60     Tue Dec  7 08:38:13 2021
+++ pkgsrc/x11/libX11/Makefile  Fri Dec 10 08:54:43 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2021/12/07 08:38:13 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2021/12/10 08:54:43 wiz Exp $
 
-DISTNAME=              libX11-1.7.3
+DISTNAME=              libX11-1.7.3.1
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/x11/libX11/distinfo
diff -u pkgsrc/x11/libX11/distinfo:1.41 pkgsrc/x11/libX11/distinfo:1.42
--- pkgsrc/x11/libX11/distinfo:1.41     Tue Dec  7 08:38:13 2021
+++ pkgsrc/x11/libX11/distinfo  Fri Dec 10 08:54:43 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2021/12/07 08:38:13 wiz Exp $
+$NetBSD: distinfo,v 1.42 2021/12/10 08:54:43 wiz Exp $
 
-BLAKE2s (libX11-1.7.3.tar.xz) = e5e7e3960adf4da6b38fe1578bb6518ee5f636c995e44d1aeb3b8f60753782b8
-SHA512 (libX11-1.7.3.tar.xz) = abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
-Size (libX11-1.7.3.tar.xz) = 1861304 bytes
-SHA1 (patch-Makefile.in) = abf5f56650c59960c20e65b50b0c26b29434f599
+BLAKE2s (libX11-1.7.3.1.tar.xz) = 0fed9151b74af4ed36d908ca9c3ab7c116a728886481d086abc1553069394922
+SHA512 (libX11-1.7.3.1.tar.xz) = a2620076db4bf35ab94706c8ab714e9c3fecbdd533cf99cdffeabaf49a1a1d30a233eb2dc76da51b01d50c43f11780aa3b2936668d982a33fa7d5008be44e25b
+Size (libX11-1.7.3.1.tar.xz) = 1864224 bytes
+SHA1 (patch-Makefile.in) = 54faa0431bdb8a1e4fed5459bff03a316eb174c8
 SHA1 (patch-aa) = 4f502264e7200fd2f9409d8684c53de3bc6f0649
 SHA1 (patch-ac) = 84bad85defd7cdac82fe4448d723c80469507f73
 SHA1 (patch-src_xkb_XKBBind.c) = 3ad94bd3265c3c4a85bcf3e2da0782c16fd461d1

Index: pkgsrc/x11/libX11/patches/patch-Makefile.in
diff -u pkgsrc/x11/libX11/patches/patch-Makefile.in:1.8 pkgsrc/x11/libX11/patches/patch-Makefile.in:1.9
--- pkgsrc/x11/libX11/patches/patch-Makefile.in:1.8     Tue Dec  7 08:38:13 2021
+++ pkgsrc/x11/libX11/patches/patch-Makefile.in Fri Dec 10 08:54:44 2021
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile.in,v 1.8 2021/12/07 08:38:13 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.9 2021/12/10 08:54:44 wiz Exp $
 
 Avoid unnecessary auto* due to patch-aa modifying configure.ac.
 
---- Makefile.in.orig   2021-12-07 01:40:02.000000000 +0000
+--- Makefile.in.orig   2021-12-10 04:18:59.000000000 +0000
 +++ Makefile.in
-@@ -92,8 +92,7 @@ subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
+@@ -95,8 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
        $(top_srcdir)/configure.ac
 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 -      $(ACLOCAL_M4)