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

Collapse All | Expand All

(-)Makefile (-6 / +11 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME?=	postgresql
4
PORTNAME?=	postgresql
5
DISTVERSION?=	9.2.9
5
DISTVERSION?=	9.2.9
6
PORTREVISION?=	0
6
PORTREVISION?=	1
7
CATEGORIES?=	databases
7
CATEGORIES?=	databases
8
MASTER_SITES=	PGSQL
8
MASTER_SITES=	PGSQL
9
MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
9
MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
Lines 12-17 Link Here
12
MAINTAINER?=	pgsql@FreeBSD.org
12
MAINTAINER?=	pgsql@FreeBSD.org
13
COMMENT?=	The most advanced open-source database available anywhere
13
COMMENT?=	The most advanced open-source database available anywhere
14
14
15
LICENSE=	PostgreSQL
16
15
CONFLICTS?=	${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
17
CONFLICTS?=	${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
16
		${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \
18
		${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \
17
		${PORTNAME}9[^${PORTVERSION:R:E}]-client* \
19
		${PORTNAME}9[^${PORTVERSION:R:E}]-client* \
Lines 39-45 Link Here
39
PG_GROUP=	pgsql
41
PG_GROUP=	pgsql
40
PG_UID=	70
42
PG_UID=	70
41
43
42
LDFLAGS+=	-L${LOCALBASE}/lib
44
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
43
INCLUDES+=	-I${LOCALBASE}/include
45
INCLUDES+=	-I${LOCALBASE}/include
44
CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
46
CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
45
		--with-includes=${PREFIX}/include \
47
		--with-includes=${PREFIX}/include \
Lines 76-85 Link Here
76
78
77
.if !defined(SLAVE_ONLY)
79
.if !defined(SLAVE_ONLY)
78
OPTIONS_DEFINE+=	NLS DTRACE PAM LDAP GSSAPI OPTIMIZED_CFLAGS XML TZDATA DEBUG
80
OPTIONS_DEFINE+=	NLS DTRACE PAM LDAP GSSAPI OPTIMIZED_CFLAGS XML TZDATA DEBUG
79
OPTIONS_RADIO= KRB5
81
OPTIONS_RADIO=	KRB5
80
OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5
82
OPTIONS_RADIO_KRB5=	MIT_KRB5 HEIMDAL_KRB5
81
83
82
KRB5_DESC=       Build with kerberos provider support
84
KRB5_DESC=	Build with kerberos provider support
83
NLS_DESC=	Use internationalized messages
85
NLS_DESC=	Use internationalized messages
84
DTRACE_DESC=	Build with DTrace probes (server only)
86
DTRACE_DESC=	Build with DTrace probes (server only)
85
PAM_DESC=	Build with PAM Support
87
PAM_DESC=	Build with PAM Support
Lines 104-109 Link Here
104
OPTIONS_DEFINE+=	SSL
106
OPTIONS_DEFINE+=	SSL
105
SSL_DESC=	Build with OpenSSL support
107
SSL_DESC=	Build with OpenSSL support
106
108
109
OPTIONS_DEFINE+=	OSSP_UUID
110
SSL_DESC=	Build with OSSP UUID
111
107
OPTIONS_DEFAULT=	NLS XML TZDATA INTDATE SSL
112
OPTIONS_DEFAULT=	NLS XML TZDATA INTDATE SSL
108
.endif # !SLAVE_ONLY
113
.endif # !SLAVE_ONLY
109
114
Lines 212-218 Link Here
212
CONFIGURE_ARGS+=--with-krb5
217
CONFIGURE_ARGS+=--with-krb5
213
# Allow defining a home built MIT Kerberos by setting KRB5_HOME
218
# Allow defining a home built MIT Kerberos by setting KRB5_HOME
214
.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
219
.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
215
LIB_DEPENDS+=	libkrb5.so.3:${PORTSDIR}/security/krb5
220
LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/krb5
216
.    endif
221
.    endif
217
.   endif
222
.   endif
218
.  endif
223
.  endif

Return to bug 175783