git: d11ee7cc646e - main - Fix CONFLICTS_INSTALL in archivers, astro, and audio
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 29 Jun 2022 14:42:29 UTC
The branch main has been updated by se:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d11ee7cc646e0506089d2d344eef1e1a83d3a978
commit d11ee7cc646e0506089d2d344eef1e1a83d3a978
Author: Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-06-29 14:40:54 +0000
Commit: Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-06-29 14:42:06 +0000
Fix CONFLICTS_INSTALL in archivers, astro, and audio
Approved by: portmgr (implict)
---
archivers/lua-lzlib/Makefile | 2 +-
archivers/zutils/Makefile | 2 +-
astro/celestia/Makefile | 2 +-
astro/match/Makefile | 2 +-
audio/julius/Makefile | 2 +-
audio/mp3blaster/Makefile | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/archivers/lua-lzlib/Makefile b/archivers/lua-lzlib/Makefile
index 74eb73f24f50..1942e1c79dc0 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[0-9][0-9]-lzlib # lib/lua/5.1/zlib.so share/doc/lzlib/README
+CONFLICTS_INSTALL= lua[0-9][0-9]-lzlib lua[0-9][0-9]-zlib # lib/lua/5.1/zlib.so share/doc/lzlib/README
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile
index 13322d112a15..80d9048ef6a2 100644
--- a/archivers/zutils/Makefile
+++ b/archivers/zutils/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2
USES= cpe tar:lz
GNU_CONFIGURE= yes
-CONFLICTS_INSTALL= gzip openzfs # bin/zcat bin/zcmp bin/zdiff bin/zgrep man/man1/ztest.1.gz
+CONFLICTS_INSTALL= gzip # bin/zcat bin/zcmp bin/zdiff bin/zgrep man/man1/ztest.1.gz
INSTALL_TARGET= install-strip
CPE_VENDOR= nongnu
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 1032e58c7ca8..542ce4d5165e 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -28,7 +28,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -pthread
UI_LIST= glut gtk gnome
CELESTIA_UI?= glut
-CONFLICTS= ${UI_LIST:S|${CELESTIA_UI}||:S|^|celestia-|}
+CONFLICTS_INSTALL= ${UI_LIST:S|^|celestia-|}
# Celestia provides different UI frontends; you should pick one that suits
# you best by setting CELESTIA_UI variable. Possible values are:
diff --git a/astro/match/Makefile b/astro/match/Makefile
index 8ef95524aabe..6565e91d00e8 100644
--- a/astro/match/Makefile
+++ b/astro/match/Makefile
@@ -13,6 +13,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
-CONFLICTS= avenger schilyutils # bin/match man/man1/match.1.gz
+CONFLICTS_INSTALL= avenger # man/man1/match.1.gz
.include <bsd.port.mk>
diff --git a/audio/julius/Makefile b/audio/julius/Makefile
index 42737006edba..54625d09493f 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
-CONFLICTS_INSTALL= generate julius-caesariii php*-pear-Text_Highlighter # bin/generate bin/julius
+CONFLICTS_INSTALL= generate # bin/generate bin/julius
CONFIGURE_ENV= ac_cv_path_PERL=${PERL}
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index cba35c7387c9..f9d7d022c6c4 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake localbase:ldflags ncurses
GNU_CONFIGURE= yes
-CONFLICTS_INSTALL= p5-MP3-Tag-Utils splay # bin/mp3tag bin/splay
+CONFLICTS_INSTALL= splay # bin/mp3tag bin/splay
OPTIONS_DEFINE= DOCS LIRC NAS SDL SIDPLAY VORBIS
OPTIONS_DEFAULT= SIDPLAY VORBIS