From d6586411337f1dc6e69b6da3a0f23210959d8766 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Tue, 14 Oct 2008 11:32:11 +0000
Subject: [PATCH] Changes 1.6: * Fixed a build problem under Windows.

Changes 1.5:
* Minor build system fixes.
* Updated gettext.  Removed included gettext copy.
* gpg-error has a new option --version.
---
 security/libgpg-error/Makefile         |  7 +++----
 security/libgpg-error/PLIST            | 13 +++++++------
 security/libgpg-error/distinfo         | 10 +++++-----
 security/libgpg-error/patches/patch-af | 13 +++++--------
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 90800842cfdab..2b633ce9911be 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2007/11/03 22:40:27 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.24 2008/10/14 11:32:11 adam Exp $
 
-DISTNAME=	libgpg-error-1.4
-PKGREVISION=	2
+DISTNAME=	libgpg-error-1.6
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
 		http://ftp.gnupg.org/gcrypt/libgpg-error/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.gnupg.org/
diff --git a/security/libgpg-error/PLIST b/security/libgpg-error/PLIST
index 938e60dff090e..47ed4818e6905 100644
--- a/security/libgpg-error/PLIST
+++ b/security/libgpg-error/PLIST
@@ -1,18 +1,19 @@
-@comment $NetBSD: PLIST,v 1.7 2007/01/24 19:38:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/10/14 11:32:11 adam Exp $
 bin/gpg-error
 bin/gpg-error-config
 include/gpg-error.h
 lib/libgpg-error.la
 share/aclocal/gpg-error.m4
-share/locale/de/LC_MESSAGES/libgpg-error.mo
-share/locale/pl/LC_MESSAGES/libgpg-error.mo
-share/locale/fr/LC_MESSAGES/libgpg-error.mo
-share/locale/ro/LC_MESSAGES/libgpg-error.mo
-share/locale/vi/LC_MESSAGES/libgpg-error.mo
 share/common-lisp/source/gpg-error/gpg-error-codes.lisp
 share/common-lisp/source/gpg-error/gpg-error-package.lisp
 share/common-lisp/source/gpg-error/gpg-error.asd
 share/common-lisp/source/gpg-error/gpg-error.lisp
+share/locale/de/LC_MESSAGES/libgpg-error.mo
+share/locale/fr/LC_MESSAGES/libgpg-error.mo
+share/locale/pl/LC_MESSAGES/libgpg-error.mo
+share/locale/ro/LC_MESSAGES/libgpg-error.mo
+share/locale/sv/LC_MESSAGES/libgpg-error.mo
+share/locale/vi/LC_MESSAGES/libgpg-error.mo
 @dirrm share/common-lisp/source/gpg-error
 @dirrm share/common-lisp/source
 @dirrm share/common-lisp
diff --git a/security/libgpg-error/distinfo b/security/libgpg-error/distinfo
index cc2e25616b13e..eb87e80116ec8 100644
--- a/security/libgpg-error/distinfo
+++ b/security/libgpg-error/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2006/10/20 15:12:20 shannonjr Exp $
+$NetBSD: distinfo,v 1.8 2008/10/14 11:32:11 adam Exp $
 
-SHA1 (libgpg-error-1.4.tar.gz) = a1f42d6b8d795d657a1f592138a14991f5aeeb85
-RMD160 (libgpg-error-1.4.tar.gz) = f7bbfc222ab8b6061634bf47b81c3c7813433484
-Size (libgpg-error-1.4.tar.gz) = 614446 bytes
+SHA1 (libgpg-error-1.6.tar.bz2) = 2f387d0c34dd55eaf3b5f3c2570e9033eb540bc3
+RMD160 (libgpg-error-1.6.tar.bz2) = 5015a9e0a9c59fe5e9a45d203c324af3736c5d68
+Size (libgpg-error-1.6.tar.bz2) = 382110 bytes
 SHA1 (patch-aa) = 04f2918c2b61250693a279cd30a94a22fa4cad0a
 SHA1 (patch-ae) = 0865909ebfc7594bb5854e9ef6f7da3718d034bf
-SHA1 (patch-af) = 47b27ae134a98d933697ef6de40348ab685eb9fd
+SHA1 (patch-af) = c3ca3a4a4f024db0ca8cae78dafe10cda1135088
 SHA1 (patch-ag) = 5cc03cb3745d366d348a0a2e495a112728b11a37
 SHA1 (patch-ah) = 4e648d5f42bd0253e0e6259fcbcca14c2de22491
 SHA1 (patch-ai) = 9db7b50cc98c5a4956a390cb721c51ef5f3e3a4f
diff --git a/security/libgpg-error/patches/patch-af b/security/libgpg-error/patches/patch-af
index b9c97d2d0627a..041507cb864ee 100644
--- a/security/libgpg-error/patches/patch-af
+++ b/security/libgpg-error/patches/patch-af
@@ -1,11 +1,8 @@
-$NetBSD: patch-af,v 1.1 2005/12/29 16:09:42 kim Exp $
+$NetBSD: patch-af,v 1.2 2008/10/14 11:32:11 adam Exp $
 
-Setting FS in some versions of awk makes it null.  The default FS of
-"whitespace" works fine, so no need to redefine it.
-
---- src/mkerrcodes.awk.orig	2004-04-22 16:30:12.000000000 +0300
-+++ src/mkerrcodes.awk	2005-12-24 15:36:22.000000000 +0200
-@@ -54,7 +54,7 @@
+--- src/mkerrcodes.awk.orig	2005-09-03 12:12:12.000000000 +0200
++++ src/mkerrcodes.awk
+@@ -60,7 +60,7 @@
  # as is trailing whitespace.
  
  BEGIN {
@@ -14,7 +11,7 @@ Setting FS in some versions of awk makes it null.  The default FS of
    print "/* Output of mkerrcodes.awk.  DO NOT EDIT.  */";
    print "";
    header = 1;
-@@ -85,7 +85,7 @@
+@@ -91,7 +91,7 @@ header {
    if (/^$/)
      next;