argon2: Update to 20190702

Add a pkg-config file.

4 files changed, 34 insertions, 22 deletions

diff --git a/security/argon2/Makefile b/security/argon2/Makefile
index c7c0dcd6f5e..df07e6901fd 100644
--- a/security/argon2/Makefile
+++ b/security/argon2/Makefile
@@ -1,22 +1,24 @@
-# $NetBSD: Makefile,v 1.4 2017/12/30 11:34:12 adam Exp $
+# $NetBSD: Makefile,v 1.5 2019/08/07 12:58:49 nia Exp $
 
 DISTNAME=	${GITHUB_PROJECT}
 PKGNAME=	${DISTNAME:S/phc-winner-//}-${GITHUB_TAG}
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=P-H-C/}
+GITHUB_PROJECT=	phc-winner-argon2
+GITHUB_TAG=	20190702
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://password-hashing.net/
 COMMENT=	Password hash Argon2
 LICENSE=	cc0-1.0-universal OR apache-2.0
 
-GITHUB_PROJECT=	phc-winner-argon2
-GITHUB_TAG=	20171227
-
 USE_TOOLS+=	gmake
 TEST_TARGET=	test
 
-INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 share/doc/argon2
+INSTALLATION_DIRS+=	bin include lib
+INSTALLATION_DIRS+=	lib/pkgconfig
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	share/doc/argon2
 
 OPSYSVARS+=		SO_SUFFIX
 SO_SUFFIX.Darwin=	dylib
@@ -28,6 +30,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/argon2.h ${DESTDIR}${PREFIX}/include
 	${INSTALL_LIB} ${WRKSRC}/libargon2.a ${DESTDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libargon2.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libargon2.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 	${INSTALL_MAN} ${WRKSRC}/man/argon2.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/argon2-specs.pdf ${DESTDIR}${PREFIX}/share/doc/argon2
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/argon2
diff --git a/security/argon2/PLIST b/security/argon2/PLIST
index 5e97b6e4678..50b5d3a0791 100644
--- a/security/argon2/PLIST
+++ b/security/argon2/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2017/02/23 16:55:07 kleink Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/08/07 12:58:49 nia Exp $
 bin/argon2
 include/argon2.h
 lib/libargon2.a
 lib/libargon2.${SO_SUFFIX}
+lib/pkgconfig/libargon2.pc
 man/man1/argon2.1
 share/doc/argon2/README.md
 share/doc/argon2/argon2-specs.pdf
diff --git a/security/argon2/distinfo b/security/argon2/distinfo
index 50a9880e4d6..a16c0afdc5a 100644
--- a/security/argon2/distinfo
+++ b/security/argon2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2019/05/27 01:17:21 maya Exp $
+$NetBSD: distinfo,v 1.6 2019/08/07 12:58:49 nia Exp $
 
-SHA1 (phc-winner-argon2-20171227.tar.gz) = c398df55c8fffe70c9a952dd3f696115437234d8
-RMD160 (phc-winner-argon2-20171227.tar.gz) = e4cf2482f11724f580da0051a8c982f9237d3451
-SHA512 (phc-winner-argon2-20171227.tar.gz) = 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
-Size (phc-winner-argon2-20171227.tar.gz) = 1503745 bytes
-SHA1 (patch-Makefile) = d3efbe77767a174cbc27d6e9b255e774afbebb2b
+SHA1 (phc-winner-argon2-20190702.tar.gz) = 4b1de90ec1ccfb6e91001e849f2cbe0222cc8b4c
+RMD160 (phc-winner-argon2-20190702.tar.gz) = 18660aa9f668339938bc1553d7c9fb8bfa816193
+SHA512 (phc-winner-argon2-20190702.tar.gz) = 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
+Size (phc-winner-argon2-20190702.tar.gz) = 1505307 bytes
+SHA1 (patch-Makefile) = db4cefd770669a30dbb415ef5f14765786da7db3
diff --git a/security/argon2/patches/patch-Makefile b/security/argon2/patches/patch-Makefile
index ca571052151..17372253977 100644
--- a/security/argon2/patches/patch-Makefile
+++ b/security/argon2/patches/patch-Makefile
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile,v 1.5 2019/05/27 01:17:21 maya Exp $
+$NetBSD: patch-Makefile,v 1.6 2019/08/07 12:58:49 nia Exp $
 
 Remove -O3 -g compiler flags.
 Disable -march=native since it causes problems on NetBSD.
 Use the same shared library name across platforms.
 
---- Makefile.orig	2017-12-27 19:56:31.000000000 +0000
+--- Makefile.orig	2019-05-20 09:18:00.000000000 +0000
 +++ Makefile
-@@ -30,7 +30,7 @@ SRC_BENCH = src/bench.c
+@@ -37,7 +37,7 @@ SRC_BENCH = src/bench.c
  SRC_GENKAT = src/genkat.c
  OBJ = $(SRC:.c=.o)
  
@@ -15,7 +15,7 @@ Use the same shared library name across platforms.
  
  ifeq ($(NO_THREADS), 1)
  CFLAGS += -DARGON2_NO_THREADS
-@@ -41,8 +41,7 @@ endif
+@@ -48,8 +48,7 @@ endif
  CI_CFLAGS := $(CFLAGS) -Werror=declaration-after-statement -D_FORTIFY_SOURCE=2 \
  				-Wextra -Wno-type-limits -Werror -coverage -DTEST_LARGE_RAM
  
@@ -25,7 +25,7 @@ Use the same shared library name across platforms.
  			-o /dev/null 2>/dev/null; echo $$?)
  # Detect compatible platform
  ifneq ($(OPTTEST), 0)
