2 files changed, 188 insertions, 180 deletions

diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index acbb0d1428a7..64bb0b4bfea2 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wargus
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,34 +25,42 @@ USE_REINPLACE=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|^\(CC\)|#\1|; \
+		s|^\(CFLAGS =\)|\1 ${CFLAGS}|; \
+		s|\/usr\/local\(\/cross\)|${PREFIX}\1|; \
+		s|\(-I\)\/usr\/local|\1${LOCALBASE}|; \
+		s|\(-L\)\/usr\/local|\1${LOCALBASE}|' \
+		${WRKSRC}/Makefile
+
 do-install:
-	${MKDIR} ${PREFIX}/share/wargus
-	${MKDIR} ${PREFIX}/share/wargus/campaigns
-	${MKDIR} ${PREFIX}/share/wargus/campaigns/human
-	${MKDIR} ${PREFIX}/share/wargus/campaigns/human-exp
-	${MKDIR} ${PREFIX}/share/wargus/campaigns/orc
-	${MKDIR} ${PREFIX}/share/wargus/campaigns/orc-exp
-	${MKDIR} ${PREFIX}/share/wargus/contrib
-	${MKDIR} ${PREFIX}/share/wargus/maps
-	${MKDIR} ${PREFIX}/share/wargus/maps/multi
-	${MKDIR} ${PREFIX}/share/wargus/scripts
-	${MKDIR} ${PREFIX}/share/wargus/scripts/ai
-	${MKDIR} ${PREFIX}/share/wargus/scripts/human
-	${MKDIR} ${PREFIX}/share/wargus/scripts/orc
-	${MKDIR} ${PREFIX}/share/wargus/scripts/tilesets
-	${INSTALL_DATA} ${WRKSRC}/campaigns/human/* ${PREFIX}/share/wargus/campaigns/human
-	${INSTALL_DATA} ${WRKSRC}/campaigns/human-exp/* ${PREFIX}/share/wargus/campaigns/human-exp
-	${INSTALL_DATA} ${WRKSRC}/campaigns/orc/* ${PREFIX}/share/wargus/campaigns/orc
-	${INSTALL_DATA} ${WRKSRC}/campaigns/orc-exp/* ${PREFIX}/share/wargus/campaigns/orc-exp
-	${INSTALL_DATA} ${WRKSRC}/contrib/* ${PREFIX}/share/wargus/contrib
-	${INSTALL_DATA} ${WRKSRC}/maps/multi/* ${PREFIX}/share/wargus/maps/multi
-	${INSTALL_DATA} ${WRKSRC}/scripts/*.lua ${PREFIX}/share/wargus/scripts
-	${INSTALL_DATA} ${WRKSRC}/scripts/ai/* ${PREFIX}/share/wargus/scripts/ai
-	${INSTALL_DATA} ${WRKSRC}/scripts/human/* ${PREFIX}/share/wargus/scripts/human
-	${INSTALL_DATA} ${WRKSRC}/scripts/orc/* ${PREFIX}/share/wargus/scripts/orc
-	${INSTALL_DATA} ${WRKSRC}/scripts/tilesets/* ${PREFIX}/share/wargus/scripts/tilesets
-	${INSTALL_SCRIPT} ${WRKSRC}/build.sh ${PREFIX}/share/wargus/build.sh
-	${INSTALL_PROGRAM} ${WRKSRC}/wartool ${PREFIX}/share/wargus/wartool
+	${MKDIR} ${DATADIR}
+	${MKDIR} ${DATADIR}/campaigns
+	${MKDIR} ${DATADIR}/campaigns/human
+	${MKDIR} ${DATADIR}/campaigns/human-exp
+	${MKDIR} ${DATADIR}/campaigns/orc
+	${MKDIR} ${DATADIR}/campaigns/orc-exp
+	${MKDIR} ${DATADIR}/contrib
+	${MKDIR} ${DATADIR}/maps
+	${MKDIR} ${DATADIR}/maps/multi
+	${MKDIR} ${DATADIR}/scripts
+	${MKDIR} ${DATADIR}/scripts/ai
+	${MKDIR} ${DATADIR}/scripts/human
+	${MKDIR} ${DATADIR}/scripts/orc
+	${MKDIR} ${DATADIR}/scripts/tilesets
+	${INSTALL_DATA} ${WRKSRC}/campaigns/human/* ${DATADIR}/campaigns/human
+	${INSTALL_DATA} ${WRKSRC}/campaigns/human-exp/* ${DATADIR}/campaigns/human-exp
+	${INSTALL_DATA} ${WRKSRC}/campaigns/orc/* ${DATADIR}/campaigns/orc
+	${INSTALL_DATA} ${WRKSRC}/campaigns/orc-exp/* ${DATADIR}/campaigns/orc-exp
+	${INSTALL_DATA} ${WRKSRC}/contrib/* ${DATADIR}/contrib
+	${INSTALL_DATA} ${WRKSRC}/maps/multi/* ${DATADIR}/maps/multi
+	${INSTALL_DATA} ${WRKSRC}/scripts/*.lua ${DATADIR}/scripts
+	${INSTALL_DATA} ${WRKSRC}/scripts/ai/* ${DATADIR}/scripts/ai
+	${INSTALL_DATA} ${WRKSRC}/scripts/human/* ${DATADIR}/scripts/human
+	${INSTALL_DATA} ${WRKSRC}/scripts/orc/* ${DATADIR}/scripts/orc
+	${INSTALL_DATA} ${WRKSRC}/scripts/tilesets/* ${DATADIR}/scripts/tilesets
+	${INSTALL_SCRIPT} ${WRKSRC}/build.sh ${DATADIR}/build.sh
+	${INSTALL_PROGRAM} ${WRKSRC}/wartool ${DATADIR}/wartool
 	${INSTALL_SCRIPT} ${WRKDIR}/wargus ${PREFIX}/bin/wargus
 
 post-build:
diff --git a/games/wargus/pkg-plist b/games/wargus/pkg-plist
index b6a299f75ae0..f8a43e1cf01e 100644
--- a/games/wargus/pkg-plist
+++ b/games/wargus/pkg-plist
@@ -1,153 +1,153 @@
 bin/wargus
-share/wargus/build.sh
-share/wargus/campaigns/human-exp/levelx01h.cm
-share/wargus/campaigns/human-exp/levelx02h.cm
-share/wargus/campaigns/human-exp/levelx03h.cm
-share/wargus/campaigns/human-exp/levelx04h.cm
-share/wargus/campaigns/human-exp/levelx05h.cm
-share/wargus/campaigns/human-exp/levelx06h.cm
-share/wargus/campaigns/human-exp/levelx07h.cm
-share/wargus/campaigns/human-exp/levelx08h.cm
-share/wargus/campaigns/human-exp/levelx09h.cm
-share/wargus/campaigns/human-exp/levelx10h.cm
-share/wargus/campaigns/human-exp/levelx11h.cm
-share/wargus/campaigns/human-exp/levelx12h.cm
-share/wargus/campaigns/human/level01h.cm
-share/wargus/campaigns/human/level02h.cm
-share/wargus/campaigns/human/level03h.cm
-share/wargus/campaigns/human/level04h.cm
-share/wargus/campaigns/human/level05h.cm
-share/wargus/campaigns/human/level06h.cm
-share/wargus/campaigns/human/level07h.cm
-share/wargus/campaigns/human/level08h.cm
-share/wargus/campaigns/human/level09h.cm
-share/wargus/campaigns/human/level10h.cm
-share/wargus/campaigns/human/level11h.cm
-share/wargus/campaigns/human/level12h.cm
-share/wargus/campaigns/human/level13h.cm
-share/wargus/campaigns/human/level14h.cm
-share/wargus/campaigns/orc-exp/levelx01o.cm
-share/wargus/campaigns/orc-exp/levelx02o.cm
-share/wargus/campaigns/orc-exp/levelx03o.cm
-share/wargus/campaigns/orc-exp/levelx04o.cm
-share/wargus/campaigns/orc-exp/levelx05o.cm
-share/wargus/campaigns/orc-exp/levelx06o.cm
-share/wargus/campaigns/orc-exp/levelx07o.cm
-share/wargus/campaigns/orc-exp/levelx08o.cm
-share/wargus/campaigns/orc-exp/levelx09o.cm
-share/wargus/campaigns/orc-exp/levelx10o.cm
-share/wargus/campaigns/orc-exp/levelx11o.cm
-share/wargus/campaigns/orc-exp/levelx12o.cm
-share/wargus/campaigns/orc/level01o.cm
-share/wargus/campaigns/orc/level02o.cm
-share/wargus/campaigns/orc/level03o.cm
-share/wargus/campaigns/orc/level04o.cm
-share/wargus/campaigns/orc/level05o.cm
-share/wargus/campaigns/orc/level06o.cm
-share/wargus/campaigns/orc/level07o.cm
-share/wargus/campaigns/orc/level08o.cm
-share/wargus/campaigns/orc/level09o.cm
-share/wargus/campaigns/orc/level10o.cm
-share/wargus/campaigns/orc/level11o.cm
-share/wargus/campaigns/orc/level12o.cm
-share/wargus/campaigns/orc/level13o.cm
-share/wargus/campaigns/orc/level14o.cm
-share/wargus/contrib/cross.png
-share/wargus/contrib/food.png
-share/wargus/contrib/health.png
-share/wargus/contrib/health2.png
-share/wargus/contrib/mana.png
-share/wargus/contrib/mana2.png
-share/wargus/contrib/ore,stone,coal.png
-share/wargus/contrib/red_cross.png
-share/wargus/contrib/score.png
-share/wargus/contrib/stratagus.png
-share/wargus/contrib/toccata.mod.gz
-share/wargus/maps/multi/(3)little-ambush.pud.gz
-share/wargus/maps/multi/(3)little-ambush.txt
-share/wargus/maps/multi/(4)4-corners.pud.gz
-share/wargus/maps/multi/(4)4-corners.txt
-share/wargus/maps/multi/(4)4-isl.pud.gz
-share/wargus/maps/multi/(4)4-isl.txt
-share/wargus/maps/multi/(4)chop-the-trees.pud.gz
-share/wargus/maps/multi/(4)chop-the-trees.txt
-share/wargus/maps/multi/(4)civ-decadente-v17.pud.gz
-share/wargus/maps/multi/(4)criss_cross.pud.gz
-share/wargus/maps/multi/(4)criss_cross2.pud.gz
-share/wargus/maps/multi/(4)criss_cross2.txt
-share/wargus/maps/multi/(4)scandinavia.pud.gz
-share/wargus/maps/multi/(4)scandinavia.txt
-share/wargus/maps/multi/(5)diablospiral.pud.gz
-share/wargus/maps/multi/(5)diablospiral.txt
-share/wargus/maps/multi/(8)altar-in-the-middle.pud.gz
-share/wargus/maps/multi/(8)altar-in-the-middle.txt
-share/wargus/maps/multi/(8)diabloarena.pud.gz
-share/wargus/maps/multi/(8)diabloarena.txt
-share/wargus/maps/multi/(8)diablodarkwood.pud.gz
-share/wargus/maps/multi/(8)diablodarkwood.txt
-share/wargus/maps/multi/(8)diablomaze.pud.gz
-share/wargus/maps/multi/(8)diablomaze.txt
-share/wargus/maps/multi/(8)fc-deathmatch-plain.pud.gz
-share/wargus/maps/multi/(8)fc-deathmatch-x.pud.gz
-share/wargus/scripts/ai.lua
-share/wargus/scripts/ai/air_attack.lua
-share/wargus/scripts/ai/campaign.lua
-share/wargus/scripts/ai/land_attack.lua
-share/wargus/scripts/ai/passive.lua
-share/wargus/scripts/ai/sea_attack.lua
-share/wargus/scripts/anim.lua
-share/wargus/scripts/buttons.lua
-share/wargus/scripts/campaigns.lua
-share/wargus/scripts/cheats.lua
-share/wargus/scripts/constructions.lua
-share/wargus/scripts/credits.lua
-share/wargus/scripts/editor.lua
-share/wargus/scripts/fonts.lua
-share/wargus/scripts/helpers.lua
-share/wargus/scripts/human/buttons.lua
-share/wargus/scripts/human/campaign1.lua
-share/wargus/scripts/human/campaign2.lua
-share/wargus/scripts/human/constructions.lua
-share/wargus/scripts/human/ui.lua
-share/wargus/scripts/human/units.lua
-share/wargus/scripts/human/upgrade.lua
-share/wargus/scripts/icons.lua
-share/wargus/scripts/keystrokes.lua
-share/wargus/scripts/menus.lua
-share/wargus/scripts/missiles.lua
-share/wargus/scripts/orc/buttons.lua
-share/wargus/scripts/orc/campaign1.lua
-share/wargus/scripts/orc/campaign2.lua
-share/wargus/scripts/orc/constructions.lua
-share/wargus/scripts/orc/ui.lua
-share/wargus/scripts/orc/units.lua
-share/wargus/scripts/orc/upgrade.lua
-share/wargus/scripts/ranks.lua
-share/wargus/scripts/sound.lua
-share/wargus/scripts/spells.lua
-share/wargus/scripts/stratagus.lua
-share/wargus/scripts/tilesets.lua
-share/wargus/scripts/tilesets/summer.lua
-share/wargus/scripts/tilesets/swamp.lua
-share/wargus/scripts/tilesets/wasteland.lua
-share/wargus/scripts/tilesets/winter.lua
-share/wargus/scripts/tips.lua
-share/wargus/scripts/ui.lua
-share/wargus/scripts/units.lua
-share/wargus/scripts/upgrade.lua
-share/wargus/scripts/wc2.lua
-share/wargus/wartool
-@dirrm share/wargus/scripts/tilesets
-@dirrm share/wargus/scripts/orc
-@dirrm share/wargus/scripts/human
-@dirrm share/wargus/scripts/ai
-@dirrm share/wargus/scripts
-@dirrm share/wargus/maps/multi
-@dirrm share/wargus/maps
-@dirrm share/wargus/contrib
-@dirrm share/wargus/campaigns/orc-exp
-@dirrm share/wargus/campaigns/orc
-@dirrm share/wargus/campaigns/human-exp
-@dirrm share/wargus/campaigns/human
-@dirrm share/wargus/campaigns
-@dirrm share/wargus
+%%DATADIR%%/build.sh
+%%DATADIR%%/campaigns/human-exp/levelx01h.cm
+%%DATADIR%%/campaigns/human-exp/levelx02h.cm
+%%DATADIR%%/campaigns/human-exp/levelx03h.cm
+%%DATADIR%%/campaigns/human-exp/levelx04h.cm
+%%DATADIR%%/campaigns/human-exp/levelx05h.cm
+%%DATADIR%%/campaigns/human-exp/levelx06h.cm
+%%DATADIR%%/campaigns/human-exp/levelx07h.cm
+%%DATADIR%%/campaigns/human-exp/levelx08h.cm
+%%DATADIR%%/campaigns/human-exp/levelx09h.cm
+%%DATADIR%%/campaigns/human-exp/levelx10h.cm
+%%DATADIR%%/campaigns/human-exp/levelx11h.cm
+%%DATADIR%%/campaigns/human-exp/levelx12h.cm
+%%DATADIR%%/campaigns/human/level01h.cm
+%%DATADIR%%/campaigns/human/level02h.cm
+%%DATADIR%%/campaigns/human/level03h.cm
+%%DATADIR%%/campaigns/human/level04h.cm
+%%DATADIR%%/campaigns/human/level05h.cm
+%%DATADIR%%/campaigns/human/level06h.cm
+%%DATADIR%%/campaigns/human/level07h.cm
+%%DATADIR%%/campaigns/human/level08h.cm
+%%DATADIR%%/campaigns/human/level09h.cm
+%%DATADIR%%/campaigns/human/level10h.cm
+%%DATADIR%%/campaigns/human/level11h.cm
+%%DATADIR%%/campaigns/human/level12h.cm
+%%DATADIR%%/campaigns/human/level13h.cm
+%%DATADIR%%/campaigns/human/level14h.cm
+%%DATADIR%%/campaigns/orc-exp/levelx01o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx02o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx03o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx04o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx05o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx06o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx07o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx08o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx09o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx10o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx11o.cm
+%%DATADIR%%/campaigns/orc-exp/levelx12o.cm
+%%DATADIR%%/campaigns/orc/level01o.cm
+%%DATADIR%%/campaigns/orc/level02o.cm
+%%DATADIR%%/campaigns/orc/level03o.cm
+%%DATADIR%%/campaigns/orc/level04o.cm
+%%DATADIR%%/campaigns/orc/level05o.cm
+%%DATADIR%%/campaigns/orc/level06o.cm
+%%DATADIR%%/campaigns/orc/level07o.cm
+%%DATADIR%%/campaigns/orc/level08o.cm
+%%DATADIR%%/campaigns/orc/level09o.cm
+%%DATADIR%%/campaigns/orc/level10o.cm
+%%DATADIR%%/campaigns/orc/level11o.cm
+%%DATADIR%%/campaigns/orc/level12o.cm
+%%DATADIR%%/campaigns/orc/level13o.cm
+%%DATADIR%%/campaigns/orc/level14o.cm
+%%DATADIR%%/contrib/cross.png
+%%DATADIR%%/contrib/food.png
+%%DATADIR%%/contrib/health.png
+%%DATADIR%%/contrib/health2.png
+%%DATADIR%%/contrib/mana.png
+%%DATADIR%%/contrib/mana2.png
+%%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%%/maps/multi/(3)little-ambush.pud.gz
+%%DATADIR%%/maps/multi/(3)little-ambush.txt
+%%DATADIR%%/maps/multi/(4)4-corners.pud.gz
+%%DATADIR%%/maps/multi/(4)4-corners.txt
+%%DATADIR%%/maps/multi/(4)4-isl.pud.gz
+%%DATADIR%%/maps/multi/(4)4-isl.txt
+%%DATADIR%%/maps/multi/(4)chop-the-trees.pud.gz
+%%DATADIR%%/maps/multi/(4)chop-the-trees.txt
+%%DATADIR%%/maps/multi/(4)civ-decadente-v17.pud.gz
+%%DATADIR%%/maps/multi/(4)criss_cross.pud.gz
+%%DATADIR%%/maps/multi/(4)criss_cross2.pud.gz
+%%DATADIR%%/maps/multi/(4)criss_cross2.txt
+%%DATADIR%%/maps/multi/(4)scandinavia.pud.gz
+%%DATADIR%%/maps/multi/(4)scandinavia.txt
+%%DATADIR%%/maps/multi/(5)diablospiral.pud.gz
+%%DATADIR%%/maps/multi/(5)diablospiral.txt
+%%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.gz
+%%DATADIR%%/maps/multi/(8)diabloarena.txt
+%%DATADIR%%/maps/multi/(8)diablodarkwood.pud.gz
+%%DATADIR%%/maps/multi/(8)diablodarkwood.txt
+%%DATADIR%%/maps/multi/(8)diablomaze.pud.gz
+%%DATADIR%%/maps/multi/(8)diablomaze.txt
+%%DATADIR%%/maps/multi/(8)fc-deathmatch-plain.pud.gz
+%%DATADIR%%/maps/multi/(8)fc-deathmatch-x.pud.gz
+%%DATADIR%%/scripts/ai.lua
+%%DATADIR%%/scripts/ai/air_attack.lua
+%%DATADIR%%/scripts/ai/campaign.lua
+%%DATADIR%%/scripts/ai/land_attack.lua
+%%DATADIR%%/scripts/ai/passive.lua
+%%DATADIR%%/scripts/ai/sea_attack.lua
+%%DATADIR%%/scripts/anim.lua
+%%DATADIR%%/scripts/buttons.lua
+%%DATADIR%%/scripts/campaigns.lua
+%%DATADIR%%/scripts/cheats.lua
+%%DATADIR%%/scripts/constructions.lua
+%%DATADIR%%/scripts/credits.lua
+%%DATADIR%%/scripts/editor.lua
+%%DATADIR%%/scripts/fonts.lua
+%%DATADIR%%/scripts/helpers.lua
+%%DATADIR%%/scripts/human/buttons.lua
+%%DATADIR%%/scripts/human/campaign1.lua
+%%DATADIR%%/scripts/human/campaign2.lua
+%%DATADIR%%/scripts/human/constructions.lua
+%%DATADIR%%/scripts/human/ui.lua
+%%DATADIR%%/scripts/human/units.lua
+%%DATADIR%%/scripts/human/upgrade.lua
+%%DATADIR%%/scripts/icons.lua
+%%DATADIR%%/scripts/keystrokes.lua
+%%DATADIR%%/scripts/menus.lua
+%%DATADIR%%/scripts/missiles.lua
+%%DATADIR%%/scripts/orc/buttons.lua
+%%DATADIR%%/scripts/orc/campaign1.lua
+%%DATADIR%%/scripts/orc/campaign2.lua
+%%DATADIR%%/scripts/orc/constructions.lua
+%%DATADIR%%/scripts/orc/ui.lua
+%%DATADIR%%/scripts/orc/units.lua
+%%DATADIR%%/scripts/orc/upgrade.lua
+%%DATADIR%%/scripts/ranks.lua
+%%DATADIR%%/scripts/sound.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
+%%DATADIR%%/scripts/wc2.lua
+%%DATADIR%%/wartool
+@dirrm %%DATADIR%%/scripts/tilesets
+@dirrm %%DATADIR%%/scripts/orc
+@dirrm %%DATADIR%%/scripts/human
+@dirrm %%DATADIR%%/scripts/ai
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/maps/multi
+@dirrm %%DATADIR%%/maps
+@dirrm %%DATADIR%%/contrib
+@dirrm %%DATADIR%%/campaigns/orc-exp
+@dirrm %%DATADIR%%/campaigns/orc
+@dirrm %%DATADIR%%/campaigns/human-exp
+@dirrm %%DATADIR%%/campaigns/human
+@dirrm %%DATADIR%%/campaigns
+@dirrm %%DATADIR%%