From bcaf25a8c8046b094f6b5ab5bc258333bc326ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20E=C3=9Fer?= Date: Mon, 10 Jan 2022 15:20:12 +0100 Subject: [PATCH] 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 fad2f9cd85218..42eafe903187c 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 392d995029ebe..3d50665310a69 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 38a20d8a32b72..ee817e4e20243 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 105c45c557aac..8ab6dc4eca5ad 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 690d44b25508f..21c568344d4be 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 4d75dce28f964..0e30c39aaee03 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 d1cbff162fde9..9cb6f3d6e60f9 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 3a254d11b6243..7fefb54b5703a 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 7cc3209bdcbb9..e165c7bc41dcb 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 diff --git a/benchmarks/fio/Makefile b/benchmarks/fio/Makefile index 06c393177ec69..9bc3086c054b4 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 a8fda49588343..e781fcb0fd426 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 22fe1205bc979..80ed9ef930239 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 8bad1fd58ff0f..bca0d43068828 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 f5ac7074ee919..929dd557c7809 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 10400cca98d2a..f26f0d0f643a4 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 763620406776a..17e8902bc6338 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 diff --git a/biology/cufflinks/Makefile b/biology/cufflinks/Makefile index 0de2dda73fec7..dcf25bfdf0102 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 a9fe7d45afc94..60042b88afb29 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 01b7bee647781..c4d6cc13f33ea 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 diff --git a/biology/gmap/Makefile b/biology/gmap/Makefile index 4df2c1d04b739..aa4abd0687339 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 caf51c66a7a7e..dc7f8d7da6663 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 af93abad15fdc..83bfefbc177fa 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 diff --git a/biology/ncbi-cxx-toolkit/Makefile b/biology/ncbi-cxx-toolkit/Makefile index 8163459800e24..40f24bc66bed1 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 7ece210acd5e7..d8a3e45399189 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 59f60cc2f1f65..e31ea80c55296 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 bc241a93978ea..f4355c04e7633 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 diff --git a/biology/sra-tools/Makefile b/biology/sra-tools/Makefile index 0b6a54bd67ca9..91b15622dd032 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 4d941e9492035..0ebdc81fc2789 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 88b02b35f20f2..f171e97d22b7f 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 2b93f5811120e..52f4d95ff799a 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 957347da05229..f22305ea322ab 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 diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile index d95fe35af3ec6..3b39cce70865c 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 bbf74cff01002..8dffc33f50059 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 2a7b5a3382473..da03bf342cc94 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 c13290728b357..764533d805147 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 index 72345d521dc31..d0ca68f282b8d 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -37,7 +37,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ SUB_FILES= pkg-message SUB_LIST+= PORTSDIR=${PORTSDIR} -CONFLICTS= zh-scim-fcitx-3.* fcitx5 +CONFLICTS= zh-scim-fcitx USE_GNOME= pango intltool libxml2 introspection USE_KDE= ecm diff --git a/chinese/hc/Makefile b/chinese/hc/Makefile index 15026340f287b..cbc1efe985ce8 100644 --- a/chinese/hc/Makefile +++ b/chinese/hc/Makefile @@ -9,6 +9,8 @@ DISTFILES= hc-30.tar.gz hc-supp.tab MAINTAINER= ports@FreeBSD.org COMMENT= Hanzi Converter -- converts between GB and BIG-5 codes +CONFLICTS_INSTALL= rubygem-hieracles + WRKSRC= ${WRKDIR}/hc3 EXTRACT_ONLY= hc-30.tar.gz ALL_TARGET= hc b2g g2b diff --git a/chinese/scim-fcitx/Makefile b/chinese/scim-fcitx/Makefile index cfd4aa04393e2..c19e6e78b1569 100644 --- a/chinese/scim-fcitx/Makefile +++ b/chinese/scim-fcitx/Makefile @@ -23,6 +23,8 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes +CONFIGURE_INSTALL= zh-fcitx + WRKSRC= ${WRKDIR}/fcitx CONFIGURE_ENV+= SCIM_DATADIR=${PREFIX}/share/scim \ diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index 823705dff7f21..aadec8de6b901 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -35,6 +35,8 @@ CONFIGURE_ENV= ENVOPTS="${CFLAGS}" MAKE_ENV+= ROOT=${STAGEDIR} MAKE_ARGS+= OPTIMIZER="" -DOPTIMIZER +CONFLICTS_INSTALL= mgetty + PORTDOCS= RELEASENOTES-4.3.txt RELEASENOTES-4.4.txt RELEASENOTES-6.0.txt SUB_FILES= pkg-message diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index a2a07e630c0a1..f174b68ded8d7 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -31,6 +31,8 @@ ALL_TARGET= noident all INFO= mgetty CFLAGS+= -DAUTO_PPP +CONFLICTS_INSTALL= hylafax + MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= FIDO diff --git a/comms/unixcw/Makefile b/comms/unixcw/Makefile index 578eb9922ff93..c7dc5d13c34c8 100644 --- a/comms/unixcw/Makefile +++ b/comms/unixcw/Makefile @@ -38,6 +38,8 @@ OPTIONS_DEFINE= NLS NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls +CONFLICTS_INSTALL= cw + .ifndef XCWCP OPTIONS_DEFINE+= ALSA PULSEAUDIO OPTIONS_DEFAULT+= ALSA PULSEAUDIO diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile index 931925150df39..e76b13b028446 100644 --- a/comms/wsjtx/Makefile +++ b/comms/wsjtx/Makefile @@ -27,6 +27,8 @@ USE_QT= core gui network widgets \ multimedia concurrent printsupport serialport sql sql-sqlite3 \ buildtools_build linguisttools_build qmake_build testlib +CONFLICTS_INSTALL= wsjtz + # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/databases/dbf/Makefile b/databases/dbf/Makefile index 90d9171f415a0..f20e06c0eb78f 100644 --- a/databases/dbf/Makefile +++ b/databases/dbf/Makefile @@ -22,6 +22,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_prog_DOC_TO_MAN="" USE_LDCONFIG= yes +CONFLICTS_INSTALL= rubygem-dbf + .include .if ${PORT_OPTIONS:MNLS} diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile index 53399e81cb54e..719dff9842794 100644 --- a/databases/emacsql/Makefile +++ b/databases/emacsql/Makefile @@ -20,6 +20,9 @@ USE_GITHUB= yes GH_ACCOUNT= skeeto MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" + +CONFLICTS_INSTALL= emacsql emacsql-emacs_* + ALL_TARGET= binary compile TEST_TARGET= check diff --git a/databases/foundationdb-devel/Makefile b/databases/foundationdb-devel/Makefile index 62b1898a1ae4c..dbc3d4697f33b 100644 --- a/databases/foundationdb-devel/Makefile +++ b/databases/foundationdb-devel/Makefile @@ -29,6 +29,8 @@ GH_PROJECT= foundationdb USE_LDCONFIG= yes USE_RC_SUBR= foundationdb +CONFLICTS_INSTALL= foundationdb + SHEBANG_FILES= bindings/c/generate_asm.py CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLLIB} diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile index efefec0100b95..fa05400cc7d0d 100644 --- a/databases/foundationdb/Makefile +++ b/databases/foundationdb/Makefile @@ -27,6 +27,8 @@ GH_PROJECT= foundationdb USE_LDCONFIG= yes USE_RC_SUBR= foundationdb +CONFLICTS_INSTALL= foundationdb-devel + SHEBANG_FILES= bindings/c/generate_asm.py CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLLIB} diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index aa5c127917cd1..a6ce0bda15634 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -49,7 +49,7 @@ UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC PORTDOCS= * -CONFLICTS= freetds-1.* +INSTALL= freetds PORTSCOUT= limit:^\d+\.\d+\.\d{3}$ diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 0f78c4bf78dc2..4113f575baf54 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -27,6 +27,8 @@ CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \ USE_LDCONFIG= yes INSTALL_TARGET= install-strip +CONFLICTS= freetds-devel + PORTDOCS= * OPTIONS_DEFINE= DOCS MARS diff --git a/databases/galera/Makefile b/databases/galera/Makefile index 7b7892c248061..5dd55d7e942ce 100644 --- a/databases/galera/Makefile +++ b/databases/galera/Makefile @@ -42,6 +42,8 @@ GH_TUPLE?= codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFI CMAKE_ARGS+= -DGALERA_REVISION=${GH_TAGNAME} +CONFLICTS_INSTALL= galera26 + USE_RC_SUBR= garb.sh PLIST_FILES= bin/garbd \ diff --git a/databases/galera26/Makefile b/databases/galera26/Makefile index 38454313c17c2..81acb5587e14b 100644 --- a/databases/galera26/Makefile +++ b/databases/galera26/Makefile @@ -39,6 +39,8 @@ CMAKE_ARGS+= -DGALERA_REVISION=${GH_TAGNAME} USE_LDCONFIG= yes USE_RC_SUBR= garb.sh +CONFLICTS_INSTALL= galera + PLIST_FILES= bin/garbd \ lib/libgalera.so \ lib/libgalera_smm.so diff --git a/databases/libcouchbase/Makefile b/databases/libcouchbase/Makefile index 04a4773b638de..8f14988f83926 100644 --- a/databases/libcouchbase/Makefile +++ b/databases/libcouchbase/Makefile @@ -20,6 +20,8 @@ USE_PERL5= build run CMAKE_ARGS= -DLCB_NO_TESTS=1 +CONFLICTS_INSTALL= coin-or-cbc + .include .if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH} == riscv64 diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index eb7cfef65782c..004d0f72f5bd7 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -105,7 +105,7 @@ DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \ DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql -CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \ +CONFLICTS_INSTALL= mariadb10[0-35-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mysqlwsrep*-server \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 516be4ce498a9..16a1f6908e1ba 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -70,7 +70,7 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .if !defined(CLIENT_ONLY) USES+= mysql:55 -CONFLICTS_INSTALL= mysql5[0-46-9]-server \ +CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ mariadb*-server \ percona*-server @@ -96,7 +96,7 @@ post-patch: post-install: # Empty directory, but check-plist complains @${RMDIR} ${STAGEDIR}${PREFIX}/info || ${TRUE} - + .include .if ${ARCH} == armv6 || ${ARCH} == armv7 diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index ef91646474b75..6bbd818e189a5 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -80,11 +80,10 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ .if !defined(CLIENT_ONLY) USES+= mysql:56 -CONFLICTS_INSTALL= mysql5[0-57-9]-server \ - mysql[0-46-9][0-9]-server \ +CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ - mariadb[0-9][0-9]-server \ - percona[0-9][0-9]-server + mariadb*-server \ + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 3c1db5d83255d..5479342078d0b 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -87,11 +87,10 @@ OPTIONS_SUB= YES .if !defined(CLIENT_ONLY) USES+= mysql:57 -CONFLICTS_INSTALL= mysql5[0-68-9]-server \ - mysql[0-46-9][0-9]-server \ +CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ - mariadb[0-9][0-9]-server \ - percona[0-9][0-9]-server + mariadb*-server \ + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 6ef5c4eb467bf..13db1af59e53d 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -115,11 +115,10 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ .if !defined(CLIENT_ONLY) USES+= mysql:80 -CONFLICTS_INSTALL= mysql8[1-9]-server \ - mysql[0-79][0-9]-server \ +CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ - mariadb[0-9][0-9]-server \ - percona[0-9][0-9]-server + mariadb*-server \ + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index fd3b494023f87..0daeffb8db360 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -93,9 +93,8 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_TMPDIR=${MY_TMPDIR} CONFLICTS_INSTALL= mariadb*-server \ - mysql[0-9]*-server \ - mysqlwsrep57*-server \ - mysqlwsrep[1-489]*-server \ + mysql*-server \ + mysqlwsrep*-server \ percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 62c0b59cd7ec7..27efceab34a4b 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -85,9 +85,8 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_TMPDIR=${MY_TMPDIR} CONFLICTS_INSTALL= mariadb*-server \ - mysql[0-9]*-server \ - mysqlwsrep56*-server \ - mysqlwsrep[1-489]*-server \ + mysql*-server \ + mysqlwsrep*-server \ percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/p5-DBD-XBase/Makefile b/databases/p5-DBD-XBase/Makefile index 32e184e78fe3c..0cb912eebb093 100644 --- a/databases/p5-DBD-XBase/Makefile +++ b/databases/p5-DBD-XBase/Makefile @@ -15,6 +15,8 @@ RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= shapelib + NO_ARCH= yes .include diff --git a/databases/pear-DB_DataObject/Makefile b/databases/pear-DB_DataObject/Makefile index c3e3ecb0bb34d..79cd345850546 100644 --- a/databases/pear-DB_DataObject/Makefile +++ b/databases/pear-DB_DataObject/Makefile @@ -15,6 +15,8 @@ RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR} USES= pear +CONFLICTS_INSTALL= php*-pear-DB_DataObject + NO_ARCH= yes OPTIONS_DEFINE= DB MDB2 VALIDATE diff --git a/databases/pear-DoctrineDBAL/Makefile b/databases/pear-DoctrineDBAL/Makefile index 6eed2b6c65920..f112d0e14fa44 100644 --- a/databases/pear-DoctrineDBAL/Makefile +++ b/databases/pear-DoctrineDBAL/Makefile @@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \ ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} +CONFLICTS_INSTALL= php*-pear-doctrine-DoctrineDBAL + OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE OPTIONS_DEFAULT=MYSQL diff --git a/databases/pear-Horde_Db/Makefile b/databases/pear-Horde_Db/Makefile index 570e9341ffece..54da12811f3e4 100644 --- a/databases/pear-Horde_Db/Makefile +++ b/databases/pear-Horde_Db/Makefile @@ -20,4 +20,6 @@ MYSQLI_USE= PHP=mysqli PDO_USES= php PDO_USE= PHP=pdo +CONFLICTS_INSTALL= php*-pear-horde-Horde_Db + .include diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 4d938cbc1bc9c..c72e826ad9ab4 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -74,7 +74,7 @@ USES+=mysql:56p CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ mariadb*-server \ - percona5[0-57-9]-server + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile index f3b05c1ce5401..03953f4ce4a6c 100644 --- a/databases/percona57-server/Makefile +++ b/databases/percona57-server/Makefile @@ -109,7 +109,7 @@ USES+=mysql:57p CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ mariadb*-server \ - percona5[0-68-9]-server + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile index 343e0bde4d5a9..2633767c8eef0 100644 --- a/databases/py-alembic/Makefile +++ b/databases/py-alembic/Makefile @@ -22,6 +22,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-alembic14 + NO_ARCH= yes do-test: diff --git a/databases/py-alembic14/Makefile b/databases/py-alembic14/Makefile index 71958b89c1a87..49bf2be4bddad 100644 --- a/databases/py-alembic14/Makefile +++ b/databases/py-alembic14/Makefile @@ -22,6 +22,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ USES= python USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-alembic + NO_ARCH= yes PORTSCOUT= limit:^1\.4\. diff --git a/databases/rubygem-dbf/Makefile b/databases/rubygem-dbf/Makefile index c375acad7e980..c22f2b09aa4c8 100644 --- a/databases/rubygem-dbf/Makefile +++ b/databases/rubygem-dbf/Makefile @@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gem USE_RUBY= yes +CONFLICTS_INSTALL= dbf + NO_ARCH= yes PLIST_FILES= bin/dbf diff --git a/deskutils/ljclive/Makefile b/deskutils/ljclive/Makefile index 0cabb7c90e10d..8ad19f98dd5f7 100644 --- a/deskutils/ljclive/Makefile +++ b/deskutils/ljclive/Makefile @@ -16,6 +16,6 @@ CONFIGURE_ARGS= ac_cv_search_iconv=${ICONV_LIB} CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -CONFLICTS= *clive-[1-9]* +CONFLICTS= clive .include diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile index 8b4929c4bdb6f..e9dd7ecf743ff 100644 --- a/deskutils/plan/Makefile +++ b/deskutils/plan/Makefile @@ -16,6 +16,8 @@ ALL_TARGET= freebsd MAKE_ENV+= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR} +CONFLICTS_INSTALL= ja-plan + OPTIONS_DEFINE= DOCS do-install: diff --git a/devel/aphpbreakdown/Makefile b/devel/aphpbreakdown/Makefile index b870a96b8b155..28862631d288f 100644 --- a/devel/aphpbreakdown/Makefile +++ b/devel/aphpbreakdown/Makefile @@ -16,6 +16,8 @@ USE_PHP= tokenizer phar hash NO_ARCH= yes NO_BUILD= yes +CONFLICTS_INSTALL= php*-aphpbreakdown + PLIST_FILES= bin/aphpbreakdown # Download isn't compressed or aggregated, it's just the single file diff --git a/devel/aphpunit/Makefile b/devel/aphpunit/Makefile index 952e733d7ff5a..d478b0ce08aa0 100644 --- a/devel/aphpunit/Makefile +++ b/devel/aphpunit/Makefile @@ -16,6 +16,8 @@ USE_PHP= mbstring pcntl phar posix sysvmsg NO_ARCH= yes NO_BUILD= yes +CONFLICTS_INSTALL= php*-aphpunit + PLIST_FILES= bin/aphpunit # Download isn't compressed or aggregated, it's just the single file diff --git a/devel/arcanist-lib/Makefile b/devel/arcanist-lib/Makefile index a69b558a731c3..4ca060e9d7087 100644 --- a/devel/arcanist-lib/Makefile +++ b/devel/arcanist-lib/Makefile @@ -49,7 +49,7 @@ ENCODINGS_USE= PHP=mbstring RUN_DEPENDS= arcanist-lib${PHP_PKGNAMESUFFIX}>0:devel/arcanist-lib@${PHP_FLAVOR} -CONFLICTS= arc +CONFLICTS= arc arcanist-php?? PLIST_FILES= bin/arc diff --git a/devel/arduino/Makefile b/devel/arduino/Makefile index 96a2be909b7cb..4d28a0d206790 100644 --- a/devel/arduino/Makefile +++ b/devel/arduino/Makefile @@ -30,6 +30,8 @@ JAVA_OS= native JAVA_VENDOR= openjdk JAVA_RUN= yes +CONFLICTS_INSTALL= arduino18 + NO_BUILD= yes USE_LDCONFIG= ${PREFIX}/arduino/lib diff --git a/devel/arm-none-eabi-gcc/Makefile b/devel/arm-none-eabi-gcc/Makefile index fe6b49b494761..ae56c7fa6b4f0 100644 --- a/devel/arm-none-eabi-gcc/Makefile +++ b/devel/arm-none-eabi-gcc/Makefile @@ -8,6 +8,8 @@ PLIST= ${.CURDIR}/pkg-plist DISTINFO_FILE= ${.CURDIR}/distinfo COMMENT= GNU Compiler Collection for bare metal arm cross-development +CONFLICTS_INSTALL= arm-none-eabi-gcc492 + OPTIONS_SINGLE= ML OPTIONS_SINGLE_ML= ML_NONE ML_DEFAULT ML_CORTEXA ML_CORTEXRM OPTIONS_DEFAULT= ML_NONE diff --git a/devel/arm-none-eabi-gcc492/Makefile b/devel/arm-none-eabi-gcc492/Makefile index a8fc592e63cac..72227a0491749 100644 --- a/devel/arm-none-eabi-gcc492/Makefile +++ b/devel/arm-none-eabi-gcc492/Makefile @@ -44,6 +44,8 @@ CONFIGURE_ARGS= --target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ --disable-libstdcxx \ --disable-multilib +CONFLICTS_INSTALL= arm-none-eabi-gcc + PLIST= ${.CURDIR}/pkg-plist # U-Boot requires libgcc, crossbuild and install it along with the compiler. diff --git a/devel/autoconf-wrapper/Makefile b/devel/autoconf-wrapper/Makefile index b802fde68b181..9810aaefaf0db 100644 --- a/devel/autoconf-wrapper/Makefile +++ b/devel/autoconf-wrapper/Makefile @@ -9,6 +9,8 @@ COMMENT?= Wrapper script for GNU autoconf LICENSE= BSD2CLAUSE +CONFLICTS_INSTALL= autoscan + WRKSRC= ${WRKDIR} NO_ARCH= yes NO_BUILD= YES diff --git a/devel/b2/Makefile b/devel/b2/Makefile index 344b03a1807d7..7cc8dc679372d 100644 --- a/devel/b2/Makefile +++ b/devel/b2/Makefile @@ -22,6 +22,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=0.8.0:devel/py-arrow@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= distutils autoplist concurrent optsuffix +CONFLICTS_INSTALL= boost_build + NO_ARCH= yes USE_GITHUB= yes diff --git a/devel/bam/Makefile b/devel/bam/Makefile index 6c383b4104935..9318a3de9003a 100644 --- a/devel/bam/Makefile +++ b/devel/bam/Makefile @@ -12,6 +12,8 @@ LICENSE= ZLIB USES= compiler tar:bzip2 +CONFLICTS_INSTALL= bamutil + PLIST_FILES= bin/bam .include diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile index 05dc68670ab3a..67d4bbb0489bb 100644 --- a/devel/bcc/Makefile +++ b/devel/bcc/Makefile @@ -18,6 +18,6 @@ BROKEN_mips64= fails to compile: unrecognized command line option "-m32" USES= uidfix -CONFLICTS= bin86 dev86 +CONFLICTS= dev86 .include diff --git a/devel/boost_build/Makefile b/devel/boost_build/Makefile index 7be89c74dd9a1..ce2834fc4aa2e 100644 --- a/devel/boost_build/Makefile +++ b/devel/boost_build/Makefile @@ -19,6 +19,8 @@ GH_ACCOUNT= boostorg GH_PROJECT= build GH_TAGNAME= 29baa79 +CONFLICTS_INSTALL= b2 + SHEBANG_GLOB= *.py SUB_FILES= pkg-message diff --git a/devel/capnproto/Makefile b/devel/capnproto/Makefile index 356fb78445778..308601d0f7fdb 100644 --- a/devel/capnproto/Makefile +++ b/devel/capnproto/Makefile @@ -17,6 +17,8 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= ac_cv_lib_ssl_OPENSSL_init_ssl=yes +CONFLICTS_INSTALL= capnproto080 + INSTALL_TARGET= install-strip TEST_TARGET= check diff --git a/devel/capstone4/Makefile b/devel/capstone4/Makefile index 2fa80e2c41665..a6e26b65644fc 100644 --- a/devel/capstone4/Makefile +++ b/devel/capstone4/Makefile @@ -9,6 +9,8 @@ COMMENT= Multi-platform, multi-architecture disassembly framework LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.TXT +CONFLICTS= capstone + USES= cpe gmake CPE_VENDOR= ${PORTNAME}-engine USE_GITHUB= yes diff --git a/devel/cask/Makefile b/devel/cask/Makefile index a6030f2c19476..5d6b43c6824ba 100644 --- a/devel/cask/Makefile +++ b/devel/cask/Makefile @@ -13,6 +13,8 @@ LICENSE= GPLv3 USES= emacs python shebangfix USE_GITHUB= yes +CONFLICTS_INSTALL= cask cask-emacs_* + NO_ARCH= yes NO_BUILD= yes diff --git a/devel/chroma/Makefile b/devel/chroma/Makefile index 492d01ec21985..b0a0825019810 100644 --- a/devel/chroma/Makefile +++ b/devel/chroma/Makefile @@ -25,6 +25,9 @@ GH_TUPLE= \ mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \ sergi:go-diff:v1.0.0:sergi_go_diff/vendor/github.com/sergi/go-diff + +CONFLICTS_INSTALL= chroma + GO_TARGET= ./cmd/chroma PLIST_FILES= bin/${PORTNAME} diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile index 3f050476f7b8c..ad49c92212dc1 100644 --- a/devel/cpan-upload/Makefile +++ b/devel/cpan-upload/Makefile @@ -18,4 +18,6 @@ RUN_DEPENDS= p5-AppConfig-Std>=1.05:devel/p5-AppConfig-Std \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= p5-CPAN-Uploader + .include diff --git a/devel/cvs+ipv6/Makefile b/devel/cvs+ipv6/Makefile index 2ecab01a2ac59..186018f7db387 100644 --- a/devel/cvs+ipv6/Makefile +++ b/devel/cvs+ipv6/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= +ipv6 MAINTAINER= ports@FreeBSD.org COMMENT= IPv6 enabled cvs. You can use IPv6 connection when using pserver -CONFLICTS_INSTALL= cvs-[12]* cvs-devel-[12]* +CONFLICTS_INSTALL= cvs cvs-devel OPTIONS_SLAVE= IPV6 OPTIONS_EXCLUDE= # empty diff --git a/devel/cvs-devel/Makefile b/devel/cvs-devel/Makefile index 864b3d29a13ac..7ce4d4e28fdc2 100644 --- a/devel/cvs-devel/Makefile +++ b/devel/cvs-devel/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= bdheeman@gmail.com COMMENT= IPv6 enabled cvs. You can use IPv6 connection when using pserver -CONFLICTS= cvsnt-[12]* cvs+ipv6-[12]* +CONFLICTS= cvs cvs+ipv6 USES= cpe makeinfo perl5 tar:bzip2 CPE_VENDOR= gnu diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index e845e08f4283c..fac27528a6b90 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2+ USES= cpe shebangfix tar:xz uidfix -CONFLICTS_INSTALL?= cvs+ipv6-[12]* cvs-devel-[12]* +CONFLICTS_INSTALL?= cvs-devel cvs+ipv6 OPTIONS_DEFINE= INFO IPV6 KERBEROS EXAMPLES OPTIONS_DEFAULT=INFO KERBEROS diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile index b40ac2008418f..97857bb23a663 100644 --- a/devel/cweb/Makefile +++ b/devel/cweb/Makefile @@ -16,6 +16,8 @@ MAKE_ARGS= CWEBINPUTS="${DATADIR}" \ LINKFLAGS="" \ CC="${CC}" +CONFLICTS_INSTALL= tex-web2c + OPTIONS_DEFINE= DOCS post-patch: diff --git a/devel/delta/Makefile b/devel/delta/Makefile index 1dd56ce1789b8..a9ae29b161b57 100644 --- a/devel/delta/Makefile +++ b/devel/delta/Makefile @@ -15,6 +15,8 @@ USES= gmake perl5 shebangfix USE_PERL5= run SHEBANG_FILES= delta multidelta +CONFLICTS_INSTALL= git-delta + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/delta ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/multidelta ${STAGEDIR}${PREFIX}/bin diff --git a/devel/deployer/Makefile b/devel/deployer/Makefile index f20c8044b3f1c..10aace5deaff2 100644 --- a/devel/deployer/Makefile +++ b/devel/deployer/Makefile @@ -15,6 +15,8 @@ LICENSE= MIT USES= php:flavors USE_PHP= curl iconv json openssl pcntl phar posix zlib +CONFLICTS_INSTALL= php*-deployer + NO_ARCH= yes NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/devel/dev86/Makefile b/devel/dev86/Makefile index a84e2daa418b6..dbb6a3b59bcdd 100644 --- a/devel/dev86/Makefile +++ b/devel/dev86/Makefile @@ -11,8 +11,7 @@ DISTNAME= Dev86src-${PORTVERSION} MAINTAINER= phs@deadc0.de COMMENT= 8086 development tools -CONFLICTS= bcc \ - bin86 +CONFLICTS= bcc WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DESTDIRNAME= DIST diff --git a/devel/dia2code+/Makefile b/devel/dia2code+/Makefile index 1fa8df531ded8..824f0372165a1 100644 --- a/devel/dia2code+/Makefile +++ b/devel/dia2code+/Makefile @@ -20,6 +20,8 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= dia2code + PLIST_FILES= bin/dia2code \ man/man1/dia2code.1.gz diff --git a/devel/dia2code/Makefile b/devel/dia2code/Makefile index f66e33d981052..b1486ed60c576 100644 --- a/devel/dia2code/Makefile +++ b/devel/dia2code/Makefile @@ -20,6 +20,8 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= dia2code+ + PLIST_FILES= bin/dia2code \ man/man1/dia2code.1.gz diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile index 0580a5139c26c..2c7143bb5f59d 100644 --- a/devel/dmake/Makefile +++ b/devel/dmake/Makefile @@ -20,6 +20,8 @@ GH_ACCOUNT= jimjag GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datarootdir=${DATADIR} +CONFLICTS_INSTALL= sunpromake + post-install: ${INSTALL_MAN} ${WRKSRC}/man/dmake.tf ${STAGEDIR}${PREFIX}/man/man1/dmake.1 diff --git a/devel/dragon/Makefile b/devel/dragon/Makefile index 2259dbd995395..64aa5bc3609f5 100644 --- a/devel/dragon/Makefile +++ b/devel/dragon/Makefile @@ -13,6 +13,8 @@ LIB_DEPENDS= liblfcbase.so:devel/lfcbase GNU_CONFIGURE= yes PLIST_FILES= bin/dragon +CONFLICTS_INSTALL= dragon-player + MAKE_JOBS_UNSAFE=yes .include diff --git a/devel/easygit/Makefile b/devel/easygit/Makefile index 3b0182a035aba..6d5762e2df67e 100644 --- a/devel/easygit/Makefile +++ b/devel/easygit/Makefile @@ -22,6 +22,8 @@ NO_WRKSUBDIR= yes NO_BUILD= yes PLIST_FILES= bin/eg bin/easygit +CONFLICTS_INSTALL= go-tools + do-extract: @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC} diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile index 7c8d3dea72e22..de24b16d25353 100644 --- a/devel/etcd/Makefile +++ b/devel/etcd/Makefile @@ -18,8 +18,7 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= github.com/coreos/etcd github.com/coreos/etcd/etcdctl -CONFLICTS_INSTALL= coreos-etcd31-* coreos-etcd32-* coreos-etcd33-* \ - coreos-etcd34-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PORTSCOUT= limit:^2.* diff --git a/devel/etcd31/Makefile b/devel/etcd31/Makefile index 4a6fb008832a0..13e8c63a0ec81 100644 --- a/devel/etcd31/Makefile +++ b/devel/etcd31/Makefile @@ -19,8 +19,7 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= ./cmd/etcd ./cmd/etcdctl -CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd32-* coreos-etcd33-* \ - coreos-etcd34-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/etcd32/Makefile b/devel/etcd32/Makefile index e033d6d86adb9..6f6a5691a1419 100644 --- a/devel/etcd32/Makefile +++ b/devel/etcd32/Makefile @@ -19,8 +19,7 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= ./cmd/etcd ./cmd/etcdctl -CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd31-* coreos-etcd33-* \ - coreos-etcd34-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/etcd33/Makefile b/devel/etcd33/Makefile index 8dc792c6e180f..8036919dcdc0e 100644 --- a/devel/etcd33/Makefile +++ b/devel/etcd33/Makefile @@ -73,8 +73,7 @@ GH_TUPLE= beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ GO_PKGNAME= github.com/coreos/etcd GO_TARGET= . ./etcdctl -CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \ - coreos-etcd34-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/etcd34/Makefile b/devel/etcd34/Makefile index 4567e69be5d98..7f4cd7d38951c 100644 --- a/devel/etcd34/Makefile +++ b/devel/etcd34/Makefile @@ -19,8 +19,7 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= . ./etcdctl -CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \ - coreos-etcd33-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile index cbd86f5829cb7..59d5ee8c5794b 100644 --- a/devel/flex-sdk/Makefile +++ b/devel/flex-sdk/Makefile @@ -7,7 +7,7 @@ DISTNAME= flex_sdk_${PORTVERSION}_mpl MAINTAINER= ports@FreeBSD.org COMMENT= Adobe Flex SDK -CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.* +CONFLICTS= flex-sdk3 USES= zip USE_JAVA= yes SUB_FILES= ${SCRIPTS:C/\$/.sh/g} diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile index 24389f3674cfe..7dd77948449ec 100644 --- a/devel/flex-sdk35/Makefile +++ b/devel/flex-sdk35/Makefile @@ -9,7 +9,7 @@ PKGNAMESUFFIX= 3 MAINTAINER= ports@FreeBSD.org COMMENT= Adobe Flex SDK -CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk-4.* +CONFLICTS= flex-sdk USES= zip USE_JAVA= yes SUB_FILES= ${SCRIPTS:C/\$/.sh/g} diff --git a/devel/generate/Makefile b/devel/generate/Makefile index d4712ceb1fccc..1b608279e96f5 100644 --- a/devel/generate/Makefile +++ b/devel/generate/Makefile @@ -14,6 +14,8 @@ USES= gmake tar:tgz MAKE_ARGS= BINDIR=${STAGEDIR}${PREFIX}/bin \ MANDIR=${STAGEDIR}${PREFIX}/man +CONFLICTS_INSTALL= julius php*-pear-Text_Highlighter + PLIST_FILES= bin/generate bin/rgenerate man/man1/generate.1.gz post-patch: diff --git a/devel/git-delta/Makefile b/devel/git-delta/Makefile index ee7850acc316f..15ba3abe2fab5 100644 --- a/devel/git-delta/Makefile +++ b/devel/git-delta/Makefile @@ -138,7 +138,7 @@ CARGO_CRATES= adler-0.2.3 \ xml-rs-0.8.3 \ yaml-rust-0.4.5 -CONFLICTS_INSTALL= devel/delta +CONFLICTS_INSTALL= delta PLIST_FILES= bin/delta OPTIONS_DEFINE= BASH diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 64768401cc332..8656ee7bc4490 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -33,6 +33,8 @@ BINARY_ALIAS= python3=${PYTHON_CMD} PORTSCOUT= limitw:1,even CPE_VENDOR= gnome +CONFLICTS_INSTALL= p5-Giovanni + _LIBVERSION= 0.7000.2 PLIST_SUB= LIBVERSION=${_LIBVERSION} diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile index fa64d360f9d3f..9f46356c436a5 100644 --- a/devel/go-tools/Makefile +++ b/devel/go-tools/Makefile @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules +CONFLICTS_INSTALL= easygit p5-Devel-Cover rubygem-bundler + GO_MODULE= golang.org/x/tools GO_TARGET= ./cmd/auth/authtest \ ./cmd/auth/cookieauth \ diff --git a/devel/got/Makefile b/devel/got/Makefile index 43024bca55693..74407adbfe4e6 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -11,6 +11,8 @@ LICENSE_FILE= ${WRKSRC}/LICENCE USES= uidfix +CONFLICTS_INSTALL= p5-App-GitGot + # Insert #include "openbsd-compat.h" into each source file, # after the <...> includes and before the "..." ones. n= ${.newline} diff --git a/devel/gradle/Makefile b/devel/gradle/Makefile index f714680e426dd..eb947b116550f 100644 --- a/devel/gradle/Makefile +++ b/devel/gradle/Makefile @@ -15,6 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe zip USE_JAVA= yes + +CONFLICTS_INSTALL= gradle6 gradle62 + NO_ARCH= yes NO_BUILD= yes SUB_FILES= gradle diff --git a/devel/gradle6/Makefile b/devel/gradle6/Makefile index 172e8f9178736..be5253af57a75 100644 --- a/devel/gradle6/Makefile +++ b/devel/gradle6/Makefile @@ -14,6 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe zip USE_JAVA= yes + +CONFLICTS_INSTALL= gradle gradle62 + NO_ARCH= yes NO_BUILD= yes SUB_FILES= gradle diff --git a/devel/gradle62/Makefile b/devel/gradle62/Makefile index 2baa767c3bb11..66b32a83c99ac 100644 --- a/devel/gradle62/Makefile +++ b/devel/gradle62/Makefile @@ -17,6 +17,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe zip USE_JAVA= yes + +CONFLICTS_INSTALL= gradle gradle6 + DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} NO_ARCH= yes NO_BUILD= yes diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index 681218b20abe4..40dfb49716204 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -35,6 +35,8 @@ CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 \ CMAKE_ON= BUILD_SHARED_LIBS USE_LDCONFIG= yes +CONFLICTS_INSTALL= grpc130 grpc134 + PLIST_SUB= SHLIB_MAJOR=${PORTVERSION:R} \ SHLIB_MINOR=${PORTVERSION:E} diff --git a/devel/grpc130/Makefile b/devel/grpc130/Makefile index 40ca73fb11ec4..e54fe2b90ca40 100644 --- a/devel/grpc130/Makefile +++ b/devel/grpc130/Makefile @@ -36,6 +36,8 @@ CMAKE_ON= BUILD_SHARED_LIBS USE_LDCONFIG= yes STRIP= +CONFLICTS_INSTALL= grpc grpc134 + PLIST_SUB= PORTVERSION=${PORTVERSION} .include diff --git a/devel/grpc134/Makefile b/devel/grpc134/Makefile index 7025c68598ad6..8a56cf6de82fd 100644 --- a/devel/grpc134/Makefile +++ b/devel/grpc134/Makefile @@ -35,6 +35,8 @@ CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 \ CMAKE_ON= BUILD_SHARED_LIBS USE_LDCONFIG= yes +CONFLICTS_INSTALL= grpc grpc130 + PLIST_SUB= PORTVERSION=${PORTVERSION} CONFLICTS_INSTALL= grpc diff --git a/devel/horde-content/Makefile b/devel/horde-content/Makefile index 1acecbc99629d..6530604291b9e 100644 --- a/devel/horde-content/Makefile +++ b/devel/horde-content/Makefile @@ -18,4 +18,6 @@ USE_HORDE_RUN= Horde_Role \ Horde_Rdo \ Horde_Util +CONFLICTS_INSTALL= php*-horde-content + .include diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile index 0da07f7df68de..e58d77b260555 100644 --- a/devel/hwloc/Makefile +++ b/devel/hwloc/Makefile @@ -27,6 +27,8 @@ CONFIGURE_ARGS= --enable-static \ INSTALL_TARGET= install-strip USE_LDCONFIG= yes +CONFLICTS_INSTALL= hwloc2 + PORTDOCS= * OPTIONS_DEFINE= CAIRO DOCS diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index 832389fb1b059..98845ef1c6b01 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= libLLVM-${FLAVOR:S/llvm//}.so:devel/${FLAVOR} \ FLAVORS= ${12 11:L:S/^/llvm/} -CONFLICTS_INSTALL= ${PORTNAME}-* +CONFLICTS_INSTALL= ${PORTNAME}-llvm* USES= bison cmake compiler:c++17-lang python:build USE_GITHUB= yes diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile index e465b98e84378..34210b03eb36d 100644 --- a/devel/ipython/Makefile +++ b/devel/ipython/Makefile @@ -26,6 +26,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backcall>=0:devel/py-backcall@${PY_FLAVOR} \ USES= cpe python:3.7+ USE_PYTHON= autoplist distutils +CONFLICTS_INSTALL= py*-ipython5 + NO_ARCH= yes PORTEXAMPLES= * diff --git a/devel/ipython5/Makefile b/devel/ipython5/Makefile index 14201222adb7a..f4393fd6091b6 100644 --- a/devel/ipython5/Makefile +++ b/devel/ipython5/Makefile @@ -27,6 +27,8 @@ USES= cpe python:3.5+ USE_PYTHON= autoplist concurrent distutils USE_GCC= yes # To be removed - Needed as a work-around for numpy, see PR ports/188114 +CONFLICTS_INSTALL= py*-ipython + NO_ARCH= yes PORTEXAMPLES= * diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 89de7ed78a608..f5c7586b782c7 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -114,7 +114,7 @@ PLIST_FILES= PLIST_SUB_SED_EXCLUDE_VAL= lib "3.0.0" CLANG_DESC= Build clang -CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]* +CLANG_CONFLICTS_INSTALL= clang-devel CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \ -DCLANG_LINK_LLVM_DYLIB=ON CLANG_PORTDOCS= clang @@ -173,6 +173,8 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils +CONFLICTS_INSTALL= llvm-devel + PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} \ LLVM_RELEASE=${LLVM_RELEASE} diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile index 88c9ae52ed77d..24fb37c53762a 100644 --- a/devel/llvm/Makefile +++ b/devel/llvm/Makefile @@ -25,6 +25,8 @@ LIT_DESC= The lit and FileCheck test tools LLD_DESC= The LLVM linker LLDB_DESC= The LLVM debugger +CONFLICTS_INSTALL= cling zapcc + NO_ARCH= yes NO_BUILD= yes diff --git a/devel/ocaml-dune/Makefile b/devel/ocaml-dune/Makefile index 04199cac7ea1c..20fa49289d968 100644 --- a/devel/ocaml-dune/Makefile +++ b/devel/ocaml-dune/Makefile @@ -16,6 +16,8 @@ GH_ACCOUNT= ocaml USE_OCAML= yes USE_OCAML_FINDLIB= yes +CONFLICTS_INSTALL= wdune + ALL_TARGET= release MAKE_ENV= LIBDIR="${OCAML_SITELIBDIR}" DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} diff --git a/devel/p5-App-GitGot/Makefile b/devel/p5-App-GitGot/Makefile index cb3dd05b71554..1280b21a8b886 100644 --- a/devel/p5-App-GitGot/Makefile +++ b/devel/p5-App-GitGot/Makefile @@ -39,6 +39,8 @@ TEST_DEPENDS= p5-Test-Class>=0:devel/p5-Test-Class \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= got + NO_ARCH= yes .include diff --git a/devel/p5-CPAN-Uploader/Makefile b/devel/p5-CPAN-Uploader/Makefile index 33f15dd65ac60..90b91a9a32982 100644 --- a/devel/p5-CPAN-Uploader/Makefile +++ b/devel/p5-CPAN-Uploader/Makefile @@ -26,4 +26,6 @@ NO_ARCH= yes USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= cpan-upload + .include diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile index c2799e9b4eed5..425ac352c3338 100644 --- a/devel/p5-Devel-Cover/Makefile +++ b/devel/p5-Devel-Cover/Makefile @@ -17,6 +17,8 @@ TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= go-tools + OPTIONS_DEFINE= CPANCOVER HTML_REPORTS POD_COVERAGE SYNTAX_HIGHLIGHTING OPTIONS_DEFAULT=CPANCOVER HTML_REPORTS POD_COVERAGE OPTIONS_SUB= yes diff --git a/devel/p5-Devel-NYTProf/Makefile b/devel/p5-Devel-NYTProf/Makefile index 2ce63fb6a43bf..ed722a7a460fb 100644 --- a/devel/p5-Devel-NYTProf/Makefile +++ b/devel/p5-Devel-NYTProf/Makefile @@ -21,6 +21,8 @@ TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= flamegraph + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Devel/NYTProf/NYTProf.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/Devel/auto/Devel/NYTProf/NYTProf.so diff --git a/devel/p5-Dist-Joseki/Makefile b/devel/p5-Dist-Joseki/Makefile index 61831a10aab1d..0954a2d7562c5 100644 --- a/devel/p5-Dist-Joseki/Makefile +++ b/devel/p5-Dist-Joseki/Makefile @@ -26,6 +26,8 @@ RUN_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= ja-mh mmh nmh + NO_ARCH= yes .include diff --git a/devel/p5-File-DirSync/Makefile b/devel/p5-File-DirSync/Makefile index d842ab93874f8..6f26b00699644 100644 --- a/devel/p5-File-DirSync/Makefile +++ b/devel/p5-File-DirSync/Makefile @@ -13,4 +13,6 @@ COMMENT= Perl5 module for synchronizing two directories rapidly USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= py*-dirsync + .include diff --git a/devel/p5-Set-CrossProduct/Makefile b/devel/p5-Set-CrossProduct/Makefile index 901de66a1bf6b..b18f677507699 100644 --- a/devel/p5-Set-CrossProduct/Makefile +++ b/devel/p5-Set-CrossProduct/Makefile @@ -16,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= topcom + NO_ARCH= yes .include diff --git a/devel/pear-HTML_Template_PHPLIB/Makefile b/devel/pear-HTML_Template_PHPLIB/Makefile index cfe18395b8751..eaf7e4b8476bd 100644 --- a/devel/pear-HTML_Template_PHPLIB/Makefile +++ b/devel/pear-HTML_Template_PHPLIB/Makefile @@ -12,4 +12,6 @@ LICENSE= LGPL3 USES= pear NO_ARCH= yes +CONFLICTS_INSTALL= php*-pear-HTML_Template_PHPLIB + .include diff --git a/devel/pear-Horde_Autoloader_Cache/Makefile b/devel/pear-Horde_Autoloader_Cache/Makefile index 4edbec1bafddf..ed6959929c5a0 100644 --- a/devel/pear-Horde_Autoloader_Cache/Makefile +++ b/devel/pear-Horde_Autoloader_Cache/Makefile @@ -11,4 +11,6 @@ USES= horde php cpe USE_HORDE_RUN= Horde_Autoloader USE_PHP= json +CONFLICTS_INSTALL= php*-pear-horde-Horde_Autoloader_Cache + .include diff --git a/devel/pear-Horde_Prefs/Makefile b/devel/pear-Horde_Prefs/Makefile index 4f5d5060ac9ed..95504332bbf78 100644 --- a/devel/pear-Horde_Prefs/Makefile +++ b/devel/pear-Horde_Prefs/Makefile @@ -13,4 +13,6 @@ USE_HORDE_RUN= Horde_Exception \ Horde_Util USE_PHP= json +CONFLICTS_INSTALL= php*-pear-horde-Horde_Prefs + .include diff --git a/devel/pear-Var_Dump/Makefile b/devel/pear-Var_Dump/Makefile index f08589aaff260..074f1203683dc 100644 --- a/devel/pear-Var_Dump/Makefile +++ b/devel/pear-Var_Dump/Makefile @@ -15,4 +15,6 @@ RUN_DEPENDS= bash:shells/bash USES= pear shebangfix SHEBANG_FILES= scripts/gen_php_doc.sh +CONFLICTS_INSTALL= php*-pear-Var_Dump + .include diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile index fb9b32ae00771..ae769170cce3a 100644 --- a/devel/php-composer/Makefile +++ b/devel/php-composer/Makefile @@ -22,7 +22,7 @@ USES= cpe php:flavors CPE_VENDOR= getcomposer USE_PHP= ctype filter intl json mbstring openssl phar -CONFLICTS_INSTALL= php*-composer2 +CONFLICTS_INSTALL= php*-composer php*-composer2 NO_ARCH= yes NO_BUILD= yes diff --git a/devel/php-composer2/Makefile b/devel/php-composer2/Makefile index 1ae5ee0e17540..05c7449b75850 100644 --- a/devel/php-composer2/Makefile +++ b/devel/php-composer2/Makefile @@ -21,7 +21,7 @@ USES= cpe php:flavors CPE_VENDOR= getcomposer USE_PHP= ctype filter intl json mbstring openssl phar -CONFLICTS_INSTALL= php*-composer +CONFLICTS_INSTALL= php*-composer php*-composer2 NO_ARCH= yes NO_BUILD= yes diff --git a/devel/psptoolchain-pspsdk-stage2/Makefile b/devel/psptoolchain-pspsdk-stage2/Makefile index 67c6a4fec85e7..db43fbf92d81d 100644 --- a/devel/psptoolchain-pspsdk-stage2/Makefile +++ b/devel/psptoolchain-pspsdk-stage2/Makefile @@ -23,6 +23,8 @@ SSP_UNSAFE= yes CFLAGS+= -fno-stack-protector LDFLAGS+= -fno-stack-protector +CONFLICTS_INSTALL= grx hxtools + PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../psptoolchain-pspsdk-stage1 diff --git a/devel/py-Faker/Makefile b/devel/py-Faker/Makefile index 29fb2f45ef0b0..e5c2c2285e77a 100644 --- a/devel/py-Faker/Makefile +++ b/devel/py-Faker/Makefile @@ -21,6 +21,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist +CONFLICTS_INSTALL= rubygem-faker + NO_ARCH= yes do-test: diff --git a/devel/py-cachecontrol/Makefile b/devel/py-cachecontrol/Makefile index ed7d302d5b89e..8384affb4868b 100644 --- a/devel/py-cachecontrol/Makefile +++ b/devel/py-cachecontrol/Makefile @@ -18,6 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-CacheControl + NO_ARCH= yes OPTIONS_DEFINE= FILECACHE REDIS diff --git a/devel/py-circuits/Makefile b/devel/py-circuits/Makefile index d8f84e87b2167..9f222d273cfae 100644 --- a/devel/py-circuits/Makefile +++ b/devel/py-circuits/Makefile @@ -18,6 +18,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= apache24 + NO_ARCH= yes do-test: diff --git a/devel/py-datadog/Makefile b/devel/py-datadog/Makefile index c2e6d65e70166..abc6975d8376e 100644 --- a/devel/py-datadog/Makefile +++ b/devel/py-datadog/Makefile @@ -17,6 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= dog + NO_ARCH= yes .include diff --git a/devel/py-dateutils/Makefile b/devel/py-dateutils/Makefile index f2f0cfe10e32f..6fd82b2203359 100644 --- a/devel/py-dateutils/Makefile +++ b/devel/py-dateutils/Makefile @@ -18,6 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= dateutils + NO_ARCH= yes .include diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile index 0a27cee5871be..09490f4c0aa9f 100644 --- a/devel/py-fabric/Makefile +++ b/devel/py-fabric/Makefile @@ -24,7 +24,7 @@ USES= cpe python:3.6+ CPE_VENDOR= fabfile USE_PYTHON= distutils concurrent autoplist -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}fabric1 +CONFLICTS_INSTALL= py*-fabric3 # bin/fab NO_ARCH= yes diff --git a/devel/py-fabric3/Makefile b/devel/py-fabric3/Makefile index 0525f66f1716d..f1a466faec898 100644 --- a/devel/py-fabric3/Makefile +++ b/devel/py-fabric3/Makefile @@ -17,6 +17,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:3.6+ USE_PYTHON= autoplist distutils +CONFLICTS_INSTALL= py*-fabric # bin/fab + NO_ARCH= yes .include diff --git a/devel/py-jsondiff/Makefile b/devel/py-jsondiff/Makefile index 0b8d9498417eb..fd6d1a44b84d7 100644 --- a/devel/py-jsondiff/Makefile +++ b/devel/py-jsondiff/Makefile @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= jojodiff py*-jsonpatch # bin/jdiff bin/jsondiff + NO_ARCH= yes .include diff --git a/devel/py-jsonpatch/Makefile b/devel/py-jsonpatch/Makefile index 5a37f06dee4b1..62e56d963893f 100644 --- a/devel/py-jsonpatch/Makefile +++ b/devel/py-jsonpatch/Makefile @@ -14,6 +14,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAV USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils + +CONFLICTS_INSTALL= py*-jsondiff # bin/jsondiff + NO_ARCH= yes do-test: build diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile index 49cf70ca8c064..927b957bd7d07 100644 --- a/devel/py-jsonschema/Makefile +++ b/devel/py-jsonschema/Makefile @@ -23,6 +23,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-jsonschema3 # bin/jsonschema + NO_ARCH= yes do-test: diff --git a/devel/py-jsonschema3/Makefile b/devel/py-jsonschema3/Makefile index 8d92df1d7772f..92edb58f3ad86 100644 --- a/devel/py-jsonschema3/Makefile +++ b/devel/py-jsonschema3/Makefile @@ -23,6 +23,8 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +CONFLICTS_INSTALL= py*-jsonschema # bin/jsonschema + PORTSCOUT= limit:^3\. .include diff --git a/devel/py-python-gist/Makefile b/devel/py-python-gist/Makefile index e05cd34e634ce..fd8f5927af82a 100644 --- a/devel/py-python-gist/Makefile +++ b/devel/py-python-gist/Makefile @@ -20,6 +20,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= autoplist distutils +CONFLICTS_INSTALL= gist p5-App-gist py*-python-gist yorick + NO_ARCH= yes do-test: # tests are currently broken and undergoing redesign, see https://github.com/jdowner/gist/issues/100#issuecomment-817039193 diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile index 115ce59047230..aff9f50e77e6e 100644 --- a/devel/rcs/Makefile +++ b/devel/rcs/Makefile @@ -11,6 +11,8 @@ LICENSE= GPLv3 USES= groff makeinfo tar:xz GNU_CONFIGURE= yes +CONFLICTS_INSTALL= rcs57 + INFO= rcs .include diff --git a/devel/rcs57/Makefile b/devel/rcs57/Makefile index 517022cfe8033..24b51660e4edd 100644 --- a/devel/rcs57/Makefile +++ b/devel/rcs57/Makefile @@ -9,7 +9,7 @@ COMMENT= Version control system (as was in FreeBSD prior to removal) LICENSE= GPLv2 -CONFLICTS= rcs-5.[89]* +CONFLICTS= rcs OPTIONS_DEFINE= FREEBSD OPTIONS_DEFAULT= FREEBSD diff --git a/devel/rubygem-faker/Makefile b/devel/rubygem-faker/Makefile index cf829ec8d4ed0..6d5ab9d6c02c2 100644 --- a/devel/rubygem-faker/Makefile +++ b/devel/rubygem-faker/Makefile @@ -14,6 +14,8 @@ RUN_DEPENDS= rubygem-i18n>=1.6,2<2,2:devel/rubygem-i18n USES= gem USE_RUBY= yes +CONFLICTS_INSTALL= py*-Faker + NO_ARCH= yes PLIST_FILES= bin/faker diff --git a/devel/sasm/Makefile b/devel/sasm/Makefile index c27ee7731b89d..e45607fc58010 100644 --- a/devel/sasm/Makefile +++ b/devel/sasm/Makefile @@ -15,6 +15,8 @@ GH_ACCOUNT= Dman95 USE_GL= gl USE_QT= core gui network widgets buildtools_build +CONFLICTS_INSTALL= fasm fasm-fpga + DATADIR= ${PREFIX}/share/sasm DOCSDIR= ${PREFIX}/share/doc/sasm diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile index 7ec1c0cdea909..cb15d4461b81f 100644 --- a/devel/shapelib/Makefile +++ b/devel/shapelib/Makefile @@ -22,6 +22,8 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes +CONFLICTS_INSTALL= p5-DBD-XBase + post-install: ${INSTALL_PROGRAM} ${WRKSRC}/.libs/shptest ${STAGEDIR}${PREFIX}/bin/ diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile index a96de2dda9c54..443a7bc685f1d 100644 --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -6,9 +6,7 @@ PKGNAMESUFFIX= -lts MAINTAINER= lev@FreeBSD.org COMMENT= Version control system, long-time-support version -CONFLICTS_INSTALL= subversion-1.[0-9].[0-9]* \ - subversion-1.1[0-9].[0-9]* \ - subversion1[0-9]-1.[0-9].[0-9]* +CONFLICTS_INSTALL= subversion USE_RC_SUBR= svnserve diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 5df5175b25a8f..8589bc3679825 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -5,9 +5,7 @@ PORTREVISION= 0 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system -CONFLICTS_INSTALL= subversion-1.[0-9].[0-9]* \ - subversion-1.1[0-1].[0-9]* \ - subversion1[0-9]-1.[0-9].[0-9]* +CONFLICTS_INSTALL= subversion-lts USE_RC_SUBR= svnserve diff --git a/devel/tex-web2c/Makefile b/devel/tex-web2c/Makefile index 255fd2ec1b011..373db9bba3383 100644 --- a/devel/tex-web2c/Makefile +++ b/devel/tex-web2c/Makefile @@ -50,6 +50,8 @@ CONFIGURE_ARGS+=--with-system-$L \ CFLAGS+= -I${LOCALBASE}/include INSTALL_TARGET= install-strip +CONFLICTS_INSTALL= cweb + INFO= web2c pre-configure: diff --git a/devel/util-linux/Makefile b/devel/util-linux/Makefile index 44f04acee6e31..7c43afff1ecce 100644 --- a/devel/util-linux/Makefile +++ b/devel/util-linux/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS= --disable-nls --disable-ipcrm --disable-ipcs \ INSTALL_TARGET= install-strip -#CONFLICTS_INSTALL= cal getopt flock hardlink # non-default options conflicts +CONFLICTS_INSTALL= heirloom-doctools OPTIONS_DEFINE= CAL FLOCK GETOPT HARDLINK UUID OPTIONS_SUB= yes diff --git a/devel/zapcc/Makefile b/devel/zapcc/Makefile index bdbc1970ecf3a..c15ad42da8078 100644 --- a/devel/zapcc/Makefile +++ b/devel/zapcc/Makefile @@ -22,6 +22,8 @@ SHEBANG_FILES= tools/clang/tools/clang-format/git-clang-format tools/clang/tools USE_GNOME= libxml2 USE_LDCONFIG= yes +CONFLICTS_INSTALL= cling llvm + CMAKE_OFF= LLVM_ENABLE_WARNINGS LLVM_BUILD_EXAMPLES LLVM_INCLUDE_EXAMPLES LLVM_INCLUDE_TESTS LLVM_INCLUDE_GO_TESTS LLVM_ENABLE_OCAMLDOC LLVM_BUILD_TEST CMAKE_ON= LLVM_ENABLE_CXX1Y LLVM_ENABLE_LLD BUILD_SHARED_LIBS diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index bd03b0d85d782..493e66d5b3bc5 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -87,7 +87,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * # XXX: Add -devel -CONFLICTS= bind911 bind912 bind913 bind914 bind916 +CONFLICTS= bind9[0-9][0-9] .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile index 52c3483588ba2..ffec40a785bcf 100644 --- a/dns/bind911/Makefile +++ b/dns/bind911/Makefile @@ -42,7 +42,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind912 bind913 bind914 bind916 bind9-devel +CONFLICTS= bind9[0-9][0-9] bind9-devel SUB_FILES= pkg-message named.conf USE_RC_SUBR= named @@ -102,7 +102,7 @@ TCP_FASTOPEN_DESC= RFC 7413 support TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) ACCFDNS_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-interfacemgr.c - + DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile index 0c1dcee790c22..3a0451047978e 100644 --- a/dns/bind916/Makefile +++ b/dns/bind916/Makefile @@ -68,7 +68,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * -CONFLICTS= bind911 bind912 bind913 bind914 bind9-devel +CONFLICTS= bind9[0-9][0-9] bind9-devel .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes diff --git a/dns/c-ares/Makefile b/dns/c-ares/Makefile index 69ea2fd5b623d..29b7f0ce63b89 100644 --- a/dns/c-ares/Makefile +++ b/dns/c-ares/Makefile @@ -29,7 +29,7 @@ CONFIG_INFO_DESC= Add the ares_config_info patch HIDE_SYMBOLS_DESC= Hide internal library symbols OPTIMIZED_CFLAGS_DESC= Build with compiler optimizations -CONFLICTS= ares-1.* +CONFLICTS= py*-ripe.atlas.tools MAKE_JOBS_UNSAFE= yes diff --git a/dns/dog/Makefile b/dns/dog/Makefile index a108b04c2618b..48c7a9da5fb4e 100644 --- a/dns/dog/Makefile +++ b/dns/dog/Makefile @@ -16,6 +16,8 @@ USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= ogham +CONFLICTS_INSTALL= py*-datadog + CARGO_CRATES= addr2line-0.14.0 \ adler-0.2.3 \ ansi_term-0.11.0 \ diff --git a/dns/gdnsd2/Makefile b/dns/gdnsd2/Makefile index b3daf9768a640..c9de6d4915797 100644 --- a/dns/gdnsd2/Makefile +++ b/dns/gdnsd2/Makefile @@ -25,7 +25,7 @@ USES= cpe pkgconfig libtool tar:xz perl5 gmake USE_PERL5= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFLICTS_INSTALL= gdnsd-1.[0-9]* gdnsd3-3.[0-9]* +CONFLICTS_INSTALL= gdnsd3 USE_RC_SUBR= gdnsd diff --git a/dns/gdnsd3/Makefile b/dns/gdnsd3/Makefile index 1deb03b3f1e88..84db1fdfc5aa5 100644 --- a/dns/gdnsd3/Makefile +++ b/dns/gdnsd3/Makefile @@ -27,7 +27,7 @@ USES= cpe pkgconfig libtool tar:xz perl5 gmake USE_PERL5= build CPPFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFLICTS_INSTALL= gdnsd-1.[0-9]* gdnsd2-2.[0-9]* +CONFLICTS_INSTALL= gdnsd2 USE_RC_SUBR= gdnsd diff --git a/editors/bpatch/Makefile b/editors/bpatch/Makefile index b6b1cfa1980bf..d7432a782d798 100644 --- a/editors/bpatch/Makefile +++ b/editors/bpatch/Makefile @@ -18,6 +18,8 @@ COMMENT= Hex editor that doesn't load the whole file at once # you will with bpatch. Nice to know it may still have a life. LICENSE= CC0-1.0 +CONFLICTS_INSTALL= bdelta + NO_WRKSUBDIR= yes PLIST_FILES= bin/bpatch \ man/man1/bpatch.1.gz diff --git a/editors/editorconfig-core-c/Makefile b/editors/editorconfig-core-c/Makefile index 386408871400b..8a471ff951926 100644 --- a/editors/editorconfig-core-c/Makefile +++ b/editors/editorconfig-core-c/Makefile @@ -21,6 +21,8 @@ GH_ACCOUNT= editorconfig USE_LDCONFIG= yes +CONFLICTS_INSTALL= py*-editorconfig + PLIST_SUB= PORTVERSION=${PORTVERSION} \ SHLIB_MAJOR=${PORTVERSION:C/\..+//} \ SHLIB_VER=${PORTVERSION} diff --git a/editors/helix/Makefile b/editors/helix/Makefile index e4c9c8d71566c..93091b6d0af47 100644 --- a/editors/helix/Makefile +++ b/editors/helix/Makefile @@ -11,6 +11,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cargo +CONFLICTS_INSTALL= shx + USE_GITHUB= yes GH_ACCOUNT= helix-editor GH_TUPLE= \ diff --git a/editors/jed/Makefile b/editors/jed/Makefile index aa25a52342db5..0e9fb42bb40de 100644 --- a/editors/jed/Makefile +++ b/editors/jed/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libslang.so:devel/libslang2 -CONFLICTS= jed-devel +CONFLICTS= ja-jed OPTIONS_DEFINE= X11 PERMS HOSTLOOKUP DOCS OPTIONS_DEFAULT=X11 HOSTLOOKUP diff --git a/editors/joe/Makefile b/editors/joe/Makefile index 1b5a457feaec5..e5668db8c2d31 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -12,7 +12,7 @@ COMMENT= Joe's Own Editor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= joe-2.* +CONFLICTS= jupp USES= gmake iconv localbase ncurses GNU_CONFIGURE= yes diff --git a/editors/jupp/Makefile b/editors/jupp/Makefile index e3a6732baf665..b2468d60db003 100644 --- a/editors/jupp/Makefile +++ b/editors/jupp/Makefile @@ -12,7 +12,7 @@ COMMENT= Portable version of Joe's Own Editor from MirBSD LICENSE= GPLv1 -CONFLICTS= joe-[24]* +CONFLICTS= joe USES= tar:tgz GNU_CONFIGURE= yes diff --git a/editors/py-editorconfig/Makefile b/editors/py-editorconfig/Makefile index 3023ae30fe3a1..46281f43ef292 100644 --- a/editors/py-editorconfig/Makefile +++ b/editors/py-editorconfig/Makefile @@ -16,6 +16,8 @@ LICENSE_COMB= multi USES= python:3.6+ USE_PYTHON= distutils autoplist +CONFLICTS_INSTALL= editorconfig-core-c + NO_ARCH= yes .include diff --git a/emulators/cpmtools/Makefile b/emulators/cpmtools/Makefile index a45463f0d898c..d2c6c0970dbab 100644 --- a/emulators/cpmtools/Makefile +++ b/emulators/cpmtools/Makefile @@ -14,4 +14,6 @@ WRKSRC= ${WRKDIR}/cpm CFLAGS+= -Wno-return-type +CONFLICTS_INSTALL= yaze-ag + .include diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile index cb03643ebd504..6c8a11f1cc80d 100644 --- a/emulators/hugo/Makefile +++ b/emulators/hugo/Makefile @@ -61,4 +61,6 @@ CONFIGURE_ENV+= ac_cv_lib_SDL_mixer_main=no \ ac_cv_lib_vorbisfile_main=no .endif +CONFLICTS_INSTSLL= gohugo + .include diff --git a/emulators/qemu5/Makefile b/emulators/qemu5/Makefile index 4a4da7520e8e8..484d0c006c0b1 100644 --- a/emulators/qemu5/Makefile +++ b/emulators/qemu5/Makefile @@ -22,9 +22,9 @@ LIB_DEPENDS= libnettle.so:security/nettle \ libzstd.so:archivers/zstd FLAVORS= default nox11 -default_CONFLICTS_INSTALL= qemu* +default_CONFLICTS_INSTALL= qemu-devel qemu-nox11 qemu42 qemu5 nox11_PKGNAMESUFFIX= 5-nox11 -nox11_CONFLICTS_INSTALL= qemu* +nox11_CONFLICTS_INSTALL= qemu qemu-devel qemu42 qemu5 nox11_COMMENT= (without X11) USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t ninja perl5 \ @@ -34,6 +34,8 @@ USE_PERL5= build USE_PYTHON= distutils noflavors USE_XORG= pixman +CONFLICTS_INSTALL= qemu qemu-devel qemu-nox11 qemu42 qemu5 + HAS_CONFIGURE= yes PORTSCOUT= limit:^5\. diff --git a/emulators/simh-hp2100/Makefile b/emulators/simh-hp2100/Makefile index 0536bb1f735f6..ab8b977b8cc82 100644 --- a/emulators/simh-hp2100/Makefile +++ b/emulators/simh-hp2100/Makefile @@ -24,7 +24,7 @@ USES= gmake dos2unix zip NO_WRKSUBDIR= yes -CONFLICTS_INSTALL= simh-3.[789]* +CONFLICTS_INSTALL= simh DOS2UNIX_GLOB= *.c *.h *.txt *.mak makefile SUB_FILES= hp2100.1 diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile index e50400bed867b..83f965a56866e 100644 --- a/emulators/simh/Makefile +++ b/emulators/simh/Makefile @@ -24,6 +24,8 @@ CFLAGS+= -Wno-format-extra-args -Wno-comment MAKE_ENV= GCC="${CC}" CFLAGS_O="${CFLAGS}" USE_NETWORK=1 MAKEFILE= makefile +CONFLICTS_INSTALL= simh-hp2100 + SUB_FILES= pkg-message simh.1 READMES= 0readme_${PORTVERSION:R:S/.//}.txt 0readme_ethernet.txt diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile index 6e70e1e83651b..623b0afc8dbb1 100644 --- a/emulators/virtualbox-ose-kmod-legacy/Makefile +++ b/emulators/virtualbox-ose-kmod-legacy/Makefile @@ -37,8 +37,7 @@ CONFIGURE_ARGS+= --disable-alsa \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-kmod-devel \ - virtualbox-ose-kmod +CONFLICTS_INSTALL= virtualbox-ose-kmod PORTSCOUT= limit:^5\. diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index b9aa595f0eba0..04f0cc7079f67 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -36,8 +36,7 @@ CONFIGURE_ARGS+= --disable-alsa \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-kmod-devel \ - virtualbox-ose-kmod-legacy +CONFLICTS_INSTALL= virtualbox-ose-kmod-legacy OPTIONS_DEFINE= DEBUG VIMAGE OPTIONS_DEFAULT=VIMAGE diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index d2dd94577dde2..ae5fb377d3ee8 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -28,7 +28,7 @@ USE_SDL= sdl2 CPE_VENDOR= winehq -CONFLICTS_INSTALL= wine-devel-* +CONFLICTS_INSTALL= wine-devel GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose \ diff --git a/emulators/yaze-ag/Makefile b/emulators/yaze-ag/Makefile index 3ace3558505e3..67489c5ac711b 100644 --- a/emulators/yaze-ag/Makefile +++ b/emulators/yaze-ag/Makefile @@ -13,6 +13,8 @@ LIB_DEPENDS= libreadline.so:devel/readline USES= compiler:c11 +CONFLICTS_INSTALL= cpmtools + MAKEFILE= Makefile_freebsd MAKE_ENV= BINDIR=${PREFIX}/bin \ DESTDIR="${STAGEDIR}" \ diff --git a/emulators/z80pack/Makefile b/emulators/z80pack/Makefile index e50a2ded04a9f..683e6d0fa9d2f 100644 --- a/emulators/z80pack/Makefile +++ b/emulators/z80pack/Makefile @@ -7,6 +7,8 @@ EXTRACT_SUFX= tgz MAINTAINER= se@FreeBSD.org COMMENT= Complete CP/M-80 emulator +CONFLICTS_INSTALL= hextools + LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE diff --git a/finance/py-pycoin/Makefile b/finance/py-pycoin/Makefile index d977165516632..54f19b4a3d05f 100644 --- a/finance/py-pycoin/Makefile +++ b/finance/py-pycoin/Makefile @@ -9,6 +9,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ehaupt@FreeBSD.org COMMENT= Utilities for Bitcoin and altcoin addresses/transaction manipulation +CONFLICTS_INSTALL= block keychain + LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile index b0cf18eb1b3e9..ec4ef67ef0b95 100644 --- a/games/arx-libertatis/Makefile +++ b/games/arx-libertatis/Makefile @@ -22,6 +22,8 @@ CMAKE_ARGS= -DDATA_DIR=arx \ -DBUILD_CRASHREPORTER=OFF LDFLAGS_i386= -Wl,-znotext +CONFLICTS_INSTALL= rnv + SUB_FILES= pkg-message PORTDOCS= AUTHORS CHANGELOG README.md diff --git a/games/block/Makefile b/games/block/Makefile index 3ad1179dd6cff..f641df193515b 100644 --- a/games/block/Makefile +++ b/games/block/Makefile @@ -9,6 +9,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Small text based maze game USES= ncurses tar:tgz + +CONFLICTS_INSTALL= py38-pycoin + WRKSRC= ${WRKDIR}/blocks MAKEFILE= makefile ALL_TARGET= block bed diff --git a/games/brogue/Makefile b/games/brogue/Makefile index c5fce97476891..c134ea6e38841 100644 --- a/games/brogue/Makefile +++ b/games/brogue/Makefile @@ -23,6 +23,9 @@ GH_PROJECT= BrogueCE .if ${FLAVOR} == x11 USES+= sdl USE_SDL= image2 sdl2 +CONFLICTS_INSTALL= brogue-nox11 +.else +CONFLICTS_INSTALL= brogue .endif MAKE_ARGS= DATADIR=${DATADIR} \ diff --git a/games/bzflag-server/Makefile b/games/bzflag-server/Makefile index 74e61c109db68..cd835622ae7b2 100644 --- a/games/bzflag-server/Makefile +++ b/games/bzflag-server/Makefile @@ -1,7 +1,7 @@ # Created by: Kevin Zheng PKGNAMESUFFIX= -server -CONFLICTS= bzflag-2.* +CONFLICTS= bzflag COMMENT= Multiplayer 3D tank battle game (server only) diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 7da60c5034f37..4b67d7eab2a32 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -22,6 +22,7 @@ USES+= gl sdl xorg USE_GL= gl glu glew USE_SDL= sdl2 USE_XORG= x11 xext xxf86vm sm ice xcb xshmfence xdamage xfixes +CONFLICTS_INSTALL= bzflag-server .endif CPPFLAGS+= -I ${LOCALBASE}/include diff --git a/games/cake/Makefile b/games/cake/Makefile index 27b17a0a3d875..bd481a1f73faa 100644 --- a/games/cake/Makefile +++ b/games/cake/Makefile @@ -16,6 +16,8 @@ USES= gl gmake jpeg ncurses xorg zip USE_GL= glut USE_XORG= x11 xext xmu xt xi sm ice +CONFLICTS_INSTALL= coffeescript + # Need to pass `-l', but PATCH_ARGS+= won't work because of PATCH_ARGS?= # in bsd.port.mk PATCH_ARGS= -N -s -E ${PATCH_STRIP} -l diff --git a/games/chroma/Makefile b/games/chroma/Makefile index 2a38db6758057..bdfde3db6c884 100644 --- a/games/chroma/Makefile +++ b/games/chroma/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= gettext localbase sdl tar:bzip2 GNU_CONFIGURE= yes +CONFLICTS_INSTALL= chroma-syntax-highlighter + PORTDOCS= * PORTDATA= * diff --git a/games/filters/Makefile b/games/filters/Makefile index 1bdc1409593bf..f1fca69ef650e 100644 --- a/games/filters/Makefile +++ b/games/filters/Makefile @@ -12,7 +12,7 @@ COMMENT= Collection of filters, including B1FF, and the Swedish Chef LICENSE= GPLv2 -CONFLICTS= talkfilters jive chef kenny +CONFLICTS= chef kenny lolcat talkfilters USES= gmake perl5 shebangfix MAKE_JOBS_UNSAFE= yes diff --git a/games/julius/Makefile b/games/julius/Makefile index 18a52adfe0dc8..62129355fc0aa 100644 --- a/games/julius/Makefile +++ b/games/julius/Makefile @@ -11,6 +11,8 @@ COMMENT= Open source re-implementation of Caesar III LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt +CONFLICTS_INSTALL= julius + BROKEN_riscv64= fails to link: julius-caesariii-1.5.1,1.log: cannot open /nxb-bin/usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-riscv64.a: No such file or directory LIB_DEPENDS= libpng.so:graphics/png diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile index 95d4eee17f0ed..1df154265fc6f 100644 --- a/games/linux-enemyterritory/Makefile +++ b/games/linux-enemyterritory/Makefile @@ -25,6 +25,8 @@ USE_LINUX= dri xorglibs ETDIR= ${PREFIX}/lib/${PORTNAME} PATCH_260B_DIR= Enemy Territory 2.60b +CONFLICTS_INSTALL= eternalterminal + OPTIONS_DEFINE= DOCS .include diff --git a/games/lolcat/Makefile b/games/lolcat/Makefile index 63a9ab615363b..76e080319b967 100644 --- a/games/lolcat/Makefile +++ b/games/lolcat/Makefile @@ -17,7 +17,7 @@ GH_ACCOUNT= jaseg CFLAGS+= -lm -CONFLICTS_INSTALL= rubygem-lolcat +CONFLICTS_INSTALL= filters PLIST_FILES= bin/censor bin/lolcat diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index 069215263a844..029c437d6307a 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -174,9 +174,8 @@ WEBP_LIB_DEPENDS= libwebp.so:graphics/webp X11_CONFIGURE_WITH= x X11_USES= xorg X11_USE= xorg=ice,sm,x11,xext,xt -X11_VARS= CONFLICTS_INSTALL+="ImageMagick-nox11-6* ImageMagick6-nox11-6*" \ - CONFLICTS+=display -X11_VARS_OFF= CONFLICTS_INSTALL+="ImageMagick-6* ImageMagick6-6*" \ +X11_VARS= CONFLICTS_INSTALL+="ImageMagick6-nox11" +X11_VARS_OFF= CONFLICTS_INSTALL+="ImageMagick6" \ PKGNAMESUFFIX=6-nox11 .include diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 3f6a041cd3120..11fa24f46f27b 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -37,7 +37,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ TESTS_DEPENDS= gsfonts>=0:print/gsfonts # bin/Magick++-config -CONFLICTS_INSTALL= ImageMagick ImageMagick-nox11 ImageMagick6 ImageMagick6-nox11 +CONFLICTS_INSTALL= ImageMagick6 ImageMagick6-nox11 # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= cpe gettext-runtime gmake gnome libtool:keepla \ @@ -176,9 +176,8 @@ WEBP_LIB_DEPENDS= libwebp.so:graphics/webp X11_CONFIGURE_WITH= x X11_USES= xorg X11_USE= xorg=ice,sm,x11,xext,xt -X11_VARS= CONFLICTS_INSTALL+="ImageMagick7-nox11-* \ - CONFLICTS+=display -X11_VARS_OFF= CONFLICTS_INSTALL+="ImageMagick7-*" \ +X11_VARS= CONFLICTS_INSTALL+="ImageMagick7-nox11" +X11_VARS_OFF= CONFLICTS_INSTALL+="ImageMagick7" \ PKGNAMESUFFIX=7-nox11 .include diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile index 130f8ab688a6c..c99898a19e8f6 100644 --- a/graphics/atril/Makefile +++ b/graphics/atril/Makefile @@ -43,8 +43,10 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--disable-thumbnailer \ --without-matedesktop \ --disable-previewer +CONFLICTS_INSTALL= atril .else USE_MATE+= desktop +CONFLICTS_INSTALL= atril-lite .endif GLIB_SCHEMAS= org.mate.Atril.gschema.xml diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile index ac453de887170..f60c223dad42a 100644 --- a/graphics/curator/Makefile +++ b/graphics/curator/Makefile @@ -12,6 +12,8 @@ COMMENT= Static Image Gallery Generator for web or CD-ROM galleries USES= magick:6,run python:3.6+ USE_PYTHON= distutils autoplist concurrent optsuffix +CONFLICTS_INSTALL= py*-elasticsearch-curator + PLIST_FILES= man/man1/curator.1.gz post-install: diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 0bc2534ee8e5c..ae669072213be 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -46,6 +46,8 @@ USE_GNOME= cairo gtk30 intltool librsvg2 libxml2 USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_XORG= ice sm x11 xext xrandr +CONFLICTS_INSTALL= darktable38 + SHEBANG_FILES= tools/*.sh CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1 \ diff --git a/graphics/darktable38/Makefile b/graphics/darktable38/Makefile index fd2762c9e2ff1..2e14e649ea362 100644 --- a/graphics/darktable38/Makefile +++ b/graphics/darktable38/Makefile @@ -51,6 +51,8 @@ USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_SDL= sdl2 USE_XORG= ice sm x11 xext xrandr +CONFLICTS_INSTALL= darktable + SHEBANG_FILES= tools/*.sh CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1 \ diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile index fce1dcc8324a3..b81cf5e9783e2 100644 --- a/graphics/dcraw/Makefile +++ b/graphics/dcraw/Makefile @@ -19,6 +19,8 @@ USES= cpe jpeg localbase tar:xz CPPFLAGS+= -I${LOCALBASE}/include/jasper LIBS+= -ljasper -ljpeg -llcms2 -lm +CONFLICTS_INSTALL= ufraw + PLIST_FILES= bin/dcraw \ share/man/man1/dcraw.1.gz diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index c2ba17400e007..1184788a77a32 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -51,9 +51,11 @@ OPTIONS_EXCLUDE= DBUS NAUTILUS PLIST= ${.CURDIR}/pkg-plist-lite PKGNAMESUFFIX= -lite COMMENT+= without GNOME dependencies +CONFLICTS_INSTALL= evince .else USE_GNOME+= introspection:build MESON_ARGS+= -Dintrospection=true +CONFLICTS_INSTALL= evince-lite .endif GLIB_SCHEMAS= org.gnome.Evince.gschema.xml diff --git a/graphics/exiftran/Makefile b/graphics/exiftran/Makefile index c1c710f362eb6..c88e22e532ede 100644 --- a/graphics/exiftran/Makefile +++ b/graphics/exiftran/Makefile @@ -17,6 +17,8 @@ LIB_DEPENDS= libexif.so:graphics/libexif USES= jpeg uidfix xorg USE_XORG= pixman +CONFLICTS_INSTALL= ida + MAKE_ARGS+= WRKSRC=${WRKSRC} BINDIR=${PREFIX}/bin MANDIR=${MANPREFIX}/man PLIST_FILES= bin/exiftran bin/thumbnail.cgi \ man/man1/exiftran.1.gz diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index d343e2bdefca0..407923c88e8c8 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -18,7 +18,7 @@ PLIST_FILES= bin/fly OPTIONS_DEFINE= DOCS EXAMPLES -CONFLICTS_INSTALL= concourse-fly +CONFLICTS_INSTALL= concourse concourse-fly do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include fly.c -o fly \ diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index b1135be7f0711..28722c59e71b4 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -13,7 +13,7 @@ COMMENT?= Graphics library for fast creation of images LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= bazaar-1.* +CONFLICTS_INSTALL= libgd ??-libgd mummer # bin/bdftogd bin/gd2copypal bin/gd2togif bin/gd2topng bin/gdcmpgif bin/gdlib-config bin/gdparttopng bin/gdtopng bin/giftogd2 USES= cpe tar:xz pkgconfig pathfix libtool:keepla shebangfix SHEBANG_FILES= ${WRKSRC}/src/bdftogd diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index 0f699e07a09b5..96ea298bf24c0 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -20,6 +20,8 @@ CFLAGS+= -DHAVE_REALLOCARRAY MAKE_ARGS= CC=${CC} LDFLAGS="${LDFLAGS}" MANDIR=${MANPREFIX}/man OFLAGS="${CFLAGS}" PREFIX="${PREFIX}" CPE_VENDOR= giflib_project +CONFLICTS_INSTALL= giftool + OPTIONS_DEFINE= DOCS TEST_TARGET= check diff --git a/graphics/giftool/Makefile b/graphics/giftool/Makefile index 9f0596aa307fb..a568ff7290407 100644 --- a/graphics/giftool/Makefile +++ b/graphics/giftool/Makefile @@ -19,6 +19,8 @@ ALL_TARGET= giftool MAKE_ARGS= CFLAGS="${CFLAGS}" USES= tar:tgz +CONFLICTS_INSTALL= giflib + OPTIONS_DEFINE= RETVALUE MALLOCSIZE DOCS OPTIONS_DEFAULT= RETVALUE MALLOCSIZE RETVALUE_DESC= Return value patch diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index ed6a1c355d2de..7713ae3701ae8 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -34,6 +34,9 @@ CFLAGS_armv7= -fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \ -fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \ -fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl MAKE_ENV= EXPR_COMPAT=yes + +CONFLICTS_INSTALL= ghmm + INSTALL_TARGET= install-strip USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile index 59dfff6e1f067..7dd224ef0528b 100644 --- a/graphics/grx/Makefile +++ b/graphics/grx/Makefile @@ -25,6 +25,8 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= hxtools psptoolchain-pspsdk-stage2 + PLIST_SUB= VERSION="${PORTVERSION}" MAKE_ARGS= infodir=${PREFIX}/${INFO_PATH} diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile index 08d38cdac3df1..fa55b84680c54 100644 --- a/graphics/ida/Makefile +++ b/graphics/ida/Makefile @@ -22,6 +22,8 @@ MAKE_ARGS= verbose=yes LDFLAGS+= ${ICONV_LIB} +CONFLICTS_INSTALL= exiftran + PORTDOCS= README TODO INSTALL PLIST_FILES= bin/exiftran bin/ida lib/X11/app-defaults/Ida \ man/man1/exiftran.1.gz man/man1/ida.1.gz \ diff --git a/graphics/imv/Makefile b/graphics/imv/Makefile index b63bd08818b32..d7902a60e9aba 100644 --- a/graphics/imv/Makefile +++ b/graphics/imv/Makefile @@ -27,6 +27,8 @@ USE_GL= egl USE_GNOME= cairo glib20 pango SHEBANG_FILES= contrib/imv-folder +CONFLICTS_INSTALL= renameutils + OPTIONS_DEFINE= FREEIMAGE HEIF JPEG NSGIF PNG SVG TEST TIFF OPTIONS_DEFAULT= ALL FREEIMAGE HEIF JPEG NSGIF PNG SVG TIFF OPTIONS_SINGLE= WIN diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile index c72ac3263a98b..e8eb9f93543af 100644 --- a/graphics/jpeg-turbo/Makefile +++ b/graphics/jpeg-turbo/Makefile @@ -49,7 +49,7 @@ CMAKE_OFF= WITH_SIMD PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG="" .else CMAKE_OFF+= WITH_TURBOJPEG -CONFLICTS_INSTALL= jpeg +CONFLICTS_INSTALL= mozjpeg PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment " .endif diff --git a/graphics/linux-c7-libglvnd/Makefile b/graphics/linux-c7-libglvnd/Makefile index 826f6996cb076..081c3463ef72e 100644 --- a/graphics/linux-c7-libglvnd/Makefile +++ b/graphics/linux-c7-libglvnd/Makefile @@ -11,6 +11,8 @@ USE_LDCONFIG= yes USE_LINUX= xorglibs USE_LINUX_RPM= yes +CONFLICTS_INSTALL= linux-nvidia-libs linux-nvidia-libs-* + LIB_DISTNAMES= libglvnd-${DISTVERSIONFULL} \ libglvnd-egl-${DISTVERSIONFULL} \ libglvnd-gles-${DISTVERSIONFULL} \ diff --git a/graphics/mozjpeg/Makefile b/graphics/mozjpeg/Makefile index fddf2e583ad13..72b63a745fe67 100644 --- a/graphics/mozjpeg/Makefile +++ b/graphics/mozjpeg/Makefile @@ -18,6 +18,8 @@ LIB_DEPENDS= libpng.so:graphics/png USES= cmake cpe +CONFLICTS_INSTALL= jpeg-turbo + CMAKE_OFF= REQUIRE_SIMD WITH_12BIT WITH_ARITH_DEC WITH_ARITH_ENC WITH_JAVA WITH_JPEG7 CMAKE_ON= ENABLE_SHARED ENABLE_STATIC FORCE_INLINE PNG_SUPPORTED WITH_JPEG8 WITH_MEM_SRCDST WITH_SIMD WITH_TURBOJPEG USE_LDCONFIG= yes diff --git a/graphics/py-fiona/Makefile b/graphics/py-fiona/Makefile index 8d9364254b3b3..e4dc4ca46dd38 100644 --- a/graphics/py-fiona/Makefile +++ b/graphics/py-fiona/Makefile @@ -21,6 +21,8 @@ LIB_DEPENDS+= libgdal.so:graphics/gdal USES= compiler:c++11-lang python:3.6+ USE_PYTHON= autoplist distutils cython +CONFLICTS_INSTALL= fio + post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME:tl} -name *.so -exec ${STRIP_CMD} {} + diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 8d2711ff39361..9d551889ca4bd 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -31,6 +31,8 @@ CONFIGURE_ARGS= --enable-extras \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib +CONFLICTS_INSTALL= dcraw + OPTIONS_DEFINE= CONTRAST DST EXIV2 FITS GIMP GNOME GTK2 LENSFUN OPTIONS_DEFAULT= CONTRAST EXIV2 GTK2 LENSFUN OPTIONS_SUB= yes diff --git a/graphics/wdune/Makefile b/graphics/wdune/Makefile index 73f2aafb5bee0..407f807e4060b 100644 --- a/graphics/wdune/Makefile +++ b/graphics/wdune/Makefile @@ -32,6 +32,9 @@ CONFIGURE_ARGS+= --with-optimization \ --with-helpurl="${DOCSDIR}/index.html" CPPFLAGS+= -I${LOCALBASE}/include/freetype2 -D__FREEBSD__ LDFLAGS+= -L${LOCALBASE}/lib + +CONFLICTS_INSTALL= ocaml-dune + ALL_TARGET= dune OPTIONS_DEFINE= DOCS diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 5772c3c7a75b4..0bb76fb343814 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -40,6 +40,9 @@ CFLAGS:= ${CFLAGS:S/-O2//g} .if ${PORT_OPTIONS:MM17N} MAKE_ENV= LOCALE_EXTENSION=-DTV_MULTILINGUAL DESCR= ${FILESDIR}/pkg-descr +CONFLICTS_INSTALL= xv +.else +CONFLICTS_INSTALL= xv-m17n .endif pre-patch: diff --git a/irc/atheme-services/Makefile b/irc/atheme-services/Makefile index 5435da0432e74..22a1915eb8197 100644 --- a/irc/atheme-services/Makefile +++ b/irc/atheme-services/Makefile @@ -27,6 +27,8 @@ CONFIGURE_ARGS= --enable-fhs-paths \ CPE_PRODUCT= atheme +CONFLICTS_INSTALL= lifelines + USERS= ircservices GROUPS= ircservices diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index a47841d008348..1f690b5d30a29 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -20,6 +20,8 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \ --datadir="${PREFIX}/share" \ --libdir="${PREFIX}/share" +CONFLICTS_INSTALL= zh-bitchx + OPTIONS_SUB= yes PLIST_SUB+= DISTVERSION=${DISTVERSION} diff --git a/irc/dancer/Makefile b/irc/dancer/Makefile index 03d77fd02504f..63212fe45ff4b 100644 --- a/irc/dancer/Makefile +++ b/irc/dancer/Makefile @@ -17,6 +17,8 @@ LDFLAGS+= -lm CPP= # USE_CSTD= gnu89 +CONFLICTS_INSTALL= p5-Dancer + do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/../${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ diff --git a/irc/ergo/Makefile b/irc/ergo/Makefile index 0d644f7d97bac..96fbd05c08d57 100644 --- a/irc/ergo/Makefile +++ b/irc/ergo/Makefile @@ -14,6 +14,8 @@ USES= go:modules USE_GITHUB= yes GH_ACCOUNT= ergochat +CONFLICTS_INSTALL= ergo + GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} PLIST_FILES= bin/${PORTNAME} diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile index 4052862cce8fe..b5db0e9ddc5d1 100644 --- a/irc/ircd-hybrid/Makefile +++ b/irc/ircd-hybrid/Makefile @@ -18,6 +18,8 @@ LDFLAGS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libltdl.so:devel/libltdl +CONFLICTS_INSTALL= ircd-ratbox ircd-ratbox-devel + USERS= ircd GROUPS= ${USERS} diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile index 5ae8b637e4478..577d930d52cee 100644 --- a/irc/ircd-ratbox-devel/Makefile +++ b/irc/ircd-ratbox-devel/Makefile @@ -13,7 +13,7 @@ COMMENT= Advanced, stable IRC daemon, used widely on EFnet ('testing' release) LICENSE= GPLv2 -CONFLICTS= ircd-ratbox charybdis +CONFLICTS= ircd-hybrid ircd-ratbox USES= libtool perl5 sqlite tar:bzip2 USE_RC_SUBR= ircd-ratbox diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile index b4d51d127501c..061fef4a1f2bb 100644 --- a/irc/ircd-ratbox/Makefile +++ b/irc/ircd-ratbox/Makefile @@ -12,7 +12,7 @@ COMMENT= Advanced, stable IRC daemon, used widely on EFnet LICENSE= GPLv2 -CONFLICTS= ircd-ratbox-devel charybdis +CONFLICTS= ircd-hybrid ircd-ratbox-devel USES= cpe libtool sqlite tar:bzip2 CPE_VENDOR= ratbox diff --git a/japanese/ack/Makefile b/japanese/ack/Makefile index c3c1c1563ec3f..a35b19ff2cded 100644 --- a/japanese/ack/Makefile +++ b/japanese/ack/Makefile @@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= CQG00620@nifty.ne.jp COMMENT= Kanji code converter -CONFLICTS_INSTALL= p5-ack ack +CONFLICTS_INSTALL= p5-ack # /bin/ack ALL_TARGET= ack CFLAGS+= -Wno-error=return-type diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile index 090befdbd2115..37b0715ec17ff 100644 --- a/japanese/eterm/Makefile +++ b/japanese/eterm/Makefile @@ -17,6 +17,8 @@ CONFIGURE_ARGS= --enable-trans --enable-utmp \ --with-backspace=bs --without-terminfo \ --enable-multi-charset=kanji +CONFLICTS_INSTALL= eterm zh-eterm # bin/Eterm + PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile index d43e9c34d810f..27f4cbdd07405 100644 --- a/japanese/gawk/Makefile +++ b/japanese/gawk/Makefile @@ -19,6 +19,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-bitops --enable-non-decimal-data MAKE_JOBS_UNSAFE= yes +CONFLICTS_INSTALL= gawk # bin/gawk + DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile index 6cf876933d78e..b8836233c0c84 100644 --- a/japanese/groff/Makefile +++ b/japanese/groff/Makefile @@ -38,7 +38,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}/${PORTVERSION} INFO= groff -CONFLICTS= groff mdocml +CONFLICTS= groff heirloom-doctools # bin/groff bin/hpftodit bin/indxbib TMAC_DISTNAME= tmac-20030521_2 TMACFILES= tmac.orig_me tmac.vgrind \ diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile index 6f586364f73ae..1215085a28d8a 100644 --- a/japanese/jed/Makefile +++ b/japanese/jed/Makefile @@ -27,6 +27,8 @@ ALL_TARGET= ${BINSTUFF} getmail MAKE_JOBS_UNSAFE= yes INFO= jed +CONFLICTS_INSTALL= jed # bin/jed + JED_ROOT= ${DATADIR} BINSTUFF= jed rgrep diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile index 10d87dfd24d8c..46afb60ff09f5 100644 --- a/japanese/kon2-16dot/Makefile +++ b/japanese/kon2-16dot/Makefile @@ -25,6 +25,8 @@ SUB_LIST= KON16FONT=${KON16FONT} \ USES= cpe CPE_VENDOR= ishikawa_mutsumi +CONFLICTS_INSTALL= ja-kon2-*dot # bin/fld + OPTIONS_DEFINE= DOCS # XXX Static libraries with PIE are currently unsupported. diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile index d9ae2fd327007..2e0a121aacafd 100644 --- a/japanese/mh/Makefile +++ b/japanese/mh/Makefile @@ -31,7 +31,7 @@ PORTDOCS= 00.READ.ME.1ST CHANGES.JP COMMANDS.JP FAQ.JP FEATURES.JP \ INSTALL.JP OPTIONS.JP READ-ME.JP TODO.JP DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} -CONFLICTS= nmh +CONFLICTS= ali mmh nmh p5-Dist-Joseki # bin/ali bin/anno bin/burst bin/comp bin/dist bin/folder bin/folders bin/forw bin/inc OPTIONS_DEFINE= DOCS diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile index b3511b7969fc9..3562c1ac43f43 100644 --- a/japanese/plan/Makefile +++ b/japanese/plan/Makefile @@ -14,6 +14,8 @@ MASTERDIR= ${.CURDIR}/../../deskutils/plan PLIST= ${WRKDIR}/PLIST EXTRA_PATCHES= ${.CURDIR}/files/patch-* +CONFLICTS_INSTALL= plan # bin/Killpland + PORTDOCS= plan_calEUC.ps OPTIONS_DEFINE= DOCS diff --git a/java/intellij-ultimate/Makefile b/java/intellij-ultimate/Makefile index 13430553d6fa8..160fbdc2ab27b 100644 --- a/java/intellij-ultimate/Makefile +++ b/java/intellij-ultimate/Makefile @@ -27,7 +27,7 @@ SHEBANG_FILES= bin/printenv.py bin/restart.py \ plugins/spy-js/server/proxy-nix.sh \ plugins/spy-js/server/proxy-osx.sh -CONFLICTS= intellij-20* +CONFLICTS= idea intellij NO_ARCH= yes NO_ARCH_IGNORE= libjansi.so diff --git a/java/intellij/Makefile b/java/intellij/Makefile index 1b202128d8beb..be45a49745fed 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -31,7 +31,7 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/idea-IC-202.7660.26 SUB_FILES= idea idea.desktop pkg-message -CONFLICTS= intellij-ultimate +CONFLICTS= idea intellij-ultimate do-install: # Linux/Windows/OS X only so remove them diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile index da082a5fe0aa5..ed11748eea341 100644 --- a/lang/bsh/Makefile +++ b/lang/bsh/Makefile @@ -15,6 +15,9 @@ GH_PROJECT= beanshell USE_JAVA= 8 USE_ANT= yes + +COMFLICTS_INSTALL= schilyutils # bin/bsh + ALL_TARGET= jarall SUB_FILES= ${PORTNAME}.sh diff --git a/lang/ccl/Makefile b/lang/ccl/Makefile index 62438d38f95d3..d3ce4056cbee0 100644 --- a/lang/ccl/Makefile +++ b/lang/ccl/Makefile @@ -24,6 +24,8 @@ EXCLUDE= cocoa-ide lisp-kernel scripts fx86cl fx86cl.image USE_ASDF= yes +CONFLICTS_INSTALL= cclive # bin/ccl + .include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk" BUILD_DEPENDS+= as:devel/binutils diff --git a/lang/cling/Makefile b/lang/cling/Makefile index 7c30e7208c666..318bfd9568218 100644 --- a/lang/cling/Makefile +++ b/lang/cling/Makefile @@ -36,6 +36,8 @@ USES= cmake compiler:c++11-lib compiler:c11 gnome libedit ncurses \ USE_GNOME= libxml2 USE_LDCONFIG= ${LLVM_PREFIX}/lib +CONFLICTS_INSTALL= llvm zapcc # # bin/bugpoint bin/c-index-test bin/clang bin/clang++ bin/clang-5.0 bin/clang-check bin/clang-cl bin/clang-cpp bin/clang-format bin/clang-import-test bin/clang-offload-bundler bin/clang-rename bin/git-clang-format + SHEBANG_FILES= tools/clang/tools/clang-format/clang-format-diff.py \ tools/clang/tools/clang-format/git-clang-format \ tools/clang/tools/scan-view/bin/scan-view diff --git a/lang/cython-devel/Makefile b/lang/cython-devel/Makefile index 07f6c91b3d792..26a705436193a 100644 --- a/lang/cython-devel/Makefile +++ b/lang/cython-devel/Makefile @@ -15,6 +15,8 @@ USE_PYTHON= allflavors autoplist concurrent distutils USE_GITHUB= yes GH_TAGNAME= 2b1e743 +CONFLICTS_INSTALL= py*-cython # bin/cygdb bin/cygdb-3.8 bin/cython bin/cython-3.8 bin/cythonize bin/cythonize-3.8 + post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Cython -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/lang/cython/Makefile b/lang/cython/Makefile index e77cb41d43111..888a667a48545 100644 --- a/lang/cython/Makefile +++ b/lang/cython/Makefile @@ -16,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= compiler:c11 python:2.7-3.10 USE_PYTHON= allflavors autoplist concurrent distutils +CONFLICTS_INSTALL= py*-cython-devel # bin/cygdb bin/cygdb-3.8 bin/cython bin/cython-3.8 bin/cythonize bin/cythonize-3.8 + post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Cython -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/lang/elixir-devel/Makefile b/lang/elixir-devel/Makefile index 3c532ab2898c5..89c9ea3fee8b3 100644 --- a/lang/elixir-devel/Makefile +++ b/lang/elixir-devel/Makefile @@ -23,7 +23,7 @@ GH_ACCOUNT= elixir-lang USE_LOCALE= en_US.UTF-8 ALL_TARGET= # empty -CONFLICTS= elixir +CONFLICTS= elixir # bin/elixir bin/elixirc bin/iex REINPLACE_ARGS= -i "" NO_ARCH= yes diff --git a/lang/elixir/Makefile b/lang/elixir/Makefile index 3e4bce7296d9b..d57f607894b80 100644 --- a/lang/elixir/Makefile +++ b/lang/elixir/Makefile @@ -21,6 +21,8 @@ USES= gmake USE_GITHUB= yes GH_ACCOUNT= elixir-lang +CONFLICTS= elixir-devel # bin/elixir bin/elixirc bin/iex + USE_LOCALE= en_US.UTF-8 ALL_TARGET= # empty diff --git a/lang/elm/Makefile b/lang/elm/Makefile index 78de20ff4db17..9c76a41ce87fc 100644 --- a/lang/elm/Makefile +++ b/lang/elm/Makefile @@ -18,6 +18,8 @@ USE_GITHUB= yes GH_ACCOUNT= elm GH_PROJECT= compiler +CONFLICTS_INSTALL= elm # bin/elm (from mail/elm) + USE_CABAL= ansi-terminal-0.8.2 \ ansi-wl-pprint-0.6.8.2_2 \ asn1-encoding-0.9.6_1 \ diff --git a/lang/fasm/Makefile b/lang/fasm/Makefile index 0378449920a5e..f9f0747ea1bd1 100644 --- a/lang/fasm/Makefile +++ b/lang/fasm/Makefile @@ -12,6 +12,8 @@ COMMENT= Flat, multiple-pass assembler for IA-32 & x86-64 architectures LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt +CONFLICTS_INSTALL= fasm-fpga SASM # bin/fasm + ONLY_FOR_ARCHS= amd64 i386 IA32_BINARY_PORT= yes diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index fb604f4ed7544..eb317b2f6da57 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsigsegv.so:devel/libsigsegv +CONFLICTS_INSTALL= ja-gawk # bin/gawk + OPTIONS_DEFINE= NLS MPFR OPTIONS_SUB= yes NLS_USES= gettext diff --git a/lang/gcc10-devel/Makefile b/lang/gcc10-devel/Makefile index 8e1688258b537..ca97265666146 100644 --- a/lang/gcc10-devel/Makefile +++ b/lang/gcc10-devel/Makefile @@ -28,7 +28,7 @@ USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build -CONFLICTS= gcc10-10.* +CONFLICTS= gcc10 CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} diff --git a/lang/gcc10/Makefile b/lang/gcc10/Makefile index 22f6022bebfcc..c8df6cff9bd76 100644 --- a/lang/gcc10/Makefile +++ b/lang/gcc10/Makefile @@ -27,7 +27,7 @@ USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build -CONFLICTS= gcc10-devel-10.* +CONFLICTS= gcc10-devel CPE_VENDOR= gnu diff --git a/lang/gcc11-devel/Makefile b/lang/gcc11-devel/Makefile index df58c6d3a7862..1e2538cff9f1f 100644 --- a/lang/gcc11-devel/Makefile +++ b/lang/gcc11-devel/Makefile @@ -28,7 +28,7 @@ USES= compiler:c++11-lang cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build -CONFLICTS= gcc11-11.* +CONFLICTS= gcc11 CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile index 23170ac475f11..c0c1ed5905c80 100644 --- a/lang/gcc11/Makefile +++ b/lang/gcc11/Makefile @@ -27,7 +27,7 @@ USES= compiler:c++11-lang cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build -CONFLICTS= gcc11-devel-11.* +CONFLICTS= gcc11-devel CPE_VENDOR= gnu diff --git a/lang/gcc9-devel/Makefile b/lang/gcc9-devel/Makefile index 1771f3ed4eea7..919a5bbb58816 100644 --- a/lang/gcc9-devel/Makefile +++ b/lang/gcc9-devel/Makefile @@ -28,7 +28,7 @@ USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build -CONFLICTS= gcc9-9.* +CONFLICTS= gcc9 CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} diff --git a/lang/gcc9/Makefile b/lang/gcc9/Makefile index 029662650c292..253d9f21fb36e 100644 --- a/lang/gcc9/Makefile +++ b/lang/gcc9/Makefile @@ -27,7 +27,7 @@ USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build -CONFLICTS= gcc9-devel-9.* +CONFLICTS= gcc9-devel CPE_VENDOR= gnu diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile index 9a88ec7724549..03496a31ec150 100644 --- a/lang/guile2/Makefile +++ b/lang/guile2/Makefile @@ -24,7 +24,7 @@ USE_LDCONFIG= yes CPE_VENDOR= gnu -CONFLICTS_INSTALL= guile +CONFLICTS_INSTALL= guile guile1 # bin/guild bin/guile bin/guile-config bin/guile-snarf bin/guile-tools MAKE_JOBS_UNSAFE= yes diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile index e38ca73c86da1..42eb95323faf3 100644 --- a/lang/linux-j/Makefile +++ b/lang/linux-j/Makefile @@ -20,6 +20,8 @@ LICENSE_PERMS= auto-accept dist-mirror pkg-mirror USES= linux USE_JAVA= yes +CONFLICTS_INSTALL= docbook-utils # bin/jw + ONLY_FOR_ARCHS= i386 amd64 NO_WRKSUBDIR= yes diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 23f96e06e99bd..7003f645a52ae 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= libinotify.so:devel/libinotify RUN_DEPENDS= ${PY_PILLOW} \ ca_root_nss>=0:security/ca_root_nss -CONFLICTS_INSTALL= czmq-3* +CONFLICTS_INSTALL= certmgr coin-or-disco disco mono[0-9]* OPTIONS_DEFINE= MONOLITE NLS X11 OPTIONS_DEFAULT= MONOLITE X11 diff --git a/lang/mono5.10/Makefile b/lang/mono5.10/Makefile index c14ee8d075450..968a3b9107f0b 100644 --- a/lang/mono5.10/Makefile +++ b/lang/mono5.10/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= libinotify.so:devel/libinotify RUN_DEPENDS= ${PY_PILLOW} \ ca_root_nss>=0:security/ca_root_nss -CONFLICTS_INSTALL= czmq-3* mono5.20 mono6.8 +CONFLICTS_INSTALL= certmgr coin-or-disco disco mono mono[0-9]* OPTIONS_DEFINE= MONOLITE NLS X11 OPTIONS_DEFAULT= MONOLITE X11 diff --git a/lang/mono5.20/Makefile b/lang/mono5.20/Makefile index ee4a2fd037f28..62c2c9b6ae669 100644 --- a/lang/mono5.20/Makefile +++ b/lang/mono5.20/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ LIB_DEPENDS= libinotify.so:devel/libinotify RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss -CONFLICTS_INSTALL= mono5.10 mono6.8 +CONFLICTS_INSTALL= certmgr coin-or-disco disco mono mono[0-9]* OPTIONS_DEFINE= MONOLITE NLS X11 HEAPVIZ OPTIONS_DEFAULT= MONOLITE X11 diff --git a/lang/mono6.8/Makefile b/lang/mono6.8/Makefile index 760cacd54b342..487e4f132dfb1 100644 --- a/lang/mono6.8/Makefile +++ b/lang/mono6.8/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ zip>=0:archivers/zip CONFLICTS_BUILD= brotli -CONFLICTS_INSTALL= czmq-3* mono5.10 mono5.20 +CONFLICTS_INSTALL= certmgr coin-or-disco disco mono mono[0-9]* USES= autoreconf bison compiler:c11 cpe gmake iconv libtool \ pathfix perl5 python:3.6+ shebangfix tar:xz diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile index 3d9c5899c02dc..1a06850e55302 100644 --- a/lang/yorick/Makefile +++ b/lang/yorick/Makefile @@ -19,6 +19,8 @@ MAKE_ARGS= Y_HOME=relocatable Y_DOCDIR=/dev/null USE_GITHUB= yes GH_ACCOUNT= dhmunro +COFNLICTS_INSTALL= gist p5-App-gist py*-python-gist # bin/gist + INFO= yorick PORTDOCS= FILE_FORMATS README drat.doc graph.doc hex.doc \ library.doc math.doc refs.pdf refs.tex std.doc \ diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile index d6531a5326f91..5ece47a2e4bb8 100644 --- a/mail/archiveopteryx-devel/Makefile +++ b/mail/archiveopteryx-devel/Makefile @@ -22,6 +22,8 @@ USES= compiler perl5 ssl USE_PERL5= build WITH_PGSQL= client +CONFLICTS_INSTALL= archiveopteryx # bin/aox bin/aoxdeliver bin/aoxexport bin/aoximport + PORTDOCS= COPYING README license.txt SUB_FILES= pkg-message diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile index 9f0eedb095948..fc4395515905c 100644 --- a/mail/archiveopteryx/Makefile +++ b/mail/archiveopteryx/Makefile @@ -17,6 +17,8 @@ USES= compiler perl5 ssl tar:bzip2 USE_PERL5= build WITH_PGSQL= client +CONFLICTS_INSTALL= archiveopteryx-devel # bin/aox bin/aoxdeliver bin/aoxexport bin/aoximport + PORTDOCS= COPYING README bsd.txt SUB_FILES= pkg-message diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile index d10086615b322..224d2d62c60c6 100644 --- a/mail/avenger/Makefile +++ b/mail/avenger/Makefile @@ -15,6 +15,8 @@ USES= bdb ssl GNU_CONFIGURE= yes +CONFLICTS_INSTALL= mailutils # bin/dotlock + USERS= ${PORTNAME} GROUPS= ${USERS} diff --git a/mail/bogofilter-kc/Makefile b/mail/bogofilter-kc/Makefile index 9c4d2285e87f9..85ff1ea2d50d8 100644 --- a/mail/bogofilter-kc/Makefile +++ b/mail/bogofilter-kc/Makefile @@ -7,7 +7,7 @@ MAINTAINER= mandree@FreeBSD.org LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet -CONFLICTS_INSTALL= bogofilter bogofilter-lmdb bogofilter-sqlite bogofilter-tc +CONFLICTS_INSTALL= bogofilter bogofilter-lmdb bogofilter-sqlite CONFIGURE_ARGS= --with-database=kyotocabinet BF_CPPFLAGS= -I${LOCALBASE}/include diff --git a/mail/bogofilter-lmdb/Makefile b/mail/bogofilter-lmdb/Makefile index da69ec5b58a0e..8a874661911a7 100644 --- a/mail/bogofilter-lmdb/Makefile +++ b/mail/bogofilter-lmdb/Makefile @@ -7,7 +7,7 @@ MAINTAINER= mandree@FreeBSD.org LIB_DEPENDS= liblmdb.so:databases/lmdb -CONFLICTS_INSTALL= bogofilter bogofilter-kc bogofilter-sqlite *bogofilter-tc +CONFLICTS_INSTALL= bogofilter bogofilter-kc bogofilter-sqlite CONFIGURE_ARGS= --with-database=lmdb BF_CPPFLAGS= -I${LOCALBASE}/include diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile index a99a0ae07fb44..ade9c52e39795 100644 --- a/mail/bogofilter-sqlite/Makefile +++ b/mail/bogofilter-sqlite/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -sqlite MAINTAINER= mandree@FreeBSD.org USES= sqlite -CONFLICTS_INSTALL= bogofilter bogofilter-lmdb bogofilter-kc bogofilter-tc +CONFLICTS_INSTALL= bogofilter bogofilter-lmdb bogofilter-kc CONFIGURE_ARGS= --with-database=sqlite BF_CPPFLAGS= -I${LOCALBASE}/include diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index 2edc4faefb6f1..a2f6e4dd4dae6 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -21,8 +21,7 @@ OPTIONS_DEFAULT= GSL UNICODE GSL_DESC= Link with system-wide GSL dynamically (recommended) UNICODE_DESC= Normalize tokens to Unicode (UTF-8) (recommended) -CONFLICTS_INSTALL?= bogofilter-sqlite bogofilter-tc bogofilter-lmdb \ - bogofilter-kc +CONFLICTS_INSTALL?= bogofilter-sqlite bogofilter-lmdb bogofilter-kc USES+= cpe perl5 shebangfix tar:xz SHEBANG_FILES= contrib/randomtrain.sh contrib/scramble.sh \ diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile index 641a7439063e1..91041c842150d 100644 --- a/mail/crm114/Makefile +++ b/mail/crm114/Makefile @@ -37,6 +37,8 @@ LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed CFLAGS+= -DVERSION='\"${PORTVERSION}-${CRM114RELEASENAME}\"' CFLAGS+= -DNO_LOGL +CONFLICTS_INSTALL= crmsh # bin/crm + INSTALL_TARGET= install_binary_only CRM_FILES= mailfilter.crm mailfilter.cf mailreaver.crm mailtrainer.crm \ diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 161d79d90a2f9..7bc909dbb33ae 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libpcre.so:devel/pcre -CONFLICTS_INSTALL= cyrus-imapd-2.[^3].* cyrus-imapd2[^3]-2.[^3].* \ - cyrus-imapd3* +CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http USE_RC_SUBR= imapd diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 05a68a05a716e..9e0c27e9e560f 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libpcre.so:devel/pcre -CONFLICTS_INSTALL= cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].* \ - cyrus-imapd3* +CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http USE_RC_SUBR= imapd diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile index 16e9098863174..82c8aa931f072 100644 --- a/mail/cyrus-imapd25/Makefile +++ b/mail/cyrus-imapd25/Makefile @@ -18,8 +18,7 @@ BROKEN_riscv64= fails to build: lib/imapopts.c: Error 1 LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libpcre.so:devel/pcre -CONFLICTS_INSTALL= cyrus-imapd-2.[^5].* cyrus-imapd2[^5]-2.[^5].* \ - cyrus-imapd3* +CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http USES= cpe libtool perl5 ssl USE_RC_SUBR= imapd diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile index 6902f765fdda9..fe00d761bb051 100644 --- a/mail/cyrus-imapd30/Makefile +++ b/mail/cyrus-imapd30/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libjansson.so:devel/jansson \ libpcre.so:devel/pcre -CONFLICTS_INSTALL= cyrus-imapd-2.* cyrus-imapd2* +CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http USES= compiler:c11 cpe gmake libtool perl5 pkgconfig ssl USE_RC_SUBR= imapd diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile index a3b76a400a484..e09463b9fb30e 100644 --- a/mail/cyrus-imapd32/Makefile +++ b/mail/cyrus-imapd32/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libpcre.so:devel/pcre \ libuuid.so:misc/e2fsprogs-libuuid -CONFLICTS_INSTALL= cyrus-imapd-2.* cyrus-imapd2* +CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http USES= compiler:c11 cpe gmake libtool perl5 pkgconfig ssl USE_RC_SUBR= imapd diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile index 0e391e7c32c0c..287b3e9475c66 100644 --- a/mail/cyrus-imapd34/Makefile +++ b/mail/cyrus-imapd34/Makefile @@ -25,7 +25,7 @@ LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libpcre.so:devel/pcre \ libuuid.so:misc/e2fsprogs-libuuid -CONFLICTS_INSTALL= cyrus-imapd-2.* cyrus-imapd2* +CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http USES= compiler:c11 cpe gmake libtool perl5 pkgconfig ssl USE_RC_SUBR= imapd diff --git a/mail/elm/Makefile b/mail/elm/Makefile index 29a80e6704863..59473c605f170 100644 --- a/mail/elm/Makefile +++ b/mail/elm/Makefile @@ -19,6 +19,8 @@ BUILD_DEPENDS= ispell:textproc/aspell-ispell CFLAGS+= -D_SIZE_T +CONFLICTS_INSTALL= hs-elm mailutils # bin/elm bin/frm + WRKSRC= ${WRKDIR}/elm${PORTVERSION} USES= gettext ncurses HAS_CONFIGURE= yes diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index 621ab9d781d2f..f292cef65c40f 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 USES= groff qmail:run -CONFLICTS= ezmlm-0.* +CONFLICTS= ezmlm # bin/ezmlm-list bin/ezmlm-make bin/ezmlm-manage bin/ezmlm-reject bin/ezmlm-return bin/ezmlm-send bin/ezmlm-sub bin/ezmlm-unsub bin/ezmlm-warn bin/ezmlm-weed SUB_FILES= pkg-message diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile index 08c4d55921d8b..5e75da9f02110 100644 --- a/mail/horde-imp/Makefile +++ b/mail/horde-imp/Makefile @@ -50,4 +50,6 @@ USE_HORDE_RUN= Horde_Role \ Horde_Vfs \ Horde_View +CONFLICTS_INSTALL= php*-horde-imp + .include diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile index a31eaf68c3a6c..4aa86139c42c4 100644 --- a/mail/horde-ingo/Makefile +++ b/mail/horde-ingo/Makefile @@ -30,4 +30,6 @@ USE_HORDE_RUN= Horde_Role \ RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:net/pear-Net_Sieve@${PHP_FLAVOR} \ ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} +CONFLICTS_INSTALL= php*-horde-ingo + .include diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index c71a576bbd211..ae62f80100884 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libc-client4.so.9:mail/cclient -CONFLICTS_INSTALL= panda-imap-20* +CONFLICTS_INSTALL= panda-imap # bin/dmail DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile index 1e3168a12d67a..b3a61bbeb16e7 100644 --- a/mail/mailutils/Makefile +++ b/mail/mailutils/Makefile @@ -23,6 +23,8 @@ USE_RC_SUBR= comsatd imap4d pop3d INSTALL_TARGET= install-strip TEST_TARGET= check +CONFLICTS_INSTALL= avenger elm # bin/dotlock bin/frm + PLIST_SUB+= LIBVERSION=8.0.0 LIBSUFX=8 VERSION=${PORTVERSION} INFO= ${PORTNAME} diff --git a/mail/mew-devel/Makefile b/mail/mew-devel/Makefile index d0d021a3504d2..40a8f6c51248f 100644 --- a/mail/mew-devel/Makefile +++ b/mail/mew-devel/Makefile @@ -24,6 +24,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-elispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew \ --with-etcdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew/etc +CONFLICTS_INSTALL= mew mew-emacs_* mew-devel-emacs_* # bin/cmew bin/incm + # target name for make build and install ALL_TARGET= all info INSTALL_TARGET= install diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 78e9219d0b5d9..0790a8deca280 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -20,6 +20,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-elispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew \ --with-etcdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew/etc +CONFLICTS_INSTALL= mew-emacs_* mew-devel mew-devel-emacs_* # bin/cmew bin/incm + # target name for make build and install ALL_TARGET= all info INSTALL_TARGET= install diff --git a/mail/mmh/Makefile b/mail/mmh/Makefile index 227d95cad3268..3c74473d9ebe9 100644 --- a/mail/mmh/Makefile +++ b/mail/mmh/Makefile @@ -40,7 +40,7 @@ LDFLAGS+= -g DEBUG_FLAGS+= -O0 -Wall -Wextra -g .endif -CONFLICTS= ja-mh nmh p5-Dist-Joseki +CONFLICTS= ali ja-mh nmh p5-Dist-Joseki post-install: @${FIND} ${STAGEDIR}${ETCDIR} -type f -exec ${MV} {} {}.sample \; diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index acb4a44f67a6e..c38e26d044f4d 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -93,7 +93,7 @@ LDFLAGS+= -g DEBUG_FLAGS+= -O0 -Wall -Wextra -g .endif -CONFLICTS_INSTALL= ja-mh pixie p5-Dist-Joseki +CONFLICTS_INSTALL= ali ja-mh pixie p5-Dist-Joseki post-install: @${FIND} ${STAGEDIR}${ETCDIR} -type f -exec ${MV} {} {}-dist \; diff --git a/mail/panda-imap/Makefile b/mail/panda-imap/Makefile index fe940b382abb3..66b40ebea7246 100644 --- a/mail/panda-imap/Makefile +++ b/mail/panda-imap/Makefile @@ -17,7 +17,7 @@ USE_GITHUB= yes GH_ACCOUNT= jonabbey GH_TAGNAME= 7905901 -CONFLICTS_INSTALL= imap-uw-20* courier-0.65.* +CONFLICTS_INSTALL= imap-uw # bin/dmail DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message diff --git a/math/calc/Makefile b/math/calc/Makefile index 980de76043675..5a2a2f0df29d1 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -15,6 +15,8 @@ USES= gmake tar:bzip2 readline USE_GITHUB= yes GH_ACCOUNT= lcn2 +CONFLICTS_INSTALL= schilyutils # bin/calc + MAKE_JOBS_UNSAFE= yes PLIST_SUB+= VERSION=${PORTVERSION} diff --git a/math/cbc/Makefile b/math/cbc/Makefile index 19d93066eacd3..cc8f0e07b0e92 100644 --- a/math/cbc/Makefile +++ b/math/cbc/Makefile @@ -32,6 +32,8 @@ GH_PROJECT= Cbc GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-nauty-lib="-L${LOCALBASE}/lib -lnauty" --with-nauty-incdir=${LOCALBASE}/include/nauty +CONFLICTS_INSTALL= libcouchbase # bin/cbc + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so diff --git a/math/coq/Makefile b/math/coq/Makefile index 0c236a0a76a79..96177465a171e 100644 --- a/math/coq/Makefile +++ b/math/coq/Makefile @@ -36,6 +36,8 @@ CONFIGURE_ARGS= -prefix ${PREFIX} \ MAKE_ENV= VERBOSE=1 ALL_TARGET= world +CONFLICTS_INSTALL= coq coq-emacs_* # bin/coq-tex bin/coq_makefile bin/coqc bin/coqchk bin/coqdep bin/coqdoc bin/coqide bin/coqmktop bin/coqtop bin/coqtop.byte bin/coqwc bin/coqworkmgr bin/gallina + OPTIONS_DEFINE= DOCS IDE OPTIONS_DEFAULT= IDE OPTIONS_SUB= yes diff --git a/math/disco/Makefile b/math/disco/Makefile index 919eb821f902a..ba2c29ef16467 100644 --- a/math/disco/Makefile +++ b/math/disco/Makefile @@ -39,6 +39,8 @@ GH_PROJECT= DisCO GNU_CONFIGURE= yes +CONFLICTS_INSTALL= disco mono mono[0-9]* + INSTALL_TARGET= install-strip .include diff --git a/math/gexpr/Makefile b/math/gexpr/Makefile index 548812edbbe7e..8203c1de40ba0 100644 --- a/math/gexpr/Makefile +++ b/math/gexpr/Makefile @@ -11,6 +11,8 @@ COMMENT= Shell calculator LICENSE= GPLv2 +CONFLICTS_INSTALL= coreutils # bin/gexpr + PLIST_FILES= bin/gexpr man/man1/gexpr.1.gz post-patch: diff --git a/math/latte-integrale/Makefile b/math/latte-integrale/Makefile index 49ff1f4794156..da6314f37f77b 100644 --- a/math/latte-integrale/Makefile +++ b/math/latte-integrale/Makefile @@ -28,7 +28,7 @@ GH_ACCOUNT= latte-int GH_PROJECT= latte USE_LDCONFIG= yes -CONFLICTS_INSTALL= latte +CONFLICTS_INSTALL= latte p5-Math-SigFigs schilyutils # bin/count OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/math/p5-Math-SigFigs/Makefile b/math/p5-Math-SigFigs/Makefile index d2e9e4e829ea2..e8540e9f3451a 100644 --- a/math/p5-Math-SigFigs/Makefile +++ b/math/p5-Math-SigFigs/Makefile @@ -10,6 +10,8 @@ COMMENT= Do math with correct handling of significant figures USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= latte latte-integrale schilyutils # # bin/count + PLIST_FILES= bin/count bin/format .include diff --git a/math/topcom/Makefile b/math/topcom/Makefile index 72d403737fd73..da468935fdc05 100644 --- a/math/topcom/Makefile +++ b/math/topcom/Makefile @@ -20,6 +20,8 @@ GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include/cdd/ LDFLAGS+= -lgmp -lgmpxx -lcddgmp +CONFLICTS_INSTALL= p5-Set-CrossProduct # bin/cross + WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} OPTIONS_DEFINE= SOPLEX # SOPLEX shouldn't be made default because SoPlex's license prevents packaging. diff --git a/misc/bdelta/Makefile b/misc/bdelta/Makefile index 00e31f02628a8..83f6bc2c5d983 100644 --- a/misc/bdelta/Makefile +++ b/misc/bdelta/Makefile @@ -18,6 +18,8 @@ USE_GITHUB= yes GH_ACCOUNT= jjwhitney GH_PROJECT= BDelta +CONFLICTS_INSTALL= bpatch # bin/bpatch + PLIST_FILES= bin/bdelta bin/bpatch lib/libbdelta.so PORTDOCS= README diff --git a/misc/clpbar/Makefile b/misc/clpbar/Makefile index 21f492732d3d0..8d1108db764d0 100644 --- a/misc/clpbar/Makefile +++ b/misc/clpbar/Makefile @@ -13,6 +13,8 @@ WRKSRC= ${WRKDIR}/bar-${PORTVERSION} GNU_CONFIGURE= yes MAKE_ARGS+= CFLAGS+="${CFLAGS}" +CONFLICTS_INSTALL= bar # bin/bar + PLIST_FILES= bin/bar \ man/man1/bar.1.gz diff --git a/misc/concourse/Makefile b/misc/concourse/Makefile index c1672e870e1d1..d73573c722e35 100644 --- a/misc/concourse/Makefile +++ b/misc/concourse/Makefile @@ -12,6 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= cpe go:modules USE_GITHUB= yes +CONFLICTS_INSTALL= concourse-fly fly # bin/fly + CPE_VENDOR= pivotal_software GH_TUPLE= \ diff --git a/misc/cpuid/Makefile b/misc/cpuid/Makefile index 3569853a8d57b..353396d2e3b84 100644 --- a/misc/cpuid/Makefile +++ b/misc/cpuid/Makefile @@ -14,4 +14,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd PLIST_FILES= bin/cpuid ONLY_FOR_ARCHS= i386 amd64 +CONFLICTS_INSTALL= gmap # bin/cpuid + .include diff --git a/misc/deco/Makefile b/misc/deco/Makefile index d4b11db6be9b8..e1d455c103533 100644 --- a/misc/deco/Makefile +++ b/misc/deco/Makefile @@ -15,4 +15,6 @@ USES= ncurses tar:tgz GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/share +CONFIGURE_INSTALL= deco # bin/deco + .include diff --git a/misc/gplink/Makefile b/misc/gplink/Makefile index e617e96f30805..bbb0b3b9dbeff 100644 --- a/misc/gplink/Makefile +++ b/misc/gplink/Makefile @@ -20,6 +20,8 @@ MAKE_ARGS= CC="${CC}" \ LDFLAGS+= -lusb WRKSRC_SUBDIR= src +CONFLICTS_INSTALL= gputils # bin/gplink + PLIST_FILES= bin/gplink do-install: diff --git a/misc/hxtools/Makefile b/misc/hxtools/Makefile index 1cd440127c536..12c48f93ffebb 100644 --- a/misc/hxtools/Makefile +++ b/misc/hxtools/Makefile @@ -34,6 +34,8 @@ SHEBANG_FILES= data/hxtools_bashrc.bash data/hxtools_profile.bash \ USE_PERL5= run USE_XORG= xcb +CONFLICTS_INSTALL= grx psptoolchain-pspsdk-stage2 # bin/bin2c + OPTIONS_DEFINE= DOCS EXAMPLES post-patch: diff --git a/misc/jojodiff/Makefile b/misc/jojodiff/Makefile index 609fb17e98f87..c1ce17e405091 100644 --- a/misc/jojodiff/Makefile +++ b/misc/jojodiff/Makefile @@ -15,6 +15,8 @@ USES= gmake tar:tgz MAKE_ARGS= CC="${CC}" CPP="${CXX}" CFLAGS="${CFLAGS}" WRKSRC_SUBDIR= src +CONFLICTS_INSTALL= py*-jsondiff # bin/jdiff + PLIST_FILES= bin/jdiff bin/jptch PORTDOCS= readme.txt readme.htm diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile index 0b2b970e35da2..79ddf7ee00457 100644 --- a/misc/lifelines/Makefile +++ b/misc/lifelines/Makefile @@ -16,6 +16,8 @@ USES= autoreconf bison gmake iconv ncurses GNU_CONFIGURE= yes CONFIGURE_ENV= YACC="bison -y" +CONFLICTS_INSTALL= atheme-services # bin/dbverify + MAKE_JOBS_UNSAFE=yes # Lifelines always installs documenatation. This is contrary to the FreeBSD diff --git a/misc/rubygem-dotenv/Makefile b/misc/rubygem-dotenv/Makefile index a5f7da5980183..0519ac95f1259 100644 --- a/misc/rubygem-dotenv/Makefile +++ b/misc/rubygem-dotenv/Makefile @@ -14,6 +14,8 @@ USE_RUBY= yes NO_ARCH= yes +CONFLICTS_INSTALL= py*-python-dotenv # bin/dotenv + PLIST_FILES= bin/dotenv .include diff --git a/multimedia/cclive/Makefile b/multimedia/cclive/Makefile index d09cd114183a0..83893e63f7e6f 100644 --- a/multimedia/cclive/Makefile +++ b/multimedia/cclive/Makefile @@ -22,6 +22,8 @@ USES= pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-boost=${LOCALBASE} +CONFLICTS_INSTALL= ccl # bin/clive + PLIST_FILES= bin/ccl \ bin/cclive \ man/man1/cclive.1.gz diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile index 525ea664c4259..1b1c1c1bae056 100644 --- a/multimedia/clive/Makefile +++ b/multimedia/clive/Makefile @@ -18,8 +18,8 @@ RUN_DEPENDS= p5-Getopt-ArgvFile>=1.11:devel/p5-Getopt-ArgvFile \ p5-JSON-XS>=2.30:converters/p5-JSON-XS \ quvi>=0.2.16.1:multimedia/quvi -# deskutils/ljclive, multimedia/clive1 (same executable/manpage/distfile name) -CONFLICTS= py*-clive-[0-1]* ljclive +# deskutils/ljclive (same executable/manpage/distfile name) +CONFLICTS= ljclive # bin/clive USES= perl5 USE_PERL5= configure diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile index 892e80982c437..6f51b5df4b834 100644 --- a/multimedia/dragon/Makefile +++ b/multimedia/dragon/Makefile @@ -17,6 +17,8 @@ USE_KDE= auth codecs completion config configwidgets coreaddons crash \ USE_QT= concurrent core dbus gui network phonon4 widgets xml \ buildtools_build qmake_build +CONFLICTS_INSTALL= dragon # bin/dragon + OPTIONS_DEFINE= DOCS .include diff --git a/multimedia/gdialog/Makefile b/multimedia/gdialog/Makefile index c9fd173dd2c5a..3ff870b894ebc 100644 --- a/multimedia/gdialog/Makefile +++ b/multimedia/gdialog/Makefile @@ -18,6 +18,8 @@ RUN_DEPENDS= projectx>=0.90.4.00:multimedia/projectx USES= zip USE_JAVA= yes +CONFLICTS_INSTALL= zenity # bin/gdialog + NO_BUILD= yes NO_WRKSUBDIR= yes SUB_FILES= gdialog diff --git a/net-mgmt/carbonzipper/Makefile b/net-mgmt/carbonzipper/Makefile index 60885b5a1b311..23e0060121352 100644 --- a/net-mgmt/carbonzipper/Makefile +++ b/net-mgmt/carbonzipper/Makefile @@ -39,6 +39,8 @@ GO_BUILDFLAGS= -ldflags='-X main.BuildVersion=${DISTVERSION}' USE_RC_SUBR= ${PORTNAME} +CONFLICTS_INSTALL= carbonapi # bin/carbonzipper + USERS= carbon GROUPS= carbon diff --git a/net-mgmt/cnagios/Makefile b/net-mgmt/cnagios/Makefile index dec84c4e3efd3..ce3bdc1713487 100644 --- a/net-mgmt/cnagios/Makefile +++ b/net-mgmt/cnagios/Makefile @@ -23,6 +23,8 @@ nagios4_RUN_DEPENDS= nagios4>=4.0:net-mgmt/nagios4 USE_GITHUB= yes GH_ACCOUNT= dannywarren +CONFLICTS_INSTALL= cnagios-nagios* # bin/cnagios + NAGIOSDIR?= /var/spool/nagios ETCDIR= ${PREFIX}/etc/nagios GNU_CONFIGURE= YES diff --git a/net-mgmt/crmsh/Makefile b/net-mgmt/crmsh/Makefile index 1b34436a6fef0..abcd5773d4632 100644 --- a/net-mgmt/crmsh/Makefile +++ b/net-mgmt/crmsh/Makefile @@ -28,6 +28,8 @@ CONFIGURE_ARGS= --with-ocf-root=${PREFIX}/lib/ocf NO_ARCH= yes +CONFLICTS_INSTALL= crm114 # bin/crm + SHEBANG_FILES= bin/crm hb_report/hb_report.in \ scripts/*/*.py \ test/cib-tests.sh \ diff --git a/net-mgmt/disco/Makefile b/net-mgmt/disco/Makefile index f665b9711105d..c19547f1b1073 100644 --- a/net-mgmt/disco/Makefile +++ b/net-mgmt/disco/Makefile @@ -13,6 +13,8 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= coin-or-disco mono mono[0-9]* # bin/disco + WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= bin/disco bin/disco.fp diff --git a/net-mgmt/icingaweb2/Makefile b/net-mgmt/icingaweb2/Makefile index 3e9960e6f73c1..f9925a00b1ba0 100644 --- a/net-mgmt/icingaweb2/Makefile +++ b/net-mgmt/icingaweb2/Makefile @@ -23,6 +23,8 @@ GH_ACCOUNT= icinga NO_BUILD= yes NO_ARCH= yes +CONFLICTS_INSTALL= icingaweb2-php* # bin/icingacli + SUB_FILES= pkg-message SUB_LIST= ETCDIR=${ETCDIR} \ EXAMPLESDIR=${EXAMPLESDIR} \ diff --git a/net-p2p/btcheck/Makefile b/net-p2p/btcheck/Makefile index c205af140e70b..b2e8ed367a0dd 100644 --- a/net-p2p/btcheck/Makefile +++ b/net-p2p/btcheck/Makefile @@ -12,6 +12,8 @@ LICENSE= GPLv3 GNU_CONFIGURE= yes +CONFLICTS_INSTALL= libbt # bin/btcheck + PLIST_FILES= bin/btcheck man/man1/btcheck.1.gz PORTDOCS= AUTHORS ChangeLog NEWS README diff --git a/net-p2p/ed2k/Makefile b/net-p2p/ed2k/Makefile index c6eac2d6e15c4..97e56c75bf31d 100644 --- a/net-p2p/ed2k/Makefile +++ b/net-p2p/ed2k/Makefile @@ -13,7 +13,7 @@ COMMENT= Calculates 'eMule' hashes or producing ed2k:// file links LICENSE= PD BSD3CLAUSE LICENSE_COMB= multi -CONFLICTS= amule +CONFLICTS= amule amule-devel # bin/ed2k NO_WRKSUBDIR= yes MAKEFILE= /dev/null diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile index 1864bb14eafe0..779169c7f80fd 100644 --- a/net-p2p/libbt/Makefile +++ b/net-p2p/libbt/Makefile @@ -17,6 +17,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ USES= gmake localbase ssl GNU_CONFIGURE= yes +CONFLICTS_INSTALL= btcheck # bin/btcheck + DOCS= docs/protocol.txt docs/protocol-ext.txt \ CHANGELOG CREDITS README diff --git a/net-p2p/shx/Makefile b/net-p2p/shx/Makefile index ba9a1aa929669..9d10841a98ebc 100644 --- a/net-p2p/shx/Makefile +++ b/net-p2p/shx/Makefile @@ -33,6 +33,8 @@ GNU_CONFIGURE= yes CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} +CONFLICTS_INSTALL= helix # bin/hx + CIPHER_IMPLIES= HOPE COMPRESS_IMPLIES= HOPE diff --git a/net/bosh-cli/Makefile b/net/bosh-cli/Makefile index e9581026307cd..96211bb244385 100644 --- a/net/bosh-cli/Makefile +++ b/net/bosh-cli/Makefile @@ -15,6 +15,8 @@ CONFLICTS_INSTALL= rubygem-bosh_cli USES= go tar:xz +CONFLICTS_INSTALL= schilyutils # bin/bosh + GO_PKGNAME= github.com/cloudfoundry/bosh-cli PLIST_FILES= bin/bosh diff --git a/net/cf/Makefile b/net/cf/Makefile index e8dbd98bfe421..2d30c3e13fd96 100644 --- a/net/cf/Makefile +++ b/net/cf/Makefile @@ -17,6 +17,8 @@ GH_PROJECT= cli USES= go +CONFLICTS_INSTALL= lbl-cf # bin/cf + GO_BUILDFLAGS= -ldflags="-X code.cloudfoundry.org/cli/version.binaryVersion=${PORTVERSION}" GO_PKGNAME= code.cloudfoundry.org/cli GO_TARGET= :cf diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile index 380ec61280d37..d1bd04b19a4e6 100644 --- a/net/clusterit/Makefile +++ b/net/clusterit/Makefile @@ -12,6 +12,8 @@ LICENSE= BSD2CLAUSE GNU_CONFIGURE= yes +CONFLICTS_INSTALL= barrier heirloom-sh pdsh schilyutils # bin/barrier bin/dshbak bin/jsh + OPTIONS_DEFINE= X11 OPTIONS_SUB= yes diff --git a/net/concourse-fly/Makefile b/net/concourse-fly/Makefile index 46147360103f5..2c0c32198146c 100644 --- a/net/concourse-fly/Makefile +++ b/net/concourse-fly/Makefile @@ -17,7 +17,7 @@ GO_TARGET= ./cmd/concourse:fly GO_BUILDFLAGS= -ldflags="-s -w -X github.com/concourse/concourse.Version=${PORTVERSION}" CGO_CFLAGS= -I. -CONFLICTS_INSTALL= fly +CONFLICTS_INSTALL= concourse fly # bin/fly PLIST_FILES= bin/fly diff --git a/net/eternalterminal/Makefile b/net/eternalterminal/Makefile index 4a9d8d546ee6a..22b315379b293 100644 --- a/net/eternalterminal/Makefile +++ b/net/eternalterminal/Makefile @@ -20,6 +20,8 @@ USE_GITHUB= yes GH_ACCOUNT= MisterTea GH_PROJECT= EternalTerminal +CONFLICTS_INSTALL= linux-enemyterritory # bin/et + PLIST_FILES= bin/et \ bin/etserver \ bin/etterminal \ diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index b2c089c0b49b2..07fd02e719ede 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -29,8 +29,7 @@ sqlite3_PKGNAMESUFFIX= -sqlite3 LOGDIR?= /var/log KRB5_CONFIG?= /usr/bin/krb5-config --libs -CONFLICTS_INSTALL= gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \ - freeradius-mysql-[0-9].* freeradius-[^3].* +CONFLICTS_INSTALL= freeradius-* # bin/dhcpclient USES= cpe gmake readline shebangfix ssl tar:bzip2 USE_RC_SUBR= radiusd diff --git a/net/go-cs/Makefile b/net/go-cs/Makefile index cba2803b50d47..18f522817199a 100644 --- a/net/go-cs/Makefile +++ b/net/go-cs/Makefile @@ -16,6 +16,8 @@ USES= go USE_GITHUB= yes GH_ACCOUNT= akosela +CONFLICTS_INSTALL= clearsilver csound # bin/cs + PLIST_FILES= bin/cs man/man1/cs.1.gz GO_TARGET= ./cs diff --git a/net/keycloak/Makefile b/net/keycloak/Makefile index e4554441cdea7..17eaf7936492b 100644 --- a/net/keycloak/Makefile +++ b/net/keycloak/Makefile @@ -39,6 +39,8 @@ JAVA_RUN= yes USE_RC_SUBR= keycloak +CONFLICTS_INSTALL= keycloak keycloak-mysql keycloak-postgresql # bin/kcadm bin/kcreg + USER= www GROUP= www diff --git a/net/kget/Makefile b/net/kget/Makefile index 664d72ad3d9c7..6a59cbcf70446 100644 --- a/net/kget/Makefile +++ b/net/kget/Makefile @@ -33,6 +33,8 @@ USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null CONFIGURE_ENV= XDG_CONFIG_HOME=/dev/null +CONFLICTS_INSTALL= sra-tools # bin/kget + OPTIONS_DEFINE= DOCS WORKSPACE OPTIONS_DEFAULT= WORKSPACE diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 176912f0efc75..711fd8c553934 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -75,7 +75,7 @@ LIBWRAP_CONFIGURE_ENABLE=tcp-wrappers SHEBANG_GLOB= afpstats -CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit +CONFLICTS= jday yudit # bin/dbd man/man1/uniconv.1.gz .include diff --git a/net/pear-Net_URL_Mapper/Makefile b/net/pear-Net_URL_Mapper/Makefile index 2966cbe1c7a09..e462bffa0d4fb 100644 --- a/net/pear-Net_URL_Mapper/Makefile +++ b/net/pear-Net_URL_Mapper/Makefile @@ -9,4 +9,6 @@ COMMENT= Simple and flexible way to build nice URLs for web applications USES= pear +CONFLICTS_INSTALL= php*-pear-Net_URL_Mapper # bin/create_package.xml.php bin/generate_path.php + .include diff --git a/net/py-ripe.atlas.tools/Makefile b/net/py-ripe.atlas.tools/Makefile index a3d5584105103..c55313415c93c 100644 --- a/net/py-ripe.atlas.tools/Makefile +++ b/net/py-ripe.atlas.tools/Makefile @@ -24,4 +24,6 @@ USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes +CONFLICTS_INSTALL= c-ares # bin/adig + .include diff --git a/net/samba412/Makefile b/net/samba412/Makefile index 2e305c01df4af..69d400b311815 100644 --- a/net/samba412/Makefile +++ b/net/samba412/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support -CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-9]-4.* samba41[013-9]-4.1* p5-Parse-Pidl-4.* +CONFLICTS_INSTALL?= samba4* # bin/cifsdd bin/dbwrap_tool bin/dumpmscat bin/findsmb bin/gentest USES= cpe diff --git a/net/samba413/Makefile b/net/samba413/Makefile index 1ce9dca2b9a0b..dc886f703a5fb 100644 --- a/net/samba413/Makefile +++ b/net/samba413/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support -CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-9]-4.* samba41[0-24-9]-4.1* p5-Parse-Pidl-4.* +CONFLICTS_INSTALL?= samba4* # bin/cifsdd bin/dbwrap_tool bin/dumpmscat bin/findsmb bin/gentest USES= cpe diff --git a/news/cnews/Makefile b/news/cnews/Makefile index 42419d2823c75..48bcb3bef0fd1 100644 --- a/news/cnews/Makefile +++ b/news/cnews/Makefile @@ -39,6 +39,8 @@ USES= tar:Z USE_CSTD= gnu89 CFLAGS+= -Wno-return-type +CONFLICTS_INSTALL= s-news trn4 # bin/inews + DIST_SUBDIR= ${DISTNAME} NO_WRKSUBDIR= yes MAKEFILE= makefile diff --git a/news/s-news/Makefile b/news/s-news/Makefile index 29489a5834e88..11881197b9504 100644 --- a/news/s-news/Makefile +++ b/news/s-news/Makefile @@ -11,7 +11,7 @@ COMMENT= Simple news server for hosts with one or two users LIB_DEPENDS= libgdbm.so:databases/gdbm -CONFLICTS= leafnode-[1-9]* nntp +CONFLICTS= cnews nntp trn4 # bin/inews sbin/nntpd CONFIGURE_ARGS+= \ --with-confdir=${PREFIX}/etc/s-news \ diff --git a/news/trn/Makefile b/news/trn/Makefile index 50aafc58adeb5..f29fda91d6bc2 100644 --- a/news/trn/Makefile +++ b/news/trn/Makefile @@ -11,7 +11,7 @@ COMMENT= Threaded Read News newsreader RUN_DEPENDS= munpack:converters/mpack -CONFLICTS_INSTALL=trn-4.[0-9]* +CONFLICTS_INSTALL= s-news trn4 USES= ncurses WRKSRC= ${WRKDIR}/trn-3.6 diff --git a/news/trn4/Makefile b/news/trn4/Makefile index d6e0e23843288..3ee9c0a48745b 100644 --- a/news/trn4/Makefile +++ b/news/trn4/Makefile @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-test/} MAINTAINER= ports@FreeBSD.org COMMENT= Version 4.0 of the threaded readnews newsreader -CONFLICTS_INSTALL=trn-3.[0-9]* cnews s-news +CONFLICTS_INSTALL= trn cnews s-news USES= ncurses diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 5f7f56ee84d1a..9ea6ea941131b 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -23,7 +23,7 @@ USE_GNOME= glib20 USE_LDCONFIG= yes USE_RC_SUBR= cups_browsed -CONFLICTS= cups-pstoraster foomatic-filters +CONFLICTS= foomatic-filters # bin/foomatic-rip CPE_VENDOR= linuxfoundation SHEBANG_FILES= filter/braille/drivers/generic/brftoembosser.in \ diff --git a/print/detex/Makefile b/print/detex/Makefile index f4e1acfb920cf..5c9a6d6623980 100644 --- a/print/detex/Makefile +++ b/print/detex/Makefile @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= tar MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DNO_MALLOC_DECL -DHAVE_STRING_H" +CONFLICTS_INSTALL= texlive-base # bin/detex + PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz PORTDOCS= README diff --git a/print/dvi2tty/Makefile b/print/dvi2tty/Makefile index 1fcbd5468d222..e1e5f4f32d4d6 100644 --- a/print/dvi2tty/Makefile +++ b/print/dvi2tty/Makefile @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= DVI file previewer for text only devices -CONFLICTS= ja-dvi2tty +CONFLICTS= texlive-base # bin/disdvi bin/dvi2tty MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${STRIP}" diff --git a/print/enscript-a4/Makefile b/print/enscript-a4/Makefile index 5ade23dfe9831..05d103a6b54e2 100644 --- a/print/enscript-a4/Makefile +++ b/print/enscript-a4/Makefile @@ -1,6 +1,6 @@ # Created by: kline -CONFLICTS= enscript-letter enscript-letterdj +CONFLICTS= enscript-letter enscript-letterdj zh-enscript-a4 PS= A4 diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile index 1681ff9ee2d60..1707cde23654f 100644 --- a/print/enscript-letter/Makefile +++ b/print/enscript-letter/Makefile @@ -22,7 +22,7 @@ OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -CONFLICTS?= enscript-a4 enscript-letterdj +CONFLICTS?= enscript-a4 enscript-letterdj zh-enscript-a4 INFO= enscript CPE_VENDOR= gnu diff --git a/print/enscript-letterdj/Makefile b/print/enscript-letterdj/Makefile index e9bd03d0b28bf..ed100dad012bb 100644 --- a/print/enscript-letterdj/Makefile +++ b/print/enscript-letterdj/Makefile @@ -1,6 +1,6 @@ # Created by: kline -CONFLICTS= enscript-a4 enscript-letter +CONFLICTS= enscript-a4 enscript-letter zh-enscript-a4 PS= Letterdj diff --git a/print/ghostscript7-base/Makefile b/print/ghostscript7-base/Makefile index bbae9441a3ab9..609349fb533bb 100644 --- a/print/ghostscript7-base/Makefile +++ b/print/ghostscript7-base/Makefile @@ -19,12 +19,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:print/gsfonts -CONFLICTS_INSTALL= \ - gambc \ - ghostscript[789] \ - ghostscript[789]-nox11 \ - ghostscript9-agpl \ - ghostscript9-agpl-nox11 +CONFLICTS_INSTALL= ghostscript*-base # CHECK USES= autoreconf cpe gmake jpeg shebangfix tar:bzip2 USE_LDCONFIG= yes diff --git a/print/ghostscript8-base/Makefile b/print/ghostscript8-base/Makefile index bac4d767ebf8c..3a259878cccb2 100644 --- a/print/ghostscript8-base/Makefile +++ b/print/ghostscript8-base/Makefile @@ -26,12 +26,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libtiff.so:graphics/tiff RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:print/gsfonts -CONFLICTS_INSTALL= \ - gambc \ - ghostscript[789] \ - ghostscript[789]-nox11 \ - ghostscript9-agpl \ - ghostscript9-agpl-nox11 +CONFLICTS_INSTALL= ghostscript*-base # CHECK USES= autoreconf cpe gmake pkgconfig shebangfix tar:xz USE_LDCONFIG= yes diff --git a/print/ghostscript9-base/Makefile b/print/ghostscript9-base/Makefile index 335fd32bc7aa9..1627105aaa643 100644 --- a/print/ghostscript9-base/Makefile +++ b/print/ghostscript9-base/Makefile @@ -25,12 +25,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libtiff.so:graphics/tiff RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:print/gsfonts -CONFLICTS_INSTALL= \ - gambc \ - ghostscript[789] \ - ghostscript[789]-nox11 \ - ghostscript9-agpl \ - ghostscript9-agpl-nox11 +CONFLICTS_INSTALL= ghostscript*-base # CHECK USES= autoreconf cpe gmake jpeg pkgconfig:build tar:bzip2 USE_LDCONFIG= yes diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile index d03fe002ecfa7..0820f5941b1e8 100644 --- a/print/html2ps/Makefile +++ b/print/html2ps/Makefile @@ -20,6 +20,8 @@ RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \ NO_BUILD= yes USES= ghostscript:run magick:6,run perl5 +CONFLICTS_INSTALL= p5-DocSet # bin/html2ps + SUB_FILES= html2psrc PLIST_FILES= bin/html2ps \ diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile index 3151ffcd212f6..1703ebc239ccb 100644 --- a/print/hyperlatex/Makefile +++ b/print/hyperlatex/Makefile @@ -15,6 +15,8 @@ RUN_DEPENDS= ppmtogif:graphics/netpbm USES= emacs USE_TEX= latex +CONFLICTS_INSTALL= Hyperlatex Hyperlatex-emacs_* + LATEX_DIR= ${PREFIX}/share/texmf/tex/latex/hyperlatex HYPERLATEX_DIR= ${PREFIX}/share/hyperlatex diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index 106b0e71a1fdb..985860b049603 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -43,6 +43,8 @@ CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \ HOME=${WRKDIR} \ YACC=${YACC} +CONFLICTS_INSTALL= lilypond + MAKEFILE= GNUmakefile ALL_TARGET= all diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 8c32aa5f7a382..3f1ebe64b3d0b 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -42,6 +42,8 @@ CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \ HOME=${WRKDIR} \ YACC=${YACC} +CONFLICTS_INSTALL= lilypond-devel + MAKEFILE= GNUmakefile ALL_TARGET= all diff --git a/print/mp-a4/Makefile b/print/mp-a4/Makefile index 9ea15768315b3..47b3a528a09ec 100644 --- a/print/mp-a4/Makefile +++ b/print/mp-a4/Makefile @@ -3,4 +3,6 @@ PAPERSIZE= a4 MASTERDIR= ${.CURDIR}/../mp-letter +CONFLICTS_INSTALL= mp-a4 + .include "${MASTERDIR}/Makefile" diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile index 923c32d579e4c..1d41131fdc169 100644 --- a/print/mp-letter/Makefile +++ b/print/mp-letter/Makefile @@ -9,6 +9,8 @@ DISTNAME= mp-3.0.1 MAINTAINER= ports@FreeBSD.org COMMENT= PostScript printing util for ASCII files +CONFLICTS_INSTALL?= mp-a4 + WRKSRC= ${WRKDIR}/mp LINKS= digestp filep filofaxp franklinp mailp newsp timemanp timesysp diff --git a/print/pdf-tools/Makefile b/print/pdf-tools/Makefile index 05fdbe578aaa3..f885c472eb3e3 100644 --- a/print/pdf-tools/Makefile +++ b/print/pdf-tools/Makefile @@ -24,6 +24,8 @@ USE_GITHUB= yes GH_ACCOUNT= vedang USE_GNOME= cairo glib20 +CONFLICTS_INSTALL= pdf-tools pdf-tools-emacs_* # bin/epdfinfo + EMACS_FLAVORS_EXCLUDE= devel_nox nox do-build: diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile index 055b97965fa24..d22f545c6d050 100644 --- a/print/py-fonttools/Makefile +++ b/print/py-fonttools/Makefile @@ -17,6 +17,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ufolib2>=0:print/py-ufolib2@${PY_FLAVOR} USES= python:3.7+ zip USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-fonttools3 # bin/fonttools + MAKE_ENV= FONTTOOLS_MANPATH="man" NO_ARCH= yes diff --git a/print/py-fonttools3/Makefile b/print/py-fonttools3/Makefile index cbcd02ff2ceda..530d59500f0ac 100644 --- a/print/py-fonttools3/Makefile +++ b/print/py-fonttools3/Makefile @@ -16,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:3.7+ zip USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-fonttools # bin/fonttools + MAKE_ENV= FONTTOOLS_MANPATH="man" NO_ARCH= yes diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 46a24ebd725f1..1b91353c5116f 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -104,7 +104,7 @@ CONFIGURE_ARGS+=--with-system-$L \ MAKE_ENV= CONFIG_SITE=${CONFIG_SITE} INSTALL_TARGET= install-strip -CONFLICTS_INSTALL= ps2eps texlive-texmf-201[234]* +CONFLICTS_INSTALL= detex dvi2tty ps2eps texlive-texmf EXTRACT_AFTER_ARGS= ${EXCLUDE_FILES:S,^,--exclude ,} INFO= dvipng tlbuild PLIST_SUB= INSTALL_DATA="${INSTALL_DATA}" diff --git a/print/transfig/Makefile b/print/transfig/Makefile index 4ab44d84c8f62..2e4b02123b5ed 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -17,6 +17,8 @@ USES= alias ghostscript:run imake xorg CFLAGS+= -Wno-return-type USE_XORG= xpm +CONFLICTS_INSTALL= fig2dev # bin/fig2dev bin/fig2ps2tex + MAKE_ARGS+= INSTALLFLAGS="${COPY}" \ INSTPGMFLAGS="${STRIP}" \ INSTBINFLAGS="-m ${BINMODE}" \ diff --git a/science/ergo/Makefile b/science/ergo/Makefile index d4ed53f3e719a..b787a939e117d 100644 --- a/science/ergo/Makefile +++ b/science/ergo/Makefile @@ -19,6 +19,8 @@ SHEBANG_FILES= test/check_eigenvectors.sh test/compare_homo_lumo.sh GNU_CONFIGURE= yes +CONFLICTS_INSTALL= ergo-irc-server # bin/ergo + TEST_TARGET= check OPTIONS_DEFINE_amd64= SSE diff --git a/science/ghmm/Makefile b/science/ghmm/Makefile index 6f9a02e433c4e..bf051a511dd0e 100644 --- a/science/ghmm/Makefile +++ b/science/ghmm/Makefile @@ -20,4 +20,6 @@ CONFIGURE_ARGS+= --without-python USE_LDCONFIG= yes +CONFLICTS_INSTALL= graphviz # bin/cluster + .include diff --git a/science/silo/Makefile b/science/silo/Makefile index 2e988ae288eb7..d9a025fcf2c1f 100644 --- a/science/silo/Makefile +++ b/science/silo/Makefile @@ -20,6 +20,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --disable-static INSTALL_TARGET= install-strip +CONFLICTS_INSTALL= deforaos-browser # bin/browser + OPTIONS_DEFINE= FORTRAN HDF5 PYTHON OPTIONS_DEFAULT= HDF5 OPTIONS_SUB= yes diff --git a/security/barnyard2-sguil/Makefile b/security/barnyard2-sguil/Makefile index 960a54753aaea..55d52f5270f78 100644 --- a/security/barnyard2-sguil/Makefile +++ b/security/barnyard2-sguil/Makefile @@ -5,4 +5,6 @@ MASTERDIR= ${.CURDIR}/../barnyard2 # enable tcl binding for sguil SLAVE= yes +CONFLICTS_INSTALL= barnyard2 + .include "${MASTERDIR}/Makefile" diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile index 71e5f8057f14a..da6371b85b7a0 100644 --- a/security/barnyard2/Makefile +++ b/security/barnyard2/Makefile @@ -14,6 +14,8 @@ USES= autoreconf libtool USE_GITHUB= yes GH_ACCOUNT= firnsy +CONFLICTS_INSTALL?= barnyard2-sguil # bin/barnyard2 + OPTIONS_DEFINE= 64BIT ARUBA GRE IPV6 MPLS PORT_PCAP DOCS EXAMPLES OPTIONS_RADIO= DATABASE OPTIONS_RADIO_DATABASE= MYSQL MYSQL_SSL ODBC PGSQL diff --git a/security/certmgr/Makefile b/security/certmgr/Makefile index 17677ae8e0dc2..981bca3e7628c 100644 --- a/security/certmgr/Makefile +++ b/security/certmgr/Makefile @@ -45,6 +45,8 @@ GH_TUPLE= beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \ spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \ spf13:viper:v1.4.0:spf13_viper/vendor/github.com/spf13/viper +CONFLICTS_INSTALL= mono mono[0-9]* # bin/certmgr + GO_TARGET= ./certmgr SUB_FILES= certmgr.yaml.sample pkg-message diff --git a/security/cowrie/Makefile b/security/cowrie/Makefile index 439d04593f5b2..28cc0c00cf6b3 100644 --- a/security/cowrie/Makefile +++ b/security/cowrie/Makefile @@ -28,6 +28,8 @@ SHEBANG_FILES= bin/cowrie USE_GITHUB= yes USE_PYTHON= distutils noflavors autoplist +CONFLICTS_INSTALL= py*-asciinema # bin/asciinema + NO_ARCH= yes .include diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index be4a7e83dd431..139052da9628c 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -28,6 +28,8 @@ CONFIGURE_ARGS+= --docdir=${DOCSDIR} LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -fcommon +CONFLICTS_INSTALL= gnupg # bin/dirmngr bin/dirmngr-client + OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index f95068570253c..5862cb1f4bed8 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= pinentry:security/pinentry USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite tar:bzip2 -CONFLICTS= gnupg-2.0.* dirmngr +CONFLICTS= dirmngr CPE_VENDOR= gnupg CONFIGURE_ARGS= --disable-ntbtls --enable-gpg-is-gpg2 --enable-symcryptrun diff --git a/security/gpgdir/Makefile b/security/gpgdir/Makefile index 044c27f461616..922e7d1cfdf5f 100644 --- a/security/gpgdir/Makefile +++ b/security/gpgdir/Makefile @@ -21,6 +21,8 @@ USES= perl5 shebangfix USE_PERL5= run SHEBANG_FILES= gpgdir +CONFLICTS_INSTALL= signing-party # bin/gpgdir + PLIST_FILES= bin/gpgdir man/man1/gpgdir.1.gz do-install: diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 892d3f72bc5a3..1e28b4f8ae861 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -12,8 +12,7 @@ COMMENT= Popular BSD-licensed implementation of Kerberos 5 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= krb4 krb5 krb5-maint srp \ - wu-ftpd wu-ftpd+ipv6 +CONFLICTS= krb5 krb5-* USES= cpe gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \ pkgconfig readline makeinfo ssl diff --git a/security/idea/Makefile b/security/idea/Makefile index c6f182772cffc..5cfc7d5d2a7a3 100644 --- a/security/idea/Makefile +++ b/security/idea/Makefile @@ -12,6 +12,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ehaupt@FreeBSD.org COMMENT= Command-line IDEA encryption and decryption utility +CONFLICTS_INSTALL= intellij intellij-ultimate # bin/idea + WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= DOCS diff --git a/security/keychain/Makefile b/security/keychain/Makefile index 68581b055cf40..04e1739f6bf83 100644 --- a/security/keychain/Makefile +++ b/security/keychain/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt USE_GITHUB= yes GH_ACCOUNT= funtoo +CONFLICTS_INSTALL= py*-pycoin # bin/keychain + OPTIONS_DEFINE= DOCS NO_BUILD= yes diff --git a/security/krb5-117/Makefile b/security/krb5-117/Makefile index b480c012ce50b..4e87fe7afa050 100644 --- a/security/krb5-117/Makefile +++ b/security/krb5-117/Makefile @@ -19,8 +19,7 @@ EXPIRATION_DATE= 2022-02-01 LICENSE= MIT -CONFLICTS= heimdal srp krb5-11[3-6] \ - krb5-1.[0-9]* krb5-devel +CONFLICTS= heimdal krb5 krb5-* CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-118/Makefile b/security/krb5-118/Makefile index 789c17e75af0f..0f818530bdbbb 100644 --- a/security/krb5-118/Makefile +++ b/security/krb5-118/Makefile @@ -16,8 +16,7 @@ COMMENT= MIT implementation of RFC 4120 network authentication service LICENSE= MIT -CONFLICTS= heimdal srp krb5-11[3-6] \ - krb5-1.[0-9]* krb5-devel +CONFLICTS= heimdal krb5 krb5-* CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile index 59da2eed06b30..47080d6e47ad3 100644 --- a/security/krb5-119/Makefile +++ b/security/krb5-119/Makefile @@ -16,8 +16,7 @@ COMMENT= MIT implementation of RFC 4120 network authentication service LICENSE= MIT -CONFLICTS= heimdal srp krb5-11[3-6] \ - krb5-1.[0-9]* krb5-devel +CONFLICTS= heimdal krb5 krb5-* CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index f4ae9cea0160a..c83cdaa086f8f 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -20,8 +20,7 @@ LICENSE= MIT USE_GITHUB= yes GH_TAGNAME= ${HASH} -CONFLICTS= heimdal srp krb5-11[345] \ - krb5-1.[0-9]* +CONFLICTS= heimdal krb5 krb5-* KERBEROSV_URL= http://web.mit.edu/kerberos/ USE_PERL5= build diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 1bff35bc34a60..8648b1c358205 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -18,7 +18,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= libressl libressl-devel openssl +CONFLICTS_INSTALL= libressl libressl-devel openssl openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl/Makefile b/security/openssl/Makefile index dcac89a989727..01d4eb2b8efea 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -14,7 +14,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= libressl libressl-devel openssl-devel +CONFLICTS_INSTALL= libressl libressl-devel openssl-devel openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/outguess/Makefile b/security/outguess/Makefile index 69047e6dd8fb0..4fa188c277bb1 100644 --- a/security/outguess/Makefile +++ b/security/outguess/Makefile @@ -18,7 +18,7 @@ LICENSE= BSD4CLAUSE DEPRECATED= Abandonware, dead upstream and last release in 2001 EXPIRATION_DATE=2022-03-31 -CONFLICTS_INSTALL= csound +CONFLICTS_INSTALL= csound libextractor # bin/extract GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/outguess diff --git a/security/pear-Crypt_GPG/Makefile b/security/pear-Crypt_GPG/Makefile index 922661e9e0984..2ed4096f24351 100644 --- a/security/pear-Crypt_GPG/Makefile +++ b/security/pear-Crypt_GPG/Makefile @@ -15,6 +15,8 @@ RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Console_CommandLine>=1.1.10:devel/pear-Console USES= pear USE_PHP= mbstring posix +CONFLICTS_INSTALL= php*-pear-Crypt_GPG # bin/crypt-gpg-pinentry + NO_ARCH= yes .include diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile index 74aee71b3608a..406e8ed60242b 100644 --- a/security/signing-party/Makefile +++ b/security/signing-party/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= gpg:security/gnupg \ USES= perl5 python gmake shebangfix SHEBANG_FILES= ${SCRIPTS} BINARY_ALIAS= sed=gsed -CONFLICTS_INSTALL=sig2dot springgraph +CONFLICTS_INSTALL= pgpdir sig2dot springgraph # bin/gpgdir bin/sig2dot bin/springgraph USE_GITLAB= yes GL_SITE= https://salsa.debian.org/ diff --git a/shells/fd/Makefile b/shells/fd/Makefile index 22bed822d621d..34981c2b3d56a 100644 --- a/shells/fd/Makefile +++ b/shells/fd/Makefile @@ -15,6 +15,8 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ PREFIX="\$$(DESTDIR)${PREFIX}" \ CONFDIR="\$$(DESTDIR)${PREFIX}/etc" \ +CONFLICTS_INSTALL= fd-find # bin/fd + DOCS_EN= FAQ.eng \ LICENSES.eng \ README.eng \ diff --git a/shells/heirloom-sh/Makefile b/shells/heirloom-sh/Makefile index 04a8a214358d9..258b0bd0d35d8 100644 --- a/shells/heirloom-sh/Makefile +++ b/shells/heirloom-sh/Makefile @@ -13,6 +13,9 @@ BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk USES= tar:bzip2 + +CONFLICTS_INSTALL= clusterit schilyutils # bin/jsh + MAKEFILE= makefile PLIST_FILES= "@shell bin/jsh" \ man/man1/jsh.1.gz diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile index aedb1850b774a..47ab9ad984e58 100644 --- a/sysutils/LPRng/Makefile +++ b/sysutils/LPRng/Makefile @@ -38,7 +38,7 @@ CFLAGS+= -fcommon SUB_FILES= pkg-message -CONFLICTS= cups-base-1.[2-9]* +CONFLICTS= cups OPTIONS_DEFINE= LIBWRAP NLS OPTIONS_DEFAULT= LIBWRAP diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile index bd125e695a606..9888725815c56 100644 --- a/sysutils/barrier/Makefile +++ b/sysutils/barrier/Makefile @@ -17,6 +17,8 @@ CPE_VENDOR= barrier_project CMAKE_ARGS= -DBARRIER_BUILD_DATE=00000000 +CONFLICTS_INSTALL= clusterit # bin/barrier + MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= EXAMPLES GUI diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile index c424c46c2b486..d868b298ce033 100644 --- a/sysutils/cdrkit/Makefile +++ b/sysutils/cdrkit/Makefile @@ -21,7 +21,7 @@ SHEBANG_FILES= 3rd-party/dirsplit/dirsplit # Fix build with clang11 CFLAGS+= -fcommon -CONFLICTS?= cdrtools cjk-cdrtools cdrtools-devel +CONFLICTS?= cdrtools PLIST_SUB?= CDRKIT="" GENISOIMAGE="@comment " diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index c34a523297c14..16510d4c491eb 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -19,7 +19,7 @@ SETUID_DESC= Install cdrecord, cdda2wav, and readcd as setuid root SETUID_PLIST_SUB= SUID="@(root,,4711) " SETUID_PLIST_SUB_OFF= SUID="@(,,755) " -CONFLICTS_INSTALL= cdrkit-* cdrtools-devel cdrtools-rscsi-devel +CONFLICTS_INSTALL= cdrkit MASTERDIR= ${.CURDIR}/../../devel/schilybase COMPONENTS= cdda2wav \ diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile index cee9aa679ddda..ea60a23b8802d 100644 --- a/sysutils/cfengine-devel/Makefile +++ b/sysutils/cfengine-devel/Makefile @@ -22,9 +22,7 @@ GH_TUPLE= cfengine:core:${CFENGINE_HASH} \ cfengine:libntech:${LIBNTECH_HASH}:libntech/libntech CPE_VENDOR= gnu -CONFLICTS= cfengine-2* cfengine3[0-9]-* cfengine31[02-9]-* cfengine-3.* - -CONFLICTS= cfengine-[12-9]* +CONFLICTS= cfengine cfengine3[0-9] cfengine3[0-9][0-9] USE_RC_SUBR= cf-execd cf-serverd cf-monitord diff --git a/sysutils/cfengine316/Makefile b/sysutils/cfengine316/Makefile index 42aa2296af249..d328ef92397f7 100644 --- a/sysutils/cfengine316/Makefile +++ b/sysutils/cfengine316/Makefile @@ -17,10 +17,9 @@ CPE_VENDOR= gnu DEPRECATED= Expire one year after cfengine 3.18.0 released EXPIRATION_DATE= 2022-07-05 -CONFLICTS= cfengine3[0-9] cfengine31[0-57-9] +CONFLICTS= cfengine cfengine3[0-9] cfengine3[0-9][0-9] .if !defined(MASTERDIR) PKGNAMESUFFIX= 316 -CONFLICTS+= cfengine-3.* .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/cfengine317/Makefile b/sysutils/cfengine317/Makefile index 3908d42e4a4a3..5c1b0307ecbe8 100644 --- a/sysutils/cfengine317/Makefile +++ b/sysutils/cfengine317/Makefile @@ -17,10 +17,9 @@ CPE_VENDOR= gnu DEPRECATED= Expire one year after cfengine 3.19.0 released EXPIRATION_DATE= 2022-12-10 -CONFLICTS= cfengine3[0-9] cfengine31[0-689] +CONFLICTS= cfengine cfengine3[0-9] cfengine3[0-9][0-9] .if !defined(MASTERDIR) PKGNAMESUFFIX= 317 -CONFLICTS+= cfengine-3.* .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/cfengine318/Makefile b/sysutils/cfengine318/Makefile index eee4a9228219c..d864ae4badeef 100644 --- a/sysutils/cfengine318/Makefile +++ b/sysutils/cfengine318/Makefile @@ -14,10 +14,9 @@ LICENSE= GPLv3 CPE_VENDOR= gnu -CONFLICTS= cfengine3[0-9] cfengine31[0-79] +CONFLICTS= cfengine cfengine3[0-9] cfengine3[0-9][0-9] .if !defined(MASTERDIR) PKGNAMESUFFIX= 318 -CONFLICTS+= cfengine-3.* .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/cfengine319/Makefile b/sysutils/cfengine319/Makefile index e433248064f01..be199418df314 100644 --- a/sysutils/cfengine319/Makefile +++ b/sysutils/cfengine319/Makefile @@ -14,10 +14,9 @@ LICENSE= GPLv3 CPE_VENDOR= gnu -CONFLICTS= cfengine3[0-9] cfengine31[0-79] +CONFLICTS= cfengine cfengine3[0-9] cfengine3[0-9][0-9] .if !defined(MASTERDIR) PKGNAMESUFFIX= 319 -CONFLICTS+= cfengine-3.* .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index e4dc0b77b2f5d..349322d8f82ff 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -22,6 +22,8 @@ CONFIGURE_ARGS= --program-prefix=g \ --program-transform-name=s/stat/nustat/ CONFIGURE_ENV= FORCE_UNSAFE_CONFIGURE=1 +CONFLICTS_INSTALL= gdu geneweb gexpr rubygem-god # bin/gdu bin/gexpr bin/god bin/gwc + INFO= coreutils OPTIONS_DEFINE= GMP NLS diff --git a/sysutils/cw/Makefile b/sysutils/cw/Makefile index c119abbec206c..f5d90ef694fa8 100644 --- a/sysutils/cw/Makefile +++ b/sysutils/cw/Makefile @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= shebangfix +CONFLICTS_INSTALL= unixcw # bin/cw + SHEBANG_FILES= def/* SHEBANG_LANG= cw cw_OLD_CMD= /cw diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 8035b5aee2646..ef6b4cbb80fbd 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -14,7 +14,7 @@ COMMENT= Service monitoring and logging utilities by djb LICENSE= PD -CONFLICTS= freedt serialmail +CONFLICTS= daemontools-encore freedt serialmail OPTIONS_DEFINE= MAN SIGQ12 TESTS OPTIONS_SUB= yes diff --git a/sysutils/dateutils/Makefile b/sysutils/dateutils/Makefile index fc8dfdc6ca546..a25601ed2b7e8 100644 --- a/sysutils/dateutils/Makefile +++ b/sysutils/dateutils/Makefile @@ -15,6 +15,8 @@ BUILD_DEPENDS= help2man:misc/help2man USES= tar:xz GNU_CONFIGURE= yes +CONFLICTS_INSTALL= py*-dateutils + INFO= dateutils OPTIONS_DEFINE= DOCS diff --git a/sysutils/docker/Makefile b/sysutils/docker/Makefile index b8f8d6eec18c3..a0d3510df5bca 100644 --- a/sysutils/docker/Makefile +++ b/sysutils/docker/Makefile @@ -20,6 +20,8 @@ GH_PROJECT= docker-ce USES= cpe go +CONFLICTS_INSTALL= docker-tray # bin/docker + GO_PKGNAME= github.com/${PORTNAME} GO_TARGET= ${GO_PKGNAME}/cli/cmd/docker diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 65d21a34dc78d..d484531df4541 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -56,6 +56,8 @@ CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig' MAKE_ENV+= CHECK_CMD=@true +CONFLICTS_INSTALL= e2fsprogs e2fsprogs-nobootfsck e2fsprogs-roothardlinks + PORTSCOUT= ignore:1 # cannot handle the version in the directory .if !defined(MASTERDIR) diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index a972a72a8de1e..a96ccab071e14 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ liblibcpp-hocon.so:devel/cpp-hocon \ libyaml-cpp.so:devel/yaml-cpp -CONFLICTS_INSTALL= rubygem-facter-2* +CONFLICTS_INSTALL= rubygem-facter PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/sysutils/freedt/Makefile b/sysutils/freedt/Makefile index f875fdff02e45..10e001fea7d7d 100644 --- a/sysutils/freedt/Makefile +++ b/sysutils/freedt/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://offog.org/files/ \ MAINTAINER= tdb@FreeBSD.org COMMENT= Experimental reimplementation of Dan Bernstein's daemontools -CONFLICTS= daemontools +CONFLICTS= daemontools daemontools-encore ucspi-tcp # bin/argv0 bin/envdir bin/envuidgid GNU_CONFIGURE= yes diff --git a/sysutils/hared/Makefile b/sysutils/hared/Makefile index da2bdfa94137d..9b1a078714bbb 100644 --- a/sysutils/hared/Makefile +++ b/sysutils/hared/Makefile @@ -23,7 +23,7 @@ GH_TUPLE= go-gcfg:gcfg:f02745a:gcfg/vendor/gopkg.in/gcfg.v1 \ GO_TARGET= ./daemon:${PORTNAME} -CONFLICTS_INSTALL= py-${PORTNAME} +CONFLICTS_INSTALL= py*-${PORTNAME} # bin/hared OPTIONS_DEFINE= DOCS diff --git a/sysutils/hextools/Makefile b/sysutils/hextools/Makefile index 1f51ec90fed12..e1703738473cf 100644 --- a/sysutils/hextools/Makefile +++ b/sysutils/hextools/Makefile @@ -11,6 +11,8 @@ LICENSE_NAME= License of hextools LICENSE_FILE= ${WRKDIR}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +CONFLICTS_INSTALL= z80pack # bin/bin2hex + NO_WRKSUBDIR= yes PLIST_FILES= bin/hex2bin bin/bin2hex man/man1/bin2hex.1.gz man/man1/hex2bin.1.gz diff --git a/sysutils/iocage-devel/Makefile b/sysutils/iocage-devel/Makefile index c5d4c7a8bf3a8..a588aff51a40e 100644 --- a/sysutils/iocage-devel/Makefile +++ b/sysutils/iocage-devel/Makefile @@ -32,7 +32,7 @@ GH_TAGNAME= e94863d4c54f02523fb09e62e48be7db9ac92eda USE_PYTHON= autoplist distutils -CONFLICTS= py[0-9]*-iocage +CONFLICTS= py*-iocage py*-iocage-devel NO_ARCH= yes _IOCAGE_LIB_VERSION= 1.2 diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index bb37e6976c6fd..c0bb15ee98bac 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -37,7 +37,7 @@ USES= python:3.6+ USE_GITHUB= yes USE_PYTHON= autoplist distutils -CONFLICTS= py*-iocage +CONFLICTS= py*-iocage py*-iocage-devel NO_ARCH= yes PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \ diff --git a/sysutils/isc-cron/Makefile b/sysutils/isc-cron/Makefile index 44427decd0a72..156cb331c1cf0 100644 --- a/sysutils/isc-cron/Makefile +++ b/sysutils/isc-cron/Makefile @@ -13,6 +13,8 @@ COMMENT= ISC Cron, former Vixie Cron LICENSE= ISCL +CONFLICTS_INSTALL= interchange mcron # bin/crontab + NO_WRKSUBDIR= yes SUB_FILES= pkg-message PLIST_FILES= sbin/cron \ diff --git a/sysutils/lbl-cf/Makefile b/sysutils/lbl-cf/Makefile index 25bc6d0640b0d..83d3f103aafd4 100644 --- a/sysutils/lbl-cf/Makefile +++ b/sysutils/lbl-cf/Makefile @@ -18,6 +18,8 @@ PLIST_FILES= bin/cf \ GNU_CONFIGURE= yes +CONFLICTS_INSTALL= cf # bin/cf + pre-install: @${STRIP_CMD} ${WRKSRC}/cf diff --git a/sysutils/mcron/Makefile b/sysutils/mcron/Makefile index d6a25e13852e8..e6ffc71370ee5 100644 --- a/sysutils/mcron/Makefile +++ b/sysutils/mcron/Makefile @@ -16,6 +16,9 @@ LIB_DEPENDS= libguile-2.2.so:lang/guile2 USES= gmake pkgconfig GNU_CONFIGURE= yes + +CONFLICTS_INSTALL= interchange isc-cron # bin/crontab + TEST_TARGET= check INFO= mcron diff --git a/sysutils/nq/Makefile b/sysutils/nq/Makefile index 9c53cce309bc7..f054a23d68f09 100644 --- a/sysutils/nq/Makefile +++ b/sysutils/nq/Makefile @@ -16,6 +16,9 @@ USE_PERL5= test MAKE_ARGS= CFLAGS="${CFLAGS}" \ PREFIX="${PREFIX}" + +CONFLICTS_INSTALL= fq # bin/fq + TEST_TARGET= check post-install: diff --git a/sysutils/p5-Giovanni/Makefile b/sysutils/p5-Giovanni/Makefile index 6600985d7b941..b83ef84a3c66b 100644 --- a/sysutils/p5-Giovanni/Makefile +++ b/sysutils/p5-Giovanni/Makefile @@ -25,4 +25,6 @@ NO_ARCH= yes USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= glib # bin/gio + .include diff --git a/sysutils/pdsh/Makefile b/sysutils/pdsh/Makefile index d3afc071d4b02..ba2f7a65a5af9 100644 --- a/sysutils/pdsh/Makefile +++ b/sysutils/pdsh/Makefile @@ -17,6 +17,9 @@ USES= autoreconf gmake libtool:keepla perl5 shebangfix USE_GITHUB= yes GH_ACCOUNT= chaos USE_PERL5= run + +CONFLICTS_INSTALL= clusterit # bin/dshbak + SHEBANG_FILES= scripts/dshbak INSTALL_TARGET= install-strip TEST_TARGET= check diff --git a/sysutils/pear-Horde_Vfs/Makefile b/sysutils/pear-Horde_Vfs/Makefile index 1731da15a10fc..457317e216e35 100644 --- a/sysutils/pear-Horde_Vfs/Makefile +++ b/sysutils/pear-Horde_Vfs/Makefile @@ -18,4 +18,6 @@ USES= horde FTP_USES= php FTP_USE= PHP=ftp +CONFLICTS_INSTALL= php*-pear-Horde_Vfs # bin/horde-vfs + .include diff --git a/sysutils/py-ansible-base/Makefile b/sysutils/py-ansible-base/Makefile index c7919eb4f6b6a..c8a921d2548fa 100644 --- a/sysutils/py-ansible-base/Makefile +++ b/sysutils/py-ansible-base/Makefile @@ -42,7 +42,7 @@ TEST_ENV= PYTHON_VERSION=${PYTHON_VER} \ TEST_FLAGS=-vv TEST_TARGET= tests -CONFLICTS= py*-ansible-core +CONFLICTS= py*-ansible-core py*-ansible2 NO_ARCH= yes diff --git a/sysutils/py-ansible-core/Makefile b/sysutils/py-ansible-core/Makefile index 71bce8f2ccbde..585a801c8ec57 100644 --- a/sysutils/py-ansible-core/Makefile +++ b/sysutils/py-ansible-core/Makefile @@ -39,7 +39,7 @@ TEST_ARGS= VERSION=${DISTVERSION} \ TEST_ENV= PYTHON_VERSION=${PYTHON_VER} TEST_TARGET= tests -CONFLICTS= py*-ansible-base +CONFLICTS= py*-ansible-base py*-ansible2 NO_ARCH= yes diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile index c440700dae6c9..cc025e4f7b37b 100644 --- a/sysutils/radmind/Makefile +++ b/sysutils/radmind/Makefile @@ -20,6 +20,8 @@ USE_RC_SUBR= radmind GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-radminddir=${RADMIND_BASE_DIR} +CONFLICTS_INSTALL= schilyutils # bin/fsdiff + MAKE_JOBS_UNSAFE= yes SUB_FILES+= pkg-install pkg-message diff --git a/sysutils/renameutils/Makefile b/sysutils/renameutils/Makefile index ee0da48286e9e..25700f6feb00f 100644 --- a/sysutils/renameutils/Makefile +++ b/sysutils/renameutils/Makefile @@ -16,6 +16,8 @@ RUN_DEPENDS= gls:sysutils/coreutils GNU_CONFIGURE= yes USES= readline charsetfix +CONFLICTS_INSTALL= imv # bin/imv + OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/sysutils/rubygem-bundler/Makefile b/sysutils/rubygem-bundler/Makefile index 34cb7635ea0c6..cabc6135d8a15 100644 --- a/sysutils/rubygem-bundler/Makefile +++ b/sysutils/rubygem-bundler/Makefile @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= cpe gem USE_RUBY= yes +CONFLICTS_INSTALL= go-tools # bin/bundle + NO_ARCH= yes PLIST_FILES= bin/bundle bin/bundler diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile index 96b9e49047caf..dedf7d109045a 100644 --- a/sysutils/rubygem-facter/Makefile +++ b/sysutils/rubygem-facter/Makefile @@ -19,6 +19,8 @@ USES= cpe gem CPE_VENDOR= puppet USE_RUBY= yes +CONFLICTS_INSTALL= facter # bin/facter + NO_ARCH= yes PLIST_FILES= bin/facter ${GEMS_DIR}/facter diff --git a/sysutils/rubygem-god/Makefile b/sysutils/rubygem-god/Makefile index 8312372633747..b35df199f8ade 100644 --- a/sysutils/rubygem-god/Makefile +++ b/sysutils/rubygem-god/Makefile @@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_RUBY= yes USES= gem +CONFLICTS_INSTALL= coreutils # bin/god + PLIST_FILES= bin/god .include diff --git a/sysutils/rubygem-hieracles/Makefile b/sysutils/rubygem-hieracles/Makefile index db285b9c4e907..8f5f92b5c23bc 100644 --- a/sysutils/rubygem-hieracles/Makefile +++ b/sysutils/rubygem-hieracles/Makefile @@ -16,6 +16,9 @@ RUN_DEPENDS= rubygem-deep_merge>=1.0.1:devel/rubygem-deep_merge \ NO_ARCH= yes USE_RUBY= yes USES= gem + +CONFLICTS_INSTALL= zh-hc # bin/hc + PLIST_FILES= bin/hc man/man1/hc.1.gz \ bin/ppdb man/man1/ppdb.1.gz \ bin/hieracles diff --git a/sysutils/sanoid-devel/Makefile b/sysutils/sanoid-devel/Makefile index 514d90486fa5d..ab3f5b8383b1b 100644 --- a/sysutils/sanoid-devel/Makefile +++ b/sysutils/sanoid-devel/Makefile @@ -25,6 +25,8 @@ GH_TAGNAME= 45d0898 USE_PERL5= run SHEBANG_FILES= findoid sanoid sleepymutex syncoid +CONFLICTS_INSTALL= sanoid # bin/findoid + NO_BUILD= yes NO_ARCH= yes diff --git a/sysutils/sanoid/Makefile b/sysutils/sanoid/Makefile index fd11188337320..d319dae5f5912 100644 --- a/sysutils/sanoid/Makefile +++ b/sysutils/sanoid/Makefile @@ -24,6 +24,8 @@ GH_ACCOUNT= jimsalterjrs USE_PERL5= run SHEBANG_FILES= findoid sanoid sleepymutex syncoid +CONFLICTS_INSTALL= sanoid-devel # bin/findoid + NO_BUILD= yes NO_ARCH= yes diff --git a/sysutils/schilyutils/Makefile b/sysutils/schilyutils/Makefile index c2627bffd0adb..ab902a99f8fe8 100644 --- a/sysutils/schilyutils/Makefile +++ b/sysutils/schilyutils/Makefile @@ -7,7 +7,7 @@ USES+= perl5 shebangfix USE_PERL5= run SHEBANG_FILES= man2html/man2html cstyle/cstyle.pl -CONFLICTS_INSTALL= bsh +CONFLICTS_INSTALL= bosh-cli bsh calc clusterit deforaos-browser heirloom-sh latte-integrale p5-Math-SigFigs radmind # bin/bosh bin/bsh bin/calc bin/copy bin/count bin/fsdiff bin/jsh MASTERDIR= ${.CURDIR}/../../devel/schilybase COMPONENTS= bsh \ diff --git a/sysutils/ucspi-tcp/Makefile b/sysutils/ucspi-tcp/Makefile index 55d6eb39350a0..577d7aaa46ffe 100644 --- a/sysutils/ucspi-tcp/Makefile +++ b/sysutils/ucspi-tcp/Makefile @@ -12,6 +12,8 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= Command-line tools for building TCP client-server applications +CONFLICTS_INSTALL= freedt # bin/argv0 + OPTIONS_DEFINE= RSS_DIFF RBL2SMTPD IPV6 SSL LIMITS RSS_DIFF_DESC= Patch rblsmtpd for qmail users diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile index cbfe7663ed5e3..90631dd5cd97f 100644 --- a/textproc/agrep/Makefile +++ b/textproc/agrep/Makefile @@ -22,6 +22,8 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept USES= tar:Z +CONFLICTS_INSTALL= rubygem-amatch # bin/agrep + ALL_TARGET= MAKE_ARGS= CFLAGS="${CFLAGS}" PLIST_FILES= bin/agrep man/man1/agrep.1.gz diff --git a/textproc/align/Makefile b/textproc/align/Makefile index bda8fe1bc1260..e1962b0404849 100644 --- a/textproc/align/Makefile +++ b/textproc/align/Makefile @@ -18,6 +18,8 @@ USES= perl5 shebangfix tar:tgz SHEBANG_FILES= align width USE_PERL5= run +CONFLICTS_INSTALL= fasta # bin/align + PLIST_FILES= bin/align bin/width do-install: diff --git a/textproc/bar/Makefile b/textproc/bar/Makefile index 3ce7bce0cfd56..6bdca7a27058d 100644 --- a/textproc/bar/Makefile +++ b/textproc/bar/Makefile @@ -10,6 +10,9 @@ MAINTAINER= erik@bz.bzflag.bz COMMENT= Cat with ASCII progress bar USES= tar:bzip2 + +CONFLICTS_INSTALL= clpbar # bin/bar + NO_BUILD= yes PLIST_FILES= bin/bar WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/textproc/bib2html/Makefile b/textproc/bib2html/Makefile index 671f25c5d8a63..1a8bab80201a0 100644 --- a/textproc/bib2html/Makefile +++ b/textproc/bib2html/Makefile @@ -21,6 +21,8 @@ USE_PERL5= run NO_BUILD= yes NO_ARCH= yes +CONFLICTS_INSTALL= bibutils sowing # bin/bib2html bin/bib2xml + post-patch: .for i in bib2html bib2sql bib2xml @${SED} -e \ diff --git a/textproc/bibutils/Makefile b/textproc/bibutils/Makefile index 9102f1fe4221c..21addcf550a5f 100644 --- a/textproc/bibutils/Makefile +++ b/textproc/bibutils/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE= ${WRKSRC}/Copying USES= cpe gmake +CONFLICTS_INSTALL= bib2html # bin/bib2xml + HAS_CONFIGURE= yes TEST_TARGET= test diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile index c60c7b25730aa..87a5509652655 100644 --- a/textproc/btparse/Makefile +++ b/textproc/btparse/Makefile @@ -15,4 +15,6 @@ USE_LDCONFIG= yes USES= perl5 libtool pathfix USE_PERL5= build +CONFLICTS_INSTALL= p5-Text-BibTeX # bin/bibparse + .include diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile index 7f6733e2ec8ba..2ec0e9f8f28df 100644 --- a/textproc/cmark/Makefile +++ b/textproc/cmark/Makefile @@ -15,6 +15,8 @@ USE_GITHUB= yes GH_ACCOUNT= commonmark USE_LDCONFIG= yes +CONFLICTS_INSTALL= py*-CommonMark # bin/cmark + CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR:STRING="lib" PLIST_SUB= VERSION=${PORTVERSION} TEST_TARGET= test diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile index cf9f58184b538..a712d47732602 100644 --- a/textproc/dict/Makefile +++ b/textproc/dict/Makefile @@ -16,6 +16,8 @@ LIB_DEPENDS= libmaa.so:devel/libmaa USES= bison gmake libtool:build localbase +CONFLICTS_INSTALL= irstlm # bin/dict + ALL_TARGET= dict GNU_CONFIGURE= yes INSTALL_TARGET= install.dict diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile index 05f86094bd1e6..4f784af1b03d7 100644 --- a/textproc/docbook-utils/Makefile +++ b/textproc/docbook-utils/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS+= dsssl-docbook-modular>0:textproc/dsssl-docbook-modular \ sgmlspl:textproc/p5-SGMLSpm \ lynx:www/lynx -CONFLICTS= docbook2X +CONFLICTS= docbook2X linux-j # bin/docbook2man bin/docbook2texi bin/jw USES= perl5 gmake shebangfix USE_PERL5= run diff --git a/textproc/dtdparse/Makefile b/textproc/dtdparse/Makefile index 16e428523ce63..b686f66ec31fb 100644 --- a/textproc/dtdparse/Makefile +++ b/textproc/dtdparse/Makefile @@ -17,4 +17,6 @@ USES= perl5 USE_PERL5= configure NO_ARCH= yes +CONFLICTS_INSTALL= p5-SGML-DTDParse # bin/dtddiff bin/dtddiff2html bin/dtdflatten bin/dtdformat bin/dtdparse + .include diff --git a/textproc/ebook-tools/Makefile b/textproc/ebook-tools/Makefile index 0f29dc41cf408..c67bbbd16a196 100644 --- a/textproc/ebook-tools/Makefile +++ b/textproc/ebook-tools/Makefile @@ -17,4 +17,6 @@ USES= cmake gnome USE_LDCONFIG= yes USE_GNOME= libxml2 +CONFLICTS_INSTALL= ncbi-entrez-direct # bin/einfo + .include diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile index 2589fcf4a373d..bb8b196a289a1 100644 --- a/textproc/groff/Makefile +++ b/textproc/groff/Makefile @@ -40,7 +40,7 @@ PAPERSIZE=A4 CONFIGURE_ENV+= PAGE=${PAPERSIZE} .endif -CONFLICTS= ja-groff +CONFLICTS= heirloom-doctools ja-groff INFO= groff diff --git a/textproc/heirloom-doctools/Makefile b/textproc/heirloom-doctools/Makefile index 884987645d345..999e2f291fc4f 100644 --- a/textproc/heirloom-doctools/Makefile +++ b/textproc/heirloom-doctools/Makefile @@ -11,6 +11,9 @@ LICENSE= CDDL USES= gmake USE_GITHUB= yes GH_ACCOUNT= n-t-roff + +CONFLICTS_INSTALL= grap groff ja-groff util-linux # bin/col bin/eqn bin/grap bin/indxbib + ALL_TARGET= #empty MAKE_ARGS+= INSTALL="${INSTALL}" \ BINDIR=${BINDIR} \ diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile index b3fe0ceb7a524..cca2098cb72f6 100644 --- a/textproc/hs-yaml/Makefile +++ b/textproc/hs-yaml/Makefile @@ -10,6 +10,8 @@ LICENSE= BSD3CLAUSE USES= cabal +CONFLICTS_INSTALL= json2yaml # bin/json2yaml + USE_CABAL= aeson-1.4.7.1_1 \ attoparsec-0.13.2.4 \ base-compat-0.11.1 \ diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile index d408bd7f804fb..209837d50eaf5 100644 --- a/textproc/htdig/Makefile +++ b/textproc/htdig/Makefile @@ -31,6 +31,8 @@ INSTALL_TARGET= install-strip LDFLAGS+= -L${OPENSSLLIB} CFLAGS+= -I${OPENSSLINC} +CONFLICTS_INSTALL= htdump mifluz # bin/htdb_dump bin/htdb_load bin/htdb_stat bin/htdump + OPTIONS_DEFINE= APACHE DOCS OPTIONS_DEFAULT= APACHE diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile index 951a7df2b340a..e11a1768b4b56 100644 --- a/textproc/html2text/Makefile +++ b/textproc/html2text/Makefile @@ -18,7 +18,7 @@ HAS_CONFIGURE= yes PORTDOCS= CHANGES CREDITS KNOWN_BUGS README TODO PLIST_FILES= bin/html2text man/man1/html2text.1.gz man/man5/html2textrc.5.gz -CONFLICTS= py*-html2text +CONFLICTS= py*-html2text py*-html2text2018 # bin/html2text PORTSCOUT= skipb:0 skipv:1.3.2 diff --git a/textproc/html2xhtml/Makefile b/textproc/html2xhtml/Makefile index b14a37dcc3273..f1a38dc7b3c81 100644 --- a/textproc/html2xhtml/Makefile +++ b/textproc/html2xhtml/Makefile @@ -9,6 +9,8 @@ COMMENT= Convert HTML to XHTML GNU_CONFIGURE= yes USES= iconv +CONFLICTS_INSTALL= p5-HTML-HTML5-Parser p5-XML-Driver-HTML # bin/html2xhtml + PLIST_FILES= bin/dtdquery \ bin/html2xhtml \ man/man1/html2xhtml.1.gz diff --git a/textproc/irstlm/Makefile b/textproc/irstlm/Makefile index 693a700d45aeb..2786bd5ec9bb0 100644 --- a/textproc/irstlm/Makefile +++ b/textproc/irstlm/Makefile @@ -17,6 +17,9 @@ USE_PERL5= run USE_CXXSTD= gnu++98 USES= autoreconf libtool perl5 shebangfix tar:tgz USE_LDCONFIG= yes + +CONFLICTS_INSTALL= dict # bin/dict + SHEBANG_FILES= scripts/add-start-end.sh scripts/lm-stat.pl scripts/sort-lm.pl scripts/build-lm-qsub.sh scripts/mdtsel.sh scripts/split-dict.pl scripts/build-lm.sh scripts/merge-sublm.pl scripts/split-ngt.sh scripts/build-sublm.pl scripts/ngram-split.pl scripts/goograms2ngrams.pl scripts/rm-start-end.sh .include diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile index d90737b545db7..206dd574cd059 100644 --- a/textproc/java2html/Makefile +++ b/textproc/java2html/Makefile @@ -12,6 +12,9 @@ COMMENT= Java sources to HTML converter LICENSE= GPLv2 GNU_CONFIGURE= yes + +CONFLICTS_INSTALL= source-highlight # bin/java2html + PORTDOCS= AUTHORS NEWS README PLIST_FILES= bin/java2html man/man1/java2html.1.gz diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile index e3b4eeec57533..cca75227229b2 100644 --- a/textproc/libextractor/Makefile +++ b/textproc/libextractor/Makefile @@ -22,6 +22,8 @@ CPE_VENDOR= gnu USE_GNOME= gtk20 gdkpixbuf2 USE_LDCONFIG= yes +CONFLICTS_INSTALL= csound outguess # bin/extract + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtk-version=2 \ --with-ltdl=${LOCALBASE} diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile index 77dbb89f789b0..0368b189ef7ed 100644 --- a/textproc/mifluz/Makefile +++ b/textproc/mifluz/Makefile @@ -24,6 +24,8 @@ CXXFLAGS_clang= -Wno-c++11-narrowing CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= htdig # bin/htdb_dump bin/htdb_load bin/htdb_stat + SUB_FILES= pkg-message INFO= mifluz diff --git a/textproc/p5-DocSet/Makefile b/textproc/p5-DocSet/Makefile index 0db0b40606c19..20434e9ee72b6 100644 --- a/textproc/p5-DocSet/Makefile +++ b/textproc/p5-DocSet/Makefile @@ -16,4 +16,6 @@ RUN_DEPENDS= p5-Pod-POM>=0:textproc/p5-Pod-POM \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= html2ps # bin/html2ps + .include diff --git a/textproc/p5-HTML-HTML5-Parser/Makefile b/textproc/p5-HTML-HTML5-Parser/Makefile index ff94a0bafdc86..519dcca2f577b 100644 --- a/textproc/p5-HTML-HTML5-Parser/Makefile +++ b/textproc/p5-HTML-HTML5-Parser/Makefile @@ -23,4 +23,6 @@ RUN_DEPENDS= p5-HTML-HTML5-Entities>=0.002:textproc/p5-HTML-HTML5-Entities \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= html2xhtml p5-XML-Driver-HTML # bin/html2xhtml + .include diff --git a/textproc/p5-SGML-DTDParse/Makefile b/textproc/p5-SGML-DTDParse/Makefile index 409a2f26b0e49..76854d2ac94a8 100644 --- a/textproc/p5-SGML-DTDParse/Makefile +++ b/textproc/p5-SGML-DTDParse/Makefile @@ -19,4 +19,6 @@ RUN_DEPENDS= p5-DelimMatch>=1.05:textproc/p5-DelimMatch \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= dtdparse # bin/dtddiff bin/dtddiff2html bin/dtdflatten bin/dtdformat bin/dtdparse + .include diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile index 51f66bf274532..1eab84c626971 100644 --- a/textproc/p5-Text-BibTeX/Makefile +++ b/textproc/p5-Text-BibTeX/Makefile @@ -23,6 +23,8 @@ USE_PERL5= modbuild CFLAGS_amd64= -fPIC USE_LDCONFIG= yes +CONFLICTS_INSTALL= btparse # bin/bibparse + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbtparse.so diff --git a/textproc/p5-XML-Driver-HTML/Makefile b/textproc/p5-XML-Driver-HTML/Makefile index 37d3aec506d3f..2d045a08c072d 100644 --- a/textproc/p5-XML-Driver-HTML/Makefile +++ b/textproc/p5-XML-Driver-HTML/Makefile @@ -17,4 +17,6 @@ RUN_DEPENDS= p5-XML-TreeBuilder>=0:textproc/p5-XML-TreeBuilder \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= html2xhtml p5-HTML-HTML5-Parser # bin/html2xhtml + .include diff --git a/textproc/pear-Text_Highlighter/Makefile b/textproc/pear-Text_Highlighter/Makefile index 2b0242763310f..1225adf0fbd95 100644 --- a/textproc/pear-Text_Highlighter/Makefile +++ b/textproc/pear-Text_Highlighter/Makefile @@ -15,4 +15,6 @@ RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} USES= pear NO_ARCH= yes +CONFLICTS_INSTALL= generate julius php*-pear-Text_Highlighter # bin/generate + .include diff --git a/textproc/py-asciinema/Makefile b/textproc/py-asciinema/Makefile index 023cd7dcf3450..1c7c45e091338 100644 --- a/textproc/py-asciinema/Makefile +++ b/textproc/py-asciinema/Makefile @@ -14,4 +14,6 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= python:3.3+ USE_PYTHON= distutils autoplist +CONFLICTS_INSTALL= cowrie # bin/asciinema + .include diff --git a/textproc/py-elasticsearch-curator/Makefile b/textproc/py-elasticsearch-curator/Makefile index ae608d0cc0257..7ad8869bef1a4 100644 --- a/textproc/py-elasticsearch-curator/Makefile +++ b/textproc/py-elasticsearch-curator/Makefile @@ -28,6 +28,8 @@ GH_ACCOUNT= elastic GH_PROJECT= curator USE_PYTHON= autoplist distutils +CONFLICTS_INSTALL= curator # bin/curator + NO_ARCH= yes .include diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index c0634cbeb59de..06816e107f377 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -19,7 +19,7 @@ USES= python:3.5+ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes -CONFLICTS_INSTALL= html2text py*-html2text2018 +CONFLICTS_INSTALL= html2text py*-html2text2018 # bin/html2text do-test: @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest --cov=html2text diff --git a/textproc/py-html2text2018/Makefile b/textproc/py-html2text2018/Makefile index 862201d795a39..d9a926a5f738d 100644 --- a/textproc/py-html2text2018/Makefile +++ b/textproc/py-html2text2018/Makefile @@ -20,7 +20,7 @@ USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes -CONFLICTS_INSTALL= html2text py*-html2text +CONFLICTS_INSTALL= html2text py*-html2text # bin/html2text do-test: @cd ${WRKSRC} && coverage run --source=html2text setup.py test -v diff --git a/textproc/rnv/Makefile b/textproc/rnv/Makefile index 4d9f393a998eb..18e3aa52e4f0a 100644 --- a/textproc/rnv/Makefile +++ b/textproc/rnv/Makefile @@ -17,6 +17,8 @@ USES= tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-expat="${LOCALBASE}" +CONFLICTS_INSTALL= arx-libertatis # bin/arx + PLIST_FILES= bin/arx bin/rnv bin/rvp bin/xsdck man/man1/rnv.1.gz .include diff --git a/textproc/rubygem-amatch/Makefile b/textproc/rubygem-amatch/Makefile index d1fbfac28cd23..b4b23fd51d2f2 100644 --- a/textproc/rubygem-amatch/Makefile +++ b/textproc/rubygem-amatch/Makefile @@ -15,6 +15,8 @@ RUN_DEPENDS= rubygem-mize>=0:devel/rubygem-mize \ USES= gem USE_RUBY= yes +CONFLICTS_INSTALL= agrep # bin/agrep + PLIST_FILES= bin/agrep bin/dupfind .include diff --git a/textproc/rubygem-diff-lcs/Makefile b/textproc/rubygem-diff-lcs/Makefile index 982b61f0dae20..03942a36b44df 100644 --- a/textproc/rubygem-diff-lcs/Makefile +++ b/textproc/rubygem-diff-lcs/Makefile @@ -19,6 +19,8 @@ USE_RUBY= yes NO_ARCH= yes +CONFLICTS_INSTALL= p5-HTML-Diff # bin/htmldiff + PLIST_FILES= bin/htmldiff bin/ldiff SHEBANG_FILES= bin/htmldiff bin/ldiff diff --git a/textproc/rubygem-github-markup/Makefile b/textproc/rubygem-github-markup/Makefile index 1722c421e0bf3..7a8d215740660 100644 --- a/textproc/rubygem-github-markup/Makefile +++ b/textproc/rubygem-github-markup/Makefile @@ -12,6 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gem shebangfix USE_RUBY= yes +CONFLICTS_INSTALL= rubygem-github-markup* + NO_ARCH= yes REINPLACE_ARGS= -i '' diff --git a/textproc/rubygem-github-markup17/Makefile b/textproc/rubygem-github-markup17/Makefile index 03f12a4c509bc..f0f53742070aa 100644 --- a/textproc/rubygem-github-markup17/Makefile +++ b/textproc/rubygem-github-markup17/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gem shebangfix USE_RUBY= yes +CONFLICTS_INSTALL= rubygem-github-markup* + NO_ARCH= yes REINPLACE_ARGS= -i '' diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile index e2cb890424380..e44f75a6ee2a1 100644 --- a/textproc/source-highlight/Makefile +++ b/textproc/source-highlight/Makefile @@ -23,6 +23,8 @@ CONFIGURE_ARGS= --with-bash-completion INSTALL_TARGET= install-strip USE_LDCONFIG= yes +CONFLICTS_INSTALL= java2html # bin/java2html + OPTIONS_DEFINE= DOCS EXAMPLES PORTDOCS= * diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile index 0a5140ab90d27..820316cdb15b3 100644 --- a/textproc/sowing/Makefile +++ b/textproc/sowing/Makefile @@ -16,6 +16,9 @@ USES= ghostscript gmake perl5 USE_TEX= latex dvipsk GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} + +CONFLICTS_INSTALL= bib2html # bin/bib2html + ALL_TARGET= all-redirect MAKE_JOBS_UNSAFE= yes diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile index 6bc4f8cfbacb8..3cd46aeabc513 100644 --- a/textproc/sphinxsearch/Makefile +++ b/textproc/sphinxsearch/Makefile @@ -20,6 +20,8 @@ LICENSE= GPLv2 USES= compiler:c++11-lang +CONFLICTS_INSTALL= mnogosearch # bin/indexer + BUILD_DEPENDS= gsed:textproc/gsed # If expat is present on the system and configure finds it, it will # unconditionally link the output binary against it. There's no way diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 64160a1d7b53e..f69f13f0d740e 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -20,6 +20,8 @@ USE_PERL5= run USE_RC_SUBR= apache24 htcacheclean GNU_CONFIGURE= yes +CONFLICTS_INSTALL= py*-circuits # bin/htpasswd + CPE_VENDOR= apache CPE_PRODUCT= http_server diff --git a/www/carbonapi/Makefile b/www/carbonapi/Makefile index 4c5873af8bf0d..b940e7b19201a 100644 --- a/www/carbonapi/Makefile +++ b/www/carbonapi/Makefile @@ -21,6 +21,8 @@ GO_BUILDFLAGS= -v \ ${CARBON_ARGS} \ -ldflags="-X main.BuildVersion=${DISTVERSION}" +CONFLICTS_INSTALL= carbonzipper # bin/carbonzipper + USERS= carbon GROUPS= carbon diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile index a3ff3cba89756..17e3510820224 100644 --- a/www/clearsilver/Makefile +++ b/www/clearsilver/Makefile @@ -14,6 +14,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-apache --disable-perl --disable-ruby \ --disable-java --disable-csharp --disable-python +CONFLICTS_INSTALL= csound go-cs # bin/cs + post-patch: @# Remove CFLAGS when building the python module, pydistfile is used @# and will do the right thing. diff --git a/www/drush/Makefile b/www/drush/Makefile index 6fdcd42eae5bb..87bbb5cf28966 100644 --- a/www/drush/Makefile +++ b/www/drush/Makefile @@ -22,6 +22,8 @@ USES= php:cli,flavors # set php requirements same as drupal itself USE_PHP= gd pcre session mbstring ctype json hash simplexml dom pdo filter phar +CONFLICTS_INSTALL= drush-php* # bin/drush bin/drush.phar + PLIST_FILES= bin/drush bin/drush.phar do-extract: diff --git a/www/geneweb/Makefile b/www/geneweb/Makefile index 6b07721727f98..99149029cc2d4 100644 --- a/www/geneweb/Makefile +++ b/www/geneweb/Makefile @@ -19,6 +19,8 @@ USE_GITHUB= yes GH_ACCOUNT= geneweb GH_TAGNAME= 13c850a0cc3973daf7ae3e0772a1621f84052041 +CONFLICTS_INSTALL= coreutils # bin/gwc + HAS_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes diff --git a/www/gist/Makefile b/www/gist/Makefile index 3e501f6099372..8d96b5950eb28 100644 --- a/www/gist/Makefile +++ b/www/gist/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.MIT RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -CONFLICTS= p5-App-gist +CONFLICTS= p5-App-gist py*-python-gist yorick # bin/gist USE_GITHUB= yes GH_ACCOUNT= defunkt diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile index 984f77a0533cd..12b152e905029 100644 --- a/www/gohugo/Makefile +++ b/www/gohugo/Makefile @@ -126,6 +126,8 @@ GH_TUPLE= \ yuin:goldmark:v1.4.4:yuin_goldmark/vendor/github.com/yuin/goldmark \ sanity-io:litter:v1.5.1:sanity_io_litter/vendor/github.com/sanity-io/litter +CONFLICTS_INSTALL= hugo # bin/hugo + post-extract: @${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/storage @${RLN} ${WRKSRC_googleapis_google_cloud_go_storage}/storage ${WRKSRC}/vendor/cloud.google.com/go/storage diff --git a/www/goose/Makefile b/www/goose/Makefile index 111c29b33bd47..07913b0c9a89f 100644 --- a/www/goose/Makefile +++ b/www/goose/Makefile @@ -18,6 +18,9 @@ RUN_DEPENDS= p5-SOAP-Lite>=0:net/p5-SOAP-Lite \ urlview:textproc/urlview USES= perl5 + +CONFLICTS_INSTALL= cfssl # bin/goose + WRKSRC= ${WRKDIR}/${PORTNAME} POD2MAN?= pod2man diff --git a/www/grafana6/Makefile b/www/grafana6/Makefile index 17e181f0a3708..dd2d7c56c6c02 100644 --- a/www/grafana6/Makefile +++ b/www/grafana6/Makefile @@ -25,6 +25,8 @@ GO_TARGET= ./pkg/cmd/grafana-server \ ./pkg/cmd/grafana-cli GO_BUILDFLAGS= -ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" +CONFLICTS_INSTALL= grafana* # bin/grafana-cli bin/grafana-server + GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana diff --git a/www/grafana7/Makefile b/www/grafana7/Makefile index aabc14dc5e174..68f17ff331dcc 100644 --- a/www/grafana7/Makefile +++ b/www/grafana7/Makefile @@ -24,6 +24,8 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= cpe go:modules +CONFLICTS_INSTALL= grafana* # bin/grafana-cli bin/grafana-server + USE_GITHUB= yes GH_TUPLE= \ BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile index 5b5672775dba8..e4948ffe446f7 100644 --- a/www/grafana8/Makefile +++ b/www/grafana8/Makefile @@ -18,6 +18,8 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= cpe go:modules +CONFLICTS_INSTALL= grafana* # bin/grafana-cli bin/grafana-server + USE_GITHUB= yes USE_RC_SUBR= grafana diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile index 39b7c91262582..8c4b80c1fd1f3 100644 --- a/www/h2o-devel/Makefile +++ b/www/h2o-devel/Makefile @@ -25,7 +25,7 @@ USE_PERL5= run USE_LDCONFIG= yes GH_TAGNAME= 96bf0ef -CONFLICTS= h2o-2* +CONFLICTS= h2o SHEBANG_FILES= share/h2o/start_server diff --git a/www/horde-ansel/Makefile b/www/horde-ansel/Makefile index 3c10b21cfe0b7..102c9f57f26e6 100644 --- a/www/horde-ansel/Makefile +++ b/www/horde-ansel/Makefile @@ -37,4 +37,6 @@ USE_HORDE_RUN= Horde_Role \ Horde_View \ Horde_Vfs +CONFLICTS_INSTALL= php*-horde-ansel # bin/AnselPublish.scpt bin/ansel bin/ansel-convert-sql-shares-to-sqlng bin/ansel-exif-to-tags bin/ansel-garbage-collection + .include diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile index afcc6cbbc82d5..1ead2d6ca5c94 100644 --- a/www/horde-base/Makefile +++ b/www/horde-base/Makefile @@ -19,6 +19,8 @@ WEATHER_DESC= Support weather forecast display USES= horde cpe php USE_PHP= filter gettext hash +CONFLICTS_INSTALL= php*-horde + USE_HORDE_BUILD= Horde_Role USE_HORDE_RUN= Horde_Role \ Horde_Alarm \ diff --git a/www/htdump/Makefile b/www/htdump/Makefile index 237d8301b3a2b..45fa6a855dca8 100644 --- a/www/htdump/Makefile +++ b/www/htdump/Makefile @@ -10,6 +10,8 @@ COMMENT= Tool to retrieve WWW data LICENSE= APACHE20 +CONFLICTS_INSTALL= htdig # bin/htdump + OPTIONS_DEFINE= SSL OPTIONS_DEFAULT=SSL diff --git a/www/interchange/Makefile b/www/interchange/Makefile index 8455056eda12a..e39ad36e7a3bc 100644 --- a/www/interchange/Makefile +++ b/www/interchange/Makefile @@ -29,6 +29,8 @@ SHEBANG_FILES= dist/src/compile.pl \ USE_PERL5= configure NO_ARCH= yes +CONFLICTS_INSTALL= isc-cron mcron # bin/crontab + OPTIONS_DEFINE= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index e891e4d46d653..a61c381d1c2d1 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -11,7 +11,7 @@ COMMENT= Full featured SQL-based hypertext search engine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= dpsearch udmsearch mguesser +CONFLICTS= sphinxsearch udmsearch mguesser OPTIONS_DEFINE= DOCS EXAMPLES THREADS SSL ASIAN SYSLOG diff --git a/www/p5-App-gist/Makefile b/www/p5-App-gist/Makefile index e17b8e4fe2236..47fe1c5e66c80 100644 --- a/www/p5-App-gist/Makefile +++ b/www/p5-App-gist/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \ p5-Pithub>=0:devel/p5-Pithub \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey -CONFLICTS= gist +CONFLICTS= gist py*-python-gist yorick # bin/gist USES= perl5 USE_PERL5= configure diff --git a/www/p5-Dancer/Makefile b/www/p5-Dancer/Makefile index 954799937e984..c441510a9d378 100644 --- a/www/p5-Dancer/Makefile +++ b/www/p5-Dancer/Makefile @@ -31,6 +31,8 @@ TEST_DEPENDS= \ p5-Test-TCP>0:devel/p5-Test-TCP \ p5-Test-Output>=0:devel/p5-Test-Output +CONFLICTS_INSTALL= dancer # bin/dancer + OPTIONS_DEFINE= YAML OPTIONS_DEFAULT= YAML diff --git a/www/p5-HTML-Diff/Makefile b/www/p5-HTML-Diff/Makefile index 9016fcc0722d8..da49ecb80fd2c 100644 --- a/www/p5-HTML-Diff/Makefile +++ b/www/p5-HTML-Diff/Makefile @@ -16,4 +16,6 @@ RUN_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= rubygem-diff-lcs # bin/htmldiff + .include diff --git a/www/pear-Horde_Service_Weather/Makefile b/www/pear-Horde_Service_Weather/Makefile index 5a77e7e694499..c889ff538d6a6 100644 --- a/www/pear-Horde_Service_Weather/Makefile +++ b/www/pear-Horde_Service_Weather/Makefile @@ -16,4 +16,6 @@ USE_HORDE_RUN= Horde_Role \ Horde_Translation \ Horde_Url +CONFLICTS_INSTALL= php*-pear-horde-Horde_Service_Weather # bin/horde-service-weather-metar-database + .include diff --git a/www/py-cachecontrol/Makefile b/www/py-cachecontrol/Makefile index 44ccf8d5125b3..ac7f300a87b4b 100644 --- a/www/py-cachecontrol/Makefile +++ b/www/py-cachecontrol/Makefile @@ -19,6 +19,8 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes REINPLACE_ARGS= -i '' +CONFLICTS_INSTALL= py*-cachecontrol # bin/doesitcache + post-patch: @${REINPLACE_CMD} -e 's|msgpack-python|msgpack|' ${WRKSRC}/setup.py ${WRKSRC}/CacheControl.egg-info/requires.txt diff --git a/www/py-django22/Makefile b/www/py-django22/Makefile index 34e92c8405509..a3b1e1898b733 100644 --- a/www/py-django22/Makefile +++ b/www/py-django22/Makefile @@ -32,8 +32,7 @@ PORTDOCS= * SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django30 \ - ${PYTHON_PKGNAMEPREFIX}django31 ${PYTHON_PKGNAMEPREFIX}django32 +CONFLICTS_INSTALL= py*-django* # bin/django-admin CPE_VENDOR= djangoproject diff --git a/www/py-python-dotenv/Makefile b/www/py-python-dotenv/Makefile index e3190b6bd87eb..5cdaf2851bfd0 100644 --- a/www/py-python-dotenv/Makefile +++ b/www/py-python-dotenv/Makefile @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= rubygem-dotenv # bin/dotenv + NO_ARCH= yes OPTIONS_DEFINE= CLI diff --git a/www/rubygem-jekyll/Makefile b/www/rubygem-jekyll/Makefile index 3a81d4ceb3d9b..79e957ecaf465 100644 --- a/www/rubygem-jekyll/Makefile +++ b/www/rubygem-jekyll/Makefile @@ -29,6 +29,8 @@ RUN_DEPENDS= rubygem-addressable>=2.4<3:www/rubygem-addressable \ USES= cpe gem USE_RUBY= yes +CONFLICTS_INSTALL= rubygem-jekyll3 + NO_ARCH= yes CPE_VENDOR= jekyllrb diff --git a/www/rubygem-jekyll3/Makefile b/www/rubygem-jekyll3/Makefile index fdb7cb5d0f0da..53ee3a9faa5e9 100644 --- a/www/rubygem-jekyll3/Makefile +++ b/www/rubygem-jekyll3/Makefile @@ -28,6 +28,8 @@ RUN_DEPENDS= rubygem-addressable>=2.4<3:www/rubygem-addressable \ USES= cpe gem USE_RUBY= yes +CONFLICTS_INSTALL= rubygem-jekyll + NO_ARCH= yes PLIST_FILES= bin/jekyll diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile index b98502d85ea47..5c99bc7389a5f 100644 --- a/x11-clocks/asclock-xlib/Makefile +++ b/x11-clocks/asclock-xlib/Makefile @@ -7,6 +7,8 @@ MASTER_SITES= LOCAL/kuriyama MAINTAINER= ports@FreeBSD.org COMMENT= New flavor of asclock +CONFLICTS_INSTALL= asclock + MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/asclock-xlib diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile index f8a98c980b992..9e03be70dad22 100644 --- a/x11-clocks/asclock/Makefile +++ b/x11-clocks/asclock/Makefile @@ -12,7 +12,7 @@ COMMENT= Afterstep clock with some language extensions LICENSE= BSD2CLAUSE -CONFLICTS= asclock-gtk asclock-xlib +CONFLICTS_INSTALL= asclock-xlib USES= tar:tgz imake xorg USE_XORG= xpm xext x11 diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile index 82e9f604a32d5..622069cafb858 100644 --- a/x11-fm/deforaos-browser/Makefile +++ b/x11-fm/deforaos-browser/Makefile @@ -31,6 +31,8 @@ USE_LDCONFIG= yes MAKE_ARGS+= PREFIX=${PREFIX} MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man + +CONFLICTS_INSTALL= schilyutils silo # bin/browser bin/copy post-patch: ${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ ${WRKSRC}/data/pkgconfig.sh diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile index f5282fb9afa46..8568ab9225a1d 100644 --- a/x11-wm/fvwm3/Makefile +++ b/x11-wm/fvwm3/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libevent.so:devel/libevent \ USES= compiler:c11 cpe pkgconfig python:3.7+ readline xorg USE_XORG= ice sm x11 xext xft xrandr xrender xt -CONFLICTS_INSTALL= fvwm-2.* +CONFLICTS_INSTALL= fvwm CPE_VENDOR= fvwm CPE_PRODUCT= fvwm diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 0bd90278a6667..fa944c2f68b91 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -27,6 +27,8 @@ CONFIGURE_ARGS= --enable-wtmp \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= zh-aterm + OPTIONS_DEFINE= TRANS BSDEL MOUSE BGIMG KANJI BIG5S GREEK OPTIONS_DEFAULT= TRANS BSDEL MOUSE TRANS_DESC= Transparency support diff --git a/x11/docker-tray/Makefile b/x11/docker-tray/Makefile index f981f65f11e7d..efff042bac164 100644 --- a/x11/docker-tray/Makefile +++ b/x11/docker-tray/Makefile @@ -17,6 +17,8 @@ USES= gmake gnome pkgconfig xorg USE_XORG= x11 USE_GNOME= glib20 +CONFLICTS_INSTALL= docker # bin/docker + PLIST_FILES= bin/docker post-patch: diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 26ca8f496849e..5117e54d0f2be 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -36,6 +36,8 @@ USE_LDCONFIG= yes USE_XORG= x11 xt CPE_VENDOR= eterm_project +CONFLICTS_INSTALL= ja-eterm zh-eterm + OPTIONS_DEFINE= DOCS OPTIONS_DEFINE_i386= MMX diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 383e2882d9b0c..116d555cc1e1c 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -125,6 +125,7 @@ PLIST_SUB+= LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment " PLIST_SUB+= LIBGLDIR="@comment " LIBGLMAP="" .endif +CONFLICTS_INSTALL+= nvidia-driver nvidia-driver-* .if ${PORTNAME} != nvidia-secondary-driver CONFLICTS_INSTALL+= nvidia-secondary-driver .endif diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index f535c62db045e..ac0d705ce39cf 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL20 BUILD_DEPENDS= itstool:textproc/itstool -CONFLICTS= gtkada-1.2.* zenity-2.* +CONFLICTS= gdialog # bin/gdialog USES= gettext gmake gnome localbase pathfix pkgconfig \ perl5 tar:xz xorg