Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id D1FA01A9239 for ; Tue, 9 Nov 2021 09:01:10 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 28F8384EB2; Tue, 9 Nov 2021 09:01:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 643BB84E82 for ; Tue, 9 Nov 2021 09:01:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ehidFA_GrkuP for ; Tue, 9 Nov 2021 09:01:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id AEDA784D5F for ; Tue, 9 Nov 2021 09:01:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A377AFAEC; Tue, 9 Nov 2021 09:01:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1636448468169900" MIME-Version: 1.0 Date: Tue, 9 Nov 2021 09:01:08 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/x11/i3lock To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20211109090108.A377AFAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1636448468169900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Nov 9 09:01:08 UTC 2021 Modified Files: pkgsrc/x11/i3lock: Makefile Removed Files: pkgsrc/x11/i3lock: MESSAGE Log Message: i3lock: make this work out of the box on NetBSD, per netbsd-users@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 pkgsrc/x11/i3lock/MESSAGE cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/i3lock/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1636448468169900 Content-Disposition: inline Content-Length: 1307 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/i3lock/Makefile diff -u pkgsrc/x11/i3lock/Makefile:1.7 pkgsrc/x11/i3lock/Makefile:1.8 --- pkgsrc/x11/i3lock/Makefile:1.7 Mon Aug 17 20:20:27 2020 +++ pkgsrc/x11/i3lock/Makefile Tue Nov 9 09:01:08 2021 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2020/08/17 20:20:27 leot Exp $ +# $NetBSD: Makefile,v 1.8 2021/11/09 09:01:08 nia Exp $ # DISTNAME= i3lock-2.8 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 MASTER_SITES= https://i3wm.org/i3lock/ EXTRACT_SUFX= .tar.bz2 @@ -25,6 +25,28 @@ CPPFLAGS.SunOS+= -Du_int32_t=uint32_t MESSAGE_SUBST+= EGDIR=${EGDIR} +BUILD_DEFS+= SYSCONFBASE + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +SUBST_CLASSES+= pam +SUBST_STAGE.pam= pre-configure +SUBST_FILES.pam+= i3lock.pam +SUBST_SED.pam+= -e "s,login,system,g" +.elif ${OPSYS} == "Linux" +SUBST_CLASSES+= pam +SUBST_STAGE.pam= pre-configure +SUBST_FILES.pam+= i3lock.pam +SUBST_SED.pam+= -e "s,login,system-auth,g" +.endif + +.if ${UNPRIVILEGED:tl} != "yes" +CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/pam.d/i3lock \ + ${SYSCONFBASE}/pam.d/i3lock +SPECIAL_PERMS+= bin/i3lock ${SETUID_ROOT_PERMS} +.endif + .include "../../devel/libev/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" --_----------=_1636448468169900--