From 3613c65630b79459bc0326e9b06aa75048ae5315 Mon Sep 17 00:00:00 2001 From: ngie Date: Wed, 4 Feb 2015 11:51:46 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.freebsd.org/base/stable/9@278205 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- etc/rc.d/Makefile | 5 ++++- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 5a282c8d6..b4698bbac 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -72,7 +72,6 @@ FILES= DAEMON \ local \ localpkg \ lockd \ - lpd \ mixer \ motd \ mountcritlocal \ @@ -168,6 +167,10 @@ _ipxrouted= ipxrouted FILES+= jail .endif +.if ${MK_LPR} != "no" +FILES+= lpd +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 28be9474a..d666a6202 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2931,6 +2931,7 @@ OLD_FILES+=usr/share/man/man8/updatedb.8.gz .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 -- 2.45.0