svn commit: r342126 - in head: share/man/man5 tools/build/mk tools/build/options usr.sbin usr.sbin/ctm

[Stefan Esser]

Author: se
Date: Sat Dec 15 16:53:15 2018
New Revision: 342126
URL: https://svnweb.freebsd.org/changeset/base/342126

Log:
  Remove CTM from 13-CURRENT after the release of FreeBSD-12.0.
  
  The removal (and creation of a port) has been pre-announced in UPDATING
  1 month ago. Packages are available for all supported FreeBSD vesions.
  
  I did not think that another entry in UPDATING is required to note the
  actual removal.
  
  No MFC is planned - CTM shall be kept in base for all releases up to 12.x.
  
  Reviewed by:	rgrimes
  Approved by:	imp, bcr (manpages)
  Relnotes:	yes
  Differential Revision:	https://reviews.freebsd.org/D17935

Deleted:
  head/tools/build/options/WITHOUT_CTM
  head/usr.sbin/ctm/
Modified:
  head/share/man/man5/src.conf.5
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.sbin/Makefile

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Sat Dec 15 15:06:22 2018	(r342125)
+++ head/share/man/man5/src.conf.5	Sat Dec 15 16:53:15 2018	(r342126)
@@ -479,10 +479,6 @@ is set explicitly)
 Set to compile with CTF (Compact C Type Format) data.
 CTF data encapsulates a reduced form of debugging information
 similar to DWARF and the venerable stabs and is required for DTrace.
-.It Va WITHOUT_CTM
-Set to not build
-.Xr ctm 1
-and related utilities.
 .It Va WITHOUT_CUSE
 Set to not build CUSE-related programs and libraries.
 .It Va WITHOUT_CXGBETOOL

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Dec 15 15:06:22 2018	(r342125)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Dec 15 16:53:15 2018	(r342126)
@@ -1551,18 +1551,6 @@ OLD_FILES+=usr/bin/cpp
 OLD_FILES+=usr/share/man/man1/cpp.1.gz
 .endif
 
-.if ${MK_CTM} == no
-OLD_FILES+=usr/sbin/ctm
-OLD_FILES+=usr/sbin/ctm_dequeue
-OLD_FILES+=usr/sbin/ctm_rmail
-OLD_FILES+=usr/sbin/ctm_smail
-OLD_FILES+=usr/share/man/man1/ctm.1.gz
-OLD_FILES+=usr/share/man/man1/ctm_dequeue.1.gz
-OLD_FILES+=usr/share/man/man1/ctm_rmail.1.gz
-OLD_FILES+=usr/share/man/man1/ctm_smail.1.gz
-OLD_FILES+=usr/share/man/man5/ctm.5.gz
-.endif
-
 .if ${MK_CUSE} == no
 OLD_FILES+=usr/include/fs/cuse/cuse_defs.h
 OLD_FILES+=usr/include/fs/cuse/cuse_ioctl.h

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Sat Dec 15 15:06:22 2018	(r342125)
+++ head/usr.sbin/Makefile	Sat Dec 15 16:53:15 2018	(r342126)
@@ -123,7 +123,6 @@ SUBDIR.${MK_BLUETOOTH}+=	bluetooth
 SUBDIR.${MK_BOOTPARAMD}+=	bootparamd
 SUBDIR.${MK_BSDINSTALL}+=	bsdinstall
 SUBDIR.${MK_BSNMP}+=	bsnmpd
-SUBDIR.${MK_CTM}+=	ctm
 SUBDIR.${MK_CXGBETOOL}+=	cxgbetool
 SUBDIR.${MK_DIALOG}+=	bsdconfig
 SUBDIR.${MK_EFI}+=	efivar efidp efibootmgr