Fri Apr 19 17:00:47 2024 UTC (38d)
Fix MAKEFLAGS handling to work with spaces in UNPRIVILEGED_GROUPS

Let environment variables handling passing MFLAGS/MAKEFLAGS to children
rather than do it explicitly on the command line.  As of 1.24 of
mk/unprivileged.mk pkgsrc puts UNPRIVILEGED_GROUPS in MAKEFLAGS.
UNPRIVILEGED_GROUPS contains a space-separated list of the groups
the current account is a member of.  This requires proper quoting
in MAKEFLAGS if the current account is a member of more than one group
(due to the spaces), and the old version of Makefile does not take
that into account.


(chuck)
diff -r1.22 -r1.23 pkgsrc/chat/icb/distinfo
diff -r0 -r1.1 pkgsrc/chat/icb/patches/patch-Makefile
cvs diff -r1.22 -r1.23 pkgsrc/chat/icb/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/icb/distinfo 2021/10/26 10:05:15 1.22
+++ pkgsrc/chat/icb/distinfo 2024/04/19 17:00:47 1.23
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.22 2021/10/26 10:05:15 nia Exp $ 1$NetBSD: distinfo,v 1.23 2024/04/19 17:00:47 chuck Exp $
2 2
3BLAKE2s (icb-5.0.9.tar.gz) = e36c28e37b84806ff0b2eab323710be73251b31a231d639ad4f0e2a519d38adf 3BLAKE2s (icb-5.0.9.tar.gz) = e36c28e37b84806ff0b2eab323710be73251b31a231d639ad4f0e2a519d38adf
4SHA512 (icb-5.0.9.tar.gz) = d72a30cd671242dceb98defae80780bffd2aaaddfea2bf50d0970368f2601dd203b13939d102ce9af3c8d46373addcd2bcf385a1bb8e3c3b3674c21072fd8d00 4SHA512 (icb-5.0.9.tar.gz) = d72a30cd671242dceb98defae80780bffd2aaaddfea2bf50d0970368f2601dd203b13939d102ce9af3c8d46373addcd2bcf385a1bb8e3c3b3674c21072fd8d00
5Size (icb-5.0.9.tar.gz) = 357565 bytes 5Size (icb-5.0.9.tar.gz) = 357565 bytes
 6SHA1 (patch-Makefile) = 466e900febf580de486de3336de93b8b4030927e
6SHA1 (patch-aa) = b82fb642c79a200aaa47b0db397c82f19fb7f9ff 7SHA1 (patch-aa) = b82fb642c79a200aaa47b0db397c82f19fb7f9ff
7SHA1 (patch-ab) = 30c85ad51b12d7730e950a641fccf3f319902fcc 8SHA1 (patch-ab) = 30c85ad51b12d7730e950a641fccf3f319902fcc
8SHA1 (patch-ac) = 99631dd1c526d5a07339205bad031003f6920495 9SHA1 (patch-ac) = 99631dd1c526d5a07339205bad031003f6920495
9SHA1 (patch-ad) = b64e9ca73b5e56122cb82363ee9c765457bde5ca 10SHA1 (patch-ad) = b64e9ca73b5e56122cb82363ee9c765457bde5ca
10SHA1 (patch-ae) = c98d058cfe6177fb4807104695f96c774b11d177 11SHA1 (patch-ae) = c98d058cfe6177fb4807104695f96c774b11d177
11SHA1 (patch-af) = b16cdbbd6d4a5489b19bb3339b6cd8d95b5395d9 12SHA1 (patch-af) = b16cdbbd6d4a5489b19bb3339b6cd8d95b5395d9
12SHA1 (patch-ag) = d9d1a36a381829b4a5593d666185f79722a33697 13SHA1 (patch-ag) = d9d1a36a381829b4a5593d666185f79722a33697
13SHA1 (patch-ah) = f19c304314ee787cdf0a0123fbcfe869f6ded062 14SHA1 (patch-ah) = f19c304314ee787cdf0a0123fbcfe869f6ded062
14SHA1 (patch-ai) = 11322bc2753dd6921272b2e64554349bb7aa6c5c 15SHA1 (patch-ai) = 11322bc2753dd6921272b2e64554349bb7aa6c5c
15SHA1 (patch-aj) = ba804422123bbc61a2ff2edf7429cd06678bb189 16SHA1 (patch-aj) = ba804422123bbc61a2ff2edf7429cd06678bb189
16SHA1 (patch-ak) = 8e363cc6c5647c064d56ec75b8b627d7d9a07a72 17SHA1 (patch-ak) = 8e363cc6c5647c064d56ec75b8b627d7d9a07a72
17SHA1 (patch-al) = a47617dd948fa972d0bab604514e4a47af117c55 18SHA1 (patch-al) = a47617dd948fa972d0bab604514e4a47af117c55
18SHA1 (patch-am) = b389f93a4cdb105e5dbbc5e97f642c7fff328f0d 19SHA1 (patch-am) = b389f93a4cdb105e5dbbc5e97f642c7fff328f0d
File Added: pkgsrc/chat/icb/patches/patch-Makefile
$NetBSD: patch-Makefile,v 1.1 2024/04/19 17:00:47 chuck Exp $

Let environment variables handling passing MFLAGS/MAKEFLAGS to children
rather than do it explicitly on the command line.  As of 1.24 of
mk/unprivileged.mk pkgsrc puts UNPRIVILEGED_GROUPS in MAKEFLAGS.
UNPRIVILEGED_GROUPS contains a space-separated list of the groups
the current account is a member of.  This requires proper quoting
in MAKEFLAGS if the current account is a member of more than one group
(due to the spaces), and the old version of Makefile does not take
that into account.

--- ./Makefile.orig	1995-02-24 16:19:28.000000000 -0500
+++ ./Makefile	2024-04-19 11:53:34.256872226 -0400
@@ -38,7 +38,7 @@
 all:		$(PREREQS)
 	@for dir in ${DIRS}; do \
 		(echo Making in $${dir}; \
-		 cd $${dir}; sh ./gen ${MFLAGS} -${MAKEFLAGS}); done
+		 cd $${dir}; sh ./gen); done
 
 install:	$(PREREQS)
 	@for dir in ${DIRS} ${MANDIRS}; do \