--- www/obhttpd/Makefile	(revision 424946)
+++ www/obhttpd/Makefile	(working copy)
@@ -15,12 +15,9 @@ 
 GH_ACCOUNT=	koue
 GH_PROJECT=	httpd
 
-USE_OPENSSL=	yes
 USE_RC_SUBR=	obhttpd
 USES=		uidfix
 
-WITH_OPENSSL_PORT=yes
-
 CFLAGS+=	-Wall
 
 MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
@@ -49,8 +46,26 @@ 
 
 .include <bsd.port.pre.mk>
 
-.if empty(SSL_DEFAULT:Mlibressl*)
-IGNORE=		Need LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything.
-.endif
+.if ${SSL_DEFAULT:Mlibressl*}
+USES+=		ssl
+.else
+BUILD_DEPENDS+=	${NONEXISTENT}:security/libressl:stage
+CFLAGS+=	-I${WRKDIR}/libressl/include
+LDFLAGS+=	-L${WRKDIR}/libressl/lib
+. ifnmake describe
+STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
+. endif
+# security/libressl ignores implicit SSP_UNSAFE, see Mk/bsd.ssp.mk
+. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 && ${ARCH} == i386
+SSP_CFLAGS?=	-fstack-protector
+CFLAGS+=	${SSP_CFLAGS}
+LDFLAGS+=	-fstack-protector
+LIBS+=		-lssp_nonshared
+. endif
 
+pre-configure:
+	@(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
+		. ${WRKDIR}/libressl "! -name *.so*")
+.endif # SSL_DEFAULT
+
 .include <bsd.port.post.mk>