Index: head/www/serf/Makefile
===================================================================
--- head/www/serf/Makefile	(revision 421422)
+++ head/www/serf/Makefile	(revision 421423)
@@ -1,69 +1,66 @@
 # Created by: Craig Rodrigues <rodrigc@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	serf
-PORTVERSION=	1.3.8
-PORTREVISION=	1
+PORTVERSION=	1.3.9
+#PORTREVISION=	1
 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 tar:bzip2 cpe
-USE_OPENSSL=	yes
+USES=		scons ssl tar:bzip2 cpe
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_RADIO=	KERBEROS
 OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE
 
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 MIT_DESC=		MIT Kerberos (security/krb5)
 MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
 HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
 
 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}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE}
 SCONS_ARGS+=	GSSAPI="/usr"
 .endif
 .if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL}
 SCONS_ARGS+=    GSSAPI="${LOCALBASE}"
 .endif
 
-do-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_CMD} ${SCONS_ARGS})
-
-do-install:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_CMD} ${SCONS_ARGS} ${INSTALL_TARGET})
-
 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
 
 regression-test check: build
 	@(cd ${WRKSRC} && ${MAKE_CMD} check)
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+MAKE_ARGS=	${SCONS_ARGS}
+
+.include <bsd.port.post.mk>
Index: head/www/serf/distinfo
===================================================================
--- head/www/serf/distinfo	(revision 421422)
+++ head/www/serf/distinfo	(revision 421423)
@@ -1,2 +1,3 @@
-SHA256 (serf-1.3.8.tar.bz2) = e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590
-SIZE (serf-1.3.8.tar.bz2) = 143337
+TIMESTAMP = 1472645004
+SHA256 (serf-1.3.9.tar.bz2) = 549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
+SIZE (serf-1.3.9.tar.bz2) = 145132
Index: head/www/serf/files/patch-SConstruct
===================================================================
--- head/www/serf/files/patch-SConstruct	(revision 421422)
+++ head/www/serf/files/patch-SConstruct	(revision 421423)
@@ -1,49 +1,49 @@
---- SConstruct.orig	2014-02-05 00:11:10.000000000 +0400
-+++ SConstruct	2015-10-19 15:07:53.089322358 +0300
-@@ -69,6 +69,9 @@
+--- SConstruct.orig	2015-09-17 12:46:24 UTC
++++ SConstruct
+@@ -74,6 +74,9 @@ else:
  
  opts = Variables(files=[SAVED_CONFIG])
  opts.AddVariables(
 +  RawListVariable('DESTDIR',
 +               'Required *dummy*, without scons will stop with "Unknown variables: DESTDIR"',
 +                None),
    PathVariable('PREFIX',
                 'Directory to install under',
                 default_prefix,
-@@ -203,6 +206,7 @@
+@@ -208,6 +211,7 @@ opts.Save(SAVED_CONFIG, env)
  thisdir = os.getcwd()
  libdir = '$LIBDIR'
  incdir = '$PREFIX/include/serf-$MAJOR'
 +pkgconfdir = '$PREFIX/libdata'
  
  # This version string is used in the dynamic library name, and for Mac OS X also
  # for the current_version and compatibility_version options in the .dylib
-@@ -345,8 +349,8 @@
+@@ -364,8 +368,8 @@ else:
    ### there is probably a better way to run/capture output.
    ### env.ParseConfig() may be handy for getting this stuff into the build
    if CALLOUT_OKAY:
 -    apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip()
 -    apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip()
 +    apr_libs = os.popen(env.subst('$APR --libs')).read().strip()
 +    apu_libs = os.popen(env.subst('$APU --libs')).read().strip()
    else:
      apr_libs = ''
      apu_libs = ''
-@@ -387,6 +391,8 @@
+@@ -406,6 +410,8 @@ pkgconfig = env.Textfile('serf-%d.pc' % 
  
  env.Default(lib_static, lib_shared, pkgconfig)
  
 +#print env.Dump()
 +
  if CALLOUT_OKAY:
    conf = Configure(env)
  
-@@ -418,7 +424,7 @@
+@@ -437,7 +443,7 @@ if sys.platform == 'darwin':
  env.Alias('install-lib', [install_static, install_shared,
                            ])
  env.Alias('install-inc', env.Install(incdir, HEADER_FILES))
 -env.Alias('install-pc', env.Install(os.path.join(libdir, 'pkgconfig'),
 +env.Alias('install-pc', env.Install(os.path.join(pkgconfdir, 'pkgconfig'),
                                      pkgconfig))
  env.Alias('install', ['install-lib', 'install-inc', 'install-pc', ])