Index: head/www/serf/Makefile
===================================================================
--- head/www/serf/Makefile	(revision 516612)
+++ head/www/serf/Makefile	(revision 516613)
@@ -1,64 +1,64 @@
 # Created by: Craig Rodrigues <rodrigc@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	serf
 PORTVERSION=	1.3.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	APACHE/serf
 
 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:MGSAPI_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 516612)
+++ head/www/serf/files/patch-buckets_ssl__buckets.c	(revision 516613)
@@ -1,11 +1,11 @@
 --- buckets/ssl_buckets.c.orig	2016-06-30 15:45:07 UTC
 +++ buckets/ssl_buckets.c
-@@ -52,7 +52,7 @@
- #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
+@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
+         }
  #endif
  
--#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- #define USE_OPENSSL_1_1_API
- #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();