- Update to 2.2.5.5

PR:		154403
Submitted by:	Grzegorz Blach <magik@roorback.net>
Feature safe:	yes

4 files changed, 171 insertions, 57 deletions

diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index 119b096753e0..10f5976453be 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	wargus
-PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTVERSION=	2.2.5.5
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/for%20Stratagus%20${PORTVERSION}
-EXTRACT_SUFX=	-src.zip
+MASTER_SITES=	http://launchpadlibrarian.net/59493162/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+EXTRACT_SUFX=	.orig.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus
@@ -18,21 +18,23 @@ COMMENT=	Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	stratagus:${PORTSDIR}/games/stratagus
 
-USE_ZIP=	yes
-EXTRACT_BEFORE_ARGS=	-a
+LICENSE=	GPLv2
 NOT_FOR_ARCHS=	sparc64
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 gnomehack gnometarget
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 SUB_FILES=	${PORTNAME} pkg-message
 
+MAKE_ARGS+=	CFLAGS+=-I${LOCALBASE}/include LDFLAGS+=-L${LOCALBASE}/lib
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 	cd ${WRKSRC} && \
-		${FIND} campaigns contrib maps scripts -type d \
-		-exec ${MKDIR} "${DATADIR}/{}" \; && \
-		${FIND} campaigns contrib maps scripts -type f \
-		-exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
+	    ${FIND} campaigns contrib maps scripts -type d \
+	    -exec ${MKDIR} "${DATADIR}/{}" \; && \
+	    ${FIND} campaigns contrib maps scripts -type f \
+	    -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 	${INSTALL_PROGRAM} ${WRKSRC}/wartool ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/build.sh ${DATADIR}
 
diff --git a/games/wargus/distinfo b/games/wargus/distinfo
index f62d197ac6dd..17d67fb48c27 100644
--- a/games/wargus/distinfo
+++ b/games/wargus/distinfo
@@ -1,3 +1,2 @@
-MD5 (wargus-2.2.4-src.zip) = b851eaf1f806996369f0ca57ee370455
-SHA256 (wargus-2.2.4-src.zip) = 81043f1a344c19130bcec5c5f2f473ca0bca45e22209033fbe75da8a182e3433
-SIZE (wargus-2.2.4-src.zip) = 944566
+SHA256 (wargus_2.2.5.5.orig.tar.gz) = 561d0ac5e88abcd5663fca1f7793ee20739aa0d641420bf0a6b7424ebd4ab14f
+SIZE (wargus_2.2.5.5.orig.tar.gz) = 3605444
diff --git a/games/wargus/files/patch-Makefile b/games/wargus/files/patch-Makefile
deleted file mode 100644
index e91c9c98871d..000000000000
--- a/games/wargus/files/patch-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./Makefile.orig	Sun Jan 14 21:40:52 2007
-+++ ./Makefile	Mon Feb 26 14:31:39 2007
-@@ -1,11 +1,11 @@
- 
--CC = gcc
-+CC ?= gcc
- 
- CROSSDIR = /usr/local/cross
- STRATAGUSPATH = ../stratagus/
- 
--CFLAGS = -I/usr/local/include -Wall -Wsign-compare
--LDFLAGS = -lz -lpng -lm -L/usr/local/lib
-+CFLAGS += -I$(LOCALBASE)/include -Wall -Wsign-compare
-+LDFLAGS += -lz -lpng -lm -L$(LOCALBASE)/lib
- 
- all: wartool pudconvert
- 
-@@ -47,3 +47,4 @@
- 	for i in `cat .list`; do echo $$i; done | cpio -pdml --quiet wargus-$(ver);\
- 	tar -zcf wargus-$(ver)-linux.tar.gz wargus-$(ver); \
- 	rm -rf wargus-$(ver) .list stratagus;
-+
diff --git a/games/wargus/pkg-plist b/games/wargus/pkg-plist
index b7fd2afda5ba..06691b40703c 100644
--- a/games/wargus/pkg-plist
+++ b/games/wargus/pkg-plist
@@ -61,49 +61,189 @@ bin/wargus
 %%DATADIR%%/contrib/ore,stone,coal.png
 %%DATADIR%%/contrib/red_cross.png
 %%DATADIR%%/contrib/score.png
-%%DATADIR%%/contrib/stratagus.png
 %%DATADIR%%/contrib/toccata.mod.gz
 %%DATADIR%%/contrib/wargus.ico
 %%DATADIR%%/contrib/wargus.png
