Index: head/www/obhttpd/Makefile
===================================================================
--- head/www/obhttpd/Makefile	(revision 516763)
+++ head/www/obhttpd/Makefile	(revision 516764)
@@ -1,66 +1,63 @@
 # $FreeBSD$
 
 PORTNAME=	obhttpd
-PORTVERSION=	6.3.20180803
-PORTREVISION=	3
+PORTVERSION=	6.6.20191023
 CATEGORIES=	www
+MASTER_SITES=	OPENBSD/LibreSSL:libressl
+DISTFILES=	libressl-${SSL_VERSION}.tar.gz:libressl
 
 MAINTAINER=	koue@chaosophia.net
 COMMENT=	OpenBSD http server
 
 LICENSE=	BSD3CLAUSE
 
 WRKSRC_SUBDIR=	src
 
-USES=		ssl uidfix
+USES=		uidfix
 
+SSL_VERSION=	3.0.2
 USE_GITHUB=	yes
 GH_ACCOUNT=	koue
 GH_PROJECT=	httpd
 
 USE_RC_SUBR=	obhttpd
 
 CFLAGS+=	-Wall
+CFLAGS+=	-I${WRKDIR}/libressl-${SSL_VERSION}/include
 
 MAKE_ARGS+=	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
+pre-configure:
+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/libressl-${SSL_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS})
+	@(cd ${WRKDIR}/libressl-${SSL_VERSION} && ${SETENV} ./configure && ${SETENV} ${MAKE_ENV} ${MAKE})
 
-.include <bsd.port.pre.mk>
-
-.if ! ${SSL_DEFAULT:Mlibressl*}
-. ifnmake describe
-STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
-. endif
-BUILD_DEPENDS+= 	${NONEXISTENT}:security/libressl:stage
-CFLAGS+=		-I${STAGEDIR_libressl}${LOCALBASE}/include
-
 post-configure:
-	${REINPLACE_CMD} 's|-ltls|${STAGEDIR_libressl}${LOCALBASE}/lib/libtls.a|g' \
+	${REINPLACE_CMD} 's|-ltls|${WRKDIR}/libressl-${SSL_VERSION}/tls/.libs/libtls.a|g' \
 		${WRKSRC}/usr.sbin/httpd/Makefile
-	${REINPLACE_CMD} 's|-lssl|${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a|g' \
+	${REINPLACE_CMD} 's|-lssl|${WRKDIR}/libressl-${SSL_VERSION}/ssl/.libs/libssl.a|g' \
 		 ${WRKSRC}/usr.sbin/httpd/Makefile
-	${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \
+	${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL_VERSION}/crypto/.libs/libcrypto.a|g' \
 		${WRKSRC}/usr.sbin/httpd/Makefile
-	${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \
+	${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL_VERSION}/crypto/.libs/libcrypto.a|g' \
 		${WRKSRC}/usr.bin/htpasswd/Makefile
-.endif # SSL_DEFAULT
 
-.include <bsd.port.post.mk>
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/etc/examples/httpd.conf \
+		${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample
+
+.include <bsd.port.mk>
Index: head/www/obhttpd/distinfo
===================================================================
--- head/www/obhttpd/distinfo	(revision 516763)
+++ head/www/obhttpd/distinfo	(revision 516764)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1533301574
-SHA256 (koue-httpd-6.3.20180803_GH0.tar.gz) = 0133dc39e099aa04a570326457874329119a249f8b52aa4cb3e29600dae9e1ab
-SIZE (koue-httpd-6.3.20180803_GH0.tar.gz) = 217937
+TIMESTAMP = 1571950082
+SHA256 (libressl-3.0.2.tar.gz) = df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e
+SIZE (libressl-3.0.2.tar.gz) = 3669468
+SHA256 (koue-httpd-6.6.20191023_GH0.tar.gz) = 80d78d2badbda1ed5b119316df7fe5e81b0fcbe1321ec3cae0d34c2edb450ac2
+SIZE (koue-httpd-6.6.20191023_GH0.tar.gz) = 224662