1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
freebsd-ports/irc
Stefan Eßer bcaf25a8c8 Fix CONFLICTS entries of multiple ports
There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.

This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.

Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).

A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.

These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,

Approved by:	portmgr (implicit)
2022-01-10 16:15:39 +01:00
..
anope One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
atheme-services Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
bip Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
birch One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
bitchx Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
bitlbee irc/bitlbee: Add CPE information 2021-08-29 19:17:02 +00:00
bitlbee-discord irc/bitlbee-discord: fix issue with glib >= 2.69 2021-12-07 12:02:05 +09:00
bitlbee-facebook irc/bitlbee-facebook: update to 1.2.2 2021-04-22 12:49:37 +00:00
bitlbee-mastodon irc/bitlbee-mastodon: Update to 1.4.5 2021-07-18 05:13:06 -04:00
bitlbee-steam One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
bnc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
bopm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
catgirl irc/catgirl: update to 2.0 2021-12-15 16:32:44 +09:00
cgiirc irc/cgiirc: Add CPE information 2021-08-31 09:23:19 +00:00
ctrlproxy Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
cwirc all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
dancer Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
darkbot Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
dircproxy irc/dircproxy: Add CPE information 2021-08-31 09:23:33 +00:00
dxirc INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
eggdrop irc/eggdrop: Update to 1.9.1 2021-06-01 20:22:10 -03:00
epic4 irc/epic4: Update to 2.10.10 2022-01-05 13:25:11 -08:00
epic5 irc/epic5: update to 2.1.6 2021-10-06 18:56:07 +03:00
ergo Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
evangeline Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
ezbounce irc/ezbounce: Add CPE information 2021-08-31 09:23:16 +00:00
gruftistats Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
hexchat irc/hexchat: Add CPE information 2021-10-20 18:13:15 +02:00
hexchat-fish One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
icbirc all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
ii Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
infobot Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
inspircd */*: Consistently use my new driesm@FreeBSD.org alias 2021-11-09 11:31:38 +01:00
insub Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
irc */*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL 2021-11-23 23:11:40 +01:00
irc2dc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
ircd-hybrid Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
ircd-ratbox Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
ircd-ratbox-devel Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
ircII *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
ircproxy cleanup: drop support for EOL FreeBSD 11.X 2021-09-30 23:23:30 +02:00
iroffer-dinoex Mk/bsd.ruby.mk: Remove RUBY_NAME 2021-11-02 05:28:58 +08:00
irssi *: apply refactor.remove-consecutive-empty-lines 2021-10-19 10:36:47 +02:00
irssi-dcc_send_limiter Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
irssi-fish Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
irssi-icb One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
irssi-scripts Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
irssi-xmpp Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
irssistats Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
keitairc2 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
komanda-cli One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
konversation KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
kvirc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
libircclient Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
miau Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
muh Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
ngircd all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
ninja Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
onis Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-AnyEvent-IRC Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Bot-BasicBot Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-IRC-Bot-Hangman Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-IRC-Utils irc/p5-IRC-Utils: Add NO_ARCH 2021-06-25 21:41:14 +08:00
p5-Parse-IRC Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-IRC irc/p5-POE-Component-IRC: Update to 6.93 2021-06-25 21:40:23 +08:00
p5-POE-Component-IRC-Object Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-IRC-Plugin-Blowfish Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-IRC-Plugin-Bollocks Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-IRC-Plugin-CoreList Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-IRC-Plugin-Hailo Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-IRC-Plugin-Karma One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
p5-POE-Component-IRC-Plugin-POE-Knee Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-IRC-Plugin-QueryDNS Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-IRC-Plugin-QueryDNSBL Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-IRC-Plugin-RSS-Headlines Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Component-Server-IRC Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Filter-IRCD Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-POE-Session-Irssi Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
pear-Net_SmartIRC */pear-*: Take maintainership 2021-05-23 00:20:48 +08:00
pircbot Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
pisg Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
polari INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
pounce irc/pounce: Update to 3.0 2021-12-12 19:54:08 +01:00
py-fishcrypt Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
py-irc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
py-limnoria irc/py-limnoria: Mark as not compatible with Python 3.10+ 2021-12-01 10:02:37 +01:00
quassel irc/quassel: update to 0.14.0 release 2022-01-05 14:20:26 +03:00
quassel-core irc/quassel*: update to 0.14-rc1 snapshot (+) 2021-08-20 05:07:49 +10:00
quirc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
ratbox-respond Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rbot irc/rbot: Add USES=cpe 2021-09-22 06:24:03 +08:00
riece USES=emacs: Chase package name changes 2021-11-15 11:19:58 -04:00
rubygem-cinch One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
rubygem-cogbot One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
rubygem-lita-irc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rubygem-net-irc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
scrollz Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
sic Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
simpleirc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
sirc One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
smartirc4net Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
smuxi INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
soju irc/soju: Update to 0.3.0 2021-11-20 21:07:19 +00:00
srain INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
srvx Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
thales irc/thales: Improve COMMENT 2021-12-12 23:50:11 +01:00
tircproxy Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
undernet-ircu all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
unreal irc/unreal: fix inline which should be static 2021-10-02 13:30:32 +02:00
weechat irc/weechat: Update to 3.4 2021-12-18 13:01:38 +00:00
weechat-otr One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
znc irc/znc: Fix build with LibreSSL 2021-12-05 19:04:21 -03:00
znc-push devel/icu: update to 70.1 2021-10-28 16:37:30 +00:00
Makefile cleanup: Remove expired ports: 2021-08-21 22:21:57 +02:00