From nobody Fri Apr 19 23:11:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLr4b6zYyz5Hwpj; Fri, 19 Apr 2024 23:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLr4b3QbKz4RlR; Fri, 19 Apr 2024 23:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XAMZRh+Gww0LwY34Nvhl0QYqB2RHz8i3m2gX7B/lnM=; b=W4ePQIKej1rwUfAyP6AVTBaG66Vlwj6lsZ876bGOx2+w/ajH3MBSP4u9LpZ1VxbXA+mtY5 6KUTjbkrRhTgZPZOUcREXjom6EEWp+vbPUNcBUkOo2h83bWeqJpbXH98WRIXJLhwPwuPhn 9nk8a7XP9ZK9iOHzce8gO6Tup3j6D7W5553fbq9iNhC3TnQK0yrgNwpEgbyFl21848Um/8 k1MU3JqSbxLRu8NsvZp8P/Y8ABKQAENP08Vb1RTXLlXZINQTV1z4XLPGGWum52bZOgFCAJ Y2to15xzDMQQZ2c1iziDkPbxyi01EnSozLRQdrr3rcbg8sCGWqIW2bxWo5OJhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713568303; a=rsa-sha256; cv=none; b=oH6rhH6fH4jsNsexjm6C8Xv1Rdvzwh7A4R+cgtHyrdVHOM8fJ2p9ZMSom2K6AD13vQ5h5P mdDxA5rAXnACCGLcdCSnoHSYEFuNDkXm3xoJlVaYVRmhjRGSf+bC3FNrfqc+2ZJK06n8aK WYNEGv0/+9ayw1TZ6ww0fEYCHPS7jAax3DB16ZaZTXF+wi+ZYDNNFUJQDi9HcQgWDqxAEj 192RGtsZobmr2zXk8UV95qs4xCdbicYSfKtnCdQnoCj6lLI3n8nNIesL6Z9xJWCQc3u8Gr qWNsAy0e1cAzXFI24kLhni3+iKiaMcovPS9zem9T0AagNY+9aggW2t6e3MSJrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XAMZRh+Gww0LwY34Nvhl0QYqB2RHz8i3m2gX7B/lnM=; b=iNDnk+XSw2OXS7PnoMmlGyUMxXHm6mZ3KuwbeZwfiYWLYb2XZadmwcuWztz8AtsF6v2jRc fQcSnjZBX3OfE4SkPvKFrgANHYBKNiFnlSKXz+1/HdsLObREuPyrrZCsFQw+6/x2fvUXat gOY4o0zxxCddx3c9iQXNL6YCHtlQdldRUP1U+jPn8YQbsn5ex0OVU2pa+hqcspeXchi+l8 EjjJaM0WQADcLVCrRSMNG5xCGzOihOjeFDPyDvI/WVUYIX3eN+1lORG5/b3VsQ2HEcwgdo B3tpQ4vP+7mF2hZ1QrDOI/AtahlCfeyCBnza2SfDr51LgbQl1n2+UwfIW2qWng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLr4b2vyMz1C3S; Fri, 19 Apr 2024 23:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43JNBhux059670; Fri, 19 Apr 2024 23:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JNBh3F059667; Fri, 19 Apr 2024 23:11:43 GMT (envelope-from git) Date: Fri, 19 Apr 2024 23:11:43 GMT Message-Id: <202404192311.43JNBh3F059667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: dbd0366f3434 - main - package: move lpr into its own package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbd0366f3434e2444792b431997dcaecfbf899ee Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dbd0366f3434e2444792b431997dcaecfbf899ee commit dbd0366f3434e2444792b431997dcaecfbf899ee Author: Lexi Winter AuthorDate: 2024-04-19 22:53:30 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:54:31 +0000 package: move lpr into its own package Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1171 --- libexec/rc/rc.d/Makefile | 4 +++- release/packages/Makefile.package | 2 ++ usr.sbin/lpr/chkprintcap/Makefile | 1 + usr.sbin/lpr/filters.ru/Makefile | 1 + usr.sbin/lpr/filters.ru/koi2855/Makefile | 1 + usr.sbin/lpr/filters.ru/koi2alt/Makefile | 1 + usr.sbin/lpr/filters/Makefile | 1 + usr.sbin/lpr/lp/Makefile | 1 + usr.sbin/lpr/lpc/Makefile | 1 + usr.sbin/lpr/lpd/Makefile | 1 + usr.sbin/lpr/lpq/Makefile | 1 + usr.sbin/lpr/lpr/Makefile | 1 + usr.sbin/lpr/lprm/Makefile | 1 + usr.sbin/lpr/lptest/Makefile | 1 + usr.sbin/lpr/pac/Makefile | 1 + usr.sbin/newsyslog/newsyslog.conf.d/Makefile | 5 ++++- usr.sbin/syslogd/Makefile | 5 ++++- 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"