svn commit: r289928 - in user/ngie/detangle-rc: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Sun Oct 25 08:52:32 2015
New Revision: 289928
URL: https://svnweb.freebsd.org/changeset/base/289928

Log:
  Conditionally install/uninstall ip6addrctl depending on MK_INET6

Modified:
  user/ngie/detangle-rc/etc/rc.d/Makefile
  user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc

Modified: user/ngie/detangle-rc/etc/rc.d/Makefile
==============================================================================
--- user/ngie/detangle-rc/etc/rc.d/Makefile	Sun Oct 25 08:40:26 2015	(r289927)
+++ user/ngie/detangle-rc/etc/rc.d/Makefile	Sun Oct 25 08:52:32 2015	(r289928)
@@ -45,7 +45,6 @@ FILES=	DAEMON \
 	hostid_save \
 	hostname \
 	iovctl \
-	ip6addrctl \
 	ipfilter \
 	ipfs \
 	ipfw \
@@ -187,6 +186,7 @@ FILES+=		hastd
 .endif
 
 .if ${MK_INET6} != "no"
+FILES+=		ip6addrctl
 FILES+=		mroute6d
 FILES+=		route6d
 FILES+=		rtadvd

Modified: user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc	Sun Oct 25 08:40:26 2015	(r289927)
+++ user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc	Sun Oct 25 08:52:32 2015	(r289928)
@@ -2784,6 +2784,7 @@ OLD_FILES+=usr/share/man/man3/iconvlist.
 .endif
 
 .if ${MK_INET6} == no
+OLD_FILES+=etc/rc.d/ip6addrctl
 OLD_FILES+=etc/rc.d/mroute6d
 OLD_FILES+=etc/rc.d/route6d
 OLD_FILES+=etc/rc.d/rtadvd