Attachment #171433 for bug #210149

Lines 65-70 WARNING+= "WITH_BDB_VER is deprecated and will be removed on 2016-08-01. Use DEF Link Here

(-)Mk/Uses/bdb.mk (-7 / +7 lines)
65	BDB_DEFAULT:=${WITH_BDB_VER}	65	BDB_DEFAULT:=${WITH_BDB_VER}
66	.endif	66	.endif
67		67
		68	.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
		69
68	_BDB_DEFAULT_save:=${BDB_DEFAULT}	70	_BDB_DEFAULT_save:=${BDB_DEFAULT}
69		71
70	_DB_PORTS= 48 5 6	72	_DB_PORTS= 48 5 6
Lines 91-101 BDB_DEFAULT= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} Link Here
91		93
92	# Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not	94	# Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not
93	# ask for a more specific version.	95	# ask for a more specific version.
94	.if defined(BDB_DEFAULT)	96	. if ${_bdb_ARGS} == yes
95	. if ${BDB_DEFAULT} != 1	97	. if ${BDB_DEFAULT} != 1
96	_bdb_ARGS= ${BDB_DEFAULT}	98	_bdb_ARGS= ${BDB_DEFAULT}
		99	. else
		100	_bdb_ARGS:= 48+
		101	. endif
97	. endif	102	. endif
98	.endif
99		103
100	# Compatiblity hack:	104	# Compatiblity hack:
101	# upgrade older plussed versions to 48+	105	# upgrade older plussed versions to 48+
Lines 106-115 _bdb_ARGS:= 48+ Link Here
106	. endif	110	. endif
107	.endfor	111	.endfor
108		112
109	.if ${_bdb_ARGS} == yes
110	_bdb_ARGS:= 48+
111	.endif
112
113	# 1. detect installed versions	113	# 1. detect installed versions
114	_INST_BDB_VER=	114	_INST_BDB_VER=
115	.for bdb in ${_DB_PORTS}	115	.for bdb in ${_DB_PORTS}




PYTHON3_DEFAULT?=	3.4
# Possible values: 2.0, 2.1, 2.2, 2.3
RUBY_DEFAULT?=		2.2
# Possible values: base, openssl, openssl-devel, libressl, libressl-devel
.if !defined(SSL_DEFAULT)
#	If no preference was set, check for an installed base version
#	but give an installed port preference over it.
.  if defined(WITH_OPENSSL_PORT)
.    if defined(OPENSSL_PORT)
SSL_DEFAULT:=${OPENSSL_PORT:T}
WARNING+=	"Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is deprecated, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}"
.    else
SSL_DEFAULT=openssl
WARNING+=	"Using WITH_OPENSSL_PORT in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=openssl"
.    endif
.  elif defined(WITH_OPENSSL_BASE)
SSL_DEFAULT=base
WARNING+=	"USing WITH_OPENSSL_BASE in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=base"
.  elif	!defined(WITH_OPENSSL_BASE) && \
	!defined(WITH_OPENSSL_PORT) && \
	!defined(SSL_DEFAULT) && \
	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
SSL_DEFAULT=	base
.  else
.    if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
# find installed port and use it for dependency
.      if !defined(OPENSSL_INSTALLED)
.        if defined(DESTDIR)
PKGARGS=	-c ${DESTDIR}
.        else
PKGARGS=
.        endif
OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || :
.      endif
.      if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)
SSL_DEFAULT:=		${OPENSSL_INSTALLED:T}
WARNING+=	"You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set"
.      endif
.    endif
.  endif
# Make sure we have a default in the end
SSL_DEFAULT?=	base
.endif
# Possible values: 8.4, 8.5, 8.6
TCLTK_DEFAULT?=		8.6






OpenSSL_Include_MAINTAINER=	dinoex@FreeBSD.org

.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
#	but give an installed port preference over it.
.if	!defined(WITH_OPENSSL_BASE) && \
	!defined(WITH_OPENSSL_PORT) && \
	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
WITH_OPENSSL_BASE=yes
.endif

.if ${SSL_DEFAULT} == base
OPENSSLBASE=		/usr
OPENSSLDIR?=		/etc/ssl


	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"
	@${ECHO_CMD} "base system. You can't build against it, while a newer"
	@${ECHO_CMD} "version is installed by a port."
	@${ECHO_CMD} "Please deinstall the port, remove DEFAULT_VERSIONS=ssl=base or undefine WITH_OPENSSL_BASE."
	@${FALSE}
.  endif


MAKE_ARGS+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
.  endif

.else # ${SSL_DEFAULT} != base

OPENSSLBASE=		${LOCALBASE}
.  if	!defined(OPENSSL_PORT) && \
	exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
# find installed port and use it for dependency
.    if !defined(OPENSSL_INSTALLED)
.      if defined(DESTDIR)
PKGARGS=	-c ${DESTDIR}
.      else
PKGARGS=
.      endif
OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || :
.    endif
.    if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != ""
OPENSSL_PORT=		${OPENSSL_INSTALLED}
OPENSSL_SHLIBFILE!=	${PKG_INFO} -ql ${OPENSSL_INSTALLED} | ${GREP} "^`${PKG_QUERY} "%p" ${OPENSSL_INSTALLED}`/lib/libcrypto.so.[0-9]*$$"
OPENSSL_SHLIBVER?=	${OPENSSL_SHLIBFILE:E}
.    endif
.  endif

