svn commit: r340444 - in stable/12: . usr.sbin/ctm/ctm

[Stefan Esser]

Author: se
Date: Wed Nov 14 20:35:04 2018
New Revision: 340444
URL: https://svnweb.freebsd.org/changeset/base/340444

Log:
  MFC S340428: 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:    re
  Relnotes:       yes
  Differential Revision:  https://reviews.freebsd.org/D17969

Modified:
  stable/12/UPDATING
  stable/12/usr.sbin/ctm/ctm/ctm.1
  stable/12/usr.sbin/ctm/ctm/ctm.c

Modified: stable/12/UPDATING
==============================================================================
--- stable/12/UPDATING	Wed Nov 14 19:10:35 2018	(r340443)
+++ stable/12/UPDATING	Wed Nov 14 20:35:04 2018	(r340444)
@@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+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.  A depreciation warning will be printed to stderr by
+	the ctm command, but the functionality will remain in base for all
+	FreeBSD-12 releases.
+
 20181019:
 	The stable/12 branch has been created in subversion from head
 	revision r339432.

Modified: stable/12/usr.sbin/ctm/ctm/ctm.1
==============================================================================
--- stable/12/usr.sbin/ctm/ctm/ctm.1	Wed Nov 14 19:10:35 2018	(r340443)
+++ stable/12/usr.sbin/ctm/ctm/ctm.1	Wed Nov 14 20:35:04 2018	(r340444)
@@ -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

Modified: stable/12/usr.sbin/ctm/ctm/ctm.c
==============================================================================
--- stable/12/usr.sbin/ctm/ctm/ctm.c	Wed Nov 14 19:10:35 2018	(r340443)
+++ stable/12/usr.sbin/ctm/ctm/ctm.c	Wed Nov 14 20:35:04 2018	(r340444)
@@ -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;