[pkgsrc/trunk]: pkgsrc/net/nagios-plugins Don't conflict with NetBSD's libint...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/345b5f3761ab
branches:  trunk
changeset: 368002:345b5f3761ab
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Sep 09 22:47:35 2017 +0000

description:
Don't conflict with NetBSD's libintl.h.

diffstat:

 net/nagios-plugins/distinfo                   |   3 ++-
 net/nagios-plugins/patches/patch-gl_gettext.h |  23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)

diffs (44 lines):

diff -r b1f5de13097a -r 345b5f3761ab net/nagios-plugins/distinfo
--- a/net/nagios-plugins/distinfo       Sat Sep 09 22:46:57 2017 +0000
+++ b/net/nagios-plugins/distinfo       Sat Sep 09 22:47:35 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2017/07/04 19:45:18 jperkin Exp $
+$NetBSD: distinfo,v 1.22 2017/09/09 22:47:35 joerg Exp $
 
 SHA1 (nagios-plugins-2.2.1.tar.gz) = 0d3fc8876343a906f0dcc2c00850e4ad956a150a
 RMD160 (nagios-plugins-2.2.1.tar.gz) = 39c364ac08854a1829d47562d4add1ae58a49334
@@ -9,6 +9,7 @@
 SHA1 (patch-ah) = 99b5eb4896262f5aa1de60e9f42c395a59794a6b
 SHA1 (patch-an) = a6adf179db754f98b2da118a8c1101edda026fbc
 SHA1 (patch-configure) = d418b81f06e22b769cd187a77f45f0add605698e
+SHA1 (patch-gl_gettext.h) = 37d14b4472f678bd84c13183e0fb263cd17f6ac5
 SHA1 (patch-plugins-root_Makefile.in) = 46e8968df375ca35d453e36c277d4052f125897b
 SHA1 (patch-plugins-scripts_check__breeze.pl) = 57ffda78989fd0d0c0fa26c74b7f53bd083dab4f
 SHA1 (patch-plugins-scripts_check__wave.pl) = 535b008877cad780afa2ed3429ffb84e7da3ec28
diff -r b1f5de13097a -r 345b5f3761ab net/nagios-plugins/patches/patch-gl_gettext.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nagios-plugins/patches/patch-gl_gettext.h     Sat Sep 09 22:47:35 2017 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-gl_gettext.h,v 1.1 2017/09/09 22:47:35 joerg Exp $
+
+Avoid redefining pgettext_expr and friends on systems that have them
+already in libintl.h
+
+--- gl/gettext.h.orig  2017-09-09 21:15:30.222205401 +0000
++++ gl/gettext.h
+@@ -180,7 +180,7 @@ npgettext_aux (const char *domain,
+ /* The same thing extended for non-constant arguments.  Here MSGCTXT and MSGID
+    can be arbitrary expressions.  But for string literals these macros are
+    less efficient than those above.  */
+-
++#if !defined(pgettext_expr)
+ #include <string.h>
+ 
+ #if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
+@@ -284,5 +284,6 @@ dcnpgettext_expr (const char *domain,
+     }
+   return (n == 1 ? msgid : msgid_plural);
+ }
++#endif
+ 
+ #endif /* NAGIOS_GL_GETTEXT_H_INCLUDED */