Add two missing build dependencies, zip and unzip.

Set _TOOLS_USE_PKGSRC.flex so that really the pkgsrc version is pulled in,
the NetBSD base version is too old.

Avoid recreating the .po files because somehow we end up with
msgctxt lines in the files.

All buildfixes, so no PKGREVISION++ for now.

3 files changed, 34 insertions, 2 deletions

diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index bea35dfb134..e4871098961 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/03/22 19:01:38 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/03/27 06:54:53 wiz Exp $
 #
 
 DISTNAME=	warzone2100-2.1.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://wz2100.net/
 COMMENT=	Real-time strategy and real-time tactics hybrid computer game
 
+BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
+BUILD_DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 DEPENDS+=	dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -24,10 +26,16 @@ CONFIGURE_ARGS+=	--with-distributor=pkgsrc
 
 CHECK_WRKREF_SKIP=	share/warzone2100/mods/global/aivolution.wz
 
+post-build:
+	cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE} update-gmo
+
 .include "../../audio/openal/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+# API depends is not enough to pull in flex; NetBSD one is 2.5.4 which
+# is too old
+_TOOLS_USE_PKGSRC.flex=		yes
 BUILDLINK_API_DEPENDS.flex+=	flex>=2.5.35
 .include "../../devel/flex/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo
index a31ee1e8654..5172a199bf0 100644
--- a/games/warzone2100/distinfo
+++ b/games/warzone2100/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/02/15 16:05:43 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2009/03/27 06:54:53 wiz Exp $
 
 SHA1 (warzone2100-2.1.1.tar.bz2) = 5f0cb41b283ec709cffa8e00c4c1fda8fc9a63d7
 RMD160 (warzone2100-2.1.1.tar.bz2) = 4eca8c00c917061e93d4c70db07b698a123ce37f
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 95c066ff4340ba6e4c021846541b53eb4cad0704
 SHA1 (patch-ab) = e82a085ddf27a5443e011ada57e78cca1ab66c79
 SHA1 (patch-ac) = b15234c26cbbeffe58e623feb49e9930bd3846d0
 SHA1 (patch-ad) = 1afe3527241d142e1af6c5e432a64324675d74f3
+SHA1 (patch-ae) = 9a5f2fccd93100e87968d2dc9d783acc595ad5d3
diff --git a/games/warzone2100/patches/patch-ae b/games/warzone2100/patches/patch-ae
new file mode 100644
index 00000000000..9bb282bd69b
--- /dev/null
+++ b/games/warzone2100/patches/patch-ae
@@ -0,0 +1,23 @@
+$NetBSD: patch-ae,v 1.1 2009/03/27 06:54:54 wiz Exp $
+
+--- po/Makefile.in.in.orig	2008-12-21 18:41:15.000000000 +0000
++++ po/Makefile.in.in
+@@ -122,7 +122,7 @@ check-macro-version:
+ # if updating the $(CATALOGS) would always touch them; however, the rule for
+ # $(POFILES) has been designed to not touch files that don't need to be
+ # changed.
+-stamp-po: $(srcdir)/$(DOMAIN).pot
++stamp-po: #$(srcdir)/$(DOMAIN).pot
+ 	test ! -f $(srcdir)/$(DOMAIN).pot || \
+ 	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+ 	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+@@ -189,7 +189,8 @@ $(srcdir)/$(DOMAIN).pot:
+ 
+ # This target rebuilds a PO file if $(DOMAIN).pot has changed.
+ # Note that a PO file is not touched if it doesn't need to be changed.
+-$(POFILES): $(srcdir)/$(DOMAIN).pot
++#$(POFILES): $(srcdir)/$(DOMAIN).pot
++bogus1:
+ 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ 	if test -f "$(srcdir)/$${lang}.po"; then \
+ 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \