29 files changed, 34 insertions, 34 deletions

diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index ac45815ffaa2..a72792aa77e1 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -75,13 +75,13 @@ PLIST_SUB+=	SERVER="@comment "
 .endif
 
 .if ! ${PORT_OPTIONS:MCLIENT}
-CONFLICTS=	boxbackup-client-[0-9]* boxbackup-[0-9]*
+CONFLICTS=	boxbackup-client boxbackup
 CLIENT_OR_SERVER=-server
 .elif ! ${PORT_OPTIONS:MSERVER}
-CONFLICTS=	boxbackup-server-[0-9]* boxbackup-[0-9]*
+CONFLICTS=	boxbackup-server boxbackup
 CLIENT_OR_SERVER=-client
 .else
-CONFLICTS=	boxbackup-server-[0-9]* boxbackup-client-[0-9]*
+CONFLICTS=	boxbackup-server boxbackup-client
 .endif
 
 post-patch:
diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index 0b286ff2a681..c424c46c2b48 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -21,7 +21,7 @@ SHEBANG_FILES=	3rd-party/dirsplit/dirsplit
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
-CONFLICTS?=	cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]*
+CONFLICTS?=	cdrtools cjk-cdrtools cdrtools-devel
 
 PLIST_SUB?=	CDRKIT="" GENISOIMAGE="@comment "
 
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index 0fa433e97f31..1dda038da626 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -8,7 +8,7 @@ COMMENT=	Advanced, highly configurable system monitor (configured for x11-wm/awe
 MASTERDIR=	${.CURDIR}/../conky
 DESCR=		${.CURDIR}/pkg-descr
 
-CONFLICTS=	conky-[0-9]*
+CONFLICTS=	conky
 
 OPTIONS_EXCLUDE=	X11 ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 \
 			LUA_RSVG
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index fb1132843560..42f3e8178d55 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -24,7 +24,7 @@ CMAKE_ARGS=	-DBUILD_PORT_MONITORS:BOOL=false \
 		-DBUILD_AUDACIOUS:BOOL=false \
 		-DBUILD_DOCS:BOOL=true \
 		-DAPP_SED=${LOCALBASE}/bin/gsed
-CONFLICTS?=	conky-awesome-[0-9]*
+CONFLICTS?=	conky-awesome
 
 SLAVEDIRS=	sysutils/conky-awesome
 PLIST_FILES=	bin/conky man/man1/conky.1.gz
diff --git a/sysutils/cronolog-devel/Makefile b/sysutils/cronolog-devel/Makefile
index 4f27d3c45240..40b1c701dc0d 100644
--- a/sysutils/cronolog-devel/Makefile
+++ b/sysutils/cronolog-devel/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	sbin/cronolog \
 		man/man1/cronolog.1m.gz \
 		man/man1/cronosplit.1m.gz
 
-CONFLICTS=	cronolog-[0-9]*
+CONFLICTS=	cronolog
 
 WRKSRC=		${WRKDIR}/cronolog-${PORTVERSION}
 INFO=		cronolog
diff --git a/sysutils/daemontools-encore/Makefile b/sysutils/daemontools-encore/Makefile
index e500a69cd5bf..423f4b869feb 100644
--- a/sysutils/daemontools-encore/Makefile
+++ b/sysutils/daemontools-encore/Makefile
@@ -12,7 +12,7 @@ LICENSE=	MIT
 
 USES=		gmake
 
-CONFLICTS=	daemontools-[0-9]* freedt-[0-9]* serialmail-[0-9]*
+CONFLICTS=	daemontools freedt serialmail
 
 ALL_TARGET=	default
 
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index ab102d0c4dda..8035b5aee264 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Service monitoring and logging utilities by djb
 
 LICENSE=	PD
 
-CONFLICTS=	freedt-[0-9]* serialmail-[0-9]*
+CONFLICTS=	freedt serialmail
 
 OPTIONS_DEFINE=	MAN SIGQ12 TESTS
 OPTIONS_SUB=	yes
diff --git a/sysutils/freedt/Makefile b/sysutils/freedt/Makefile
index 07cea7a04d09..f875fdff02e4 100644
--- a/sysutils/freedt/Makefile
+++ b/sysutils/freedt/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://offog.org/files/ \
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Experimental reimplementation of Dan Bernstein's daemontools
 
-CONFLICTS=	daemontools-[0-9]*
+CONFLICTS=	daemontools
 
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/hfsutils/Makefile b/sysutils/hfsutils/Makefile
index a4918b540c7d..8d9fe6ba3c88 100644
--- a/sysutils/hfsutils/Makefile
+++ b/sysutils/hfsutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utilities for accessing Apple's HFS volumes
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	hfs-[0-9]*
+CONFLICTS=	hfs
 
 USES=		gmake			# passing -jX breaks BSD make(1)
 GNU_CONFIGURE=	yes
diff --git a/sysutils/iocage-devel/Makefile b/sysutils/iocage-devel/Makefile
index 5ff2e2250e10..c5d4c7a8bf3a 100644
--- a/sysutils/iocage-devel/Makefile
+++ b/sysutils/iocage-devel/Makefile
@@ -32,7 +32,7 @@ GH_TAGNAME=	e94863d4c54f02523fb09e62e48be7db9ac92eda
 
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS=	py[0-9]*-iocage-[0-9]*
+CONFLICTS=	py[0-9]*-iocage
 NO_ARCH=	yes
 
 _IOCAGE_LIB_VERSION=	1.2
diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile
index 0a3d672e5601..bb37e6976c6f 100644
--- a/sysutils/iocage/Makefile
+++ b/sysutils/iocage/Makefile
@@ -37,7 +37,7 @@ USES=		python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS=	py*-iocage-[0-9]*
+CONFLICTS=	py*-iocage
 NO_ARCH=	yes
 
 PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \
diff --git a/sysutils/lbl-hf/Makefile b/sysutils/lbl-hf/Makefile
index d5ac7a18c093..8404faf801bd 100644
--- a/sysutils/lbl-hf/Makefile
+++ b/sysutils/lbl-hf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Address to hostname filter
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	hf-[0-9]*
+CONFLICTS=	hf
 
 PLIST_FILES=	bin/hf \
 		man/man1/hf.1.gz
diff --git a/sysutils/logstash6/Makefile b/sysutils/logstash6/Makefile
index 3423c25801a8..f126930d8250 100644
--- a/sysutils/logstash6/Makefile
+++ b/sysutils/logstash6/Makefile
@@ -19,7 +19,7 @@ JAVA_VERSION=	1.8+
 JAVA_RUN=	yes
 USE_RC_SUBR=	logstash
 SHEBANG_FILES=	bin/*
-CONFLICTS=	logstash-[0-9]* logstash5* logstash7*
+CONFLICTS=	logstash logstash5* logstash7*
 
 NO_BUILD=	yes
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
diff --git a/sysutils/logstash7/Makefile b/sysutils/logstash7/Makefile
index 817c3865a593..d6ab1a37d628 100644
--- a/sysutils/logstash7/Makefile
+++ b/sysutils/logstash7/Makefile
@@ -24,7 +24,7 @@ USE_RC_SUBR=	logstash
 
 SHEBANG_FILES=	bin/*
 
-CONFLICTS=	logstash5-[0-9]* logstash6-[0-9]*
+CONFLICTS=	logstash5 logstash6
 
 NO_BUILD=	yes
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
diff --git a/sysutils/mcweject/Makefile b/sysutils/mcweject/Makefile
index 38151e488666..191f61efc2d0 100644
--- a/sysutils/mcweject/Makefile
+++ b/sysutils/mcweject/Makefile
@@ -10,7 +10,7 @@ LICENSE=	BSD3CLAUSE
 
 SUB_FILES=	pkg-message
 
-CONFLICTS=	eject-[0-9]*
+CONFLICTS=	eject
 
 USES=		tar:xz
 
diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile
index 2405072f2f75..7ee3a35c0bdd 100644
--- a/sysutils/passwordsafe/Makefile
+++ b/sysutils/passwordsafe/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libqrencode.so:graphics/libqrencode
 BUILD_DEPENDS=	zip:archivers/zip
 
-CONFLICTS=	pwsafe-[0-9]*
+CONFLICTS=	pwsafe
 
 USES=		gmake pkgconfig xorg
 USE_GITHUB=	yes
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 90d2a3e65093..dbbeb2a7620e 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 
-CONFLICTS=	pidof-[0-9]* pstree-2.[0-9]*
+CONFLICTS=	pidof pstree-2.[0-9]*
 
 GNU_CONFIGURE=	yes
 USES=		gmake ncurses
diff --git a/sysutils/pstack/Makefile b/sysutils/pstack/Makefile
index c5b22039c0a4..e4963410106f 100644
--- a/sysutils/pstack/Makefile
+++ b/sysutils/pstack/Makefile
@@ -14,7 +14,7 @@ GH_ACCOUNT=	z0nt
 GH_TAGNAME=	874a052
 USES=		uidfix
 ONLY_FOR_ARCHS=	amd64 i386
-CONFLICTS=	pstacku-[0-9]*
+CONFLICTS=	pstacku
 MAKE_ARGS+=	BINDIR=${PREFIX}/bin
 MAKE_ARGS+=	MANDIR=${PREFIX}/man/man
 MAKE_ARGS+=	LIBDIR=${PREFIX}/lib
diff --git a/sysutils/pstacku/Makefile b/sysutils/pstacku/Makefile
index 8b2d4be66216..c678e0ff45b4 100644
--- a/sysutils/pstacku/Makefile
+++ b/sysutils/pstacku/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-libunwind=${LOCALBASE}
 LLD_UNSAFE=	yes
 ONLY_FOR_ARCHS=	amd64 i386
-CONFLICTS=	pstack-[0-9]*
+CONFLICTS=	pstack
 
 PLIST_FILES=	bin/pstack man/man1/pstack.1.gz
 
diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile
index 6ed0692fc79e..37a63eccfaea 100644
--- a/sysutils/pstree/Makefile
+++ b/sysutils/pstree/Makefile
@@ -12,7 +12,7 @@ USES=		alias
 
 NO_WRKSUBDIR=	yes
 
-CONFLICTS=	psmisc-[0-9]*
+CONFLICTS=	psmisc
 
 PLIST_FILES=	bin/pstree man/man1/pstree.1.gz
 
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index 6dcab972001a..8060c0b78895 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -12,7 +12,7 @@ LICENSE=	ART20
 
 USES=	tar:bzip2 gmake
 
-CONFLICTS=	waon-[0-9]*
+CONFLICTS=	waon
 
 GNU_CONFIGURE=	yes
 MAKE_ENV+=	LD=${LD}
diff --git a/sysutils/py-rdiff-backup/Makefile b/sysutils/py-rdiff-backup/Makefile
index 1da3d8bccb69..07ee563c2f09 100644
--- a/sysutils/py-rdiff-backup/Makefile
+++ b/sysutils/py-rdiff-backup/Makefile
@@ -20,7 +20,7 @@ USES=		localbase:ldflags python:3.5+
 USE_LDCONFIG=	yes
 USE_PYTHON=	autoplist concurrent distutils
 
-CONFLICTS=	rdiff-backup-devel-[0-9]* rdiff-backup-1.0*
+CONFLICTS=	rdiff-backup-devel rdiff-backup-1.0*
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/sysutils/samefile/Makefile b/sysutils/samefile/Makefile
index 6ce0e50beba3..d7c48e7800e5 100644
--- a/sysutils/samefile/Makefile
+++ b/sysutils/samefile/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	http://www.schweikhardt.net/
 MAINTAINER=	schweikh@FreeBSD.org
 COMMENT=	Find files with identical contents
 
-CONFLICTS=	samesame-[0-9]*
+CONFLICTS=	samesame
 
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/samesame/Makefile b/sysutils/samesame/Makefile
index 7490a18f670f..e2d2d2f16869 100644
--- a/sysutils/samesame/Makefile
+++ b/sysutils/samesame/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Find duplicate files and optionally link them together
 
 LICENSE=	BSD2CLAUSE
 
-CONFLICTS=	samefile-[0-9]*
+CONFLICTS=	samefile
 
 HAS_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 66638629e898..d7352e40e1ba 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -20,7 +20,7 @@ LICENSE_PERMS_IBM=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 RUN_DEPENDS=	p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
 		exif:graphics/exif
 
-CONFLICTS=	ja-ls-[0-9]* icat-[0-9]*
+CONFLICTS=	ja-ls icat
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_libpq_fe_h=no
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 225388d103fd..5b7775cd0727 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -22,9 +22,9 @@ USES=		autoreconf:build compiler:c11 cpe gettext-runtime gmake gnome \
 
 CPE_VENDOR=	oneidentity
 
-CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
-		syslog-ng[0-9][0-9]-[0-9]* \
-		syslog-ng-devel-[0-9]* eventlog*
+CONFLICTS?=	syslog-ng syslog-ng[0-9] \
+		syslog-ng[0-9][0-9] \
+		syslog-ng-devel eventlog*
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/sysutils/userneu/Makefile b/sysutils/userneu/Makefile
index db46eba307b4..60783292696d 100644
--- a/sysutils/userneu/Makefile
+++ b/sysutils/userneu/Makefile
@@ -23,7 +23,7 @@ NO_BUILD=	yes
 NO_ARCH=	yes
 SHEBANG_FILES=	userquick.pl smbrepair.pl userneu.pl
 
-CONFLICTS=	userneu-devel-[0-9]*
+CONFLICTS=	userneu-devel
 
 SCRIPTS=	userneu.pl userquick.pl smbrepair.pl
 DOCS=		BUGS CHANGES CREDITS REQUIREMENTS TODO \
diff --git a/sysutils/vcp/Makefile b/sysutils/vcp/Makefile
index f297bcfcfc8a..9b2fbf446d26 100644
--- a/sysutils/vcp/Makefile
+++ b/sysutils/vcp/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Copy files in curses interface
 BROKEN_FreeBSD_13=	ld: error: duplicate symbol: logw
 BROKEN_FreeBSD_14=	ld: error: duplicate symbol: logw
 
-CONFLICTS=	p5-VCP-[0-9]* \
-		p5-VCP-autrijus-[0-9]*
+CONFLICTS=	p5-VCP \
+		p5-VCP-autrijus
 
 USES=		ncurses
 LDFLAGS+=	-lncurses
diff --git a/sysutils/xen-guest-tools/Makefile b/sysutils/xen-guest-tools/Makefile
index 236df2d92a5f..8fb2d6a25dec 100644
--- a/sysutils/xen-guest-tools/Makefile
+++ b/sysutils/xen-guest-tools/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than amd64 or i386
-CONFLICTS=	xen-tools-[0-9]*
+CONFLICTS=	xen-tools
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/lib/libglib-2.0.so:devel/glib20 \