xlockmore: add pam-pwauth_suid to pam option on NetBSD

Requested and patch supplied by John D. Baker on pkgsrc-users.

Some pkglint cleanup while here.

Bump PKGREVISION.

6 files changed, 28 insertions, 21 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index a72d8113ab9..88965d01087 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.148 2020/12/04 04:56:20 riastradh Exp $
+# $NetBSD: Makefile,v 1.149 2021/03/22 17:46:06 wiz Exp $
 
-PKGREVISION= 26
+PKGREVISION= 27
 .include "Makefile.common"
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 5b7519ae879..0721ebf5776 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.81 2020/01/26 17:32:28 rillig Exp $
+# $NetBSD: Makefile.common,v 1.82 2021/03/22 17:46:06 wiz Exp $
 #
-# used by x11/xlockmore/Makefile
-# used by x11/xlockmore-lite/Makefile
+# used by ../../x11/xlockmore/Makefile
+# used by ../../x11/xlockmore-lite/Makefile
 
 DISTNAME=	xlockmore-5.46
 CATEGORIES=	x11
@@ -11,11 +11,11 @@ EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://sillycycle.com/xlockmore.html
 
-DISTINFO_FILE?=		${.CURDIR}/../xlockmore/distinfo
-PATCHDIR?=		${.CURDIR}/../xlockmore/patches
-PLIST_SRC?=		${.CURDIR}/../xlockmore/PLIST
-FILESDIR?=		${.CURDIR}/../xlockmore/files
-MESSAGE_SRC?=		${.CURDIR}/../xlockmore/MESSAGE
+DISTINFO_FILE?=		${.CURDIR}/../../x11/xlockmore/distinfo
+PATCHDIR?=		${.CURDIR}/../../x11/xlockmore/patches
+PLIST_SRC?=		${.CURDIR}/../../x11/xlockmore/PLIST
+FILESDIR?=		${.CURDIR}/../../x11/xlockmore/files
+MESSAGE_SRC?=		${.CURDIR}/../../x11/xlockmore/MESSAGE
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -51,6 +51,7 @@ CONFIGURE_ARGS+=	--without-esound
 CONFIGURE_ARGS+=	--enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults
 CONFIGURE_ENV+=		ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults/XLock
 
+OWN_DIRS+=		${PREFIX}/lib/X11/app-defaults
 CONF_FILES+=		${EGDIR}/app-defaults/XLock ${PREFIX}/lib/X11/app-defaults/XLock
 
 .if ${OPSYS} == "NetBSD"
@@ -75,19 +76,23 @@ CONFIGURE_ARGS+=	--disable-allow-root
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-pam --enable-bad-pam
+.  if ${OPSYS} == "NetBSD"
+# needed to read shadow passwords
+DEPENDS+=       pam-pwauth_suid-[0-9]*:../../security/pam-pwauth_suid
+.  endif
 .else
 CONFIGURE_ARGS+=	--disable-pam
-.endif
 
 #
 # Special permissions of bin/xlock if any.
 #
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || \
-    ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
+.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || \
+      ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
 SPECIAL_PERMS+=	bin/xlock ${SETUID_ROOT_PERMS}
-.elif ${OPSYS} == "Linux"
+.  elif ${OPSYS} == "Linux"
 # setgid shadow should be enough for modern Linux
 SPECIAL_PERMS+=	bin/xlock ${REAL_ROOT_USER} shadow 2511
+.  endif
 .endif
 
 EGDIR=			${PREFIX}/share/examples/xlock
diff --git a/x11/xlockmore/PLIST b/x11/xlockmore/PLIST
index 7047ba99f8c..0e6f78d36a2 100644
--- a/x11/xlockmore/PLIST
+++ b/x11/xlockmore/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/12/13 14:31:03 is Exp $
+@comment $NetBSD: PLIST,v 1.10 2021/03/22 17:46:06 wiz Exp $
 ${LITE}bin/xglock
 bin/xlock
 lib/X11/xlock/sounds/complete.au
