Index: head/www/serf/Makefile
===================================================================
--- head/www/serf/Makefile	(revision 563961)
+++ head/www/serf/Makefile	(revision 563962)
@@ -1,67 +1,67 @@
 # Created by: Craig Rodrigues <rodrigc@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	serf
 PORTVERSION=	1.3.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	APACHE/serf
 
 PATCHFILES=	py3-compat:-p1
 PATCH_SITES=	https://salsa.debian.org/jamessan/serf/-/raw/f6a5256b2de696c2527524d9b1a695ec5aaa17b0/debian/patches/
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Serf HTTP client library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS+=	libapr-1.so:devel/apr1
 
 USES=		scons ssl tar:bzip2 cpe
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
 GSSAPI_BASE_DESC=		Heimdal Kerberos (base)
 GSSAPI_HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 GSSAPI_MIT_DESC=		MIT Kerberos (security/krb5)
 GSSAPI_HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
 GSSAPI_MIT_LIB_DEPENDS=		libkrb5.so.3:security/krb5
 
 SCONS_ARGS=	APR=${LOCALBASE}/bin/apr-1-config
 SCONS_ARGS+=	APU=${LOCALBASE}/bin/apu-1-config
 SCONS_ARGS+=	OPENSSL=${OPENSSLBASE}
 SCONS_ARGS+=	PREFIX=${PREFIX}
 SCONS_ARGS+=	CC=${CC}
 SCONS_ARGS+=	CFLAGS="${CFLAGS}"
 INSTALL_TARGET=	install --install-sandbox=${STAGEDIR}
 TEST_TARGET=	check  # some tests fail
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGSSAPI_BASE}
 SCONS_ARGS+=	GSSAPI="/usr"
 .endif
 .if ${PORT_OPTIONS:MGSSAPI_MIT} || ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
 SCONS_ARGS+=	GSSAPI="${LOCALBASE}"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e '/^Requires.private/s/(libssl|libcrypto)//g' \
 		-e '/^Libs.private/s|$$| -L${OPENSSLLIB} -lssl -lcrypto|' \
 		${WRKSRC}/build/serf.pc.in
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libserf-1.so
 
 .include <bsd.port.pre.mk>
 
 MAKE_ARGS=	${SCONS_ARGS}
 
 .include <bsd.port.post.mk>
Index: head/www/serf/files/patch-buckets_ssl__buckets.c
===================================================================
--- head/www/serf/files/patch-buckets_ssl__buckets.c	(revision 563961)
+++ head/www/serf/files/patch-buckets_ssl__buckets.c	(revision 563962)
@@ -1,11 +1,28 @@
 --- buckets/ssl_buckets.c.orig	2016-06-30 15:45:07 UTC
 +++ buckets/ssl_buckets.c
-@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
+@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio)
+ 
+ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr)
+ {
+-    long ret = 1;
++    long ret = 0;
+ 
+     switch (cmd) {
+     default:
+@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long nu
+         break;
+     case BIO_CTRL_FLUSH:
+         /* At this point we can't force a flush. */
++        ret = 1;
+         break;
+     case BIO_CTRL_PUSH:
+     case BIO_CTRL_POP:
+@@ -1156,7 +1157,7 @@ static void init_ssl_libraries(void)
          }
  #endif
  
 -#ifdef USE_OPENSSL_1_1_API
 +#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
          OPENSSL_malloc_init();
  #else
          CRYPTO_malloc_init();