plink2: Work toward NetBSD 7.1 build

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

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Thu May 3 21:12:49 2018 -0500
Changeset:	bf70c7adddc651804a9afe7b08696329cf5ca70f

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

Log Message:
plink2: Work toward NetBSD 7.1 build

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

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

diffstat:
 plink2/Makefile                     |  8 ++++++--
 plink2/distinfo                     |  2 +-
 plink2/patches/patch-plink2__base.h | 13 +++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diffs:
diff --git a/plink2/Makefile b/plink2/Makefile
index cc9167c681..6daccc238c 100644
--- a/plink2/Makefile
+++ b/plink2/Makefile
@@ -23,6 +23,7 @@ LICENSE=	gnu-gpl-v2
 # Just assuming C and C++: Adjust this!
 USE_LANGUAGES=	c c++ fortran
 USE_TOOLS+=	gmake
+GCC_REQD+=	5.0
 
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/2.0
 
@@ -30,12 +31,15 @@ CFLAGS+=	-DDYNAMIC_ZLIB -I${PREFIX}/include -g
 CXXFLAGS+=	-DDYNAMIC_ZLIB -I${PREFIX}/include -g
 
 # Check this
-MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -lopenblas_pthread"
+MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -llapack -lcblas"
 # INSTALL_TARGET=	install-strip
 
 PORTVERSION=	0.0.0.20180503
+# PREFER.zlib=pkgsrc	# Requires newer version than NetBSD 7.1 provides
 
-.include "../../wip/openblas_pthread/buildlink3.mk"
+#.include "../../wip/openblas_pthread/buildlink3.mk"
+.include "../../math/blas/buildlink3.mk"
+.include "../../math/lapack/buildlink3.mk"
 .include "../../wip/cblas/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/plink2/distinfo b/plink2/distinfo
index 349e9e7e7c..f97b908702 100644
--- a/plink2/distinfo
+++ b/plink2/distinfo
@@ -4,4 +4,4 @@ SHA1 (plink-ng-0.0.0.20180503-e81056a32d67cd73a69579e2dbb374d16196f305.tar.gz) =
 RMD160 (plink-ng-0.0.0.20180503-e81056a32d67cd73a69579e2dbb374d16196f305.tar.gz) = 3a064362785e5193070df2a7027f714912a671c2
 SHA512 (plink-ng-0.0.0.20180503-e81056a32d67cd73a69579e2dbb374d16196f305.tar.gz) = c6dc6d187f1664e3489817dbe6ba0a19c548a9b9e42b7033cb751f2254b6a66ebd0b562663924bcca351db0d4bcabb2683a79cfd1339777fea7ac8d3f2965650
 Size (plink-ng-0.0.0.20180503-e81056a32d67cd73a69579e2dbb374d16196f305.tar.gz) = 2363822 bytes
-SHA1 (patch-plink2__base.h) = 54489e47f233e3dfe0d7df693da97a3913c69752
+SHA1 (patch-plink2__base.h) = 08cc1710f2824985dc132149ca102f82e0488bf1
diff --git a/plink2/patches/patch-plink2__base.h b/plink2/patches/patch-plink2__base.h
index 580f2a87ca..87e3f7420f 100644
--- a/plink2/patches/patch-plink2__base.h
+++ b/plink2/patches/patch-plink2__base.h
@@ -1,15 +1,20 @@
 $NetBSD$
 
-# Fix build error
+# Portability
 
---- plink2_base.h.orig	2018-05-03 13:55:25 UTC
+--- plink2_base.h.orig	2018-05-03 22:24:28.000000000 +0000
 +++ plink2_base.h
-@@ -433,7 +433,7 @@ typedef uint32_t BoolErr;
+@@ -435,7 +435,12 @@ 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__)
++#  if defined(__APPLE__) || defined(__FreeBSD__)
++#    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