aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Davis <brd@FreeBSD.org>2018-09-20 09:21:05 +0000
committerBrad Davis <brd@FreeBSD.org>2018-09-20 09:21:05 +0000
commit80994f8119b0ad74049cd6ebc79fa569e447d2b0 (patch)
treed4b4a361cdbc3a611fc81e8d528615125a735a7b
parent232d0b87e0047b095db8103bd06ebfdf9b431d47 (diff)
downloadsrc-80994f8119b0ad74049cd6ebc79fa569e447d2b0.tar.gz
src-80994f8119b0ad74049cd6ebc79fa569e447d2b0.zip
Move hosts.lpd and printcap to usr.sbin/lpr/lpd/
This leverages CONFS to handle the install Approved by: re (blanket, pkgbase), bapt (mentor) Differential Revision: https://reviews.freebsd.org/D17238
Notes
Notes: svn path=/head/; revision=338822
-rw-r--r--etc/Makefile4
-rw-r--r--usr.sbin/lpr/lpd/Makefile1
-rw-r--r--usr.sbin/lpr/lpd/hosts.lpd (renamed from etc/hosts.lpd)0
-rw-r--r--usr.sbin/lpr/lpd/printcap (renamed from etc/printcap)0
4 files changed, 1 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile
index a76b61cbb658..8c55699d5624 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -22,10 +22,6 @@ BIN1= \
# NB: keep these sorted by MK_* knobs
-.if ${MK_LPR} != "no"
-BIN1+= hosts.lpd printcap
-.endif
-
.if ${MK_OPENSSL} != "no"
SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index af2582c4bb1c..6a152c46268f 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -1,6 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+CONFS= hosts.lpd printcap
PROG= lpd
MAN= lpd.8
SRCS= lpd.c printjob.c recvjob.c lpdchar.c modes.c
diff --git a/etc/hosts.lpd b/usr.sbin/lpr/lpd/hosts.lpd
index b53202ab18e5..b53202ab18e5 100644
--- a/etc/hosts.lpd
+++ b/usr.sbin/lpr/lpd/hosts.lpd
diff --git a/etc/printcap b/usr.sbin/lpr/lpd/printcap
index b1f83b344c8f..b1f83b344c8f 100644
--- a/etc/printcap
+++ b/usr.sbin/lpr/lpd/printcap