CVS commit: pkgsrc/x11

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jun 18 08:25:05 UTC 2022

Modified Files:
        pkgsrc/x11/py-xcbgen: Makefile distinfo
        pkgsrc/x11/py-xcbgen/patches: patch-ae
        pkgsrc/x11/xcb-proto: Makefile PLIST distinfo
        pkgsrc/x11/xcb-proto/patches: patch-ae

Log Message:
py-xcbgen, xcb-proto: update to 1.15.2

Matt Turner (4):
      Remove libdir from xcb-proto.pc
      Install xcb-proto to $(datarootdir)
      Call AC_OUTPUT without arguments
      xcb-proto 1.15.2


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/py-xcbgen/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/py-xcbgen/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/py-xcbgen/patches/patch-ae
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/xcb-proto/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xcb-proto/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xcb-proto/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xcb-proto/patches/patch-ae

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

Modified files:

Index: pkgsrc/x11/py-xcbgen/Makefile
diff -u pkgsrc/x11/py-xcbgen/Makefile:1.24 pkgsrc/x11/py-xcbgen/Makefile:1.25
--- pkgsrc/x11/py-xcbgen/Makefile:1.24  Thu Jun 16 21:26:15 2022
+++ pkgsrc/x11/py-xcbgen/Makefile       Sat Jun 18 08:25:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2022/06/16 21:26:15 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/06/18 08:25:05 wiz Exp $
 #
 # When updating this, also update x11/xcb-proto
 
-DISTNAME=      xcb-proto-1.15.1
+DISTNAME=      xcb-proto-1.15.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/xcb-proto/xcbgen/}
 CATEGORIES=    x11
 MASTER_SITES=  https://xorg.freedesktop.org/archive/individual/proto/

Index: pkgsrc/x11/py-xcbgen/distinfo
diff -u pkgsrc/x11/py-xcbgen/distinfo:1.19 pkgsrc/x11/py-xcbgen/distinfo:1.20
--- pkgsrc/x11/py-xcbgen/distinfo:1.19  Thu Jun 16 21:26:15 2022
+++ pkgsrc/x11/py-xcbgen/distinfo       Sat Jun 18 08:25:05 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2022/06/16 21:26:15 wiz Exp $
+$NetBSD: distinfo,v 1.20 2022/06/18 08:25:05 wiz Exp $
 
-BLAKE2s (xcb-proto-1.15.1.tar.xz) = 859d71fa4fa4d10f6038ea4a90637e01f01d37309bb1b3dc71a53c3bb9c81db1
-SHA512 (xcb-proto-1.15.1.tar.xz) = 56fd505e567e1d39b4d46d0e5f79aeb90144c9b1a4429b2f51cd326ec0dea2a5fda5e2ebfe48af0da2781a4b1e29d9a91a4e0da662db5e35a701eac2e5ec1684
-Size (xcb-proto-1.15.1.tar.xz) = 147908 bytes
-SHA1 (patch-ae) = e5bff371fc8d87b9e3eaaea80734f8fcf544b4b1
+BLAKE2s (xcb-proto-1.15.2.tar.xz) = 0d9b32f71966c1e82957f86d4e107d6c53f1ede0148377eed971ebd07a5fbb7d
+SHA512 (xcb-proto-1.15.2.tar.xz) = 9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d
+Size (xcb-proto-1.15.2.tar.xz) = 148108 bytes
+SHA1 (patch-ae) = feedb2eb11b504eda50dc4a99b2a3fe4bf280c10

Index: pkgsrc/x11/py-xcbgen/patches/patch-ae
diff -u pkgsrc/x11/py-xcbgen/patches/patch-ae:1.4 pkgsrc/x11/py-xcbgen/patches/patch-ae:1.5
--- pkgsrc/x11/py-xcbgen/patches/patch-ae:1.4   Sun Feb 23 22:32:03 2020
+++ pkgsrc/x11/py-xcbgen/patches/patch-ae       Sat Jun 18 08:25:05 2022
@@ -1,19 +1,19 @@
-$NetBSD: patch-ae,v 1.4 2020/02/23 22:32:03 wiz Exp $
+$NetBSD: patch-ae,v 1.5 2022/06/18 08:25:05 wiz Exp $
 
 Only build xcbgen parts in this package, other stuff is in xcbproto.
 
---- Makefile.in.orig   2020-02-22 20:16:56.000000000 +0000
+--- Makefile.in.orig   2022-06-17 17:57:17.000000000 +0000
 +++ Makefile.in
-@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
+@@ -314,7 +314,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  xcbincludedir = @xcbincludedir@
 -SUBDIRS = src xcbgen
 +SUBDIRS = xcbgen
- pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfigdir = $(datarootdir)/pkgconfig
  pkgconfig_DATA = xcb-proto.pc
  EXTRA_DIST = doc xcb-proto.pc.in autogen.sh README.md
