diff options
| author | Dmitry Sivachenko <demon@FreeBSD.org> | 2019-03-26 10:59:32 +0000 |
|---|---|---|
| committer | Dmitry Sivachenko <demon@FreeBSD.org> | 2019-03-26 10:59:32 +0000 |
| commit | 190fc8a29c3513cbd806740d5dd7d48a4e007ba7 (patch) | |
| tree | 7ca7be9bd906955f262d6791d88e2512bfb2c7a8 /net | |
| parent | 94101fabecee977ba3622eafaae495d837a3b044 (diff) | |
| download | ports-190fc8a29c3513cbd806740d5dd7d48a4e007ba7.tar.gz ports-190fc8a29c3513cbd806740d5dd7d48a4e007ba7.zip | |
Update CONFLICTS.
Notes
Notes:
svn path=/head/; revision=496889
Diffstat (limited to 'net')
| -rw-r--r-- | net/haproxy17/Makefile | 2 | ||||
| -rw-r--r-- | net/haproxy18/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile index 5d824aac9cb5..7d29e79f4f05 100644 --- a/net/haproxy17/Makefile +++ b/net/haproxy17/Makefile @@ -16,7 +16,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]* +CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* USES= cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy18/Makefile b/net/haproxy18/Makefile index 0fd00cffbfd5..90cdef724659 100644 --- a/net/haproxy18/Makefile +++ b/net/haproxy18/Makefile @@ -13,7 +13,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* +CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* USES= cpe gmake USE_RC_SUBR= haproxy |