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

Collapse All | Expand All

(-)Makefile (-18 / +22 lines)
Lines 41-50 Link Here
41
PLIST_SUB=	PORTVERSION=${DISTVERSION} LIBVER=0${PORTVERSION:C/\./0/g}
41
PLIST_SUB=	PORTVERSION=${DISTVERSION} LIBVER=0${PORTVERSION:C/\./0/g}
42
42
43
OPTIONS_SUB=	yes
43
OPTIONS_SUB=	yes
44
OPTIONS_DEFINE=	USER KERBEROS HEIMDAL HEIMDAL_PORT LDAP MYSQL \
44
OPTIONS_DEFINE=	USER LDAP MYSQL \
45
		PGSQL UNIXODBC FIREBIRD REDIS PYTHON RUBY \
45
		PGSQL UNIXODBC FIREBIRD REDIS PYTHON RUBY \
46
		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
46
		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
47
		FREETDS IDN SSL_PORT DOCS SQLITE3
47
		FREETDS IDN SSL_PORT DOCS SQLITE3
48
OPTIONS_SINGLE=	KRB
49
OPTIONS_SINGLE_KRB=	HEIMDAL HEIMDAL_PORT KERBEROS
48
OPTIONS_DEFAULT=USER PERL
50
OPTIONS_DEFAULT=USER PERL
49
51
50
USER_DESC=		Run as user freeradius, group freeradius
52
USER_DESC=		Run as user freeradius, group freeradius
Lines 80-109 Link Here
80
USERS=		${RADIUS_USER}
82
USERS=		${RADIUS_USER}
81
GROUPS=		${RADIUS_GROUP}
83
GROUPS=		${RADIUS_GROUP}
82
84
83
.if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL}
85
.if ${PORT_OPTIONS:MHEIMDAL} || ${PORT_OPTIONS:MHEIMDAL_PORT} || ${PORT_OPTIONS:MKERBEROS}
84
.if ${PORT_OPTIONS:MHEIMDAL}
85
.if ${PORT_OPTIONS:MHEIMDAL_PORT}
86
LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/heimdal
87
.endif
88
CONFIGURE_ARGS+=--enable-heimdal-krb5 --enable-pthread-support
89
.else
90
LIB_DEPENDS+=	libkrb5support.so:${PORTSDIR}/security/krb5
91
.endif
92
CONFIGURE_ARGS+=--with-rlm_krb5
86
CONFIGURE_ARGS+=--with-rlm_krb5
93
.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
94
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=/usr/lib
95
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=/usr/include
96
CONFIGURE_ENV+=	KRB5LIBS="$$(${KRB5_CONFIG})"
97
.else
98
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=${LOCALBASE}/lib
99
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=${LOCALBASE}/include
100
.endif
101
PLIST_SUB+=	KRB5=""
87
PLIST_SUB+=	KRB5=""
102
.else
88
.else
103
CONFIGURE_ARGS+=--without-rlm_krb5
89
CONFIGURE_ARGS+=--without-rlm_krb5
104
PLIST_SUB+=	KRB5="@comment "
90
PLIST_SUB+=	KRB5="@comment "
105
.endif
91
.endif
106
92
93
.if ${PORT_OPTIONS:MHEIMDAL}
94
CONFIGURE_ARGS+=--with-rlm-krb5-dir=/
95
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=/usr/include
96
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=/usr/lib
97
.endif
98
99
.if ${PORT_OPTIONS:MHEIMDAL_PORT} || ${PORT_OPTIONS:MKERBEROS}
100
CONFIGURE_ARGS+=--with-rlm-krb5-dir=${LOCALBASE}
101
.endif
102
103
.if ${PORT_OPTIONS:MHEIMDAL_PORT}
104
LIB_DEPENDS+=	libkrb5.so.26:${PORTSDIR}/security/heimdal
105
.endif
106
107
.if ${PORT_OPTIONS:MKERBEROS}
108
LIB_DEPENDS+=	libkrb5support.so:${PORTSDIR}/security/krb5
109
.endif
110
107
.if ${PORT_OPTIONS:MEDIR}
111
.if ${PORT_OPTIONS:MEDIR}
108
CONFIGURE_ARGS+=--with-edir
112
CONFIGURE_ARGS+=--with-edir
109
.if empty(PORT_OPTIONS:MLDAP)
113
.if empty(PORT_OPTIONS:MLDAP)

Return to bug 205493