CVS commit: pkgsrc/devel/talloc

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sat Jun 22 12:47:08 UTC 2019

Modified Files:
        pkgsrc/devel/talloc: distinfo
Added Files:
        pkgsrc/devel/talloc/patches: patch-buildtools_wafsamba_samba__utils.py

Log Message:
Another build fix for people unlucky enough to have the letter 'j' in
MAKEFLAGS


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/talloc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__utils.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/talloc/distinfo
diff -u pkgsrc/devel/talloc/distinfo:1.24 pkgsrc/devel/talloc/distinfo:1.25
--- pkgsrc/devel/talloc/distinfo:1.24   Mon Mar 25 23:18:00 2019
+++ pkgsrc/devel/talloc/distinfo        Sat Jun 22 12:47:07 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2019/03/25 23:18:00 wiz Exp $
+$NetBSD: distinfo,v 1.25 2019/06/22 12:47:07 jmcneill Exp $
 
 SHA1 (talloc-2.2.0.tar.gz) = d806e2e4e9b973e8ab6521d1dd20a03abae32c99
 RMD160 (talloc-2.2.0.tar.gz) = 837d165e4524936ca39af7a0434321f10fe685bb
@@ -6,3 +6,4 @@ SHA512 (talloc-2.2.0.tar.gz) = e762c6443
 Size (talloc-2.2.0.tar.gz) = 633467 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 50ff76f5b085f770751ca8bb93c8544cfdcd40d9
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
+SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 2d05638e542ecadf4d0475d25d89a1ae59289bd2

Added files:

Index: pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__utils.py
diff -u /dev/null pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__utils.py:1.1
--- /dev/null   Sat Jun 22 12:47:08 2019
+++ pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__utils.py       Sat Jun 22 12:47:07 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-buildtools_wafsamba_samba__utils.py,v 1.1 2019/06/22 12:47:07 jmcneill Exp $
+
+--- buildtools/wafsamba/samba_utils.py.orig    2019-03-21 10:12:32.000000000 +0000
++++ buildtools/wafsamba/samba_utils.py
+@@ -519,10 +519,7 @@ def CHECK_MAKEFLAGS(options):
+             setattr(options, opt[0:loc], opt[loc+1:])
+         elif opt[0] != '-':
+             for v in opt:
+-                if re.search(r'j[0-9]*$', v):
+-                    jobs_set = True
+-                    jobs = opt.strip('j')
+-                elif v == 'k':
++                if v == 'k':
+                     options.keep = True
+         elif re.search(r'-j[0-9]*$', opt):
+             jobs_set = True