diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-04 09:21:07 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-04 09:21:07 +0000 |
| commit | 5f6c6cdef0f4b549fd110f91bb2d7b6f1eca86dd (patch) | |
| tree | f1719f87c60c91129dc0e9402d34f26c17cf26f9 | |
| parent | 4387ccbff5139246eed2871a9bcc73c92a767e66 (diff) | |
| download | FreeBSD-src-5f6c6cdef0f4b549fd110f91bb2d7b6f1eca86dd.zip FreeBSD-src-5f6c6cdef0f4b549fd110f91bb2d7b6f1eca86dd.tar.gz | |
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
| -rw-r--r-- | etc/rc.d/Makefile | 5 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index ef66965..3fe99a0 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 24dfeb1..c226f0e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3317,6 +3317,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 |
