From 002f3b22cf5d825b0c078631a62ea5cdb8643d43 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 4 Apr 2009 14:53:38 +0000 Subject: [PATCH] - unbreak with newer scons (breakage spotted by naddy@) - regen PLIST while here maintainer timeout --- games/widelands/Makefile | 4 ++-- games/widelands/patches/patch-SConstruct | 17 +++++++++++++++++ games/widelands/pkg/PLIST | 4 ++-- 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 games/widelands/patches/patch-SConstruct diff --git a/games/widelands/Makefile b/games/widelands/Makefile index b5bbeac45d2..1d5f0cc5bba 100644 --- a/games/widelands/Makefile +++ b/games/widelands/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2007/12/09 22:37:30 simon Exp $ +# $OpenBSD: Makefile,v 1.5 2009/04/04 14:53:38 ajacoutot Exp $ COMMENT= economic and military simulation game DISTNAME= widelands-build-11-source -PKGNAME= widelands-0.11p1 +PKGNAME= widelands-0.11p2 CATEGORIES= games EXTRACT_SUFX= .tar.bz2 diff --git a/games/widelands/patches/patch-SConstruct b/games/widelands/patches/patch-SConstruct new file mode 100644 index 00000000000..cab737f372d --- /dev/null +++ b/games/widelands/patches/patch-SConstruct @@ -0,0 +1,17 @@ +$OpenBSD: patch-SConstruct,v 1.1 2009/04/04 14:53:38 ajacoutot Exp $ + +Needed with newer scons to avoid the following error: +scons: *** [installtarget] AttributeError : 'NoneType' object has no attribute 'genstring' + +Should not be needed when widelands gets updated. + +--- SConstruct.orig Sat Apr 4 16:35:45 2009 ++++ SConstruct Sat Apr 4 16:35:55 2009 +@@ -305,7 +305,6 @@ instadd(env, 'widelands', filetype='binary') + install=env.Install('installtarget', 'build-widelands.sh') # the second argument is a (neccessary) dummy + Alias('install', install) + AlwaysBuild(install) +-env.AddPreAction(install, Action(buildlocale)) + + uninstall=env.Uninstall('uninstalltarget', 'build-widelands.sh') # the second argument is a (neccessary) dummy + Alias('uninstall', uninstall) diff --git a/games/widelands/pkg/PLIST b/games/widelands/pkg/PLIST index 2592ee76aba..8cd17f4ed25 100644 --- a/games/widelands/pkg/PLIST +++ b/games/widelands/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2007/10/03 13:21:20 steven Exp $ -bin/widelands +@comment $OpenBSD: PLIST,v 1.3 2009/04/04 14:53:38 ajacoutot Exp $ +@bin bin/widelands share/locale/cz_CZ/ share/locale/cz_CZ/LC_MESSAGES/ share/locale/cz_CZ/LC_MESSAGES/campaigns/