diff -ur src.old/distrib/sets/lists/base/mi src/distrib/sets/lists/base/mi --- src.old/distrib/sets/lists/base/mi 2010-04-09 22:49:53.000000000 +0200 +++ src/distrib/sets/lists/base/mi 2010-04-09 20:31:55.000000000 +0200 @@ -469,10 +469,10 @@ ./usr/bin/login base-util-bin ./usr/bin/logname base-util-bin ./usr/bin/look base-util-bin -./usr/bin/lp base-lpr-bin -./usr/bin/lpq base-lpr-bin -./usr/bin/lpr base-lpr-bin -./usr/bin/lprm base-lpr-bin +./usr/bin/lp base-lpr-bin lpr +./usr/bin/lpq base-lpr-bin lpr +./usr/bin/lpr base-lpr-bin lpr +./usr/bin/lprm base-lpr-bin lpr ./usr/bin/lsextattr base-util-bin ./usr/bin/m4 base-util-bin ./usr/bin/machine base-util-bin @@ -893,8 +893,8 @@ ./usr/libexec/locate.code base-sysutil-bin ./usr/libexec/locate.updatedb base-sysutil-bin ./usr/libexec/lpr base-lpr-usr -./usr/libexec/lpr/lpf base-lpr-bin -./usr/libexec/lpr/pjlfilter base-lpr-bin +./usr/libexec/lpr/lpf base-lpr-bin lpr +./usr/libexec/lpr/pjlfilter base-lpr-bin lpr ./usr/libexec/mail.local base-mail-bin ./usr/libexec/makekey base-crypto-bin ./usr/libexec/makewhatis base-man-bin @@ -1126,9 +1126,9 @@ ./usr/sbin/lmcconfig base-netutil-bin ./usr/sbin/lmtp base-obsolete obsolete ./usr/sbin/lockstat base-sysutil-bin -./usr/sbin/lpc base-lpr-bin -./usr/sbin/lpd base-lpr-bin -./usr/sbin/lptest base-lpr-bin +./usr/sbin/lpc base-lpr-bin lpr +./usr/sbin/lpd base-lpr-bin lpr +./usr/sbin/lptest base-lpr-bin lpr ./usr/sbin/lwresd base-bind-bin ./usr/sbin/mailstats base-obsolete obsolete ./usr/sbin/mailwrapper base-mailwrapper-bin @@ -1190,7 +1190,7 @@ ./usr/sbin/ntptimeset base-obsolete obsolete ./usr/sbin/ntptrace base-ntp-bin ./usr/sbin/omshell base-dhcpd-bin -./usr/sbin/pac base-sysutil-bin +./usr/sbin/pac base-sysutil-bin lpr ./usr/sbin/paxctl base-sysutil-bin ./usr/sbin/pcictl base-sysutil-bin ./usr/sbin/pfspamdb base-obsolete obsolete diff -ur src.old/distrib/sets/lists/comp/mi src/distrib/sets/lists/comp/mi --- src.old/distrib/sets/lists/comp/mi 2010-04-09 22:49:54.000000000 +0200 +++ src/distrib/sets/lists/comp/mi 2010-04-09 10:02:15.000000000 +0200 @@ -3107,9 +3107,9 @@ ./usr/libdata/debug/usr/bin/logname.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/look.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/lookbib.debug comp-groff-debug debug -./usr/libdata/debug/usr/bin/lpq.debug comp-lpr-debug debug -./usr/libdata/debug/usr/bin/lpr.debug comp-lpr-debug debug -./usr/libdata/debug/usr/bin/lprm.debug comp-lpr-debug debug +./usr/libdata/debug/usr/bin/lpq.debug comp-lpr-debug lpr,debug +./usr/libdata/debug/usr/bin/lpr.debug comp-lpr-debug lpr,debug +./usr/libdata/debug/usr/bin/lprm.debug comp-lpr-debug lpr,debug ./usr/libdata/debug/usr/bin/m4.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/mail.debug comp-mail-debug debug ./usr/libdata/debug/usr/bin/make.debug comp-util-debug debug @@ -3391,7 +3391,7 @@ ./usr/libdata/debug/usr/libexec/lint2.debug comp-c-debug debug ./usr/libdata/debug/usr/libexec/locate.bigram.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/libexec/locate.code.debug comp-sysutil-debug debug -./usr/libdata/debug/usr/libexec/lpr/lpf.debug comp-lpr-debug debug +./usr/libdata/debug/usr/libexec/lpr/lpf.debug comp-lpr-debug lpr,debug ./usr/libdata/debug/usr/libexec/mail.local.debug comp-mail-debug debug ./usr/libdata/debug/usr/libexec/makekey.debug comp-crypto-debug debug ./usr/libdata/debug/usr/libexec/makewhatis.debug comp-man-debug debug @@ -3541,9 +3541,9 @@ ./usr/libdata/debug/usr/sbin/link.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/lmcconfig.debug comp-netutil-debug debug ./usr/libdata/debug/usr/sbin/lockstat.debug comp-sysutil-debug debug -./usr/libdata/debug/usr/sbin/lpc.debug comp-lpr-debug debug -./usr/libdata/debug/usr/sbin/lpd.debug comp-lpr-debug debug -./usr/libdata/debug/usr/sbin/lptest.debug comp-lpr-debug debug +./usr/libdata/debug/usr/sbin/lpc.debug comp-lpr-debug lpr,debug +./usr/libdata/debug/usr/sbin/lpd.debug comp-lpr-debug lpr,debug +./usr/libdata/debug/usr/sbin/lptest.debug comp-lpr-debug lpr,debug ./usr/libdata/debug/usr/sbin/mailwrapper.debug comp-mailwrapper-debug debug ./usr/libdata/debug/usr/sbin/makedbm.debug comp-nis-debug yp,debug ./usr/libdata/debug/usr/sbin/makefs.debug comp-sysutil-debug debug @@ -3588,7 +3588,7 @@ ./usr/libdata/debug/usr/sbin/ntpq.debug comp-ntp-debug debug ./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug debug ./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug -./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug lpr,debug ./usr/libdata/debug/usr/sbin/paxctl.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/pcictl.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/pkg_add.debug comp-pkgutil-debug debug diff -ur src.old/distrib/sets/lists/etc/mi src/distrib/sets/lists/etc/mi --- src.old/distrib/sets/lists/etc/mi 2010-04-09 22:49:54.000000000 +0200 +++ src/distrib/sets/lists/etc/mi 2010-04-09 21:15:34.000000000 +0200 @@ -68,7 +68,7 @@ ./etc/group etc-sys-etc ./etc/hosts etc-net-etc ./etc/hosts.equiv etc-netutil-etc -./etc/hosts.lpd etc-lpr-etc +./etc/hosts.lpd etc-lpr-etc lpr ./etc/inetd.conf etc-netutil-etc ./etc/iscsi/auths etc-iscsi-etc iscsi ./etc/iscsi/targets etc-iscsi-etc iscsi @@ -152,7 +152,7 @@ ./etc/powerd/scripts/sensor_voltage etc-sysutil-etc ./etc/powerd/scripts/sleep_button etc-sysutil-etc ./etc/primes etc-obsolete obsolete -./etc/printcap etc-lpr-etc +./etc/printcap etc-lpr-etc lpr ./etc/profile etc-util-etc ./etc/protocols etc-net-etc ./etc/pwd.db etc-sys-etc @@ -216,7 +216,7 @@ ./etc/rc.d/lkm2 etc-obsolete obsolete ./etc/rc.d/lkm3 etc-obsolete obsolete ./etc/rc.d/local etc-sys-rc -./etc/rc.d/lpd etc-lpr-rc +./etc/rc.d/lpd etc-lpr-rc lpr ./etc/rc.d/lvm etc-sys-rc ./etc/rc.d/mdnsd etc-mdns-rc ./etc/rc.d/mixerctl etc-audio-rc diff -ur src.old/distrib/sets/lists/man/mi src/distrib/sets/lists/man/mi --- src.old/distrib/sets/lists/man/mi 2010-04-09 22:49:54.000000000 +0200 +++ src/distrib/sets/lists/man/mi 2010-04-09 11:49:36.000000000 +0200 @@ -256,11 +256,11 @@ ./usr/share/man/cat1/login.0 man-util-catman .cat ./usr/share/man/cat1/logname.0 man-util-catman .cat ./usr/share/man/cat1/look.0 man-util-catman .cat -./usr/share/man/cat1/lp.0 man-lpr-catman .cat -./usr/share/man/cat1/lpq.0 man-lpr-catman .cat -./usr/share/man/cat1/lpr.0 man-lpr-catman .cat -./usr/share/man/cat1/lprm.0 man-lpr-catman .cat -./usr/share/man/cat1/lptest.0 man-lpr-catman .cat +./usr/share/man/cat1/lp.0 man-lpr-catman lpr,.cat +./usr/share/man/cat1/lpq.0 man-lpr-catman lpr,.cat +./usr/share/man/cat1/lpr.0 man-lpr-catman lpr,.cat +./usr/share/man/cat1/lprm.0 man-lpr-catman lpr,.cat +./usr/share/man/cat1/lptest.0 man-lpr-catman lpr,.cat ./usr/share/man/cat1/ls.0 man-util-catman .cat ./usr/share/man/cat1/lsextattr.0 man-util-catman .cat ./usr/share/man/cat1/m4.0 man-util-catman .cat @@ -1860,7 +1860,7 @@ ./usr/share/man/cat5/postconf.0 man-postfix-catman postfix,.cat ./usr/share/man/cat5/postfix-wrapper.0 man-postfix-catman postfix,.cat ./usr/share/man/cat5/primes.0 man-obsolete obsolete -./usr/share/man/cat5/printcap.0 man-lpr-catman .cat +./usr/share/man/cat5/printcap.0 man-lpr-catman lpr,.cat ./usr/share/man/cat5/protocols.0 man-net-catman .cat ./usr/share/man/cat5/racoon.conf.0 man-netutil-catman crypto,.cat ./usr/share/man/cat5/radius.conf.0 man-netutil-catman .cat @@ -2249,8 +2249,8 @@ ./usr/share/man/cat8/locate.updatedb.0 man-sysutil-catman .cat ./usr/share/man/cat8/lockd.0 man-nfsserver-catman .cat ./usr/share/man/cat8/lockstat.0 man-sysutil-catman .cat -./usr/share/man/cat8/lpc.0 man-lpr-catman .cat -./usr/share/man/cat8/lpd.0 man-lpr-catman .cat +./usr/share/man/cat8/lpc.0 man-lpr-catman lpr,.cat +./usr/share/man/cat8/lpd.0 man-lpr-catman lpr,.cat ./usr/share/man/cat8/luna68k/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/luna68k/makedev.0 man-obsolete obsolete ./usr/share/man/cat8/lvchange.0 man-lvm-catman lvm,.cat @@ -2410,7 +2410,7 @@ ./usr/share/man/cat8/ofppc/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/ofppc/makedev.0 man-obsolete obsolete ./usr/share/man/cat8/oqmgr.0 man-postfix-catman postfix,.cat -./usr/share/man/cat8/pac.0 man-sysutil-catman .cat +./usr/share/man/cat8/pac.0 man-sysutil-catman lpr,.cat ./usr/share/man/cat8/pam.0 man-sysutil-catman .cat ./usr/share/man/cat8/pam_afslog.0 man-sysutil-catman kerberos,pam,.cat ./usr/share/man/cat8/pam_chroot.0 man-sysutil-catman pam,.cat @@ -2975,11 +2975,11 @@ ./usr/share/man/html1/login.html man-util-htmlman html ./usr/share/man/html1/logname.html man-util-htmlman html ./usr/share/man/html1/look.html man-util-htmlman html -./usr/share/man/html1/lp.html man-lpr-htmlman html -./usr/share/man/html1/lpq.html man-lpr-htmlman html -./usr/share/man/html1/lpr.html man-lpr-htmlman html -./usr/share/man/html1/lprm.html man-lpr-htmlman html -./usr/share/man/html1/lptest.html man-lpr-htmlman html +./usr/share/man/html1/lp.html man-lpr-htmlman lpr,html +./usr/share/man/html1/lpq.html man-lpr-htmlman lpr,html +./usr/share/man/html1/lpr.html man-lpr-htmlman lpr,html +./usr/share/man/html1/lprm.html man-lpr-htmlman lpr,html +./usr/share/man/html1/lptest.html man-lpr-htmlman lpr,html ./usr/share/man/html1/ls.html man-util-htmlman html ./usr/share/man/html1/lsextattr.html man-util-htmlman html ./usr/share/man/html1/m4.html man-util-htmlman html @@ -4420,7 +4420,7 @@ ./usr/share/man/html5/pkg_summary.html man-pkgutil-htmlman html ./usr/share/man/html5/postconf.html man-postfix-htmlman postfix,html ./usr/share/man/html5/postfix-wrapper.html man-postfix-htmlman postfix,html -./usr/share/man/html5/printcap.html man-lpr-htmlman html +./usr/share/man/html5/printcap.html man-lpr-htmlman lpr,html ./usr/share/man/html5/protocols.html man-net-htmlman html ./usr/share/man/html5/racoon.conf.html man-netutil-htmlman crypto,html ./usr/share/man/html5/radius.conf.html man-netutil-htmlman html @@ -4714,8 +4714,8 @@ ./usr/share/man/html8/locate.updatedb.html man-sysutil-htmlman html ./usr/share/man/html8/lockd.html man-nfsserver-htmlman html ./usr/share/man/html8/lockstat.html man-sysutil-htmlman html -./usr/share/man/html8/lpc.html man-lpr-htmlman html -./usr/share/man/html8/lpd.html man-lpr-htmlman html +./usr/share/man/html8/lpc.html man-lpr-htmlman lpr,html +./usr/share/man/html8/lpd.html man-lpr-htmlman lpr,html ./usr/share/man/html8/lvchange.html man-lvm-htmlman lvm,html ./usr/share/man/html8/lvconvert.html man-lvm-htmlman lvm,html ./usr/share/man/html8/lvcreate.html man-lvm-htmlman lvm,html @@ -4838,7 +4838,7 @@ ./usr/share/man/html8/ntptrace.html man-ntp-htmlman html ./usr/share/man/html8/ofctl.html man-sysutil-htmlman html ./usr/share/man/html8/oqmgr.html man-postfix-htmlman postfix,html -./usr/share/man/html8/pac.html man-sysutil-htmlman html +./usr/share/man/html8/pac.html man-sysutil-htmlman lpr,html ./usr/share/man/html8/pam.html man-sysutil-htmlman html ./usr/share/man/html8/pam_afslog.html man-sysutil-htmlman kerberos,pam,html ./usr/share/man/html8/pam_chroot.html man-sysutil-htmlman pam,html @@ -5340,11 +5340,11 @@ ./usr/share/man/man1/login.1 man-util-man .man ./usr/share/man/man1/logname.1 man-util-man .man ./usr/share/man/man1/look.1 man-util-man .man -./usr/share/man/man1/lp.1 man-lpr-man .man -./usr/share/man/man1/lpq.1 man-lpr-man .man -./usr/share/man/man1/lpr.1 man-lpr-man .man -./usr/share/man/man1/lprm.1 man-lpr-man .man -./usr/share/man/man1/lptest.1 man-lpr-man .man +./usr/share/man/man1/lp.1 man-lpr-man lpr,.man +./usr/share/man/man1/lpq.1 man-lpr-man lpr,.man +./usr/share/man/man1/lpr.1 man-lpr-man lpr,.man +./usr/share/man/man1/lprm.1 man-lpr-man lpr,.man +./usr/share/man/man1/lptest.1 man-lpr-man lpr,.man ./usr/share/man/man1/ls.1 man-util-man .man ./usr/share/man/man1/lsextattr.1 man-util-man .man ./usr/share/man/man1/m4.1 man-util-man .man @@ -6944,7 +6944,7 @@ ./usr/share/man/man5/postconf.5 man-postfix-man postfix,.man ./usr/share/man/man5/postfix-wrapper.5 man-postfix-man postfix,.man ./usr/share/man/man5/primes.5 man-obsolete obsolete -./usr/share/man/man5/printcap.5 man-lpr-man .man +./usr/share/man/man5/printcap.5 man-lpr-man lpr,.man ./usr/share/man/man5/protocols.5 man-net-man .man ./usr/share/man/man5/racoon.conf.5 man-netutil-man crypto,.man ./usr/share/man/man5/radius.conf.5 man-netutil-man .man @@ -7333,8 +7333,8 @@ ./usr/share/man/man8/locate.updatedb.8 man-sysutil-man .man ./usr/share/man/man8/lockd.8 man-nfsserver-man .man ./usr/share/man/man8/lockstat.8 man-sysutil-man .man -./usr/share/man/man8/lpc.8 man-lpr-man .man -./usr/share/man/man8/lpd.8 man-lpr-man .man +./usr/share/man/man8/lpc.8 man-lpr-man lpr,.man +./usr/share/man/man8/lpd.8 man-lpr-man lpr,.man ./usr/share/man/man8/luna68k/MAKEDEV.8 man-obsolete obsolete ./usr/share/man/man8/luna68k/makedev.8 man-obsolete obsolete ./usr/share/man/man8/lvchange.8 man-lvm-man lvm,.man @@ -7494,7 +7494,7 @@ ./usr/share/man/man8/ofppc/MAKEDEV.8 man-obsolete obsolete ./usr/share/man/man8/ofppc/makedev.8 man-obsolete obsolete ./usr/share/man/man8/oqmgr.8 man-postfix-man postfix,.man -./usr/share/man/man8/pac.8 man-sysutil-man .man +./usr/share/man/man8/pac.8 man-sysutil-man lpr,.man ./usr/share/man/man8/pam.8 man-sysutil-man .man ./usr/share/man/man8/pam_afslog.8 man-sysutil-man kerberos,.man,pam ./usr/share/man/man8/pam_chroot.8 man-sysutil-man .man,pam diff -ur src.old/distrib/sets/lists/misc/mi src/distrib/sets/lists/misc/mi --- src.old/distrib/sets/lists/misc/mi 2010-04-09 22:49:54.000000000 +0200 +++ src/distrib/sets/lists/misc/mi 2010-04-09 10:05:44.000000000 +0200 @@ -508,15 +508,15 @@ ./usr/share/doc/smm/06.nfs/2.t misc-smm-doc doc ./usr/share/doc/smm/06.nfs/Makefile misc-smm-doc doc ./usr/share/doc/smm/06.nfs/ref.t misc-smm-doc doc -./usr/share/doc/smm/07.lpd/0.t misc-smm-doc doc -./usr/share/doc/smm/07.lpd/1.t misc-smm-doc doc -./usr/share/doc/smm/07.lpd/2.t misc-smm-doc doc -./usr/share/doc/smm/07.lpd/3.t misc-smm-doc doc -./usr/share/doc/smm/07.lpd/4.t misc-smm-doc doc -./usr/share/doc/smm/07.lpd/5.t misc-smm-doc doc -./usr/share/doc/smm/07.lpd/6.t misc-smm-doc doc -./usr/share/doc/smm/07.lpd/7.t misc-smm-doc doc -./usr/share/doc/smm/07.lpd/Makefile misc-smm-doc doc +./usr/share/doc/smm/07.lpd/0.t misc-smm-doc lpr,doc +./usr/share/doc/smm/07.lpd/1.t misc-smm-doc lpr,doc +./usr/share/doc/smm/07.lpd/2.t misc-smm-doc lpr,doc +./usr/share/doc/smm/07.lpd/3.t misc-smm-doc lpr,doc +./usr/share/doc/smm/07.lpd/4.t misc-smm-doc lpr,doc +./usr/share/doc/smm/07.lpd/5.t misc-smm-doc lpr,doc +./usr/share/doc/smm/07.lpd/6.t misc-smm-doc lpr,doc +./usr/share/doc/smm/07.lpd/7.t misc-smm-doc lpr,doc +./usr/share/doc/smm/07.lpd/Makefile misc-smm-doc lpr,doc ./usr/share/doc/smm/08.sendmailop/Makefile misc-obsolete obsolete ./usr/share/doc/smm/08.sendmailop/op.me misc-obsolete obsolete ./usr/share/doc/smm/09.sendmail/Makefile misc-obsolete obsolete diff -ur src.old/distrib/sets/sets.subr src/distrib/sets/sets.subr --- src.old/distrib/sets/sets.subr 2010-04-09 22:49:53.000000000 +0200 +++ src/distrib/sets/sets.subr 2010-04-08 19:22:28.000000000 +0200 @@ -216,6 +216,7 @@ # kmod ${MKKMOD} != no # ldap ${MKLDAP} != no # lint ${MKLINT} != no +# lpr ${MKLPR} != no # lvm ${MKLVM} != no # man ${MKMAN} != no # manpages ${MKMANPAGES} != no diff -ur src.old/etc/Makefile src/etc/Makefile --- src.old/etc/Makefile 2010-04-09 22:50:04.000000000 +0200 +++ src/etc/Makefile 2010-04-09 20:24:01.000000000 +0200 @@ -17,6 +17,7 @@ # default is ${KERNSRCDIR}/arch/${MACHINE}/conf but can be overridden. # MKCRYPTO; if not `no', install crypto-related configuration # MKPOSTFIX; if not `no', install postfix configuration +# MKLPR; if not `no', install printers configuration # MKUNPRIVED; if not `no', allow non-root installs. # MKUPDATE; if not `no', don't do a 'make clean' before kernel compile # @@ -90,10 +91,10 @@ UTMPGRP= utmp BIN1+= bootptab changelist csh.cshrc csh.login \ csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \ - ftpusers gettytab gpio.conf group hosts hosts.lpd inetd.conf \ + ftpusers gettytab gpio.conf group hosts inetd.conf \ locate.conf login.conf mailer.conf man.conf monthly monthly.conf \ mrouted.conf named.conf netconfig networks newsyslog.conf \ - nsswitch.conf ntp.conf passwd.conf phones printcap profile protocols \ + nsswitch.conf ntp.conf passwd.conf phones profile protocols \ rbootd.conf rc rc.conf rc.local rc.subr rc.shutdown remote rpc \ security security.conf services shells shrc sysctl.conf syslog.conf \ weekly weekly.conf wscons.conf @@ -113,6 +114,11 @@ BIN1+= etc.${MACHINE}/ttyaction .endif +.if (${MKLPR} != "no") +BIN1+= printcap +BIN1+= hosts.lpd +.endif + # -rw-rw-r-- .if !empty(DISTRIBVER:M*.99.*) BIN2+= motd.current @@ -191,7 +197,7 @@ MKDEBUG MKDEBUGLIB MKDOC MKDYNAMICROOT \ MKGCC MKGCCCMDS MKGDB \ MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \ - MKKERBEROS MKLDAP MKLINKLIB MKLINT \ + MKKERBEROS MKLDAP MKLINKLIB MKLINT MKLPR \ MKMAN MKMANZ MKMDNS MKNLS MKNVI MKOBJ MKOBJDIRS \ MKPAM MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \ MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \ diff -ur src.old/etc/rc.d/Makefile src/etc/rc.d/Makefile --- src.old/etc/rc.d/Makefile 2010-04-09 22:50:05.000000000 +0200 +++ src/etc/rc.d/Makefile 2010-04-09 20:24:56.000000000 +0200 @@ -25,7 +25,7 @@ identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \ irdaattach iscsi_target isdnd \ kdc \ - ldconfig local lpd lvm \ + ldconfig local lvm \ mdnsd mixerctl mopd motd mountall mountcritlocal \ mountcritremote mountd moused mrouted \ named ndbootd network newsyslog nfsd nfslocking ntpd ntpdate \ @@ -41,6 +41,10 @@ FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} +.if (${MKLPR} != "no") +CONFIGFILES+= lpd +.endif + .if ${MKX11} != "no" CONFIGFILES+= xdm xfs FILESBUILD_xdm= yes diff -ur src.old/share/man/man5/Makefile src/share/man/man5/Makefile --- src.old/share/man/man5/Makefile 2010-04-09 22:48:23.000000000 +0200 +++ src/share/man/man5/Makefile 2010-04-09 19:13:39.000000000 +0200 @@ -3,6 +3,8 @@ # missing: dump.5 plot.5 +.include + MAN= a.out.5 acct.5 ar.5 boot.cfg.5 \ core.5 daily.conf.5 dir.5 disktab.5 elf.5 \ ethers.5 forward.5 \ @@ -12,7 +14,7 @@ locate.conf.5 login.conf.5 mixerctl.conf.5 mk.conf.5 monthly.conf.5 \ motd.5 netconfig.5 netgroup.5 networks.5 nologin.5 \ nsswitch.conf.5 pam.conf.5 passwd.5 passwd.conf.5 phones.5 \ - printcap.5 protocols.5 ranlib.5 rc.conf.5 remote.5 \ + protocols.5 ranlib.5 rc.conf.5 remote.5 \ resolv.conf.5 route.conf.5 rpc.5 \ security.conf.5 services.5 shells.5 \ stab.5 statvfs.5 sysctl.conf.5 ttyaction.5 types.5 \ @@ -22,5 +24,9 @@ MLINKS+=utmp.5 wtmp.5 utmp.5 lastlog.5 passwd.5 master.passwd.5 MLINKS+=utmpx.5 wtmpx.5 utmpx.5 lastlogx.5 +.if ("${MKLPR}" != "no") +MAN+= printcap.5 +.endif + .include .include diff -ur src.old/share/man/man5/mk.conf.5 src/share/man/man5/mk.conf.5 --- src.old/share/man/man5/mk.conf.5 2010-04-09 22:48:23.000000000 +0200 +++ src/share/man/man5/mk.conf.5 2010-04-09 20:44:12.000000000 +0200 @@ -470,6 +470,11 @@ .Sy DESTDIR Ns Pa /usr/libdata/lint . .DFLTy . +.It Sy MKLPR +.YorN +Indicates whether the lpr(1) and related programs will be build. +.DFLTy +. .It Sy MKMAN .YorN Indicates whether manual pages will be installed. diff -ur src.old/share/mk/bsd.README src/share/mk/bsd.README --- src.old/share/mk/bsd.README 2010-04-09 22:48:24.000000000 +0200 +++ src/share/mk/bsd.README 2010-04-08 19:21:04.000000000 +0200 @@ -222,6 +222,9 @@ (libraries and support programs). Default: yes +MKLPR If "no", disables building printer daemon and commands + Default: yes + MKLINKLIB If "no", act as "MKLINT=no MKPICINSTALL=no MKPROFILE=no". Also: - don't install the .a libraries diff -ur src.old/share/mk/bsd.own.mk src/share/mk/bsd.own.mk --- src.old/share/mk/bsd.own.mk 2010-04-09 22:48:24.000000000 +0200 +++ src/share/mk/bsd.own.mk 2010-04-08 19:19:50.000000000 +0200 @@ -695,7 +695,7 @@ MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \ MKKERBEROS \ MKKMOD \ - MKLDAP MKLINKLIB MKLINT MKLVM \ + MKLDAP MKLINKLIB MKLINT MKLPR MKLVM \ MKMAN \ MKMDNS \ MKNLS \ diff -ur src.old/usr.sbin/Makefile src/usr.sbin/Makefile --- src.old/usr.sbin/Makefile 2010-04-09 22:50:27.000000000 +0200 +++ src/usr.sbin/Makefile 2010-04-08 23:56:58.000000000 +0200 @@ -11,7 +11,7 @@ gpioctl grfconfig grfinfo gspa hdaudioctl hilinfo ifwatchd inetd \ installboot \ iopctl iostat ipwctl irdaattach isdn iteconfig iwictl\ - kgmon lastlogin link lmcconfig lockstat lpr mailwrapper makefs \ + kgmon lastlogin link lmcconfig lockstat mailwrapper makefs \ map-mbone mdconfig memswitch mlxctl mmcformat mopd mountd moused \ mrinfo mrouted mscdlabel mtrace \ mtree ndbootd ndiscvt netgroup_mkdb nfsd ntp ofctl paxctl pcictl \ @@ -57,6 +57,11 @@ SUBDIR+=ipf .endif +# printing support +.if (${MKLPR} != "no") +SUBDIR+=lpr +.endif + # PF .if (${MKPF} != "no") SUBDIR+=pf