Fix CONFLICTS_INSTALL in archivers, astro, and audio

Approved by: portmgr (implict)
freebsd · Jun 29, 2022 · d11ee7c · d11ee7c
1 parent efc03b9
commit d11ee7c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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