diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 22:11:40 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 22:11:40 +0000 |
| commit | 5933ac0b099d61d98eb531d373cf57a8927bc7af (patch) | |
| tree | fc0ebf2ac7225dec2aa7f2a7b0efbb91919c1030 | |
| parent | e2521329169c2867009b66984bc2988c9631f00f (diff) | |
| download | ports-5933ac0b099d61d98eb531d373cf57a8927bc7af.tar.gz ports-5933ac0b099d61d98eb531d373cf57a8927bc7af.zip | |
*/*: 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)
157 files changed, 245 insertions, 255 deletions
diff --git a/audio/optimfrog-sse2/Makefile b/audio/optimfrog-sse2/Makefile index 22163c3e0348..50933a52c947 100644 --- a/audio/optimfrog-sse2/Makefile +++ b/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 diff --git a/audio/optimfrog/Makefile b/audio/optimfrog/Makefile index 8e58b58c568c..ccd37b30eb6a 100644 --- a/audio/optimfrog/Makefile +++ b/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 diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile index 66c1e38eb738..c3ad27d47921 100644 --- a/audio/timidity++/Makefile +++ b/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 diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile index dd5357fb04cb..0e0002cfbe31 100644 --- a/comms/conserver-com/Makefile +++ b/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 diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile index 45615e7f1bfd..7dff04f867a5 100644 --- a/databases/p5-DBD-mysql/Makefile +++ b/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 diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile index 8610f7431992..bb51a25dc856 100644 --- a/deskutils/xpad/Makefile +++ b/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 diff --git a/deskutils/xpad3/Makefile b/deskutils/xpad3/Makefile index 1e86c49e0c4f..9e9f01e264a9 100644 --- a/deskutils/xpad3/Makefile +++ b/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 diff --git a/devel/ccache-memcached-static/Makefile b/devel/ccache-memcached-static/Makefile index a37421fedde8..295bef881772 100644 --- a/devel/ccache-memcached-static/Makefile +++ b/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" diff --git a/devel/ccache-memcached/Makefile b/devel/ccache-memcached/Makefile index 54458cd0a944..5b179b3b74df 100644 --- a/devel/ccache-memcached/Makefile +++ b/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 diff --git a/devel/ccache-static/Makefile b/devel/ccache-static/Makefile index e49c7d70b306..464c6e19177c 100644 --- a/devel/ccache-static/Makefile +++ b/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" diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index c36fe1142fb2..f5f6a9c1af72 100644 --- a/devel/ccache/Makefile +++ b/devel/ccache/Makefile @@ -13,7 +13,7 @@ COMMENT= Tool to minimize the compile time of C/C++ programs LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/GPL-3.0.txt -CONFLICTS_INSTALL?= ccache-static-[0-9]* ccache-memcached-[0-9]* ccache-memcached-static-[0-9]* +CONFLICTS_INSTALL?= ccache-static ccache-memcached ccache-memcached-static GNU_CONFIGURE= yes diff --git a/devel/hwloc2/Makefile b/devel/hwloc2/Makefile index b2150e26913a..9ffea5a52117 100644 --- a/devel/hwloc2/Makefile +++ b/devel/hwloc2/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libpciaccess.so:devel/libpciaccess USES= iconv libtool gnome pathfix pkgconfig tar:bzip2 USE_GNOME= libxml2 -CONFLICTS_INSTALL= hwloc-[0-9]* +CONFLICTS_INSTALL= hwloc GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile index cd4e70c306e5..78879aa347c7 100644 --- a/devel/kBuild/Makefile +++ b/devel/kBuild/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi USES= autoreconf:build gmake makeinfo tar:xz -CONFLICTS_INSTALL= kBuild-devel-[0-9]* +CONFLICTS_INSTALL= kBuild-devel WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile index a248f6df0578..8cf1e77a3f1e 100644 --- a/devel/kdesvn/Makefile +++ b/devel/kdesvn/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libgdbm.so:databases/gdbm \ libsvn_client-1.so:devel/subversion -CONFLICTS_INSTALL= qsvn-[0-9]* +CONFLICTS_INSTALL= qsvn USES= bdb cmake compiler:c++11-lang kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile index f91a019b2e39..b53237e0ac9c 100644 --- a/devel/physfs/Makefile +++ b/devel/physfs/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= http://icculus.org/${PORTNAME}/downloads/ MAINTAINER= oliver@FreeBSD.org COMMENT= Library to provide abstract access to various archives -CONFLICTS_INSTALL= physfs-devel-[0-9]* +CONFLICTS_INSTALL= physfs-devel USES= cmake readline tar:bzip2 USE_LDCONFIG= yes diff --git a/devel/py-boto/Makefile b/devel/py-boto/Makefile index deca23ccf9ad..77014139641d 100644 --- a/devel/py-boto/Makefile +++ b/devel/py-boto/Makefile @@ -17,6 +17,6 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= p5-Net-Amazon-Route53-[0-9]* +CONFLICTS_INSTALL= p5-Net-Amazon-Route53 .include <bsd.port.mk> diff --git a/devel/rubygem-svn2git/Makefile b/devel/rubygem-svn2git/Makefile index fd03b6399a2c..4c89a9ba229a 100644 --- a/devel/rubygem-svn2git/Makefile +++ b/devel/rubygem-svn2git/Makefile @@ -10,7 +10,7 @@ LICENSE= MIT RUN_DEPENDS= git>0:devel/git -CONFLICTS_INSTALL= svn2git-[0-9]* +CONFLICTS_INSTALL= svn2git NO_ARCH= yes USE_RUBY= yes diff --git a/devel/yasm-devel/Makefile b/devel/yasm-devel/Makefile index 8d249138bccd..077f21475a61 100644 --- a/devel/yasm-devel/Makefile +++ b/devel/yasm-devel/Makefile @@ -27,7 +27,7 @@ NLS_CONFIGURE_ON= --with-libiconv-prefix=${LOCALBASE} \ NLS_CONFIGURE_OFF= --without-libiconv-prefix \ --without-libintl-prefix -CONFLICTS_INSTALL= yasm-[0-9]* +CONFLICTS_INSTALL= yasm .include <bsd.port.options.mk> diff --git a/dns/mDNSResponder_nss/Makefile b/dns/mDNSResponder_nss/Makefile index 97691c12c60b..530da2997bd5 100644 --- a/dns/mDNSResponder_nss/Makefile +++ b/dns/mDNSResponder_nss/Makefile @@ -16,7 +16,7 @@ USES= cpe CPE_VENDOR= apple -CONFLICTS_INSTALL= nss_mdns-[0-9]* +CONFLICTS_INSTALL= nss_mdns WRKSRC= ${WRKDIR}/${PORTNAME:S/_nss//}-${PORTVERSION} diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile index 650f7f1a218a..8586d2a37fdc 100644 --- a/dns/nss_mdns/Makefile +++ b/dns/nss_mdns/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --localstatedir=/var \ INSTALL_TARGET= install-strip -CONFLICTS_INSTALL= mDNSResponder_nss-[0-9]* +CONFLICTS_INSTALL= mDNSResponder_nss # TODO: Print a message about the etc directory used for mdns.allow # being relative to ${PREFIX}. diff --git a/editors/linux-sublime/Makefile b/editors/linux-sublime/Makefile index e53f83bf6d3c..1dc1a9facc4d 100644 --- a/editors/linux-sublime/Makefile +++ b/editors/linux-sublime/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/"Sublime Text 2" NO_BUILD= SUB_FILES= sublime -CONFLICTS_INSTALL= linux-sublime3-[0-9]* +CONFLICTS_INSTALL= linux-sublime3 do-install: @${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/editors/nvi2/Makefile b/editors/nvi2/Makefile index 9a0ba015ee41..d6f8b48fdd17 100644 --- a/editors/nvi2/Makefile +++ b/editors/nvi2/Makefile @@ -15,7 +15,7 @@ USE_GITHUB= yes GH_ACCOUNT= lichray -CONFLICTS_INSTALL= nvi-m17n-[0-9]* nvi-[0-9]* +CONFLICTS_INSTALL= nvi-m17n nvi OPTIONS_DEFINE= DEBUG WIDECHAR ICONV OPTIONS_DEFAULT= WIDECHAR ICONV diff --git a/editors/vile/Makefile b/editors/vile/Makefile index 6ddce80e2533..406ac2119b81 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= cf_cv_crypt_works=yes MAKEFILE= makefile INSTALL_TARGET= install install-doc install-html -CONFLICTS_INSTALL= xvile-[0-9]* +CONFLICTS_INSTALL= xvile OPTIONS_DEFINE= DOCS FILTERS ICONV PERL OPTIONS_SUB= yes diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index e0de03356ee9..938e2b326461 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS= --disable-imake \ MAKEFILE= makefile INSTALL_TARGET= install install-doc install-html -CONFLICTS_INSTALL= vile-[0-9]* +CONFLICTS_INSTALL= vile OPTIONS_DEFINE= DOCS FILTERS ICONV PERL OPTIONS_RADIO= MENUS diff --git a/emulators/qemu-user-static-devel/Makefile b/emulators/qemu-user-static-devel/Makefile index b68f079b1daf..6e4545a0b684 100644 --- a/emulators/qemu-user-static-devel/Makefile +++ b/emulators/qemu-user-static-devel/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 powerpc powerpc64 -CONFLICTS_INSTALL= qemu-user-static-[0-9]* +CONFLICTS_INSTALL= qemu-user-static # When static linking we have a build dependency on libglib-2.0.a, otherwise # we use glib20 in the usual way (shared-lib runtime dependency). diff --git a/emulators/qemu-user-static/Makefile b/emulators/qemu-user-static/Makefile index 65b26be5cff1..bbaa9372d044 100644 --- a/emulators/qemu-user-static/Makefile +++ b/emulators/qemu-user-static/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 powerpc powerpc64 -CONFLICTS_INSTALL= qemu-user-static-devel-[0-9]* +CONFLICTS_INSTALL= qemu-user-static-devel USES= bison compiler:c11 cpe gmake perl5 pkgconfig python:build USE_GITHUB= yes diff --git a/emulators/qemu-utils/Makefile b/emulators/qemu-utils/Makefile index bb3eb2026c30..ce5c7d9c61d9 100644 --- a/emulators/qemu-utils/Makefile +++ b/emulators/qemu-utils/Makefile @@ -8,7 +8,7 @@ USES= compiler:c11 cpe gettext-runtime gmake gnome perl5 pkgconfig \ python:build tar:xz USE_GNOME+= glib20 MAKE_ENV+= BSD_MAKE="${MAKE}" PREFIX=${PREFIX} -CONFLICTS_INSTALL= qemu-[0-9]* qemu-devel-* qemu-sbruno-* +CONFLICTS_INSTALL= qemu qemu-devel qemu-sbruno OPTIONS_SLAVE= DOCS OPTIONS_EXCLUDE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \ diff --git a/emulators/virtualbox-ose-additions-legacy/Makefile b/emulators/virtualbox-ose-additions-legacy/Makefile index ee6830eeb373..6b8980a749f2 100644 --- a/emulators/virtualbox-ose-additions-legacy/Makefile +++ b/emulators/virtualbox-ose-additions-legacy/Makefile @@ -40,12 +40,12 @@ CONFIGURE_ARGS+= --disable-alsa \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-[0-9]* \ - virtualbox-ose-additions-[0-9]* \ - virtualbox-ose-additions-devel-[0-9]* \ - virtualbox-ose-devel-[0-9]* \ - virtualbox-ose-lite-[0-9]* \ - virtualbox-ose-nox11-[0-9]* +CONFLICTS_INSTALL= virtualbox-ose \ + virtualbox-ose-additions \ + virtualbox-ose-additions-devel \ + virtualbox-ose-devel \ + virtualbox-ose-lite \ + virtualbox-ose-nox11 PORTSCOUT= limit:^5\. @@ -67,9 +67,9 @@ X11_VARS= VBOX_WITH_X11=1 .include <bsd.port.options.mk> .if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11-[0-9]* +CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11 .else -CONFLICTS_INSTALL+= virtualbox-ose-additions-[0-9]* +CONFLICTS_INSTALL+= virtualbox-ose-additions .endif VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 6deaded7037b..bcf20976544e 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -39,13 +39,13 @@ CONFIGURE_ARGS+= --disable-alsa \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-[0-9]* \ - virtualbox-ose-additions-devel-[0-9]* \ - virtualbox-ose-additions-legacy-[0-9]* \ - virtualbox-ose-devel-[0-9]* \ - virtualbox-ose-legacy-[0-9]* \ - virtualbox-ose-lite-[0-9]* \ - virtualbox-ose-nox11-[0-9]* +CONFLICTS_INSTALL= virtualbox-ose \ + virtualbox-ose-additions-devel \ + virtualbox-ose-additions-legacy \ + virtualbox-ose-devel \ + virtualbox-ose-legacy \ + virtualbox-ose-lite \ + virtualbox-ose-nox11 OPTIONS_DEFINE= DBUS DEBUG X11 OPTIONS_DEFAULT= DBUS X11 @@ -65,9 +65,9 @@ X11_VARS= VBOX_WITH_X11=1 .include <bsd.port.options.mk> .if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11-[0-9]* +CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11 .else -CONFLICTS_INSTALL+= virtualbox-ose-additions-[0-9]* +CONFLICTS_INSTALL+= virtualbox-ose-additions .endif VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index fa4c0a7f749f..7d0e5812f01a 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -38,9 +38,9 @@ CONFIGURE_ARGS= --disable-java --passive-mesa CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}" CONFLICTS_INSTALL= virtualbox-ose-additions-* \ - virtualbox-ose-devel-[0-9]* \ - virtualbox-ose-[0-9]* \ - virtualbox-ose-lite-[0-9]* + virtualbox-ose-devel \ + virtualbox-ose \ + virtualbox-ose-lite PORTSCOUT= limit:^5\. @@ -113,10 +113,10 @@ USE_RC_SUBR= vboxheadless vboxwatchdog .include <bsd.port.options.mk> .if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-nox11-[0-9]* +CONFLICTS_INSTALL+= virtualbox-ose-nox11 OPTIONS_DEFAULT+= PYTHON .else -CONFLICTS_INSTALL+= virtualbox-ose-[0-9]* +CONFLICTS_INSTALL+= virtualbox-ose .endif .if ${ARCH} == "amd64" diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 37b04b7b6908..c1993fc01e5a 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -35,9 +35,9 @@ CONFIGURE_ARGS= --disable-java --passive-mesa CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}" CONFLICTS_INSTALL= virtualbox-ose-additions-* \ - virtualbox-ose-devel-[0-9]* \ - virtualbox-ose-legacy-[0-9]* \ - virtualbox-ose-lite-[0-9]* + virtualbox-ose-devel \ + virtualbox-ose-legacy \ + virtualbox-ose-lite VBOXUSER?= vboxusers VBOXWSUSER?= vboxusers @@ -114,10 +114,10 @@ USE_RC_SUBR= vboxheadless vboxwatchdog .include <bsd.port.options.mk> .if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-nox11-[0-9]* +CONFLICTS_INSTALL+= virtualbox-ose-nox11 OPTIONS_DEFAULT+= PYTHON .else -CONFLICTS_INSTALL+= virtualbox-ose-[0-9]* +CONFLICTS_INSTALL+= virtualbox-ose .endif .if ${ARCH} == "amd64" diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 4750aadc358c..1c9c2fbd9a85 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -29,7 +29,7 @@ USE_SDL= sdl2 CPE_VENDOR= winehq -CONFLICTS_INSTALL= wine-[0-9]* +CONFLICTS_INSTALL= wine GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose \ diff --git a/emulators/wine-gecko-devel/Makefile b/emulators/wine-gecko-devel/Makefile index 16e53785a0ac..df080a745920 100644 --- a/emulators/wine-gecko-devel/Makefile +++ b/emulators/wine-gecko-devel/Makefile @@ -15,7 +15,7 @@ COMMENT= Gecko Layout Engine for Wine development branch (HTML support) LICENSE= MPL20 GPLv2 GPLv3 LGPL21 LGPL3 LICENSE_COMB= multi -CONFLICTS_INSTALL= wine-gecko-[0-9]* +CONFLICTS_INSTALL= wine-gecko NO_BUILD= yes PLIST_SUB+= GECKO_VERSION="${DISTVERSION}" diff --git a/emulators/wine-gecko/Makefile b/emulators/wine-gecko/Makefile index ee4e68f29acf..7db513dd645f 100644 --- a/emulators/wine-gecko/Makefile +++ b/emulators/wine-gecko/Makefile @@ -16,7 +16,7 @@ LICENSE_COMB= multi PORTSCOUT= ignore:1 # for newer versions see emulators/wine-gecko-devel -CONFLICTS_INSTALL= wine-gecko-devel-[0-9]* +CONFLICTS_INSTALL= wine-gecko-devel NO_BUILD= yes PLIST_SUB+= GECKO_VERSION="${DISTVERSION}" diff --git a/emulators/wine-mono-devel/Makefile b/emulators/wine-mono-devel/Makefile index 1090d1f5efa5..b5130d712f4e 100644 --- a/emulators/wine-mono-devel/Makefile +++ b/emulators/wine-mono-devel/Makefile @@ -15,7 +15,7 @@ COMMENT= Mono .NET implementation for Wine development branch LICENSE= MIT GPLv2 LGPL20 LICENSE_COMB= multi -CONFLICTS_INSTALL= wine-mono-[0-9]* +CONFLICTS_INSTALL= wine-mono NO_BUILD= yes PLIST_SUB+= MONO_VERSION="${DISTVERSION}" diff --git a/emulators/wine-mono/Makefile b/emulators/wine-mono/Makefile index 40bc1f39ea94..aace8c29ee98 100644 --- a/emulators/wine-mono/Makefile +++ b/emulators/wine-mono/Makefile @@ -16,7 +16,7 @@ LICENSE_COMB= multi PORTSCOUT= ignore:1 # for newer versions see emulators/wine-mono-devel -CONFLICTS_INSTALL= wine-mono-devel-[0-9]* +CONFLICTS_INSTALL= wine-mono-devel NO_BUILD= yes PLIST_SUB+= MONO_VERSION="${DISTVERSION}" diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index ed3e5754d68f..367205931cc6 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -18,7 +18,8 @@ ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex LIB_DEPENDS= libFAudio.so:audio/faudio \ - libxml2.so:textproc/libxml2 + libxml2.so:textproc/libxml2 \ + libsysinfo.so:devel/libsysinfo USES= bison cpe desktop-file-utils gmake localbase \ pkgconfig sdl shebangfix tar:xz @@ -57,7 +58,7 @@ CONFIGURE_ARGS+=--verbose \ --without-udev \ --without-unwind \ --without-usb -CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" +CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" CFLAGS="-D_WITH_CPU_SET_T" WINELIBDIR?= ${PREFIX}/lib .if !defined(USE_LDCONFIG32) USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile index ff58290dd1a8..a81621fa1a22 100644 --- a/games/aisleriot/Makefile +++ b/games/aisleriot/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libgc-threaded.so:devel/boehm-gc-threaded -CONFLICTS_INSTALL= sol-[0-9]* +CONFLICTS_INSTALL= sol PORTSCOUT= limitw:1,even USES= desktop-file-utils gettext meson gnome pkgconfig \ diff --git a/games/linux-ut/Makefile b/games/linux-ut/Makefile index 5b29ff6262db..f56a4c1763c0 100644 --- a/games/linux-ut/Makefile +++ b/games/linux-ut/Makefile @@ -27,7 +27,7 @@ USE_LINUX= xorglibs sdl12 NO_BUILD= yes WRKSRC= ${WRKDIR}/${PKGNAME} -CONFLICTS_INSTALL= exult-[0-9]* ucc-[0-9]* +CONFLICTS_INSTALL= exult ucc # Patch files. PATCH436FILES= unreal.tournament_436-multilanguage.run:p436 \ diff --git a/games/qstat/Makefile b/games/qstat/Makefile index 9da78434107c..4f923e92d4cd 100644 --- a/games/qstat/Makefile +++ b/games/qstat/Makefile @@ -10,7 +10,7 @@ COMMENT= Command-line program to query game servers on the net LICENSE= ART20 -CONFLICTS_INSTALL= torque-[0-9]* +CONFLICTS_INSTALL= torque USES= autoreconf gmake GNU_CONFIGURE= yes diff --git a/games/redeclipse-data/Makefile b/games/redeclipse-data/Makefile index e6e0e8591f9f..18be1bae9e4c 100644 --- a/games/redeclipse-data/Makefile +++ b/games/redeclipse-data/Makefile @@ -6,7 +6,7 @@ CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Data files for Red Eclipse first-person shooter -CONFLICTS_INSTALL=redeclipse-data16-[0-9]* +CONFLICTS_INSTALL=redeclipse-data16 USE_GITHUB= nodefault diff --git a/games/redeclipse-data16/Makefile b/games/redeclipse-data16/Makefile index ed499405cb83..af56d81d5bd8 100644 --- a/games/redeclipse-data16/Makefile +++ b/games/redeclipse-data16/Makefile @@ -12,7 +12,7 @@ COMMENT= Data files for Red Eclipse first-person shooter USE_GITHUB= nodefault GH_TUPLE= ${DATAFILES:C/.*/red-eclipse:&:${DISTVERSIONPREFIX}${PORTVERSION}:&\/&/} -CONFLICTS_INSTALL=redeclipse-data-[0-9]* +CONFLICTS_INSTALL=redeclipse-data DATAFILES= acerspyro actors appleflap blendbrush caustics crosshairs \ decals dziq elyvisions fonts freezurbern john jojo jwin luckystrike \ diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile index 02b67160eede..4fb9bd639049 100644 --- a/games/redeclipse/Makefile +++ b/games/redeclipse/Makefile @@ -12,7 +12,7 @@ COMMENT= Single-player and multi-player first-person ego-shooter LICENSE= MIT ZLIB LICENSE_COMB= multi -CONFLICTS_INSTALL=redeclipse16-[0-9]* +CONFLICTS_INSTALL=redeclipse16 BROKEN_sparc64= does not build on sparc64 diff --git a/games/redeclipse16/Makefile b/games/redeclipse16/Makefile index a2e4ba8226b9..98ef9284f86c 100644 --- a/games/redeclipse16/Makefile +++ b/games/redeclipse16/Makefile @@ -13,7 +13,7 @@ COMMENT= Single-player and multi-player first-person ego-shooter LICENSE= MIT ZLIB LICENSE_COMB= multi -CONFLICTS_INSTALL=redeclipse-[0-9]* +CONFLICTS_INSTALL=redeclipse BROKEN_sparc64= does not build on sparc64 diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile index b90128ac8d1e..bc5a2de8c2f9 100644 --- a/games/wolfpack/Makefile +++ b/games/wolfpack/Makefile @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes BINDIR= lib/${PORTNAME} CONFIGURE_ARGS= --bindir=${PREFIX}/${BINDIR} --sbindir=${PREFIX}/${BINDIR} -CONFLICTS_INSTALL= empire-[0-9]* +CONFLICTS_INSTALL= empire USERS= wolfpack GROUPS= wolfpack diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index fd82b87496c2..cb5207ace147 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -173,7 +173,7 @@ X11_CONFIGURE_WITH= x X11_USES= xorg X11_USE= xorg=ice,sm,x11,xext,xt X11_VARS= CONFLICTS_INSTALL+="ImageMagick7-nox11-* \ - CONFLICTS+=display-[0-9]* + CONFLICTS+=display X11_VARS_OFF= CONFLICTS_INSTALL+="ImageMagick7-*" \ PKGNAMESUFFIX=7-nox11 diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile index 514a2d2ec837..c72ac3263a98 100644 --- a/graphics/jpeg-turbo/Makefile +++ b/graphics/jpeg-turbo/Makefile @@ -49,7 +49,7 @@ CMAKE_OFF= WITH_SIMD PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG="" .else CMAKE_OFF+= WITH_TURBOJPEG -CONFLICTS_INSTALL= jpeg-[0-9]* +CONFLICTS_INSTALL= jpeg PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment " .endif diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 56e48a6d01fa..178452e5627c 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -21,7 +21,7 @@ USE_GITHUB= yes GH_ACCOUNT= openscenegraph GH_PROJECT= OpenSceneGraph -CONFLICTS_INSTALL=osg34-[0-9]* +CONFLICTS_INSTALL=osg34 USES= alias cmake compiler:c11 jpeg gl pkgconfig xorg USE_GL= gl diff --git a/graphics/osg34/Makefile b/graphics/osg34/Makefile index 5dc84d1d92f0..6f1e77472a87 100644 --- a/graphics/osg34/Makefile +++ b/graphics/osg34/Makefile @@ -22,7 +22,7 @@ USE_GITHUB= yes GH_ACCOUNT= openscenegraph GH_PROJECT= OpenSceneGraph -CONFLICTS_INSTALL=osg-[0-9]* +CONFLICTS_INSTALL=osg USES= alias cmake compiler:c++11-lang gl jpeg pkgconfig xorg USE_GL= gl glu diff --git a/graphics/pecl-imagick-im7/Makefile b/graphics/pecl-imagick-im7/Makefile index 525ab9a403da..9074c1e8a397 100644 --- a/graphics/pecl-imagick-im7/Makefile +++ b/graphics/pecl-imagick-im7/Makefile @@ -10,7 +10,7 @@ LICENSE= PHP301 MASTERDIR= ${.CURDIR}/../pecl-imagick -CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME}-[0-9]* +CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME} X11_LIB_DEPENDS?= libMagickWand-7.so:graphics/ImageMagick7 X11_LIB_DEPENDS_OFF?= libMagickWand-7.so:graphics/ImageMagick7-nox11 diff --git a/graphics/sekrit-twc-zimg/Makefile b/graphics/sekrit-twc-zimg/Makefile index a0d55b2a08f8..ef5c6714e585 100644 --- a/graphics/sekrit-twc-zimg/Makefile +++ b/graphics/sekrit-twc-zimg/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes GH_ACCOUNT= sekrit-twc -CONFLICTS_INSTALL= zimg-[0-9]* # include/zimg.h +CONFLICTS_INSTALL= zimg # include/zimg.h USES= autoreconf compiler:c++11-lib gmake libtool pathfix EXCLUDE= googletest sha1 diff --git a/graphics/springgraph/Makefile b/graphics/springgraph/Makefile index 0a5805686b51..06867713723b 100644 --- a/graphics/springgraph/Makefile +++ b/graphics/springgraph/Makefile @@ -13,7 +13,7 @@ COMMENT= Render graph described in a .dot file RUN_DEPENDS= p5-GD>=0:graphics/p5-GD -CONFLICTS_INSTALL=signing-party-[0-9]* +CONFLICTS_INSTALL=signing-party PLIST_FILES= bin/springgraph EXTRACT_CMD= ${CP} diff --git a/graphics/zathura-pdf-mupdf/Makefile b/graphics/zathura-pdf-mupdf/Makefile index 8f38c93c05d7..88c4c81fc9ba 100644 --- a/graphics/zathura-pdf-mupdf/Makefile +++ b/graphics/zathura-pdf-mupdf/Makefile @@ -32,7 +32,7 @@ PLIST_FILES= lib/zathura/libpdf-mupdf.so \ share/applications/org.pwmt.zathura-pdf-mupdf.desktop \ share/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml -CONFLICTS_INSTALL= zathura-pdf-poppler-[0-9]* +CONFLICTS_INSTALL= zathura-pdf-poppler post-patch: ${REINPLACE_CMD} "s@\(cc.find_library(.*\))@\1,dirs:'${PREFIX}/lib')@" \ diff --git a/irc/irc/Makefile b/irc/irc/Makefile index 2efc1903ac6e..691a0dcfe44d 100644 --- a/irc/irc/Makefile +++ b/irc/irc/Makefile @@ -14,8 +14,8 @@ COMMENT= The "Internet Relay Chat" Server BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk -CONFLICTS_INSTALL= charybdis-[0-9]* ircd-hybrid-[0-9]* Nefarious-[0-9]* \ - ru-ircd-hybrid-[0-9]* ircd-ru-[0-9]* +CONFLICTS_INSTALL= charybdis ircd-hybrid Nefarious \ + ru-ircd-hybrid ircd-ru USES= tar:tgz USE_RC_SUBR= ircd diff --git a/japanese/ack/Makefile b/japanese/ack/Makefile index e4c42b1a90fd..c3c1c1563ec3 100644 --- a/japanese/ack/Makefile +++ b/japanese/ack/Makefile @@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= CQG00620@nifty.ne.jp COMMENT= Kanji code converter -CONFLICTS_INSTALL= p5-ack-[0-9]* ack-[0-9]* +CONFLICTS_INSTALL= p5-ack ack ALL_TARGET= ack CFLAGS+= -Wno-error=return-type diff --git a/lang/chez-scheme/Makefile b/lang/chez-scheme/Makefile index 507fab67b8c4..7f34c208316d 100644 --- a/lang/chez-scheme/Makefile +++ b/lang/chez-scheme/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= X11 HAS_CONFIGURE= yes ALL_TARGET= build -CONFLICTS_INSTALL= petite-chez-[0-9]* +CONFLICTS_INSTALL= petite-chez STRIP_FILES= bin/petite bin/${PORTNAME} bin/${PORTNAME}-script CHEZ_LIBDIR=lib/csv${PORTVERSION} CFLAGS+= -I${LOCALBASE}/include diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 14a00be0b462..85ba27157bca 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -23,7 +23,7 @@ USE_LDCONFIG= yes CPE_VENDOR= gnu -CONFLICTS_INSTALL= guile1-[0-9]* guile2-[0-9]* +CONFLICTS_INSTALL= guile1 guile2 MAKE_JOBS_UNSAFE= yes diff --git a/lang/guile1/Makefile b/lang/guile1/Makefile index 97a77ec8410d..0643292655b5 100644 --- a/lang/guile1/Makefile +++ b/lang/guile1/Makefile @@ -20,7 +20,7 @@ USES= autoreconf cpe gmake libtool makeinfo ncurses pathfix CPE_VENDOR= gnu USE_LDCONFIG= yes -CONFLICTS_INSTALL= guile2-[0-9]* guile-[0-9]* +CONFLICTS_INSTALL= guile2 guile GNU_CONFIGURE= yes CFLAGS+= -fwrapv diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile index 91c6a4ce794d..9a88ec772454 100644 --- a/lang/guile2/Makefile +++ b/lang/guile2/Makefile @@ -24,7 +24,7 @@ USE_LDCONFIG= yes CPE_VENDOR= gnu -CONFLICTS_INSTALL= guile-[0-9]* +CONFLICTS_INSTALL= guile MAKE_JOBS_UNSAFE= yes diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile index ffb10c94f599..e3062a21b780 100644 --- a/lang/sdcc/Makefile +++ b/lang/sdcc/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/sdas/COPYING3 BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/adjacency_list.hpp:devel/boost-libs -CONFLICTS_INSTALL= sdcc-[0-9]* sdcc-devel-[0-9]* +CONFLICTS_INSTALL= sdcc sdcc-devel GNU_CONFIGURE= yes USES= autoreconf:build bison compiler:c++11-lang gmake \ readline python shebangfix tar:bzip2 diff --git a/mail/bogofilter-kc/Makefile b/mail/bogofilter-kc/Makefile index 181923515d8f..9c4d2285e87f 100644 --- a/mail/bogofilter-kc/Makefile +++ b/mail/bogofilter-kc/Makefile @@ -7,7 +7,7 @@ MAINTAINER= mandree@FreeBSD.org LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet -CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-lmdb-[0-9]* bogofilter-sqlite-[0-9]* bogofilter-tc-[0-9]* +CONFLICTS_INSTALL= bogofilter bogofilter-lmdb bogofilter-sqlite bogofilter-tc CONFIGURE_ARGS= --with-database=kyotocabinet BF_CPPFLAGS= -I${LOCALBASE}/include diff --git a/mail/bogofilter-lmdb/Makefile b/mail/bogofilter-lmdb/Makefile index 7e62bd9574e3..da69ec5b58a0 100644 --- a/mail/bogofilter-lmdb/Makefile +++ b/mail/bogofilter-lmdb/Makefile @@ -7,7 +7,7 @@ MAINTAINER= mandree@FreeBSD.org LIB_DEPENDS= liblmdb.so:databases/lmdb -CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-kc-[0-9]* bogofilter-sqlite-[0-9]* *bogofilter-tc-[0-9]* +CONFLICTS_INSTALL= bogofilter bogofilter-kc bogofilter-sqlite *bogofilter-tc CONFIGURE_ARGS= --with-database=lmdb BF_CPPFLAGS= -I${LOCALBASE}/include diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile index b960b02b619d..a99a0ae07fb4 100644 --- a/mail/bogofilter-sqlite/Makefile +++ b/mail/bogofilter-sqlite/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -sqlite MAINTAINER= mandree@FreeBSD.org USES= sqlite -CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-lmdb-[0-9]* bogofilter-kc-[0-9]* bogofilter-tc-[0-9]* +CONFLICTS_INSTALL= bogofilter bogofilter-lmdb bogofilter-kc bogofilter-tc CONFIGURE_ARGS= --with-database=sqlite BF_CPPFLAGS= -I${LOCALBASE}/include diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index d061385d5e87..2edc4faefb6f 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -21,8 +21,8 @@ OPTIONS_DEFAULT= GSL UNICODE GSL_DESC= Link with system-wide GSL dynamically (recommended) UNICODE_DESC= Normalize tokens to Unicode (UTF-8) (recommended) -CONFLICTS_INSTALL?= bogofilter-sqlite-[0-9]* bogofilter-tc-[0-9]* bogofilter-lmdb-[0-9]* \ - bogofilter-kc-[0-9]* +CONFLICTS_INSTALL?= bogofilter-sqlite bogofilter-tc bogofilter-lmdb \ + bogofilter-kc USES+= cpe perl5 shebangfix tar:xz SHEBANG_FILES= contrib/randomtrain.sh contrib/scramble.sh \ diff --git a/mail/mew-devel/Makefile b/mail/mew-devel/Makefile index d2563a8b7179..d0d021a3504d 100644 --- a/mail/mew-devel/Makefile +++ b/mail/mew-devel/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/00copyright USES= emacs USE_GITHUB= yes -CONFLICTS_INSTALL= ${PORTNAME}${EMACS_PKGNAMESUFFIX}-[0-9]* +CONFLICTS_INSTALL= ${PORTNAME}${EMACS_PKGNAMESUFFIX} GH_ACCOUNT= kazu-yamamoto GH_PROJECT= Mew diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index 7c3a6d544e5b..acb4a44f67a6 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -93,7 +93,7 @@ LDFLAGS+= -g DEBUG_FLAGS+= -O0 -Wall -Wextra -g .endif -CONFLICTS_INSTALL= ja-mh-[0-9]* pixie-* p5-Dist-Joseki-* +CONFLICTS_INSTALL= ja-mh pixie p5-Dist-Joseki post-install: @${FIND} ${STAGEDIR}${ETCDIR} -type f -exec ${MV} {} {}-dist \; diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile index 9499ce2b8723..bea96d5621ba 100644 --- a/mail/opensmtpd/Makefile +++ b/mail/opensmtpd/Makefile @@ -32,7 +32,7 @@ CPE_VENDOR= openbsd USE_RC_SUBR= smtpd SUB_FILES= pkg-install pkg-deinstall pkg-message -CONFLICTS_INSTALL= postfix-[0-9]* sendmail-[0-9]* opensmtpd-devel-[0-9]* +CONFLICTS_INSTALL= postfix sendmail opensmtpd-devel USERS= _smtpd _smtpq GROUPS= _smtpd _smtpq diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 609d0a812740..c16c0a61d1e1 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -26,19 +26,19 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS_IPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept FLAVORS= default ldap sasl -default_CONFLICTS_INSTALL= postfix-current-base-ldap-* \ - postfix-current-base-sasl-* \ - postfix-current-ldap-* postfix-current-sasl-* +default_CONFLICTS_INSTALL= postfix-current-base-ldap \ + postfix-current-base-sasl \ + postfix-current-ldap postfix-current-sasl ldap_PKGNAMESUFFIX= -current-ldap -ldap_CONFLICTS_INSTALL= postfix-current-[0-9]* \ - postfix-current-base-[0-9] \ - postfix-current-base-sasl-* \ - postfix-current-sasl-* +ldap_CONFLICTS_INSTALL= postfix-current \ + postfix-current-base \ + postfix-current-base-sasl \ + postfix-current-sasl sasl_PKGNAMESUFFIX= -current-sasl -sasl_CONFLICTS_INSTALL= postfix-current-[0-9]* \ - postfix-current-base-[0-9] \ - postfix-current-base-ldap-* \ - postfix-current-ldap-* +sasl_CONFLICTS_INSTALL= postfix-current \ + postfix-current-base \ + postfix-current-base-ldap \ + postfix-current-ldap COMMENT_ldap= (with OpenLDAP and Cyrus SASL support) COMMENT_sasl= (with Cyrus SASL support) @@ -51,10 +51,10 @@ SHEBANG_FILES= auxiliary/qshape/qshape.pl SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" -CONFLICTS_INSTALL= courier-0.* opensmtpd-[0-9]* opensmtpd-devel-* \ - postfix-[0-9]* postfix-base-* postfix-ldap-sasl-* \ - postfix-sasl-* postfix35-* sendmail-[0-9]* \ - sendmail-devel-* +CONFLICTS_INSTALL= courier-0.* opensmtpd opensmtpd-devel \ + postfix postfix-base postfix-ldap-sasl \ + postfix-sasl postfix35 sendmail \ + sendmail-devel USERS= postfix GROUPS= mail maildrop postfix diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 9af440e224bc..bae47d1aa5c0 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -24,14 +24,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS_IPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept FLAVORS= default ldap sasl -default_CONFLICTS_INSTALL= postfix-base-ldap-* postfix-base-sasl-* \ - postfix-ldap-* postfix-sasl-* +default_CONFLICTS_INSTALL= postfix-base-ldap postfix-base-sasl \ + postfix-ldap postfix-sasl ldap_PKGNAMESUFFIX= -ldap -ldap_CONFLICTS_INSTALL= postfix-[0-9]* postfix-base-[0-9]* \ - postfix-base-sasl-* postfix-sasl-* +ldap_CONFLICTS_INSTALL= postfix postfix-base \ + postfix-base-sasl postfix-sasl sasl_PKGNAMESUFFIX= -sasl -sasl_CONFLICTS_INSTALL= postfix-[0-9]* postfix-base-[0-9]* \ - postfix-base-ldap-* postfix-ldap-* +sasl_CONFLICTS_INSTALL= postfix postfix-base \ + postfix-base-ldap postfix-ldap COMMENT_ldap= (with OpenLDAP and Cyrus SASL support) COMMENT_sasl= (with Cyrus SASL support) @@ -44,8 +44,8 @@ SHEBANG_FILES= auxiliary/qshape/qshape.pl SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" -CONFLICTS_INSTALL= courier-0.* opensmtpd-[0-9]* opensmtpd-devel-* \ - postfix-current-* sendmail-[0-9]* sendmail-devel-* +CONFLICTS_INSTALL= courier-0.* opensmtpd opensmtpd-devel \ + postfix-current sendmail sendmail-devel PORTSCOUT= limit:^3\.6\. diff --git a/mail/rainloop-community/Makefile b/mail/rainloop-community/Makefile index b63791cfb2f9..a1683c8db382 100644 --- a/mail/rainloop-community/Makefile +++ b/mail/rainloop-community/Makefile @@ -6,7 +6,7 @@ COMMENT= Modern and interactive webmail - community edition LICENSE= AGPLv3 -CONFLICTS_INSTALL= rainloop-[0-9]* +CONFLICTS_INSTALL= rainloop MASTERDIR= ${.CURDIR}/../rainloop PLIST= ${.CURDIR}/pkg-plist diff --git a/math/gnubc/Makefile b/math/gnubc/Makefile index 791617458477..de28e17d79e2 100644 --- a/math/gnubc/Makefile +++ b/math/gnubc/Makefile @@ -32,7 +32,7 @@ PORTEXAMPLES= ckbook.b \ OPTIONS_DEFINE= EXAMPLES -CONFLICTS_INSTALL= gh-bc-[0-9]* +CONFLICTS_INSTALL= gh-bc post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/math/gnuplot-lite/Makefile b/math/gnuplot-lite/Makefile index f7ca4369f5e1..8a07337100cb 100644 --- a/math/gnuplot-lite/Makefile +++ b/math/gnuplot-lite/Makefile @@ -2,7 +2,7 @@ PKGNAMESUFFIX= -lite COMMENT= Command-line driven graphing utility (lite package) -CONFLICTS_INSTALL= gnuplot-[0-9]* +CONFLICTS_INSTALL= gnuplot LITE= yes MASTERDIR= ${.CURDIR}/../gnuplot diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile index b280e09a8b3e..f9af5dc030e3 100644 --- a/math/gnuplot/Makefile +++ b/math/gnuplot/Makefile @@ -12,7 +12,7 @@ LICENSE_NAME= Gnuplot license LICENSE_FILE= ${WRKSRC}/Copyright LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -CONFLICTS_INSTALL?= gnuplot-lite-[0-9]* +CONFLICTS_INSTALL?= gnuplot-lite USES+= compiler:c++11-lang cpe groff iconv pkgconfig readline CPE_VENDOR= gnuplot_project diff --git a/math/ogdf/Makefile b/math/ogdf/Makefile index bb5dbedd21d2..82e8ef0a26cf 100644 --- a/math/ogdf/Makefile +++ b/math/ogdf/Makefile @@ -14,7 +14,7 @@ LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE_GPL_v2.txt LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE_GPL_v3.txt -CONFLICTS_INSTALL= CoinMP-[0-9]* +CONFLICTS_INSTALL= CoinMP USES= cmake compiler:c++11-lang zip USE_LDCONFIG= yes diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 2d9c4925de6e..edf47cc0dba7 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -77,8 +77,8 @@ SUBSHELL_SUB_FILES= pkg-message X11_CONFIGURE_WITH= x X11_USES= xorg X11_USE= xorg=x11,xext -X11_VARS= CONFLICTS_INSTALL+="mc-nox11-[0-9]*" -X11_VARS_OFF= CONFLICTS_INSTALL+="mc-[0-9]*" +X11_VARS= CONFLICTS_INSTALL+="mc-nox11" +X11_VARS_OFF= CONFLICTS_INSTALL+="mc" post-patch: @${REINPLACE_CMD} -e 's|clang||' ${WRKSRC}/configure diff --git a/multimedia/libmtp/Makefile b/multimedia/libmtp/Makefile index e0b07132ae14..801afd544c7e 100644 --- a/multimedia/libmtp/Makefile +++ b/multimedia/libmtp/Makefile @@ -10,7 +10,7 @@ COMMENT= Media Transfer Protocol (MTP) library LICENSE= LGPL21+ -CONFLICTS_INSTALL=libosmo-sccp-[0-9]* # lib/libmtp.a +CONFLICTS_INSTALL=libosmo-sccp # lib/libmtp.a USES= cpe iconv libtool localbase pathfix pkgconfig GNU_CONFIGURE= yes diff --git a/net-mgmt/gnu-ipcalc/Makefile b/net-mgmt/gnu-ipcalc/Makefile index 89ae4cf4fc54..7fcd68b5c0d6 100644 --- a/net-mgmt/gnu-ipcalc/Makefile +++ b/net-mgmt/gnu-ipcalc/Makefile @@ -17,7 +17,7 @@ USE_GITLAB= yes GL_ACCOUNT= ipcalc GL_COMMIT= 8dfa28013234755ef3ce3e157b3940eeaaa2b7df -CONFLICTS_INSTALL= ipcalc-[0-9]* +CONFLICTS_INSTALL= ipcalc OPTIONS_DEFINE= DOCS MAXMINDDB OPTIONS_SUB= yes diff --git a/net-mgmt/ipcalc/Makefile b/net-mgmt/ipcalc/Makefile index 06ca21621b57..67fe47887313 100644 --- a/net-mgmt/ipcalc/Makefile +++ b/net-mgmt/ipcalc/Makefile @@ -12,7 +12,7 @@ COMMENT= IP Calculator LICENSE= GPLv2 -CONFLICTS_INSTALL= gnu-ipcalc-[0-9]* +CONFLICTS_INSTALL= gnu-ipcalc PLIST_FILES= bin/ipcalc NO_BUILD= yes diff --git a/net-p2p/namecoin-daemon/Makefile b/net-p2p/namecoin-daemon/Makefile index f5a067fbc918..9d40fef5ddd1 100644 --- a/net-p2p/namecoin-daemon/Makefile +++ b/net-p2p/namecoin-daemon/Makefile @@ -5,8 +5,8 @@ PKGNAMESUFFIX= -daemon COMMENT= Decentralized, open DNS and more (Daemon) SLAVE_PORT= yes -CONFLICTS_INSTALL= namecoin-stable-[0-9]* namecoin-stable-daemon-[0-9]* namecoin-stable-utils-[0-9]* \ - namecoin-beta-[0-9]* namecoin-beta-daemon-[0-9]* namecoin-beta-utils-[0-9]* +CONFLICTS_INSTALL= namecoin-stable namecoin-stable-daemon namecoin-stable-utils \ + namecoin-beta namecoin-beta-daemon namecoin-beta-utils OPTIONS_DEFINE= DEBUG HARDENING TESTS UPNP WALLET ZMQ OPTIONS_DEFAULT= HARDENING UPNP WALLET diff --git a/net-p2p/namecoin-utils/Makefile b/net-p2p/namecoin-utils/Makefile index 042fab12260e..85c2882500b4 100644 --- a/net-p2p/namecoin-utils/Makefile +++ b/net-p2p/namecoin-utils/Makefile @@ -5,8 +5,8 @@ PKGNAMESUFFIX= -utils COMMENT= Decentralized, open DNS and more (CLI and Utilities) SLAVE_PORT= yes -CONFLICTS_INSTALL= namecoin-stable-[0-9]* namecoin-stable-daemon-[0-9]* namecoin-stable-utils-[0-9]* \ - namecoin-beta-[0-9]* namecoin-beta-daemon-[0-9]* namecoin-beta-utils-[0-9]* +CONFLICTS_INSTALL= namecoin-stable namecoin-stable-daemon namecoin-stable-utils \ + namecoin-beta namecoin-beta-daemon namecoin-beta-utils OPTIONS_DEFINE= DEBUG HARDENING TESTS OPTIONS_DEFAULT= HARDENING TESTS diff --git a/net/exabgp4/Makefile b/net/exabgp4/Makefile index 36062d447510..2f85179851a6 100644 --- a/net/exabgp4/Makefile +++ b/net/exabgp4/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENCE.txt USES= python:3.6+ shebangfix USE_PYTHON= distutils autoplist -CONFLICTS_INSTALL= exabgp-[0-9]* +CONFLICTS_INSTALL= exabgp SUB_FILES= pkg-message SUB_LIST= PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \ diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index 3154b678cc59..0843de3e7be9 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -13,7 +13,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 062716b8fc66..593da6e2dc9f 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -18,7 +18,7 @@ default_CONFLICTS_INSTALL= haproxy-lua lua_CONFLICTS_INSTALL= haproxy lua_PKGNAMESUFFIX= -lua -CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile index 044b96a7ffab..572b736fb8a9 100644 --- a/net/haproxy17/Makefile +++ b/net/haproxy17/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi BROKEN_mips= fails to build: undefined reference to '__sync_sub_and_fetch_4' BROKEN_mips64= fails to build: undefined reference to '__sync_sub_and_fetch_4' -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy18 haproxy19 haproxy20 haproxy21 USES= cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy18/Makefile b/net/haproxy18/Makefile index 5d444f001797..9ab3f2da746e 100644 --- a/net/haproxy18/Makefile +++ b/net/haproxy18/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy19 haproxy20 haproxy21 USES= cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy19/Makefile b/net/haproxy19/Makefile index 67f22562acf6..9a4db6b9ad71 100644 --- a/net/haproxy19/Makefile +++ b/net/haproxy19/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy20/Makefile b/net/haproxy20/Makefile index 52d777683d83..b52296caabec 100644 --- a/net/haproxy20/Makefile +++ b/net/haproxy20/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy21/Makefile b/net/haproxy21/Makefile index bd43f64d3a25..0715da768e55 100644 --- a/net/haproxy21/Makefile +++ b/net/haproxy21/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy22/Makefile b/net/haproxy22/Makefile index 43b05a2f8bd6..b1141e2b6a79 100644 --- a/net/haproxy22/Makefile +++ b/net/haproxy22/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy23/Makefile b/net/haproxy23/Makefile index 2015b15d59e7..63664f63ab7c 100644 --- a/net/haproxy23/Makefile +++ b/net/haproxy23/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/libexosip2/Makefile b/net/libexosip2/Makefile index a1b6e3f2a0f4..dc31add9783f 100644 --- a/net/libexosip2/Makefile +++ b/net/libexosip2/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libosip2.so:net/libosip2 USES= libtool ssl USE_LDCONFIG= yes -CONFLICTS_INSTALL= libeXosip2-legacy-[0-9]* +CONFLICTS_INSTALL= libeXosip2-legacy GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile index 86b13a385959..01caeb9dd749 100644 --- a/net/p5-SOAP-Lite/Makefile +++ b/net/p5-SOAP-Lite/Makefile @@ -28,7 +28,7 @@ TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject \ p5-Test-Warn>=0:devel/p5-Test-Warn \ p5-Test-XML>=0:devel/p5-Test-XML -CONFLICTS_INSTALL= p5-SOAP-Lite-0.60* p5-SOAP-[0-9]* +CONFLICTS_INSTALL= p5-SOAP-Lite-0.60* p5-SOAP CONFIGURE_ARGS= --noprompt INSTALL_TARGET= pure_install diff --git a/net/py-pysendfile/Makefile b/net/py-pysendfile/Makefile index 0414902c7f53..846cbcccd6a5 100644 --- a/net/py-pysendfile/Makefile +++ b/net/py-pysendfile/Makefile @@ -13,7 +13,7 @@ COMMENT= Python interface to sendfile(2) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= py*-sendfile-[0-9]* +CONFLICTS_INSTALL= py*-sendfile USES= python:3.6+ USE_PYTHON= distutils autoplist diff --git a/net/tshark-lite/Makefile b/net/tshark-lite/Makefile index a67ad4d8ebe4..ad48443d9b68 100644 --- a/net/tshark-lite/Makefile +++ b/net/tshark-lite/Makefile @@ -2,7 +2,7 @@ LITE= yes -CONFLICTS_INSTALL?= tshark-[0-9]* wireshark-[0-9]* wireshark-lite-[0-9]* +CONFLICTS_INSTALL?= tshark wireshark wireshark-lite MASTERDIR= ${.CURDIR}/../tshark COMMENT= Powerful network analyzer/capture tool (lite package) diff --git a/net/tshark/Makefile b/net/tshark/Makefile index dfa8f2437aff..0d32e3be44b3 100644 --- a/net/tshark/Makefile +++ b/net/tshark/Makefile @@ -2,7 +2,7 @@ PORTNAME= tshark -CONFLICTS_INSTALL?= tshark-lite-[0-9]* wireshark-lite-[0-9]* wireshark-[0-9]* +CONFLICTS_INSTALL?= tshark-lite wireshark-lite wireshark MASTERDIR= ${.CURDIR}/../wireshark diff --git a/net/wireshark-lite/Makefile b/net/wireshark-lite/Makefile index 4d2f76d29b6a..65becb93b434 100644 --- a/net/wireshark-lite/Makefile +++ b/net/wireshark-lite/Makefile @@ -2,7 +2,7 @@ LITE= yes -CONFLICTS_INSTALL?= wireshark-[0-9]* tshark-[0-9]* tshark-lite-[0-9]* +CONFLICTS_INSTALL?= wireshark tshark tshark-lite MASTERDIR= ${.CURDIR}/../wireshark COMMENT= Powerful network analyzer/capture tool (lite package) diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 7afe05b110d1..9a78160ce281 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -20,7 +20,7 @@ COMMENT?= Powerful network analyzer/capture tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL?= wireshark-lite-[0-9]* tshark-[0-9]* tshark-lite-[0-9]* +CONFLICTS_INSTALL?= wireshark-lite tshark tshark-lite DATADIR_NAME= wireshark DATADIR= ${PREFIX}/share/${DATADIR_NAME} diff --git a/news/slrn/Makefile b/news/slrn/Makefile index 252c7321cac9..90477d8e9713 100644 --- a/news/slrn/Makefile +++ b/news/slrn/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LIB_DEPENDS= libslang.so:devel/libslang2 -CONFLICTS_INSTALL= ja-slrn-[0-9]* +CONFLICTS_INSTALL= ja-slrn USES= gmake iconv tar:bz2 diff --git a/news/trn4/Makefile b/news/trn4/Makefile index 6a18a74af703..d6e0e2384328 100644 --- a/news/trn4/Makefile +++ b/news/trn4/Makefile @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-test/} MAINTAINER= ports@FreeBSD.org COMMENT= Version 4.0 of the threaded readnews newsreader -CONFLICTS_INSTALL=trn-3.[0-9]* cnews-* s-news-[0-9]* +CONFLICTS_INSTALL=trn-3.[0-9]* cnews s-news USES= ncurses diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index d6c6f6cfdcbc..5dfcbf401585 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -15,7 +15,7 @@ COMMENT= FreeBSD ports/packages management tool (devel version) LICENSE= BSD3CLAUSE -CONFLICTS_INSTALL= portupgrade-[0-9]* +CONFLICTS_INSTALL= portupgrade USES= uidfix diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index bb04a983810d..eaac39c045d4 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -12,7 +12,7 @@ COMMENT= Port build and test system LICENSE= BSD2CLAUSE -CONFLICTS_INSTALL= poudriere-[0-9]* +CONFLICTS_INSTALL= poudriere USE_GITHUB= yes GH_ACCOUNT= freebsd diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 215a512ad71c..a4e9f79a0eca 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -11,7 +11,7 @@ COMMENT= Port build and test system LICENSE= BSD2CLAUSE -CONFLICTS_INSTALL= poudriere-devel-[0-9]* +CONFLICTS_INSTALL= poudriere-devel USE_GITHUB= yes GH_ACCOUNT= freebsd diff --git a/print/ghostscript7-base/Makefile b/print/ghostscript7-base/Makefile index 03135a0b3e9a..bbae9441a3ab 100644 --- a/print/ghostscript7-base/Makefile +++ b/print/ghostscript7-base/Makefile @@ -20,11 +20,11 @@ LIB_DEPENDS= libpng.so:graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:print/gsfonts CONFLICTS_INSTALL= \ - gambc-[0-9]* \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + gambc \ + ghostscript[789] \ + ghostscript[789]-nox11 \ + ghostscript9-agpl \ + ghostscript9-agpl-nox11 USES= autoreconf cpe gmake jpeg shebangfix tar:bzip2 USE_LDCONFIG= yes diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile index a07997e7b914..af2083bba1b7 100644 --- a/print/ghostscript7-commfont/Makefile +++ b/print/ghostscript7-commfont/Makefile @@ -23,10 +23,10 @@ USES= ghostscript:7,run NO_ARCH= yes CONFLICTS_INSTALL= \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + ghostscript[789] \ + ghostscript[789]-nox11 \ + ghostscript9-agpl \ + ghostscript9-agpl-nox11 CMAPDIR?= ${LOCALBASE}/share/fonts/adobe-cmaps GS_RESDIR?= share/ghostscript/Resource diff --git a/print/ghostscript7-x11/Makefile b/print/ghostscript7-x11/Makefile index 3e5866ff40bc..8b0e59fe1688 100644 --- a/print/ghostscript7-x11/Makefile +++ b/print/ghostscript7-x11/Makefile @@ -14,11 +14,11 @@ COMMENT= Ghostscript 7.x PostScript interpreter, X11 support LICENSE= GPLv2 CONFLICTS_INSTALL= \ - gambc-[0-9]* \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + gambc \ + ghostscript[789] \ + ghostscript[789]-nox11 \ + ghostscript9-agpl \ + ghostscript9-agpl-nox11 USES= autoreconf cpe ghostscript:7 gmake tar:bzip2 xorg USE_LDCONFIG= yes diff --git a/print/ghostscript8-base/Makefile b/print/ghostscript8-base/Makefile index a86a7bf4220a..a9760c0792ff 100644 --- a/print/ghostscript8-base/Makefile +++ b/print/ghostscript8-base/Makefile @@ -27,11 +27,11 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:print/gsfonts CONFLICTS_INSTALL= \ - gambc-[0-9]* \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + gambc \ + ghostscript[789] \ + ghostscript[789]-nox11 \ + ghostscript9-agpl \ + ghostscript9-agpl-nox11 USES= autoreconf cpe gmake pkgconfig shebangfix tar:xz USE_LDCONFIG= yes diff --git a/print/ghostscript8-x11/Makefile b/print/ghostscript8-x11/Makefile index 946858fc294f..4a84ea36b066 100644 --- a/print/ghostscript8-x11/Makefile +++ b/print/ghostscript8-x11/Makefile @@ -16,11 +16,11 @@ COMMENT= Ghostscript 8.x PostScript interpreter, X11 support LICENSE= GPLv3 CONFLICTS_INSTALL= \ - gambc-[0-9]* \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + gambc \ + ghostscript[789] \ + ghostscript[789]-nox11 \ + ghostscript9-agpl \ + ghostscript9-agpl-nox11 USES= autoreconf cpe ghostscript:8 gmake tar:xz xorg USE_LDCONFIG= yes diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile index a7498f6e6efb..380836ce33aa 100644 --- a/print/ghostscript9-agpl-base/Makefile +++ b/print/ghostscript9-agpl-base/Makefile @@ -26,10 +26,10 @@ USE_CSTD= gnu99 USE_LDCONFIG= yes CONFLICTS_INSTALL= \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + ghostscript[789] \ + ghostscript[789]-nox11 \ + ghostscript9-agpl \ + ghostscript9-agpl-nox11 CPE_VENDOR= artifex DATADIR= ${PREFIX}/share/${PORTNAME}/${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} diff --git a/print/ghostscript9-agpl-x11/Makefile b/print/ghostscript9-agpl-x11/Makefile index c5a94765d3cb..fde69930e076 100644 --- a/print/ghostscript9-agpl-x11/Makefile +++ b/print/ghostscript9-agpl-x11/Makefile @@ -26,10 +26,10 @@ USE_LDCONFIG= yes USE_XORG= ice sm x11 xext xt CONFLICTS_INSTALL= \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + ghostscript[789] \ + ghostscript[789]-nox11 \ + ghostscript9-agpl \ + ghostscript9-agpl-nox11 DISTINFO_FILE= ${.CURDIR:H}/ghostscript9-agpl-base/distinfo PATCHDIR= ${.CURDIR:H}/ghostscript9-agpl-base/files CPE_VENDOR= artifex diff --git a/print/ghostscript9-base/Makefile b/print/ghostscript9-base/Makefile index 633d97f60077..01995907c24e 100644 --- a/print/ghostscript9-base/Makefile +++ b/print/ghostscript9-base/Makefile @@ -26,11 +26,11 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:print/gsfonts CONFLICTS_INSTALL= \ - gambc-[0-9]* \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + gambc \ + ghostscript[789] \ + ghostscript[789]-nox11 \ + ghostscript9-agpl \ + ghostscript9-agpl-nox11 USES= autoreconf cpe gmake jpeg pkgconfig:build tar:bzip2 USE_LDCONFIG= yes diff --git a/print/ghostscript9-x11/Makefile b/print/ghostscript9-x11/Makefile index 6d852433f626..457d9f84472d 100644 --- a/print/ghostscript9-x11/Makefile +++ b/print/ghostscript9-x11/Makefile @@ -13,11 +13,11 @@ COMMENT= Ghostscript 9.x PostScript interpreter, X11 support LICENSE= GPLv3 CONFLICTS_INSTALL= \ - gambc-[0-9]* \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + gambc \ + ghostscript[789] \ + ghostscript[789]-nox11 \ + ghostscript9-agpl \ + ghostscript9-agpl-nox11 USES= autoreconf cpe ghostscript:9 gmake tar:bzip2 xorg USE_LDCONFIG= yes diff --git a/print/hplip/Makefile b/print/hplip/Makefile index c73aa794ad8b..bf10726c30d1 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= cups-filters>=0:print/cups-filters \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} -CONFLICTS_INSTALL= hpijs-[0-9]* +CONFLICTS_INSTALL= hpijs INSTALL_TARGET= install-strip USES= dos2unix jpeg libtool pkgconfig python:3.6+ shebangfix diff --git a/print/papersize-default-a4/Makefile b/print/papersize-default-a4/Makefile index aa66c19f4ae1..80afca514be6 100644 --- a/print/papersize-default-a4/Makefile +++ b/print/papersize-default-a4/Makefile @@ -18,7 +18,7 @@ NO_BUILD= yes DEFAULTPAPERSIZE?= a4 .for P in a4 letter .if ${DEFAULTPAPERSIZE:tl:M${P}} != ${P} -CONFLICTS_INSTALL+= papersize-default-${P}-[0-9]* +CONFLICTS_INSTALL+= papersize-default-${P} .endif .endfor diff --git a/print/tex-xdvik/Makefile b/print/tex-xdvik/Makefile index 670b08f96ad1..1bfbbc7414d2 100644 --- a/print/tex-xdvik/Makefile +++ b/print/tex-xdvik/Makefile @@ -42,8 +42,7 @@ CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" CFLAGS+= -I${LOCALBASE}/include -DHAVE_LIBPAPER -g -O0 PLIST_SUB= TEXMFDISTDIR=${TEXMFDISTDIR} -CONFLICTS_INSTALL= xdvi-[0-9]* xdvi-*-[0-9]* *-xdvi-[0-9]* \ - xdvik-[0-9]* ja-xdvik-*-[0-9]* +CONFLICTS_INSTALL= xdvi xdvi-* *-xdvi xdvik ja-xdvik PORTDOCS= BUGS CHANGES INSTALL README README.CVS README.coding \ README.config README.cross README.distro README.hacking \ diff --git a/print/typetools/Makefile b/print/typetools/Makefile index 8dd9e28c5eb8..fcca8d264030 100644 --- a/print/typetools/Makefile +++ b/print/typetools/Makefile @@ -18,6 +18,6 @@ CONFIGURE_ARGS= --with-kpathsea=${LOCALBASE} DATADIR= ${PREFIX}/share/lcdf-${PORTNAME} -CONFLICTS_INSTALL= texlive-base-[0-9]* +CONFLICTS_INSTALL= texlive-base .include <bsd.port.mk> diff --git a/security/bsmtrace3/Makefile b/security/bsmtrace3/Makefile index 27ec38bedf79..9ef05d18d3fa 100644 --- a/security/bsmtrace3/Makefile +++ b/security/bsmtrace3/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libpcre.so:devel/pcre -CONFLICTS_INSTALL= bsmtrace-[0-9]* +CONFLICTS_INSTALL= bsmtrace USE_GITHUB= yes GH_ACCOUNT= openbsm diff --git a/security/clamav-lts/Makefile b/security/clamav-lts/Makefile index 2d9c79ea6a36..968e3f83b826 100644 --- a/security/clamav-lts/Makefile +++ b/security/clamav-lts/Makefile @@ -35,7 +35,7 @@ CFLAGS_i386= -march=i486 # force to use -lthr until it's not fixed. LDFLAGS+= -lthr -CONFLICTS_INSTALL= clamav-[0-9]* +CONFLICTS_INSTALL= clamav SUB_FILES= pkg-deinstall SUB_LIST+= CHMOD=${CHMOD} \ diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 1ba7ad8b2daf..83841129e985 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -25,7 +25,7 @@ CMAKE_ON= ENABLE_EXTERNAL_MSPACK TEST_TARGET= check -CONFLICTS_INSTALL= clamav-[0-9]* +CONFLICTS_INSTALL= clamav-lts SUB_FILES= pkg-message SUB_LIST+= CHMOD=${CHMOD} \ diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index f93262c3cd7a..b88b9c8d7eba 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -26,10 +26,8 @@ LIBTLS_DESC= Only install libtls (no libcrypto/libssl) MAN3_DESC= Install API manpages (section 3) NC_DESC= Install TLS-enabled netcat -CONFLICTS_INSTALL= libressl-[0-9]* \ - libretls-[0-9]* -default_CONFLICTS_INSTALL= openssl-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl libretls +default_CONFLICTS_INSTALL= openssl openssl-devel .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/libressl/Makefile b/security/libressl/Makefile index f7b96ea29085..4906e5d40014 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -25,10 +25,9 @@ LIBTLS_DESC= Only install libtls (no libcrypto/libssl) MAN3_DESC= Install API manpages (section 3) NC_DESC= Install TLS-enabled netcat -CONFLICTS_INSTALL= libressl-devel-libtls-[0-9]* -libtls_CONFLICTS_INSTALL= libretls-[0-9]* -default_CONFLICTS_INSTALL= openssl-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl-devel-libtls +libtls_CONFLICTS_INSTALL= libretls +default_CONFLICTS_INSTALL= openssl openssl-devel .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/mbedtls/Makefile b/security/mbedtls/Makefile index b3db9e786cce..f50634a5cbed 100644 --- a/security/mbedtls/Makefile +++ b/security/mbedtls/Makefile @@ -18,7 +18,7 @@ MAKE_ENV= SHARED=1 USES= gmake tar:tgz USE_LDCONFIG= yes -CONFLICTS_INSTALL= polarssl13-[0-9]* +CONFLICTS_INSTALL= polarssl13 post-patch: @${RM} ${WRKSRC}/include/mbedtls/*.orig diff --git a/security/openiked-portable/Makefile b/security/openiked-portable/Makefile index 367468a2ddb7..0f97938ac29b 100644 --- a/security/openiked-portable/Makefile +++ b/security/openiked-portable/Makefile @@ -11,7 +11,7 @@ LICENSE= ISCL LIB_DEPENDS= libevent.so:devel/libevent -CONFLICTS_INSTALL= openiked-[0-9]* +CONFLICTS_INSTALL= openiked USES= cmake ssl USE_RC_SUBR= iked diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 804d8eb735c2..a4fa55c20589 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -14,9 +14,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= libressl-[0-9]* \ - libressl-devel-[0-9]* \ - openssl-[0-9]* +CONFLICTS_INSTALL= libressl libressl-devel openssl HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index ca4fdb537716..32bb4d0f040d 100644 --- a/security/openssl-quictls/Makefile +++ b/security/openssl-quictls/Makefile @@ -11,10 +11,7 @@ COMMENT= QUIC capable fork of OpenSSL LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= libressl-[0-9]* \ - libressl-devel-[0-9]* \ - openssl-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl libressl-devel openssl openssl-devel BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 630a02c963ef..93fb54f8b5bc 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -14,9 +14,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= libressl-[0-9]* \ - libressl-devel-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl libressl-devel openssl-devel HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index acb8539bca05..a118648f9e33 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -41,8 +41,8 @@ CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} CPPFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include -DCONFIGURE_GIT_REVISION='\"${GL_COMMIT}\"' -DCONFIGURE_GIT_FLAGS= LDFLAGS+= -L${LOCALBASE}/lib -CONFLICTS_INSTALL?= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* \ - openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]* +CONFLICTS_INSTALL?= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta \ + openvpn-devel openvpn-mbedtls SUB_FILES= openvpn-client pkg-message diff --git a/security/openvpn-mbedtls/Makefile b/security/openvpn-mbedtls/Makefile index dab8f9ea7385..381fa31933a2 100644 --- a/security/openvpn-mbedtls/Makefile +++ b/security/openvpn-mbedtls/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= -mbedtls COMMENT= Secure IP/Ethernet tunnel daemon, mbedTLS-based build -CONFLICTS_INSTALL= openvpn-[0-9].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* +CONFLICTS_INSTALL= openvpn openvpn-beta openvpn-devel OPTIONS_EXCLUDE= OPENSSL PKCS11 X509ALTUSERNAME OPTIONS_SLAVE= MBEDTLS diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 0c571b012fd6..fd1e39226ae9 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --enable-strict # set PLUGIN_LIBDIR so that unqualified plugin paths are found: CONFIGURE_ENV+= PLUGINDIR="${PREFIX}/lib/openvpn/plugins" -CONFLICTS_INSTALL?= openvpn-2.[!5].* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]* +CONFLICTS_INSTALL?= openvpn-2.[!5].* openvpn-devel openvpn-mbedtls SUB_FILES= pkg-message openvpn-client diff --git a/security/putty-gtk2/Makefile b/security/putty-gtk2/Makefile index 746a40c5ba9e..b608ba950027 100644 --- a/security/putty-gtk2/Makefile +++ b/security/putty-gtk2/Makefile @@ -8,7 +8,7 @@ EXPIRATION_DATE= 2021-12-15 OPTIONS_SLAVE= GTK2 OPTIONS_EXCLUDE= GTK3 -CONFLICTS_INSTALL= pssh-[0-9]* putty-[0-9]* putty-nogtk-[0-9]* +CONFLICTS_INSTALL= pssh putty putty-nogtk MASTERDIR= ${.CURDIR}/../../security/putty diff --git a/security/putty-nogtk/Makefile b/security/putty-nogtk/Makefile index 0f348a9ebf82..9ddb579bcfdb 100644 --- a/security/putty-nogtk/Makefile +++ b/security/putty-nogtk/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= -nogtk OPTIONS_EXCLUDE= GTK2 GTK3 -CONFLICTS_INSTALL= pssh-[0-9]* putty-[0-9]* putty-gtk2-[0-9]* +CONFLICTS_INSTALL= pssh putty putty-gtk2 MASTERDIR= ${.CURDIR}/../../security/putty diff --git a/security/putty/Makefile b/security/putty/Makefile index 6f9b7a6367e8..01e847854e31 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -16,7 +16,7 @@ USES= cpe gmake pkgconfig MAKEFILE= Makefile.gtk MAKE_ARGS+= "prefix=${PREFIX}" -CONFLICTS_INSTALL?= pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]* +CONFLICTS_INSTALL?= pssh putty-gtk2 putty-nogtk PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME}/unix diff --git a/security/sig2dot/Makefile b/security/sig2dot/Makefile index cf0442f5eb9d..ba3f33fd18d3 100644 --- a/security/sig2dot/Makefile +++ b/security/sig2dot/Makefile @@ -10,7 +10,7 @@ EXTRACT_SUFX= .pl MAINTAINER= ports@FreeBSD.org COMMENT= GPG/PGP Keyring Graph Generator -CONFLICTS_INSTALL=signing-party-[0-9]* +CONFLICTS_INSTALL=signing-party PLIST_FILES= bin/sig2dot EXTRACT_CMD= ${CP} diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile index bef06bdebd3c..74aee71b3608 100644 --- a/security/signing-party/Makefile +++ b/security/signing-party/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= gpg:security/gnupg \ USES= perl5 python gmake shebangfix SHEBANG_FILES= ${SCRIPTS} BINARY_ALIAS= sed=gsed -CONFLICTS_INSTALL=sig2dot-[0-9]* springgraph-[0-9]* +CONFLICTS_INSTALL=sig2dot springgraph USE_GITLAB= yes GL_SITE= https://salsa.debian.org/ diff --git a/sysutils/beadm-devel/Makefile b/sysutils/beadm-devel/Makefile index db47dc5d0d56..28c70dc05f93 100644 --- a/sysutils/beadm-devel/Makefile +++ b/sysutils/beadm-devel/Makefile @@ -19,7 +19,7 @@ GH_TAGNAME= 2665f52786a12aadbe8984731b8a64d1249692f4 NO_BUILD= YES -CONFLICTS_INSTALL= beadm-[0-9]* +CONFLICTS_INSTALL= beadm PLIST_FILES= sbin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz diff --git a/sysutils/cronolog/Makefile b/sysutils/cronolog/Makefile index d032482303a4..d1a3dfe55b98 100644 --- a/sysutils/cronolog/Makefile +++ b/sysutils/cronolog/Makefile @@ -11,7 +11,7 @@ COMMENT= Web log rotation utility that provides datestamp filenames LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL= cronolog-devel-[0-9]* +CONFLICTS_INSTALL= cronolog-devel INFO= cronolog GNU_CONFIGURE= yes diff --git a/sysutils/fswatch-mon/Makefile b/sysutils/fswatch-mon/Makefile index f4b43a051d25..09c8a06f7fa5 100644 --- a/sysutils/fswatch-mon/Makefile +++ b/sysutils/fswatch-mon/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lang libtool makeinfo USE_LDCONFIG= yes -CONFLICTS_INSTALL= fswatch-[0-9]* +CONFLICTS_INSTALL= fswatch GNU_CONFIGURE= yes INFO= fswatch INSTALL_TARGET= install-strip diff --git a/sysutils/gather/Makefile b/sysutils/gather/Makefile index 43f2c65689ed..4228a2fad237 100644 --- a/sysutils/gather/Makefile +++ b/sysutils/gather/Makefile @@ -14,7 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= trociny -CONFLICTS_INSTALL= harvest-[0-9]* +CONFLICTS_INSTALL= harvest DATADIR= /var/db/gather MAKE_ENV+= CONFDIR=${PREFIX}/etc/gather DATADIR=${DATADIR} diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile index f6e5cec347cb..70e25f40aa6e 100644 --- a/sysutils/torque/Makefile +++ b/sysutils/torque/Makefile @@ -25,7 +25,7 @@ USE_LDCONFIG= yes INSTALL_TARGET= install-strip CFLAGS+= -D_WANT_VMMETER -CONFLICTS_INSTALL= qstat-[0-9]* zh-qterm-[0-9]* +CONFLICTS_INSTALL= qstat zh-qterm OPTIONS_DEFINE= EXAMPLES diff --git a/sysutils/zfs-stats-lite/Makefile b/sysutils/zfs-stats-lite/Makefile index 4209f3526fa9..9c9e43baca46 100644 --- a/sysutils/zfs-stats-lite/Makefile +++ b/sysutils/zfs-stats-lite/Makefile @@ -10,7 +10,7 @@ COMMENT= Display human-readable ZFS statistics LICENSE= BSD2CLAUSE -CONFLICTS_INSTALL= zfs-stats-[0-9]* +CONFLICTS_INSTALL= zfs-stats NO_BUILD= yes NO_ARCH= yes diff --git a/textproc/grap/Makefile b/textproc/grap/Makefile index d4133f51416b..534b875d0766 100644 --- a/textproc/grap/Makefile +++ b/textproc/grap/Makefile @@ -13,7 +13,7 @@ CONFIGURE_ARGS=--with-freebsd-ports OPTIONS_DEFINE= DOCS EXAMPLES -CONFLICTS_INSTALL=heirloom-doctools-[0-9]* +CONFLICTS_INSTALL=heirloom-doctools PORTDOCS= README CHANGES COPYRIGHT grap.man PORTEXAMPLES= * diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile index ff78521ec2e9..3d02d15e6c94 100644 --- a/textproc/hunspell/Makefile +++ b/textproc/hunspell/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE_GPLv2+ = ${_LICENSE_STORE}/GPLv2 LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 LICENSE_FILE_MPL11= ${WRKSRC}/COPYING.MPL -CONFLICTS_INSTALL= tinker-[0-9]* +CONFLICTS_INSTALL= tinker CONFIGURE_ARGS= --disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui GNU_CONFIGURE= yes USES= autoreconf compiler:c++11-lib cpe libtool:keepla pathfix \ diff --git a/textproc/p5-RTF-Parser/Makefile b/textproc/p5-RTF-Parser/Makefile index 4b56dcdfea3c..0a28edb83ff6 100644 --- a/textproc/p5-RTF-Parser/Makefile +++ b/textproc/p5-RTF-Parser/Makefile @@ -16,7 +16,7 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-RTF-Tokenizer>=1.16:textproc/p5-RTF-Tokenizer -CONFLICTS_INSTALL= rtf2html-[0-9]* +CONFLICTS_INSTALL= rtf2html USES= perl5 USE_PERL5= configure diff --git a/textproc/p5-ack/Makefile b/textproc/p5-ack/Makefile index b9c867e365c4..95bc59dd517f 100644 --- a/textproc/p5-ack/Makefile +++ b/textproc/p5-ack/Makefile @@ -24,7 +24,7 @@ USE_PERL5= configure NO_ARCH= yes -CONFLICTS_INSTALL= ja-ack-[0-9]* +CONFLICTS_INSTALL= ja-ack CPE_VENDOR= beyondgrep diff --git a/textproc/rtf2html/Makefile b/textproc/rtf2html/Makefile index 1a5d91aa3722..7c474bc863d0 100644 --- a/textproc/rtf2html/Makefile +++ b/textproc/rtf2html/Makefile @@ -11,7 +11,7 @@ COMMENT= Simple rtf2html converter LICENSE= BSD2CLAUSE -CONFLICTS_INSTALL= p5-RTF-Parser-[0-9]* +CONFLICTS_INSTALL= p5-RTF-Parser PLIST_FILES= bin/rtf2html diff --git a/www/calamaris-devel/Makefile b/www/calamaris-devel/Makefile index 7aa4fff3eb64..942b21a98949 100644 --- a/www/calamaris-devel/Makefile +++ b/www/calamaris-devel/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 RUN_DEPENDS= p5-GD-Graph>=0:graphics/p5-GD-Graph \ p5-NetAddr-IP>=0:net-mgmt/p5-NetAddr-IP -CONFLICTS_INSTALL= calamaris-[0-9]* +CONFLICTS_INSTALL= calamaris USES= shebangfix perl5 NO_BUILD= yes diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile index ec24daa77ee0..cacf0bfb9bf8 100644 --- a/www/calamaris/Makefile +++ b/www/calamaris/Makefile @@ -11,7 +11,7 @@ COMMENT= Perl script to produce statistics out of Squid log files LICENSE= GPLv2 -CONFLICTS_INSTALL= calamaris-devel-[0-9]* +CONFLICTS_INSTALL= calamaris-devel USES= shebangfix perl5 NO_BUILD= yes diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index 7e9746b5245f..1ed1904be37d 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support -CONFLICTS_INSTALL= lynx-2.8* ja-lynx-[0-9]* +CONFLICTS_INSTALL= lynx-2.8* ja-lynx USES= cpe iconv ncurses shebangfix tar:bzip2 WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/www/node/Makefile b/www/node/Makefile index 519a5f3bcaf6..e5d93bca19da 100644 --- a/www/node/Makefile +++ b/www/node/Makefile @@ -46,7 +46,7 @@ DTRACE_CONFIGURE_ON= --with-dtrace HAS_CONFIGURE= yes -CONFLICTS_INSTALL= node10-[0-9]* node14-[0-9]* node16-[0-9]* +CONFLICTS_INSTALL= node10 node14 node16 CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ diff --git a/www/node10/Makefile b/www/node10/Makefile index c2d4e595b7d4..60079f0c8452 100644 --- a/www/node10/Makefile +++ b/www/node10/Makefile @@ -50,7 +50,7 @@ DTRACE_CONFIGURE_ON= --with-dtrace HAS_CONFIGURE= yes -CONFLICTS_INSTALL= node14-[0-9]* node16-[0-9]* node-[0-9]* +CONFLICTS_INSTALL= node14 node16 node CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ diff --git a/www/node14/Makefile b/www/node14/Makefile index 3b6274d6aa5a..d3f472a0d42d 100644 --- a/www/node14/Makefile +++ b/www/node14/Makefile @@ -48,7 +48,7 @@ DTRACE_CONFIGURE_ON= --with-dtrace HAS_CONFIGURE= yes -CONFLICTS_INSTALL= node10-[0-9]* node16-[0-9]* node-[0-9]* +CONFLICTS_INSTALL= node10 node16 node CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ diff --git a/www/node16/Makefile b/www/node16/Makefile index 82cc00f19a0a..4525a0a414d4 100644 --- a/www/node16/Makefile +++ b/www/node16/Makefile @@ -47,7 +47,7 @@ DTRACE_CONFIGURE_ON= --with-dtrace HAS_CONFIGURE= yes -CONFLICTS_INSTALL= node10-[0-9]* node14-[0-9]* node-[0-9]* +CONFLICTS_INSTALL= node10 node14 node CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ diff --git a/www/rt44/Makefile b/www/rt44/Makefile index 0d89aa6256a0..621dbc843590 100644 --- a/www/rt44/Makefile +++ b/www/rt44/Makefile @@ -10,7 +10,7 @@ COMMENT= Industrial-grade ticketing system written in Perl LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL= rt42-4.2* brlcad-[0-9]* +CONFLICTS_INSTALL= rt42-4.2* brlcad NO_ARCH= yes diff --git a/www/rt50/Makefile b/www/rt50/Makefile index 205b56de8b62..3b56421ba535 100644 --- a/www/rt50/Makefile +++ b/www/rt50/Makefile @@ -10,7 +10,7 @@ COMMENT= Industrial-grade ticketing system written in Perl LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL= rt42-4.2* rt44-4.4* brlcad-[0-9]* +CONFLICTS_INSTALL= rt42-4.2* rt44-4.4* brlcad NO_ARCH= yes diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index eefb5383e8d3..49647e21f247 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ libxcb-xrm.so:x11/xcb-util-xrm \ libxkbcommon.so:x11/libxkbcommon -CONFLICTS_INSTALL= awesome3-[0-9]* +CONFLICTS_INSTALL= awesome3 USES= cmake compiler:c11 gettext gnome iconv pkgconfig lua \ shebangfix xorg diff --git a/x11/i3lock-color/Makefile b/x11/i3lock-color/Makefile index 7c53a4b23985..0afb89ae868e 100644 --- a/x11/i3lock-color/Makefile +++ b/x11/i3lock-color/Makefile @@ -36,7 +36,7 @@ MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \ LDFLAGS+= ${ICONV_LIB} -CONFLICTS_INSTALL= i3lock-[0-9]* +CONFLICTS_INSTALL= i3lock BUILD_WRKSRC= ${WRKSRC}/${CONFIGURE_TARGET} INSTALL_WRKSRC= ${WRKSRC}/${CONFIGURE_TARGET} diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile index 1e2d04d414ec..6d56abea2cde 100644 --- a/x11/i3lock/Makefile +++ b/x11/i3lock/Makefile @@ -33,7 +33,7 @@ USE_XORG= x11 xcb xt xorgproto xext USE_CSTD= c99 GNU_CONFIGURE= yes -CONFLICTS_INSTALL= i3lock-color-[0-9]* +CONFLICTS_INSTALL= i3lock-color BUILD_WRKSRC= ${WRKSRC}/${CONFIGURE_TARGET} INSTALL_WRKSRC= ${WRKSRC}/${CONFIGURE_TARGET} diff --git a/x11/xsel-conrad/Makefile b/x11/xsel-conrad/Makefile index 1928835caac6..33bd7864058a 100644 --- a/x11/xsel-conrad/Makefile +++ b/x11/xsel-conrad/Makefile @@ -16,7 +16,7 @@ LICENSE_NAME= xsel-conrad license LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS_INSTALL= xsel-[0-9]* +CONFLICTS_INSTALL= xsel USES= autoreconf localbase xorg USE_XORG= x11 xt |