[pkgsrc/trunk]: pkgsrc/www/serf self: catch up with scons update; support bui...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1bb671e02302
branches:  trunk
changeset: 317223:1bb671e02302
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Jan 02 17:25:05 2019 +0000

description:
self: catch up with scons update; support building with python 3

diffstat:

 www/serf/Makefile                 |  10 +++++-----
 www/serf/distinfo                 |   4 ++--
 www/serf/patches/patch-SConstruct |  11 ++++++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diffs (74 lines):

diff -r fc73b0ea15d0 -r 1bb671e02302 www/serf/Makefile
--- a/www/serf/Makefile Wed Jan 02 17:23:03 2019 +0000
+++ b/www/serf/Makefile Wed Jan 02 17:25:05 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2017/04/04 23:40:06 gdt Exp $
+# $NetBSD: Makefile,v 1.38 2019/01/02 17:25:05 tnn Exp $
 
 DISTNAME=      serf-1.3.9
 CATEGORIES=    www
@@ -10,8 +10,6 @@
 COMMENT=       High-performance asynchronous HTTP client library
 LICENSE=       apache-2.0
 
-BUILD_DEPENDS+=                scons>=2.3.0:../../devel/scons
-
 SCONS_ARGS+=           APR=${PREFIX}/bin/apr-1-config
 SCONS_ARGS+=           APU=${PREFIX}/bin/apu-1-config
 SCONS_ARGS+=           CC=${CC:Q}
@@ -30,13 +28,15 @@
        ${CHMOD} -R go-w ${WRKSRC}
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons PREFIX=${PREFIX} ${SCONS_ARGS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} PREFIX=${PREFIX} ${SCONS_ARGS}
 
 do-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons PREFIX=${PREFIX} ${SCONS_ARGS} install
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} PREFIX=${PREFIX} ${SCONS_ARGS} install
 
 .include "../../devel/apr/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
+PYTHON_FOR_BUILD_ONLY?=        yes
+.include "../../devel/scons/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fc73b0ea15d0 -r 1bb671e02302 www/serf/distinfo
--- a/www/serf/distinfo Wed Jan 02 17:23:03 2019 +0000
+++ b/www/serf/distinfo Wed Jan 02 17:25:05 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.23 2017/10/04 11:53:10 wiz Exp $
+$NetBSD: distinfo,v 1.24 2019/01/02 17:25:05 tnn Exp $
 
 SHA1 (serf-1.3.9.tar.bz2) = 26015c63e3bbb108c1689bf2090e4c26351db674
 RMD160 (serf-1.3.9.tar.bz2) = 4bbc773841eb2bd83a7c12170937b403201dd83b
 SHA512 (serf-1.3.9.tar.bz2) = 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
 Size (serf-1.3.9.tar.bz2) = 145132 bytes
-SHA1 (patch-SConstruct) = 22ade50e574ae503d40158558e03f5063da7df1c
+SHA1 (patch-SConstruct) = f5adb0e945fc22937ee8f7861d65735d7ffa0b2d
diff -r fc73b0ea15d0 -r 1bb671e02302 www/serf/patches/patch-SConstruct
--- a/www/serf/patches/patch-SConstruct Wed Jan 02 17:23:03 2019 +0000
+++ b/www/serf/patches/patch-SConstruct Wed Jan 02 17:25:05 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-SConstruct,v 1.9 2017/10/04 11:53:10 wiz Exp $
+$NetBSD: patch-SConstruct,v 1.10 2019/01/02 17:25:06 tnn Exp $
 
 Hack: Use OPENSSL variable as final shared library path; fixes lib id on Darwin.
 Don't append -O2 compiler flag.
@@ -24,6 +24,15 @@
                    tools=('default', 'textfile',),
                    CPPPATH=['.', ],
                    )
+@@ -166,7 +167,7 @@ env.Append(BUILDERS = {
+ match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+                   'SERF_MINOR_VERSION ([0-9]+).*'
+                   'SERF_PATCH_VERSION ([0-9]+)',
+-                  env.File('serf.h').get_contents(),
++                  env.File('serf.h').get_contents().decode('utf-8'),
+                   re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+ env.Append(MAJOR=str(MAJOR))
 @@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean
  
  unknown = opts.UnknownVariables()