-@@ -730,7 +730,7 @@ info: info-recursive
+@@ -738,7 +738,7 @@ info: info-recursive
  
  info-am:
  

Index: pkgsrc/x11/xcb-proto/Makefile
diff -u pkgsrc/x11/xcb-proto/Makefile:1.29 pkgsrc/x11/xcb-proto/Makefile:1.30
--- pkgsrc/x11/xcb-proto/Makefile:1.29  Thu Jun 16 21:26:15 2022
+++ pkgsrc/x11/xcb-proto/Makefile       Sat Jun 18 08:25:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2022/06/16 21:26:15 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/06/18 08:25:05 wiz Exp $
 #
 # When updating this package, also update x11/py-xcbgen
 
-DISTNAME=      xcb-proto-1.15.1
+DISTNAME=      xcb-proto-1.15.2
 CATEGORIES=    x11
 MASTER_SITES=  https://xorg.freedesktop.org/archive/individual/proto/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/x11/xcb-proto/PLIST
diff -u pkgsrc/x11/xcb-proto/PLIST:1.7 pkgsrc/x11/xcb-proto/PLIST:1.8
--- pkgsrc/x11/xcb-proto/PLIST:1.7      Thu Jun 16 21:26:15 2022
+++ pkgsrc/x11/xcb-proto/PLIST  Sat Jun 18 08:25:05 2022
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2022/06/16 21:26:15 wiz Exp $
-lib/pkgconfig/xcb-proto.pc
+@comment $NetBSD: PLIST,v 1.8 2022/06/18 08:25:05 wiz Exp $
+share/pkgconfig/xcb-proto.pc
 share/xcb/bigreq.xml
 share/xcb/composite.xml
 share/xcb/damage.xml

Index: pkgsrc/x11/xcb-proto/distinfo
diff -u pkgsrc/x11/xcb-proto/distinfo:1.18 pkgsrc/x11/xcb-proto/distinfo:1.19
--- pkgsrc/x11/xcb-proto/distinfo:1.18  Thu Jun 16 21:26:15 2022
+++ pkgsrc/x11/xcb-proto/distinfo       Sat Jun 18 08:25:05 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2022/06/16 21:26:15 wiz Exp $
+$NetBSD: distinfo,v 1.19 2022/06/18 08:25:05 wiz Exp $
 
-BLAKE2s (xcb-proto-1.15.1.tar.xz) = 859d71fa4fa4d10f6038ea4a90637e01f01d37309bb1b3dc71a53c3bb9c81db1
-SHA512 (xcb-proto-1.15.1.tar.xz) = 56fd505e567e1d39b4d46d0e5f79aeb90144c9b1a4429b2f51cd326ec0dea2a5fda5e2ebfe48af0da2781a4b1e29d9a91a4e0da662db5e35a701eac2e5ec1684
-Size (xcb-proto-1.15.1.tar.xz) = 147908 bytes
-SHA1 (patch-ae) = c3244439391c8aa47e8c82bc3347fbe0e10ac5cc
+BLAKE2s (xcb-proto-1.15.2.tar.xz) = 0d9b32f71966c1e82957f86d4e107d6c53f1ede0148377eed971ebd07a5fbb7d
+SHA512 (xcb-proto-1.15.2.tar.xz) = 9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d
+Size (xcb-proto-1.15.2.tar.xz) = 148108 bytes
+SHA1 (patch-ae) = f0143f1ccda08e9c626b30ee53ddf3779759e03e

Index: pkgsrc/x11/xcb-proto/patches/patch-ae
diff -u pkgsrc/x11/xcb-proto/patches/patch-ae:1.4 pkgsrc/x11/xcb-proto/patches/patch-ae:1.5
--- pkgsrc/x11/xcb-proto/patches/patch-ae:1.4   Sun Feb 23 22:29:38 2020
+++ pkgsrc/x11/xcb-proto/patches/patch-ae       Sat Jun 18 08:25:05 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.4 2020/02/23 22:29:38 wiz Exp $
+$NetBSD: patch-ae,v 1.5 2022/06/18 08:25:05 wiz Exp $
 
 xcbgen is built by py-xcbgen package.
 
---- Makefile.in.orig   2020-02-22 20:16:56.000000000 +0000
+--- Makefile.in.orig   2022-06-17 17:57:17.000000000 +0000
 +++ Makefile.in
-@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
+@@ -314,7 +314,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  xcbincludedir = @xcbincludedir@
 -SUBDIRS = src xcbgen
 +SUBDIRS = src
- pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfigdir = $(datarootdir)/pkgconfig
  pkgconfig_DATA = xcb-proto.pc
  EXTRA_DIST = doc xcb-proto.pc.in autogen.sh README.md