Do not insist on GNU gettext in libintl, accept

any that has a gettext() function. Fixes build on NetBSD-3.99.16 (and probably older
releases too).
Lots of additional translation files now installed, add them to the PLIST
and bump PKGREVISION.

4 files changed, 191 insertions, 4 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index c344fc77029..5cbab1c5263 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/03/11 10:51:23 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/12 12:30:05 wiz Exp $
 
 DISTNAME=	wesnoth-1.0.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index b1854875540..22c562d4771 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/12/07 17:57:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/03/12 12:30:05 wiz Exp $
 bin/wesnoth
 bin/wmlxgettext
 man/de/man6/wesnoth.6
@@ -3829,6 +3829,163 @@ share/wesnoth/sounds/ugg.wav
 share/wesnoth/sounds/wolf-attack.wav
 share/wesnoth/sounds/zombie-attack.wav
 share/wesnoth/sounds/zombie-hit.wav
+share/wesnoth/translations/af/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/af/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/af/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/af/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/af/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/af/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/af/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/ja/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/la/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/la/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/la/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/la/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/la/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/tr/LC_MESSAGES/wesnoth.mo
+@dirrm share/wesnoth/translations/tr/LC_MESSAGES
+@dirrm share/wesnoth/translations/tr
+@dirrm share/wesnoth/translations/sv/LC_MESSAGES
+@dirrm share/wesnoth/translations/sv
+@dirrm share/wesnoth/translations/sk/LC_MESSAGES
+@dirrm share/wesnoth/translations/sk
+@dirrm share/wesnoth/translations/ru/LC_MESSAGES
+@dirrm share/wesnoth/translations/ru
+@dirrm share/wesnoth/translations/pl/LC_MESSAGES
+@dirrm share/wesnoth/translations/pl
+@dirrm share/wesnoth/translations/nl/LC_MESSAGES
+@dirrm share/wesnoth/translations/nl
+@dirrm share/wesnoth/translations/la/LC_MESSAGES
+@dirrm share/wesnoth/translations/la
+@dirrm share/wesnoth/translations/ja/LC_MESSAGES
+@dirrm share/wesnoth/translations/ja
+@dirrm share/wesnoth/translations/it/LC_MESSAGES
+@dirrm share/wesnoth/translations/it
+@dirrm share/wesnoth/translations/hu/LC_MESSAGES
+@dirrm share/wesnoth/translations/hu
+@dirrm share/wesnoth/translations/fr/LC_MESSAGES
+@dirrm share/wesnoth/translations/fr
+@dirrm share/wesnoth/translations/fi/LC_MESSAGES
+@dirrm share/wesnoth/translations/fi
+@dirrm share/wesnoth/translations/es/LC_MESSAGES
+@dirrm share/wesnoth/translations/es
+@dirrm share/wesnoth/translations/en_GB/LC_MESSAGES
+@dirrm share/wesnoth/translations/en_GB
+@dirrm share/wesnoth/translations/de/LC_MESSAGES
+@dirrm share/wesnoth/translations/de
+@dirrm share/wesnoth/translations/cs/LC_MESSAGES
+@dirrm share/wesnoth/translations/cs
+@dirrm share/wesnoth/translations/ca/LC_MESSAGES
+@dirrm share/wesnoth/translations/ca
+@dirrm share/wesnoth/translations/af/LC_MESSAGES
+@dirrm share/wesnoth/translations/af
+@dirrm share/wesnoth/translations
 @dirrm share/wesnoth/sounds
 @dirrm share/wesnoth/music
 @dirrm share/wesnoth/images/tools/exploder
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 0e305a2f763..c724bc3dcd4 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.16 2005/12/07 17:57:38 wiz Exp $
+$NetBSD: distinfo,v 1.17 2006/03/12 12:30:05 wiz Exp $
 
 SHA1 (wesnoth-1.0.2.tar.gz) = c2313242615b79249f26371bd7c410e8385adc0a
 RMD160 (wesnoth-1.0.2.tar.gz) = 20ba5be7078224f65a37d268eaf95be79e0e57c2
 Size (wesnoth-1.0.2.tar.gz) = 40034289 bytes
+SHA1 (patch-aa) = 28e6a2e8171336fb0f798b2f28ced9152e1678ae
diff --git a/games/wesnoth/patches/patch-aa b/games/wesnoth/patches/patch-aa
new file mode 100644
index 00000000000..33de5ef3504
--- /dev/null
+++ b/games/wesnoth/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.6 2006/03/12 12:30:05 wiz Exp $
+
+Don't insist on GNU gettext.
+
+--- configure.orig	2005-11-19 18:01:16.000000000 +0000
++++ configure
+@@ -4682,7 +4682,7 @@ fi;
+   fi
+ 
+           echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
++echo $ECHO_N "checking for gettext in libintl... $ECHO_C" >&6
+ if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4702,12 +4702,11 @@ extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+-const char *_nl_expand_alias (const char *);
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
++return * gettext ("");
+   ;
+   return 0;
+ }