git: bcaf25a8c804 - main - Fix CONFLICTS entries of multiple ports
Date: Mon, 10 Jan 2022 15:16:23 UTC
The branch main has been updated by se:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bcaf25a8c8046b094f6b5ab5bc258333bc326ee1
commit bcaf25a8c8046b094f6b5ab5bc258333bc326ee1
Author: Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-01-10 14:20:12 +0000
Commit: Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-01-10 15:15:39 +0000
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)
---
archivers/arc/Makefile | 2 +-
archivers/deco/Makefile | 2 ++
astro/jday/Makefile | 2 ++
audio/csound/Makefile | 2 ++
audio/grip/Makefile | 2 ++
audio/icecast-kh/Makefile | 2 +-
audio/icecast/Makefile | 2 ++
audio/julius/Makefile | 2 ++
benchmarks/ali/Makefile | 2 ++
benchmarks/fio/Makefile | 2 ++
benchmarks/flamegraph/Makefile | 2 ++
benchmarks/iozone/Makefile | 2 ++
benchmarks/iozone21/Makefile | 2 +-
benchmarks/rubygem-derailed_benchmarks/Makefile | 2 ++
benchmarks/rubygem-gitlab-derailed_benchmarks/Makefile | 2 ++
biology/bamutil/Makefile | 2 ++
biology/cufflinks/Makefile | 2 ++
biology/fasta/Makefile | 2 ++
biology/gffread/Makefile | 2 ++
biology/gmap/Makefile | 2 ++
biology/mummer/Makefile | 2 ++
biology/ncbi-blast+/Makefile | 2 ++
biology/ncbi-cxx-toolkit/Makefile | 2 ++
biology/ncbi-entrez-direct/Makefile | 2 ++
biology/ruby-bio/Makefile | 2 ++
biology/rubygem-bio-shell/Makefile | 2 ++
biology/sra-tools/Makefile | 2 ++
cad/cascade-compiler/Makefile | 2 ++
cad/cascade/Makefile | 2 ++
cad/dinotrace/Makefile | 2 ++
cad/fasm/Makefile | 2 ++
chinese/aterm/Makefile | 2 ++
chinese/bitchx/Makefile | 2 ++
chinese/enscript/Makefile | 2 ++
chinese/eterm/Makefile | 2 ++
chinese/fcitx/Makefile | 2 +-
chinese/hc/Makefile | 2 ++
chinese/scim-fcitx/Makefile | 2 ++
comms/hylafax/Makefile | 2 ++
comms/mgetty+sendfax/Makefile | 2 ++
comms/unixcw/Makefile | 2 ++
comms/wsjtx/Makefile | 2 ++
databases/dbf/Makefile | 2 ++
databases/emacsql/Makefile | 3 +++
databases/foundationdb-devel/Makefile | 2 ++
databases/foundationdb/Makefile | 2 ++
databases/freetds-devel/Makefile | 2 +-
databases/freetds/Makefile | 2 ++
databases/galera/Makefile | 2 ++
databases/galera26/Makefile | 2 ++
databases/libcouchbase/Makefile | 2 ++
databases/mariadb104-server/Makefile | 2 +-
databases/mysql55-server/Makefile | 4 ++--
databases/mysql56-server/Makefile | 7 +++----
databases/mysql57-server/Makefile | 7 +++----
databases/mysql80-server/Makefile | 7 +++----
databases/mysqlwsrep56-server/Makefile | 5 ++---
databases/mysqlwsrep57-server/Makefile | 5 ++---
databases/p5-DBD-XBase/Makefile | 2 ++
databases/pear-DB_DataObject/Makefile | 2 ++
databases/pear-DoctrineDBAL/Makefile | 2 ++
databases/pear-Horde_Db/Makefile | 2 ++
databases/percona56-server/Makefile | 2 +-
databases/percona57-server/Makefile | 2 +-
databases/py-alembic/Makefile | 2 ++
databases/py-alembic14/Makefile | 2 ++
databases/rubygem-dbf/Makefile | 2 ++
deskutils/ljclive/Makefile | 2 +-
deskutils/plan/Makefile | 2 ++
devel/aphpbreakdown/Makefile | 2 ++
devel/aphpunit/Makefile | 2 ++
devel/arcanist-lib/Makefile | 2 +-
devel/arduino/Makefile | 2 ++
devel/arm-none-eabi-gcc/Makefile | 2 ++
devel/arm-none-eabi-gcc492/Makefile | 2 ++
devel/autoconf-wrapper/Makefile | 2 ++
devel/b2/Makefile | 2 ++
devel/bam/Makefile | 2 ++
devel/bcc/Makefile | 2 +-
devel/boost_build/Makefile | 2 ++
devel/capnproto/Makefile | 2 ++
devel/capstone4/Makefile | 2 ++
devel/cask/Makefile | 2 ++
devel/chroma/Makefile | 3 +++
devel/cpan-upload/Makefile | 2 ++
devel/cvs+ipv6/Makefile | 2 +-
devel/cvs-devel/Makefile | 2 +-
devel/cvs/Makefile | 2 +-
devel/cweb/Makefile | 2 ++
devel/delta/Makefile | 2 ++
devel/deployer/Makefile | 2 ++
devel/dev86/Makefile | 3 +--
devel/dia2code+/Makefile | 2 ++
devel/dia2code/Makefile | 2 ++
devel/dmake/Makefile | 2 ++
devel/dragon/Makefile | 2 ++
devel/easygit/Makefile | 2 ++
devel/etcd/Makefile | 3 +--
devel/etcd31/Makefile | 3 +--
devel/etcd32/Makefile | 3 +--
devel/etcd33/Makefile | 3 +--
devel/etcd34/Makefile | 3 +--
devel/flex-sdk/Makefile | 2 +-
devel/flex-sdk35/Makefile | 2 +-
devel/generate/Makefile | 2 ++
devel/git-delta/Makefile | 2 +-
devel/glib20/Makefile | 2 ++
devel/go-tools/Makefile | 2 ++
devel/got/Makefile | 2 ++
devel/gradle/Makefile | 3 +++
devel/gradle6/Makefile | 3 +++
devel/gradle62/Makefile | 3 +++
devel/grpc/Makefile | 2 ++
devel/grpc130/Makefile | 2 ++
devel/grpc134/Makefile | 2 ++
devel/horde-content/Makefile | 2 ++
devel/hwloc/Makefile | 2 ++
devel/intel-graphics-compiler/Makefile | 2 +-
devel/ipython/Makefile | 2 ++
devel/ipython5/Makefile | 2 ++
devel/llvm-devel/Makefile | 4 +++-
devel/llvm/Makefile | 2 ++
devel/ocaml-dune/Makefile | 2 ++
devel/p5-App-GitGot/Makefile | 2 ++
devel/p5-CPAN-Uploader/Makefile | 2 ++
devel/p5-Devel-Cover/Makefile | 2 ++
devel/p5-Devel-NYTProf/Makefile | 2 ++
devel/p5-Dist-Joseki/Makefile | 2 ++
devel/p5-File-DirSync/Makefile | 2 ++
devel/p5-Set-CrossProduct/Makefile | 2 ++
devel/pear-HTML_Template_PHPLIB/Makefile | 2 ++
devel/pear-Horde_Autoloader_Cache/Makefile | 2 ++
devel/pear-Horde_Prefs/Makefile | 2 ++
devel/pear-Var_Dump/Makefile | 2 ++
devel/php-composer/Makefile | 2 +-
devel/php-composer2/Makefile | 2 +-
devel/psptoolchain-pspsdk-stage2/Makefile | 2 ++
devel/py-Faker/Makefile | 2 ++
devel/py-cachecontrol/Makefile | 2 ++
devel/py-circuits/Makefile | 2 ++
devel/py-datadog/Makefile | 2 ++
devel/py-dateutils/Makefile | 2 ++
devel/py-fabric/Makefile | 2 +-
devel/py-fabric3/Makefile | 2 ++
devel/py-jsondiff/Makefile | 2 ++
devel/py-jsonpatch/Makefile | 3 +++
devel/py-jsonschema/Makefile | 2 ++
devel/py-jsonschema3/Makefile | 2 ++
devel/py-python-gist/Makefile | 2 ++
devel/rcs/Makefile | 2 ++
devel/rcs57/Makefile | 2 +-
devel/rubygem-faker/Makefile | 2 ++
devel/sasm/Makefile | 2 ++
devel/shapelib/Makefile | 2 ++
devel/subversion-lts/Makefile | 4 +---
devel/subversion/Makefile | 4 +---
devel/tex-web2c/Makefile | 2 ++
devel/util-linux/Makefile | 2 +-
devel/zapcc/Makefile | 2 ++
dns/bind9-devel/Makefile | 2 +-
dns/bind911/Makefile | 4 ++--
dns/bind916/Makefile | 2 +-
dns/c-ares/Makefile | 2 +-
dns/dog/Makefile | 2 ++
dns/gdnsd2/Makefile | 2 +-
dns/gdnsd3/Makefile | 2 +-
editors/bpatch/Makefile | 2 ++
editors/editorconfig-core-c/Makefile | 2 ++
editors/helix/Makefile | 2 ++
editors/jed/Makefile | 2 +-
editors/joe/Makefile | 2 +-
editors/jupp/Makefile | 2 +-
editors/py-editorconfig/Makefile | 2 ++
emulators/cpmtools/Makefile | 2 ++
emulators/hugo/Makefile | 2 ++
emulators/qemu5/Makefile | 6 ++++--
emulators/simh-hp2100/Makefile | 2 +-
emulators/simh/Makefile | 2 ++
emulators/virtualbox-ose-kmod-legacy/Makefile | 3 +--
emulators/virtualbox-ose-kmod/Makefile | 3 +--
emulators/wine/Makefile | 2 +-
emulators/yaze-ag/Makefile | 2 ++
emulators/z80pack/Makefile | 2 ++
finance/py-pycoin/Makefile | 2 ++
games/arx-libertatis/Makefile | 2 ++
games/block/Makefile | 3 +++
games/brogue/Makefile | 3 +++
games/bzflag-server/Makefile | 2 +-
games/bzflag/Makefile | 1 +
games/cake/Makefile | 2 ++
games/chroma/Makefile | 2 ++
games/filters/Makefile | 2 +-
games/julius/Makefile | 2 ++
games/linux-enemyterritory/Makefile | 2 ++
games/lolcat/Makefile | 2 +-
graphics/ImageMagick6/Makefile | 5 ++---
graphics/ImageMagick7/Makefile | 7 +++----
graphics/atril/Makefile | 2 ++
graphics/curator/Makefile | 2 ++
graphics/darktable/Makefile | 2 ++
graphics/darktable38/Makefile | 2 ++
graphics/dcraw/Makefile | 2 ++
graphics/evince/Makefile | 2 ++
graphics/exiftran/Makefile | 2 ++
graphics/fly/Makefile | 2 +-
graphics/gd/Makefile | 2 +-
graphics/giflib/Makefile | 2 ++
graphics/giftool/Makefile | 2 ++
graphics/graphviz/Makefile | 3 +++
graphics/grx/Makefile | 2 ++
graphics/ida/Makefile | 2 ++
graphics/imv/Makefile | 2 ++
graphics/jpeg-turbo/Makefile | 2 +-
graphics/linux-c7-libglvnd/Makefile | 2 ++
graphics/mozjpeg/Makefile | 2 ++
graphics/py-fiona/Makefile | 2 ++
graphics/ufraw/Makefile | 2 ++
graphics/wdune/Makefile | 3 +++
graphics/xv/Makefile | 3 +++
irc/atheme-services/Makefile | 2 ++
irc/bitchx/Makefile | 2 ++
irc/dancer/Makefile | 2 ++
irc/ergo/Makefile | 2 ++
irc/ircd-hybrid/Makefile | 2 ++
irc/ircd-ratbox-devel/Makefile | 2 +-
irc/ircd-ratbox/Makefile | 2 +-
japanese/ack/Makefile | 2 +-
japanese/eterm/Makefile | 2 ++
japanese/gawk/Makefile | 2 ++
japanese/groff/Makefile | 2 +-
japanese/jed/Makefile | 2 ++
japanese/kon2-16dot/Makefile | 2 ++
japanese/mh/Makefile | 2 +-
japanese/plan/Makefile | 2 ++
java/intellij-ultimate/Makefile | 2 +-
java/intellij/Makefile | 2 +-
lang/bsh/Makefile | 3 +++
lang/ccl/Makefile | 2 ++
lang/cling/Makefile | 2 ++
lang/cython-devel/Makefile | 2 ++
lang/cython/Makefile | 2 ++
lang/elixir-devel/Makefile | 2 +-
lang/elixir/Makefile | 2 ++
lang/elm/Makefile | 2 ++
lang/fasm/Makefile | 2 ++
lang/gawk/Makefile | 2 ++
lang/gcc10-devel/Makefile | 2 +-
lang/gcc10/Makefile | 2 +-
lang/gcc11-devel/Makefile | 2 +-
lang/gcc11/Makefile | 2 +-
lang/gcc9-devel/Makefile | 2 +-
lang/gcc9/Makefile | 2 +-
lang/guile2/Makefile | 2 +-
lang/linux-j/Makefile | 2 ++
lang/mono/Makefile | 2 +-
lang/mono5.10/Makefile | 2 +-
lang/mono5.20/Makefile | 2 +-
lang/mono6.8/Makefile | 2 +-
lang/yorick/Makefile | 2 ++
mail/archiveopteryx-devel/Makefile | 2 ++
mail/archiveopteryx/Makefile | 2 ++
mail/avenger/Makefile | 2 ++
mail/bogofilter-kc/Makefile | 2 +-
mail/bogofilter-lmdb/Makefile | 2 +-
mail/bogofilter-sqlite/Makefile | 2 +-
mail/bogofilter/Makefile | 3 +--
mail/crm114/Makefile | 2 ++
mail/cyrus-imapd23/Makefile | 3 +--
mail/cyrus-imapd24/Makefile | 3 +--
mail/cyrus-imapd25/Makefile | 3 +--
mail/cyrus-imapd30/Makefile | 2 +-
mail/cyrus-imapd32/Makefile | 2 +-
mail/cyrus-imapd34/Makefile | 2 +-
mail/elm/Makefile | 2 ++
mail/ezmlm-idx/Makefile | 2 +-
mail/horde-imp/Makefile | 2 ++
mail/horde-ingo/Makefile | 2 ++
mail/imap-uw/Makefile | 2 +-
mail/mailutils/Makefile | 2 ++
mail/mew-devel/Makefile | 2 ++
mail/mew/Makefile | 2 ++
mail/mmh/Makefile | 2 +-
mail/nmh/Makefile | 2 +-
mail/panda-imap/Makefile | 2 +-
math/calc/Makefile | 2 ++
math/cbc/Makefile | 2 ++
math/coq/Makefile | 2 ++
math/disco/Makefile | 2 ++
math/gexpr/Makefile | 2 ++
math/latte-integrale/Makefile | 2 +-
math/p5-Math-SigFigs/Makefile | 2 ++
math/topcom/Makefile | 2 ++
misc/bdelta/Makefile | 2 ++
misc/clpbar/Makefile | 2 ++
misc/concourse/Makefile | 2 ++
misc/cpuid/Makefile | 2 ++
misc/deco/Makefile | 2 ++
misc/gplink/Makefile | 2 ++
misc/hxtools/Makefile | 2 ++
misc/jojodiff/Makefile | 2 ++
misc/lifelines/Makefile | 2 ++
misc/rubygem-dotenv/Makefile | 2 ++
multimedia/cclive/Makefile | 2 ++
multimedia/clive/Makefile | 4 ++--
multimedia/dragon/Makefile | 2 ++
multimedia/gdialog/Makefile | 2 ++
net-mgmt/carbonzipper/Makefile | 2 ++
net-mgmt/cnagios/Makefile | 2 ++
net-mgmt/crmsh/Makefile | 2 ++
net-mgmt/disco/Makefile | 2 ++
net-mgmt/icingaweb2/Makefile | 2 ++
net-p2p/btcheck/Makefile | 2 ++
net-p2p/ed2k/Makefile | 2 +-
net-p2p/libbt/Makefile | 2 ++
net-p2p/shx/Makefile | 2 ++
net/bosh-cli/Makefile | 2 ++
net/cf/Makefile | 2 ++
net/clusterit/Makefile | 2 ++
net/concourse-fly/Makefile | 2 +-
net/eternalterminal/Makefile | 2 ++
net/freeradius3/Makefile | 3 +--
net/go-cs/Makefile | 2 ++
net/keycloak/Makefile | 2 ++
net/kget/Makefile | 2 ++
net/netatalk3/Makefile | 2 +-
net/pear-Net_URL_Mapper/Makefile | 2 ++
net/py-ripe.atlas.tools/Makefile | 2 ++
net/samba412/Makefile | 2 +-
net/samba413/Makefile | 2 +-
news/cnews/Makefile | 2 ++
news/s-news/Makefile | 2 +-
news/trn/Makefile | 2 +-
news/trn4/Makefile | 2 +-
print/cups-filters/Makefile | 2 +-
print/detex/Makefile | 2 ++
print/dvi2tty/Makefile | 2 +-
print/enscript-a4/Makefile | 2 +-
print/enscript-letter/Makefile | 2 +-
print/enscript-letterdj/Makefile | 2 +-
print/ghostscript7-base/Makefile | 7 +------
print/ghostscript8-base/Makefile | 7 +------
print/ghostscript9-base/Makefile | 7 +------
print/html2ps/Makefile | 2 ++
print/hyperlatex/Makefile | 2 ++
print/lilypond-devel/Makefile | 2 ++
print/lilypond/Makefile | 2 ++
print/mp-a4/Makefile | 2 ++
print/mp-letter/Makefile | 2 ++
print/pdf-tools/Makefile | 2 ++
print/py-fonttools/Makefile | 2 ++
print/py-fonttools3/Makefile | 2 ++
print/texlive-base/Makefile | 2 +-
print/transfig/Makefile | 2 ++
science/ergo/Makefile | 2 ++
science/ghmm/Makefile | 2 ++
science/silo/Makefile | 2 ++
security/barnyard2-sguil/Makefile | 2 ++
security/barnyard2/Makefile | 2 ++
security/certmgr/Makefile | 2 ++
security/cowrie/Makefile | 2 ++
security/dirmngr/Makefile | 2 ++
security/gnupg/Makefile | 2 +-
security/gpgdir/Makefile | 2 ++
security/heimdal/Makefile | 3 +--
security/idea/Makefile | 2 ++
security/keychain/Makefile | 2 ++
security/krb5-117/Makefile | 3 +--
security/krb5-118/Makefile | 3 +--
security/krb5-119/Makefile | 3 +--
security/krb5-devel/Makefile | 3 +--
security/openssl-devel/Makefile | 2 +-
security/openssl/Makefile | 2 +-
security/outguess/Makefile | 2 +-
security/pear-Crypt_GPG/Makefile | 2 ++
security/signing-party/Makefile | 2 +-
shells/fd/Makefile | 2 ++
shells/heirloom-sh/Makefile | 3 +++
sysutils/LPRng/Makefile | 2 +-
sysutils/barrier/Makefile | 2 ++
sysutils/cdrkit/Makefile | 2 +-
sysutils/cdrtools/Makefile | 2 +-
sysutils/cfengine-devel/Makefile | 4 +---
sysutils/cfengine316/Makefile | 3 +--
sysutils/cfengine317/Makefile | 3 +--
sysutils/cfengine318/Makefile | 3 +--
sysutils/cfengine319/Makefile | 3 +--
sysutils/coreutils/Makefile | 2 ++
sysutils/cw/Makefile | 2 ++
sysutils/daemontools/Makefile | 2 +-
sysutils/dateutils/Makefile | 2 ++
sysutils/docker/Makefile | 2 ++
sysutils/e2fsprogs/Makefile | 2 ++
sysutils/facter/Makefile | 2 +-
sysutils/freedt/Makefile | 2 +-
sysutils/hared/Makefile | 2 +-
sysutils/hextools/Makefile | 2 ++
sysutils/iocage-devel/Makefile | 2 +-
sysutils/iocage/Makefile | 2 +-
sysutils/isc-cron/Makefile | 2 ++
sysutils/lbl-cf/Makefile | 2 ++
sysutils/mcron/Makefile | 3 +++
sysutils/nq/Makefile | 3 +++
sysutils/p5-Giovanni/Makefile | 2 ++
sysutils/pdsh/Makefile | 3 +++
sysutils/pear-Horde_Vfs/Makefile | 2 ++
sysutils/py-ansible-base/Makefile | 2 +-
sysutils/py-ansible-core/Makefile | 2 +-
sysutils/radmind/Makefile | 2 ++
sysutils/renameutils/Makefile | 2 ++
sysutils/rubygem-bundler/Makefile | 2 ++
sysutils/rubygem-facter/Makefile | 2 ++
sysutils/rubygem-god/Makefile | 2 ++
sysutils/rubygem-hieracles/Makefile | 3 +++
sysutils/sanoid-devel/Makefile | 2 ++
sysutils/sanoid/Makefile | 2 ++
sysutils/schilyutils/Makefile | 2 +-
sysutils/ucspi-tcp/Makefile | 2 ++
textproc/agrep/Makefile | 2 ++
textproc/align/Makefile | 2 ++
textproc/bar/Makefile | 3 +++
textproc/bib2html/Makefile | 2 ++
textproc/bibutils/Makefile | 2 ++
textproc/btparse/Makefile | 2 ++
textproc/cmark/Makefile | 2 ++
textproc/dict/Makefile | 2 ++
textproc/docbook-utils/Makefile | 2 +-
textproc/dtdparse/Makefile | 2 ++
textproc/ebook-tools/Makefile | 2 ++
textproc/groff/Makefile | 2 +-
textproc/heirloom-doctools/Makefile | 3 +++
textproc/hs-yaml/Makefile | 2 ++
textproc/htdig/Makefile | 2 ++
textproc/html2text/Makefile | 2 +-
textproc/html2xhtml/Makefile | 2 ++
textproc/irstlm/Makefile | 3 +++
textproc/java2html/Makefile | 3 +++
textproc/libextractor/Makefile | 2 ++
textproc/mifluz/Makefile | 2 ++
textproc/p5-DocSet/Makefile | 2 ++
textproc/p5-HTML-HTML5-Parser/Makefile | 2 ++
textproc/p5-SGML-DTDParse/Makefile | 2 ++
textproc/p5-Text-BibTeX/Makefile | 2 ++
textproc/p5-XML-Driver-HTML/Makefile | 2 ++
textproc/pear-Text_Highlighter/Makefile | 2 ++
textproc/py-asciinema/Makefile | 2 ++
textproc/py-elasticsearch-curator/Makefile | 2 ++
textproc/py-html2text/Makefile | 2 +-
textproc/py-html2text2018/Makefile | 2 +-
textproc/rnv/Makefile | 2 ++
textproc/rubygem-amatch/Makefile | 2 ++
textproc/rubygem-diff-lcs/Makefile | 2 ++
textproc/rubygem-github-markup/Makefile | 2 ++
textproc/rubygem-github-markup17/Makefile | 2 ++
textproc/source-highlight/Makefile | 2 ++
textproc/sowing/Makefile | 3 +++
textproc/sphinxsearch/Makefile | 2 ++
www/apache24/Makefile | 2 ++
www/carbonapi/Makefile | 2 ++
www/clearsilver/Makefile | 2 ++
www/drush/Makefile | 2 ++
www/geneweb/Makefile | 2 ++
www/gist/Makefile | 2 +-
www/gohugo/Makefile | 2 ++
www/goose/Makefile | 3 +++
www/grafana6/Makefile | 2 ++
www/grafana7/Makefile | 2 ++
www/grafana8/Makefile | 2 ++
www/h2o-devel/Makefile | 2 +-
www/horde-ansel/Makefile | 2 ++
www/horde-base/Makefile | 2 ++
www/htdump/Makefile | 2 ++
www/interchange/Makefile | 2 ++
www/mnogosearch/Makefile | 2 +-
www/p5-App-gist/Makefile | 2 +-
www/p5-Dancer/Makefile | 2 ++
www/p5-HTML-Diff/Makefile | 2 ++
www/pear-Horde_Service_Weather/Makefile | 2 ++
www/py-cachecontrol/Makefile | 2 ++
www/py-django22/Makefile | 3 +--
www/py-python-dotenv/Makefile | 2 ++
www/rubygem-jekyll/Makefile | 2 ++
www/rubygem-jekyll3/Makefile | 2 ++
x11-clocks/asclock-xlib/Makefile | 2 ++
x11-clocks/asclock/Makefile | 2 +-
x11-fm/deforaos-browser/Makefile | 2 ++
x11-wm/fvwm3/Makefile | 2 +-
x11/aterm/Makefile | 2 ++
x11/docker-tray/Makefile | 2 ++
x11/eterm/Makefile | 2 ++
x11/nvidia-driver/Makefile | 1 +
x11/zenity/Makefile | 2 +-
491 files changed, 868 insertions(+), 220 deletions(-)
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index fad2f9cd8521..42eafe903187 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -10,7 +10,7 @@ COMMENT= Create & extract files from DOS .ARC files
LICENSE= GPLv2
-CONFLICTS= php5-arcanist
+CONFLICTS_INSTALL= arcanist-php73 arcanist-php74 arcanist-php80
OPTIONS_DEFINE= DOCS
diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
index 392d995029eb..3d50665310a6 100644
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@@ -28,6 +28,8 @@ RUN_DEPENDS= arc:archivers/arc \
zoo:archivers/zoo \
flac:audio/flac
+CONFLICTS= deco-misc # bin/deco
+
DARCHIVE_VER= 1.7
DARCHIVE= deco-archive-${DARCHIVE_VER}
diff --git a/astro/jday/Makefile b/astro/jday/Makefile
index 38a20d8a32b7..ee817e4e2024 100644
--- a/astro/jday/Makefile
+++ b/astro/jday/Makefile
@@ -12,6 +12,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
+CONFLICTS_INSTALL= netatalk3
+
PLIST_FILES= bin/dbd bin/j2d bin/jday \
include/jday.h lib/libjday.a \
lib/libjday.so lib/libjday.so.2 \
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 105c45c557aa..8ab6dc4eca5a 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -23,6 +23,8 @@ USE_LDCONFIG= yes
CPE_VENDOR= csounds
+CONFLICTS_INSTALL= clearsilver go-cs libextractor outguess
+
CFLAGS_powerpc= -maltivec
CFLAGS_powerpcspe= -DPFFFT_SIMD_DISABLE
CFLAGS_powerpc64= -maltivec
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 690d44b25508..21c568344d4b 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -24,6 +24,8 @@ USE_XORG= ice sm x11 xext
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-werror
+CONFLICTS_INSTALL= py*-grip
+
OPTIONS_DEFINE= CDDA2WAV CDPARANOIA FAAC FLAC LAME NLS VORBIS
OPTIONS_DEFAULT= CDPARANOIA FLAC VORBIS
diff --git a/audio/icecast-kh/Makefile b/audio/icecast-kh/Makefile
index 4d75dce28f96..0e30c39aaee0 100644
--- a/audio/icecast-kh/Makefile
+++ b/audio/icecast-kh/Makefile
@@ -23,7 +23,7 @@ GH_PROJECT= icecast-kh
USE_GNOME= libxml2 libxslt
USE_RC_SUBR= icecast
-CONFLICTS_INSTALL= icecast icecast2
+CONFLICTS_INSTALL= icecast
GNU_CONFIGURE= yes
CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE}
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index d1cbff162fde..9cb6f3d6e60f 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -31,6 +31,8 @@ USE_GNOME= libxml2 libxslt
GNU_CONFIGURE= yes
USE_RC_SUBR= icecast
+CONFLICTS_INSTALL= icecast-kh
+
SUB_FILES= pkg-message
CPE_VENDOR= xiph
diff --git a/audio/julius/Makefile b/audio/julius/Makefile
index 3a254d11b624..7fefb54b5703 100644
--- a/audio/julius/Makefile
+++ b/audio/julius/Makefile
@@ -16,6 +16,8 @@ GNU_CONFIGURE= yes
USES= iconv perl5 shebangfix
SHEBANG_FILES= jclient-perl/jclient.pl
+INSTALL_CONFLICTS= generate julius-caesariii php*-pear-Text_Highlighter
+
CONFIGURE_ENV= ac_cv_path_PERL=${PERL}
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -Wno-return-type
diff --git a/benchmarks/ali/Makefile b/benchmarks/ali/Makefile
index 7cc3209bdcbb..e165c7bc41dc 100644
--- a/benchmarks/ali/Makefile
+++ b/benchmarks/ali/Makefile
@@ -38,6 +38,8 @@ GH_TUPLE= davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-sp
uber-go:atomic:v1.9.0:uber_go_atomic/vendor/go.uber.org/atomic \
uber-go:goleak:v1.1.12:uber_go_goleak/vendor/go.uber.org/goleak
+CONFLICTS_INSTALL= ja-mh mmh nmh
+
PLIST_FILES= bin/ali
.include <bsd.port.mk>
diff --git a/benchmarks/fio/Makefile b/benchmarks/fio/Makefile
index 06c393177ec6..9bc3086c054b 100644
--- a/benchmarks/fio/Makefile
+++ b/benchmarks/fio/Makefile
@@ -21,6 +21,8 @@ GNUPLOT_DESC= Support for plotting graphs
GNUPLOT_BUILD_DEPENDS= ${LOCALBASE}/bin/gnuplot:math/gnuplot
+CONFLICTS_INSTALL= py*-Fiona
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/fio ${STAGEDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/tools/fio_generate_plots ${STAGEDIR}${PREFIX}/bin
diff --git a/benchmarks/flamegraph/Makefile b/benchmarks/flamegraph/Makefile
index a8fda4958834..e781fcb0fd42 100644
--- a/benchmarks/flamegraph/Makefile
+++ b/benchmarks/flamegraph/Makefile
@@ -22,6 +22,8 @@ GH_TAGNAME= 810687f
NO_BUILD= yes
+CONFLICTS_INSTALL= p5-Devel-NYTProf
+
SHEBANG_FILES= *.php *.pl *.py *.sh
SOURCE_FILES= aix-perf.pl \
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 22fe1205bc97..80ed9ef93023 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -19,6 +19,8 @@ MAKE_ARGS= ${MAKE_ENV}
ALL_TARGET= freebsd
MAKE_JOBS_UNSAFE= yes
+CONFLICTS_INSTALL= iozone21
+
PLIST_FILES= bin/iozone man/man1/iozone.1.gz
OPTIONS_DEFINE= SSH THREADS
diff --git a/benchmarks/iozone21/Makefile b/benchmarks/iozone21/Makefile
index 8bad1fd58ff0..bca0d4306882 100644
--- a/benchmarks/iozone21/Makefile
+++ b/benchmarks/iozone21/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX= 21
MAINTAINER= ports@FreeBSD.org
COMMENT= Performance Test of Sequential File I/O (older version)
-CONFLICTS= iozone-3.*
+CONFLICTS_INSTALL= iozone
PLIST_FILES= bin/iozone \
man/man1/iozone.1.gz
diff --git a/benchmarks/rubygem-derailed_benchmarks/Makefile b/benchmarks/rubygem-derailed_benchmarks/Makefile
index f5ac7074ee91..929dd557c780 100644
--- a/benchmarks/rubygem-derailed_benchmarks/Makefile
+++ b/benchmarks/rubygem-derailed_benchmarks/Makefile
@@ -24,6 +24,8 @@ RUN_DEPENDS= rubygem-benchmark-ips>=2.0.0:benchmarks/rubygem-benchmark-ips \
USES= gem
USE_RUBY= yes
+CONFLICTS_INSTALL= rubygem-gitlab-derailed_benchmarks
+
NO_ARCH= yes
PLIST_FILES= bin/derailed
diff --git a/benchmarks/rubygem-gitlab-derailed_benchmarks/Makefile b/benchmarks/rubygem-gitlab-derailed_benchmarks/Makefile
index 10400cca98d2..f26f0d0f643a 100644
--- a/benchmarks/rubygem-gitlab-derailed_benchmarks/Makefile
+++ b/benchmarks/rubygem-gitlab-derailed_benchmarks/Makefile
@@ -22,6 +22,8 @@ RUN_DEPENDS= rubygem-benchmark-ips>=2.0.0:benchmarks/rubygem-benchmark-ips \
USES= gem
USE_RUBY= yes
+CONFLICTS_INSTALL= rubygem-derailed_benchmarks
+
NO_ARCH= yes
PLIST_FILES= bin/derailed
diff --git a/biology/bamutil/Makefile b/biology/bamutil/Makefile
index 763620406776..17e8902bc633 100644
--- a/biology/bamutil/Makefile
+++ b/biology/bamutil/Makefile
@@ -21,6 +21,8 @@ GH_TUPLE= statgen:libStatGen:v${DISTVERSION}:statgen/libStatGen
MAKE_ENV= LIB_PATH_GENERAL=${WRKSRC}/libStatGen
MAKE_ENV+= INSTALLDIR=${STAGEDIR}${PREFIX}/bin
+CONFLICTS_INSTALL= bam
+
PLIST_FILES= bin/bam
.include <bsd.port.mk>
diff --git a/biology/cufflinks/Makefile b/biology/cufflinks/Makefile
index 0de2dda73fec..dcf25bfdf010 100644
--- a/biology/cufflinks/Makefile
+++ b/biology/cufflinks/Makefile
@@ -26,6 +26,8 @@ GH_ACCOUNT= cole-trapnell-lab
CXXFLAGS+= -I${LOCALBASE}/include/eigen3
CFLAGS+= -I${LOCALBASE}/include/eigen3 # https://github.com/cole-trapnell-lab/cufflinks/issues/113
+CONFLICTS_INSTALL= gffread
+
PLIST_FILES= bin/compress_gtf \
bin/cuffcompare \
bin/cuffdiff \
diff --git a/biology/fasta/Makefile b/biology/fasta/Makefile
index a9fe7d45afc9..60042b88afb2 100644
--- a/biology/fasta/Makefile
+++ b/biology/fasta/Makefile
@@ -16,6 +16,8 @@ LICENSE_NAME= fasta
LICENSE_TEXT= May not be sold or incorporated into a commercial product
LICENSE_PERMS= dist-mirror pkg-mirror auto-accept
+CONFLICTS_INSTALL= align
+
WRKSRC= ${WRKDIR}/fasta
SUB_FILES= pkg-message
diff --git a/biology/gffread/Makefile b/biology/gffread/Makefile
index 01b7bee64778..c4d6cc13f33e 100644
--- a/biology/gffread/Makefile
+++ b/biology/gffread/Makefile
@@ -17,6 +17,8 @@ GH_TUPLE= gpertea:gclib:v${DISTVERSION}:gpertea/gclib
INSTALL_TARGET= install-strip
+CONFLICTS_INSTALL= cufflinks
+
PLIST_FILES= bin/gffread
.include <bsd.port.mk>
diff --git a/biology/gmap/Makefile b/biology/gmap/Makefile
index 4df2c1d04b73..aa4abd068733 100644
--- a/biology/gmap/Makefile
+++ b/biology/gmap/Makefile
@@ -20,6 +20,8 @@ ONLY_FOR_ARCHS_REASON= upstream supports only x86 and possibly POWER8
USES= gmake perl5
GNU_CONFIGURE= yes
+CONFLICTS_INSTALL= cpuid
+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C|\.|-|g}
CFLAGS+= -fcommon
diff --git a/biology/mummer/Makefile b/biology/mummer/Makefile
index caf51c66a7a7..dc7f8d7da666 100644
--- a/biology/mummer/Makefile
+++ b/biology/mummer/Makefile
@@ -22,6 +22,8 @@ USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME}4
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= ??-libgd libgd
+
SHEBANG_FILES= scripts/*.pl
perl_OLD_CMD= __PERL_PATH
_SHEBANG_REINPLACE_ARGS+= -e "s|__BIN_DIR|${PREFIX}/bin|g;s|__AUX_BIN_DIR|${PREFIX}/libexec/mummer|g;s|__SCRIPT_DIR|${PREFIX}/libexec/mummer|g"
diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
index af93abad15fd..83bfefbc177f 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -48,6 +48,8 @@ GNU_CONFIGURE= yes
# a postinstall mv.
CONFIGURE_ARGS= AR="ar cr" --without-boost --libdir=${PREFIX}/lib/ncbi-tools++
+CONFLICTS_INSTALL= ncbi-cxx-toolkit
+
WRKSRC_SUBDIR= c++
.include <bsd.port.pre.mk>
diff --git a/biology/ncbi-cxx-toolkit/Makefile b/biology/ncbi-cxx-toolkit/Makefile
index 8163459800e2..40f24bc66bed 100644
--- a/biology/ncbi-cxx-toolkit/Makefile
+++ b/biology/ncbi-cxx-toolkit/Makefile
@@ -25,6 +25,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-debug --with-dll --without-static \
--without-vdb
+CONFLICTS_INSTALL= ncbi-blast+
+
post-install:
# strip
@${FIND} ${STAGEDIR}${PREFIX}/bin -type f | ${GREP} -v -E '\.(sh|py|pl)$$' | ${XARGS} ${STRIP_CMD}
diff --git a/biology/ncbi-entrez-direct/Makefile b/biology/ncbi-entrez-direct/Makefile
index 7ece210acd5e..d8a3e4539918 100644
--- a/biology/ncbi-entrez-direct/Makefile
+++ b/biology/ncbi-entrez-direct/Makefile
@@ -20,6 +20,8 @@ RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
USES= go:modules perl5 shebangfix
USE_GITHUB= nodefault
+CONFLICTS_INSTALL= ebook-tools
+
# Dependency versions:
# make clean extract
# cd ${WRKSRC}/cmd
diff --git a/biology/ruby-bio/Makefile b/biology/ruby-bio/Makefile
index 59f60cc2f1f6..e31ea80c5529 100644
--- a/biology/ruby-bio/Makefile
+++ b/biology/ruby-bio/Makefile
@@ -28,6 +28,8 @@ BDB4_RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb
MYSQL_RUN_DEPENDS= rubygem-dbd-mysql>=0:databases/rubygem-dbd-mysql
PGSQL_RUN_DEPENDS= rubygem-dbd-pg>=0:databases/rubygem-dbd-pg
+CONFLICTS_INSTALL= rubygem-bio-shell
+
post-patch:
${RUBY} -i -pe 'gsub(%r"(/etc/bioinformatics/)") { "${PREFIX}" + $$1 }' \
${WRKSRC}/doc/Tutorial.rd \
diff --git a/biology/rubygem-bio-shell/Makefile b/biology/rubygem-bio-shell/Makefile
index bc241a93978e..f4355c04e763 100644
--- a/biology/rubygem-bio-shell/Makefile
+++ b/biology/rubygem-bio-shell/Makefile
@@ -20,6 +20,8 @@ USE_RUBY= yes
NO_ARCH= yes
+CONFLICTS_INSTALL= ruby??-bio
+
PLIST_FILES= bin/bioruby
.include <bsd.port.mk>
diff --git a/biology/sra-tools/Makefile b/biology/sra-tools/Makefile
index 0b6a54bd67ca..91b15622dd03 100644
--- a/biology/sra-tools/Makefile
+++ b/biology/sra-tools/Makefile
@@ -45,6 +45,8 @@ FREEBSD_RELEASE= uname -r | cut -d - -f 1
CFLAGS+= -I${WRKSRC}/interfaces/os/sun
CXXFLAGS+= -I${WRKSRC}/interfaces/os/sun
+CONFLICTS_INSTALL= kget
+
BINARY_ALIAS= gcc=${CC} g++=${CXX}
# for port developers, building with these options may fail
diff --git a/cad/cascade-compiler/Makefile b/cad/cascade-compiler/Makefile
index 4d941e949203..0ebdc81fc278 100644
--- a/cad/cascade-compiler/Makefile
+++ b/cad/cascade-compiler/Makefile
@@ -23,6 +23,8 @@ MAKE_ENV= FREEBSD_WRKSRC=${WRKSRC} FREEBSD_LOCALBASE=${LOCALBASE}
CMAKE_OFF= BUILD_TESTING
+CONFLICTS_INSTALL= cascade
+
BINARY_ALIAS= flex=${FILESDIR}/flex flex.real=${LOCALBASE}/bin/flex bison=${LOCALBASE}/bin/bison
post-patch:
diff --git a/cad/cascade/Makefile b/cad/cascade/Makefile
index 88b02b35f20f..f171e97d22b7 100644
--- a/cad/cascade/Makefile
+++ b/cad/cascade/Makefile
@@ -14,6 +14,8 @@ PORTDOCS= ex1.gif index.html
PORTEXAMPLES= README.examples ex1.cas ex1.gif ex1.out cascade-mode.el
PLIST_FILES= bin/cascade man/man1/cascade.1.gz
+CONFLICTS_INSTALL= cascade-compiler
+
OPTIONS_DEFINE= DOCS EXAMPLES
do-install:
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 2b93f5811120..52f4d95ff799 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -19,6 +19,8 @@ USE_PERL5= build
GNU_CONFIGURE= yes
+CONFLICTS_INSTALL= dinotrace dinotrace-emacs_*
+
INFO= dinotrace
PLIST_FILES= bin/dinotrace
diff --git a/cad/fasm/Makefile b/cad/fasm/Makefile
index 957347da0522..f22305ea322a 100644
--- a/cad/fasm/Makefile
+++ b/cad/fasm/Makefile
@@ -19,4 +19,6 @@ USE_PYTHON= distutils concurrent noflavors autoplist
NO_ARCH= yes
+CONFLICTS_INSTALL= fasm SASM
+
.include <bsd.port.mk>
diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile
index d95fe35af3ec..3b39cce70865 100644
--- a/chinese/aterm/Makefile
+++ b/chinese/aterm/Makefile
@@ -14,6 +14,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-xim --enable-big5
MAKE_JOBS_UNSAFE= yes
+CONFLICTS_INSTALL= aterm
+
PLIST_FILES= "@(,,4711) bin/aterm" \
man/man1/aterm.1.gz
diff --git a/chinese/bitchx/Makefile b/chinese/bitchx/Makefile
index bbf74cff0100..8dffc33f5005 100644
--- a/chinese/bitchx/Makefile
+++ b/chinese/bitchx/Makefile
@@ -11,6 +11,8 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-source__input.c \
${.CURDIR}/files/patch-include__config.h \
${.CURDIR}/files/patch-source__screen.c
+CONFLICTS_INSTALL= bitchx
+
OPTIONS_SLAVE= LATIN
.include "${MASTERDIR}/Makefile"
diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile
index 2a7b5a338247..da03bf342cc9 100644
--- a/chinese/enscript/Makefile
+++ b/chinese/enscript/Makefile
@@ -16,6 +16,8 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
USES+= ghostscript:run
+CONFLICTS_INSTALL= enscript-a4 enscript-letter enscript-letterdj
+
post-patch:
@${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist
@${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist
diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile
index c13290728b35..764533d80514 100644
--- a/chinese/eterm/Makefile
+++ b/chinese/eterm/Makefile
@@ -14,6 +14,8 @@ CONFIGURE_ARGS= --enable-trans --enable-utmp \
--with-backspace=bs --without-terminfo \
--enable-multi-charset=big5
+CONFLICTS_INSTALL= eterm ja-eterm
+
PKGDIR= ${.CURDIR}
PLIST= ${MASTERDIR}/pkg-plist
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
*** 6013 LINES SKIPPED ***