xtrlock: simplify patch (NFC)

[Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Sun Oct 30 13:11:02 2022 +0100
Changeset:	4690e7949c2d7e4ad0c6cb34460a345f4f77caef

Modified Files:
	xtrlock/distinfo
	xtrlock/patches/patch-xtrlock.c

Log Message:
xtrlock: simplify patch (NFC)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4690e7949c2d7e4ad0c6cb34460a345f4f77caef

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

diffstat:
 xtrlock/distinfo                | 2 +-
 xtrlock/patches/patch-xtrlock.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs:
diff --git a/xtrlock/distinfo b/xtrlock/distinfo
index c5957b3b36..db75292ccc 100644
--- a/xtrlock/distinfo
+++ b/xtrlock/distinfo
@@ -3,4 +3,4 @@ $NetBSD$
 BLAKE2s (xtrlock_2.15.tar.xz) = 78fa4bbc9f0ab0999db7fc6cb5330aabff241f2b8c0e6c2f5189640adf8034c0
 SHA512 (xtrlock_2.15.tar.xz) = 3047ca57f04c58426c55c68cf711dffe124ba6c221a3659112339b01ec0f1a411d965277bb366bd39d8155fd82f8e49cb00e728a911aa67b4e46fcfcc489f0b1
 Size (xtrlock_2.15.tar.xz) = 21316 bytes
-SHA1 (patch-xtrlock.c) = 5dff00b35f8957f027439659d896ce739fc14557
+SHA1 (patch-xtrlock.c) = 3fadf9ba5cf6d4f56d127383bcb60394386cfb0f
diff --git a/xtrlock/patches/patch-xtrlock.c b/xtrlock/patches/patch-xtrlock.c
index 0d5bba713f..cb25044a8b 100644
--- a/xtrlock/patches/patch-xtrlock.c
+++ b/xtrlock/patches/patch-xtrlock.c
@@ -4,19 +4,20 @@ Portability fixes for BSD systems.
 
 --- xtrlock.c.orig	2021-02-13 15:34:52.000000000 +0000
 +++ xtrlock.c
-@@ -31,11 +31,15 @@
+@@ -31,11 +31,16 @@
  #include <grp.h>
  #include <limits.h>
  #include <string.h>
-+#if !(defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__))
++#include <sys/param.h>
++#ifndef BSD
  #include <crypt.h>
 +#endif
  #include <unistd.h>
  #include <math.h>
  #include <ctype.h>
-+#if !(defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__))
++#ifndef BSD
  #include <values.h>
 +#endif
-
+ 
  #ifdef SHADOW_PWD
  #include <shadow.h>