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

Collapse All | Expand All

(-)www/obhttpd/Makefile (-6 / +21 lines)
Lines 15-26 Link Here
15
GH_ACCOUNT=	koue
15
GH_ACCOUNT=	koue
16
GH_PROJECT=	httpd
16
GH_PROJECT=	httpd
17
17
18
USE_OPENSSL=	yes
19
USE_RC_SUBR=	obhttpd
18
USE_RC_SUBR=	obhttpd
20
USES=		uidfix
19
USES=		uidfix
21
20
22
WITH_OPENSSL_PORT=yes
23
24
CFLAGS+=	-Wall
21
CFLAGS+=	-Wall
25
22
26
MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
23
MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
Lines 49-56 Link Here
49
46
50
.include <bsd.port.pre.mk>
47
.include <bsd.port.pre.mk>
51
48
52
.if empty(SSL_DEFAULT:Mlibressl*)
49
.if ${SSL_DEFAULT:Mlibressl*}
53
IGNORE=		Need LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything.
50
USES+=		ssl
54
.endif
51
.else
52
BUILD_DEPENDS+=	${NONEXISTENT}:security/libressl:stage
53
CFLAGS+=	-I${WRKDIR}/libressl/include
54
LDFLAGS+=	-L${WRKDIR}/libressl/lib
55
. ifnmake describe
56
STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
57
. endif
58
# security/libressl ignores implicit SSP_UNSAFE, see Mk/bsd.ssp.mk
59
. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 && ${ARCH} == i386
60
SSP_CFLAGS?=	-fstack-protector
61
CFLAGS+=	${SSP_CFLAGS}
62
LDFLAGS+=	-fstack-protector
63
LIBS+=		-lssp_nonshared
64
. endif
55
65
66
pre-configure:
67
	@(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
68
		. ${WRKDIR}/libressl "! -name *.so*")
69
.endif # SSL_DEFAULT
70
56
.include <bsd.port.post.mk>
71
.include <bsd.port.post.mk>

Return to bug 213822