xtrlock: revised patch.

[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 01:23:16 2022 +0200
Changeset:	41559b35d023db944ccec728cb143650063f2115

Modified Files:
	xtrlock/Makefile
	xtrlock/distinfo
Added Files:
	xtrlock/patches/patch-xtrlock.c
Removed Files:
	xtrlock/patches/patch-aa

Log Message:
xtrlock: revised patch.

Do not require libgcrypt; on BSDs, the contents of crypt.h are handled
by unistd.h.

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

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

diffstat:
 xtrlock/Makefile                |  1 -
 xtrlock/distinfo                |  2 +-
 xtrlock/patches/patch-aa        | 25 -------------------------
 xtrlock/patches/patch-xtrlock.c | 22 ++++++++++++++++++++++
 4 files changed, 23 insertions(+), 27 deletions(-)

diffs:
diff --git a/xtrlock/Makefile b/xtrlock/Makefile
index c76faa45dc..22ceea2da5 100644
--- a/xtrlock/Makefile
+++ b/xtrlock/Makefile
@@ -49,5 +49,4 @@ do-install:
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xtrlock/distinfo b/xtrlock/distinfo
index 88fc7f54bc..c5957b3b36 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-aa) = b8b3393cdb17253ec285def7ade91461bbd632ad
+SHA1 (patch-xtrlock.c) = 5dff00b35f8957f027439659d896ce739fc14557
diff --git a/xtrlock/patches/patch-aa b/xtrlock/patches/patch-aa
deleted file mode 100644
index b15295db6e..0000000000
--- a/xtrlock/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/28 07:19:42 uhabel Exp $
-
-Adjust includes matching BSD systems
-
---- xtrlock.c.orig	2007-03-28 07:24:00.000000000 +0200
-+++ xtrlock.c	2007-03-28 07:27:32.000000000 +0200
-@@ -31,11 +31,17 @@
- #include <grp.h>
- #include <limits.h>
- #include <string.h>
--#include <crypt.h>
- #include <unistd.h>
- #include <math.h>
- #include <ctype.h>
-+
-+#ifdef BSD
-+#include <gcrypt.h>
-+#include <limits.h>
-+#elseif
-+#include <crypt.h>
- #include <values.h>
-+#endif
- 
- #ifdef SHADOW_PWD
- #include <shadow.h>
diff --git a/xtrlock/patches/patch-xtrlock.c b/xtrlock/patches/patch-xtrlock.c
new file mode 100644
index 0000000000..0d5bba713f
--- /dev/null
+++ b/xtrlock/patches/patch-xtrlock.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Portability fixes for BSD systems.
+
+--- xtrlock.c.orig	2021-02-13 15:34:52.000000000 +0000
++++ xtrlock.c
+@@ -31,11 +31,15 @@
+ #include <grp.h>
+ #include <limits.h>
+ #include <string.h>
++#if !(defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__))
+ #include <crypt.h>
++#endif
+ #include <unistd.h>
+ #include <math.h>
+ #include <ctype.h>
++#if !(defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__))
+ #include <values.h>
++#endif
+
+ #ifdef SHADOW_PWD
+ #include <shadow.h>