svn commit: r278188 - in stable/10: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Wed Feb  4 09:21:07 2015
New Revision: 278188
URL: https://svnweb.freebsd.org/changeset/base/278188

Log:
  MFC r277731,r277734:
  
  r277731:
  
    Honor MK_LPR with etc/rc.d/lpd
  
    Sponsored by: EMC / Isilon Storage Division
  
  r277734:
  
    Remove explicit inclusion of lpd from FILES
  
    Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/etc/rc.d/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile	Wed Feb  4 09:16:14 2015	(r278187)
+++ stable/10/etc/rc.d/Makefile	Wed Feb  4 09:21:07 2015	(r278188)
@@ -80,7 +80,6 @@ FILES=	DAEMON \
 	local \
 	localpkg \
 	lockd \
-	lpd \
 	mixer \
 	motd \
 	mountcritlocal \
@@ -193,6 +192,10 @@ _kfd=		kfd
 _kpasswdd=	kpasswdd
 .endif
 
+.if ${MK_LPR} != "no"
+FILES+=		lpd
+.endif
+
 .if ${MK_NS_CACHING} != "no"
 _nscd=		nscd
 .endif

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 09:16:14 2015	(r278187)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 09:21:07 2015	(r278188)
@@ -3317,6 +3317,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