[pkgsrc/trunk]: pkgsrc/graphics/mypaint-brushes mypaint-brushes: catch up wit...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc73b0ea15d0
branches:  trunk
changeset: 317222:fc73b0ea15d0
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Jan 02 17:23:03 2019 +0000

description:
mypaint-brushes: catch up with scons update; support building with python 3

diffstat:

 graphics/mypaint-brushes/Makefile                 |  10 +++---
 graphics/mypaint-brushes/distinfo                 |   3 +-
 graphics/mypaint-brushes/patches/patch-SConstruct |  32 +++++++++++++++++++++++
 3 files changed, 39 insertions(+), 6 deletions(-)

diffs (82 lines):

diff -r 4fc537973ebf -r fc73b0ea15d0 graphics/mypaint-brushes/Makefile
--- a/graphics/mypaint-brushes/Makefile Wed Jan 02 17:19:48 2019 +0000
+++ b/graphics/mypaint-brushes/Makefile Wed Jan 02 17:23:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/04/30 20:57:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/01/02 17:23:03 tnn Exp $
 
 DISTNAME=      mypaint-brushes-1.3.0
 CATEGORIES=    graphics
@@ -11,8 +11,6 @@
 COMMENT=       Default MyPaint brushes
 LICENSE=       cc0-1.0-universal
 
-BUILD_DEPENDS+=        scons-[0-9]*:../../devel/scons
-
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= # none
 
@@ -21,11 +19,13 @@
 SCONS_ARGS+=   prefix=${DESTDIR}${PREFIX}
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} \
                ${SCONS_ARGS}
 
 do-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} \
                ${SCONS_ARGS} install
 
+PYTHON_FOR_BUILD_ONLY?=        yes
+.include "../../devel/scons/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4fc537973ebf -r fc73b0ea15d0 graphics/mypaint-brushes/distinfo
--- a/graphics/mypaint-brushes/distinfo Wed Jan 02 17:19:48 2019 +0000
+++ b/graphics/mypaint-brushes/distinfo Wed Jan 02 17:23:03 2019 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2018/04/30 04:56:17 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2019/01/02 17:23:04 tnn Exp $
 
 SHA1 (mypaint-brushes-1.3.0.tar.gz) = 809e085b9920891c0f42a92ce2950a2aa5cf236e
 RMD160 (mypaint-brushes-1.3.0.tar.gz) = b28518aa1d3b5d9f5c75d0b5411e55bb64dccc64
 SHA512 (mypaint-brushes-1.3.0.tar.gz) = f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
 Size (mypaint-brushes-1.3.0.tar.gz) = 2447093 bytes
+SHA1 (patch-SConstruct) = ca04983b2c6829f3cca0a7e60bb59499f4f63e5c
diff -r 4fc537973ebf -r fc73b0ea15d0 graphics/mypaint-brushes/patches/patch-SConstruct
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/mypaint-brushes/patches/patch-SConstruct Wed Jan 02 17:23:03 2019 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-SConstruct,v 1.1 2019/01/02 17:23:04 tnn Exp $
+
+python 3.x compatibility
+
+--- SConstruct.orig    2018-01-01 20:22:53.000000000 +0000
++++ SConstruct
+@@ -23,7 +23,7 @@ opts.Update(env)
+ env.Alias('install', '$prefix')
+ 
+ set_dir_postaction = {}
+-def install_perms(env, target, sources, perms=0644, dirperms=0755):
++def install_perms(env, target, sources, perms=0o644, dirperms=0o755):
+     """As a normal env.Install, but with Chmod postactions.
+ 
+     The `target` parameter must be a string which starts with ``$prefix``.
+@@ -52,14 +52,14 @@ def install_perms(env, target, sources, 
+             d_prev = None
+             while d != d_prev and d != '$prefix':
+                 d_prev = d
+-                if not set_dir_postaction.has_key(d):
++                if not d in set_dir_postaction:
+                     env.AddPostAction(file_targ, Chmod(d, dirperms))
+                     set_dir_postaction[d] = True
+                 d = os.path.dirname(d)
+ 
+     return install_targs
+ 
+-def install_tree(env, dest, path, perms=0644, dirperms=0755):
++def install_tree(env, dest, path, perms=0o644, dirperms=0o755):
+     assert os.path.isdir(path)
+     target_root = os.path.join(dest, os.path.basename(path))
+     for dirpath, dirnames, filenames in os.walk(path):