From 80994f8119b0ad74049cd6ebc79fa569e447d2b0 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 20 Sep 2018 09:21:05 +0000 Subject: [PATCH] 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 --- etc/Makefile | 4 ---- usr.sbin/lpr/lpd/Makefile | 1 + {etc => usr.sbin/lpr/lpd}/hosts.lpd | 0 {etc => usr.sbin/lpr/lpd}/printcap | 0 4 files changed, 1 insertion(+), 4 deletions(-) rename {etc => usr.sbin/lpr/lpd}/hosts.lpd (100%) rename {etc => usr.sbin/lpr/lpd}/printcap (100%) diff --git a/etc/Makefile b/etc/Makefile index a76b61cbb65..8c55699d562 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 af2582c4bb1..6a152c46268 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 similarity index 100% rename from etc/hosts.lpd rename to usr.sbin/lpr/lpd/hosts.lpd diff --git a/etc/printcap b/usr.sbin/lpr/lpd/printcap similarity index 100% rename from etc/printcap rename to usr.sbin/lpr/lpd/printcap