CVS commit: pkgsrc/games/xboard

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Wed Sep 21 21:45:06 UTC 2016

Modified Files:
        pkgsrc/games/xboard: distinfo
Added Files:
        pkgsrc/games/xboard/patches: patch-gettext.h

Log Message:
Fix build on NetBSD-7.99.36

Address conflicts of local gettext.h with /usr/include/libintl.h.
Undefine system symbols and allow package's specific ones.

GUI presents correctly texts in a local language.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/xboard/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/xboard/patches/patch-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/games/xboard/distinfo
diff -u pkgsrc/games/xboard/distinfo:1.10 pkgsrc/games/xboard/distinfo:1.11
--- pkgsrc/games/xboard/distinfo:1.10   Tue May  3 02:39:30 2016
+++ pkgsrc/games/xboard/distinfo        Wed Sep 21 21:45:05 2016
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2016/05/03 02:39:30 mef Exp $
+$NetBSD: distinfo,v 1.11 2016/09/21 21:45:05 kamil Exp $
 
 SHA1 (xboard-4.8.0.tar.gz) = b44de53d704c2d524a3dc79a0c1afdd7414a3ff3
 RMD160 (xboard-4.8.0.tar.gz) = 2ac17ce9efa182b95f108ef78d83490cbe189327
 SHA512 (xboard-4.8.0.tar.gz) = fc3231f170baacdf97df5d08488f5a1fb9a144810f7b0eb72e3e95d345ce47aa2ff67a586ef45b6a9e45932300babc59c161a29e055dd0d19b133ba986985c81
 Size (xboard-4.8.0.tar.gz) = 3691531 bytes
 SHA1 (patch-Makefile.in) = 9f0b08576f612d31cb85b962ee0a3934f5909238
+SHA1 (patch-gettext.h) = 213c3527e01379a4488601122ee3fb63948853db

Added files:

Index: pkgsrc/games/xboard/patches/patch-gettext.h
diff -u /dev/null pkgsrc/games/xboard/patches/patch-gettext.h:1.1
--- /dev/null   Wed Sep 21 21:45:06 2016
+++ pkgsrc/games/xboard/patches/patch-gettext.h Wed Sep 21 21:45:05 2016
@@ -0,0 +1,64 @@
+$NetBSD: patch-gettext.h,v 1.1 2016/09/21 21:45:05 kamil Exp $
+
+Address conflicts of local gettext.h with /usr/include/libintl.h on
+NetBSD-7.99.36. Undefine system symbols and allow package's specific ones.
+
+--- gettext.h.orig     2014-10-18 05:24:43.000000000 +0000
++++ gettext.h
+@@ -186,8 +186,14 @@ npgettext_aux (const char *domain,
+ #include <stdlib.h>
+ #endif
+ 
++#ifdef pgettext_expr
++#undef pgettext_expr
++#endif
+ #define pgettext_expr(Msgctxt, Msgid) \
+   dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
++#ifdef dpgettext_expr
++#undef dpgettext_expr
++#endif
+ #define dpgettext_expr(Domainname, Msgctxt, Msgid) \
+   dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
+ 
+@@ -198,6 +204,11 @@ __inline
+ inline
+ #endif
+ #endif
++
++#ifdef dcpgettext_expr
++#undef dcpgettext_expr
++#endif
++
+ static const char *
+ dcpgettext_expr (const char *domain,
+                  const char *msgctxt, const char *msgid,
+@@ -231,8 +242,17 @@ dcpgettext_expr (const char *domain,
+   return msgid;
+ }
+ 
++#ifdef npgettext_expr
++#undef npgettext_expr
++#endif
++
+ #define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
+   dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
++
++#ifdef dnpgettext_expr
++#undef dnpgettext_expr
++#endif
++
+ #define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+   dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+ 
+@@ -243,6 +263,11 @@ __inline
+ inline
+ #endif
+ #endif
++
++#ifdef dcnpgettext_expr
++#undef dcnpgettext_expr
++#endif
++
+ static const char *
+ dcnpgettext_expr (const char *domain,
+                   const char *msgctxt, const char *msgid,