Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin mk: Add MKFINGER, MKTALK flags for not building
details: https://anonhg.NetBSD.org/src/rev/cd837fbb6f11
branches: trunk
changeset: 366470:cd837fbb6f11
user: nia <nia%NetBSD.org@localhost>
date: Sat May 28 14:31:11 2022 +0000
description:
mk: Add MKFINGER, MKTALK flags for not building
talk, talkd, finger, fingerd.
diffstat:
distrib/sets/lists/base/mi | 10 +++++-----
distrib/sets/lists/debug/mi | 10 +++++-----
distrib/sets/lists/man/mi | 32 ++++++++++++++++----------------
etc/Makefile | 2 +-
libexec/Makefile | 14 +++++++++++---
share/man/man5/mk.conf.5 | 20 +++++++++++++++++++-
share/mk/bsd.README | 8 +++++++-
share/mk/bsd.own.mk | 4 +++-
usr.bin/Makefile | 14 +++++++++++---
9 files changed, 78 insertions(+), 36 deletions(-)
diffs (truncated from 420 to 300 lines):
diff -r 63c109d671f1 -r cd837fbb6f11 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Sat May 28 12:36:56 2022 +0000
+++ b/distrib/sets/lists/base/mi Sat May 28 14:31:11 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1303 2022/05/28 11:17:36 nia Exp $
+# $NetBSD: mi,v 1.1304 2022/05/28 14:31:11 nia Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -608,7 +608,7 @@
./usr/bin/file base-util-bin
./usr/bin/fincore base-util-bin
./usr/bin/find base-util-bin
-./usr/bin/finger base-util-bin
+./usr/bin/finger base-util-bin finger
./usr/bin/flock base-util-bin
./usr/bin/fmt base-util-bin
./usr/bin/fold base-util-bin
@@ -861,7 +861,7 @@
./usr/bin/tabs base-util-bin
./usr/bin/tac base-util-bin
./usr/bin/tail base-util-bin
-./usr/bin/talk base-netutil-bin
+./usr/bin/talk base-netutil-bin talk
./usr/bin/tar base-util-bin
./usr/bin/tcopy base-util-bin
./usr/bin/tee base-util-bin
@@ -1281,7 +1281,7 @@
./usr/libexec/cpp0 base-obsolete obsolete
./usr/libexec/digest-service base-krb5-bin kerberos
./usr/libexec/dnskeygen base-obsolete obsolete
-./usr/libexec/fingerd base-netutil-bin
+./usr/libexec/fingerd base-netutil-bin finger
./usr/libexec/ftp-proxy base-obsolete obsolete
./usr/libexec/ftpd base-netutil-bin
./usr/libexec/getNAME base-man-bin !makemandb
@@ -1310,7 +1310,7 @@
./usr/libexec/makewhatis base-man-bin !makemandb
./usr/libexec/named base-bind-bin
./usr/libexec/named-xfer base-obsolete obsolete
-./usr/libexec/ntalkd base-netutil-bin
+./usr/libexec/ntalkd base-netutil-bin talk
./usr/libexec/pfspamd base-obsolete obsolete
./usr/libexec/pfspamd-setup base-obsolete obsolete
./usr/libexec/pfspamlogd base-obsolete obsolete
diff -r 63c109d671f1 -r cd837fbb6f11 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi Sat May 28 12:36:56 2022 +0000
+++ b/distrib/sets/lists/debug/mi Sat May 28 14:31:11 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.382 2022/05/28 11:17:36 nia Exp $
+# $NetBSD: mi,v 1.383 2022/05/28 14:31:12 nia Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -561,7 +561,7 @@
./usr/libdata/debug/usr/bin/file.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/fincore.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/find.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/finger.debug comp-util-debug debug
+./usr/libdata/debug/usr/bin/finger.debug comp-util-debug finger,debug
./usr/libdata/debug/usr/bin/flock.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/fmt.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/fold.debug comp-util-debug debug
@@ -826,7 +826,7 @@
./usr/libdata/debug/usr/bin/systat.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/tabs.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/tail.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/talk.debug comp-netutil-debug debug
+./usr/libdata/debug/usr/bin/talk.debug comp-netutil-debug talk,debug
./usr/libdata/debug/usr/bin/tbl.debug comp-groff-debug groff,debug
./usr/libdata/debug/usr/bin/tcopy.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/tee.debug comp-util-debug debug
@@ -975,7 +975,7 @@
./usr/libdata/debug/usr/libexec/cxxcom.debug comp-cxx-debug pcc,debug
./usr/libdata/debug/usr/libexec/digest-service.debug comp-krb5-debug kerberos,debug
./usr/libdata/debug/usr/libexec/f771.debug comp-obsolete obsolete
-./usr/libdata/debug/usr/libexec/fingerd.debug comp-netutil-debug debug
+./usr/libdata/debug/usr/libexec/fingerd.debug comp-netutil-debug finger,debug
./usr/libdata/debug/usr/libexec/ftp-proxy.debug comp-obsolete obsolete
./usr/libdata/debug/usr/libexec/ftpd.debug comp-netutil-debug debug
./usr/libdata/debug/usr/libexec/getNAME.debug comp-man-debug !makemandb,debug
@@ -1000,7 +1000,7 @@
./usr/libdata/debug/usr/libexec/mail.local.debug comp-mail-debug debug
./usr/libdata/debug/usr/libexec/makekey.debug comp-crypto-debug debug
./usr/libdata/debug/usr/libexec/makewhatis.debug comp-man-debug !makemandb,debug
-./usr/libdata/debug/usr/libexec/ntalkd.debug comp-netutil-debug debug
+./usr/libdata/debug/usr/libexec/ntalkd.debug comp-netutil-debug talk,debug
./usr/libdata/debug/usr/libexec/pcpp.debug comp-c-debug pcc,debug
./usr/libdata/debug/usr/libexec/postfix/anvil.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/libexec/postfix/bounce.debug comp-postfix-debug postfix,debug
diff -r 63c109d671f1 -r cd837fbb6f11 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Sat May 28 12:36:56 2022 +0000
+++ b/distrib/sets/lists/man/mi Sat May 28 14:31:11 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1744 2022/05/28 11:17:36 nia Exp $
+# $NetBSD: mi,v 1.1745 2022/05/28 14:31:12 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -172,7 +172,7 @@
./usr/share/man/cat1/file.0 man-util-catman .cat
./usr/share/man/cat1/fincore.0 man-util-catman .cat
./usr/share/man/cat1/find.0 man-util-catman .cat
-./usr/share/man/cat1/finger.0 man-util-catman .cat
+./usr/share/man/cat1/finger.0 man-util-catman finger,.cat
./usr/share/man/cat1/flock.0 man-util-catman .cat
./usr/share/man/cat1/fmt.0 man-util-catman .cat
./usr/share/man/cat1/fold.0 man-util-catman .cat
@@ -572,7 +572,7 @@
./usr/share/man/cat1/tabs.0 man-util-catman .cat
./usr/share/man/cat1/tac.0 man-util-catman .cat
./usr/share/man/cat1/tail.0 man-util-catman .cat
-./usr/share/man/cat1/talk.0 man-netutil-catman .cat
+./usr/share/man/cat1/talk.0 man-netutil-catman talk,.cat
./usr/share/man/cat1/tar.0 man-util-catman .cat
./usr/share/man/cat1/tcopy.0 man-util-catman .cat
./usr/share/man/cat1/tee.0 man-util-catman .cat
@@ -2617,7 +2617,7 @@
./usr/share/man/cat8/fasthalt.0 man-sysutil-catman .cat
./usr/share/man/cat8/fdiscard.0 man-sysutil-catman .cat
./usr/share/man/cat8/fdisk.0 man-sysutil-catman .cat
-./usr/share/man/cat8/fingerd.0 man-sysutil-catman .cat
+./usr/share/man/cat8/fingerd.0 man-sysutil-catman finger,.cat
./usr/share/man/cat8/fixmount.0 man-sysutil-catman .cat
./usr/share/man/cat8/flashctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/flush.0 man-postfix-catman postfix,.cat
@@ -2936,7 +2936,7 @@
./usr/share/man/cat8/nsec3hash.0 man-bind-catman .cat
./usr/share/man/cat8/nslookup.0 man-netutil-catman .cat
./usr/share/man/cat8/nsupdate.0 man-obsolete obsolete
-./usr/share/man/cat8/ntalkd.0 man-netutil-catman .cat
+./usr/share/man/cat8/ntalkd.0 man-netutil-catman talk,.cat
./usr/share/man/cat8/ntp-keygen.0 man-ntp-catman ntp,.cat
./usr/share/man/cat8/ntpd.0 man-ntp-catman ntp,.cat
./usr/share/man/cat8/ntpdate.0 man-ntp-catman ntp,.cat
@@ -3211,7 +3211,7 @@
./usr/share/man/cat8/sysctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/sysinst.0 man-sysutil-man .cat
./usr/share/man/cat8/syslogd.0 man-sysutil-catman .cat
-./usr/share/man/cat8/talkd.0 man-netutil-catman .cat
+./usr/share/man/cat8/talkd.0 man-netutil-catman talk,.cat
./usr/share/man/cat8/tbrconfig.0 man-router-catman .cat
./usr/share/man/cat8/tcpdchk.0 man-netutil-catman .cat
./usr/share/man/cat8/tcpdmatch.0 man-netutil-catman .cat
@@ -3508,7 +3508,7 @@
./usr/share/man/html1/file.html man-util-htmlman html
./usr/share/man/html1/fincore.html man-util-htmlman html
./usr/share/man/html1/find.html man-util-htmlman html
-./usr/share/man/html1/finger.html man-util-htmlman html
+./usr/share/man/html1/finger.html man-util-htmlman finger,html
./usr/share/man/html1/flock.html man-util-htmlman html
./usr/share/man/html1/fmt.html man-util-htmlman html
./usr/share/man/html1/fold.html man-util-htmlman html
@@ -3888,7 +3888,7 @@
./usr/share/man/html1/tabs.html man-util-htmlman html
./usr/share/man/html1/tac.html man-util-htmlman html
./usr/share/man/html1/tail.html man-util-htmlman html
-./usr/share/man/html1/talk.html man-netutil-htmlman html
+./usr/share/man/html1/talk.html man-netutil-htmlman talk,html
./usr/share/man/html1/tar.html man-util-htmlman html
./usr/share/man/html1/tcopy.html man-util-htmlman html
./usr/share/man/html1/tee.html man-util-htmlman html
@@ -5715,7 +5715,7 @@
./usr/share/man/html8/fasthalt.html man-sysutil-htmlman html
./usr/share/man/html8/fdiscard.html man-sysutil-htmlman html
./usr/share/man/html8/fdisk.html man-sysutil-htmlman html
-./usr/share/man/html8/fingerd.html man-sysutil-htmlman html
+./usr/share/man/html8/fingerd.html man-sysutil-htmlman finger,html
./usr/share/man/html8/fixmount.html man-sysutil-htmlman html
./usr/share/man/html8/flashctl.html man-sysutil-htmlman html
./usr/share/man/html8/flush.html man-postfix-htmlman postfix,html
@@ -5967,7 +5967,7 @@
./usr/share/man/html8/nsec3hash.html man-bind-htmlman html
./usr/share/man/html8/nslookup.html man-netutil-htmlman html
./usr/share/man/html8/nsupdate.html man-obsolete obsolete
-./usr/share/man/html8/ntalkd.html man-netutil-htmlman html
+./usr/share/man/html8/ntalkd.html man-netutil-htmlman talk,html
./usr/share/man/html8/ntp-keygen.html man-ntp-htmlman ntp,html
./usr/share/man/html8/ntpd.html man-ntp-htmlman ntp,html
./usr/share/man/html8/ntpdate.html man-ntp-htmlman ntp,html
@@ -6183,7 +6183,7 @@
./usr/share/man/html8/sysctl.html man-sysutil-htmlman html
./usr/share/man/html8/sysinst.html man-sysutil-man html
./usr/share/man/html8/syslogd.html man-sysutil-htmlman html
-./usr/share/man/html8/talkd.html man-netutil-htmlman html
+./usr/share/man/html8/talkd.html man-netutil-htmlman talk,html
./usr/share/man/html8/tbrconfig.html man-router-htmlman html
./usr/share/man/html8/tcpdchk.html man-netutil-htmlman html
./usr/share/man/html8/tcpdmatch.html man-netutil-htmlman html
@@ -6458,7 +6458,7 @@
./usr/share/man/man1/file.1 man-util-man .man
./usr/share/man/man1/fincore.1 man-util-man .man
./usr/share/man/man1/find.1 man-util-man .man
-./usr/share/man/man1/finger.1 man-util-man .man
+./usr/share/man/man1/finger.1 man-util-man finger,.man
./usr/share/man/man1/flock.1 man-util-man .man
./usr/share/man/man1/fmt.1 man-util-man .man
./usr/share/man/man1/fold.1 man-util-man .man
@@ -6858,7 +6858,7 @@
./usr/share/man/man1/tabs.1 man-util-man .man
./usr/share/man/man1/tac.1 man-util-man .man
./usr/share/man/man1/tail.1 man-util-man .man
-./usr/share/man/man1/talk.1 man-netutil-man .man
+./usr/share/man/man1/talk.1 man-netutil-man talk,.man
./usr/share/man/man1/tar.1 man-util-man .man
./usr/share/man/man1/tcopy.1 man-util-man .man
./usr/share/man/man1/tee.1 man-util-man .man
@@ -8902,7 +8902,7 @@
./usr/share/man/man8/fasthalt.8 man-sysutil-man .man
./usr/share/man/man8/fdiscard.8 man-sysutil-man .man
./usr/share/man/man8/fdisk.8 man-sysutil-man .man
-./usr/share/man/man8/fingerd.8 man-sysutil-man .man
+./usr/share/man/man8/fingerd.8 man-sysutil-man finger,.man
./usr/share/man/man8/fixmount.8 man-sysutil-man .man
./usr/share/man/man8/flashctl.8 man-sysutil-man .man
./usr/share/man/man8/flush.8 man-postfix-man postfix,.man
@@ -9222,7 +9222,7 @@
./usr/share/man/man8/nsec3hash.8 man-bind-man .man
./usr/share/man/man8/nslookup.8 man-netutil-man .man
./usr/share/man/man8/nsupdate.8 man-obsolete obsolete
-./usr/share/man/man8/ntalkd.8 man-netutil-man .man
+./usr/share/man/man8/ntalkd.8 man-netutil-man talk,.man
./usr/share/man/man8/ntp-keygen.8 man-ntp-man ntp,.man
./usr/share/man/man8/ntpd.8 man-ntp-man ntp,.man
./usr/share/man/man8/ntpdate.8 man-ntp-man ntp,.man
@@ -9497,7 +9497,7 @@
./usr/share/man/man8/sysctl.8 man-sysutil-man .man
./usr/share/man/man8/sysinst.8 man-sysutil-man .man
./usr/share/man/man8/syslogd.8 man-sysutil-man .man
-./usr/share/man/man8/talkd.8 man-netutil-man .man
+./usr/share/man/man8/talkd.8 man-netutil-man talk,.man
./usr/share/man/man8/tbrconfig.8 man-router-man .man
./usr/share/man/man8/tcpdchk.8 man-netutil-man .man
./usr/share/man/man8/tcpdmatch.8 man-netutil-man .man
diff -r 63c109d671f1 -r cd837fbb6f11 etc/Makefile
--- a/etc/Makefile Sat May 28 12:36:56 2022 +0000
+++ b/etc/Makefile Sat May 28 14:31:11 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.462 2022/05/28 12:36:56 nia Exp $
+# $NetBSD: Makefile,v 1.463 2022/05/28 14:31:11 nia Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
diff -r 63c109d671f1 -r cd837fbb6f11 libexec/Makefile
--- a/libexec/Makefile Sat May 28 12:36:56 2022 +0000
+++ b/libexec/Makefile Sat May 28 14:31:11 2022 +0000
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.62 2022/05/27 07:28:20 nia Exp $
+# $NetBSD: Makefile,v 1.63 2022/05/28 14:31:11 nia Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
.include <bsd.own.mk>
SUBDIR= atrun \
- comsat fingerd ftpd getty httpd identd ld.aout_so \
+ comsat ftpd getty httpd identd ld.aout_so \
ld.elf_so mail.local makekey rexecd \
rlogind rshd rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld \
- rpc.sprayd talkd telnetd tftpd utmp_update
+ rpc.sprayd telnetd tftpd utmp_update
+
+.if ${MKFINGER} != "no"
+SUBDIR+= fingerd
+.endif
.if ${MKLFS} != "no"
SUBDIR+= lfs_cleanerd
@@ -17,4 +21,8 @@
SUBDIR+= getNAME makewhatis
.endif
+.if ${MKTALK} != "no"
+SUBDIR+= talkd
+.endif
+
.include <bsd.subdir.mk>
diff -r 63c109d671f1 -r cd837fbb6f11 share/man/man5/mk.conf.5
--- a/share/man/man5/mk.conf.5 Sat May 28 12:36:56 2022 +0000
+++ b/share/man/man5/mk.conf.5 Sat May 28 14:31:11 2022 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.92 2022/05/28 11:17:35 nia Exp $
+.\" $NetBSD: mk.conf.5,v 1.93 2022/05/28 14:31:12 nia Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -445,6 +445,15 @@
statically.
.DFLTy
.
+.It Sy MKFINGER
+.YorN
+Indicates whether
+.Xr finger 1
+and
+.Xr fingerd 8
+are to be built and installed.
+.DFLTy
+.
.It Sy MKGCC
.YorN
Home |
Main Index |
Thread Index |
Old Index