OPENSSL_PORT=		security/${SSL_DEFAULT}

# Get OPENSSL_SHLIBVER from the port
.sinclude <${PORTSDIR}/${OPENSSL_PORT}/version.mk>
OPENSSL_SHLIBVER?=	38
.  elif defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/openssl-devel
OPENSSL_SHLIBVER?=	9
.  endif

.  if !defined(OPENSSL_SHLIBVER)
.error You are using an unsupported SSL provider ${SSL_DEFAULT}
.  endif

OPENSSLDIR?=		${OPENSSLBASE}/openssl
BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}




USE_PYTHON=	autoplist distutils
USE_OPENSSL=	yes

.include <bsd.port.options.mk>

.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
.endif

# borg requires openssl>=1.0.0
.if ${OSVERSION} < 1000015
WITH_OPENSSL_PORT=yes
.endif

.include <bsd.port.pre.mk>

.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
.endif

post-install:
	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/*.so


Lines 129-135 PERFSCHM_SUB_LIST+= PERFSCHEMRC="" Link Here

(-)databases/mysql57-server/Makefile (-3 / +6 lines)
129	PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"	129	PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
130	.endif	130	.endif
131		131
132	.include <bsd.port.pre.mk>	132	.include <bsd.port.options.mk>
133		133
134	### Just for the sake of FreeBSD 9.X ###	134	### Just for the sake of FreeBSD 9.X ###
135	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000	135	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
Lines 137-146 PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" Link Here
137	EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc	137	EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
138	.endif	138	.endif
139	WITH_OPENSSL_PORT= yes	139	WITH_OPENSSL_PORT= yes
		140	.endif
		141
		142	.include <bsd.port.pre.mk>
140		143
141	### FreeBSD Version > 9.X ###	144	### FreeBSD Version > 9.X ###
142	.else	145	.if ! ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
143	.if defined(WITH_OPENSSL_BASE)	146	.if ${SSL_DEFAULT} == base
144	CMAKE_ARGS+= -DWITH_SSL=system	147	CMAKE_ARGS+= -DWITH_SSL=system
145	.else	148	.else
146	CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}	149	CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}

Lines 40-46 BROKEN_sparc64= does not install: thread-local storage not supported Link Here

(-)devel/libgit2/Makefile (-1 / +1 lines)
40	post-patch:	40	post-patch:
41	@${REINPLACE_CMD} -e "s\|/pkgconfig\|/../libdata/pkgconfig\|; \	41	@${REINPLACE_CMD} -e "s\|/pkgconfig\|/../libdata/pkgconfig\|; \
42	/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt	42	/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
43	.if defined(WITH_OPENSSL_BASE)	43	.if ${SSL_DEFAULT} == base
44	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \	44	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
45	${WRKSRC}/CMakeLists.txt	45	${WRKSRC}/CMakeLists.txt
46	.endif	46	.endif

Lines 41-47 USE_OPENSSL= yes Link Here

(-)devel/libopkele/Makefile (-1 / +1 lines)
41	post-patch:	41	post-patch:
42	@ ${REINPLACE_CMD} -e "s\|pkgconfigdir =.*\|pkgconfigdir = ${PREFIX}/libdata/pkgconfig\|g" \	42	@ ${REINPLACE_CMD} -e "s\|pkgconfigdir =.*\|pkgconfigdir = ${PREFIX}/libdata/pkgconfig\|g" \
43	${WRKSRC}/Makefile.in	43	${WRKSRC}/Makefile.in
44	.if !defined(WITH_OPENSSL_PORT)	44	.if ${SSL_DEFAULT} == base
45	@ ${REINPLACE_CMD} -e "s\|Requires: openssl\|Requires:\|" ${WRKSRC}/libopkele.pc.in	45	@ ${REINPLACE_CMD} -e "s\|Requires: openssl\|Requires:\|" ${WRKSRC}/libopkele.pc.in
46	.endif	46	.endif
47		47

Lines 47-53 CONFIGURE_ARGS+= \ Link Here

(-)devel/thrift-cpp/Makefile (-1 / +1 lines)
47		47
48	.include <bsd.port.pre.mk>	48	.include <bsd.port.pre.mk>
49		49
50	.if !defined(WITH_OPENSSL_PORT) && \	50	.if ${SSL_DEFAULT} == base && \
51	${OPSYS} == FreeBSD && ${OSVERSION} < 1000015	51	${OPSYS} == FreeBSD && ${OSVERSION} < 1000015
52	# src/thrift/transport/TSSLSocket.cpp:147: error: 'TLSv1_1_method' was not declared in this scope	52	# src/thrift/transport/TSSLSocket.cpp:147: error: 'TLSv1_1_method' was not declared in this scope
53	# src/thrift/transport/TSSLSocket.cpp:149: error: 'TLSv1_2_method' was not declared in this scope	53	# src/thrift/transport/TSSLSocket.cpp:149: error: 'TLSv1_2_method' was not declared in this scope

Lines 207-213 PORTDOCS= * Link Here

(-)dns/bind9-devel/Makefile (-1 / +1 lines)
207		207
208	.include <bsd.port.pre.mk>	208	.include <bsd.port.pre.mk>
209		209
210	.if ( ${PORT_OPTIONS:MGOST} \|\| ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE)	210	.if ( ${PORT_OPTIONS:MGOST} \|\| ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base
211	BROKEN= OpenSSL from the base system does not support GOST, add \	211	BROKEN= OpenSSL from the base system does not support GOST, add \
212	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \	212	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
213	that needs SSL.	213	that needs SSL.

Lines 232-238 PORTDOCS= * Link Here

(-)dns/bind910/Makefile (-1 / +1 lines)
232		232
233	.include <bsd.port.pre.mk>	233	.include <bsd.port.pre.mk>
234		234
235	.if ( ${PORT_OPTIONS:MGOST} \|\| ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE)	235	.if ( ${PORT_OPTIONS:MGOST} \|\| ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base
236	BROKEN= OpenSSL from the base system does not support GOST, add \	236	BROKEN= OpenSSL from the base system does not support GOST, add \
237	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \	237	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
238	that needs SSL.	238	that needs SSL.

Lines 191-197 PORTDOCS= * Link Here

(-)dns/bind99/Makefile (-1 / +1 lines)
191		191
192	.include <bsd.port.pre.mk>	192	.include <bsd.port.pre.mk>
193		193
194	.if ( ${PORT_OPTIONS:MGOST} ) && defined(WITH_OPENSSL_BASE)	194	.if ( ${PORT_OPTIONS:MGOST} ) && ${SSL_DEFAULT} == base
195	BROKEN= OpenSSL from the base system does not support GOST, add \	195	BROKEN= OpenSSL from the base system does not support GOST, add \
196	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \	196	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
197	that needs SSL.	197	that needs SSL.

Lines 209-215 EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \ Link Here

(-)emulators/virtualbox-ose/Makefile (-1 / +1 lines)
209	${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk	209	${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk
210	.endif	210	.endif
211		211
212	.if !defined(WITH_OPENSSL_BASE)	212	.if ${SSL_DEFAULT} != base
213	CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}"	213	CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}"
214	.endif	214	.endif
215		215




TLS_SRP_DESC=		TLS-SRP (Secure Remote Password) support

LOCALBASE?=	/usr/local

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

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

IGNORE=		only supports LDAPS with SSL
.endif

.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT} != base
IGNORE=		GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
.endif

.if ${SSL_DEFAULT} == libressl
.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL}
IGNORE=		GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options
.endif

Lines 36-42 DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ Link Here

(-)mail/deforaos-mailer/Makefile (-1 / +1 lines)
36		36
37	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
38		38
39	.if defined(WITH_OPENSSL_BASE)	39	.if ${SSL_DEFAULT} == base
40	# openssl from base doesn't install a .pc file and pkg-config didn't like it	40	# openssl from base doesn't install a .pc file and pkg-config didn't like it
41	CONFIGURE_ENV+= libssl_CFLAGS="-I${OPENSSLINC}" libssl_LIBS="-L${OPENSSLLIB} -lssl"	41	CONFIGURE_ENV+= libssl_CFLAGS="-I${OPENSSLINC}" libssl_LIBS="-L${OPENSSLLIB} -lssl"
42	.endif	42	.endif

Lines 85-91 SITE_SUB+= -e '\\|bld_USE_ARLIB\|s/^dnl //g' Link Here

(-)mail/dk-milter/Makefile (-1 / +1 lines)
85	SITE_SUB+= -e '/-DPOPAUTH/s/^dnl //g'	85	SITE_SUB+= -e '/-DPOPAUTH/s/^dnl //g'
86	.endif	86	.endif
87		87
88	.if defined(WITH_OPENSSL_BASE)	88	.if ${SSL_DEFAULT} == base
89	SITE_SUB+= -e 's\|%%OPENSSL%%\|dnl \|g'	89	SITE_SUB+= -e 's\|%%OPENSSL%%\|dnl \|g'
90	.else	90	.else
91	SITE_SUB+= -e 's\|%%OPENSSL%%\|\|g' \	91	SITE_SUB+= -e 's\|%%OPENSSL%%\|\|g' \

Lines 310-316 help: Link Here

(-)mail/sendmail/Makefile (-1 / +1 lines)
310	.include <bsd.port.pre.mk>	310	.include <bsd.port.pre.mk>
311		311
312	.if ${PORT_OPTIONS:MTLS}	312	.if ${PORT_OPTIONS:MTLS}
313	.if !defined(WITH_OPENSSL_BASE)	313	.if ${SSL_DEFAULT} != base
314	SITE+= ${FILESDIR}/site.config.m4.ssl	314	SITE+= ${FILESDIR}/site.config.m4.ssl
315	.endif	315	.endif
316	SITE+= ${FILESDIR}/site.config.m4.tls	316	SITE+= ${FILESDIR}/site.config.m4.tls

Lines 33-39 INSTALL_TARGET= install-strip Link Here

(-)net-im/telepathy-gabble/Makefile (-2 / +4 lines)
33		33
34	PLIST_SUB= PVERSION=${PORTVERSION}	34	PLIST_SUB= PVERSION=${PORTVERSION}
35		35
36	.if defined(WITH_OPENSSL_BASE)	36	.include <bsd.port.pre.mk>
		37
		38	.if ${SSL_DEFAULT} == base
37	CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include"	39	CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include"
38	.endif	40	.endif
39		41
Lines 41-44 post-patch: Link Here
41	@${REINPLACE_CMD} -e 's\|-Werror\|\|g' \	43	@${REINPLACE_CMD} -e 's\|-Werror\|\|g' \
42	${WRKSRC}/lib/ext/wocky/configure	44	${WRKSRC}/lib/ext/wocky/configure
43		45
44	.include <bsd.port.mk>	46	.include <bsd.port.post.mk>

Lines 23-29 INSTALL_TARGET= install-strip Link Here

(-)net-im/telepathy-idle/Makefile (-1 / +1 lines)
23		23
24	.include <bsd.port.pre.mk>	24	.include <bsd.port.pre.mk>
25		25
26	.if defined(WITH_OPENSSL_BASE)	26	.if ${SSL_DEFAULT} == base
27	CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto" OPENSSL_CFLAGS="-I/usr/include"	27	CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto" OPENSSL_CFLAGS="-I/usr/include"
28	.endif	28	.endif
29		29

Lines 215-221 CONFLICTS= ucd-snmp-4.* net-snmp-5.3.* Link Here

(-)net-mgmt/net-snmp/Makefile (-1 / +1 lines)
215		215
216	.include <bsd.port.pre.mk>	216	.include <bsd.port.pre.mk>
217		217
218	.if defined(WITH_OPENSSL_PORT) \|\| defined(OPENSSL_PORT)	218	.if ${SSL_DEFAULT} != base
219	LCRYPTO= -lcrypto	219	LCRYPTO= -lcrypto
220	.else	220	.else
221	LCRYPTO=	221	LCRYPTO=

Lines 150-158 GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls Link Here

(-)net-mgmt/zabbix3-server/Makefile (-3 / +5 lines)
150	POLARSSL_CONFIGURE_WITH=mbedtls	150	POLARSSL_CONFIGURE_WITH=mbedtls
151	POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13	151	POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13
152		152
153	.include <bsd.port.options.mk>	153	.include <bsd.port.pre.mk>
154		154
155	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT)	155	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base
156	IGNORE= OpenSSL from the base system is too old, add WITH_OPENSSL_PORT to your /etc/make.conf and rebuild everything that needs SSL.	156	IGNORE= OpenSSL from the base system is too old, add WITH_OPENSSL_PORT to your /etc/make.conf and rebuild everything that needs SSL.
157	.endif	157	.endif
158		158
Lines 192-197 post-install: Link Here
192	${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \	192	${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \
193	${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/)	193	${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/)
194	.endif	194	.endif
		195	.else # frontend
		196	.include <bsd.port.pre.mk>
195	.endif	197	.endif
196		198
197	.include <bsd.port.mk>	199	.include <bsd.port.post.mk>





PORTS_SSL_DESC= Build with OpenSSL from ports (instead of base system)

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MPORTS_SSL}
.if ${SSL_DEFAULT} == base
IGNORE=		the PORTS_SSL option not allowed when using SSL from base
.endif
CONFIGURE_ARGS+= --with-ssl-dir=${PREFIX}
.else
.if ${SSL_DEFAULT} != base
IGNORE=		the PORTS_SSL option is required when using SSL from ports
.endif
.endif


	${INSTALL_MAN} ${WRKSRC}/hostapd/hostapd.8 \
		${STAGEDIR}${MANPREFIX}/man/man8

.include <bsd.port.post.mk>




# XXX FreeBSD does not implement O_DSYNC and fdatasync at this time.
CFLAGS+=		-DMDB_DSYNC=O_SYNC -Dfdatasync=fsync

.if !${PORT_OPTIONS:MFETCH}
CONFIGURE_ARGS+=	--without-fetch
.else
. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || defined(WITH_OPENSSL_PORT)
BROKEN=	using OpenSSL from ports and OPTION FETCH together is not supported
. endif
.endif

.if ${PORT_OPTIONS:MSASL}
LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
CONFIGURE_ARGS+=	--with-cyrus-sasl

PLIST_SUB+=		SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}
PLIST_SUB+=		OPENLDAP_MAJOR=${OPENLDAP_MAJOR}

.include <bsd.port.pre.mk>

.if !${PORT_OPTIONS:MFETCH}
CONFIGURE_ARGS+=	--without-fetch
.else
. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base
BROKEN=	using OpenSSL from ports and OPTION FETCH together is not supported
. endif
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
		${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf

.endif
.endif # defined(CLIENT_ONLY)

.include <bsd.port.post.mk>

Lines 29-35 OPTIONS_DEFINE= DOCS Link Here

(-)net/socat/Makefile (-1 / +1 lines)
29		29
30	.include <bsd.port.pre.mk>	30	.include <bsd.port.pre.mk>
31		31
32	.if defined(WITH_OPENSSL_PORT)	32	.if ${SSL_DEFAULT} != base
33	CFLAGS+= -I${LOCALBASE}/include	33	CFLAGS+= -I${LOCALBASE}/include
34	LDFLAGS+= -L${LOCALBASE}/lib	34	LDFLAGS+= -L${LOCALBASE}/lib
35	.endif	35	.endif

Lines 110-116 CONFIGURE_ARGS+= \ Link Here

(-)net/tigervnc/Makefile (-1 / +1 lines)
110	TIGERVNC_XORG_PATCH_VER= 117	110	TIGERVNC_XORG_PATCH_VER= 117
111		111
112	# import from x11-server/xorg-server/Makefile	112	# import from x11-server/xorg-server/Makefile
113	.ifdef WITH_OPENSSL_BASE	113	.if ${SSL_DEFAULT} == base
114	# The reason why I use this is cause openssl from base doesn't	114	# The reason why I use this is cause openssl from base doesn't
115	# install a .pc file and configure will fail trying to find it.	115	# install a .pc file and configure will fail trying to find it.
116	# Setting both of those variables to a non-empty value by-passes	116	# Setting both of those variables to a non-empty value by-passes

Lines 13-19 LICENSE= MIT Link Here

(-)security/R-cran-openssl/Makefile (-2 / +2 lines)
13		13
14	USES= cran:auto-plist	14	USES= cran:auto-plist
15		15
16	.include <bsd.port.pre.mk>	16	.include <bsd.port.options.mk>
17		17
18	.if ${OSVERSION} < 1000015	18	.if ${OSVERSION} < 1000015
19	WITH_OPENSSL_PORT= yes	19	WITH_OPENSSL_PORT= yes
Lines 21-24 R_POSTCMD_INSTALL_OPTIONS+= --configure-vars="INCLUDE_DIR=${OPENSSLINC} LIB_DIR= Link Here
21	.include "${PORTSDIR}/Mk/bsd.openssl.mk"	21	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
22	.endif	22	.endif
23		23
24	.include <bsd.port.post.mk>	24	.include <bsd.port.mk>

Lines 137-144 CMAKE_ARGS+= -D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}" Link Here

(-)security/bro/Makefile (-2 / +2 lines)
137	BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl	137	BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl
138	RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl	138	RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl
139	.else	139	.else
140	.if defined(WITH_OPENSSL_PORT)	140	.if ${SSL_DEFAULT} != base
141	IGNORE= the SSL option is requred when WITH_OPENSSL_PORT is enabled	141	IGNORE= the SSL option is requred when using SSL from ports
142	.endif	142	.endif
143	.endif	143	.endif
144		144

Added Link Here

(-)security/libressl-devel/version.mk (+1 lines)
1	OPENSSL_SHLIBVER?= 38

Added Link Here

(-)security/libressl/version.mk (+1 lines)
1	OPENSSL_SHLIBVER?= 37

Lines 43-49 USE_OPENSSL= yes Link Here

(-)security/libssh2/Makefile (-1 / +1 lines)
43	post-patch:	43	post-patch:
44	@${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \	44	@${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \
45	${WRKSRC}/libssh2.pc.in	45	${WRKSRC}/libssh2.pc.in
46	.if defined(WITH_OPENSSL_BASE)	46	.if ${SSL_DEFAULT} == base
47	@${REINPLACE_CMD} -e 's/LIBSREQUIRED=libssl,libcrypto/LIBS="$$LIBS -lssl -lcrypto"/' \	47	@${REINPLACE_CMD} -e 's/LIBSREQUIRED=libssl,libcrypto/LIBS="$$LIBS -lssl -lcrypto"/' \
48	${WRKSRC}/configure	48	${WRKSRC}/configure
49	.endif	49	.endif

Added Link Here

(-)security/openssl-devel/version.mk (+1 lines)
1	OPENSSL_SHLIBVER?= 9

Added Link Here

(-)security/openssl/version.mk (+1 lines)
1	OPENSSL_SHLIBVER?= 8

Lines 114-120 post-stage: Link Here

(-)security/p5-openxpki/Makefile (-1 / +1 lines)
114		114
115	.include <bsd.port.pre.mk>	115	.include <bsd.port.pre.mk>
116		116
117	.if defined(WITH_OPENSSL_PORT) && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl	117	.if ${SSL_DEFAULT} == libressl
118	IGNORE= this version of OpenXPKI is not fully functional with LibreSSL library, use OpenSSL instead	118	IGNORE= this version of OpenXPKI is not fully functional with LibreSSL library, use OpenSSL instead
119	.endif	119	.endif
120		120

Lines 27-33 PLIST_FILES= %%PYTHON_SITELIBDIR%%/M2Crypto/_m2crypto.py \ Link Here

(-)security/py-m2crypto/Makefile (-1 / +1 lines)
27		27
28	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
29		29
30	.if ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT)	30	.if ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base
31	IGNORE= py-m2crypto requires OpenSSL 1.0.1e+	31	IGNORE= py-m2crypto requires OpenSSL 1.0.1e+
32	.endif	32	.endif
33		33

Lines 38-45 CRYP_OPEN_USE= openssl=yes Link Here

(-)security/softhsm2/Makefile (-2 / +4 lines)
38	CRYP_OPEN_VARS= WITH_OPENSSL_PORT=yes	38	CRYP_OPEN_VARS= WITH_OPENSSL_PORT=yes
39	CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl	39	CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl
40		40
41	.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl	41	.include <bsd.port.pre.mk>
		42
		43	.if ${SSL_DEFAULT} == libressl
42	CONFIGURE_ARGS+= --disable-gost	44	CONFIGURE_ARGS+= --disable-gost
43	.endif	45	.endif
44		46
45	.include <bsd.port.mk>	47	.include <bsd.port.post.mk>

Lines 74-84 CONFIGURE_ARGS+=--with-threads=pthread Link Here

(-)security/stunnel/Makefile (-3 / +5 lines)
74	LDFLAGS+= -lpthread	74	LDFLAGS+= -lpthread
75	.endif	75	.endif
76		76
77	.if ${PORT_OPTIONS:MFIPS} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl	77	.include <bsd.port.pre.mk>
		78
		79	.if ${PORT_OPTIONS:MFIPS} && ${SSL_DEFAULT} == libressl
78	IGNORE= LibreSSL does not support FIPS standard	80	IGNORE= LibreSSL does not support FIPS standard
79	.endif	81	.endif
80		82
81	.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl	83	.if ${SSL_DEFAULT} == libressl
82	NO_PACKAGE= The stunnel license restricts distribution when linked to non-OpenSSL non-base SSL-libraries	84	NO_PACKAGE= The stunnel license restricts distribution when linked to non-OpenSSL non-base SSL-libraries
83	.endif	85	.endif
84		86
Lines 115-118 cert: Link Here
115	@${ECHO} ""	117	@${ECHO} ""
116	@(cd ${WRKSRC}/tools/; make install-data-local)	118	@(cd ${WRKSRC}/tools/; make install-data-local)
117		119
118	.include <bsd.port.mk>	120	.include <bsd.port.post.mk>

Lines 41-47 PLIST_FILES= include/microhttpd.h \ Link Here

(-)www/libmicrohttpd/Makefile (-1 / +1 lines)
41		41
42	.include <bsd.port.pre.mk>	42	.include <bsd.port.pre.mk>
43		43
44	.if !(defined(WITH_OPENSSL_BASE) && ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015)	44	.if !(${SSL_DEFAULT} == base && ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015)
45	PLIST_FILES+= include/microspdy.h \	45	PLIST_FILES+= include/microspdy.h \
46	lib/libmicrospdy.a \	46	lib/libmicrospdy.a \
47	lib/libmicrospdy.so \	47	lib/libmicrospdy.so \

Lines 37-43 PORTDOCS= * Link Here

(-)www/spdylay/Makefile (-1 / +1 lines)
37		37
38	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
39		39
40	.if ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT)	40	.if ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base
41	IGNORE= spdylay requires OpenSSL 1.0.1+	41	IGNORE= spdylay requires OpenSSL 1.0.1+
42	.endif	42	.endif
43		43

Lines 64-70 PLIST= ${.CURDIR}/pkg-plist Link Here

(-)x11-servers/xorg-server/Makefile (-1 / +1 lines)
64		64
65	.include <bsd.port.pre.mk>	65	.include <bsd.port.pre.mk>
66		66
67	.if defined(WITH_OPENSSL_BASE)	67	.if ${SSL_DEFAULT} == base
68	# The reason why I use this is cause openssl from base doesn't install a .pc file	68	# The reason why I use this is cause openssl from base doesn't install a .pc file
69	# and configure will fail trying to find it. Setting both of those variables to	69	# and configure will fail trying to find it. Setting both of those variables to
70	# a non-empty value by-passes the pkg-config check.	70	# a non-empty value by-passes the pkg-config check.

Return to bug 210149

Lines 61-66 PYTHON2_DEFAULT?= 2.7 Link Here

(-)Mk/bsd.default-versions.mk (+41 lines)
61	PYTHON3_DEFAULT?= 3.4	61	PYTHON3_DEFAULT?= 3.4
62	# Possible values: 2.0, 2.1, 2.2, 2.3	62	# Possible values: 2.0, 2.1, 2.2, 2.3
63	RUBY_DEFAULT?= 2.2	63	RUBY_DEFAULT?= 2.2
		64	# Possible values: base, openssl, openssl-devel, libressl, libressl-devel
		65	.if !defined(SSL_DEFAULT)
		66	# If no preference was set, check for an installed base version
		67	# but give an installed port preference over it.
		68	. if defined(WITH_OPENSSL_PORT)
		69	. if defined(OPENSSL_PORT)
		70	SSL_DEFAULT:=${OPENSSL_PORT:T}
		71	WARNING+= "Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is deprecated, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}"
		72	. else
		73	SSL_DEFAULT=openssl
		74	WARNING+= "Using WITH_OPENSSL_PORT in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=openssl"
		75	. endif
		76	. elif defined(WITH_OPENSSL_BASE)
		77	SSL_DEFAULT=base
		78	WARNING+= "USing WITH_OPENSSL_BASE in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=base"
		79	. elif !defined(WITH_OPENSSL_BASE) && \
		80	!defined(WITH_OPENSSL_PORT) && \
		81	!defined(SSL_DEFAULT) && \
		82	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
		83	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
		84	SSL_DEFAULT= base
		85	. else
		86	. if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
		87	# find installed port and use it for dependency
		88	. if !defined(OPENSSL_INSTALLED)
		89	. if defined(DESTDIR)
		90	PKGARGS= -c ${DESTDIR}
		91	. else
		92	PKGARGS=
		93	. endif
		94	OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so \|\| :
		95	. endif
		96	. if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)
		97	SSL_DEFAULT:= ${OPENSSL_INSTALLED:T}
		98	WARNING+= "You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set"
		99	. endif
		100	. endif
		101	. endif
		102	# Make sure we have a default in the end
		103	SSL_DEFAULT?= base
		104	.endif
64	# Possible values: 8.4, 8.5, 8.6	105	# Possible values: 8.4, 8.5, 8.6
65	TCLTK_DEFAULT?= 8.6	106	TCLTK_DEFAULT?= 8.6
66		107

Lines 31-46 Link Here

(-)Mk/bsd.openssl.mk (-39 / +11 lines)
31		31
32	OpenSSL_Include_MAINTAINER= dinoex@FreeBSD.org	32	OpenSSL_Include_MAINTAINER= dinoex@FreeBSD.org
33		33
34	# If no preference was set, check for an installed base version	34	.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
35	# but give an installed port preference over it.
36	.if !defined(WITH_OPENSSL_BASE) && \
37	!defined(WITH_OPENSSL_PORT) && \
38	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
39	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
40	WITH_OPENSSL_BASE=yes
41	.endif
42		35
43	.if defined(WITH_OPENSSL_BASE)	36	.if ${SSL_DEFAULT} == base
44	OPENSSLBASE= /usr	37	OPENSSLBASE= /usr
45	OPENSSLDIR?= /etc/ssl	38	OPENSSLDIR?= /etc/ssl
46		39
Lines 59-65 check-depends:: Link Here
59	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"	52	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"
60	@${ECHO_CMD} "base system. You can't build against it, while a newer"	53	@${ECHO_CMD} "base system. You can't build against it, while a newer"
61	@${ECHO_CMD} "version is installed by a port."	54	@${ECHO_CMD} "version is installed by a port."
62	@${ECHO_CMD} "Please deinstall the port or undefine WITH_OPENSSL_BASE."	55	@${ECHO_CMD} "Please deinstall the port, remove DEFAULT_VERSIONS=ssl=base or undefine WITH_OPENSSL_BASE."
63	@${FALSE}	56	@${FALSE}
64	. endif	57	. endif
65		58
Lines 81-119 OPENSSL_CFLAGS+= -DNO_IDEA Link Here
81	MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"	74	MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
82	. endif	75	. endif
83		76
84	.else # !defined(WITH_OPENSSL_BASE)	77	.else # ${SSL_DEFAULT} != base
85		78
86	OPENSSLBASE= ${LOCALBASE}	79	OPENSSLBASE= ${LOCALBASE}
87	. if !defined(OPENSSL_PORT) && \
88	exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
89	# find installed port and use it for dependency
90	. if !defined(OPENSSL_INSTALLED)
91	. if defined(DESTDIR)
92	PKGARGS= -c ${DESTDIR}
93	. else
94	PKGARGS=
95	. endif
96	OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so \|\| :
97	. endif
98	. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != ""
99	OPENSSL_PORT= ${OPENSSL_INSTALLED}
100	OPENSSL_SHLIBFILE!= ${PKG_INFO} -ql ${OPENSSL_INSTALLED} \| ${GREP} "^`${PKG_QUERY} "%p" ${OPENSSL_INSTALLED}`/lib/libcrypto.so.[0-9]*$$"
101	OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E}
102	. endif
103	. endif
104		80
105	# LibreSSL and OpenSSL-BETA specific SHLIBVER	81	OPENSSL_PORT= security/${SSL_DEFAULT}
106	. if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl	82
107	OPENSSL_SHLIBVER?= 37	83	# Get OPENSSL_SHLIBVER from the port
108	. elif defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl-devel	84	.sinclude <${PORTSDIR}/${OPENSSL_PORT}/version.mk>
109	OPENSSL_SHLIBVER?= 38
110	. elif defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/openssl-devel
111	OPENSSL_SHLIBVER?= 9
112	. endif
113		85
114	# default	86	. if !defined(OPENSSL_SHLIBVER)
115	OPENSSL_PORT?= security/openssl	87	.error You are using an unsupported SSL provider ${SSL_DEFAULT}
116	OPENSSL_SHLIBVER?= 8	88	. endif
117		89
118	OPENSSLDIR?= ${OPENSSLBASE}/openssl	90	OPENSSLDIR?= ${OPENSSLBASE}/openssl
119	BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}	91	BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}

Lines 27-43 USES= python:3.4+ Link Here

(-)archivers/py-borgbackup/Makefile (-5 / +7 lines)
27	USE_PYTHON= autoplist distutils	27	USE_PYTHON= autoplist distutils
28	USE_OPENSSL= yes	28	USE_OPENSSL= yes
29		29
30	.include <bsd.port.pre.mk>	30	.include <bsd.port.options.mk>
31
32	.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
33	IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
34	.endif
35		31
36	# borg requires openssl>=1.0.0	32	# borg requires openssl>=1.0.0
37	.if ${OSVERSION} < 1000015	33	.if ${OSVERSION} < 1000015
38	WITH_OPENSSL_PORT=yes	34	WITH_OPENSSL_PORT=yes
39	.endif	35	.endif
40		36
		37	.include <bsd.port.pre.mk>
		38
		39	.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
		40	IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
		41	.endif
		42
41	post-install:	43	post-install:
42	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/*.so	44	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/*.so
43		45

Lines 32-38 THREADED_RESOLVER_DESC= Threaded DNS resolver Link Here

(-)ftp/curl/Makefile (-3 / +6 lines)
32	TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support	32	TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support
33		33
34	LOCALBASE?= /usr/local	34	LOCALBASE?= /usr/local
35	.if defined(WITH_OPENSSL_PORT) \|\| (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so))	35
		36	.include <${PORTSDIR}/Mk/bsd.default-versions.mk>
		37
		38	.if ${SSL_DEFAULT} != base
36	OPTIONS_DEFAULT+= GSSAPI_NONE	39	OPTIONS_DEFAULT+= GSSAPI_NONE
37	.else	40	.else
38	OPTIONS_DEFAULT+= GSSAPI_BASE	41	OPTIONS_DEFAULT+= GSSAPI_BASE
Lines 148-158 IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS Link Here
148	IGNORE= only supports LDAPS with SSL	151	IGNORE= only supports LDAPS with SSL
149	.endif	152	.endif
150		153
151	.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && (defined(WITH_OPENSSL_PORT) \|\| (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)))	154	.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT} != base
152	IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system	155	IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
153	.endif	156	.endif
154		157
155	.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"	158	.if ${SSL_DEFAULT} == libressl
156	.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL}	159	.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL}
157	IGNORE= GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options	160	IGNORE= GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options
158	.endif	161	.endif

Lines 24-39 OPTIONS_DEFINE= PORTS_SSL Link Here

(-)net/hostapd/Makefile (-6 / +6 lines)
24		24
25	PORTS_SSL_DESC= Build with OpenSSL from ports (instead of base system)	25	PORTS_SSL_DESC= Build with OpenSSL from ports (instead of base system)
26		26
27	.include <bsd.port.options.mk>	27	.include <bsd.port.pre.mk>
28		28
29	.if ${PORT_OPTIONS:MPORTS_SSL}	29	.if ${PORT_OPTIONS:MPORTS_SSL}
30	.if !defined(WITH_OPENSSL_PORT)	30	.if ${SSL_DEFAULT} == base
31	IGNORE= the PORTS_SSL option not allowed when WITH_OPENSSL_PORT is not set	31	IGNORE= the PORTS_SSL option not allowed when using SSL from base
32	.endif	32	.endif
33	CONFIGURE_ARGS+= --with-ssl-dir=${PREFIX}	33	CONFIGURE_ARGS+= --with-ssl-dir=${PREFIX}
34	.else	34	.else
35	.if defined(WITH_OPENSSL_PORT)	35	.if ${SSL_DEFAULT} != base
36	IGNORE= the PORTS_SSL option is required when WITH_OPENSSL_PORT is set	36	IGNORE= the PORTS_SSL option is required when using SSL from ports
37	.endif	37	.endif
38	.endif	38	.endif
39		39
Lines 52-55 do-install: Link Here
52	${INSTALL_MAN} ${WRKSRC}/hostapd/hostapd.8 \	52	${INSTALL_MAN} ${WRKSRC}/hostapd/hostapd.8 \
53	${STAGEDIR}${MANPREFIX}/man/man8	53	${STAGEDIR}${MANPREFIX}/man/man8
54		54
55	.include <bsd.port.mk>	55	.include <bsd.port.post.mk>

Lines 189-202 CONFIGURE_ARGS= --with-threads=posix \ Link Here

(-)net/openldap24-server/Makefile (-9 / +11 lines)
189	# XXX FreeBSD does not implement O_DSYNC and fdatasync at this time.	189	# XXX FreeBSD does not implement O_DSYNC and fdatasync at this time.
190	CFLAGS+= -DMDB_DSYNC=O_SYNC -Dfdatasync=fsync	190	CFLAGS+= -DMDB_DSYNC=O_SYNC -Dfdatasync=fsync
191		191
192	.if !${PORT_OPTIONS:MFETCH}
193	CONFIGURE_ARGS+= --without-fetch
194	.else
195	. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" \|\| defined(WITH_OPENSSL_PORT)
196	BROKEN= using OpenSSL from ports and OPTION FETCH together is not supported
197	. endif
198	.endif
199
200	.if ${PORT_OPTIONS:MSASL}	192	.if ${PORT_OPTIONS:MSASL}
201	LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2	193	LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2
202	CONFIGURE_ARGS+= --with-cyrus-sasl	194	CONFIGURE_ARGS+= --with-cyrus-sasl
Lines 512-517 PLIST_SUB+= SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR} Link Here
512	PLIST_SUB+= SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}	504	PLIST_SUB+= SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}
513	PLIST_SUB+= OPENLDAP_MAJOR=${OPENLDAP_MAJOR}	505	PLIST_SUB+= OPENLDAP_MAJOR=${OPENLDAP_MAJOR}
514		506
		507	.include <bsd.port.pre.mk>
		508
		509	.if !${PORT_OPTIONS:MFETCH}
		510	CONFIGURE_ARGS+= --without-fetch
		511	.else
		512	. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" \|\| ${SSL_DEFAULT} != base
		513	BROKEN= using OpenSSL from ports and OPTION FETCH together is not supported
		514	. endif
		515	.endif
		516
515	post-patch:	517	post-patch:
516	@${REINPLACE_CMD} -e 's\|%LOCALSTATEDIR%/run/\|${LDAP_RUN_DIR}/\|g' \	518	@${REINPLACE_CMD} -e 's\|%LOCALSTATEDIR%/run/\|${LDAP_RUN_DIR}/\|g' \
517	${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf	519	${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf
Lines 588-591 post-install: Link Here
588	.endif	590	.endif
589	.endif # defined(CLIENT_ONLY)	591	.endif # defined(CLIENT_ONLY)
590		592
591	.include <bsd.port.mk>	593	.include <bsd.port.post.mk>