*/*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL

The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").

Approved by: portmgr (blanket)

Author: stesser

audio/optimfrog-sse2/Makefile

@@ -3,7 +3,7 @@ PKGNAMESUFFIX=	-sse2
 MASTERDIR=	${.CURDIR}/../optimfrog
 COMMENT=	Best-ratio lossless audio codec (SSE2 required)
 
-CONFLICTS_INSTALL=	optimfrog-[0-9]*
+CONFLICTS_INSTALL=	optimfrog
 
 ONLY_FOR_ARCHS=	i386
 OPTIONS_DEFAULT=	SSE2

audio/optimfrog/Makefile

@@ -15,7 +15,7 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
 
-CONFLICTS_INSTALL?=	optimfrog-sse2-[0-9]*
+CONFLICTS_INSTALL?=	optimfrog-sse2
 
 ONLY_FOR_ARCHS?=	amd64 i386
 

audio/timidity++/Makefile

@@ -55,7 +55,7 @@ USES+=		ncurses
 CONFIGURE_ARGS+=--enable-interface=ncurses,vt100,server \
 		--enable-network
 
-CONFLICTS_INSTALL=	timidity-[0-9]*
+CONFLICTS_INSTALL=	timidity
 
 DOCFILES=	README.alsaseq README.dl README.m2m README.mts README.sf
 

comms/conserver-com/Makefile

@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
 		--with-pam --with-libwrap --with-openssl
 
-CONFLICTS_INSTALL=	conserver-[0-9]*
+CONFLICTS_INSTALL=	conserver
 
 OPTIONS_DEFINE=	FREEIPMI GSSAPI GSSAPIONLY STRIPREALM UDS
 FREEIPMI_DESC=	Compile in FreeIPMI support

databases/p5-DBD-mysql/Makefile

@@ -26,7 +26,7 @@ USE_PERL5=	configure
 CONFIGURE_ARGS=		${_CONFIGURE_ARGS_${CHOSEN_COMPILER_TYPE}}
 _CONFIGURE_ARGS_gcc=	--libs="-L${PREFIX}/lib/gcc${GCC_DEFAULT} `mysql_config --libs | ${SED} 's/-pthread //'`"
 
-CONFLICTS_INSTALL=	p5-DBD-mysql[45][0-9]-[0-9]*
+CONFLICTS_INSTALL=	p5-DBD-mysql[45][0-9]
 
 OPTIONS_DEFINE=		SSL
 OPTIONS_DEFAULT=	SSL

deskutils/xpad/Makefile

@@ -17,7 +17,7 @@ USES=		autoreconf compiler:c++11-lang gmake pkgconfig tar:bzip2 gnome xorg
 OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_SUB=	yes
 
-CONFLICTS_INSTALL=	xpad3-[0-9]*
+CONFLICTS_INSTALL=	xpad3
 USE_XORG=	x11 sm ice
 USE_GNOME=	gtk30 intltool gtksourceview3 cairo
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include

deskutils/xpad3/Makefile

@@ -20,7 +20,7 @@ USES=	pkgconfig gmake tar:bzip2 xorg gnome
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-CONFLICTS_INSTALL=	xpad-[0-9]*
+CONFLICTS_INSTALL=	xpad
 
 USE_XORG=	x11 sm ice
 USE_GNOME=	gtk20 intltool cairo

devel/ccache-memcached-static/Makefile

@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../ccache-memcached
 
 OPTIONS_SLAVE=	STATIC
 
-CONFLICTS_INSTALL=	ccache-[0-9]* ccache-memcached[0-9]* ccache-static[0-9]*
+CONFLICTS_INSTALL=	ccache ccache-memcached ccache-static
 
 .include "${MASTERDIR}/Makefile"

devel/ccache-memcached/Makefile

@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/GPL-3.0.txt
 USE_GITHUB=	yes
 GH_TAGNAME=	f7712082106bef085515f86ae47e7dbbd2a48b57
 
-CONFLICTS_INSTALL?=	ccache-[0-9]* ccache-static-[0-9]* ccache-memcached-static-[0-9]*
+CONFLICTS_INSTALL?=	ccache ccache-static ccache-memcached-static
 
 GNU_CONFIGURE=	yes
 

devel/ccache-static/Makefile

@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../ccache
 
 OPTIONS_SLAVE=	STATIC
 
-CONFLICTS_INSTALL=	ccache-[0-9]* ccache-memcached[0-9]* ccache-memcached-static[0-9]*
+CONFLICTS_INSTALL=	ccache ccache-memcached ccache-memcached-static
 
 .include "${MASTERDIR}/Makefile"