Date: Tue, 23 Nov 2021 22:12:44 GMT From: =?utf-8?Q?Stefan E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5933ac0b099d - main - */*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL Message-ID: <202111232212.1ANMCiZX056938@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=5933ac0b099d61d98eb531d373cf57a8927bc7af commit 5933ac0b099d61d98eb531d373cf57a8927bc7af Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2021-11-23 22:11:40 +0000 Commit: Stefan Eßer <se@FreeBSD.org> CommitDate: 2021-11-23 22:11:40 +0000 */*: 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) --- audio/optimfrog-sse2/Makefile | 2 +- audio/optimfrog/Makefile | 2 +- audio/timidity++/Makefile | 2 +- comms/conserver-com/Makefile | 2 +- databases/p5-DBD-mysql/Makefile | 2 +- deskutils/xpad/Makefile | 2 +- deskutils/xpad3/Makefile | 2 +- devel/ccache-memcached-static/Makefile | 2 +- devel/ccache-memcached/Makefile | 2 +- devel/ccache-static/Makefile | 2 +- devel/ccache/Makefile | 2 +- devel/hwloc2/Makefile | 2 +- devel/kBuild/Makefile | 2 +- devel/kdesvn/Makefile | 2 +- devel/physfs/Makefile | 2 +- devel/py-boto/Makefile | 2 +- devel/rubygem-svn2git/Makefile | 2 +- devel/yasm-devel/Makefile | 2 +- dns/mDNSResponder_nss/Makefile | 2 +- dns/nss_mdns/Makefile | 2 +- editors/linux-sublime/Makefile | 2 +- editors/nvi2/Makefile | 2 +- editors/vile/Makefile | 2 +- editors/xvile/Makefile | 2 +- emulators/qemu-user-static-devel/Makefile | 2 +- emulators/qemu-user-static/Makefile | 2 +- emulators/qemu-utils/Makefile | 2 +- emulators/virtualbox-ose-additions-legacy/Makefile | 16 ++++++------ emulators/virtualbox-ose-additions/Makefile | 18 ++++++------- emulators/virtualbox-ose-legacy/Makefile | 10 ++++---- emulators/virtualbox-ose/Makefile | 10 ++++---- emulators/wine-devel/Makefile | 2 +- emulators/wine-gecko-devel/Makefile | 2 +- emulators/wine-gecko/Makefile | 2 +- emulators/wine-mono-devel/Makefile | 2 +- emulators/wine-mono/Makefile | 2 +- emulators/wine/Makefile | 5 ++-- games/aisleriot/Makefile | 2 +- games/linux-ut/Makefile | 2 +- games/qstat/Makefile | 2 +- games/redeclipse-data/Makefile | 2 +- games/redeclipse-data16/Makefile | 2 +- games/redeclipse/Makefile | 2 +- games/redeclipse16/Makefile | 2 +- games/wolfpack/Makefile | 2 +- graphics/ImageMagick7/Makefile | 2 +- graphics/jpeg-turbo/Makefile | 2 +- graphics/osg/Makefile | 2 +- graphics/osg34/Makefile | 2 +- graphics/pecl-imagick-im7/Makefile | 2 +- graphics/sekrit-twc-zimg/Makefile | 2 +- graphics/springgraph/Makefile | 2 +- graphics/zathura-pdf-mupdf/Makefile | 2 +- irc/irc/Makefile | 4 +-- japanese/ack/Makefile | 2 +- lang/chez-scheme/Makefile | 2 +- lang/guile/Makefile | 2 +- lang/guile1/Makefile | 2 +- lang/guile2/Makefile | 2 +- lang/sdcc/Makefile | 2 +- mail/bogofilter-kc/Makefile | 2 +- mail/bogofilter-lmdb/Makefile | 2 +- mail/bogofilter-sqlite/Makefile | 2 +- mail/bogofilter/Makefile | 4 +-- mail/mew-devel/Makefile | 2 +- mail/nmh/Makefile | 2 +- mail/opensmtpd/Makefile | 2 +- mail/postfix-current/Makefile | 30 +++++++++++----------- mail/postfix/Makefile | 16 ++++++------ mail/rainloop-community/Makefile | 2 +- math/gnubc/Makefile | 2 +- math/gnuplot-lite/Makefile | 2 +- math/gnuplot/Makefile | 2 +- math/ogdf/Makefile | 2 +- misc/mc/Makefile | 4 +-- multimedia/libmtp/Makefile | 2 +- net-mgmt/gnu-ipcalc/Makefile | 2 +- net-mgmt/ipcalc/Makefile | 2 +- net-p2p/namecoin-daemon/Makefile | 4 +-- net-p2p/namecoin-utils/Makefile | 4 +-- net/exabgp4/Makefile | 2 +- net/haproxy-devel/Makefile | 2 +- net/haproxy/Makefile | 2 +- net/haproxy17/Makefile | 2 +- net/haproxy18/Makefile | 2 +- net/haproxy19/Makefile | 2 +- net/haproxy20/Makefile | 2 +- net/haproxy21/Makefile | 2 +- net/haproxy22/Makefile | 2 +- net/haproxy23/Makefile | 2 +- net/libexosip2/Makefile | 2 +- net/p5-SOAP-Lite/Makefile | 2 +- net/py-pysendfile/Makefile | 2 +- net/tshark-lite/Makefile | 2 +- net/tshark/Makefile | 2 +- net/wireshark-lite/Makefile | 2 +- net/wireshark/Makefile | 2 +- news/slrn/Makefile | 2 +- news/trn4/Makefile | 2 +- ports-mgmt/portupgrade-devel/Makefile | 2 +- ports-mgmt/poudriere-devel/Makefile | 2 +- ports-mgmt/poudriere/Makefile | 2 +- print/ghostscript7-base/Makefile | 10 ++++---- print/ghostscript7-commfont/Makefile | 8 +++--- print/ghostscript7-x11/Makefile | 10 ++++---- print/ghostscript8-base/Makefile | 10 ++++---- print/ghostscript8-x11/Makefile | 10 ++++---- print/ghostscript9-agpl-base/Makefile | 8 +++--- print/ghostscript9-agpl-x11/Makefile | 8 +++--- print/ghostscript9-base/Makefile | 10 ++++---- print/ghostscript9-x11/Makefile | 10 ++++---- print/hplip/Makefile | 2 +- print/papersize-default-a4/Makefile | 2 +- print/tex-xdvik/Makefile | 3 +-- print/typetools/Makefile | 2 +- security/bsmtrace3/Makefile | 2 +- security/clamav-lts/Makefile | 2 +- security/clamav/Makefile | 2 +- security/libressl-devel/Makefile | 6 ++--- security/libressl/Makefile | 7 +++-- security/mbedtls/Makefile | 2 +- security/openiked-portable/Makefile | 2 +- security/openssl-devel/Makefile | 4 +-- security/openssl-quictls/Makefile | 5 +--- security/openssl/Makefile | 4 +-- security/openvpn-devel/Makefile | 4 +-- security/openvpn-mbedtls/Makefile | 2 +- security/openvpn/Makefile | 2 +- security/putty-gtk2/Makefile | 2 +- security/putty-nogtk/Makefile | 2 +- security/putty/Makefile | 2 +- security/sig2dot/Makefile | 2 +- security/signing-party/Makefile | 2 +- sysutils/beadm-devel/Makefile | 2 +- sysutils/cronolog/Makefile | 2 +- sysutils/fswatch-mon/Makefile | 2 +- sysutils/gather/Makefile | 2 +- sysutils/torque/Makefile | 2 +- sysutils/zfs-stats-lite/Makefile | 2 +- textproc/grap/Makefile | 2 +- textproc/hunspell/Makefile | 2 +- textproc/p5-RTF-Parser/Makefile | 2 +- textproc/p5-ack/Makefile | 2 +- textproc/rtf2html/Makefile | 2 +- www/calamaris-devel/Makefile | 2 +- www/calamaris/Makefile | 2 +- www/lynx-current/Makefile | 2 +- www/node/Makefile | 2 +- www/node10/Makefile | 2 +- www/node14/Makefile | 2 +- www/node16/Makefile | 2 +- www/rt44/Makefile | 2 +- www/rt50/Makefile | 2 +- x11-wm/awesome/Makefile | 2 +- x11/i3lock-color/Makefile | 2 +- x11/i3lock/Makefile | 2 +- x11/xsel-conrad/Makefile | 2 +- 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 *** 1473 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111232212.1ANMCiZX056938>