-%%DATADIR%%/maps/multi/(3)little-ambush.pud
+%%DATADIR%%/maps/multi/(2)blick-nach-oben.smp.gz
+%%DATADIR%%/maps/multi/(2)blick-nach-oben.sms.gz
+%%DATADIR%%/maps/multi/(2)blick-nach-oben.txt
+%%DATADIR%%/maps/multi/(2)east-west-conflict.pud
+%%DATADIR%%/maps/multi/(2)east-west-conflict.smp.gz
+%%DATADIR%%/maps/multi/(2)east-west-conflict.sms.gz
+%%DATADIR%%/maps/multi/(2)east-west-conflict.txt
+%%DATADIR%%/maps/multi/(2)king-in-stone.pud
+%%DATADIR%%/maps/multi/(2)king-in-stone.smp.gz
+%%DATADIR%%/maps/multi/(2)king-in-stone.sms.gz
+%%DATADIR%%/maps/multi/(2)no-mans-land.pud
+%%DATADIR%%/maps/multi/(2)no-mans-land.smp.gz
+%%DATADIR%%/maps/multi/(2)no-mans-land.sms.gz
+%%DATADIR%%/maps/multi/(2)nord-sued-konflikt.smp.gz
+%%DATADIR%%/maps/multi/(2)nord-sued-konflikt.sms.gz
+%%DATADIR%%/maps/multi/(2)nord-sued-konflikt.txt
+%%DATADIR%%/maps/multi/(2)nordische-seenplatte.smp.gz
+%%DATADIR%%/maps/multi/(2)nordische-seenplatte.sms.gz
+%%DATADIR%%/maps/multi/(2)nordische-seenplatte.txt
+%%DATADIR%%/maps/multi/(2)oily-wars.smp.gz
+%%DATADIR%%/maps/multi/(2)oily-wars.sms.gz
+%%DATADIR%%/maps/multi/(2)the-right-strategy.pud
+%%DATADIR%%/maps/multi/(2)the-right-strategy.smp.gz
+%%DATADIR%%/maps/multi/(2)the-right-strategy.sms.gz
+%%DATADIR%%/maps/multi/(2)zeit-fuer-entscheidungen.smp.gz
+%%DATADIR%%/maps/multi/(2)zeit-fuer-entscheidungen.sms.gz
+%%DATADIR%%/maps/multi/(2)zeit-fuer-entscheidungen.txt
+%%DATADIR%%/maps/multi/(3)around-the-sea.pud
+%%DATADIR%%/maps/multi/(3)calculate.pud
+%%DATADIR%%/maps/multi/(3)calculate.smp.gz
+%%DATADIR%%/maps/multi/(3)calculate.sms.gz
+%%DATADIR%%/maps/multi/(3)calculate.txt
+%%DATADIR%%/maps/multi/(3)frosty-rescue.smp.gz
+%%DATADIR%%/maps/multi/(3)frosty-rescue.sms.gz
+%%DATADIR%%/maps/multi/(3)frosty-rescue.txt
 %%DATADIR%%/maps/multi/(3)little-ambush.pud.gz
 %%DATADIR%%/maps/multi/(3)little-ambush.txt
-%%DATADIR%%/maps/multi/(4)4-corners.pud
+%%DATADIR%%/maps/multi/(3)man-on-the-moon.pud
+%%DATADIR%%/maps/multi/(3)man-on-the-moon.smp.gz
+%%DATADIR%%/maps/multi/(3)man-on-the-moon.sms.gz
+%%DATADIR%%/maps/multi/(3)no-mans-land.smp.gz
+%%DATADIR%%/maps/multi/(3)no-mans-land.sms.gz
+%%DATADIR%%/maps/multi/(3)no-mans-land.txt
+%%DATADIR%%/maps/multi/(3)one-two-three.smp.gz
+%%DATADIR%%/maps/multi/(3)one-two-three.sms.gz
+%%DATADIR%%/maps/multi/(3)one-two-three.txt
+%%DATADIR%%/maps/multi/(3)sea-wars.smp.gz
+%%DATADIR%%/maps/multi/(3)sea-wars.sms.gz
+%%DATADIR%%/maps/multi/(3)three-frontiers.smp.gz
+%%DATADIR%%/maps/multi/(3)three-frontiers.sms.gz
 %%DATADIR%%/maps/multi/(4)4-corners.pud.gz
 %%DATADIR%%/maps/multi/(4)4-corners.txt
-%%DATADIR%%/maps/multi/(4)4-isl.pud
 %%DATADIR%%/maps/multi/(4)4-isl.pud.gz
 %%DATADIR%%/maps/multi/(4)4-isl.txt
