Update to gnupg-1.4.22

security/gnupg/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.105 2017/07/27 20:12:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.106 2017/10/19 16:36:04 jca Exp $
 
 COMMENT=	GNU privacy guard - a free PGP replacement
 
-DISTNAME=	gnupg-1.4.21
-REVISION=	2
+DISTNAME=	gnupg-1.4.22
 CATEGORIES=	security
 
 # restrict, not compatible with gnupg-2.
@@ -38,7 +37,7 @@ FLAVOR?=
 
 .if ${FLAVOR:Mcard}
 LIB_DEPENDS+=		devel/libusb-compat
-WANTLIB +=		usb pthread
+WANTLIB +=		usb
 .else
 CONFIGURE_ARGS+=	--disable-card-support --without-libusb
 .endif

security/gnupg/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gnupg-1.4.21.tar.gz) = so5ugC8I2w/IzxMM8Ufyrc7vji7+yKe76V9B5H+AoLA=
-SIZE (gnupg-1.4.21.tar.gz) = 5162404
+SHA256 (gnupg-1.4.22.tar.gz) = Mk9wtd92pIJbzlDSsXAuw6D6wNaBVAu+ocmqHjmBT7w=
+SIZE (gnupg-1.4.22.tar.gz) = 5219805

security/gnupg/patches/patch-cipher_Makefile_in

@@ -1,12 +1,13 @@
-$OpenBSD: patch-cipher_Makefile_in,v 1.11 2015/03/01 12:12:54 jca Exp $
---- cipher/Makefile.in.orig	Fri Feb 27 09:37:51 2015
-+++ cipher/Makefile.in	Fri Feb 27 22:39:17 2015
+$OpenBSD: patch-cipher_Makefile_in,v 1.12 2017/10/19 16:36:04 jca Exp $
+Index: cipher/Makefile.in
+--- cipher/Makefile.in.orig
++++ cipher/Makefile.in
 @@ -401,7 +401,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -AM_CPPFLAGS = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl \
 +AM_CPPFLAGS = -I.. -I$(top_srcdir)/include \
- 	$(am__append_1)
+ 	-I$(top_srcdir)/mpi -I../mpi $(am__append_1)
  noinst_LIBRARIES = libcipher.a
  libcipher_a_SOURCES = cipher.c pubkey.c md.c dynload.c bithelp.h des.c \