Sat Sep 9 22:47:35 2017 UTC ()
Don't conflict with NetBSD's libintl.h.


(joerg)
diff -r1.21 -r1.22 pkgsrc/net/nagios-plugins/distinfo
diff -r0 -r1.1 pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h
cvs diff -r1.21 -r1.22 pkgsrc/net/nagios-plugins/distinfo (expand / switch to unified diff)

--- pkgsrc/net/nagios-plugins/distinfo 2017/07/04 19:45:18 1.21
+++ pkgsrc/net/nagios-plugins/distinfo 2017/09/09 22:47:35 1.22
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.21 2017/07/04 19:45:18 jperkin Exp $ 1$NetBSD: distinfo,v 1.22 2017/09/09 22:47:35 joerg Exp $
2 2
3SHA1 (nagios-plugins-2.2.1.tar.gz) = 0d3fc8876343a906f0dcc2c00850e4ad956a150a 3SHA1 (nagios-plugins-2.2.1.tar.gz) = 0d3fc8876343a906f0dcc2c00850e4ad956a150a
4RMD160 (nagios-plugins-2.2.1.tar.gz) = 39c364ac08854a1829d47562d4add1ae58a49334 4RMD160 (nagios-plugins-2.2.1.tar.gz) = 39c364ac08854a1829d47562d4add1ae58a49334
5SHA512 (nagios-plugins-2.2.1.tar.gz) = 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 5SHA512 (nagios-plugins-2.2.1.tar.gz) = 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
6Size (nagios-plugins-2.2.1.tar.gz) = 2728818 bytes 6Size (nagios-plugins-2.2.1.tar.gz) = 2728818 bytes
7SHA1 (patch-ad) = cad52f9d8c5a6b53a1b512238df1590c0fa2177d 7SHA1 (patch-ad) = cad52f9d8c5a6b53a1b512238df1590c0fa2177d
8SHA1 (patch-af) = 12ea1194eee95ea15ecc6d7daedd10eb9541ee6e 8SHA1 (patch-af) = 12ea1194eee95ea15ecc6d7daedd10eb9541ee6e
9SHA1 (patch-ah) = 99b5eb4896262f5aa1de60e9f42c395a59794a6b 9SHA1 (patch-ah) = 99b5eb4896262f5aa1de60e9f42c395a59794a6b
10SHA1 (patch-an) = a6adf179db754f98b2da118a8c1101edda026fbc 10SHA1 (patch-an) = a6adf179db754f98b2da118a8c1101edda026fbc
11SHA1 (patch-configure) = d418b81f06e22b769cd187a77f45f0add605698e 11SHA1 (patch-configure) = d418b81f06e22b769cd187a77f45f0add605698e
 12SHA1 (patch-gl_gettext.h) = 37d14b4472f678bd84c13183e0fb263cd17f6ac5
12SHA1 (patch-plugins-root_Makefile.in) = 46e8968df375ca35d453e36c277d4052f125897b 13SHA1 (patch-plugins-root_Makefile.in) = 46e8968df375ca35d453e36c277d4052f125897b
13SHA1 (patch-plugins-scripts_check__breeze.pl) = 57ffda78989fd0d0c0fa26c74b7f53bd083dab4f 14SHA1 (patch-plugins-scripts_check__breeze.pl) = 57ffda78989fd0d0c0fa26c74b7f53bd083dab4f
14SHA1 (patch-plugins-scripts_check__wave.pl) = 535b008877cad780afa2ed3429ffb84e7da3ec28 15SHA1 (patch-plugins-scripts_check__wave.pl) = 535b008877cad780afa2ed3429ffb84e7da3ec28
15SHA1 (patch-plugins__check_swap.c) = b822de3488ecace977a739ebcfc56229763cd945 16SHA1 (patch-plugins__check_swap.c) = b822de3488ecace977a739ebcfc56229763cd945
16SHA1 (patch-plugins_check__radius.c) = 3f86bac4f7aa52931bad46d9ee4a421c2ee744f3 17SHA1 (patch-plugins_check__radius.c) = 3f86bac4f7aa52931bad46d9ee4a421c2ee744f3
File Added: pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h
$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 */