View | Details | Raw Unified | Return to bug 220325 | Differences between
and this patch

Collapse All | Expand All

(-)b/databases/postgresql10-server/Makefile (-34 / +27 lines)
Lines 106-123 OPTIONS_DEFAULT+= XML TZDATA INTDATE Link Here
106
.endif
106
.endif
107
107
108
.if !defined(SLAVE_ONLY)
108
.if !defined(SLAVE_ONLY)
109
OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG
109
OPTIONS_DEFINE+=	NLS PAM OPTIMIZED_CFLAGS DEBUG
110
. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3
110
. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3
111
  # Select optional Kerberos, optional GSSAPI
112
  OPTIONS_DEFINE+=	GSSAPI
111
  OPTIONS_RADIO= KRB5
113
  OPTIONS_RADIO= KRB5
112
  OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5
114
  OPTIONS_RADIO_KRB5= BASE_KRB5 MIT_KRB5 HEIMDAL_KRB5
115
  BASE_KRB5_USES=	gssapi:base
116
  MIT_KRB5_USES=	gssapi:mit
117
  HEIMDAL_KRB5_USES=	gssapi:heimdal,flags
118
  BASE_KRB5_CONFIGURE_ON=	--with-krb5
119
  MIT_KRB5_CONFIGURE_ON=	--with-krb5
120
  HEIMDAL_KRB5_CONFIGURE_ON=	--with-krb5
121
  GSSAPI_CONFIGURE_WITH=	gssapi
122
.else
123
  # Select Kerberos for optional GSSAPI
124
  OPTIONS_RADIO+=	GSSAPI
125
  OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_MIT GSSAPI_HEIMDAL
126
  GSSAPI_BASE_USES=	gssapi:base
127
  GSSAPI_MIT_USES=	gssapi:mit
128
  GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
129
  GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi
130
  GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi
131
  GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi
113
. endif
132
. endif
114
133
115
KRB5_DESC=	Build with kerberos provider support
134
KRB5_DESC=	Build with kerberos provider support
116
NLS_DESC=	Use internationalized messages
135
NLS_DESC=	Use internationalized messages
117
PAM_DESC=	Build with PAM Support
136
PAM_DESC=	Build with PAM Support
118
MIT_KRB5_DESC=	Build with MIT kerberos support
137
BASE_KRB5_DESC=	Build with Heimdal Kerberos from base
119
HEIMDAL_KRB5_DESC=	Builds with Heimdal kerberos
138
MIT_KRB5_DESC=	Build with MIT Kerberos support
139
HEIMDAL_KRB5_DESC=	Build with Heimdal Kerberos
120
GSSAPI_DESC=	Build with GSSAPI support
140
GSSAPI_DESC=	Build with GSSAPI support
141
GSSAPI_BASE_DESC=	Build with GSSAPI from base
142
GSSAPI_MIT_DESC=	Build with GSSAPI from MIT Kerberos
143
GSSAPI_HEIMDAL_DESC=	BUild with GSSAPI from Heimdal Kerberos
121
OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
144
OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
122
145
123
OPTIONS_DEFINE+=	SSL
146
OPTIONS_DEFINE+=	SSL
Lines 184-219 LDFLAGS+=-lelf Link Here
184
INSTALL_TARGET=install
207
INSTALL_TARGET=install
185
.  endif
208
.  endif
186
209
187
.if ${PORT_OPTIONS:MGSSAPI}
188
CONFIGURE_ARGS+=--with-gssapi
189
.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5)
190
# Kerberos libraries will pull the proper GSSAPI library
191
# via linker dependencies, but otherwise we must specify
192
# it explicitely: ld --as-needed is used for compilation,
193
# so configure's -lgssapi_krb5 won't go.
194
LDFLAGS+=	-lgssapi
195
LDFLAGS_SL+=	-lgssapi
196
.endif
197
.else
198
CONFIGURE_ARGS+=--without-gssapi
199
.endif
200
201
.  if ${PORT_OPTIONS:MMIT_KRB5}
202
.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
203
IGNORE=	requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
204
.   else
205
CONFIGURE_ARGS+=--with-krb5
206
# Allow defining a home built MIT Kerberos by setting KRB5_HOME
207
.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
208
LIB_DEPENDS+=	libkrb5.so.3:security/krb5
209
.    endif
210
.   endif
211
.  endif
212
213
.  if ${PORT_OPTIONS:MHEIMDAL_KRB5}
214
CONFIGURE_ARGS+=--with-krb5
215
.  endif
216
217
.endif # !SLAVE_ONLY
210
.endif # !SLAVE_ONLY
218
211
219
# For testing files in FILESDIR
212
# For testing files in FILESDIR

Return to bug 220325