PR/58155 CVS commit: pkgsrc

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

The following reply was made to PR pkg/58155; it has been noted by GNATS.

From: "Thomas Klausner" <wiz%netbsd.org@localhost>
To: gnats-bugs%gnats.NetBSD.org@localhost
Cc: 
Subject: PR/58155 CVS commit: pkgsrc
Date: Wed, 17 Apr 2024 10:38:36 +0000

 Module Name:	pkgsrc
 Committed By:	wiz
 Date:		Wed Apr 17 10:38:36 UTC 2024
 
 Modified Files:
 	pkgsrc/audio/py-ao: Makefile
 	pkgsrc/audio/py-daap: Makefile
 	pkgsrc/comms/py-serial: Makefile
 	pkgsrc/databases/phpmyadmin5: Makefile
 	pkgsrc/databases/py-pypika: Makefile
 	pkgsrc/databases/py-pypika-tortoise: Makefile
 	pkgsrc/devel/lua-bit32: Makefile
 	pkgsrc/devel/py-at-spi2: Makefile
 	pkgsrc/devel/py-gobject: Makefile.common
 	pkgsrc/devel/py-gobject3: Makefile.common
 	pkgsrc/devel/ruby-pkg-config: Makefile
 	pkgsrc/graphics/py-Pillow: Makefile
 	pkgsrc/graphics/py-Pillow6: Makefile
 	pkgsrc/lang/ruby-cucumber-gherkin: Makefile
 	pkgsrc/math/py-roman: Makefile
 	pkgsrc/net/py-Socks: Makefile
 	pkgsrc/net/py-adns: Makefile
 	pkgsrc/net/py-socksipy-branch: Makefile
 	pkgsrc/net/rabbiter: Makefile
 	pkgsrc/security/passphrase: Makefile
 	pkgsrc/security/php-ssh2: Makefile
 	pkgsrc/security/php-ssh2-0: Makefile
 	pkgsrc/textproc/py-gnosis-utils: Makefile
 	pkgsrc/x11/py-gtk2: Makefile
 
 Log Message:
 *: fix some CONFLICTS lines
 
 Noted by riastradh@ in PR 58155.
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.23 -r1.24 pkgsrc/audio/py-ao/Makefile
 cvs rdiff -u -r1.19 -r1.20 pkgsrc/audio/py-daap/Makefile
 cvs rdiff -u -r1.11 -r1.12 pkgsrc/comms/py-serial/Makefile
 cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/phpmyadmin5/Makefile
 cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/py-pypika/Makefile
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/py-pypika-tortoise/Makefile
 cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/lua-bit32/Makefile
 cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/py-at-spi2/Makefile
 cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/py-gobject/Makefile.common
 cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-gobject3/Makefile.common
 cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/ruby-pkg-config/Makefile
 cvs rdiff -u -r1.80 -r1.81 pkgsrc/graphics/py-Pillow/Makefile
 cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/py-Pillow6/Makefile
 cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ruby-cucumber-gherkin/Makefile
 cvs rdiff -u -r1.16 -r1.17 pkgsrc/math/py-roman/Makefile
 cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/py-Socks/Makefile
 cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/py-adns/Makefile
 cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/py-socksipy-branch/Makefile
 cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/rabbiter/Makefile
 cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/passphrase/Makefile
 cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/php-ssh2/Makefile
 cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/php-ssh2-0/Makefile
 cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/py-gnosis-utils/Makefile
 cvs rdiff -u -r1.143 -r1.144 pkgsrc/x11/py-gtk2/Makefile
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.