CVS commit: pkgsrc/databases/ldb

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

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sat Jun 22 12:56:31 UTC 2019

Modified Files:
        pkgsrc/databases/ldb: distinfo
Added Files:
        pkgsrc/databases/ldb/patches: patch-buildtools_wafsamba_samba__utils.py

Log Message:
Fixes a build failure when the letter 'j' appears in MAKEFLAGS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/ldb/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/ldb/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/databases/ldb/distinfo
diff -u pkgsrc/databases/ldb/distinfo:1.1 pkgsrc/databases/ldb/distinfo:1.2
--- pkgsrc/databases/ldb/distinfo:1.1   Wed Mar 20 19:06:56 2019
+++ pkgsrc/databases/ldb/distinfo       Sat Jun 22 12:56:31 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/03/20 19:06:56 adam Exp $
+$NetBSD: distinfo,v 1.2 2019/06/22 12:56:31 jmcneill Exp $
 
 SHA1 (ldb-1.5.4.tar.gz) = 870e4112053ae350f5de27b00aa8703d3e7dc34d
 RMD160 (ldb-1.5.4.tar.gz) = d2bbb808990f7dc80a4d0d1278756f13a4526f85
@@ -6,3 +6,4 @@ SHA512 (ldb-1.5.4.tar.gz) = fc323e428367
 Size (ldb-1.5.4.tar.gz) = 1629123 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 4d2727e1ca3d65c26200bf699b93b5bf3198bfd0
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
+SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2

Added files:

Index: pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__utils.py
diff -u /dev/null pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__utils.py:1.1
--- /dev/null   Sat Jun 22 12:56:31 2019
+++ pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__utils.py      Sat Jun 22 12:56:31 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-buildtools_wafsamba_samba__utils.py,v 1.1 2019/06/22 12:56:31 jmcneill Exp $
+
+Fixes a build failure when the letter 'j' appears in MAKEFLAGS.
+
+--- 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