Subject: CVS commit: pkgsrc
From: Thomas Klausner
Date: 2024-04-17 12:38:36
Message id: 20240417103836.C7B53FA2C@cvs.NetBSD.org
Log Message:
*: fix some CONFLICTS lines

Noted by riastradh@ in PR 58155.
Files:
RevisionActionfile
1.24modifypkgsrc/audio/py-ao/Makefile
1.20modifypkgsrc/audio/py-daap/Makefile
1.12modifypkgsrc/comms/py-serial/Makefile
1.4modifypkgsrc/databases/phpmyadmin5/Makefile
1.26modifypkgsrc/databases/py-pypika/Makefile
1.2modifypkgsrc/databases/py-pypika-tortoise/Makefile
1.5modifypkgsrc/devel/lua-bit32/Makefile
1.32modifypkgsrc/devel/py-at-spi2/Makefile
1.23modifypkgsrc/devel/py-gobject/Makefile.common
1.20modifypkgsrc/devel/py-gobject3/Makefile.common
1.40modifypkgsrc/devel/ruby-pkg-config/Makefile
1.81modifypkgsrc/graphics/py-Pillow/Makefile
1.13modifypkgsrc/graphics/py-Pillow6/Makefile
1.9modifypkgsrc/lang/ruby-cucumber-gherkin/Makefile
1.17modifypkgsrc/math/py-roman/Makefile
1.8modifypkgsrc/net/py-Socks/Makefile
1.26modifypkgsrc/net/py-adns/Makefile
1.8modifypkgsrc/net/py-socksipy-branch/Makefile
1.16modifypkgsrc/net/rabbiter/Makefile
1.11modifypkgsrc/security/passphrase/Makefile
1.19modifypkgsrc/security/php-ssh2/Makefile
1.7modifypkgsrc/security/php-ssh2-0/Makefile
1.25modifypkgsrc/textproc/py-gnosis-utils/Makefile
1.144modifypkgsrc/x11/py-gtk2/Makefile