CVS commit: pkgsrc/x11/xtrlock

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Nov 30 10:14:05 UTC 2025

Modified Files:
        pkgsrc/x11/xtrlock: Makefile distinfo

Log Message:
x11/xtrlock: update to 2.18

# pkgsrc changes

* Simplify Makefile
* Add HOMEPAGE

# upstream changes

* Apply patch from Takeshi Hamasaki to fix a mistake in the manpage.
  (Closes: #1121176)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xtrlock/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xtrlock/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xtrlock/Makefile
diff -u pkgsrc/x11/xtrlock/Makefile:1.6 pkgsrc/x11/xtrlock/Makefile:1.7
--- pkgsrc/x11/xtrlock/Makefile:1.6     Sat Jun  7 16:32:55 2025
+++ pkgsrc/x11/xtrlock/Makefile Sun Nov 30 10:14:05 2025
@@ -1,20 +1,28 @@
-# $NetBSD: Makefile,v 1.6 2025/06/07 16:32:55 vins Exp $
+# $NetBSD: Makefile,v 1.7 2025/11/30 10:14:05 vins Exp $
 
-DISTNAME=      xtrlock-2.17
+DISTNAME=      xtrlock-2.18
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/x/xtrlock/}
 EXTRACT_SUFX=  .tar.xz
 DISTFILES=     ${DEFAULT_DISTFILES:S/-/_/}
 
 MAINTAINER=    vins%NetBSD.org@localhost
+HOMEPAGE=      https://salsa.debian.org/debian/xtrlock
 COMMENT=       Simple X11 screen lock tool
 LICENSE=       gnu-gpl-v3
 
 USE_IMAKE=     yes
 
+FORCE_C_STD=   c99
+
+.include "../../mk/bsd.prefs.mk"
+
 # mitigate CVE-2016-10894
 CFLAGS+=       -DMULTITOUCH
-FORCE_C_STD=   c99
+.if exists(/etc/shadow) && !(${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly")
+CFLAGS+=       -DSHADOW_PWD    #getspnam()
+.endif
+
 LDFLAGS+=      -lXi
 
 .include "../../mk/bsd.prefs.mk"
@@ -27,11 +35,7 @@ SUBST_SED.defs=              -e 's|-D_BSD_SOURCE[[:s
 SUBST_MESSAGE.defs=    Replacing deprecated preprocessor-defined macros.
 .endif
 
-.if exists(/etc/shadow) && !(${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly")
-MAKE_FLAGS+=           CCOPTIONS="${CFLAGS} -DSHADOW_PWD"                      #getspnam()
-.else
 MAKE_FLAGS+=           CCOPTIONS=${CFLAGS:Q}
-.endif
 MAKE_FLAGS+=           LOCAL_LDFLAGS=${LDFLAGS:Q}
 
 .if    ${OPSYS} == "Linux"
@@ -43,19 +47,6 @@ SETUID_ROOT_PERMS?=  ${REAL_ROOT_USER} ${
 .endif
 SPECIAL_PERMS+=                bin/xtrlock ${SETUID_ROOT_PERMS}
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
-
-do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}                                                           \
-       ${MAKE_PROGRAM} ${MAKE_FLAGS} xtrlock
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/xtrlock                                                            \
-       ${DESTDIR}${PREFIX}/bin/xtrlock
-
-       ${INSTALL_MAN} ${WRKSRC}/xtrlock.man                                                            \
-       ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xtrlock.1
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"

Index: pkgsrc/x11/xtrlock/distinfo
diff -u pkgsrc/x11/xtrlock/distinfo:1.3 pkgsrc/x11/xtrlock/distinfo:1.4
--- pkgsrc/x11/xtrlock/distinfo:1.3     Sat Jun  7 16:32:55 2025
+++ pkgsrc/x11/xtrlock/distinfo Sun Nov 30 10:14:05 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2025/06/07 16:32:55 vins Exp $
+$NetBSD: distinfo,v 1.4 2025/11/30 10:14:05 vins Exp $
 
-BLAKE2s (xtrlock_2.17.tar.xz) = 4f9fef6fcb753aef4e77be4cd4881d66b86a003dcf8faecd0146cd9d535c8ab2
-SHA512 (xtrlock_2.17.tar.xz) = 710f9be0850440885d73d791e4304841aaf4839bf92a50b1aac9fc6778cfb5cff159f9f5955ffdf8b57cb035308cb1500b783ca3a0b126e8b85bf16f464d21e3
-Size (xtrlock_2.17.tar.xz) = 21704 bytes
+BLAKE2s (xtrlock_2.18.tar.xz) = 5298aafc8eccdafef62913ebde581ddfbd0371ebdfba813da9d768058b637684
+SHA512 (xtrlock_2.18.tar.xz) = 9236c025e70911073aa80cd0ce51e3fb9b4612cb045a69cf059e705f37512ade9f61fbbf1bfe311cc72bc96b6d0453f09250872ad8ef2a70d1454407c8be1bee
+Size (xtrlock_2.18.tar.xz) = 21760 bytes
 SHA1 (patch-xtrlock.c) = 2fdef6890a285883c82a03ff53dea2cfc22fdaf5