diff options
Diffstat (limited to 'sysutils')
33 files changed, 36 insertions, 39 deletions
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 6d7c62e312af..9eb1320b5ee9 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -23,7 +23,7 @@ SHEBANG_FILES= ansible_collections/community/zabbix/roles/zabbix_proxy/files/ins ansible_collections/ovirt/ovirt/roles/disaster_recovery/files/ovirt-dr SHEBANG_GLOB= *.py *.sh -CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}-*} +CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}} NO_ARCH= yes @@ -31,9 +31,9 @@ DO_MAKE_TEST= ansible -m ping TEST_TARGET= localhost _ANSIBLE_VERSIONS= 1 2 23 24 25 26 27 28 -_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible-* +_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible .for version in ${_ANSIBLE_VERSIONS} -_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version}-* +_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version} .endfor post-patch: diff --git a/sysutils/ansible2/Makefile b/sysutils/ansible2/Makefile index fb59cd2eb250..6e9c8d870eb0 100644 --- a/sysutils/ansible2/Makefile +++ b/sysutils/ansible2/Makefile @@ -41,7 +41,7 @@ TEST_ARGS= VERSION=${PORTVERSION} \ TEST_ENV= PYTHON_VERSION=${PYTHON_VER} TEST_TARGET= tests -CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}-*} +CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}} EXTRA_PATCHES?= NO_ARCH= yes @@ -62,9 +62,9 @@ PLIST_FILES?= man/man1/ansible-config.1.gz \ PORTEXAMPLES= ansible.cfg hosts _ANSIBLE_VERSIONS= 1 2 23 24 25 26 27 28 -_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible-* +_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible .for version in ${_ANSIBLE_VERSIONS} -_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version}-* +_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version} .endfor OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/sysutils/bacula11-docs/Makefile b/sysutils/bacula11-docs/Makefile index 62c006c8f217..c4048392a40a 100644 --- a/sysutils/bacula11-docs/Makefile +++ b/sysutils/bacula11-docs/Makefile @@ -5,7 +5,7 @@ MASTER_SITES= SF PKGNAMESUFFIX= 11-docs DISTNAME= ${PORTNAME}-docs-${PORTVERSION} -CONFLICTS= bacula9-* +CONFLICTS= bacula9 MAINTAINER= dvl@FreeBSD.org COMMENT= Bacula document set diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index 2f1aaf0a7a35..d71c4607181c 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in scripts/baculabackupreport.in -CONFLICTS?= bacula9-server-* bacula5-server-* bacula-server-* +CONFLICTS?= bacula9-server bacula-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 diff --git a/sysutils/bacula9-docs/Makefile b/sysutils/bacula9-docs/Makefile index 3e6619834c9b..d44981c786c7 100644 --- a/sysutils/bacula9-docs/Makefile +++ b/sysutils/bacula9-docs/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= SF PKGNAMESUFFIX= 9-docs DISTNAME= ${PORTNAME}-docs-${PORTVERSION} -CONFLICTS= bacula-* bacula5-* bacula11-* +CONFLICTS= bacula bacula11 MAINTAINER= dvl@FreeBSD.org COMMENT= Bacula document set diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile index e0abc3936084..ec581973e6f3 100644 --- a/sysutils/bacula9-server/Makefile +++ b/sysutils/bacula9-server/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in -CONFLICTS?= bacula11-server-* bacula5-server-* bacula-server-* +CONFLICTS?= bacula11-server bacula-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile index 21f1d1f9bbf6..c49c27dc3688 100644 --- a/sysutils/bareos-client/Makefile +++ b/sysutils/bareos-client/Makefile @@ -3,7 +3,7 @@ PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) -CONFLICTS= bareos19-client-* bareos18-client-* bareos17-client-* +CONFLICTS= bareos19-client bareos18-client bareos17-client WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 4c979a58bdaf..21133a0d58fb 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -12,7 +12,7 @@ COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -CONFLICTS?= bacula19*-server bacula18*-server-* bareos17-server-* +CONFLICTS?= bareos19-server bareos18-server bareos17-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile index 9006ce05bb3e..ad919eb7821c 100644 --- a/sysutils/bareos-traymonitor/Makefile +++ b/sysutils/bareos-traymonitor/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libbareos.so:sysutils/bareos-client -CONFLICTS= bareos17-traymonitor-* bareos18-traymonitor-* bareos19-traymonitor-* +CONFLICTS= bareos17-traymonitor bareos18-traymonitor bareos19-traymonitor USES= desktop-file-utils gettext-runtime pkgconfig qt:5 USE_QT= buildtools_build qmake_build uitools_build gui core diff --git a/sysutils/bareos17-client-static/Makefile b/sysutils/bareos17-client-static/Makefile index c2628a55f14d..9db2f693a3af 100644 --- a/sysutils/bareos17-client-static/Makefile +++ b/sysutils/bareos17-client-static/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (static client) BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk -CONFLICTS= bareos16-client-static-* +CONFLICTS= bareos16-client-static PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../../sysutils/bareos17-server diff --git a/sysutils/bareos17-client/Makefile b/sysutils/bareos17-client/Makefile index 3bc4c169df48..dd2433f9c6d9 100644 --- a/sysutils/bareos17-client/Makefile +++ b/sysutils/bareos17-client/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (client) BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk -CONFLICTS= bareos16-client-* bareos-client-* +CONFLICTS= bareos16-client bareos-client WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd diff --git a/sysutils/bareos17-server/Makefile b/sysutils/bareos17-server/Makefile index 84123919d79e..c797776e282f 100644 --- a/sysutils/bareos17-server/Makefile +++ b/sysutils/bareos17-server/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi DEPRECATED= Deprecated, no new release since 2020 EXPIRATION_DATE=2021-12-05 -CONFLICTS?= bacula*-server-* bareos16-server-* +CONFLICTS?= bacula*-server bareos16-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson diff --git a/sysutils/bareos18-client/Makefile b/sysutils/bareos18-client/Makefile index 8fbbabb028da..5d7dcdd142a1 100644 --- a/sysutils/bareos18-client/Makefile +++ b/sysutils/bareos18-client/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (client) BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk -CONFLICTS= bareos17-client-* bareos16-client-* bareos-client-* +CONFLICTS= bareos17-client bareos16-client bareos-client WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd diff --git a/sysutils/bareos18-server/Makefile b/sysutils/bareos18-server/Makefile index 4d45d528cba4..9e57e9c01510 100644 --- a/sysutils/bareos18-server/Makefile +++ b/sysutils/bareos18-server/Makefile @@ -12,7 +12,7 @@ COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -CONFLICTS?= bacula17*-server-* bareos16-server-* bareos-server-* +CONFLICTS?= bareos17-server bareos16-server bareos-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson diff --git a/sysutils/bareos18-traymonitor/Makefile b/sysutils/bareos18-traymonitor/Makefile index 2c004728018f..73ac06d95ca9 100644 --- a/sysutils/bareos18-traymonitor/Makefile +++ b/sysutils/bareos18-traymonitor/Makefile @@ -7,7 +7,7 @@ COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libbareos.so:sysutils/bareos18-client -CONFLICTS= bacula*-bat-* bareos-traymonitor-* +CONFLICTS= bacula*-bat bareos-traymonitor USES= pkgconfig gettext-runtime desktop-file-utils qt:5 USE_QT= buildtools_build qmake_build uitools_build gui core diff --git a/sysutils/bareos19-client/Makefile b/sysutils/bareos19-client/Makefile index 92b246709fc9..c427cd66771d 100644 --- a/sysutils/bareos19-client/Makefile +++ b/sysutils/bareos19-client/Makefile @@ -3,7 +3,7 @@ PKGNAMESUFFIX= 19-client COMMENT= Backup archiving recovery open sourced (client) -CONFLICTS= bareos18-client-* bareos17-client-* bareos-client-* +CONFLICTS= bareos18-client bareos17-client bareos-client WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd diff --git a/sysutils/bareos19-server/Makefile b/sysutils/bareos19-server/Makefile index 73d8697e5aff..d0e74e571070 100644 --- a/sysutils/bareos19-server/Makefile +++ b/sysutils/bareos19-server/Makefile @@ -12,7 +12,7 @@ COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -CONFLICTS?= bacula18*-server bacula17*-server-* +CONFLICTS?= bareos18-server bareos17-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson diff --git a/sysutils/bareos19-traymonitor/Makefile b/sysutils/bareos19-traymonitor/Makefile index 6774426e8efb..ce861d3ba5f8 100644 --- a/sysutils/bareos19-traymonitor/Makefile +++ b/sysutils/bareos19-traymonitor/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libbareos.so:sysutils/bareos19-client -CONFLICTS= bareos18-traymonitor-* bareos17-traymonitor-* bareos-traymonitor-* +CONFLICTS= bareos18-traymonitor bareos17-traymonitor bareos-traymonitor USES= desktop-file-utils gettext-runtime pkgconfig qt:5 USE_QT= buildtools_build qmake_build uitools_build gui core diff --git a/sysutils/beadm/Makefile b/sysutils/beadm/Makefile index 0047e7c403c0..1df42a46a6e2 100644 --- a/sysutils/beadm/Makefile +++ b/sysutils/beadm/Makefile @@ -15,7 +15,7 @@ GH_ACCOUNT= vermaden NO_BUILD= YES NO_ARCH= YES -CONFLICTS_INSTALL= beadm-devel-* +CONFLICTS_INSTALL= beadm-devel PLIST_FILES= sbin/${PORTNAME} \ man/man8/${PORTNAME}.8.gz diff --git a/sysutils/cfengine-masterfiles316/Makefile b/sysutils/cfengine-masterfiles316/Makefile index c51f83bcd5d5..e569ebbe1c5c 100644 --- a/sysutils/cfengine-masterfiles316/Makefile +++ b/sysutils/cfengine-masterfiles316/Makefile @@ -18,7 +18,7 @@ CPE_PRODUCT= cfengine DEPRECATED= Expire one year after cfengine 3.18.0 released EXPIRATION_DATE= 2022-07-05 -CONFLICTS= cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[013-9]-* +CONFLICTS= cfengine-masterfiles3[0-9] cfengine-masterfiles31[013-9] .if !defined(MASTERDIR) PKGNAMESUFFIX= 316 CONFLICTS+= cfengine-masterfiles-3.* diff --git a/sysutils/cfengine-masterfiles317/Makefile b/sysutils/cfengine-masterfiles317/Makefile index 01590b06d29b..1486970d9aef 100644 --- a/sysutils/cfengine-masterfiles317/Makefile +++ b/sysutils/cfengine-masterfiles317/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 CPE_VENDOR= gnu CPE_PRODUCT= cfengine -CONFLICTS= cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[0-689]-* +CONFLICTS= cfengine-masterfiles3[0-9] cfengine-masterfiles31[0-689] .if !defined(MASTERDIR) PKGNAMESUFFIX= 317 CONFLICTS+= cfengine-masterfiles-3.* diff --git a/sysutils/cfengine-masterfiles318/Makefile b/sysutils/cfengine-masterfiles318/Makefile index a115d1bca5e8..267114872b1a 100644 --- a/sysutils/cfengine-masterfiles318/Makefile +++ b/sysutils/cfengine-masterfiles318/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 CPE_VENDOR= gnu CPE_PRODUCT= cfengine -CONFLICTS= cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[0-79]-* +CONFLICTS= cfengine-masterfiles3[0-9] cfengine-masterfiles31[0-79] .if !defined(MASTERDIR) PKGNAMESUFFIX= 318 CONFLICTS+= cfengine-masterfiles-3.* diff --git a/sysutils/cfengine316/Makefile b/sysutils/cfengine316/Makefile index 263c75c423ac..42aa2296af24 100644 --- a/sysutils/cfengine316/Makefile +++ b/sysutils/cfengine316/Makefile @@ -17,7 +17,7 @@ CPE_VENDOR= gnu DEPRECATED= Expire one year after cfengine 3.18.0 released EXPIRATION_DATE= 2022-07-05 -CONFLICTS= cfengine3[0-9]-* cfengine31[0-57-9]-* +CONFLICTS= cfengine3[0-9] cfengine31[0-57-9] .if !defined(MASTERDIR) PKGNAMESUFFIX= 316 CONFLICTS+= cfengine-3.* diff --git a/sysutils/cfengine317/Makefile b/sysutils/cfengine317/Makefile index 6d55c47ee83e..caba4e80a255 100644 --- a/sysutils/cfengine317/Makefile +++ b/sysutils/cfengine317/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3 CPE_VENDOR= gnu -CONFLICTS= cfengine3[0-9]-* cfengine31[0-689]-* +CONFLICTS= cfengine3[0-9] cfengine31[0-689] .if !defined(MASTERDIR) PKGNAMESUFFIX= 317 CONFLICTS+= cfengine-3.* diff --git a/sysutils/cfengine318/Makefile b/sysutils/cfengine318/Makefile index 72cb2d0f5954..a8bc088af3a2 100644 --- a/sysutils/cfengine318/Makefile +++ b/sysutils/cfengine318/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 CPE_VENDOR= gnu -CONFLICTS= cfengine3[0-9]-* cfengine31[0-79]-* +CONFLICTS= cfengine3[0-9] cfengine31[0-79] .if !defined(MASTERDIR) PKGNAMESUFFIX= 318 CONFLICTS+= cfengine-3.* diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index e04a3ce56842..5338d110ac16 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -15,9 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid -CONFLICTS_BUILD= bonobo-1.* -CONFLICTS_INSTALL= ntfsprogs-* - USES= fuse pkgconfig iconv libtool localbase:ldflags tar:tgz USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/sysutils/iocell/Makefile b/sysutils/iocell/Makefile index 8f8d6ea0b1c5..3241270f6366 100644 --- a/sysutils/iocell/Makefile +++ b/sysutils/iocell/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= uclcmd:devel/uclcmd -CONFLICTS= iocage-* +CONFLICTS= iocage USE_GITHUB= yes GH_ACCOUNT= bartekrutkowski diff --git a/sysutils/moosefs3-master/Makefile b/sysutils/moosefs3-master/Makefile index 244de06d0634..efa35f527ccd 100644 --- a/sysutils/moosefs3-master/Makefile +++ b/sysutils/moosefs3-master/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --localstatedir=${MFS_WORKDIR} \ --with-default-user=${MFS_USER} \ --with-default-group=${MFS_GROUP} -CONFLICTS= moosefs2-${MFS_COMPONENT}-* +CONFLICTS= moosefs2-${MFS_COMPONENT} .if ${MFS_COMPONENT} == cgi MFS_CGIDIR= ${PREFIX}/share/mfscgi diff --git a/sysutils/puppet6/Makefile b/sysutils/puppet6/Makefile index 33d3184896e5..4a95dbfc2c09 100644 --- a/sysutils/puppet6/Makefile +++ b/sysutils/puppet6/Makefile @@ -28,7 +28,7 @@ USES= cpe USE_GITHUB= yes GH_ACCOUNT= puppetlabs -CONFLICTS_INSTALL= puppet5-* puppet7-* +CONFLICTS_INSTALL= puppet7 PLIST_SUB= PORTVERSION="${PORTVERSION}" NO_ARCH= yes NO_BUILD= yes diff --git a/sysutils/puppet7/Makefile b/sysutils/puppet7/Makefile index a4c6c6d50e72..a394237576bf 100644 --- a/sysutils/puppet7/Makefile +++ b/sysutils/puppet7/Makefile @@ -23,7 +23,7 @@ USES= cpe USE_GITHUB= yes GH_ACCOUNT= puppetlabs -CONFLICTS_INSTALL= puppet5-* puppet6-* +CONFLICTS_INSTALL= puppet6 PLIST_SUB= PORTVERSION="${PORTVERSION}" NO_ARCH= yes NO_BUILD= yes diff --git a/sysutils/puppetserver6/Makefile b/sysutils/puppetserver6/Makefile index aa42ec34326d..bfa1b072b8f1 100644 --- a/sysutils/puppetserver6/Makefile +++ b/sysutils/puppetserver6/Makefile @@ -28,7 +28,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.8+ -CONFLICTS_INSTALL= puppetserver5-* puppetserver7-* +CONFLICTS_INSTALL= puppetserver7 SHEBANG_FILES= ext/bin/puppetserver diff --git a/sysutils/puppetserver7/Makefile b/sysutils/puppetserver7/Makefile index 6ab649e8965a..d3c59b531d0d 100644 --- a/sysutils/puppetserver7/Makefile +++ b/sysutils/puppetserver7/Makefile @@ -28,7 +28,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.8+ -CONFLICTS_INSTALL= puppetserver5-* puppetserver6-* +CONFLICTS_INSTALL= puppetserver5 puppetserver6 SHEBANG_FILES= ext/bin/puppetserver diff --git a/sysutils/rw/Makefile b/sysutils/rw/Makefile index a0120751b533..43edd2026e7f 100644 --- a/sysutils/rw/Makefile +++ b/sysutils/rw/Makefile @@ -11,7 +11,7 @@ COMMENT= Simple replacement for dd(1) with standard command-line flags LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= rankwidth-* +CONFLICTS_INSTALL= rankwidth PLIST_FILES= bin/rw share/man/man1/rw.1.gz |