-@@ -50,7 +49,6 @@ $(info Building without optimizations)
+@@ -57,7 +56,6 @@ $(info Building without optimizations)
  	SRC += src/ref.c
  else
  $(info Building with optimizations for $(OPTTARGET))
@@ -33,17 +33,17 @@ Use the same shared library name across platforms.
  	SRC += src/opt.c
  endif
  
-@@ -59,7 +57,7 @@ KERNEL_NAME := $(shell uname -s)
+@@ -70,7 +68,7 @@ PC_NAME = lib$(LIB_NAME).pc
+ PC_SRC = $(PC_NAME).in
  
- LIB_NAME=argon2
  ifeq ($(KERNEL_NAME), Linux)
 -	LIB_EXT := so.$(ABI_VERSION)
 +	LIB_EXT := so
  	LIB_CFLAGS := -shared -fPIC -fvisibility=hidden -DA2_VISCTL=1
  	SO_LDFLAGS := -Wl,-soname,lib$(LIB_NAME).$(LIB_EXT)
  	LINKED_LIB_EXT := so
-@@ -69,8 +67,8 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_
- 	LIB_CFLAGS := -shared -fPIC
+@@ -82,8 +80,8 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_
+ 	PC_EXTRA_LIBS ?=
  endif
  ifeq ($(KERNEL_NAME), Darwin)
 -	LIB_EXT := $(ABI_VERSION).dylib
@@ -51,5 +51,13 @@ Use the same shared library name across platforms.
 +	LIB_EXT := dylib
 +	LIB_CFLAGS := -dynamiclib -install_name ${DESTDIR}${PREFIX}/lib/lib$(LIB_NAME).$(LIB_EXT)
  	LINKED_LIB_EXT := dylib
+ 	PC_EXTRA_LIBS ?=
+ endif
+@@ -103,7 +101,6 @@ ifeq ($(findstring MSYS, $(KERNEL_NAME))
+ 	PC_EXTRA_LIBS ?=
  endif
- ifeq ($(findstring CYGWIN, $(KERNEL_NAME)), CYGWIN)
+ ifeq ($(KERNEL_NAME), SunOS)
+-	CC := gcc
+ 	CFLAGS += -D_REENTRANT
+ 	LIB_EXT := so
+ 	LIB_CFLAGS := -shared -fPIC