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 /dns | |
| 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)
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/mDNSResponder_nss/Makefile | 2 | ||||
| -rw-r--r-- | dns/nss_mdns/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
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}. |