git: c7fd29f0f29a - main - pkgbase: Create a FreeBSD-telnet package

[Emmanuel Vadot]

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=c7fd29f0f29ae3eb9d86cc019f6c1bab35634548

commit c7fd29f0f29ae3eb9d86cc019f6c1bab35634548
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-09-01 17:02:00 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-09-07 08:18:11 +0000

    pkgbase: Create a FreeBSD-telnet package
    
    both telnet and telnetd aren't that useful nowadays but some
    might want them.
    Create a FreeBSD-telnet package so users have a choice to have
    them or not.
    
    Differential Revision:  https://reviews.freebsd.org/D31791
    Reviewed by: emaste
---
 lib/libpam/pam.d/Makefile         | 1 +
 libexec/telnetd/Makefile          | 2 ++
 release/packages/Makefile.package | 2 ++
 usr.bin/telnet/Makefile           | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile
index 43e43780ee33..1a9caeef940f 100644
--- a/lib/libpam/pam.d/Makefile
+++ b/lib/libpam/pam.d/Makefile
@@ -34,6 +34,7 @@ afterinstallconfig:
 .if ${MK_TELNET} != "no"
 CONFGROUPS+=	TELNET
 TELNET+=	telnetd
+TELNETPACKAGE=	telnet
 .endif
 
 .include <bsd.prog.mk>
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 24119797ec8b..15dc0af01f0b 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -5,6 +5,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	telnet
+
 TELNETDIR=	${SRCTOP}/contrib/telnet
 .PATH:		${TELNETDIR}/telnetd
 
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 254a0fa5afb8..f38644c84d32 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -88,6 +88,8 @@ svn_COMMENT= 		Subversion Version Control System
 svn_DESC= 		Subversion Version Control System
 syscons_COMMENT= 	Syscons Console
 syscons_DESC= 		Syscons Console
+telnet_COMMENT=		Telnet and telnetd
+telnet_DESC=		Telnet and telnetd
 tests_COMMENT= 		Test Suite
 tests_DESC= 		Test Suite
 unbound_COMMENT= 	Unbound DNS Resolver
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index cb5d886e9d36..33c8b9cba193 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	telnet
+
 TELNETDIR=	${SRCTOP}/contrib/telnet
 .PATH:		${TELNETDIR}/telnet