cvs commit: ports/games/wesnoth Makefile distinfo pkg-plist ports/games/wesnoth/files patch-configure.ac patch-src-gettext.cpp patch-src-gettext.hpp

[Philip Paeps]

On 2010-08-26 15:41:34 (+0400), Anonymous <swell.k at gmail.com> wrote:
> Philip Paeps <philip at FreeBSD.org> writes:
> 
> > philip      2010-08-26 11:25:34 UTC
> >
> >   FreeBSD ports repository
> >
> >   Modified files:
> >     games/wesnoth        Makefile distinfo pkg-plist 
> >     games/wesnoth/files  patch-configure.ac patch-src-gettext.cpp 
> >                          patch-src-gettext.hpp 
> >   Log:
> >   Update to 1.8.4
> [...]
> >   Revision  Changes    Path
> >   1.84      +6 -6      ports/games/wesnoth/Makefile
> >   1.52      +3 -3      ports/games/wesnoth/distinfo
> >   1.3       +0 -12     ports/games/wesnoth/files/patch-configure.ac
> 
> >   1.2       +15 -0     ports/games/wesnoth/files/patch-src-gettext.cpp
> >   1.2       +25 -0     ports/games/wesnoth/files/patch-src-gettext.hpp
> 
> These files now contain diffs twice: from ports/148880 and from ports/149485.
> They're practically same except for cosmetic renaming[1]. You can remove
> the parts comitted with ports/148880.

Oh ... whoops. :o

Like this then?

Index: patch-src-gettext.cpp
===================================================================
RCS file: /home/pcvs/ports/games/wesnoth/files/patch-src-gettext.cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-src-gettext.cpp
--- patch-src-gettext.cpp	26 Aug 2010 11:25:34 -0000	1.2
+++ patch-src-gettext.cpp	26 Aug 2010 11:54:42 -0000
@@ -13,18 +13,3 @@
  char const *egettext(char const *msgid)
  {
  	return msgid[0] == '\0' ? msgid : gettext(msgid);
---- src/gettext.cpp~
-+++ src/gettext.cpp
-@@ -18,6 +18,12 @@
- 
- #include <cstring>
- 
-+#ifndef ENABLE_NLS
-+char *textdomain (const char *domainname) {
-+  return "dummy";
-+}
-+#endif
-+
- char const *egettext(char const *msgid)
- {
- 	return msgid[0] == '\0' ? msgid : gettext(msgid);
Index: patch-src-gettext.hpp
===================================================================
RCS file: /home/pcvs/ports/games/wesnoth/files/patch-src-gettext.hpp,v
retrieving revision 1.2
diff -u -r1.2 patch-src-gettext.hpp
--- patch-src-gettext.hpp	26 Aug 2010 11:25:34 -0000	1.2
+++ patch-src-gettext.hpp	26 Aug 2010 11:54:42 -0000
@@ -23,28 +23,3 @@
  
  const char* egettext(const char*);
  const char* sgettext(const char*);
---- src/gettext.hpp~
-+++ src/gettext.hpp
-@@ -35,7 +35,21 @@
- 
- // gettext-related declarations
- 
--#include <libintl.h>
-+#include "wesconfig.h"
-+
-+#ifdef ENABLE_NLS
-+# include <libintl.h>
-+#else
-+# define bind_textdomain_codeset(Domain,Codeset) "C"
-+# define bindtextdomain(Domain,Dir) "/nonexistent"
-+# define gettext(String) gettext_noop(String)
-+# define ngettext(String1,String2,Int) gettext_noop(Int == 1 ? String1 : String2)
-+# define dgettext(Domain,String) gettext_noop(String)
-+# define dngettext(Domain,String1,String2,Int) gettext_noop(Int == 1 ? String1 : String2)
-+# define dcgettext(Domain,String,Int) gettext_noop(String)
-+# define dcngettext(Domain,String1,String2,Int1,Int2) gettext_noop(Int1 == 1 ? String1 : String2)
-+char *textdomain (const char *domainname);
-+#endif
- 
- const char* egettext(const char*);
- const char* sgettext(const char*);

 - Philip

-- 
Philip Paeps                                         Shaken, not stirred
philip at freebsd.org