git: 07389cd463dd - main - *: Sweep up new CONFLICTS_INSTALL mess
Date: Mon, 17 Jan 2022 13:20:42 UTC
The branch main has been updated by tobik:
URL: https://cgit.FreeBSD.org/ports/commit/?id=07389cd463ddec99ddadfa42843e2f6d879ee023
commit 07389cd463ddec99ddadfa42843e2f6d879ee023
Author: Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2022-01-17 12:26:45 +0000
Commit: Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2022-01-17 13:20:24 +0000
*: Sweep up new CONFLICTS_INSTALL mess
- Fix typos
- Fix overwritten master/slave variables
I'm assuming the entries are correct otherwise.
Reported by: portscan
---
archivers/libunrar6/Makefile | 2 --
archivers/zutils/Makefile | 2 +-
audio/sweep/Makefile | 2 +-
chinese/scim-fcitx/Makefile | 2 +-
deskutils/plan/Makefile | 2 +-
devel/grpc134/Makefile | 2 --
emulators/hugo/Makefile | 4 ++--
irc/bitchx/Makefile | 2 +-
lang/bsh/Makefile | 2 +-
lang/yorick/Makefile | 2 +-
mail/mew-devel/Makefile | 2 --
net/bosh-cli/Makefile | 2 --
textproc/cmark/Makefile | 2 --
x11/eterm/Makefile | 2 +-
14 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/archivers/libunrar6/Makefile b/archivers/libunrar6/Makefile
index 45cca4c09895..5ba04ce6abab 100644
--- a/archivers/libunrar6/Makefile
+++ b/archivers/libunrar6/Makefile
@@ -27,8 +27,6 @@ MAKE_ARGS= AR="${AR}" \
SONAME= libunrar.so.6
WRKSRC= ${WRKDIR}/unrar
-CONFLICTS_INSTALL= libunrar-3*
-
OPTIONS_DEFINE= OPENSSL_AES
OPTIONS_DEFAULT= OPENSSL_AES
diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile
index ad93f221a2ae..4ecae2e8c934 100644
--- a/archivers/zutils/Makefile
+++ b/archivers/zutils/Makefile
@@ -13,7 +13,7 @@ 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
+CONFLICTS_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/audio/sweep/Makefile b/audio/sweep/Makefile
index 6cfe80757ba7..3243aaa53894 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -33,7 +33,7 @@ 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
+CONFLICTS_INSTALL= libsweep-lidar # include/sweep/sweep.h
post-patch:
@${REINPLACE_CMD} -e 's|^ac_enable_alsa=yes|ac_enable_alsa=no|g ; \
diff --git a/chinese/scim-fcitx/Makefile b/chinese/scim-fcitx/Makefile
index c19e6e78b156..1c051994b7ab 100644
--- a/chinese/scim-fcitx/Makefile
+++ b/chinese/scim-fcitx/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE= yes
-CONFIGURE_INSTALL= zh-fcitx
+CONFLICTS_INSTALL= zh-fcitx
WRKSRC= ${WRKDIR}/fcitx
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index e9dd7ecf743f..8bec6b3c8a77 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -16,7 +16,7 @@ ALL_TARGET= freebsd
MAKE_ENV+= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}
-CONFLICTS_INSTALL= ja-plan
+CONFLICTS_INSTALL?= ja-plan
OPTIONS_DEFINE= DOCS
diff --git a/devel/grpc134/Makefile b/devel/grpc134/Makefile
index 8a56cf6de82f..63ef6e989d3b 100644
--- a/devel/grpc134/Makefile
+++ b/devel/grpc134/Makefile
@@ -39,6 +39,4 @@ CONFLICTS_INSTALL= grpc grpc130
PLIST_SUB= PORTVERSION=${PORTVERSION}
-CONFLICTS_INSTALL= grpc
-
.include <bsd.port.mk>
diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile
index 6c8a11f1cc80..8e58a12aaf8c 100644
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@@ -30,6 +30,8 @@ CFLAGS+= -Wno-return-type
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+CONFLICTS_INSTALL= gohugo
+
.include <bsd.port.options.mk>
.if empty(PORT_OPTIONS:MGTK2) && ${PORT_OPTIONS:MNETPLAY}
@@ -61,6 +63,4 @@ CONFIGURE_ENV+= ac_cv_lib_SDL_mixer_main=no \
ac_cv_lib_vorbisfile_main=no
.endif
-CONFLICTS_INSTSLL= gohugo
-
.include <bsd.port.mk>
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 1f690b5d30a2..6f46afcd83c2 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
--datadir="${PREFIX}/share" \
--libdir="${PREFIX}/share"
-CONFLICTS_INSTALL= zh-bitchx
+CONFLICTS_INSTALL?= zh-bitchx
OPTIONS_SUB= yes
diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile
index ed11748eea34..53b93e0ce14e 100644
--- a/lang/bsh/Makefile
+++ b/lang/bsh/Makefile
@@ -16,7 +16,7 @@ GH_PROJECT= beanshell
USE_JAVA= 8
USE_ANT= yes
-COMFLICTS_INSTALL= schilyutils # bin/bsh
+CONFLICTS_INSTALL= schilyutils # bin/bsh
ALL_TARGET= jarall
diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index 1a06850e5530..d7a187199879 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -19,7 +19,7 @@ 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
+CONFLICTS_INSTALL= gist p5-App-gist py*-python-gist # bin/gist
INFO= yorick
PORTDOCS= FILE_FORMATS README drat.doc graph.doc hex.doc \
diff --git a/mail/mew-devel/Makefile b/mail/mew-devel/Makefile
index 40a8f6c51248..f74d3a553080 100644
--- a/mail/mew-devel/Makefile
+++ b/mail/mew-devel/Makefile
@@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/00copyright
USES= emacs
USE_GITHUB= yes
-CONFLICTS_INSTALL= ${PORTNAME}${EMACS_PKGNAMESUFFIX}
-
GH_ACCOUNT= kazu-yamamoto
GH_PROJECT= Mew
diff --git a/net/bosh-cli/Makefile b/net/bosh-cli/Makefile
index 96211bb24438..e4f9b85cc9d6 100644
--- a/net/bosh-cli/Makefile
+++ b/net/bosh-cli/Makefile
@@ -11,8 +11,6 @@ LICENSE= APACHE20
USE_GITHUB= yes
GH_TUPLE= cloudfoundry:bosh-cli:v${PORTVERSION}
-CONFLICTS_INSTALL= rubygem-bosh_cli
-
USES= go tar:xz
CONFLICTS_INSTALL= schilyutils # bin/bosh
diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile
index 2ec0e9f8f28d..c6d25e52b67f 100644
--- a/textproc/cmark/Makefile
+++ b/textproc/cmark/Makefile
@@ -8,8 +8,6 @@ COMMENT= CommonMark parsing and rendering library and program in C
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL= py[2-3][0-9]-CommonMark
-
USES= cmake python:3.4+,test
USE_GITHUB= yes
GH_ACCOUNT= commonmark
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 5117e54d0f2b..282f0cd39070 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -36,7 +36,7 @@ USE_LDCONFIG= yes
USE_XORG= x11 xt
CPE_VENDOR= eterm_project
-CONFLICTS_INSTALL= ja-eterm zh-eterm
+CONFLICTS_INSTALL?= ja-eterm zh-eterm
OPTIONS_DEFINE= DOCS
OPTIONS_DEFINE_i386= MMX