git: Merge branch 'vendor/BMAKE'

[Antonio Huete Jimenez]

commit 9e7ae5a0527a977cab412aede3a532cfe2903bbb
Merge: 1176aeedca 6eef5f0c4f
Author: Antonio Huete Jimenez <tuxillo at quantumachine.net>
Date:   Wed Nov 9 14:52:46 2022 +0100

    Merge branch 'vendor/BMAKE'
    
    Conflicts:
    	contrib/bmake/main.c
    	contrib/bmake/make.1
    	contrib/bmake/meta.c

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/9e7ae5a0527a977cab412aede3a532cfe2903bbb


-- 
DragonFly BSD source repository