Sat Jun 22 12:52:44 2019 UTC ()
Add comment.


(jmcneill)
diff -r1.25 -r1.26 pkgsrc/devel/talloc/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__utils.py
cvs diff -r1.25 -r1.26 pkgsrc/devel/talloc/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/talloc/distinfo 2019/06/22 12:47:07 1.25
+++ pkgsrc/devel/talloc/distinfo 2019/06/22 12:52:44 1.26
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.25 2019/06/22 12:47:07 jmcneill Exp $ 1$NetBSD: distinfo,v 1.26 2019/06/22 12:52:44 jmcneill Exp $
2 2
3SHA1 (talloc-2.2.0.tar.gz) = d806e2e4e9b973e8ab6521d1dd20a03abae32c99 3SHA1 (talloc-2.2.0.tar.gz) = d806e2e4e9b973e8ab6521d1dd20a03abae32c99
4RMD160 (talloc-2.2.0.tar.gz) = 837d165e4524936ca39af7a0434321f10fe685bb 4RMD160 (talloc-2.2.0.tar.gz) = 837d165e4524936ca39af7a0434321f10fe685bb
5SHA512 (talloc-2.2.0.tar.gz) = e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388 5SHA512 (talloc-2.2.0.tar.gz) = e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388
6Size (talloc-2.2.0.tar.gz) = 633467 bytes 6Size (talloc-2.2.0.tar.gz) = 633467 bytes
7SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 50ff76f5b085f770751ca8bb93c8544cfdcd40d9 7SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 50ff76f5b085f770751ca8bb93c8544cfdcd40d9
8SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d 8SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
9SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 2d05638e542ecadf4d0475d25d89a1ae59289bd2 9SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
cvs diff -r1.1 -r1.2 pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__utils.py (expand / switch to unified diff)

--- pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__utils.py 2019/06/22 12:47:07 1.1
+++ pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__utils.py 2019/06/22 12:52:44 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-buildtools_wafsamba_samba__utils.py,v 1.1 2019/06/22 12:47:07 jmcneill Exp $ 1$NetBSD: patch-buildtools_wafsamba_samba__utils.py,v 1.2 2019/06/22 12:52:44 jmcneill Exp $
 2
 3Fixes a build failure when the letter 'j' appears in MAKEFLAGS.
2 4
3--- buildtools/wafsamba/samba_utils.py.orig 2019-03-21 10:12:32.000000000 +0000 5--- buildtools/wafsamba/samba_utils.py.orig 2019-03-21 10:12:32.000000000 +0000
4+++ buildtools/wafsamba/samba_utils.py 6+++ buildtools/wafsamba/samba_utils.py
5@@ -519,10 +519,7 @@ def CHECK_MAKEFLAGS(options): 7@@ -519,10 +519,7 @@ def CHECK_MAKEFLAGS(options):
6 setattr(options, opt[0:loc], opt[loc+1:]) 8 setattr(options, opt[0:loc], opt[loc+1:])
7 elif opt[0] != '-': 9 elif opt[0] != '-':
8 for v in opt: 10 for v in opt:
9- if re.search(r'j[0-9]*$', v): 11- if re.search(r'j[0-9]*$', v):
10- jobs_set = True 12- jobs_set = True
11- jobs = opt.strip('j') 13- jobs = opt.strip('j')
12- elif v == 'k': 14- elif v == 'k':
13+ if v == 'k': 15+ if v == 'k':
14 options.keep = True 16 options.keep = True