svn commit: r262335 - in head: etc libexec share/mk tools/build/mk tools/build/options

[Baptiste Daroussin]

Author: bapt
Date: Sat Feb 22 13:05:23 2014
New Revision: 262335
URL: http://svnweb.freebsd.org/changeset/base/262335

Log:
  Rename WITHOUT_DMA into WITHOUT_DMAGENT to avoid confusion
  
  Requested by:	ian

Added:
  head/tools/build/options/WITHOUT_DMAGENT
     - copied unchanged from r262334, head/tools/build/options/WITHOUT_DMA
Deleted:
  head/tools/build/options/WITHOUT_DMA
Modified:
  head/etc/Makefile
  head/libexec/Makefile
  head/share/mk/bsd.own.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Sat Feb 22 11:06:48 2014	(r262334)
+++ head/etc/Makefile	Sat Feb 22 13:05:23 2014	(r262335)
@@ -226,7 +226,7 @@ distribution:
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
-.if ${MK_DMA} != "no"
+.if ${MK_DMAGENT} != "no"
 	${_+_}cd ${.CURDIR}/dma; ${MAKE} install
 .endif
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install

Modified: head/libexec/Makefile
==============================================================================
--- head/libexec/Makefile	Sat Feb 22 11:06:48 2014	(r262334)
+++ head/libexec/Makefile	Sat Feb 22 13:05:23 2014	(r262335)
@@ -49,7 +49,7 @@ _casper=	casper
 _comsat=	comsat
 .endif
 
-.if ${MK_DMA} != "no"
+.if ${MK_DMAGENT} != "no"
 _dma=		dma
 _dma-mbox-create=	dma-mbox-create
 .endif

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Feb 22 11:06:48 2014	(r262334)
+++ head/share/mk/bsd.own.mk	Sat Feb 22 13:05:23 2014	(r262335)
@@ -271,7 +271,7 @@ __DEFAULT_YES_OPTIONS = \
     CTM \
     CXX \
     DICT \
-    DMA \
+    DMAGENT \
     DYNAMICROOT \
     ED_CRYPTO \
     EXAMPLES \
@@ -512,7 +512,7 @@ MK_GROFF:=	no
 .if ${MK_MAIL} == "no"
 MK_MAILWRAPPER:= no
 MK_SENDMAIL:=	no
-MK_DMA:=	no
+MK_DMAGENT:=	no
 .endif
 
 .if ${MK_NETGRAPH} == "no"

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Feb 22 11:06:48 2014	(r262334)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Feb 22 13:05:23 2014	(r262335)
@@ -4307,7 +4307,7 @@ OLD_FILES+=usr/bin/svnsync
 OLD_FILES+=usr/bin/svnversion
 .endif
 
-.if ${MK_DMA} == no
+.if ${MK_DMAGENT} == no
 OLD_FILES+=usr/libexec/dma
 OLD_FILES+=usr/libexec/dma-mbox-create
 OLD_FILES+=usr/share/man/man8/dma.8.gz

Copied: head/tools/build/options/WITHOUT_DMAGENT (from r262334, head/tools/build/options/WITHOUT_DMA)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_DMAGENT	Sat Feb 22 13:05:23 2014	(r262335, copy of r262334, head/tools/build/options/WITHOUT_DMA)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build dma Mail Transport Agent