[pkgsrc/trunk]: pkgsrc/security/gnutls Workaround gettext context function de...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cde60e9ac228
branches:  trunk
changeset: 652810:cde60e9ac228
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jun 08 13:44:56 2015 +0000

description:
Workaround gettext context function definition mess to unbreak
NetBSD/current.

diffstat:

 security/gnutls/distinfo                            |   3 ++-
 security/gnutls/patches/patch-src_libopts_libopts.c |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 02822ef4447d -r cde60e9ac228 security/gnutls/distinfo
--- a/security/gnutls/distinfo  Mon Jun 08 13:44:01 2015 +0000
+++ b/security/gnutls/distinfo  Mon Jun 08 13:44:56 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.114 2015/06/04 09:43:53 jperkin Exp $
+$NetBSD: distinfo,v 1.115 2015/06/08 13:44:56 joerg Exp $
 
 SHA1 (gnutls-3.3.15.tar.xz) = d7f66b0aeaf48ff8621cc1913230635ef672f0a4
 RMD160 (gnutls-3.3.15.tar.xz) = 0c812034b3b8356c31d69074ec92382545eb808b
@@ -10,6 +10,7 @@
 SHA1 (patch-src_gl_stdio.in.h) = fbea411c3a7b71dd2daa3a5963324a2f8daad212
 SHA1 (patch-src_libopts_autoopts_options.h) = 9202c55314fe8764ac82c95bbfabfa1b031e9ba4
 SHA1 (patch-src_libopts_compat_compat.h) = 240fbfc0ba20af35e0634ba873fe9e34bfbcc921
+SHA1 (patch-src_libopts_libopts.c) = ce5e7681def882e95ed5ab770564d1f999b97039
 SHA1 (patch-src_libopts_makeshell.c) = e5b7d66caaec45e12ae5490d515fc9fc75de3d92
 SHA1 (patch-src_libopts_proto.h) = 78f845bdcbac8de74953a3cee0b77fa9c5b05386
 SHA1 (patch-tests_Makefile.in) = b76dfb38f057b9094a5f46eef33b27492a79301e
diff -r 02822ef4447d -r cde60e9ac228 security/gnutls/patches/patch-src_libopts_libopts.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnutls/patches/patch-src_libopts_libopts.c       Mon Jun 08 13:44:56 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libopts_libopts.c,v 1.1 2015/06/08 13:44:57 joerg Exp $
+
+Workaround broken gettext.h conflicting with native implementation of
+message contexts in NetBSD.
+
+--- src/libopts/libopts.c.orig 2015-06-08 13:12:30.000000000 +0000
++++ src/libopts/libopts.c
+@@ -1,3 +1,7 @@
++#include <config.h>
++#if ENABLE_NLS
++#include <gettext.h>
++#endif
+ #define  AUTOOPTS_INTERNAL 1
+ #include "autoopts/project.h"
+ #define  LOCAL static