@@ -6,6 +6,6 @@ lib/X11/xlock/sounds/identify-please.au
 lib/X11/xlock/sounds/not-programmed.au
 lib/X11/xlock/sounds/thank-you.au
 man/man1/xlock.1
-share/examples/xlock/pam.d/xlock-NetBSD
 share/examples/xlock/app-defaults/XLock
+share/examples/xlock/pam.d/xlock-NetBSD
 ${LITE}share/xlock/xglockrc
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index f3001849546..f7ace1a4492 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2018/02/08 16:03:12 jaapb Exp $
+$NetBSD: distinfo,v 1.56 2021/03/22 17:46:06 wiz Exp $
 
 SHA1 (xlockmore-5.46.tar.xz) = 849ba21a6a82493b0b352d5fbd9212e6d4581752
 RMD160 (xlockmore-5.46.tar.xz) = 978f8119c89c1c954ec5bc5f8cc8d8edea7c8c8e
@@ -8,5 +8,5 @@ SHA1 (patch-aa) = a8af264d041df95d0773cbe27984f9461e865722
 SHA1 (patch-ab) = 918be6904fb2a1b616dfbf7ac3d9759cc39d1608
 SHA1 (patch-ad) = 619c3413ae4bfdb420c77867062670dce336f5d8
 SHA1 (patch-config.cygport) = c120f9b9f9ca6a9ba60f8e46e9c2dd23225079d9
-SHA1 (patch-modes_Makefile.in) = 47236aa529a5324ccd7133da7e25ac96d4b2a60e
-SHA1 (patch-xglock_Makefile.in) = 46a9860c0fac56d6d860adb4ffb0dbff5c79d82c
+SHA1 (patch-modes_Makefile.in) = bb32f1394224f44adbe2c2f4a17e084aa5aa5143
+SHA1 (patch-xglock_Makefile.in) = 697182ddac24cc624b82420c5f6e3d66fd6b0679
diff --git a/x11/xlockmore/patches/patch-modes_Makefile.in b/x11/xlockmore/patches/patch-modes_Makefile.in
index e7ca141b013..102c94d8a1a 100644
--- a/x11/xlockmore/patches/patch-modes_Makefile.in
+++ b/x11/xlockmore/patches/patch-modes_Makefile.in
@@ -1,7 +1,8 @@
-$NetBSD: patch-modes_Makefile.in,v 1.1 2018/02/08 16:03:12 jaapb Exp $
+$NetBSD: patch-modes_Makefile.in,v 1.2 2021/03/22 17:46:06 wiz Exp $
 
 Honour LDFLAGS.
 Use INSTALL properly.
+
 --- modes/Makefile.in.orig	2015-02-13 04:24:37.000000000 +0000
 +++ modes/Makefile.in
 @@ -334,7 +334,7 @@ CFLAGS = @CFLAGS@
diff --git a/x11/xlockmore/patches/patch-xglock_Makefile.in b/x11/xlockmore/patches/patch-xglock_Makefile.in
index 98cc14de4a8..10a1291c5a4 100644
--- a/x11/xlockmore/patches/patch-xglock_Makefile.in
+++ b/x11/xlockmore/patches/patch-xglock_Makefile.in
@@ -1,7 +1,8 @@
-$NetBSD: patch-xglock_Makefile.in,v 1.1 2018/02/08 16:03:12 jaapb Exp $
+$NetBSD: patch-xglock_Makefile.in,v 1.2 2021/03/22 17:46:06 wiz Exp $
 
 Honour LDFLAGS.
 Use INSTALL properly.
+
 --- xglock/Makefile.in.orig	2010-04-19 13:34:35.000000000 +0000
 +++ xglock/Makefile.in
 @@ -92,7 +92,7 @@ XGLOCKINC = @XGLOCKINC@ -I.. -I$(top_src