Index: head/www/obhttpd/Makefile
===================================================================
--- head/www/obhttpd/Makefile	(revision 453877)
+++ head/www/obhttpd/Makefile	(revision 453878)
@@ -1,51 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	obhttpd
 PORTVERSION=	6.0.20161006
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	koue@chaosophia.net
 COMMENT=	OpenBSD http server
 
 LICENSE=	BSD3CLAUSE
 
 WRKSRC_SUBDIR=	src
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	koue
 GH_PROJECT=	httpd
 
 USE_RC_SUBR=	obhttpd
 USES=		ssl uidfix
 
 CFLAGS+=	-Wall
 
 MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
 
 USERS=		www
 GROUPS=		www
 
 post-patch:
 	${REINPLACE_CMD} -e 's|httpd$$|obhttpd|g' \
 			 -e 's|httpd.conf.5|obhttpd.conf.5|g' \
 			 -e 's|httpd.8|obhttpd.8|g' ${WRKSRC}/usr.sbin/httpd/Makefile
 	${REINPLACE_CMD} -e 's|htpasswd$$|obhtpasswd|g' \
 			 -e 's|htpasswd.1|obhtpasswd.1|g' ${WRKSRC}/usr.bin/htpasswd/Makefile
 	${MV} ${WRKSRC}/usr.bin/htpasswd/htpasswd.1 ${WRKSRC}/usr.bin/htpasswd/obhtpasswd.1
 	${MV} ${WRKSRC}/usr.sbin/httpd/httpd.conf.5 ${WRKSRC}/usr.sbin/httpd/obhttpd.conf.5
 	${MV} ${WRKSRC}/usr.sbin/httpd/httpd.8 ${WRKSRC}/usr.sbin/httpd/obhttpd.8
 	${REINPLACE_CMD} -e 's|/etc/httpd.conf|${PREFIX}/etc/obhttpd.conf|g' \
 		${WRKSRC}/usr.sbin/httpd/httpd.h
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/examples/httpd.conf \
 		${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample
 
 .include <bsd.port.pre.mk>
 
-.if empty(SSL_DEFAULT:Mlibressl*)
-IGNORE=		needs LibreSSL to build. Set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything
-.endif
+.if ! ${SSL_DEFAULT:Mlibressl*}
+BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
+
+do-configure:
+	${REINPLACE_CMD} -e 's|/usr/local|${WRKDIR}/libressl|g' \
+			${WRKSRC}/usr.sbin/httpd/Makefile
+	${REINPLACE_CMD} -e 's|LOCALBASE|LIBRESSLBASE|g' \
+			${WRKSRC}/usr.sbin/httpd/Makefile
+	${REINPLACE_CMD} -e 's|/usr/local|${WRKDIR}/libressl|g' \
+			${WRKSRC}/usr.bin/htpasswd/Makefile
+	${REINPLACE_CMD} -e 's|LOCALBASE|LIBRESSLBASE|g' \
+			${WRKSRC}/usr.bin/htpasswd/Makefile
+
+. ifnmake describe
+STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
+. endif
+
+pre-configure:
+	@(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
+		. ${WRKDIR}/libressl "! -name *.so*")
+.endif # SSL_DEFAULT
 
 .include <bsd.port.post.mk>
Index: head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c
===================================================================
--- head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c	(nonexistent)
+++ head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c	(revision 453878)
@@ -0,0 +1,14 @@
+--- lib/libtls/tls_conninfo.c.orig	2017-05-04 18:48:54 UTC
++++ lib/libtls/tls_conninfo.c
+@@ -140,9 +140,9 @@ tls_get_peer_cert_times(struct tls *ctx,
+ 		goto err;
+ 	if ((after = X509_get_notAfter(ctx->ssl_peer_cert)) == NULL)
+ 		goto err;
+-	if (asn1_time_parse(before->data, before->length, &before_tm, 0) == -1)
++	if (ASN1_time_parse(before->data, before->length, &before_tm, 0) == -1)
+ 		goto err;
+-	if (asn1_time_parse(after->data, after->length, &after_tm, 0) == -1)
++	if (ASN1_time_parse(after->data, after->length, &after_tm, 0) == -1)
+ 		goto err;
+ 	if ((*notbefore = timegm(&before_tm)) == -1)
+ 		goto err;

Property changes on: head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property