-%%DATADIR%%/maps/multi/(4)chop-the-trees.pud
+%%DATADIR%%/maps/multi/(4)arctic-goldrush.pud
+%%DATADIR%%/maps/multi/(4)arctic-goldrush.smp.gz
+%%DATADIR%%/maps/multi/(4)arctic-goldrush.sms.gz
+%%DATADIR%%/maps/multi/(4)central-park.smp.gz
+%%DATADIR%%/maps/multi/(4)central-park.sms.gz
+%%DATADIR%%/maps/multi/(4)central-park.txt
 %%DATADIR%%/maps/multi/(4)chop-the-trees.pud.gz
 %%DATADIR%%/maps/multi/(4)chop-the-trees.txt
-%%DATADIR%%/maps/multi/(4)criss_cross.pud
+%%DATADIR%%/maps/multi/(4)circle-hill.pud
+%%DATADIR%%/maps/multi/(4)circle-hill.smp.gz
+%%DATADIR%%/maps/multi/(4)circle-hill.sms.gz
 %%DATADIR%%/maps/multi/(4)criss_cross.pud.gz
-%%DATADIR%%/maps/multi/(4)criss_cross2.pud
 %%DATADIR%%/maps/multi/(4)criss_cross2.pud.gz
 %%DATADIR%%/maps/multi/(4)criss_cross2.txt
-%%DATADIR%%/maps/multi/(4)scandinavia.pud
+%%DATADIR%%/maps/multi/(4)east-lakes.pud
+%%DATADIR%%/maps/multi/(4)east-lakes.txt
+%%DATADIR%%/maps/multi/(4)green-hell.smp.gz
+%%DATADIR%%/maps/multi/(4)green-hell.sms.gz
+%%DATADIR%%/maps/multi/(4)green-hell.txt
+%%DATADIR%%/maps/multi/(4)holy-forest.pud
+%%DATADIR%%/maps/multi/(4)holy-forest.smp.gz
+%%DATADIR%%/maps/multi/(4)holy-forest.sms.gz
+%%DATADIR%%/maps/multi/(4)lake-in-the-middle.smp.gz
+%%DATADIR%%/maps/multi/(4)lake-in-the-middle.sms.gz
+%%DATADIR%%/maps/multi/(4)lake-in-the-middle.txt
+%%DATADIR%%/maps/multi/(4)little-island.smp.gz
+%%DATADIR%%/maps/multi/(4)little-island.sms.gz
+%%DATADIR%%/maps/multi/(4)little-island.txt
+%%DATADIR%%/maps/multi/(4)look-around.smp.gz
+%%DATADIR%%/maps/multi/(4)look-around.sms.gz
+%%DATADIR%%/maps/multi/(4)pathfinders.pud
+%%DATADIR%%/maps/multi/(4)pathfinders.smp.gz
+%%DATADIR%%/maps/multi/(4)pathfinders.sms.gz
 %%DATADIR%%/maps/multi/(4)scandinavia.pud.gz
 %%DATADIR%%/maps/multi/(4)scandinavia.txt
-%%DATADIR%%/maps/multi/(5)diablospiral.pud
+%%DATADIR%%/maps/multi/(4)smile.pud
+%%DATADIR%%/maps/multi/(4)smile.smp.gz
+%%DATADIR%%/maps/multi/(4)smile.sms.gz
+%%DATADIR%%/maps/multi/(4)smile.txt
+%%DATADIR%%/maps/multi/(4)think-like-your-enemy.pud
+%%DATADIR%%/maps/multi/(4)think-like-your-enemy.txt
+%%DATADIR%%/maps/multi/(4)tournament-continent.pud
+%%DATADIR%%/maps/multi/(4)tournament-continent.smp.gz
+%%DATADIR%%/maps/multi/(4)tournament-continent.sms.gz
+%%DATADIR%%/maps/multi/(4)tournament-forest.pud
+%%DATADIR%%/maps/multi/(4)tournament-forest.smp.gz
+%%DATADIR%%/maps/multi/(4)tournament-forest.sms.gz
+%%DATADIR%%/maps/multi/(4)tournament-islands.pud
+%%DATADIR%%/maps/multi/(4)tournament-islands.smp.gz
+%%DATADIR%%/maps/multi/(4)tournament-islands.sms.gz
+%%DATADIR%%/maps/multi/(4)what-can-you-do.pud
+%%DATADIR%%/maps/multi/(4)what-can-you-do.smp.gz
+%%DATADIR%%/maps/multi/(4)what-can-you-do.sms.gz
+%%DATADIR%%/maps/multi/(4)what-can-you-do.txt
+%%DATADIR%%/maps/multi/(4)woody-islands.pud
+%%DATADIR%%/maps/multi/(4)woody-islands.smp.gz
+%%DATADIR%%/maps/multi/(4)woody-islands.sms.gz
+%%DATADIR%%/maps/multi/(4)you-have-to-look-around.pud
+%%DATADIR%%/maps/multi/(4)you-have-to-look-around.smp.gz
+%%DATADIR%%/maps/multi/(4)you-have-to-look-around.sms.gz
+%%DATADIR%%/maps/multi/(4)you-have-to-look-around.txt
 %%DATADIR%%/maps/multi/(5)diablospiral.pud.gz
 %%DATADIR%%/maps/multi/(5)diablospiral.txt
