Index: head/www/serf/Makefile
===================================================================
--- head/www/serf/Makefile	(revision 537445)
+++ head/www/serf/Makefile	(revision 537446)
@@ -1,64 +1,67 @@
 # Created by: Craig Rodrigues <rodrigc@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	serf
 PORTVERSION=	1.3.9
 PORTREVISION=	5
 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:python2 ssl tar:bzip2 cpe
+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}"
+.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/distinfo
===================================================================
--- head/www/serf/distinfo	(revision 537445)
+++ head/www/serf/distinfo	(revision 537446)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1472645004
+TIMESTAMP = 1590959783
 SHA256 (serf-1.3.9.tar.bz2) = 549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
 SIZE (serf-1.3.9.tar.bz2) = 145132
+SHA256 (py3-compat) = aa31670d4acf132400c78524caa9efbfdf76bde6f4a973bf72ae69b25fd4c4d0
+SIZE (py3-compat) = 2879