freebsd-ports/mail
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
..
abook
adcomplain
addresses
addresses-goodies
aerc
akpop3d
alpine
amavis-logwatch
anomy-sanitizer
antivirus-milter
anubis
archiveopteryx Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
archiveopteryx-devel Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
archivesmtp
archmbox
ask
asmail
assp
astroid
automx
autorespond
avenger Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
balsa
batv-milter
bayespam
bbmail
biabam
bincimap
bmf
bogofilter Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
bogofilter-kc Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
bogofilter-lmdb Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
bogofilter-sqlite Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
bsfilter
bsmtp
bulk_mailer
c-sig
cclient
claws-mail
claws-mail-address_keeper
claws-mail-archive
claws-mail-att_remover
claws-mail-attachwarner
claws-mail-bogofilter
claws-mail-bsfilter
claws-mail-clamd
claws-mail-dillo
claws-mail-fetchinfo
claws-mail-gdata
claws-mail-libravatar
claws-mail-litehtml_viewer
claws-mail-mailmbox
claws-mail-managesieve
claws-mail-newmail
claws-mail-notification
claws-mail-pdf_viewer graphics/poppler: update to 21.12 2021-12-13 21:13:45 +01:00
claws-mail-perl
claws-mail-pgp
claws-mail-plugins
claws-mail-rssyl
claws-mail-spam_report
claws-mail-spamassassin
claws-mail-tnef_parse
claws-mail-vcalendar
clawsker
cleanup-maildir
cone
coolmail
courier
courier-analog
courier-authlib-vchkpw
courier-imap
couriergraph
crm114 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
cvsmail
cyrus2courier
cyrus2dovecot
cyrus-imapd23 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
cyrus-imapd24 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
cyrus-imapd25 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
cyrus-imapd30 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
cyrus-imapd32 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
cyrus-imapd34 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
davmail mail/davmail: update to 6.0.1 2021-12-11 17:28:08 +09:00
dbmail mail/dbmail: Update version 3.2.5=>3.2.6 2022-01-10 03:09:32 -06:00
dcc-dccd
deforaos-mailer
delatt
dk-milter
dkfilter
dkimproxy
dma
dot-forward
dovecot
dovecot-fts-xapian
dovecot-pigeonhole
dspam
ecartis
elm Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
emailrelay
emil
enma
eps
epstools
esmtp
evolution
evolution-ews
exilog
exim mail/exim: switch to native SRS implementation (+) 2021-12-29 16:53:55 +03:00
exim-doc-html
exim-doc-pdf
exim-doc-postscript
exim-ldap2
exim-monitor
exim-mysql
exim-postgresql
exim-sa-exim
exim-sqlite
exipick
exmh2
ez-pine-gpg
ezmlm
ezmlm-idx Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
faces
fastforward
fdm
fetchmail mail/fetchmail: update 6.4.25, add WOLFSSL support 2021-12-10 23:48:02 +01:00
fetchmailconf mail/fetchmail: update 6.4.25, add WOLFSSL support 2021-12-10 23:48:02 +01:00
filtermail
findmaildirs
geary
gensig
getmail6
gmime2
gmime2-sharp
gmime26
gmime26-sharp
gmime30
gnarwl
gnubiff
gnumail
gotmail
grepmail
greyfix
greylite
gubby
hashcash
hbiff
heirloom-mailx
horde-imp Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
horde-ingo Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
horde-turba
horde-webmail
ifile
im
imap-uw Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
imapdedup
imapfilter
imapsync
imaptools
imaputils
isbg
isoqlog
isync mail/isync: Update deprecated CPE information 2021-12-21 12:57:48 +00:00
james
jamlib
jmba
junkfilter
jwsmtp
lbdb
lens
libcmime
libdkim
libdomainkeys
libesmtp
libetpan
libmilter
libpst mail/libpst: Use ImageMagick 7 2021-12-22 02:46:26 +08:00
libsieve
libspamtest
libspf
libspf2
libsrs2
libsrs_alt
libvmime
listadmin
lmtp2nntp
lookout
lurker
mail2sms
mailagent
maildrop
mailest
mailfromd
mailfront
mailgraph
mailhog
mailman mail/mailman: regression fix update to 2.1.39 2021-12-13 23:27:25 +01:00
mailman3
mailman-exim4
mailman-postfix
mailscanner
mailsync
mailutils Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
mailx
mairix
masqmail
mb2md
mblaze
mbox2imap
mbox2mdir
mboxgrep
mboxstats
mbx2mbox
mdpop3d
mess822
meta1
metamail
mew Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
mew-devel Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
milter-bogom
milter-callback
milter-greylist
milter-manager
milter-regex
milter-skem
mime4j
mime-construct
mimedefang mail/mimedefang: Allow setting MX_MAX_RSS and MX_MAX_AS in rc.conf 2021-12-11 00:25:57 +01:00
mini_sendmail
minimalist
missey
mlmmj
mlmmj-webview
mls
mmh Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
mmr
mpop
msglint
msmtp
mu
mu4e
mu4e-maildirs
mulberry
mutt mail/mutt: Update to 2.1.5 2021-12-31 02:28:46 +00:00
mutt_vc_query
nbsmtp
neomutt
nextcloud-mail mail/nextcloud-mail: Update to 1.11.5 2021-12-29 10:58:53 +00:00
nmh Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
noattach
nocc
normalizemime
notmuch mail/notmuch*: Update to 0.34.2 2021-12-10 20:19:00 -04:00
notmuch-emacs mail/notmuch*: Update to 0.34.2 2021-12-10 20:19:00 -04:00
notmuch-mutt
nullmailer
opendkim mail/opendkim: Fix errors when no value is set for socket in RC script 2022-01-08 13:07:55 +00:00
opendmarc mail/opendmarc: Update to 1.4.2 2021-12-24 18:39:45 +01:00
opensmtpd
opensmtpd-extras
opensmtpd-extras-queue-ram
opensmtpd-extras-scheduler-ram
opensmtpd-extras-table-ldap
opensmtpd-extras-table-mysql
opensmtpd-extras-table-passwd
opensmtpd-extras-table-postgresql
opensmtpd-extras-table-redis
opensmtpd-extras-table-socketmap
opensmtpd-extras-table-sqlite
opensmtpd-filter-rspamd
opensmtpd-filter-senderscore
osbf-lua
ovs
p5-CGP-CLI
p5-Clamd
p5-Dancer2-Plugin-Email
p5-Dancer-Plugin-Email
p5-Data-Validate-Email
p5-Email-Abstract
p5-Email-Address
p5-Email-Address-List
p5-Email-Address-Loose
p5-Email-Address-UseXS
p5-Email-Address-XS
p5-Email-AddressParser
p5-Email-Date
p5-Email-Date-Format
p5-Email-Delete
p5-Email-Filter
p5-Email-Find
p5-Email-Folder
p5-Email-Folder-IMAP
p5-Email-Folder-IMAPS
p5-Email-Folder-POP3
p5-Email-FolderType
p5-Email-FolderType-Net
p5-Email-LocalDelivery
p5-Email-LocalDelivery-Ezmlm
p5-Email-MessageID
p5-Email-MIME mail/p5-Email-MIME: Update to 1.952 2021-12-27 07:56:16 +00:00
p5-Email-MIME-Attachment-Stripper
p5-Email-MIME-ContentType
p5-Email-MIME-CreateHTML
p5-Email-MIME-Creator-ISO_2022_JP
p5-Email-MIME-Encodings
p5-Email-MIME-RFC2047
p5-Email-Outlook-Message
p5-Email-Reply
p5-Email-Send
p5-Email-Sender
p5-Email-Sender-Transport-SMTP-TLS
p5-Email-Sender-Transport-SMTPS
p5-Email-Sender-Transport-SQLite
p5-Email-Simple
p5-Email-Simple-FromHandle
p5-Email-Stuffer
p5-Email-Valid
p5-Email-Valid-Loose
p5-FuzzyOcr-devel
p5-GMail-IMAPD
p5-IMAP-Admin
p5-IMAP-Client
p5-IMAP-Sieve
p5-LMAP-CID2SPF
p5-Log-Procmail
p5-Mail-Address-MobileJp
p5-Mail-Alias
p5-Mail-Audit
p5-Mail-Audit-Attach
p5-Mail-AuthenticationResults
p5-Mail-Box
p5-Mail-Box-IMAP4
p5-Mail-Box-IMAP4-SSL
p5-Mail-Box-Parser-C
p5-Mail-Box-POP3
p5-Mail-Bulkmail
p5-Mail-CheckUser
p5-Mail-DeliveryStatus-BounceParser
p5-Mail-DKIM
p5-Mail-DMARC
p5-Mail-DomainKeys
p5-Mail-Ezmlm
p5-Mail-Field-Received
p5-Mail-FilterXML
p5-Mail-Folder
p5-Mail-Freshmeat
p5-Mail-GnuPG
p5-Mail-Graph
p5-Mail-IMAPClient
p5-Mail-IMAPTalk
p5-Mail-ListDetector
p5-Mail-LMLM
p5-Mail-Mbox-MessageParser
p5-Mail-MboxParser
p5-Mail-Message
p5-Mail-OpenDKIM
p5-Mail-OpenRelay-Simple
p5-Mail-POP3Client
p5-Mail-Procmail
p5-Mail-Procmailrc
p5-Mail-RBL
p5-Mail-RFC822-Address
p5-Mail-SendEasy
p5-Mail-Sender
p5-Mail-Sendmail
p5-Mail-SPF
p5-Mail-Spool
p5-Mail-SRS
p5-Mail-Tools
p5-Mail-Transport
p5-Mail-Transport-Dbx
p5-Mail-Verify
p5-Mail-Verp
p5-Mail-Webmail-Gmail
p5-MIME-AltWords
p5-MIME-Charset
p5-MIME-EcoEncode
p5-MIME-EncWords
p5-MIME-Explode
p5-MIME-Fast
p5-MIME-Lite
p5-MIME-Lite-HTML
p5-MIME-Lite-TT
p5-MIME-Lite-TT-HTML
p5-MIME-Tools
p5-MIME-Types
p5-Mojolicious-Plugin-Mail
p5-Net-IMAP-Client
p5-Net-IMAP-Server
p5-Net-IMAP-Simple
p5-Net-IMAP-Simple-SSL
p5-Net-LMTP
p5-Net-ManageSieve
p5-Net-POP3-SSLWrapper
p5-Net-QMTP
p5-Net-SenderBase
p5-Net-Server-Mail
p5-Net-SMTP_auth
p5-Net-SMTP-Server
p5-Net-SMTP-TLS
p5-Net-SMTP-TLS-ButMaintained
p5-Net-SMTPS
p5-Parse-MIME mail/p5-Parse-MIME: Update to 1.005 2021-12-27 09:22:24 +00:00
p5-Parse-Syslog-Mail
p5-POE-Component-Client-POP3
p5-POE-Component-Client-SMTP
p5-POE-Component-SMTP
p5-POE-Filter-Transparent-SMTP
p5-Qmail-Envelope
p5-qpsmtpd
p5-Sendmail-AccessDB
p5-Sendmail-Milter
p5-SES
p5-Sisimai
p5-Test-Email
p5-URI-imap
p5-URI-imaps
p5-WWW-GMail
p5-WWW-Hotmail
panda-cclient
panda-imap Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
pantomime
pathalias
pear-Contact_Vcard_Build
pear-Contact_Vcard_Parse
pear-Horde_Imap_Client
pear-Horde_Kolab_Storage
pear-Horde_ListHeaders
pear-Horde_Mail
pear-Horde_Mail_Autoconfig
pear-Horde_Mapi
pear-Horde_Mime mail/pear-Horde_Mime: Update to 2.11.1 2022-01-08 17:03:51 +01:00
pear-Horde_Mime_Viewer
pear-Horde_Smtp mail/pear-Horde_Smtp: Update to 1.9.6 2022-01-08 17:03:52 +01:00
pear-Mail
pear-Mail_Mbox
pear-Mail_Mime
pear-Mail_mimeDecode
pear-Mail_Queue
pear-MIME_Type
pear-Net_Cyrus
pear-Net_IMAP
pear-Net_LMTP
pecl-mailparse
perdition
pflogsumm
pfqueue
php73-imap
php74-imap
php80-imap
php81-imap Add php81 to the tree 2021-12-28 20:09:08 -06:00
phplist mail/phplist: update to 3.6.6 2021-12-31 16:42:47 +09:00
phpmailer
phpmailer6
pine-pgp-filters
pm-lib
policyd2
popa3d
popa3d-before-sendmail
popcheck
popfile
poppwd
popular
postfinger
postfix
postfix-current
postfix-logwatch
postfix-policyd-sf
postfix-policyd-spf-perl
postfix-policyd-weight
postfix-postfwd
postfixadmin
postfixadmin33
postfixadmin33-lite
postfixadmin-lite
postgrey
postsrsd
prepflog
procmail
proxsmtp
py-afew
py-aiosmtpd
py-alot
py-authheaders
py-authres
py-django-mailbox
py-django-mailman3 mail/py-django-mailman3: Require mail/py-mailmanclient >= 3.3.3 2021-12-05 15:13:58 +00:00
py-dkimpy
py-email_reply_parser
py-email-validator
py-flanker
py-flask-mail
py-flufl.bounce
py-fuglu
py-imapclient
py-mail-parser
py-mailmanclient mail/py-django-mailman3: Require mail/py-mailmanclient >= 3.3.3 2021-12-05 15:13:58 +00:00
py-mailnag
py-mailsuite
py-managesieve3
py-milter
py-notmuch
py-notmuch2 mail/notmuch*: Update to 0.34.2 2021-12-10 20:19:00 -04:00
py-postfix-mta-sts-resolver mail/py-postfix-mta-sts-resolver: Update to 1.1.1 2021-12-27 08:18:48 -10:00
py-premailer
py-Products.SecureMailHost
py-pymailq
py-pysasl
py-pyspf
py-python-slimta
py-pyzmail
py-spf-engine
py-validate_email
pymsgauth
pyzor
qconfirm
qmail
qmail-activedir
qmail-autoresponder
qmail-conf
qmail-contrib
qmail-dk
qmail-mysql
qmail-notify
qmail-qfilter
qmail-rblchk
qmail-remove
qmail-spamcontrol
qmail-tls
qmailadmin
qmailanalog
qmailmrtg7
qmhandle
qpopper
qsf
qsheff
qtools
queue-fix
queue-repair
rainloop
rainloop-community
ratelimit-policyd
raysfilter
razor-agents
rbl-milter
rblcheck
renattach
ripmime
rlytest
rmilter
roundcube mail/roundcube: update to 1.5.2 release. 2022-01-10 11:23:51 +01:00
roundcube-automatic_addressbook mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-calendar-kolab mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-carddav mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-contextmenu mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-html5_notifier mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-identity_smtp
roundcube-login_info mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-mobilecube mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-mvision2 mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-sauserprefs mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-thunderbird_labels mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-twofactor_gauthenticator mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-umich mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-veximaccountadmin mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
roundcube-yubikey_auth mail/roundcube-*: unbreak bulk -a 2022-01-10 13:04:28 +00:00
rspamd
rspamd-devel mail/rspamd-devel: fix build on powerpc64 2021-12-24 21:33:12 +00:00
rss2email3 mail/rss2email3: update to 3.13.1 2021-12-06 20:17:18 +09:00
rubygem-actionmailbox60
rubygem-actionmailbox61
rubygem-actionmailer4
rubygem-actionmailer5
rubygem-actionmailer50
rubygem-actionmailer52
rubygem-actionmailer60
rubygem-actionmailer61
rubygem-email_reply_parser
rubygem-email_reply_parser-discourse
rubygem-email_reply_trimmer
rubygem-exception_notification
rubygem-gitlab-mail_room
rubygem-mail
rubygem-mail_room
rubygem-mailboxer
rubygem-mailfactory
rubygem-mini_mime
rubygem-net-imap
rubygem-net-pop
rubygem-net-smtp
rubygem-pony
rubygem-premailer
rubygem-premailer-rails
rubygem-premailer-rails-rails5
rubygem-premailer-rails-rails52
rubygem-premailer-rails-rails60
rubygem-premailer-rails-rails61
rubygem-rmail
rubygem-roadie
rubygem-roadie3
rubygem-roadie-rails-rails4
rubygem-roadie-rails-rails52
rubygem-ruby-qmail
rubygem-tmail
rubygem-valid_email
rubygem-vmail
s-nail
sa-stats
sa-utils
scam-backscatter
sendmail
sendmail-devel
sendok
sentinel
serialmail
sgwi
sid-milter
sieve-connect
sigrot
simscan
slapd-cyrus
slimta
sma
smfsav
smfsav-devel
smtp-cli
smtpfeed
smtpmail
smtprc
smtprelay
smtptrapd
sortmail
spamass-ixhash
spamass-milter
spamass-rules
spamassassin
spamassassin-devel mail/spamassassin-devel: update to latest github commit 2022-01-03 17:16:18 -08:00
spamassassin-dqs
spambnc
spamcup
spamd
spamdyke
spamguard
spamilter
spampd
spamprobe
spamstats
spfmilter
spfval
spmfilter
spmfilter-clamav
sqlgrey
squirrelmail
squirrelmail-abook_import_export-plugin
squirrelmail-askuserinfo-plugin
squirrelmail-avelsieve-plugin
squirrelmail-calendar_file_backend-plugin
squirrelmail-change_ldappass-plugin
squirrelmail-change_sqlpass-plugin
squirrelmail-check_quota-plugin
squirrelmail-compatibility-plugin
squirrelmail-decode
squirrelmail-email_footer-plugin
squirrelmail-login_auth-plugin
squirrelmail-login_notes-plugin
squirrelmail-mark_read-plugin
squirrelmail-multilogin-plugin
squirrelmail-notes-plugin
squirrelmail-notify-plugin
squirrelmail-password_forget-plugin
squirrelmail-plugins
squirrelmail-pupdate-plugin
squirrelmail-qmailadmin_login-plugin
squirrelmail-quota_usage-plugin
squirrelmail-sasql-plugin
squirrelmail-secure_login-plugin
squirrelmail-shared_calendars-plugin
squirrelmail-spam-buttons-plugin
squirrelmail-squirrel_logger-plugin
squirrelmail-timeout_user-plugin
squirrelmail-translations
squirrelmail-unsafe_image_rules-plugin
squirrelmail-user_special_mailboxes-plugin
squirrelmail-vlogin-plugin
squirrelmail-websearch-plugin
squirrelmail-wetteronline-plugin
sqwebmail
ssmtp
surblhost
swaks
sylpheed
sympa
t-prot
textmail
thunderbird www/firefox: replace 571ee96df4 with upstream fix 2021-12-26 17:09:28 +00:00
thunderbird-dictionaries
tlb
tmpmail
tpop3d
trojita
tumgreyspf
up-imapproxy
usendmail
vacation
vbsfilter
vexim
vmailmgr
vpopmail
vqadmin
vrfy
wanderlust mail/wanderlust: Update to the snapshot on 2022-01-03 2022-01-10 02:16:54 +09:00
websieve
whoson
wmbiff
wmmaiload
x-face-e21
xbuffy
xcite
xfaces
xfce4-mailwatch-plugin
xmail
xmailbox
xmailwatcher
xpbiff
Makefile Add php81 to the tree 2021-12-28 20:09:08 -06:00