-%%DATADIR%%/maps/multi/(8)altar-in-the-middle.pud
+%%DATADIR%%/maps/multi/(5)many-ways-to-beat.pud
+%%DATADIR%%/maps/multi/(5)many-ways-to-beat.smp.gz
+%%DATADIR%%/maps/multi/(5)many-ways-to-beat.sms.gz
+%%DATADIR%%/maps/multi/(5)many-ways-to-beat.txt
+%%DATADIR%%/maps/multi/(5)speed-is-the-key.pud
+%%DATADIR%%/maps/multi/(5)speed-is-the-key.smp.gz
+%%DATADIR%%/maps/multi/(5)speed-is-the-key.sms.gz
+%%DATADIR%%/maps/multi/(5)the-pentagon.pud
+%%DATADIR%%/maps/multi/(5)the-pentagon.smp.gz
+%%DATADIR%%/maps/multi/(5)the-pentagon.sms.gz
+%%DATADIR%%/maps/multi/(5)the-pentagon.txt
+%%DATADIR%%/maps/multi/(5)venedig.pud
+%%DATADIR%%/maps/multi/(5)venedig.smp.gz
+%%DATADIR%%/maps/multi/(5)venedig.sms.gz
+%%DATADIR%%/maps/multi/(5)venedig.txt
+%%DATADIR%%/maps/multi/(6)all-against-the-floods.pud
+%%DATADIR%%/maps/multi/(6)all-against-the-floods.smp.gz
+%%DATADIR%%/maps/multi/(6)all-against-the-floods.sms.gz
+%%DATADIR%%/maps/multi/(6)all-against-the-floods.txt
+%%DATADIR%%/maps/multi/(6)can-you-swim.pud
+%%DATADIR%%/maps/multi/(6)can-you-swim.smp.gz
+%%DATADIR%%/maps/multi/(6)can-you-swim.sms.gz
+%%DATADIR%%/maps/multi/(6)different-ways.pud
+%%DATADIR%%/maps/multi/(6)different-ways.smp.gz
+%%DATADIR%%/maps/multi/(6)different-ways.sms.gz
+%%DATADIR%%/maps/multi/(6)many-ways-to-rome.pud
+%%DATADIR%%/maps/multi/(6)many-ways-to-rome.smp.gz
+%%DATADIR%%/maps/multi/(6)many-ways-to-rome.sms.gz
+%%DATADIR%%/maps/multi/(7)many-frontiers.pud
+%%DATADIR%%/maps/multi/(7)many-frontiers.smp.gz
+%%DATADIR%%/maps/multi/(7)many-frontiers.sms.gz
 %%DATADIR%%/maps/multi/(8)altar-in-the-middle.pud.gz
 %%DATADIR%%/maps/multi/(8)altar-in-the-middle.txt
-%%DATADIR%%/maps/multi/(8)diabloarena.pud
+%%DATADIR%%/maps/multi/(8)are-you-lucky.pud
+%%DATADIR%%/maps/multi/(8)are-you-lucky.smp.gz
+%%DATADIR%%/maps/multi/(8)are-you-lucky.sms.gz
+%%DATADIR%%/maps/multi/(8)are-you-lucky.txt
+%%DATADIR%%/maps/multi/(8)death-in-the-rocks.pud
+%%DATADIR%%/maps/multi/(8)death-in-the-rocks.smp.gz
+%%DATADIR%%/maps/multi/(8)death-in-the-rocks.sms.gz
 %%DATADIR%%/maps/multi/(8)diabloarena.pud.gz
 %%DATADIR%%/maps/multi/(8)diabloarena.txt
-%%DATADIR%%/maps/multi/(8)diablodarkwood.pud
 %%DATADIR%%/maps/multi/(8)diablodarkwood.pud.gz
 %%DATADIR%%/maps/multi/(8)diablodarkwood.txt
