Wed Jan 2 17:23:04 2019 UTC ()
mypaint-brushes: catch up with scons update; support building with python 3


(tnn)
diff -r1.3 -r1.4 pkgsrc/graphics/mypaint-brushes/Makefile
diff -r1.1 -r1.2 pkgsrc/graphics/mypaint-brushes/distinfo
diff -r0 -r1.1 pkgsrc/graphics/mypaint-brushes/patches/patch-SConstruct
cvs diff -r1.3 -r1.4 pkgsrc/graphics/mypaint-brushes/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/mypaint-brushes/Makefile 2018/04/30 20:57:47 1.3
+++ pkgsrc/graphics/mypaint-brushes/Makefile 2019/01/02 17:23:03 1.4
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.3 2018/04/30 20:57:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2019/01/02 17:23:03 tnn Exp $
2 2
3DISTNAME= mypaint-brushes-1.3.0 3DISTNAME= mypaint-brushes-1.3.0
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= ${MASTER_SITE_GITHUB:=Jehan/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=Jehan/}
6GITHUB_PROJECT= mypaint-brushes 6GITHUB_PROJECT= mypaint-brushes
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://github.com/Jehan/mypaint-brushes/ 10HOMEPAGE= https://github.com/Jehan/mypaint-brushes/
11COMMENT= Default MyPaint brushes 11COMMENT= Default MyPaint brushes
12LICENSE= cc0-1.0-universal 12LICENSE= cc0-1.0-universal
13 13
14BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons 
15 
16USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
17USE_LANGUAGES= # none 15USE_LANGUAGES= # none
18 16
19PKGCONFIG_OVERRIDE+= pkgconfig.pc.in 17PKGCONFIG_OVERRIDE+= pkgconfig.pc.in
20 18
21SCONS_ARGS+= prefix=${DESTDIR}${PREFIX} 19SCONS_ARGS+= prefix=${DESTDIR}${PREFIX}
22 20
23do-build: 21do-build:
24 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \ 22 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} \
25 ${SCONS_ARGS} 23 ${SCONS_ARGS}
26 24
27do-install: 25do-install:
28 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \ 26 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} \
29 ${SCONS_ARGS} install 27 ${SCONS_ARGS} install
30 28
 29PYTHON_FOR_BUILD_ONLY?= yes
 30.include "../../devel/scons/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/graphics/mypaint-brushes/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/mypaint-brushes/distinfo 2018/04/30 04:56:17 1.1
+++ pkgsrc/graphics/mypaint-brushes/distinfo 2019/01/02 17:23:04 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2018/04/30 04:56:17 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2019/01/02 17:23:04 tnn Exp $
2 2
3SHA1 (mypaint-brushes-1.3.0.tar.gz) = 809e085b9920891c0f42a92ce2950a2aa5cf236e 3SHA1 (mypaint-brushes-1.3.0.tar.gz) = 809e085b9920891c0f42a92ce2950a2aa5cf236e
4RMD160 (mypaint-brushes-1.3.0.tar.gz) = b28518aa1d3b5d9f5c75d0b5411e55bb64dccc64 4RMD160 (mypaint-brushes-1.3.0.tar.gz) = b28518aa1d3b5d9f5c75d0b5411e55bb64dccc64
5SHA512 (mypaint-brushes-1.3.0.tar.gz) = f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414 5SHA512 (mypaint-brushes-1.3.0.tar.gz) = f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
6Size (mypaint-brushes-1.3.0.tar.gz) = 2447093 bytes 6Size (mypaint-brushes-1.3.0.tar.gz) = 2447093 bytes
 7SHA1 (patch-SConstruct) = ca04983b2c6829f3cca0a7e60bb59499f4f63e5c
File Added: pkgsrc/graphics/mypaint-brushes/patches/Attic/patch-SConstruct
$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):