Date: Wed, 4 Feb 2015 11:51:47 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r278205 - in stable/9: etc/rc.d tools/build/mk Message-ID: <201502041151.t14Bpl9E091934@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Feb 4 11:51:46 2015 New Revision: 278205 URL: https://svnweb.freebsd.org/changeset/base/278205 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/9/etc/rc.d/Makefile stable/9/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/9/ (props changed) stable/9/etc/ (props changed) stable/9/etc/rc.d/ (props changed) stable/9/tools/ (props changed) stable/9/tools/build/ (props changed) Modified: stable/9/etc/rc.d/Makefile ============================================================================== --- stable/9/etc/rc.d/Makefile Wed Feb 4 11:48:33 2015 (r278204) +++ stable/9/etc/rc.d/Makefile Wed Feb 4 11:51:46 2015 (r278205) @@ -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 Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 11:48:33 2015 (r278204) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 11:51:46 2015 (r278205) @@ -2931,6 +2931,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502041151.t14Bpl9E091934>