Skip to content

Commit

Permalink
net/openldap24-server: Fix CONFLICTS
Browse files Browse the repository at this point in the history
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 f55d967)
  • Loading branch information
0mp committed Aug 4, 2022
1 parent de2d3c6 commit 2d2596c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/openldap24-server/Makefile
Expand Up @@ -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
Expand Down

0 comments on commit 2d2596c

Please sign in to comment.