git: bdd2d4af9630 - main - Update CONFLICTS definitions in categories a* to c*
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 06 Feb 2022 18:43:10 UTC
The branch main has been updated by se:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bdd2d4af9630fdc1157d49bd193e8195c3240e9e
commit bdd2d4af9630fdc1157d49bd193e8195c3240e9e
Author: Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-02-06 18:36:07 +0000
Commit: Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-02-06 18:36:07 +0000
Update CONFLICTS definitions in categories a* to c*
Update the CONFLICTS definitions of ports in the following categories:
- accessibility
- archivers
- audio
- benchmarks
- biology
- cad
- chinese
- comms
- converters
An attempt has been made to use generic conflicts patterns that do not
have to be updated whenever a new version of a conflicting port is
added to the ports system.
There is a misunderstanding that the port being built/installed has to
be omitted from the conflicts pattern. This is not true - the port
being built is implicitly non-conflicting due to logic in bsd.port.mk.
Approved by: portmgr (implicit)
---
accessibility/orca/Makefile | 2 +-
archivers/lua-lzlib/Makefile | 2 +-
audio/asterisk-flite/Makefile | 4 ++--
audio/ocp/Makefile | 2 ++
benchmarks/nosqlbench/Makefile | 2 +-
benchmarks/phoronix-test-suite/Makefile | 2 ++
biology/bolt-lmm/Makefile | 2 ++
biology/fastx-toolkit/Makefile | 2 ++
biology/gmap/Makefile | 2 +-
biology/iolib/Makefile | 2 ++
biology/migrate/Makefile | 2 ++
biology/ncbi-cxx-toolkit/Makefile | 3 ++-
biology/ncbi-entrez-direct/Makefile | 2 +-
biology/ncbi-toolkit/Makefile | 2 ++
biology/picard-tools/Makefile | 2 ++
biology/plink/Makefile | 2 ++
biology/py-scikit-bio/Makefile | 2 ++
biology/seqan1/Makefile | 2 +-
biology/vcflib/Makefile | 2 ++
biology/viennarna/Makefile | 2 ++
cad/alliance/Makefile | 2 +-
cad/kicad-devel/Makefile | 2 +-
cad/kicad-library-footprints-devel/Makefile | 2 +-
cad/kicad-library-footprints/Makefile | 2 +-
cad/kicad-library-packages3d-devel/Makefile | 2 +-
cad/kicad-library-packages3d/Makefile | 2 +-
cad/kicad-library-symbols-devel/Makefile | 2 +-
cad/kicad-library-symbols/Makefile | 2 +-
cad/kicad-library-templates-devel/Makefile | 2 +-
cad/kicad-library-templates/Makefile | 2 +-
cad/kicad/Makefile | 2 +-
cad/netgen-lvs/Makefile | 2 ++
cad/netgen/Makefile | 2 ++
cad/opencascade/Makefile | 2 ++
cad/opencascade740/Makefile | 2 ++
cad/openscad/Makefile | 4 ++--
cad/scotch/Makefile | 2 +-
cad/surelog/Makefile | 2 ++
cad/uhdm/Makefile | 2 ++
cad/verilog-mode.el/Makefile | 2 ++
chinese/cconv/Makefile | 2 ++
chinese/enscript/Makefile | 2 +-
chinese/eterm/Makefile | 2 +-
chinese/fcitx-chewing/Makefile | 2 ++
chinese/fcitx-rime/Makefile | 2 ++
chinese/fcitx-table-extra/Makefile | 2 ++
chinese/fcitx/Makefile | 2 +-
chinese/fcitx5-chewing/Makefile | 2 ++
chinese/fcitx5-chinese-addons/Makefile | 2 ++
chinese/fcitx5-rime/Makefile | 2 ++
chinese/fcitx5-table-extra/Makefile | 2 ++
chinese/fcitx5-table-other/Makefile | 2 ++
chinese/phpbb-tw/Makefile | 2 +-
chinese/phpbb3-tw/Makefile | 2 +-
chinese/tin/Makefile | 2 ++
chinese/wenju/Makefile | 2 ++
chinese/wordpress-zh_TW/Makefile | 3 +++
comms/libfec/Makefile | 2 ++
comms/lrzsz/Makefile | 2 ++
comms/openzwave-devel/Makefile | 2 ++
comms/openzwave/Makefile | 2 ++
comms/predict/Makefile | 2 ++
comms/qico/Makefile | 2 ++
comms/scmxx/Makefile | 2 ++
comms/smstools3/Makefile | 2 +-
comms/yagiuda/Makefile | 2 ++
converters/gbase/Makefile | 2 ++
converters/mmencode/Makefile | 2 ++
converters/py-svglib/Makefile | 2 ++
69 files changed, 115 insertions(+), 29 deletions(-)
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 364aaa2b77b3..4274e97e9589 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
# conflict with py*-json-py because orca uses the json from python itself
# and py*-json-py shadows this.
-CONFLICTS= py*-json-py
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}orca # lib/python3.8/site-packages/orca/__init__.py
PORTSCOUT= limitw:1,even
NO_ARCH= yes
diff --git a/archivers/lua-lzlib/Makefile b/archivers/lua-lzlib/Makefile
index ab299189ad33..74eb73f24f50 100644
--- a/archivers/lua-lzlib/Makefile
+++ b/archivers/lua-lzlib/Makefile
@@ -17,7 +17,7 @@ CMAKE_ARGS= -DINSTALL_LMOD="${LUA_MODSHAREDIR}" \
-DINSTALL_DOC="${DOCSDIR}" \
-DINSTALL_TEST="${EXAMPLESDIR}"
-CONFLICTS_INSTALL= ${LUA_PKGNAMEPREFIX}zlib lua*-lzlib # lib/lua/5.1/zlib.so share/doc/lzlib/README
+CONFLICTS_INSTALL= ${LUA_PKGNAMEPREFIX}zlib lua[0-9][0-9]-lzlib # lib/lua/5.1/zlib.so share/doc/lzlib/README
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/audio/asterisk-flite/Makefile b/audio/asterisk-flite/Makefile
index e4944e560b94..98c72316e70b 100644
--- a/audio/asterisk-flite/Makefile
+++ b/audio/asterisk-flite/Makefile
@@ -15,12 +15,10 @@ FLAVORS= asterisk18 asterisk16
FLAVOR?= ${FLAVORS:[1]}
asterisk16_PKGNAMEPREFIX= asterisk16-
-asterisk16_CONFLICTS_INSTALL= asterisk13-flite asterisk18-flite
asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
asterisk18_PKGNAMEPREFIX= asterisk18-
-asterisk18_CONFLICTS_INSTALL= asterisk13-flite asterisk16-flite
asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18
asterisk18_RUN_DEPENDS= asterisk:net/asterisk18
@@ -31,6 +29,8 @@ USE_GITHUB= yes
GH_ACCOUNT= zaf
GH_PROJECT= Asterisk-Flite
+CONFLICTS_INSTALL= asterisk[0-9][0-9]-flite # etc/asterisk/flite.conf.sample
+
.include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == clang
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 71da0fee6294..c2c50475b3b2 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -36,6 +36,8 @@ MAKE_JOBS_UNSAFE= yes
LDFLAGS_i386= -Wl,-z,notext
+CONFLICTS_INSTALL= alliance # man/man1/ocp.1.gz
+
INFO= ocp
OPTIONS_DEFINE= ADPLUG ALSA DOCS FLAC MIDI OSS SDL X11
diff --git a/benchmarks/nosqlbench/Makefile b/benchmarks/nosqlbench/Makefile
index 0c7b31ce9965..025615262c9a 100644
--- a/benchmarks/nosqlbench/Makefile
+++ b/benchmarks/nosqlbench/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libleveldb.so:databases/leveldb
DATE= 20151214
USES= cmake:insource tar:bzip2
-CONFLICTS= tarantool-c
+CONFLICTS_INSTALL= nanoblogger tarantool-c # bin/nb include/tarantool/tarantool.h
post-patch:
@${REINPLACE_CMD} -e 's|-O3 -march=native||' ${WRKSRC}/CMakeLists.txt \
diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index 0ccfcf2751c7..9ee5909bbdf0 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -37,6 +37,8 @@ SHEBANG_FILES= ob-cache/test-profiles/pts/shadowofthetombraider-1.0.0/install.sh
ob-cache/test-profiles/pts/portal-1.1.1/pre_linux.sh \
deploy/docker/ubuntu-pts-docker-build.sh
+CONFLICTS_INSTALL= phoronix-test-suite-php[0-9][0-9] # bin/phoronix-test-suite
+
OPTIONS_DEFINE= BASH_COMPLETIONS DOCS X11
OPTIONS_DEFAULT= X11
OPTIONS_SUB= yes
diff --git a/biology/bolt-lmm/Makefile b/biology/bolt-lmm/Makefile
index 74284124e40a..7302e3ef897b 100644
--- a/biology/bolt-lmm/Makefile
+++ b/biology/bolt-lmm/Makefile
@@ -34,6 +34,8 @@ MAKE_ARGS= BOOST_INSTALL_DIR=${LOCALBASE} \
MEMCPY="" \
LLAPACK="-lopenblas -lgfortran"
+CONFLICTS_INSTALL= rubygem-bolt # bin/bolt
+
PORTEXAMPLES= *
OPTIONS_DEFINE= EXAMPLES
diff --git a/biology/fastx-toolkit/Makefile b/biology/fastx-toolkit/Makefile
index ac8deefde71e..5e7f8067f298 100644
--- a/biology/fastx-toolkit/Makefile
+++ b/biology/fastx-toolkit/Makefile
@@ -17,4 +17,6 @@ USE_GITHUB= yes
GH_ACCOUNT= agordon
GNU_CONFIGURE= yes
+CONFLICTS_INSTALL= autoconf-archive # share/aclocal/ax_c_long_long.m4
+
.include <bsd.port.mk>
diff --git a/biology/gmap/Makefile b/biology/gmap/Makefile
index aa4abd068733..876678f60cb1 100644
--- a/biology/gmap/Makefile
+++ b/biology/gmap/Makefile
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS_REASON= upstream supports only x86 and possibly POWER8
USES= gmake perl5
GNU_CONFIGURE= yes
-CONFLICTS_INSTALL= cpuid
+CONFLICTS_INSTALL= cpuid scotch # bin/cpuid bin/gmap
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C|\.|-|g}
CFLAGS+= -fcommon
diff --git a/biology/iolib/Makefile b/biology/iolib/Makefile
index 6e509abc1b81..f75377cff48a 100644
--- a/biology/iolib/Makefile
+++ b/biology/iolib/Makefile
@@ -22,4 +22,6 @@ USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
LDFLAGS+= -lpthread
+CONFLICTS_INSTALL= filters scramble # bin/scramble
+
.include <bsd.port.mk>
diff --git a/biology/migrate/Makefile b/biology/migrate/Makefile
index 0e5867011a63..e6c8596d987c 100644
--- a/biology/migrate/Makefile
+++ b/biology/migrate/Makefile
@@ -22,6 +22,8 @@ CONFIGURE_ENV= ac_cv_prog_GMAKE="${MAKE}"
MAKE_ARGS= PRETTYCFLAGS="${CFLAGS} -DNOJPEG -DNOZLIB -DNOPNG -Iharu \
-DPRETTY -lstdc++"
+CONFLICTS_INSTALL= py*-sqlalchemy-migrate # bin/migrate
+
PORTDOCS= HISTORY README README_PARALLEL_GENERAL ${PORTNAME}.html
PORTEXAMPLES= *
diff --git a/biology/ncbi-cxx-toolkit/Makefile b/biology/ncbi-cxx-toolkit/Makefile
index 2fc85bad7d51..f9263c047eca 100644
--- a/biology/ncbi-cxx-toolkit/Makefile
+++ b/biology/ncbi-cxx-toolkit/Makefile
@@ -28,7 +28,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-debug --with-dll --without-static \
--without-vdb
-CONFLICTS_INSTALL= ncbi-blast+
+CONFLICTS_INSTALL= dakota libxdiff ncbi-blast+ ncbi-toolkit proj \
+ py*-speedtest-cli # bin/blast_formatter bin/speedtest bin/test_regexp lib/libeutils.so lib/libproj.so lib/libxdiff.so
post-install:
# strip
diff --git a/biology/ncbi-entrez-direct/Makefile b/biology/ncbi-entrez-direct/Makefile
index d8a3e4539918..284d92bd598d 100644
--- a/biology/ncbi-entrez-direct/Makefile
+++ b/biology/ncbi-entrez-direct/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
USES= go:modules perl5 shebangfix
USE_GITHUB= nodefault
-CONFLICTS_INSTALL= ebook-tools
+CONFLICTS_INSTALL= ebook-tools p5-XML-Compile # bin/einfo bin/xml2json
# Dependency versions:
# make clean extract
diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index ffae0c32fe3c..90c3219ff061 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -26,6 +26,8 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
USES= gettext-runtime iconv jpeg motif xorg
USE_XORG= x11 xau xext xft xmu xrender xt
+CONFLICTS_INSTALL= fhist ncbi-cxx-toolkit # bin/test_regexp man/man1/fmerge.1.gz
+
SUB_FILES= pkg-message
OPTIONS_DEFINE= DOCS
diff --git a/biology/picard-tools/Makefile b/biology/picard-tools/Makefile
index 4e970306080c..f086f83ca177 100644
--- a/biology/picard-tools/Makefile
+++ b/biology/picard-tools/Makefile
@@ -16,6 +16,8 @@ RUN_DEPENDS= samtools:biology/samtools
USE_JAVA= 1.8+
JAVA_RUN= yes
+CONFLICTS_INSTALL= picard # bin/picard
+
SUB_FILES= picard
NO_BUILD= yes
NO_ARCH= yes
diff --git a/biology/plink/Makefile b/biology/plink/Makefile
index 40dc0c77ff3a..46cf662f316e 100644
--- a/biology/plink/Makefile
+++ b/biology/plink/Makefile
@@ -27,6 +27,8 @@ CFLAGS+= -DDYNAMIC_ZLIB -I${LOCALBASE}/include
LDFLAGS+= -lthr
INSTALL_TARGET= install-strip
+CONFLICTS_INSTALL= putty putty-nogtk # bin/plink
+
OPTIONS_DEFINE= EXAMPLES
OPTIONS_SINGLE= BLAS
OPTIONS_SINGLE_BLAS= NETLIB OPENBLAS
diff --git a/biology/py-scikit-bio/Makefile b/biology/py-scikit-bio/Makefile
index 65253e23c183..5a4f0b01d3c7 100644
--- a/biology/py-scikit-bio/Makefile
+++ b/biology/py-scikit-bio/Makefile
@@ -26,6 +26,8 @@ RUN_DEPENDS= ${PYNUMPY} \
USES= python:3.7+
USE_PYTHON= autoplist distutils
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}ddtrace # lib/python3.8/site-packages/benchmarks/__init__.py
+
.include <bsd.port.options.mk>
.if ${ARCH} == i386
diff --git a/biology/seqan1/Makefile b/biology/seqan1/Makefile
index 5ca1ae722732..1267cf8aae28 100644
--- a/biology/seqan1/Makefile
+++ b/biology/seqan1/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/seqan/LICENSE
USES= zip
NO_BUILD= yes
-CONFLICTS= seqan-[2-9]*
+CONFLICTS_INSTALL= seqan # include/seqan/align.h
OPTIONS_DEFINE= DOCS
diff --git a/biology/vcflib/Makefile b/biology/vcflib/Makefile
index 4bc5f9a9d945..5656d5baf827 100644
--- a/biology/vcflib/Makefile
+++ b/biology/vcflib/Makefile
@@ -29,4 +29,6 @@ SHEBANG_FILES= scripts/*
# Clang and GCC disable sse2 by default on i386, but it's required for vcflib
CFLAGS_i386= -msse2
+CONFLICTS_INSTALL= dakota filevercmp libdisorder # include/disorder.h include/filevercmp.h include/pdflib.hpp
+
.include <bsd.port.mk>
diff --git a/biology/viennarna/Makefile b/biology/viennarna/Makefile
index 5b3d547a7f14..b3efc36f81f0 100644
--- a/biology/viennarna/Makefile
+++ b/biology/viennarna/Makefile
@@ -25,6 +25,8 @@ GNU_CONFIGURE= yes
CONFIGURE_SHELL= ${PREFIX}/bin/bash
CONFIGURE_ARGS= --enable-shared --disable-static --with-gsl --with-cluster --with-kinwalker --enable-mpfr --without-python --without-python3 --without-perl
+CONFLICTS_INSTALL= g2 # include/g2.h
+
INFO= RNAlib
DATASDIR= ${PREFIX}/share/ViennaRNA
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index b39afaabe8b1..98e80faad71f 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -34,7 +34,7 @@ MAKE_JOBS_UNSAFE= yes
INSTALL_TARGET= install-strip
CFLAGS+= -fcommon
-CONFLICTS_INSTALL= fspclient
+CONFLICTS_INSTALL= ocp publib
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/alliance/src
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index e185deca3fd2..5bb0db745f89 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libpng.so:graphics/png \
libcurl.so:ftp/curl
-CONFLICTS= kicad-4.*
+CONFLICTS_INSTALL= kicad # bin/_cvpcb.kiface
USE_GITLAB= yes
GL_ACCOUNT= kicad/code
diff --git a/cad/kicad-library-footprints-devel/Makefile b/cad/kicad-library-footprints-devel/Makefile
index a27010d975b6..b33d298c8c29 100644
--- a/cad/kicad-library-footprints-devel/Makefile
+++ b/cad/kicad-library-footprints-devel/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= kicad:cad/kicad-devel
-CONFLICTS= kicad-4.*
+CONFLICTS_INSTALL= kicad-library-footprints # share/kicad/footprints/Audio_Module.pretty/Reverb_BTDR-1H.kicad_mod
USE_GITLAB= nodefault
GL_ACCOUNT= kicad
diff --git a/cad/kicad-library-footprints/Makefile b/cad/kicad-library-footprints/Makefile
index f17275cfcfd9..c2ea17440c1c 100644
--- a/cad/kicad-library-footprints/Makefile
+++ b/cad/kicad-library-footprints/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= kicad:cad/kicad
USES= cmake tar:bz2
-CONFLICTS= kicad-devel-r2*
+CONFLICTS_INSTALL= kicad-library-footprints-devel # share/kicad/footprints/Audio_Module.pretty/Reverb_BTDR-1H.kicad_mod
CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \
-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-packages3d-devel/Makefile b/cad/kicad-library-packages3d-devel/Makefile
index f4b65c224a64..431d7302ec41 100644
--- a/cad/kicad-library-packages3d-devel/Makefile
+++ b/cad/kicad-library-packages3d-devel/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= kicad:cad/kicad-devel
-CONFLICTS= kicad-4.*
+CONFLICTS_INSTALL= kicad-library-packages3d # share/kicad/3dmodels/Battery.3dshapes/BatteryHolder_Bulgin_BX0036_1xC.step
USE_GITLAB= nodefault
GL_ACCOUNT= kicad
diff --git a/cad/kicad-library-packages3d/Makefile b/cad/kicad-library-packages3d/Makefile
index 09605758d404..6371e64c4355 100644
--- a/cad/kicad-library-packages3d/Makefile
+++ b/cad/kicad-library-packages3d/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= kicad:cad/kicad
USES= cmake tar:bz2
-CONFLICTS= kicad-devel-r2*
+CONFLICTS_INSTALL= kicad-library-packages3d-devel # share/kicad/3dmodels/Battery.3dshapes/BatteryHolder_Bulgin_BX0036_1xC.step
CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \
-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-symbols-devel/Makefile b/cad/kicad-library-symbols-devel/Makefile
index 45a3bf949622..d698b1e14a93 100644
--- a/cad/kicad-library-symbols-devel/Makefile
+++ b/cad/kicad-library-symbols-devel/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= kicad:cad/kicad-devel
-CONFLICTS= kicad-4.*
+CONFLICTS_INSTALL= kicad-library-symbols # share/kicad/symbols/4xxx.kicad_sym
USE_GITLAB= nodefault
GL_ACCOUNT= kicad
diff --git a/cad/kicad-library-symbols/Makefile b/cad/kicad-library-symbols/Makefile
index 7a627a0f5194..b0e607aa95c3 100644
--- a/cad/kicad-library-symbols/Makefile
+++ b/cad/kicad-library-symbols/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= kicad:cad/kicad
USES= cmake tar:bz2
-CONFLICTS= kicad-devel-r2*
+CONFLICTS_INSTALL= kicad-library-symbols-devel # share/kicad/symbols/4xxx.kicad_sym
CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \
-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-templates-devel/Makefile b/cad/kicad-library-templates-devel/Makefile
index b21287aca346..607062ed23ba 100644
--- a/cad/kicad-library-templates-devel/Makefile
+++ b/cad/kicad-library-templates-devel/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= kicad:cad/kicad-devel
-CONFLICTS= kicad-4.*
+CONFLICTS_INSTALL= kicad-library-tmpl # share/kicad/template/A2_ISO5457-1999_ISO7200-2004-compact_ASMEY1435-2014_EN.kicad_wks
USE_GITLAB= nodefault
GL_ACCOUNT= kicad
diff --git a/cad/kicad-library-templates/Makefile b/cad/kicad-library-templates/Makefile
index 4508069eee61..5fa157ddef50 100644
--- a/cad/kicad-library-templates/Makefile
+++ b/cad/kicad-library-templates/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= kicad:cad/kicad
USES= cmake tar:bz2
-CONFLICTS= kicad-devel-r2*
+CONFLICTS_INSTALL= kicad-library-tmpl-devel # share/kicad/template/A2_ISO5457-1999_ISO7200-2004-compact_ASMEY1435-2014_EN.kicad_wks
CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \
-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index bf3f71357a3d..f4828b6e8c5c 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libpng.so:graphics/png \
libcurl.so:ftp/curl
-CONFLICTS= kicad-devel-r201*
+CONFLICTS_INSTALL= kicad-devel # bin/_cvpcb.kiface
USES= cmake:noninja compiler:c++11-lib desktop-file-utils gl \
gnome pkgconfig python:3.5+ shared-mime-info shebangfix ssl \
diff --git a/cad/netgen-lvs/Makefile b/cad/netgen-lvs/Makefile
index c14eb2d141a8..793b872b0cfb 100644
--- a/cad/netgen-lvs/Makefile
+++ b/cad/netgen-lvs/Makefile
@@ -23,6 +23,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= HAVE_PYTHON3=yes
CONFIGURE_ARGS= --with-interpreter=tcl --with-tcl=${LOCALBASE}/lib/tcl8.6 --with-tk=${LOCALBASE}/lib/tk8.6 --with-x
+CONFLICTS_INSTALL= netgen # bin/netgen
+
post-patch:
@${REINPLACE_CMD} -e 's|^#!/bin/env python3$$|#!${PYTHON_CMD}|' \
${WRKSRC}/python/*.py \
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index c4b15fd82dc5..9ab50e4fedd5 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -31,6 +31,8 @@ LDFLAGS+= -lexecinfo
CMAKE_OFF= USE_NATIVE_ARCH
+CONFLICTS_INSTALL= libvisual netgen-lvs pybind11 # bin/netgen include/pybind11/attr.h lib/libvisual.so
+
OPTIONS_DEFINE= JPEG MPEG CGNS
JPEG_DESC= Enable snapshots using jpeg
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 7c34082f9c5b..4c2313bd1c87 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -72,6 +72,8 @@ CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= opencascade740 # OpenCAS/bin/DRAWEXE
+
LOCCROOT= OpenCAS
OCCROOT= ${PREFIX}/${LOCCROOT}
PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \
diff --git a/cad/opencascade740/Makefile b/cad/opencascade740/Makefile
index 22f28ab929dc..164cd03b2f7b 100644
--- a/cad/opencascade740/Makefile
+++ b/cad/opencascade740/Makefile
@@ -57,6 +57,8 @@ CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= opencascade # OpenCAS/bin/DRAWEXE
+
LOCCROOT= OpenCAS
OCCROOT= ${PREFIX}/${LOCCROOT}
PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 56f3030608b2..3ad7848e7b90 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -27,8 +27,6 @@ LIB_DEPENDS= libzip.so:archivers/libzip \
libfontconfig.so:x11-fonts/fontconfig \
libdouble-conversion.so:devel/double-conversion
-#CONFLICTS= openscad-devel
-
USES= bison compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
USE_GITHUB= yes
@@ -41,6 +39,8 @@ QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION}
# Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
LDFLAGS+= -Wl,--as-needed
+CONFLICTS_INSTALL= openscad-devel # bin/openscad
+
post-patch:
@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
@${REINPLACE_CMD} -e 's,share/man,man,' \
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 97858c445ae2..a9f68ecfe3aa 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -15,7 +15,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= bison:alias gmake localbase
-CONFLICTS= gbase-0.* gmap-2015.*
+CONFLICTS_INSTALL= gbase gmap # bin/gbase bin/gmap
MAKE_JOBS_UNSAFE=yes
diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
index 7c740fff0d7d..baa6033a4fda 100644
--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@@ -30,6 +30,8 @@ GH_TUPLE= \
CMAKE_ON= BUILD_SHARED_LIBS
+CONFLICTS_INSTALL= capnproto capnproto080 uhdm # bin/uhdm-dump lib/libcapnp.so
+
BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH}
OPTIONS_DEFINE= PYTHON
diff --git a/cad/uhdm/Makefile b/cad/uhdm/Makefile
index 5036ee684cb2..e4230f6968a7 100644
--- a/cad/uhdm/Makefile
+++ b/cad/uhdm/Makefile
@@ -21,6 +21,8 @@ GH_TUPLE= capnproto:capnproto:14f24a4:capnproto/third_party/capnproto \
CMAKE_ON= BUILD_SHARED_LIBS
+CONFLICTS_INSTALL= capnproto capnproto080 surelog # bin/uhdm-dump lib/libcapnp.so
+
BINARY_ALIAS= tclsh=${TCLSH}
.include <bsd.port.mk>
diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile
index daf70aeb4721..0af06756f98c 100644
--- a/cad/verilog-mode.el/Makefile
+++ b/cad/verilog-mode.el/Makefile
@@ -23,6 +23,8 @@ NO_BUILD= yes
USES= emacs:run
+CONFLICTS_INSTALL= verilog-mode.el verilog-mode.el-emacs_* # share/emacs/site-lisp/verilog-mode.el
+
PLIST_FILES= ${EMACS_SITE_LISPDIR}/${PORTNAME}
do-install:
diff --git a/chinese/cconv/Makefile b/chinese/cconv/Makefile
index 2824cb4a8431..87474cd2d386 100644
--- a/chinese/cconv/Makefile
+++ b/chinese/cconv/Makefile
@@ -19,6 +19,8 @@ USES= autoreconf iconv libtool
GH_ACCOUNT= xiaoyjy
USE_GITHUB= yes
+CONFLICTS_INSTALL= libunicode # include/unicode.h
+
.include <bsd.port.pre.mk>
.if !empty(ICONV_LIB)
diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile
index da03bf342cc9..31a9f3201fdb 100644
--- a/chinese/enscript/Makefile
+++ b/chinese/enscript/Makefile
@@ -16,7 +16,7 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
USES+= ghostscript:run
-CONFLICTS_INSTALL= enscript-a4 enscript-letter enscript-letterdj
+CONFLICTS_INSTALL= enscript-a4 enscript-letter enscript-letterdj py*-us # bin/einfo bin/xml2json
post-patch:
@${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist
diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile
index 764533d80514..cfd73d3ed0cc 100644
--- a/chinese/eterm/Makefile
+++ b/chinese/eterm/Makefile
@@ -14,7 +14,7 @@ CONFIGURE_ARGS= --enable-trans --enable-utmp \
--with-backspace=bs --without-terminfo \
--enable-multi-charset=big5
-CONFLICTS_INSTALL= eterm ja-eterm
+CONFLICTS_INSTALL= eterm eterm-bg ja-eterm # bin/Esetroot share/Eterm/pix/scale/Neopolis-horizon.jpg
PKGDIR= ${.CURDIR}
PLIST= ${MASTERDIR}/pkg-plist
diff --git a/chinese/fcitx-chewing/Makefile b/chinese/fcitx-chewing/Makefile
index 757f69186ade..c5d8701b560f 100644
--- a/chinese/fcitx-chewing/Makefile
+++ b/chinese/fcitx-chewing/Makefile
@@ -18,4 +18,6 @@ LIB_DEPENDS= libfcitx-config.so:chinese/fcitx \
USES= cmake gettext gnome pkgconfig tar:xz
+CONFLICTS_INSTALL= zh-fcitx5-chewing # share/icons/hicolor/48x48/apps/fcitx-chewing.png
+
.include <bsd.port.mk>
diff --git a/chinese/fcitx-rime/Makefile b/chinese/fcitx-rime/Makefile
index 64891cd34877..fa1725ae6c08 100644
--- a/chinese/fcitx-rime/Makefile
+++ b/chinese/fcitx-rime/Makefile
@@ -23,6 +23,8 @@ RUN_DEPENDS= ${_SCHEMA_DEPENDS}
USES= cmake gettext gnome localbase pkgconfig tar:xz
+CONFLICTS_INSTALL= zh-fcitx5-rime # share/icons/hicolor/48x48/apps/fcitx-rime-deploy.png
+
_SCHEMA_DEPENDS= \
${LOCALBASE}/share/rime-data/luna_pinyin.schema.yaml:chinese/rime-luna-pinyin \
${LOCALBASE}/share/rime-data/bopomofo.schema.yaml:chinese/rime-bopomofo \
diff --git a/chinese/fcitx-table-extra/Makefile b/chinese/fcitx-table-extra/Makefile
index 4709965f6cc6..9e50eb8cb422 100644
--- a/chinese/fcitx-table-extra/Makefile
+++ b/chinese/fcitx-table-extra/Makefile
@@ -16,6 +16,8 @@ BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libfcitx-config.so:chinese/fcitx
USES= cmake gettext gnome tar:xz
+
+CONFLICTS_INSTALL= zh-fcitx5-table-extra # share/icons/hicolor/48x48/apps/fcitx-cantonese.png
STRIP=
.include <bsd.port.mk>
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index d0ca68f282b8..52292fd83244 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
+CONFLICTS_INSTALL= fcitx5 zh-fcitx5-chinese-addons zh-scim-fcitx # bin/createPYMB share/icons/hicolor/128x128/apps/fcitx.png share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
USE_GNOME= pango intltool libxml2 introspection
USE_KDE= ecm
diff --git a/chinese/fcitx5-chewing/Makefile b/chinese/fcitx5-chewing/Makefile
index 46e771afcfad..d4d98f9b19af 100644
--- a/chinese/fcitx5-chewing/Makefile
+++ b/chinese/fcitx5-chewing/Makefile
@@ -20,4 +20,6 @@ GH_ACCOUNT= fcitx
USE_KDE= ecm
+CONFLICTS_INSTALL= zh-fcitx-chewing # share/icons/hicolor/48x48/apps/fcitx-chewing.png
+
.include <bsd.port.mk>
diff --git a/chinese/fcitx5-chinese-addons/Makefile b/chinese/fcitx5-chinese-addons/Makefile
index a51e26c5e89e..c2b095cc7b0b 100644
--- a/chinese/fcitx5-chinese-addons/Makefile
+++ b/chinese/fcitx5-chinese-addons/Makefile
@@ -45,6 +45,8 @@ CMAKE_ON= ENABLE_OPENCC
CMAKE_OFF= ENABLE_TEST
MAKE_ENV= FCITX5_DOWNLOAD_DISALLOWED=TRUE
+CONFLICTS_INSTALL= zh-fcitx # share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
+
# These must follow modules/pinyinhelper/CMakeLists.txt
PY_STROKE_VER= 20121124
PY_TABLE_VER= 20121124
diff --git a/chinese/fcitx5-rime/Makefile b/chinese/fcitx5-rime/Makefile
index 65252765aa35..70ec9c8430ed 100644
--- a/chinese/fcitx5-rime/Makefile
+++ b/chinese/fcitx5-rime/Makefile
@@ -23,6 +23,8 @@ GH_ACCOUNT= fcitx
USE_KDE= ecm
+CONFLICTS_INSTALL= zh-fcitx-rime # share/icons/hicolor/48x48/apps/fcitx-rime-deploy.png
+
_SCHEMA_DEPENDS= \
${LOCALBASE}/share/rime-data/luna_pinyin.schema.yaml:chinese/rime-luna-pinyin \
${LOCALBASE}/share/rime-data/bopomofo.schema.yaml:chinese/rime-bopomofo \
diff --git a/chinese/fcitx5-table-extra/Makefile b/chinese/fcitx5-table-extra/Makefile
index cfea252432e1..88392194cf3b 100644
--- a/chinese/fcitx5-table-extra/Makefile
+++ b/chinese/fcitx5-table-extra/Makefile
@@ -22,4 +22,6 @@ USE_KDE= ecm
INSTALL_TARGET= install
+CONFLICTS_INSTALL= zh-fcitx-table-extra # share/icons/hicolor/48x48/apps/fcitx-cantonese.png
+
.include <bsd.port.mk>
diff --git a/chinese/fcitx5-table-other/Makefile b/chinese/fcitx5-table-other/Makefile
index d8dfd4757d5b..429be107854e 100644
--- a/chinese/fcitx5-table-other/Makefile
+++ b/chinese/fcitx5-table-other/Makefile
@@ -26,4 +26,6 @@ USE_KDE= ecm
INSTALL_TARGET= install
+CONFLICTS_INSTALL= fcitx-table-other # share/icons/hicolor/32x32/apps/fcitx-thai.png
+
.include <bsd.port.mk>
diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index 7e72d5f799d3..99a5a3328235 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/docs/COPYING
RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
-CONFLICTS= phpbb
+CONFLICTS_INSTALL= phpbb phpbb3 zh-phpbb3-tw # share/doc/phpbb/AUTHORS share/doc/phpbb/CHANGELOG.html
USES= dos2unix php
# Get HOSTNAME
diff --git a/chinese/phpbb3-tw/Makefile b/chinese/phpbb3-tw/Makefile
index 86ec92e09149..1dc21e37c81d 100644
--- a/chinese/phpbb3-tw/Makefile
+++ b/chinese/phpbb3-tw/Makefile
@@ -15,7 +15,7 @@ COMMENT= The Traditional Chinese version of phpBB3
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/docs/COPYING
-CONFLICTS= phpbb-tw-[0-2]* phpbb-devel-[0-3]* phpbb-[0-3]*
+CONFLICTS_INSTALL= phpbb phpbb3 zh-phpbb-tw # share/doc/phpbb/AUTHORS share/doc/phpbb/CHANGELOG.html
USES= zip
diff --git a/chinese/tin/Makefile b/chinese/tin/Makefile
index de33e07efddd..6cb42ddda8e1 100644
--- a/chinese/tin/Makefile
+++ b/chinese/tin/Makefile
@@ -4,6 +4,8 @@ CATEGORIES= chinese
MAINTAINER= ports@FreeBSD.org
+CONFLICTS_INSTALL= tin # bin/metamutt
+
EXTRA_PATCHES= ${.CURDIR}/files/patch-attrib.c \
${.CURDIR}/files/patch-cook.c \
${.CURDIR}/files/patch-mail.c \
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index 2dec8e2048dc..9fc0b127466b 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -18,6 +18,8 @@ USE_GNOME= gtk20
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= reed talkfilters # bin/wrap
+
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
NLS_USES= gettext
diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile
index 42905005b317..dd9728e76cd4 100644
--- a/chinese/wordpress-zh_TW/Makefile
+++ b/chinese/wordpress-zh_TW/Makefile
@@ -20,6 +20,9 @@ USES= cpe php:web
CPE_VERSION= ${DISTVERSION}.0
.endif
USE_PHP= curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
+
+CONFLICTS_INSTALL= ja-wordpress wordpress # share/doc/wordpress/readme.html
+
WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
NO_ARCH= yes
NO_BUILD= yes
diff --git a/comms/libfec/Makefile b/comms/libfec/Makefile
index dc034926b6ff..81fa8674cf90 100644
--- a/comms/libfec/Makefile
+++ b/comms/libfec/Makefile
@@ -30,6 +30,8 @@ PLIST_FILES= include/fec.h \
# makefile tries to create libfec.so from object files compiled without -fPIC.
CFLAGS+= -fPIC
+CONFLICTS_INSTALL= reed-solomon simd-viterbi # man/man3/rs.3.gz man/man3/simd-viterbi.3.gz
+
post-patch:
@${CP} ${FILESDIR}/cpu_mode.c ${WRKSRC}
diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index 3138d1365005..2e77798112c1 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -18,6 +18,8 @@ CPE_VENDOR= lrzsz_project
GNU_CONFIGURE= yes
ALL_TARGET= all # vcheck
+CONFLICTS_INSTALL= lrzip # bin/lrz
+
OPTIONS_DEFINE= NLS
NLS_USES= gettext
diff --git a/comms/openzwave-devel/Makefile b/comms/openzwave-devel/Makefile
index f10c134fb7a8..265ce076b0e2 100644
--- a/comms/openzwave-devel/Makefile
+++ b/comms/openzwave-devel/Makefile
@@ -24,6 +24,8 @@ GH_PROJECT= open-zwave
GH_TAGNAME= 14f2ba74
MAKE_ARGS= VERSION_REV=${VERSION_REV} LIBDIR=${WRKSRC} docdir=${DOCSDIR} CXX=${CXX}
+CONFLICTS_INSTALL= openzwave # bin/MinOZW
+
OPTIONS_DEFINE= DOXYGEN DOCS
OPTIONS_SUB= yes
diff --git a/comms/openzwave/Makefile b/comms/openzwave/Makefile
index 001c75e8ed4c..7603e155651a 100644
--- a/comms/openzwave/Makefile
+++ b/comms/openzwave/Makefile
@@ -21,6 +21,8 @@ GH_TAGNAME= f339aa6
CFLAGS+= -Wno-error
MAKE_ARGS= VERSION_REV=${PORTVERSION:E} LIBDIR=${WRKSRC}
+CONFLICTS_INSTALL= openzwave-devel # bin/MinOZW
+
OPTIONS_DEFINE= DOCS DOXYGEN
OPTIONS_SUB= yes
diff --git a/comms/predict/Makefile b/comms/predict/Makefile
index 7212cf4a9822..e31f0b4e7674 100644
--- a/comms/predict/Makefile
+++ b/comms/predict/Makefile
@@ -16,6 +16,8 @@ USES= ncurses
INSTALL_TARGET= install install.man
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" STAGEDIR="${STAGEDIR}"
+CONFLICTS_INSTALL= liblinear # bin/predict
+
post-patch:
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/predict.h > ${WRKSRC}/predict.h
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/vocalizer.h > ${WRKSRC}/vocalizer/vocalizer.h
diff --git a/comms/qico/Makefile b/comms/qico/Makefile
index 117e0f064871..81c0444c826f 100644
--- a/comms/qico/Makefile
+++ b/comms/qico/Makefile
@@ -28,6 +28,8 @@ CONFIGURE_ARGS+= --with-config=${CONFDIR}/qico.conf \
--with-default-speed=115200
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFLICTS_INSTALL= qcc # bin/qcc
+
DOCS= Changes FAQ README
EXAMPLES= koi8r_866.cp onchat qhistory qico.xpm qlinks sfreq \
stat.run synctime test.pl tossing
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 811d215455c2..106d8b824cc9 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -15,6 +15,8 @@ CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+CONFLICTS_INSTALL= smi # bin/smi
+
DOCS= README docs/*.txt
EXAMPLES= sms.txt vCalendar.vcs vCard.vcf
diff --git a/comms/smstools3/Makefile b/comms/smstools3/Makefile
index 17475a3d9996..214f536a7b2a 100644
--- a/comms/smstools3/Makefile
+++ b/comms/smstools3/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libinotify.so:devel/libinotify
-CONFLICTS= gnokii smstools-2.* sendsms
+CONFLICTS_INSTALL= gnokii sendsms # bin/sendsms
OPTIONS_DEFINE= STATS UTF8 EXAMPLES DOCS
OPTIONS_DEFAULT= STATS UTF8
diff --git a/comms/yagiuda/Makefile b/comms/yagiuda/Makefile
index ffc810407e9d..7f6d6cf75d17 100644
--- a/comms/yagiuda/Makefile
+++ b/comms/yagiuda/Makefile
@@ -14,6 +14,8 @@ LICENSE= GPLv2
GNU_CONFIGURE= yes
+CONFLICTS_INSTALL= 4ti2 # bin/output
+
OPTIONS_DEFINE= DOCS
do-install:
diff --git a/converters/gbase/Makefile b/converters/gbase/Makefile
index 55b96aec4bee..cdc3292cc7c5 100644
--- a/converters/gbase/Makefile
+++ b/converters/gbase/Makefile
@@ -18,6 +18,8 @@ USE_GNOME+= gtk20
GTK_CFLAGS= `pkg-config --cflags gtk+-2.0`
GTK_LIBS= `pkg-config --libs gtk+-2.0`
+CONFLICTS_INSTALL= scotch # bin/gbase
+
post-patch:
@${REINPLACE_CMD} -e \
's|(i == argc)|(i+1 == argc)|' ${WRKSRC}/${PORTNAME}.c
diff --git a/converters/mmencode/Makefile b/converters/mmencode/Makefile
*** 25 LINES SKIPPED ***