CVS commit: pkgsrc/net/nagios-plugins

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Sep  9 22:47:35 UTC 2017

Modified Files:
        pkgsrc/net/nagios-plugins: distinfo
Added Files:
        pkgsrc/net/nagios-plugins/patches: patch-gl_gettext.h

Log Message:
Don't conflict with NetBSD's libintl.h.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/nagios-plugins/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nagios-plugins/distinfo
diff -u pkgsrc/net/nagios-plugins/distinfo:1.21 pkgsrc/net/nagios-plugins/distinfo:1.22
--- pkgsrc/net/nagios-plugins/distinfo:1.21     Tue Jul  4 19:45:18 2017
+++ pkgsrc/net/nagios-plugins/distinfo  Sat Sep  9 22:47:35 2017
@@ -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-af) = 12ea1194eee95ea15ecc6d
 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

Added files:

Index: pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h
diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h:1.1
--- /dev/null   Sat Sep  9 22:47:35 2017
+++ pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h        Sat Sep  9 22:47:35 2017
@@ -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 */