diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2022-08-04 11:33:26 +0000 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2022-08-04 11:39:15 +0000 |
| commit | 2d2596cfd77264496d3b865285b2cf757db6233d (patch) | |
| tree | a0f77fd56c93bea48433fe3a2a0a7cf5accd4257 | |
| parent | de2d3c618558248bbacbefa5add997dbe68cac35 (diff) | |
| download | ports-2d2596cfd77264496d3b865285b2cf757db6233d.tar.gz ports-2d2596cfd77264496d3b865285b2cf757db6233d.zip | |
net/openldap24-server: Fix CONFLICTS
Error message:
pkg: openldap26-client-2.6.3 conflicts with openldap24-client-2.4.59_4 (installs files into the same place). Problematic file: /usr/local/bin/ldapadd
Approved by: portmgr blanket
(cherry picked from commit f55d9674821ec3f06a1f1286e3ddabb6278363b2)
| -rw-r--r-- | net/openldap24-server/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 819cbfeb716c..6b15124a62f5 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -35,9 +35,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept .if defined(CLIENT_ONLY) -CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-client ${PORTNAME}-client +CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-client ${PORTNAME}2[0-35-9]-client ${PORTNAME}-client .else -CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-server ${PORTNAME}-server +CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-server ${PORTNAME}2[0-35-9]-server ${PORTNAME}-server .endif GNU_CONFIGURE= yes |