17 files changed, 26 insertions, 3 deletions
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 320408d5d62c..15dcc811d9b4 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -257,7 +257,9 @@ CONSOLEPACKAGE=	console-tools
 .endif
 
 .if ${MK_LPR} != "no"
-CONFS+=		lpd
+CONFGROUPS+=	LP
+LP+=		lpd
+LPPACKAGE=	lp
 .endif
 
 .if ${MK_KERBEROS} != "no"
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index ed3da78665be..72a521eebe8b 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -100,6 +100,8 @@ kerberos-lib_COMMENT=	Kerberos Libraries
 kerberos-lib_DESC=	Kerberos Libraries
 kernel_COMMENT= 	FreeBSD Kernel
 kernel_DESC= 		FreeBSD Kernel
+lp_COMMENT=		Printer subsystem
+lp_DESC=		Printer subsystem
 manuals_COMMENT= 	Manual Pages
 manuals_DESC= 		Manual Pages
 mlx-tools_COMMENT=	Mellanox Utilities
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index 4895305ba9bb..600b71237426 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile
+++ b/usr.sbin/lpr/chkprintcap/Makefile
@@ -1,6 +1,7 @@
 
 .PATH: ${.CURDIR:H}/common_source
 
+PACKAGE=lp
 PROG=	chkprintcap
 MAN=	chkprintcap.8
 SRCS=	chkprintcap.c skimprintcap.c
diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile
index c3f7e6162369..05971920182c 100644
--- a/usr.sbin/lpr/filters.ru/Makefile
+++ b/usr.sbin/lpr/filters.ru/Makefile
@@ -1,6 +1,7 @@
 
 SUBDIR=	koi2alt koi2855
 
+PACKAGE=lp
 FILES=	bjc-240.sh.sample
 
 .include "Makefile.inc"
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile
index ec6d8cb2c198..53d6a5bd9869 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile
@@ -1,4 +1,5 @@
 
+PACKAGE=lp
 PROG=	koi2855
 MAN=
 
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
index 84a1e1eb4b00..6b005afac0a6 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
@@ -1,4 +1,5 @@
 
+PACKAGE=lp
 PROG=	koi2alt
 MAN=
 
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index 024fb738f0fb..b3d7cbab9c56 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -1,6 +1,7 @@
 
 BINDIR=	${LIBEXECDIR}/lpr
 
+PACKAGE=lp
 PROG=	lpf
 MAN=
 
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index c726c0bb25ee..59562bdc6f13 100644
--- a/usr.sbin/lpr/lp/Makefile
+++ b/usr.sbin/lpr/lp/Makefile
@@ -1,6 +1,7 @@
 
 BINDIR=	/usr/bin
 
+PACKAGE=lp
 SCRIPTS=lp.sh
 MAN=	lp.1
 
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index 545f0f7ed121..ccc7fb503ee0 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -1,6 +1,7 @@
 
 .PATH: ${.CURDIR:H}/common_source
 
+PACKAGE=lp
 PROG=	lpc
 MAN=	lpc.8
 SRCS=	lpc.c cmds.c cmdtab.c movejobs.c
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 944a3e1a83ab..c4f4f5e0e56a 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -1,4 +1,5 @@
 
+PACKAGE=lp
 CONFS=	hosts.lpd printcap
 PROG=	lpd
 MAN=	lpd.8
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 0010eb05e968..d8fe64de2c84 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -1,6 +1,7 @@
 
 BINDIR=	/usr/bin
 
+PACKAGE=lp
 PROG=	lpq
 BINOWN=	root
 BINGRP=	daemon
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index 7f7fa6d1fd71..84f965b728b8 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -3,6 +3,7 @@
 
 BINDIR=	/usr/bin
 
+PACKAGE=lp
 PROG=	lpr
 MAN=	lpr.1 printcap.5
 BINOWN=	root
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index 11c5a7a5a7ac..1fac5ce73471 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -3,6 +3,7 @@
 
 BINDIR=	/usr/bin
 
+PACKAGE=lp
 PROG=	lprm
 BINOWN=	root
 BINGRP=	daemon
diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile
index 2f44f09acd89..a48836389049 100644
--- a/usr.sbin/lpr/lptest/Makefile
+++ b/usr.sbin/lpr/lptest/Makefile
@@ -1,4 +1,5 @@
 
+PACKAGE=lp
 PROG=	lptest
 
 CFLAGS+= -I${.CURDIR:H}/common_source
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index c3b6f5078fca..eb40bfa7a4d2 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -1,6 +1,7 @@
 
 .PATH: ${.CURDIR:H}/common_source
 
+PACKAGE=lp
 PROG=	pac
 MAN=	pac.8
 
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
index 4b2dff13723b..e0451c228f5a 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
@@ -15,7 +15,10 @@ FTPDIR=		/etc/newsyslog.conf.d
 .endif
 
 .if ${MK_LPR} != "no"
-CONFS+=		lpr.conf
+CONFGROUPS+=	LP
+LP+=		lpr.conf
+LPPACKAGE=	lp
+LPDIR=		/etc/newsyslog.conf.d
 .endif
 
 .if ${MK_OFED} != "no"
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index d612b5a0a6af..492b5529fc89 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -31,7 +31,10 @@ FTPPACKAGE=	ftpd
 .endif
 
 .if ${MK_LPR} != "no"
-SYSLOGD_D+=	lpr.conf
+CONFGROUPS+=	LP
+LP+=		lpr.conf
+LPDIR=		/etc/syslog.d
+LPPACKAGE=	lp
 .endif
 
 .if ${MK_PPP} != "no"