diff options
author | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 23:11:40 +0100 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 23:11:40 +0100 |
commit | 5933ac0b099d61d98eb531d373cf57a8927bc7af (patch) | |
tree | fc0ebf2ac7225dec2aa7f2a7b0efbb91919c1030 /net/haproxy | |
parent | lang/guile2: define _WITH_CPU_SET_T to fix build on -CURRENT (diff) |
*/*: 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 'net/haproxy')
-rw-r--r-- | net/haproxy/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |