The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9cf02c38e492dd16b70bfd8203b3f1bc6436e574
commit 9cf02c38e492dd16b70bfd8203b3f1bc6436e574 Author: Lexi Winter <[email protected]> AuthorDate: 2025-11-10 10:14:42 +0000 Commit: Lexi Winter <[email protected]> CommitDate: 2025-11-10 10:17:06 +0000 libpam: Don't put man8 in the dev package These are user-facing manpages, but were installed in the runtime-dev package since the PAM modules use bsd.lib.mk. Use MANNODEV instead of MAN to put them in the base runtime package instead. Fixes: 031e711647c3 ("packages: Install development manpages in the -dev package") MFC after: 3 days Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53601 --- lib/libpam/modules/pam_chroot/Makefile | 2 +- lib/libpam/modules/pam_deny/Makefile | 6 +++--- lib/libpam/modules/pam_echo/Makefile | 6 +++--- lib/libpam/modules/pam_exec/Makefile | 6 +++--- lib/libpam/modules/pam_ftpusers/Makefile | 6 +++--- lib/libpam/modules/pam_group/Makefile | 2 +- lib/libpam/modules/pam_guest/Makefile | 2 +- lib/libpam/modules/pam_krb5/Makefile | 10 +++++----- lib/libpam/modules/pam_ksu/Makefile | 7 ++++--- lib/libpam/modules/pam_lastlog/Makefile | 6 +++--- lib/libpam/modules/pam_login_access/Makefile | 6 +++--- lib/libpam/modules/pam_nologin/Makefile | 6 +++--- lib/libpam/modules/pam_passwdqc/Makefile | 6 +++--- lib/libpam/modules/pam_permit/Makefile | 6 +++--- lib/libpam/modules/pam_radius/Makefile | 7 ++++--- lib/libpam/modules/pam_rhosts/Makefile | 6 +++--- lib/libpam/modules/pam_rootok/Makefile | 6 +++--- lib/libpam/modules/pam_securetty/Makefile | 6 +++--- lib/libpam/modules/pam_self/Makefile | 6 +++--- lib/libpam/modules/pam_ssh/Makefile | 7 ++++--- lib/libpam/modules/pam_tacplus/Makefile | 6 +++--- lib/libpam/modules/pam_unix/Makefile | 6 +++--- lib/libpam/modules/pam_xdg/Makefile | 6 +++--- 23 files changed, 68 insertions(+), 65 deletions(-) diff --git a/lib/libpam/modules/pam_chroot/Makefile b/lib/libpam/modules/pam_chroot/Makefile index 206f8fa40a09..fcec5bd04473 100644 --- a/lib/libpam/modules/pam_chroot/Makefile +++ b/lib/libpam/modules/pam_chroot/Makefile @@ -1,5 +1,5 @@ LIB= pam_chroot SRCS= pam_chroot.c -MAN= pam_chroot.8 +MANNODEV= pam_chroot.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile index 862d1859d0d6..8ff2bfcee869 100644 --- a/lib/libpam/modules/pam_deny/Makefile +++ b/lib/libpam/modules/pam_deny/Makefile @@ -23,8 +23,8 @@ # SUCH DAMAGE. # -LIB= pam_deny -SRCS= pam_deny.c -MAN= pam_deny.8 +LIB= pam_deny +SRCS= pam_deny.c +MANNODEV= pam_deny.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile index 532d0a51b58e..9ea51b392e31 100644 --- a/lib/libpam/modules/pam_echo/Makefile +++ b/lib/libpam/modules/pam_echo/Makefile @@ -1,5 +1,5 @@ -LIB= pam_echo -SRCS= pam_echo.c -MAN= pam_echo.8 +LIB= pam_echo +SRCS= pam_echo.c +MANNODEV= pam_echo.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_exec/Makefile b/lib/libpam/modules/pam_exec/Makefile index c2327a2860cd..a3e9948ab69b 100644 --- a/lib/libpam/modules/pam_exec/Makefile +++ b/lib/libpam/modules/pam_exec/Makefile @@ -1,6 +1,6 @@ -LIB= pam_exec -SRCS= pam_exec.c -MAN= pam_exec.8 +LIB= pam_exec +SRCS= pam_exec.c +MANNODEV= pam_exec.8 WARNS?= 1 diff --git a/lib/libpam/modules/pam_ftpusers/Makefile b/lib/libpam/modules/pam_ftpusers/Makefile index 07d37c8b17a8..e2326312426d 100644 --- a/lib/libpam/modules/pam_ftpusers/Makefile +++ b/lib/libpam/modules/pam_ftpusers/Makefile @@ -1,5 +1,5 @@ -LIB= pam_ftpusers -SRCS= pam_ftpusers.c -MAN= pam_ftpusers.8 +LIB= pam_ftpusers +SRCS= pam_ftpusers.c +MANNODEV= pam_ftpusers.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_group/Makefile b/lib/libpam/modules/pam_group/Makefile index 0395b3a8f355..cbf902026d66 100644 --- a/lib/libpam/modules/pam_group/Makefile +++ b/lib/libpam/modules/pam_group/Makefile @@ -1,5 +1,5 @@ LIB= pam_group SRCS= pam_group.c -MAN= pam_group.8 +MANNODEV= pam_group.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_guest/Makefile b/lib/libpam/modules/pam_guest/Makefile index 7128b513afbc..04eb249e4a79 100644 --- a/lib/libpam/modules/pam_guest/Makefile +++ b/lib/libpam/modules/pam_guest/Makefile @@ -1,5 +1,5 @@ LIB= pam_guest SRCS= pam_guest.c -MAN= pam_guest.8 +MANNODEV= pam_guest.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile index 7634930a7202..0c933f8f7e57 100644 --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -57,8 +57,8 @@ SRCS= account.c \ support.c \ vector.c -MAN= pam-krb5.8 -MLINKS= pam-krb5.8 pam_krb5.8 +MANNODEV= pam-krb5.8 +MANNODEVLINKS= pam-krb5.8 pam_krb5.8 CFLAGS= -I${SRCDIR} \ -I${.CURDIR} \ @@ -77,9 +77,9 @@ module_options.c: .PHONY .else PACKAGE= kerberos -LIB= pam_krb5 -SRCS= pam_krb5.c -MAN= pam_krb5.8 +LIB= pam_krb5 +SRCS= pam_krb5.c +MANNODEV= pam_krb5.8 .if defined(_FREEFALL_CONFIG) CFLAGS+=-D_FREEFALL_CONFIG WARNS?= 3 diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile index 953ca23d1416..8b695384c13c 100644 --- a/lib/libpam/modules/pam_ksu/Makefile +++ b/lib/libpam/modules/pam_ksu/Makefile @@ -27,9 +27,10 @@ PACKAGE= kerberos .include <src.opts.mk> -LIB= pam_ksu -SRCS= pam_ksu.c -MAN= pam_ksu.8 +LIB= pam_ksu +SRCS= pam_ksu.c +MANNODEV= pam_ksu.8 + WARNS?= 3 LIBADD+= krb5 diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile index 1abf6f2b6304..ecaf013c504a 100644 --- a/lib/libpam/modules/pam_lastlog/Makefile +++ b/lib/libpam/modules/pam_lastlog/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_lastlog -SRCS= pam_lastlog.c -MAN= pam_lastlog.8 +LIB= pam_lastlog +SRCS= pam_lastlog.c +MANNODEV= pam_lastlog.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile index 43c025336354..41bc32212351 100644 --- a/lib/libpam/modules/pam_login_access/Makefile +++ b/lib/libpam/modules/pam_login_access/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_login_access -SRCS= pam_login_access.c login_access.c -MAN= login.access.5 pam_login_access.8 +LIB= pam_login_access +SRCS= pam_login_access.c login_access.c +MANNODEV= login.access.5 pam_login_access.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile index e4c3c5a35c1e..c4ccc27b8958 100644 --- a/lib/libpam/modules/pam_nologin/Makefile +++ b/lib/libpam/modules/pam_nologin/Makefile @@ -25,9 +25,9 @@ PACKAGE= runtime -LIB= pam_nologin -SRCS= pam_nologin.c -MAN= pam_nologin.8 +LIB= pam_nologin +SRCS= pam_nologin.c +MANNODEV= pam_nologin.8 LIBADD+= util diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile index 91ce72928a66..9f2091d5403e 100644 --- a/lib/libpam/modules/pam_passwdqc/Makefile +++ b/lib/libpam/modules/pam_passwdqc/Makefile @@ -1,9 +1,9 @@ SRCDIR= ${SRCTOP}/contrib/pam_modules/pam_passwdqc .PATH: ${SRCDIR} -LIB= pam_passwdqc -SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c -MAN= pam_passwdqc.8 +LIB= pam_passwdqc +SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c +MANNODEV= pam_passwdqc.8 WARNS?= 2 CFLAGS+= -I${SRCDIR} diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile index 5606fe1cf75a..cc3d9ca210f2 100644 --- a/lib/libpam/modules/pam_permit/Makefile +++ b/lib/libpam/modules/pam_permit/Makefile @@ -23,8 +23,8 @@ # SUCH DAMAGE. # -LIB= pam_permit -SRCS= pam_permit.c -MAN= pam_permit.8 +LIB= pam_permit +SRCS= pam_permit.c +MANNODEV= pam_permit.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile index ab39fedcee04..d1180af62324 100644 --- a/lib/libpam/modules/pam_radius/Makefile +++ b/lib/libpam/modules/pam_radius/Makefile @@ -23,9 +23,10 @@ # SUCH DAMAGE. # -LIB= pam_radius -SRCS= pam_radius.c -MAN= pam_radius.8 +LIB= pam_radius +SRCS= pam_radius.c +MANNODEV= pam_radius.8 + WARNS?= 3 LIBADD+= radius diff --git a/lib/libpam/modules/pam_rhosts/Makefile b/lib/libpam/modules/pam_rhosts/Makefile index 4cd25fe5dfa5..3aaefc9ca89b 100644 --- a/lib/libpam/modules/pam_rhosts/Makefile +++ b/lib/libpam/modules/pam_rhosts/Makefile @@ -1,5 +1,5 @@ -LIB= pam_rhosts -SRCS= pam_rhosts.c -MAN= pam_rhosts.8 +LIB= pam_rhosts +SRCS= pam_rhosts.c +MANNODEV= pam_rhosts.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_rootok/Makefile b/lib/libpam/modules/pam_rootok/Makefile index 668eeef7f7d9..bb5889139c16 100644 --- a/lib/libpam/modules/pam_rootok/Makefile +++ b/lib/libpam/modules/pam_rootok/Makefile @@ -23,8 +23,8 @@ # SUCH DAMAGE. # -LIB= pam_rootok -SRCS= pam_rootok.c -MAN= pam_rootok.8 +LIB= pam_rootok +SRCS= pam_rootok.c +MANNODEV= pam_rootok.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile index 3a36a37b543c..6e5e7d929b7d 100644 --- a/lib/libpam/modules/pam_securetty/Makefile +++ b/lib/libpam/modules/pam_securetty/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_securetty -SRCS= pam_securetty.c -MAN= pam_securetty.8 +LIB= pam_securetty +SRCS= pam_securetty.c +MANNODEV= pam_securetty.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile index 0a58728fea52..ecf85b8de70a 100644 --- a/lib/libpam/modules/pam_self/Makefile +++ b/lib/libpam/modules/pam_self/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_self -SRCS= pam_self.c -MAN= pam_self.8 +LIB= pam_self +SRCS= pam_self.c +MANNODEV= pam_self.8 .include <bsd.lib.mk> diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 6652244a84af..eb817b559331 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -2,11 +2,12 @@ SSHDIR= ${SRCTOP}/crypto/openssh -LIB= pam_ssh -MAN= pam_ssh.8 -SRCS= pam_ssh.c PACKAGE= ssh +LIB= pam_ssh +MANNODEV= pam_ssh.8 +SRCS= pam_ssh.c + WARNS?= 5 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile index 2b558d9f72b3..a29185f9bc23 100644 --- a/lib/libpam/modules/pam_tacplus/Makefile +++ b/lib/libpam/modules/pam_tacplus/Makefile @@ -23,9 +23,9 @@ # SUCH DAMAGE. # -LIB= pam_tacplus -SRCS= pam_tacplus.c -MAN= pam_tacplus.8 +LIB= pam_tacplus +SRCS= pam_tacplus.c +MANNODEV= pam_tacplus.8 LIBADD+= tacplus diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile index 2e76f054c502..1bb1e6f2c71a 100644 --- a/lib/libpam/modules/pam_unix/Makefile +++ b/lib/libpam/modules/pam_unix/Makefile @@ -38,9 +38,9 @@ PACKAGE= runtime -LIB= pam_unix -SRCS= pam_unix.c -MAN= pam_unix.8 +LIB= pam_unix +SRCS= pam_unix.c +MANNODEV= pam_unix.8 LIBADD+= util crypt diff --git a/lib/libpam/modules/pam_xdg/Makefile b/lib/libpam/modules/pam_xdg/Makefile index df3948987da6..e119354d1297 100644 --- a/lib/libpam/modules/pam_xdg/Makefile +++ b/lib/libpam/modules/pam_xdg/Makefile @@ -1,5 +1,5 @@ -LIB= pam_xdg -SRCS= pam_xdg.c -MAN= pam_xdg.8 +LIB= pam_xdg +SRCS= pam_xdg.c +MANNODEV= pam_xdg.8 .include <bsd.lib.mk>
