svn commit: r277731 - in head: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Mon Jan 26 08:20:51 2015
New Revision: 277731
URL: https://svnweb.freebsd.org/changeset/base/277731

Log:
  Honor MK_LPR with etc/rc.d/lpd
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Mon Jan 26 08:04:38 2015	(r277730)
+++ head/etc/rc.d/Makefile	Mon Jan 26 08:20:51 2015	(r277731)
@@ -192,6 +192,10 @@ FILES+=		iscsictl
 FILES+=		iscsid
 .endif
 
+.if ${MK_LPR} != "no"
+FILES+=		lpd
+.endif
+
 .if ${MK_NS_CACHING} != "no"
 _nscd=		nscd
 .endif

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 08:04:38 2015	(r277730)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 08:20:51 2015	(r277731)
@@ -3512,6 +3512,7 @@ OLD_FILES+=usr/share/man/man8/updatedb.8
 .if ${MK_LPR} == no
 OLD_FILES+=etc/hosts.lpd
 OLD_FILES+=etc/printcap
+OLD_FILES+=etc/rc.d/lpd
 OLD_FILES+=usr/bin/lp
 OLD_FILES+=usr/bin/lpq
 OLD_FILES+=usr/bin/lpr