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

Collapse All | Expand All

(-)b/databases/postgresql92-server/Makefile (-32 / +25 lines)
Lines 97-114 OPTIONS_DEFAULT+= XML TZDATA INTDATE Link Here
97
.endif
97
.endif
98
98
99
.if !defined(SLAVE_ONLY)
99
.if !defined(SLAVE_ONLY)
100
OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG
100
OPTIONS_DEFINE+=	NLS PAM OPTIMIZED_CFLAGS DEBUG
101
. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3
101
. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3
102
  # Select optional Kerberos, optional GSSAPI
103
  OPTIONS_DEFINE+=	GSSAPI
102
  OPTIONS_RADIO= KRB5
104
  OPTIONS_RADIO= KRB5
103
  OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5
105
  OPTIONS_RADIO_KRB5= BASE_KRB5 MIT_KRB5 HEIMDAL_KRB5
106
  BASE_KRB5_USES=	gssapi:base
107
  MIT_KRB5_USES=	gssapi:mit
108
  HEIMDAL_KRB5_USES=	gssapi:heimdal,flags
109
  BASE_KRB5_CONFIGURE_ON=	--with-krb5
110
  MIT_KRB5_CONFIGURE_ON=	--with-krb5
111
  HEIMDAL_KRB5_CONFIGURE_ON=	--with-krb5
112
  GSSAPI_CONFIGURE_WITH=	gssapi
113
. else
114
  # Select Kerberos for optional GSSAPI
115
  OPTIONS_RADIO+= GSSAPI
116
  OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_MIT GSSAPI_HEIMDAL
117
  GSSAPI_BASE_USES=	gssapi:base
118
  GSSAPI_MIT_USES=	gssapi:mit
119
  GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
120
  GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi
121
  GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi
122
  GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi
104
. endif
123
. endif
105
124
106
KRB5_DESC=       Build with kerberos provider support
125
KRB5_DESC=       Build with kerberos provider support
107
NLS_DESC=	Use internationalized messages
126
NLS_DESC=	Use internationalized messages
108
PAM_DESC=	Build with PAM Support
127
PAM_DESC=	Build with PAM Support
128
BASE_KRB5_DESC=	Build with Heimdal Kerberos from base
109
MIT_KRB5_DESC=	Build with MIT kerberos support
129
MIT_KRB5_DESC=	Build with MIT kerberos support
110
HEIMDAL_KRB5_DESC=	Builds with Heimdal kerberos
130
HEIMDAL_KRB5_DESC=	Builds with Heimdal kerberos
111
GSSAPI_DESC=	Build with GSSAPI support
131
GSSAPI_DESC=	Build with GSSAPI support
132
GSSAPI_BASE_DESC=	Build with GSSAPI from base
133
GSSAPI_MIT_DESC=	Build with GSSAPI from MIT Kerberos
134
GSSAPI_HEIMDAL_DESC=	Build with GSSAPI from Heimdal Kerberos
112
OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
135
OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
113
136
114
OPTIONS_DEFINE+=	SSL
137
OPTIONS_DEFINE+=	SSL
Lines 173-208 LDFLAGS+=-lelf Link Here
173
INSTALL_TARGET=install
196
INSTALL_TARGET=install
174
.  endif
197
.  endif
175
198
176
.if ${PORT_OPTIONS:MGSSAPI}
177
CONFIGURE_ARGS+=--with-gssapi
178
.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5)
179
# Kerberos libraries will pull the proper GSSAPI library
180
# via linker dependencies, but otherwise we must specify
181
# it explicitely: ld --as-needed is used for compilation,
182
# so configure's -lgssapi_krb5 won't go.
183
LDFLAGS+=	-lgssapi
184
LDFLAGS_SL+=	-lgssapi
185
.endif
186
.else
187
CONFIGURE_ARGS+=--without-gssapi
188
.endif
189
190
.  if ${PORT_OPTIONS:MMIT_KRB5}
191
.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
192
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
193
.   else
194
CONFIGURE_ARGS+=--with-krb5
195
# Allow defining a home built MIT Kerberos by setting KRB5_HOME
196
.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
197
LIB_DEPENDS+=	libkrb5.so.3:security/krb5
198
.    endif
199
.   endif
200
.  endif
201
202
.  if ${PORT_OPTIONS:MHEIMDAL_KRB5}
203
CONFIGURE_ARGS+=--with-krb5
204
.  endif
205
206
.endif # !SLAVE_ONLY
199
.endif # !SLAVE_ONLY
207
200
208
# For testing files in FILESDIR
201
# For testing files in FILESDIR

Return to bug 220325