From 3c5cf9b51a8debdb3c47d44b08fc2ad2f4f65f4a Mon Sep 17 00:00:00 2001
From: Ryo ONODERA <ryoon@NetBSD.org>
Date: Sat, 4 Jul 2015 04:27:32 +0000
Subject: [PATCH] Update to 2.2.1

* Remove an empty line.
* Fix CONFLISTS pattern to match security/libassuan2.
---
 libassuan22/Makefile | 7 +++----
 libassuan22/distinfo | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libassuan22/Makefile b/libassuan22/Makefile
index b143b329f8..e2dad113dd 100644
--- a/libassuan22/Makefile
+++ b/libassuan22/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2015/03/30 07:29:43 adanbsd Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/04 04:27:32 ryo-on Exp $
 
-
-DISTNAME=	libassuan-2.2.0
+DISTNAME=	libassuan-2.2.1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libassuan/
 EXTRACT_SUFX=	.tar.bz2
-CONFLICTS=	libassuan-1.*{,nb*}
+CONFLICTS=	libassuan-[0-9]*
 
 MAINTAINER=	ada@netbsdfr.org
 HOMEPAGE=	http://gnupg.org/related_software/libassuan/index.en.html
diff --git a/libassuan22/distinfo b/libassuan22/distinfo
index 3fc79bd1b4..4037ebb3e9 100644
--- a/libassuan22/distinfo
+++ b/libassuan22/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2015/03/20 15:32:10 adanbsd Exp $
+$NetBSD: distinfo,v 1.2 2015/07/04 04:27:32 ryo-on Exp $
 
-SHA1 (libassuan-2.2.0.tar.bz2) = 7cf0545955ce414044bb99b871d324753dd7b2e5
-RMD160 (libassuan-2.2.0.tar.bz2) = dbc56f36eb7d831ba0c36cd4bc8a7114a17ec176
-Size (libassuan-2.2.0.tar.bz2) = 516800 bytes
+SHA1 (libassuan-2.2.1.tar.bz2) = c21b86482f6a3624c2b46b91e20f8415f244233a
+RMD160 (libassuan-2.2.1.tar.bz2) = a3cd677855045fe095a1d04de756ab4d8e25521c
+Size (libassuan-2.2.1.tar.bz2) = 542381 bytes