Fri Mar 27 06:54:54 2009 UTC ()
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.


(wiz)
diff -r1.4 -r1.5 pkgsrc/games/warzone2100/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/games/warzone2100/distinfo
diff -r0 -r1.1 pkgsrc/games/warzone2100/patches/patch-ae
cvs diff -r1.4 -r1.5 pkgsrc/games/warzone2100/Makefile (expand / switch to unified diff)

--- pkgsrc/games/warzone2100/Makefile 2009/03/22 19:01:38 1.4
+++ pkgsrc/games/warzone2100/Makefile 2009/03/27 06:54:53 1.5
@@ -1,42 +1,50 @@ @@ -1,42 +1,50 @@
1# $NetBSD: Makefile,v 1.4 2009/03/22 19:01:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2009/03/27 06:54:53 wiz Exp $
2# 2#
3 3
4DISTNAME= warzone2100-2.1.1 4DISTNAME= warzone2100-2.1.1
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= http://download.gna.org/warzone/releases/2.1/ 6MASTER_SITES= http://download.gna.org/warzone/releases/2.1/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://wz2100.net/ 10HOMEPAGE= http://wz2100.net/
11COMMENT= Real-time strategy and real-time tactics hybrid computer game 11COMMENT= Real-time strategy and real-time tactics hybrid computer game
12 12
 13BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
 14BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
13DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf 15DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
14 16
15PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
16 18
17GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
18USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
19USE_DIRS+= xdg-1.4 21USE_DIRS+= xdg-1.4
20USE_TOOLS+= pkg-config bison msgfmt intltool gmake gsed gawk flex 22USE_TOOLS+= pkg-config bison msgfmt intltool gmake gsed gawk flex
21TOOLS_PLATFORM.gsed= #empty, override nonsense in tools 23TOOLS_PLATFORM.gsed= #empty, override nonsense in tools
22 24
23CONFIGURE_ARGS+= --with-distributor=pkgsrc 25CONFIGURE_ARGS+= --with-distributor=pkgsrc
24 26
25CHECK_WRKREF_SKIP= share/warzone2100/mods/global/aivolution.wz 27CHECK_WRKREF_SKIP= share/warzone2100/mods/global/aivolution.wz
26 28
 29post-build:
 30 cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE} update-gmo
 31
27.include "../../audio/openal/buildlink3.mk" 32.include "../../audio/openal/buildlink3.mk"
28.include "../../audio/libvorbis/buildlink3.mk" 33.include "../../audio/libvorbis/buildlink3.mk"
29.include "../../converters/libiconv/buildlink3.mk" 34.include "../../converters/libiconv/buildlink3.mk"
30.include "../../devel/SDL/buildlink3.mk" 35.include "../../devel/SDL/buildlink3.mk"
 36# API depends is not enough to pull in flex; NetBSD one is 2.5.4 which
 37# is too old
 38_TOOLS_USE_PKGSRC.flex= yes
31BUILDLINK_API_DEPENDS.flex+= flex>=2.5.35 39BUILDLINK_API_DEPENDS.flex+= flex>=2.5.35
32.include "../../devel/flex/buildlink3.mk" 40.include "../../devel/flex/buildlink3.mk"
33.include "../../devel/gettext-lib/buildlink3.mk" 41.include "../../devel/gettext-lib/buildlink3.mk"
34.include "../../devel/physfs/buildlink3.mk" 42.include "../../devel/physfs/buildlink3.mk"
35.include "../../devel/popt/buildlink3.mk" 43.include "../../devel/popt/buildlink3.mk"
36.include "../../fonts/fontconfig/buildlink3.mk" 44.include "../../fonts/fontconfig/buildlink3.mk"
37.include "../../graphics/freetype2/buildlink3.mk" 45.include "../../graphics/freetype2/buildlink3.mk"
38.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 46.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
39.include "../../graphics/png/buildlink3.mk" 47.include "../../graphics/png/buildlink3.mk"
40.include "../../graphics/quesoglc/buildlink3.mk" 48.include "../../graphics/quesoglc/buildlink3.mk"
41.include "../../net/SDL_net/buildlink3.mk" 49.include "../../net/SDL_net/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/games/warzone2100/distinfo (expand / switch to unified diff)

--- pkgsrc/games/warzone2100/distinfo 2009/02/15 16:05:43 1.1.1.1
+++ pkgsrc/games/warzone2100/distinfo 2009/03/27 06:54:53 1.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.1.1.1 2009/02/15 16:05:43 jmcneill Exp $ 1$NetBSD: distinfo,v 1.2 2009/03/27 06:54:53 wiz Exp $
2 2
3SHA1 (warzone2100-2.1.1.tar.bz2) = 5f0cb41b283ec709cffa8e00c4c1fda8fc9a63d7 3SHA1 (warzone2100-2.1.1.tar.bz2) = 5f0cb41b283ec709cffa8e00c4c1fda8fc9a63d7
4RMD160 (warzone2100-2.1.1.tar.bz2) = 4eca8c00c917061e93d4c70db07b698a123ce37f 4RMD160 (warzone2100-2.1.1.tar.bz2) = 4eca8c00c917061e93d4c70db07b698a123ce37f
5Size (warzone2100-2.1.1.tar.bz2) = 44839794 bytes 5Size (warzone2100-2.1.1.tar.bz2) = 44839794 bytes
6SHA1 (patch-aa) = 95c066ff4340ba6e4c021846541b53eb4cad0704 6SHA1 (patch-aa) = 95c066ff4340ba6e4c021846541b53eb4cad0704
7SHA1 (patch-ab) = e82a085ddf27a5443e011ada57e78cca1ab66c79 7SHA1 (patch-ab) = e82a085ddf27a5443e011ada57e78cca1ab66c79
8SHA1 (patch-ac) = b15234c26cbbeffe58e623feb49e9930bd3846d0 8SHA1 (patch-ac) = b15234c26cbbeffe58e623feb49e9930bd3846d0
9SHA1 (patch-ad) = 1afe3527241d142e1af6c5e432a64324675d74f3 9SHA1 (patch-ad) = 1afe3527241d142e1af6c5e432a64324675d74f3
 10SHA1 (patch-ae) = 9a5f2fccd93100e87968d2dc9d783acc595ad5d3
File Added: pkgsrc/games/warzone2100/patches/Attic/patch-ae
$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) && "; \