aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Eßer <se@FreeBSD.org>2022-01-13 20:56:01 +0000
committerStefan Eßer <se@FreeBSD.org>2022-01-13 21:01:28 +0000
commit98f7d7db7e9bd14301b6a481ac477729c0ed6a24 (patch)
tree1641273136f797b27378b76c547e3734914c3c51
parent0db2fec06b15f7add8ebeb3e2caa2f20f2147740 (diff)
downloadports-98f7d7db7e9bd14301b6a481ac477729c0ed6a24.tar.gz
ports-98f7d7db7e9bd14301b6a481ac477729c0ed6a24.zip
Fix CONFLICTS entries in archivers, astro, audio
Fix conflicts entries based on a script that searches for duplicate files installed by several ports. Some patters seem to make ports conflict with themselves, but this is actually not the case due to the check-*-conflicts logic implemented in bsd.port.mk, which excludes self-conflicts. PHP based ports have been ignored in this commit as requested by the committers currently working on the php-8.1 import. Approved by: portmgr (implicit)
-rw-r--r--archivers/gzip/Makefile2
-rw-r--r--archivers/libunrar/Makefile3
-rw-r--r--archivers/libunrar6/Makefile2
-rw-r--r--archivers/lrzip/Makefile2
-rw-r--r--archivers/lua-lzlib/Makefile2
-rw-r--r--archivers/lua-zlib/Makefile2
-rw-r--r--archivers/mscompress/Makefile2
-rw-r--r--archivers/par/Makefile2
-rw-r--r--archivers/rpm4/Makefile2
-rw-r--r--archivers/squsq/Makefile2
-rw-r--r--archivers/zutils/Makefile3
-rw-r--r--astro/astrometry/Makefile3
-rw-r--r--astro/match/Makefile3
-rw-r--r--astro/py-astropy/Makefile2
-rw-r--r--astro/routino/Makefile2
-rw-r--r--astro/sextractor/Makefile2
-rw-r--r--audio/aften/Makefile2
-rw-r--r--audio/ampache/Makefile2
-rw-r--r--audio/asterisk-espeak/Makefile2
-rw-r--r--audio/clunk/Makefile2
-rw-r--r--audio/dpf-plugins-lv2/Makefile2
-rw-r--r--audio/emms/Makefile2
-rw-r--r--audio/gbsplay/Makefile2
-rw-r--r--audio/grip/Makefile2
-rw-r--r--audio/jack-smf-utils/Makefile2
-rw-r--r--audio/julius/Makefile2
-rw-r--r--audio/libsmf/Makefile2
-rw-r--r--audio/libsonic/Makefile2
-rw-r--r--audio/mp3blaster/Makefile2
-rw-r--r--audio/mp3rename/Makefile2
-rw-r--r--audio/nekobi-lv2/Makefile2
-rw-r--r--audio/p5-MP3-Tag-Utils/Makefile2
-rw-r--r--audio/p5-tagged/Makefile2
-rw-r--r--audio/phaserotate-lv2/Makefile2
-rw-r--r--audio/picard/Makefile2
-rw-r--r--audio/py-fmoo-audiotools/Makefile2
-rw-r--r--audio/py-zita-audiotools/Makefile2
-rw-r--r--audio/splay/Makefile2
-rw-r--r--audio/sweep/Makefile2
-rw-r--r--audio/timidity++-slang/Makefile2
-rw-r--r--audio/timidity++/Makefile2
-rw-r--r--audio/timidity/Makefile2
-rw-r--r--audio/wavbreaker/Makefile2
-rw-r--r--audio/x42-plugins-lv2/Makefile2
-rw-r--r--audio/xmcd/Makefile2
45 files changed, 87 insertions, 7 deletions
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index 62ea92a771b0..824cfd2cd1ca 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -13,6 +13,8 @@ LICENSE= GPLv3+
USES= cpe charsetfix makeinfo tar:xz
GNU_CONFIGURE= yes
+CONFLICTS_INSTALL= zutils # bin/zcat bin/zcmp bin/zdiff bin/zgrep
+
INFO= gzip
CPE_VENDOR= gnu
diff --git a/archivers/libunrar/Makefile b/archivers/libunrar/Makefile
index 61cbce57619d..002c827ecdd9 100644
--- a/archivers/libunrar/Makefile
+++ b/archivers/libunrar/Makefile
@@ -13,6 +13,9 @@ COMMENT= Library to work with RAR archives
WRKSRC= ${WRKDIR}/unrar
USES= gmake
+
+CONFLICTS_INSTALL= libunrar6 # lib/libunrar.so
+
MAKEFILE= makefile.unix
ALL_TARGET= lib
USE_LDCONFIG= yes
diff --git a/archivers/libunrar6/Makefile b/archivers/libunrar6/Makefile
index 3b35a94225cc..45cca4c09895 100644
--- a/archivers/libunrar6/Makefile
+++ b/archivers/libunrar6/Makefile
@@ -15,6 +15,8 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= compiler:c++11-lang gmake
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= libunrar # lib/libunrar.so
+
ALL_TARGET= lib
MAKEFILE= makefile
MAKE_ARGS= AR="${AR}" \
diff --git a/archivers/lrzip/Makefile b/archivers/lrzip/Makefile
index 32124eab4205..9b0a55a2afd2 100644
--- a/archivers/lrzip/Makefile
+++ b/archivers/lrzip/Makefile
@@ -23,6 +23,8 @@ USE_PERL5= build
USE_LDCONFIG= yes
CPE_VENDOR= lrzip_project
+CONFLICTS_INSTALL= lrzsz # bin/lrz man/man1/lrz.1.gz
+
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblrzip.so.0.0.0
diff --git a/archivers/lua-lzlib/Makefile b/archivers/lua-lzlib/Makefile
index 5750a1d18756..ab299189ad33 100644
--- a/archivers/lua-lzlib/Makefile
+++ b/archivers/lua-lzlib/Makefile
@@ -17,6 +17,8 @@ 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
+
OPTIONS_DEFINE= DOCS EXAMPLES
post-patch:
diff --git a/archivers/lua-zlib/Makefile b/archivers/lua-zlib/Makefile
index 65ff6ac9426f..445fd11b640f 100644
--- a/archivers/lua-zlib/Makefile
+++ b/archivers/lua-zlib/Makefile
@@ -18,6 +18,8 @@ GH_PROJECT= lua-zlib
USES= lua:51,module
+CONFLICTS_INSTALL= ${LUA_PKGNAMEPREFIX}lzlib # lib/lua/5.1/zlib.so
+
ALL_TARGET= bsd
MAKE_ENV+= LUAPATH="${LOCALBASE}"
MAKE_ENV+= LUACPATH="${STAGEDIR}${LUA_MODLIBDIR}"
diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index 1afb12d20cfd..772050a4672e 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= tar:bzip2
HAS_CONFIGURE= yes
+CONFLICTS_INSTALL= foo2zjs # bin/msexpand
+
PLIST_FILES= bin/mscompress bin/msexpand \
share/man/man1/mscompress.1.gz \
share/man/man1/msexpand.1.gz
diff --git a/archivers/par/Makefile b/archivers/par/Makefile
index ac27d0253c4d..b1e8e3e4fb45 100644
--- a/archivers/par/Makefile
+++ b/archivers/par/Makefile
@@ -11,7 +11,7 @@ COMMENT= Archiver for Quake I and II packed data files
LICENSE= GPLv2
-CONFLICTS= par
+CONFLICTS= par_format # bin/par
MAKEFILE= Makefile.Linux
MAKE_ARGS= CC="${CC}"
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 605deb742b68..3a4204c240bb 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -49,6 +49,8 @@ CPPFLAGS+= -I${LOCALBASE}/include \
LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss \
-L${BDB_LIB_DIR} -L${LUA_LIBDIR}
+CONFLICTS_INSTALL= rpm2cpio # bin/rpm2cpio
+
PLIST_SUB= VERSION=${PORTVERSION} \
OPSYS=${OPSYS:tl}
diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile
index bd7cd8e95802..ce68536331ee 100644
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@@ -14,6 +14,8 @@ WRKSRC= ${WRKDIR}/t20-squsq
MAKEFILE= ${FILESDIR}/Makefile
CFLAGS+= -Wno-error=return-type
+CONFLICTS_INSTALL= sequoia squirrel # bin/sq
+
PLIST_FILES= bin/sq bin/usq
PORTDOCS= readme
diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile
index 83a9e1a3542d..ad93f221a2ae 100644
--- a/archivers/zutils/Makefile
+++ b/archivers/zutils/Makefile
@@ -12,6 +12,9 @@ LICENSE= GPLv2
USES= cpe tar:lz
GNU_CONFIGURE= yes
+
+CONFIGURE_INSTALL= gzip openzfs # bin/zcat bin/zcmp bin/zdiff bin/zgrep man/man1/ztest.1.gz
+
INSTALL_TARGET= install-strip
CPE_VENDOR= nongnu
diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index f388c7c7bf57..f1a1ad197582 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -27,6 +27,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \
USES= gmake jpeg localbase pkgconfig python shebangfix
USE_LDCONFIG= yes
+
+CONFLICTS_INSTALL= afni p5-Text-RecordParser # bin/imstat bin/tabmerge
+
SHEBANG_FILES= bin/* sdss/*.py solver/*.py util/[!c]*.py
MAKE_ARGS= NETPBM_INC="-I${LOCALBASE}/include/netpbm" \
diff --git a/astro/match/Makefile b/astro/match/Makefile
index dc076bb07121..8ef95524aabe 100644
--- a/astro/match/Makefile
+++ b/astro/match/Makefile
@@ -11,7 +11,8 @@ COMMENT= Program for matching star lists
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS= avenger
GNU_CONFIGURE= yes
+CONFLICTS= avenger schilyutils # bin/match man/man1/match.1.gz
+
.include <bsd.port.mk>
diff --git a/astro/py-astropy/Makefile b/astro/py-astropy/Makefile
index 950a483e743d..79c66ac6aaaf 100644
--- a/astro/py-astropy/Makefile
+++ b/astro/py-astropy/Makefile
@@ -23,4 +23,6 @@ RUN_DEPENDS= ${PYNUMPY} \
USES= compiler:c11 python:3.8+
USE_PYTHON= autoplist cython distutils
+CONFLICTS_INSTALL= p5-Data-ShowTable # bin/showtable
+
.include <bsd.port.mk>
diff --git a/astro/routino/Makefile b/astro/routino/Makefile
index 5f55e7c8bd57..3418727f36a3 100644
--- a/astro/routino/Makefile
+++ b/astro/routino/Makefile
@@ -14,6 +14,8 @@ OPTIONS_DEFINE= DOCS
USES= compiler gmake perl5 tar:tgz
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= jabberd # bin/router
+
.include <bsd.port.pre.mk>
post-patch:
diff --git a/astro/sextractor/Makefile b/astro/sextractor/Makefile
index c7ef89bdf889..ca887d0d86a8 100644
--- a/astro/sextractor/Makefile
+++ b/astro/sextractor/Makefile
@@ -16,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
USES= gmake
+CONFLICTS_INSTALL= sex # bin/sex
+
OPTIONS_DEFINE= STATIC
OPTIONS_DEFAULT= STATIC
diff --git a/audio/aften/Makefile b/audio/aften/Makefile
index 1803d4ace2d4..02254cad6799 100644
--- a/audio/aften/Makefile
+++ b/audio/aften/Makefile
@@ -10,6 +10,8 @@ COMMENT= ATSC A/52 audio encoder
USES= tar:bzip2 cmake
+CONFLICTS_INSTALL= wavbreaker # bin/wavinfo
+
OPTIONS_DEFINE= SHARED_LIB CXX_BINDINGS DOUBLE
OPTIONS_DEFAULT=
diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile
index bab27c15a7bf..a998f8480eee 100644
--- a/audio/ampache/Makefile
+++ b/audio/ampache/Makefile
@@ -16,6 +16,8 @@ USES= cpe zip gettext php:flavors mysql
USE_PHP= pdo pdo_mysql hash session json intl simplexml curl dom xml
IGNORE_WITH_PHP=73 80
+CONFLICTS_INSTALL= ampache-php* # etc/periodic/daily/500.ampache-cron man/man1/ampache.1.gz
+
NO_WRKSUBDIR= yes
NO_BUILD= yes
SUB_FILES= 500.ampache-cron
diff --git a/audio/asterisk-espeak/Makefile b/audio/asterisk-espeak/Makefile
index 4e35c98f499d..5ba88926d32f 100644
--- a/audio/asterisk-espeak/Makefile
+++ b/audio/asterisk-espeak/Makefile
@@ -28,6 +28,8 @@ asterisk18_RUN_DEPENDS= asterisk:net/asterisk18
USES= compiler:c11 gmake localbase
INSTALL_TARGET= install samples
+CONFLICTS_INSTALL= asterisk*-espeak # etc/asterisk/espeak.conf.sample
+
USE_GITHUB= yes
GH_ACCOUNT= zaf
GH_PROJECT= Asterisk-eSpeak
diff --git a/audio/clunk/Makefile b/audio/clunk/Makefile
index cd8a485dd1d9..b00075ca5ccb 100644
--- a/audio/clunk/Makefile
+++ b/audio/clunk/Makefile
@@ -14,6 +14,8 @@ USES= cmake sdl tar:bzip2
USE_SDL= sdl
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= btanks # lib/libclunk.so
+
OPTIONS_DEFINE= SSE
OPTIONS_DEFAULT_amd64=SSE
SSE_CMAKE_ON= -DWITH_SSE:BOOL=TRUE
diff --git a/audio/dpf-plugins-lv2/Makefile b/audio/dpf-plugins-lv2/Makefile
index 1d9cdd45b1e6..cfb08663b77e 100644
--- a/audio/dpf-plugins-lv2/Makefile
+++ b/audio/dpf-plugins-lv2/Makefile
@@ -27,6 +27,8 @@ USE_GL= gl
CXXFLAGS+= -I${FILESDIR}
LDFLAGS+= -pthread
+CONFLICTS_INSTALL= nekobi-lv2 # bin/Nekobi
+
OPTIONS_DEFINE= JACK
OPTIONS_DEFAULT= JACK
OPTIONS_SUB= yes
diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index 94548e202c73..0874b0d6f0e9 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -17,6 +17,8 @@ BUILD_DEPENDS= texi2dvi:print/texinfo
USES= emacs gmake
+CONFLICTS_INSTALL= emms emms-emacs_* # share/emacs/site-lisp/emms/emms-auto.el
+
INFO= emms
NO_ARCH= yes
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index 78b8c733ab0d..d9b880bd644d 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -26,6 +26,8 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \
MAKE_ENV+= EXAMPLESDIR="${STAGEDIR}${EXAMPLESDIR}"
+CONFLICTS_INSTALL= mate-control-center # share/applications/mimeinfo.cache
+
OPTIONS_DEFINE= BASH_COMPLETIONS DOCS EXAMPLES NAS NLS
OPTIONS_DEFAULT= BASH_COMPLETIONS
OPTIONS_SUB= yes
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 21c568344d4b..a287dc8fcb0a 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -24,7 +24,7 @@ USE_XORG= ice sm x11 xext
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-werror
-CONFLICTS_INSTALL= py*-grip
+CONFLICTS_INSTALL= py*-grip # bin/grip
OPTIONS_DEFINE= CDDA2WAV CDPARANOIA FAAC FLAC LAME NLS VORBIS
OPTIONS_DEFAULT= CDPARANOIA FLAC VORBIS
diff --git a/audio/jack-smf-utils/Makefile b/audio/jack-smf-utils/Makefile
index 74659405a040..6b77c072566e 100644
--- a/audio/jack-smf-utils/Makefile
+++ b/audio/jack-smf-utils/Makefile
@@ -19,4 +19,6 @@ USES= gnome pkgconfig
GNU_CONFIGURE= yes
USE_GNOME= glib20
+CONFLICTS_INSTALL= libsmf # bin/smfsh
+
.include <bsd.port.mk>
diff --git a/audio/julius/Makefile b/audio/julius/Makefile
index 7fefb54b5703..42737006edba 100644
--- a/audio/julius/Makefile
+++ b/audio/julius/Makefile
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
USES= iconv perl5 shebangfix
SHEBANG_FILES= jclient-perl/jclient.pl
-INSTALL_CONFLICTS= generate julius-caesariii php*-pear-Text_Highlighter
+CONFLICTS_INSTALL= generate julius-caesariii php*-pear-Text_Highlighter # bin/generate bin/julius
CONFIGURE_ENV= ac_cv_path_PERL=${PERL}
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/libsmf/Makefile b/audio/libsmf/Makefile
index e35a07ac9811..94aad5d4f2e5 100644
--- a/audio/libsmf/Makefile
+++ b/audio/libsmf/Makefile
@@ -17,4 +17,6 @@ USE_GNOME= glib20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+CONFLICTS_INSTALL= jack-smf-utils # bin/smfsh
+
.include <bsd.port.mk>
diff --git a/audio/libsonic/Makefile b/audio/libsonic/Makefile
index ecdb5cb0f679..0feed3971b0a 100644
--- a/audio/libsonic/Makefile
+++ b/audio/libsonic/Makefile
@@ -22,6 +22,8 @@ GH_PROJECT= sonic
MAKE_ARGS= CC=${CC} CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" USE_SPECTROGRAM=1
CFLAGS+= -ansi -fPIC -pthread -Wno-unused-function -DSONIC_SPECTROGRAM
+CONFLICTS_INSTALL= sonic # bin/sonic
+
PLIST_FILES= bin/sonic \
include/sonic.h \
lib/libsonic.a \
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index b7a5dc43426b..cba35c7387c9 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake localbase:ldflags ncurses
GNU_CONFIGURE= yes
+CONFLICTS_INSTALL= p5-MP3-Tag-Utils splay # bin/mp3tag bin/splay
+
OPTIONS_DEFINE= DOCS LIRC NAS SDL SIDPLAY VORBIS
OPTIONS_DEFAULT= SIDPLAY VORBIS
SIDPLAY_DESC= Sidplayer support
diff --git a/audio/mp3rename/Makefile b/audio/mp3rename/Makefile
index 5c6c4b9d5a62..fece7ce52a14 100644
--- a/audio/mp3rename/Makefile
+++ b/audio/mp3rename/Makefile
@@ -9,6 +9,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
COMMENT= Renaming program for MP3 files based on their ID3 tag
+CONFLICTS_INSTALL= p5-MP3-Tag-Utils # bin/mp3rename
+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
PLIST_FILES= bin/mp3rename
diff --git a/audio/nekobi-lv2/Makefile b/audio/nekobi-lv2/Makefile
index dbfc56262ba9..4838ab9dc28b 100644
--- a/audio/nekobi-lv2/Makefile
+++ b/audio/nekobi-lv2/Makefile
@@ -27,6 +27,8 @@ USE_XORG= x11
CFLAGS+= -I${FILESDIR}
CFLAGS+= -Wno-c++11-narrowing # clang prints errors: https://github.com/DISTRHO/Nekobi/issues/7
+CONFLICTS_INSTALL= dpf-plugins-lv2 # bin/Nekobi
+
.include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == gcc
diff --git a/audio/p5-MP3-Tag-Utils/Makefile b/audio/p5-MP3-Tag-Utils/Makefile
index f337a39ea33c..e29bfbd610fe 100644
--- a/audio/p5-MP3-Tag-Utils/Makefile
+++ b/audio/p5-MP3-Tag-Utils/Makefile
@@ -21,6 +21,8 @@ RUN_DEPENDS= p5-MP3-Tag>=1.13:audio/p5-MP3-Tag \
USES= perl5 shebangfix
USE_PERL5= configure
+CONFLICTS_INSTALL= mp3blaster mp3rename # bin/mp3rename bin/mp3tag
+
SHEBANG_FILES= bin/mp3rename bin/mp3show bin/mp3tag
.include <bsd.port.mk>
diff --git a/audio/p5-tagged/Makefile b/audio/p5-tagged/Makefile
index 2f1e2bf7a65e..0a0e0985e241 100644
--- a/audio/p5-tagged/Makefile
+++ b/audio/p5-tagged/Makefile
@@ -14,6 +14,6 @@ COMMENT= Read, change, and write different tags of MP3 audio files
USES= perl5
USE_PERL5= configure
-CONFLICTS= p5-MP3-Tag-0.*
+CONFLICTS= p5-MP3-Tag # lib/perl5/site_perl/MP3/Tag.pm
.include <bsd.port.mk>
diff --git a/audio/phaserotate-lv2/Makefile b/audio/phaserotate-lv2/Makefile
index d2221310952b..bc1e983185c1 100644
--- a/audio/phaserotate-lv2/Makefile
+++ b/audio/phaserotate-lv2/Makefile
@@ -21,6 +21,8 @@ GH_PROJECT= ${PORTNAME}.lv2
MAKE_ARGS= LV2VERSION=${DISTVERSION}
+CONFLICTS_INSTALL= x42-plugins-lv2 # lib/lv2/phaserotate.lv2/phaserotate.so
+
PLIST_FILES= lib/lv2/phaserotate.lv2/manifest.ttl \
lib/lv2/phaserotate.lv2/phaserotate.so \
lib/lv2/phaserotate.lv2/phaserotate.ttl
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index d99419a64c0d..d01d39eda9c1 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -24,6 +24,8 @@ USE_LOCALE= en_US.UTF-8
USE_PYQT= core_run dbus_run gui_run network_run widgets_run sip
USE_PYTHON= autoplist distutils noflavors
+CONFLICTS_INSTALL= picard-tools py*-python-picard # bin/picard
+
WRKSRC= ${WRKDIR}/${PORTNAME}-release-${DISTVERSION}
OPTIONS_DEFINE= ACOUSTID PLAYER PLUGINS
diff --git a/audio/py-fmoo-audiotools/Makefile b/audio/py-fmoo-audiotools/Makefile
index 2aed3288631c..d3716d5da71a 100644
--- a/audio/py-fmoo-audiotools/Makefile
+++ b/audio/py-fmoo-audiotools/Makefile
@@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= pkgconfig python:3.6+
USE_PYTHON= autoplist concurrent distutils
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}zita-audiotools
+
OPTIONS_DEFINE= CDIO LAME MPG123 OPUS TWOLAME VORBIS
OPTIONS_DEFAULT=CDIO MPG123 OPUS TWOLAME VORBIS
diff --git a/audio/py-zita-audiotools/Makefile b/audio/py-zita-audiotools/Makefile
index c1db15d2017a..6ce450199077 100644
--- a/audio/py-zita-audiotools/Makefile
+++ b/audio/py-zita-audiotools/Makefile
@@ -15,6 +15,8 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \
USES= localbase python:3.6+ tar:bz2
USE_PYTHON= autoplist distutils
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}fmoo-audiotools
+
post-install:
@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/audiotools/*.so
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index ab19ba2794ac..20f7509aa4a9 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -16,6 +16,8 @@ LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB
GNU_CONFIGURE= yes
+CONFLICTS_INSTALL= mp3blaster # bin/splay
+
PLIST_FILES= bin/splay man/man1/splay.1.gz
# XXX: pthread library can be used, but sound quality is buggy(?)
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 6dbad4b624d6..6cfe80757ba7 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -33,6 +33,8 @@ CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
--with-ogg-includes=${LOCALBASE}/include/ogg
CONFIGURE_ENV= LIBS="`pkg-config --libs gmodule-2.0`"
+CONFIGURE_INSTALL= libsweep-lidar # include/sweep/sweep.h
+
post-patch:
@${REINPLACE_CMD} -e 's|^ac_enable_alsa=yes|ac_enable_alsa=no|g ; \
s|$${datadir}|$${datarootdir}|g' ${WRKSRC}/configure
diff --git a/audio/timidity++-slang/Makefile b/audio/timidity++-slang/Makefile
index 6fa2e4fa4a89..71e8c4b7a308 100644
--- a/audio/timidity++-slang/Makefile
+++ b/audio/timidity++-slang/Makefile
@@ -5,6 +5,8 @@ PKGNAMESUFFIX= -slang
MAINTAINER= ports@FreeBSD.org
COMMENT= Slang interface for TiMidity++
+CONFLICTS_INSTALL= ja-timidity++-slang # lib/timidity/if_slang.so
+
MASTERDIR= ${.CURDIR}/../../audio/timidity++
PLIST_FILES= ${TIMID_LIBDIR}/if_${INTERFACE}.so
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index c3ad27d47921..b4494cfe80e5 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -55,7 +55,7 @@ USES+= ncurses
CONFIGURE_ARGS+=--enable-interface=ncurses,vt100,server \
--enable-network
-CONFLICTS_INSTALL= timidity
+CONFLICTS_INSTALL?= timidity
DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index e1c4e86256e6..231bb73ea618 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -11,7 +11,7 @@ COMMENT= MIDI to PCM software synthesizer
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL= timidity++-2.*
+CONFLICTS_INSTALL= timidity++
USES= alias ncurses
INSTALL_TARGET= install.all
diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile
index b4a8ecd037d2..6ccd7a2be487 100644
--- a/audio/wavbreaker/Makefile
+++ b/audio/wavbreaker/Makefile
@@ -15,6 +15,8 @@ USE_GITHUB= yes
USE_GNOME= cairo gtk30
GH_ACCOUNT= thp
+CONFLICTS_INSTALL= aften # bin/wavinfo
+
OPTIONS_DEFINE= MOODBAR MPG123
OPTIONS_DEFAULT=MOODBAR MPG123
diff --git a/audio/x42-plugins-lv2/Makefile b/audio/x42-plugins-lv2/Makefile
index 1e352aa5ec6d..a13d5a0690a7 100644
--- a/audio/x42-plugins-lv2/Makefile
+++ b/audio/x42-plugins-lv2/Makefile
@@ -38,6 +38,8 @@ SHEBANG_FILES= stepseq.lv2/gridgen.sh
CXXFLAGS+= -std=c++98
+CONFLICTS_INSTALL= phaserotate-lv2 # lib/lv2/phaserotate.lv2/phaserotate.so
+
OPTIONS_DEFINE_amd64= SSE
OPTIONS_DEFINE_i386= SSE
OPTIONS_DEFAULT_amd64= SSE
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 3ab64b356ee8..e051642ee267 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -22,6 +22,8 @@ SUB_FILES= pkg-message
CFLAGS+= -D_WANT_SEMUN
+CONFLICTS_INSTALL= py*-cclib # bin/cda
+
LIBBINDIR= ${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH:S/aarch64/arm64/:C/armv.*/arm/:C/powerpc64.*/powerpc/:C/riscv64.*/riscv/}
pre-patch: