plink2: Clean up NetBSD patch

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Wed May 23 14:26:20 2018 -0500
Changeset:	c6e4bfb33ff76501d5c9c006d6dffb688f795a8b

Modified Files:
	plink2/distinfo
	plink2/patches/patch-plink2__base.h

Log Message:
plink2: Clean up NetBSD patch

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

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

diffstat:
 plink2/distinfo                     |  2 +-
 plink2/patches/patch-plink2__base.h | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs:
diff --git a/plink2/distinfo b/plink2/distinfo
index a8bb5ef566..3871d19c97 100644
--- a/plink2/distinfo
+++ b/plink2/distinfo
@@ -4,4 +4,4 @@ SHA1 (plink-ng-0.0.0.20180518-f758bbd77e04eb0cb46fbc633be60b22b8b3cc2d.tar.gz) =
 RMD160 (plink-ng-0.0.0.20180518-f758bbd77e04eb0cb46fbc633be60b22b8b3cc2d.tar.gz) = 7be21109553e1a984f96e19887b5179bd6e94937
 SHA512 (plink-ng-0.0.0.20180518-f758bbd77e04eb0cb46fbc633be60b22b8b3cc2d.tar.gz) = 412f3b27b509fd731f816739a8155c77d407af6761749ce9b3eaabfa0e701426134c1bf4862101c379bbf63f97b425726b49283aa0dd96d74976c56e03a15426
 Size (plink-ng-0.0.0.20180518-f758bbd77e04eb0cb46fbc633be60b22b8b3cc2d.tar.gz) = 2392148 bytes
-SHA1 (patch-plink2__base.h) = 4a662fa7abd55069a5c85d5381fcab6a5c1ca7d2
+SHA1 (patch-plink2__base.h) = 5261f0a92966fe51eec8f270a2a8eb81216e531a
diff --git a/plink2/patches/patch-plink2__base.h b/plink2/patches/patch-plink2__base.h
index a540d9c4aa..79dc454985 100644
--- a/plink2/patches/patch-plink2__base.h
+++ b/plink2/patches/patch-plink2__base.h
@@ -2,19 +2,20 @@ $NetBSD$
 
 # Portability
 
---- plink2_base.h.orig	2018-05-03 22:24:28.000000000 +0000
+--- plink2_base.h.orig	2018-05-18 05:07:50.000000000 +0000
 +++ plink2_base.h
-@@ -435,7 +435,12 @@ typedef uint32_t BoolErr;
+@@ -448,10 +448,13 @@ typedef uint32_t BoolErr;
  #  define FOPEN_RB "r"
  #  define FOPEN_WB "w"
  #  define FOPEN_AB "a"
 -#  ifdef __APPLE__
 +#  if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#    define fread_unlocked fread
-+#    define fwrite_unlocked fwrite
-+#  endif
-+#  if defined(__NetBSD__)
-+#    define ferror_unlocked ferror
  #    define fread_unlocked fread
  #    define fwrite_unlocked fwrite
  #  endif
++#  if defined(__NetBSD__)
++#    define ferror_unlocked ferror
++#  endif
+ #endif
+ 
+ #ifdef _WIN32