CVS commit: pkgsrc/mk/tools

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Tue May  9 12:16:01 UTC 2023

Modified Files:
        pkgsrc/mk/tools: defaults.mk replace.mk tools.Linux.mk tools.NetBSD.mk

Log Message:
mk/tools: add mandoc as tool

Only nroff was handled as tool dependency for now, coming from the same
source. Now the mandoc command is handled, too (libfido2 needs it, the
change staged in wip right now).

Platform-provided mandoc is only checked on NetBSD and Linux right now.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/mk/tools/defaults.mk
cvs rdiff -u -r1.297 -r1.298 pkgsrc/mk/tools/replace.mk
cvs rdiff -u -r1.68 -r1.69 pkgsrc/mk/tools/tools.Linux.mk
cvs rdiff -u -r1.73 -r1.74 pkgsrc/mk/tools/tools.NetBSD.mk

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

Modified files:

Index: pkgsrc/mk/tools/defaults.mk
diff -u pkgsrc/mk/tools/defaults.mk:1.63 pkgsrc/mk/tools/defaults.mk:1.64
--- pkgsrc/mk/tools/defaults.mk:1.63    Thu Jan  6 10:19:11 2022
+++ pkgsrc/mk/tools/defaults.mk Tue May  9 12:16:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.63 2022/01/06 10:19:11 schmonz Exp $
+# $NetBSD: defaults.mk,v 1.64 2023/05/09 12:16:01 thor Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -99,6 +99,7 @@ _TOOLS_VARNAME.lzcat=         LZCAT
 _TOOLS_VARNAME.m4=             M4
 _TOOLS_VARNAME.mail=           MAIL_CMD
 _TOOLS_VARNAME.makeinfo=       MAKEINFO
+_TOOLS_VARNAME.mandoc=         MANDOC
 _TOOLS_VARNAME.mkdir=          MKDIR
 _TOOLS_VARNAME.mktemp=         MKTEMP
 _TOOLS_VARNAME.mtree=          MTREE

Index: pkgsrc/mk/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.297 pkgsrc/mk/tools/replace.mk:1.298
--- pkgsrc/mk/tools/replace.mk:1.297    Sat Mar  4 23:29:24 2023
+++ pkgsrc/mk/tools/replace.mk  Tue May  9 12:16:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.297 2023/03/04 23:29:24 rillig Exp $
+# $NetBSD: replace.mk,v 1.298 2023/05/09 12:16:01 thor Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1026,7 +1026,7 @@ TOOLS_PATH.${_t_}=        ${LOCALBASE}/bin/g${_
 # groff counterparts.  As this package has fewer dependencies it should
 # be preferred over groff wherever possible.
 #
-_TOOLS.mandoc= nroff
+_TOOLS.mandoc= mandoc nroff
 
 .for _t_ in ${_TOOLS.mandoc}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})

Index: pkgsrc/mk/tools/tools.Linux.mk
diff -u pkgsrc/mk/tools/tools.Linux.mk:1.68 pkgsrc/mk/tools/tools.Linux.mk:1.69
--- pkgsrc/mk/tools/tools.Linux.mk:1.68 Tue Jul  5 20:35:45 2022
+++ pkgsrc/mk/tools/tools.Linux.mk      Tue May  9 12:16:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.68 2022/07/05 20:35:45 markd Exp $
+# $NetBSD: tools.Linux.mk,v 1.69 2023/05/09 12:16:01 thor Exp $
 #
 # System-supplied tools for the Linux operating system.
 #
@@ -162,6 +162,9 @@ TOOLS_PLATFORM.mail?=               ${_path}/mail   # D
 .  if exists(${_path}/makeinfo)
 TOOLS_PLATFORM.makeinfo?=      ${_path}/makeinfo
 .  endif
+.  if exists(${_path}/mandoc)
+TOOLS_PLATFORM.mandoc?=                ${_path}/mandoc
+.  endif
 .  if exists(${_path}/mkdir)
 TOOLS_PLATFORM.mkdir?=         ${_path}/mkdir -p
 .  endif

Index: pkgsrc/mk/tools/tools.NetBSD.mk
diff -u pkgsrc/mk/tools/tools.NetBSD.mk:1.73 pkgsrc/mk/tools/tools.NetBSD.mk:1.74
--- pkgsrc/mk/tools/tools.NetBSD.mk:1.73        Sat Mar  4 23:29:24 2023
+++ pkgsrc/mk/tools/tools.NetBSD.mk     Tue May  9 12:16:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.73 2023/03/04 23:29:24 rillig Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.74 2023/05/09 12:16:01 thor Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -78,6 +78,7 @@ TOOLS_PLATFORM.mail?=         /usr/bin/mail
 .if exists(/usr/bin/makeinfo)
 TOOLS_PLATFORM.makeinfo?=      /usr/bin/makeinfo
 .endif
+TOOLS_PLATFORM.mandoc?=                /usr/bin/mandoc
 TOOLS_PLATFORM.mkdir?=         /bin/mkdir -p
 TOOLS_PLATFORM.mktemp?=                /usr/bin/mktemp
 .if exists(/usr/bin/msgconv)