[pkgsrc/pkgsrc-2015Q1]: pkgsrc/security/gnutls Pullup ticket #4741 - requeste...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f976daea187
branches:  pkgsrc-2015Q1
changeset: 649282:3f976daea187
user:      spz <spz%pkgsrc.org@localhost>
date:      Sat Jun 13 10:50:01 2015 +0000

description:
Pullup ticket #4741 - requested by tron
security/gnutls: build fix

Revisions pulled up:
- security/gnutls/distinfo                                      1.115
- security/gnutls/patches/patch-src_libopts_libopts.c           1.1

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Mon Jun  8 13:44:57 UTC 2015

   Modified Files:
        pkgsrc/security/gnutls: distinfo
   Added Files:
        pkgsrc/security/gnutls/patches: patch-src_libopts_libopts.c

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


   To generate a diff of this commit:
   cvs rdiff -u -r1.114 -r1.115 pkgsrc/security/gnutls/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/security/gnutls/patches/patch-src_libopts_libopts.c

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 34edb66ef411 -r 3f976daea187 security/gnutls/distinfo
--- a/security/gnutls/distinfo  Sat Jun 13 10:46:49 2015 +0000
+++ b/security/gnutls/distinfo  Sat Jun 13 10:50:01 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.112 2015/02/11 11:25:57 adam Exp $
+$NetBSD: distinfo,v 1.112.2.1 2015/06/13 10:50:01 spz Exp $
 
 SHA1 (gnutls-3.2.21.tar.xz) = fa12e643ad21bcaf450d534f262c813d75843966
 RMD160 (gnutls-3.2.21.tar.xz) = 8d3b7817dcd28d3c4f1e3ad0d014ab7891daa7f9
@@ -10,6 +10,7 @@
 SHA1 (patch-lib_system.h) = fb67be62f1e889a665a65ab151ced24fa1ab3e2e
 SHA1 (patch-src_libopts_autoopts_options.h) = 60be5b43f23ba5978759c1e245781da7f9125071
 SHA1 (patch-src_libopts_compat_compat.h) = 2e0a1be460917b2d7a8f6bdac698dad405143013
+SHA1 (patch-src_libopts_libopts.c) = ce5e7681def882e95ed5ab770564d1f999b97039
 SHA1 (patch-src_libopts_makeshell.c) = c94e717027d078a081acd10eaec51a44dc4d42e1
 SHA1 (patch-src_libopts_proto.h) = 9749cc4bd080e1a8d800bde181143acb9c340ec8
 SHA1 (patch-tests_Makefile.in) = 0c2e37c632686301855cf6d0ed09583e797ae4e3
diff -r 34edb66ef411 -r 3f976daea187 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       Sat Jun 13 10:50:01 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libopts_libopts.c,v 1.1.2.2 2015/06/13 10:50:01 spz 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