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

Collapse All | Expand All

(-)net/openntpd/Makefile (-5 / +24 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	openntpd
3
PORTNAME=	openntpd
4
PORTVERSION=	6.0p1
4
PORTVERSION=	6.0p1
5
PORTREVISION=	1
5
PORTREVISION=	2
6
PORTEPOCH=	2
6
PORTEPOCH=	2
7
CATEGORIES=	net
7
CATEGORIES=	net
8
MASTER_SITES=	OPENBSD/OpenNTPD
8
MASTER_SITES=	OPENBSD/OpenNTPD
Lines 27-34 OPTIONS_DEFAULT= RESSL Link Here
27
# Requires libtls from LibreSSL
27
# Requires libtls from LibreSSL
28
RESSL_USES=		ssl
28
RESSL_USES=		ssl
29
RESSL_CONFIGURE_WITH=	cacert=${LOCALBASE}/etc/ssl/cert.pem
29
RESSL_CONFIGURE_WITH=	cacert=${LOCALBASE}/etc/ssl/cert.pem
30
RESSL_CPPFLAGS=		-I${OPENSSLINC}
31
RESSL_LDFLAGS=		-L${OPENSSLLIB}
32
RESSL_RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
30
RESSL_RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
33
31
34
pre-build:
32
pre-build:
Lines 40-47 post-stage: Link Here
40
38
41
.include <bsd.port.pre.mk>
39
.include <bsd.port.pre.mk>
42
40
43
.if ${PORT_OPTIONS:MRESSL} && empty(SSL_DEFAULT:Mlibressl*)
41
.if ${PORT_OPTIONS:MRESSL}
44
IGNORE=	Requires LibreSSL from ports, define DEFAULT_VERSIONS+=ssl=libressl in your make.conf and rebuild everything.
42
. if ${SSL_DEFAULT:Mlibressl*}
43
CPPFLAGS+=		-I${OPENSSLINC}
44
LDFLAGS+=		-L${OPENSSLLIB}
45
. else # SSL_DEFAULT
46
BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
47
CPPFLAGS+=		-I${WRKDIR}/libressl/include
48
LDFLAGS+=		-L${WRKDIR}/libressl/lib
49
.  ifnmake describe
50
STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
51
.  endif
52
# security/libressl ignores implicit SSP_UNSAFE, see Mk/bsd.ssp.mk
53
.  if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 && ${ARCH} == i386
54
SSP_CFLAGS?=	-fstack-protector
55
CFLAGS+=	${SSP_CFLAGS}
56
LDFLAGS+=	-fstack-protector
57
LIBS+=		-lssp_nonshared
58
.  endif
59
60
pre-configure:
61
	@(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
62
		. ${WRKDIR}/libressl "! -name *.so*")
63
. endif # SSL_DEFAULT
45
.endif
64
.endif
46
65
47
.include <bsd.port.post.mk>
66
.include <bsd.port.post.mk>

Return to bug 213691