View | Details | Raw Unified | Return to bug 246375
Collapse All | Expand All

(-)net/openldap24-server/Makefile (-8 / +7 lines)
Lines 42-52 Link Here
42
42
43
.if defined(CLIENT_ONLY)
43
.if defined(CLIENT_ONLY)
44
.if ${CLIENT_ONLY} == sasl
44
.if ${CLIENT_ONLY} == sasl
45
CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
45
CONFLICTS=		${PORTNAME}-client-2.*
46
			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].*
47
.else
46
.else
48
CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \
47
CONFLICTS=		${PORTNAME}-sasl-client-2.*
49
			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
50
.endif
48
.endif
51
.endif
49
.endif
52
50
Lines 65-71 Link Here
65
BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
63
BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
66
.endif
64
.endif
67
65
68
PORTREVISION_CLIENT=	0
66
PORTREVISION_CLIENT=	1
69
PORTREVISION_SERVER=	0
67
PORTREVISION_SERVER=	0
70
OPENLDAP_SHLIB_MAJOR=	2
68
OPENLDAP_SHLIB_MAJOR=	2
71
OPENLDAP_SHLIB_MINOR=	10.13
69
OPENLDAP_SHLIB_MINOR=	10.13
Lines 157-165 Link Here
157
.if ${CLIENT_ONLY} == sasl
155
.if ${CLIENT_ONLY} == sasl
158
PORT_OPTIONS+=	SASL
156
PORT_OPTIONS+=	SASL
159
.endif
157
.endif
158
160
.if defined(USE_OPENLDAP)
159
.if defined(USE_OPENLDAP)
161
BROKEN=			you have USE_OPENLDAP variable defined either in environment or in make(1) arguments; please undefine and try again
160
BROKEN=			you have USE_OPENLDAP variable defined either in environment or in make(1) arguments; please undefine and try again
162
.endif
161
.endif
162
163
.else
163
.else
164
USE_OPENLDAP=		yes
164
USE_OPENLDAP=		yes
165
WANT_OPENLDAP_VER=	24
165
WANT_OPENLDAP_VER=	24
Lines 172-184 Link Here
172
172
173
.if ${PORT_OPTIONS:MSASL}
173
.if ${PORT_OPTIONS:MSASL}
174
WANT_OPENLDAP_SASL=	yes
174
WANT_OPENLDAP_SASL=	yes
175
CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.*
175
CONFLICTS=		${PORTNAME}-client-2.*
176
PKGNAMESUFFIX=		-sasl-server
177
.if ${PORT_OPTIONS:MGSSAPI}
176
.if ${PORT_OPTIONS:MGSSAPI}
178
RUN_DEPENDS+=		cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
177
RUN_DEPENDS+=		cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
179
.endif
178
.endif
180
.else
179
.else
181
CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
180
CONFLICTS=		${PORTNAME}-sasl-client-2.*
182
.endif
181
.endif
183
182
184
.endif
183
.endif

Return to bug 246375