From 189462687621eb53f6b073b1947e6113ba4d1c2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20E=C3=9Fer?= <se@FreeBSD.org>
Date: Wed, 14 Nov 2018 08:45:48 +0000
Subject: [PATCH] Prepare move of ctm from base to a port (misc/ctm) by: -
 Adding a note to UPDATING - Adding a note to the history section of the
 manpage ctm.1 - Adding a message printed to STDERR to the ctm program

This version is meant for release in FreeBSD-12.0 and should remain in
FreeBSD-12 over its life-time.

A follow-up commit will remove ctm from -CURRENT after the MFC to 12
has happened.

Approved by:	imp, rgrimes, bcr (man-page)
MFC after:	3 days
Relnotes:	yes
Differential Revision:	https://reviews.freebsd.org/D17969
---
 UPDATING               | 6 ++++++
 usr.sbin/ctm/ctm/ctm.1 | 8 +++++++-
 usr.sbin/ctm/ctm/ctm.c | 3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index c82d4fa8ca92..b859dd6a295c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20181115:
+	The set of CTM commands (ctm, ctm_smail, ctm_rmail, ctm_dequeue)
+	has been converted to a port (misc/ctm) and will be removed from
+	FreeBSD-13.  It is available as a package (ctm) for all supported
+	FreeBSD versions.
+
 20181110:
 	The default newsyslog.conf(5) file has been changed to only include
 	files in /etc/newsyslog.conf.d/ and /usr/local/etc/newsyslog.conf.d/ if
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index 819a14b7fadd..ab0557f872b0 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -12,7 +12,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 14, 2016
+.Dd November 15, 2018
 .Dt CTM 1
 .Os
 .Sh NAME
@@ -321,6 +321,12 @@ The
 .Nm
 command appeared in
 .Fx 2.1 .
+.Pp
+The latest
+.Nm
+code has been made available as a port (misc/ctm) in preparation of removal
+from base in
+.Fx 13.0 .
 .Sh AUTHORS
 .An -nosplit
 The CTM system has been designed and implemented by
diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c
index 3f36ace81018..9674baf8e8bc 100644
--- a/usr.sbin/ctm/ctm/ctm.c
+++ b/usr.sbin/ctm/ctm/ctm.c
@@ -144,6 +144,9 @@ main(int argc, char **argv)
 	warnx("%d errors during option processing",stat);
 	return Exit_Pilot;
     }
+    fprintf(stderr, "CTM will be removed from FreeBSD-13, and will be "
+	"provided as a port (misc/ctm) or package (ctm).\n\n");
+
     stat = Exit_Done;
     argc -= optind;
     argv += optind;