Attachment #178791 for bug #215996

Lines 41-47 FPC_DEFAULT?= 3.0.0 Link Here

(-)Mk/bsd.default-versions.mk (-1 / +1 lines)
41	GCC_DEFAULT?= 4.9	41	GCC_DEFAULT?= 4.9
42	# Possible values: 7, 8, 9, agpl	42	# Possible values: 7, 8, 9, agpl
43	GHOSTSCRIPT_DEFAULT?= agpl	43	GHOSTSCRIPT_DEFAULT?= agpl
44	.if defined(ARCH) && ${ARCH} == amd64	44	.if ${ARCH} == amd64
45	# Possible values: c6, c6_64, c7, c7_64	45	# Possible values: c6, c6_64, c7, c7_64
46	LINUX_DEFAULT?= c6_64	46	LINUX_DEFAULT?= c6_64
47	.else	47	.else




LDCONFIG_DIR=	libdata/ldconfig
LDCONFIG32_DIR=	libdata/ldconfig32

.endif

# At least KDE needs TMPDIR for the package building,
# so we're setting it to the known default value.
.if defined(PACKAGE_BUILDING)

.endif
.endif

.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.include "${PORTSDIR}/Mk/bsd.options.mk"

.endif
# End of options section.

# Start of pre-makefile section.
.if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)



_PREMKINCLUDED=	yes

.include "${PORTSDIR}/Mk/bsd.default-versions.mk"

.if defined(PORTVERSION)
.if ${PORTVERSION:M*[-_,]*}x != x
IGNORE=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','




OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL POLARSSL WOLFSSL
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_DEFAULT=	CA_BUNDLE COOKIES HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
OPTIONS_DEFAULT+=	GSSAPI_${"${SSL_DEFAULT}" == "base":?BASE:NONE}
CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
CA_BUNDLE_IMPLIES=	OPENSSL
COOKIES_DESC=		Cookies support

THREADED_RESOLVER_DESC=	Threaded DNS resolver
TLS_SRP_DESC=		TLS-SRP (Secure Remote Password) support

.include <${.CURDIR}/../../Mk/bsd.default-versions.mk>

.if ${SSL_DEFAULT} != base
OPTIONS_DEFAULT+=	GSSAPI_NONE
.else
OPTIONS_DEFAULT+=	GSSAPI_BASE
.endif

CONFIGURE_ARGS=	--disable-werror \
		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
		--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \

Return to bug 215996

Lines 1234-1241 GROUPS_BLACKLIST= _dhcp _pflogd _ypldap Link Here

(-)Mk/bsd.port.mk (-4 / +4 lines)
1234	LDCONFIG_DIR= libdata/ldconfig	1234	LDCONFIG_DIR= libdata/ldconfig
1235	LDCONFIG32_DIR= libdata/ldconfig32	1235	LDCONFIG32_DIR= libdata/ldconfig32
1236		1236
1237	.endif
1238
1239	# At least KDE needs TMPDIR for the package building,	1237	# At least KDE needs TMPDIR for the package building,
1240	# so we're setting it to the known default value.	1238	# so we're setting it to the known default value.
1241	.if defined(PACKAGE_BUILDING)	1239	.if defined(PACKAGE_BUILDING)
Lines 1248-1255 WITH_DEBUG= yes Link Here
1248	.endif	1246	.endif
1249	.endif	1247	.endif
1250		1248
		1249	.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
1251	.include "${PORTSDIR}/Mk/bsd.options.mk"	1250	.include "${PORTSDIR}/Mk/bsd.options.mk"
1252		1251
		1252	.endif
		1253	# End of options section.
		1254
1253	# Start of pre-makefile section.	1255	# Start of pre-makefile section.
1254	.if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)	1256	.if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
1255		1257
Lines 1259-1266 WITH_DEBUG= yes Link Here
1259		1261
1260	_PREMKINCLUDED= yes	1262	_PREMKINCLUDED= yes
1261		1263
1262	.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
1263
1264	.if defined(PORTVERSION)	1264	.if defined(PORTVERSION)
1265	.if ${PORTVERSION:M[-_,]}x != x	1265	.if ${PORTVERSION:M[-_,]}x != x
1266	IGNORE= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','	1266	IGNORE= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','

Lines 21-26 OPTIONS_RADIO_RESOLV= CARES THREADED_RES Link Here

(-)ftp/curl/Makefile (-8 / +1 lines)
21	OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL WOLFSSL	21	OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL WOLFSSL
22	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE	22	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
23	OPTIONS_DEFAULT= CA_BUNDLE COOKIES HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP	23	OPTIONS_DEFAULT= CA_BUNDLE COOKIES HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
		24	OPTIONS_DEFAULT+= GSSAPI_${"${SSL_DEFAULT}" == "base":?BASE:NONE}
24	CA_BUNDLE_DESC= Install CA bundle for OpenSSL	25	CA_BUNDLE_DESC= Install CA bundle for OpenSSL
25	CA_BUNDLE_IMPLIES= OPENSSL	26	CA_BUNDLE_IMPLIES= OPENSSL
26	COOKIES_DESC= Cookies support	27	COOKIES_DESC= Cookies support
Lines 33-46 SMB_DESC= SMB/CIFS support Link Here
33	THREADED_RESOLVER_DESC= Threaded DNS resolver	34	THREADED_RESOLVER_DESC= Threaded DNS resolver
34	TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support	35	TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support
35		36
36	.include <${.CURDIR}/../../Mk/bsd.default-versions.mk>
37
38	.if ${SSL_DEFAULT} != base
39	OPTIONS_DEFAULT+= GSSAPI_NONE
40	.else
41	OPTIONS_DEFAULT+= GSSAPI_BASE
42	.endif
43
44	CONFIGURE_ARGS= --disable-werror \	37	CONFIGURE_ARGS= --disable-werror \
45	--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \	38	--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
46	--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \	39	--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \