 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.27 2010/01/21 23:32:10 heinz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/08 10:15:32 wiz Exp $
-DISTNAME=	libgpg-error-1.7
+DISTNAME=	libgpg-error-1.8
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
 		ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/ \
 		ftp://mirror.switch.ch/mirror/gnupg/libgpg-error/ \
 		ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/libgpg-error/ \
 		ftp://ftp.gnupg.ca/libgpg-error/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.gnupg.org/
 COMMENT=	Definitions of common error values for all GnuPG components
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1

 @@ -1,16 +1,20 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:13:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/06/08 10:15:32 wiz Exp $
 bin/gpg-error
 bin/gpg-error-config
 include/gpg-error.h
 lib/libgpg-error.la
 share/aclocal/gpg-error.m4
 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/cs/LC_MESSAGES/libgpg-error.mo
 share/locale/de/LC_MESSAGES/libgpg-error.mo
 share/locale/fr/LC_MESSAGES/libgpg-error.mo
 share/locale/it/LC_MESSAGES/libgpg-error.mo
 share/locale/nl/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
 share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo

 @@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2009/06/09 13:27:33 wiz Exp $
+$NetBSD: distinfo,v 1.10 2010/06/08 10:15:32 wiz Exp $
-SHA1 (libgpg-error-1.7.tar.bz2) = bf8c6babe1e28cae7dd6374ca24ddcc42d57e902
+SHA1 (libgpg-error-1.8.tar.bz2) = f5cf677a7cd684645feaa9704d09eb5cd6d97e8a
-RMD160 (libgpg-error-1.7.tar.bz2) = 6f9004baf8e707b5995a276b5a454102405a6afc
+RMD160 (libgpg-error-1.8.tar.bz2) = 65d2c96bced82af76d9a68c416bfb9ea183ab087
-Size (libgpg-error-1.7.tar.bz2) = 403751 bytes
+Size (libgpg-error-1.8.tar.bz2) = 435341 bytes
-SHA1 (patch-aa) = 04f2918c2b61250693a279cd30a94a22fa4cad0a
+SHA1 (patch-aa) = c8641b95f0e2f8637f4e32383c5e5a778fddf5b9
-SHA1 (patch-ae) = 0865909ebfc7594bb5854e9ef6f7da3718d034bf
+SHA1 (patch-ae) = 16a63ce241b4f48922dd6711f442ed03c0e85d8a
-SHA1 (patch-af) = c3ca3a4a4f024db0ca8cae78dafe10cda1135088
+SHA1 (patch-af) = 30b605f53ef09cd71322e3f928c0ac2d05b4f4ed
-SHA1 (patch-ag) = 5cc03cb3745d366d348a0a2e495a112728b11a37
+SHA1 (patch-ag) = 2332740f4f89d8d4775d88d86c3cb3ffea4df24b
-SHA1 (patch-ah) = 4e648d5f42bd0253e0e6259fcbcca14c2de22491
+SHA1 (patch-ah) = 4dedd24724d7f2e4d65844456dba3f1c802604a8
-SHA1 (patch-ai) = 9db7b50cc98c5a4956a390cb721c51ef5f3e3a4f
+SHA1 (patch-ai) = da067509fb9ce547bad18caf0662770800d8b928

 @@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2004/10/15 18:21:56 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2010/06/08 10:15:32 wiz Exp $
---- src/gpg-error-config.in.orig	2004-10-07 03:53:03.000000000 -0600
+--- src/gpg-error-config.in.orig	2010-01-14 09:18:30.000000000 +0000
 +++ src/gpg-error-config.in
-@@ -63,7 +63,7 @@ while test $# -gt 0; do
+@@ -70,7 +70,7 @@ while test $# -gt 0; do
  	    ;;
  	--libs)
  	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
 -		output="$output -L$libdir"
 +		output="$output -Wl,-R$libdir -L$libdir"
  	    fi
- 	    output="$output -lgpg-error"
+ 	    output="$output @GPG_ERROR_CONFIG_LIBS@"
  	    ;;

 @@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.2 2008/10/14 11:32:11 adam Exp $
+$NetBSD: patch-af,v 1.3 2010/06/08 10:15:33 wiz Exp $
---- src/mkerrcodes.awk.orig	2005-09-03 12:12:12.000000000 +0200
+--- src/mkerrcodes.awk.orig	2008-08-26 12:45:58.000000000 +0000
 +++ src/mkerrcodes.awk
 @@ -60,7 +60,7 @@
  # as is trailing whitespace.
  BEGIN {
 -  FS="[ \t]+GPG_ERR_";
 +  #FS="[ \t]+GPG_ERR_";
    print "/* Output of mkerrcodes.awk.  DO NOT EDIT.  */";
    print "";
    header = 1;
 @@ -91,7 +91,7 @@ header {
    if (/^$/)
      next;

 @@ -1,25 +1,25 @@
-$NetBSD: patch-ae,v 1.1 2005/12/29 16:09:42 kim Exp $
+$NetBSD: patch-ae,v 1.2 2010/06/08 10:15:32 wiz 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/mkerrcodes1.awk.orig	2004-03-08 18:44:05.000000000 +0200
+--- src/mkerrcodes1.awk.orig	2009-07-23 13:52:35.000000000 +0000
-+++ src/mkerrcodes1.awk	2005-12-24 15:34:33.000000000 +0200
++++ src/mkerrcodes1.awk
 @@ -55,7 +55,7 @@
  # as is trailing whitespace.
  BEGIN {
 -  FS="[\t]+";
 +  #FS="[\t]+";
    header = 1;
    if (errnoidx == 0)
      errnoidx = 2;
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ BEGIN {
  /^#/ { next; }
  header {
 -  if ($1 ~ /^[0-9]/)
 +  if ($0 ~ /^[0-9]/)
+     {
        print "#include <errno.h>";
-       print "";
+       print "#ifdef _WIN32";

 @@ -1,25 +1,25 @@
-$NetBSD: patch-ag,v 1.1 2005/12/29 16:09:42 kim Exp $
+$NetBSD: patch-ag,v 1.2 2010/06/08 10:15:33 wiz 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/mkerrnos.awk.orig	2004-03-08 18:44:05.000000000 +0200
+--- src/mkerrnos.awk.orig	2009-07-23 13:52:35.000000000 +0000
-+++ src/mkerrnos.awk	2005-12-24 15:40:07.000000000 +0200
++++ src/mkerrnos.awk
 @@ -56,7 +56,7 @@
  # as is trailing whitespace.
  BEGIN {
 -  FS="[\t]+";
 +  #FS="[\t]+";
    header = 1;
    if (errnoidx == 0)
      errnoidx = 2;
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ BEGIN {
  /^#/ { next; }
  header {
 -  if ($1 ~ /^[0-9]/)
 +  if ($0 ~ /^[0-9]/)
+     {
        print "#include <errno.h>";
-       print "";
+       print "#ifdef _WIN32";

 @@ -1,25 +1,25 @@
-$NetBSD: patch-ah,v 1.1 2005/12/29 16:09:42 kim Exp $
+$NetBSD: patch-ah,v 1.2 2010/06/08 10:15:33 wiz 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/mkstrtable.awk.orig	2004-03-08 18:44:05.000000000 +0200
+--- src/mkstrtable.awk.orig	2010-01-21 11:09:02.000000000 +0000
-+++ src/mkstrtable.awk	2005-12-24 16:56:12.000000000 +0200
++++ src/mkstrtable.awk
 @@ -81,7 +81,7 @@
  # variable and macro name.
  BEGIN {
 -  FS = "[\t]+";
 +  #FS = "[\t]+";
  # cpos holds the current position in the message string.
    cpos = 0;
  # msg holds the number of messages.
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@ BEGIN {
  /^#/ { next; }
  header {
 -  if ($1 ~ /^[0123456789]+$/)
 +  if ($0 ~ /^[0-9]+/)
+     {
        print "/* The purpose of this complex string table is to produce";
        print "   optimal code with a minimum of relocations.  */";

 @@ -1,70 +1,70 @@
-$NetBSD: patch-ai,v 1.1 2005/12/29 16:09:42 kim Exp $
+$NetBSD: patch-ai,v 1.2 2010/06/08 10:15:33 wiz Exp $
 Setting FS in some versions of awk makes it null.  Make this script
 work with the default FS of "whitespace" instead.
---- src/mkheader.awk.orig	2004-03-08 18:44:05.000000000 +0200
+--- src/mkheader.awk.orig	2010-03-15 10:49:49.000000000 +0000
-+++ src/mkheader.awk	2005-12-24 16:51:38.000000000 +0200
++++ src/mkheader.awk
 @@ -51,7 +51,7 @@
  # at the full path of the files in @srcdir@.
  BEGIN {
 -  FS = "[\t]+";
 +  #FS = "[\t]+";
  # sources_nr holds the number of error sources.
    sources_nr = 0;
  # codes_nr holds the number of error codes.
-@@ -74,7 +74,7 @@
+@@ -78,7 +78,7 @@ BEGIN {
  sources_header {
 -  if ($1 ~ /^[0123456789]+$/)
 +  if ($0 ~ /^[0-9]+/)
+     {
        sources_header = 0;
        sources_body = 1;
-@@ -88,7 +88,7 @@
+@@ -92,7 +92,7 @@ sources_body {
    if (/^$/)
      next;
 -  if ($1 == "")
 +  if ($0 !~ /^[0-9]+/)
+     {
        sources_body = 0;
        between_sources_and_codes = 1;
-@@ -103,7 +103,7 @@
+@@ -107,7 +107,7 @@ sources_body {
+ }
  between_sources_and_codes {
 -  if ($1 ~ /^[0123456789]+$/)
 +  if ($0 ~ /^[0-9]+/)
+     {
        between_sources_and_codes = 0;
        codes_body = 1;
-@@ -117,7 +117,7 @@
+@@ -121,7 +121,7 @@ codes_body {
    if (/^$/)
      next;
 -  if ($1 == "")
 +  if ($0 !~ /^[0-9]+/)
+     {
        codes_body = 0;
        between_codes_and_errnos = 1;
-@@ -132,7 +132,7 @@
+@@ -136,7 +136,7 @@ codes_body {
+ }
  between_codes_and_errnos {
 -  if ($1 ~ /^[0-9]/)
 +  if ($0 ~ /^[0-9]+/)
+     {
        between_codes_and_errnos = 0;
        errnos_body = 1;
-@@ -146,7 +146,7 @@
+@@ -150,7 +150,7 @@ errnos_body {
    if (/^$/)
      next;
 -  if ($1 !~ /^[0-9]/)
 +  if ($0 !~ /^[0-9]+/)
+     {
- # Note that this assumes that gpg-error.h.in doesn't start with a digit.
+ # Note that this assumes that extra_body.in doesn't start with a digit.
        errnos_body = 0;