-%%DATADIR%%/maps/multi/(8)diablomaze.pud
 %%DATADIR%%/maps/multi/(8)diablomaze.pud.gz
 %%DATADIR%%/maps/multi/(8)diablomaze.txt
-%%DATADIR%%/maps/multi/(8)fc-deathmatch-plain.pud
+%%DATADIR%%/maps/multi/(8)everywhere.pud
+%%DATADIR%%/maps/multi/(8)everywhere.txt
 %%DATADIR%%/maps/multi/(8)fc-deathmatch-plain.pud.gz
-%%DATADIR%%/maps/multi/(8)fc-deathmatch-x.pud
 %%DATADIR%%/maps/multi/(8)fc-deathmatch-x.pud.gz
+%%DATADIR%%/maps/multi/(8)oil-is-the-key.pud
+%%DATADIR%%/maps/multi/(8)oil-is-the-key.smp.gz
+%%DATADIR%%/maps/multi/(8)oil-is-the-key.sms.gz
+%%DATADIR%%/maps/multi/(8)roads-to-the-coasts.pud
+%%DATADIR%%/maps/multi/(8)roads-to-the-coasts.smp.gz
+%%DATADIR%%/maps/multi/(8)roads-to-the-coasts.sms.gz
+%%DATADIR%%/maps/multi/(8)roads-to-the-coasts.txt
+%%DATADIR%%/maps/multi/(8)tournament-continent.pud
+%%DATADIR%%/maps/multi/(8)tournament-continent.smp.gz
+%%DATADIR%%/maps/multi/(8)tournament-continent.sms.gz
+%%DATADIR%%/maps/multi/(8)tournament-islands.pud
+%%DATADIR%%/maps/multi/(8)tournament-islands.smp.gz
+%%DATADIR%%/maps/multi/(8)tournament-islands.sms.gz
 %%DATADIR%%/scripts/ai.lua
 %%DATADIR%%/scripts/ai/air_attack.lua
 %%DATADIR%%/scripts/ai/campaign.lua
@@ -115,7 +255,6 @@ bin/wargus
 %%DATADIR%%/scripts/cheats.lua
 %%DATADIR%%/scripts/commands.lua
 %%DATADIR%%/scripts/constructions.lua
-%%DATADIR%%/scripts/credits.lua
 %%DATADIR%%/scripts/editor.lua
 %%DATADIR%%/scripts/fonts.lua
 %%DATADIR%%/scripts/guichan.lua
@@ -130,10 +269,10 @@ bin/wargus
 %%DATADIR%%/scripts/human/upgrade.lua
 %%DATADIR%%/scripts/icons.lua
 %%DATADIR%%/scripts/keystrokes.lua
-%%DATADIR%%/scripts/menus.lua
 %%DATADIR%%/scripts/menus/campaign.lua
 %%DATADIR%%/scripts/menus/credits.lua
 %%DATADIR%%/scripts/menus/diplomacy.lua
+%%DATADIR%%/scripts/menus/editor.lua
 %%DATADIR%%/scripts/menus/endscenario.lua
 %%DATADIR%%/scripts/menus/game.lua
 %%DATADIR%%/scripts/menus/help.lua
@@ -153,18 +292,14 @@ bin/wargus
 %%DATADIR%%/scripts/orc/ui.lua
 %%DATADIR%%/scripts/orc/units.lua
 %%DATADIR%%/scripts/orc/upgrade.lua
-%%DATADIR%%/scripts/ranks.lua
 %%DATADIR%%/scripts/scripts.lua
 %%DATADIR%%/scripts/sound.lua
-%%DATADIR%%/scripts/soundz.lua
 %%DATADIR%%/scripts/spells.lua
 %%DATADIR%%/scripts/stratagus.lua
-%%DATADIR%%/scripts/tilesets.lua
 %%DATADIR%%/scripts/tilesets/summer.lua
 %%DATADIR%%/scripts/tilesets/swamp.lua
 %%DATADIR%%/scripts/tilesets/wasteland.lua
 %%DATADIR%%/scripts/tilesets/winter.lua
-%%DATADIR%%/scripts/tips.lua
 %%DATADIR%%/scripts/ui.lua
 %%DATADIR%%/scripts/units.lua
 %%DATADIR%%/scripts/upgrade.lua
@@ -185,4 +320,4 @@ bin/wargus
 @dirrm %%DATADIR%%/campaigns/human-exp
 @dirrm %%DATADIR%%/campaigns/human
 @dirrm %%DATADIR%%/campaigns
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%