4 files changed, 102 insertions, 108 deletions

diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index d0e3b147a04c..2299b2f33cd5 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -21,13 +21,13 @@ USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
-DATADIR=	${PREFIX}/lib/enemyterritory
+DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}
 
 do-build:
 .for f in et etded
-	@(${ECHO} "#!/bin/sh"; \
-	${ECHO} 'exec ${PREFIX}/bin/${f} +set fs_game ${PORTNAME} +set omnibot_path "${DATADIR}/omni-bot" "$$@"') > \
+	@(${ECHO_CMD} "#!/bin/sh"; \
+	${ECHO_CMD} 'exec ${PREFIX}/bin/${f} +set fs_game ${PORTNAME} +set omnibot_path "${DATADIR}/omni-bot" "$$@"') > \
 		${WRKSRC}/${f}-${PORTNAME}
 .endfor
 
@@ -35,14 +35,11 @@ do-install:
 .for f in et etded
 	${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME} ${PREFIX}/bin
 .endfor
-	${MKDIR} ${DATADIR}/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/omni-bot/omnibot_et.so \
-		${DATADIR}/${PORTNAME}
-	cd ${WRKSRC}/omni-bot && ${CP} -R et global_scripts \
-		${DATADIR}/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/omnibot/qagame.mp.i386.so \
-		${DATADIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/omnibot/omnibot_et.pk3 ${DATADIR}/${PORTNAME}
+	${MKDIR} ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/omni-bot/omnibot_et.so ${DATADIR}
+	cd ${WRKSRC}/omni-bot && ${CP} -R et global_scripts ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/omnibot/qagame.mp.i386.so ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/omnibot/omnibot_et.pk3 ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .   for f in *.txt omni-bot/*.txt
diff --git a/games/linux-enemyterritory-omni-bot-0660/pkg-plist b/games/linux-enemyterritory-omni-bot-0660/pkg-plist
index e57004bd09bc..90bfe387a19d 100644
--- a/games/linux-enemyterritory-omni-bot-0660/pkg-plist
+++ b/games/linux-enemyterritory-omni-bot-0660/pkg-plist
@@ -1,51 +1,51 @@
 bin/et-omni-bot
 bin/etded-omni-bot
-%%DATADIR%%/omni-bot/et/nav/et_custom.zip
-%%DATADIR%%/omni-bot/et/nav/et_official.zip
-%%DATADIR%%/omni-bot/et/scripts/ammo_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/def_bot.gm
-%%DATADIR%%/omni-bot/et/scripts/difficulty.gm
-%%DATADIR%%/omni-bot/et/scripts/disguise_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/dispenseammo_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/dispensehealth_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/escortvehicle_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/et_autoexec.gm
-%%DATADIR%%/omni-bot/et/scripts/et_commands.gm
-%%DATADIR%%/omni-bot/et/scripts/et_navconfig.gm
-%%DATADIR%%/omni-bot/et/scripts/et_utilities.gm
-%%DATADIR%%/omni-bot/et/scripts/health_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/makemapgm.gm
-%%DATADIR%%/omni-bot/et/scripts/mountvehicle_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/poisoned.gm
-%%DATADIR%%/omni-bot/et/scripts/ridevehicle_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/sample.gm
-%%DATADIR%%/omni-bot/et/scripts/testbot.gm
-%%DATADIR%%/omni-bot/et/scripts/testmap.gm
-%%DATADIR%%/omni-bot/et/scripts/useswitch_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/weapons/weapons.zip
-%%DATADIR%%/omni-bot/global_scripts/commands.gm
-%%DATADIR%%/omni-bot/global_scripts/config.gm
-%%DATADIR%%/omni-bot/global_scripts/testdebugger.gm
-%%DATADIR%%/omni-bot/global_scripts/testdebugwindows.gm
-%%DATADIR%%/omni-bot/global_scripts/testfilesystem.gm
-%%DATADIR%%/omni-bot/global_scripts/testmath.gm
-%%DATADIR%%/omni-bot/global_scripts/testmisc.gm
-%%DATADIR%%/omni-bot/global_scripts/testrequire.gm
-%%DATADIR%%/omni-bot/global_scripts/utilities.gm
-%%DATADIR%%/omni-bot/global_scripts/weapons/weapon_sample.gm
-%%DATADIR%%/omni-bot/omnibot_et.pk3
-%%DATADIR%%/omni-bot/omnibot_et.so
-%%DATADIR%%/omni-bot/qagame.mp.i386.so
+%%DATADIR%%/et/nav/et_custom.zip
+%%DATADIR%%/et/nav/et_official.zip
+%%DATADIR%%/et/scripts/ammo_goal.gm
+%%DATADIR%%/et/scripts/def_bot.gm
+%%DATADIR%%/et/scripts/difficulty.gm
+%%DATADIR%%/et/scripts/disguise_goal.gm
+%%DATADIR%%/et/scripts/dispenseammo_goal.gm
+%%DATADIR%%/et/scripts/dispensehealth_goal.gm
+%%DATADIR%%/et/scripts/escortvehicle_goal.gm
+%%DATADIR%%/et/scripts/et_autoexec.gm
+%%DATADIR%%/et/scripts/et_commands.gm
+%%DATADIR%%/et/scripts/et_navconfig.gm
+%%DATADIR%%/et/scripts/et_utilities.gm
+%%DATADIR%%/et/scripts/health_goal.gm
+%%DATADIR%%/et/scripts/makemapgm.gm
+%%DATADIR%%/et/scripts/mountvehicle_goal.gm
+%%DATADIR%%/et/scripts/poisoned.gm
+%%DATADIR%%/et/scripts/ridevehicle_goal.gm
+%%DATADIR%%/et/scripts/sample.gm
+%%DATADIR%%/et/scripts/testbot.gm
+%%DATADIR%%/et/scripts/testmap.gm
+%%DATADIR%%/et/scripts/useswitch_goal.gm
+%%DATADIR%%/et/scripts/weapons/weapons.zip
+%%DATADIR%%/global_scripts/commands.gm
+%%DATADIR%%/global_scripts/config.gm
+%%DATADIR%%/global_scripts/testdebugger.gm
+%%DATADIR%%/global_scripts/testdebugwindows.gm
+%%DATADIR%%/global_scripts/testfilesystem.gm
+%%DATADIR%%/global_scripts/testmath.gm
+%%DATADIR%%/global_scripts/testmisc.gm
+%%DATADIR%%/global_scripts/testrequire.gm
+%%DATADIR%%/global_scripts/utilities.gm
+%%DATADIR%%/global_scripts/weapons/weapon_sample.gm
+%%DATADIR%%/omnibot_et.pk3
+%%DATADIR%%/omnibot_et.so
+%%DATADIR%%/qagame.mp.i386.so
 %%PORTDOCS%%%%DOCSDIR%%/credits.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/Omni-bot Wiki.pdf
 %%PORTDOCS%%%%DOCSDIR%%/install.de.txt
 %%PORTDOCS%%%%DOCSDIR%%/install.en.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/omni-bot/global_scripts/weapons
-@dirrm %%DATADIR%%/omni-bot/global_scripts
-@dirrm %%DATADIR%%/omni-bot/et/scripts/weapons
-@dirrm %%DATADIR%%/omni-bot/et/scripts
-@dirrm %%DATADIR%%/omni-bot/et/nav
-@dirrm %%DATADIR%%/omni-bot/et
-@dirrm %%DATADIR%%/omni-bot
+@dirrm %%DATADIR%%/global_scripts/weapons
+@dirrm %%DATADIR%%/global_scripts
+@dirrm %%DATADIR%%/et/scripts/weapons
+@dirrm %%DATADIR%%/et/scripts
+@dirrm %%DATADIR%%/et/nav
+@dirrm %%DATADIR%%/et
+@dirrm %%DATADIR%%
diff --git a/games/linux-enemyterritory-omni-bot/Makefile b/games/linux-enemyterritory-omni-bot/Makefile
index d0e3b147a04c..2299b2f33cd5 100644
--- a/games/linux-enemyterritory-omni-bot/Makefile
+++ b/games/linux-enemyterritory-omni-bot/Makefile
@@ -21,13 +21,13 @@ USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
-DATADIR=	${PREFIX}/lib/enemyterritory
+DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}
 
 do-build:
 .for f in et etded
-	@(${ECHO} "#!/bin/sh"; \
-	${ECHO} 'exec ${PREFIX}/bin/${f} +set fs_game ${PORTNAME} +set omnibot_path "${DATADIR}/omni-bot" "$$@"') > \
+	@(${ECHO_CMD} "#!/bin/sh"; \
+	${ECHO_CMD} 'exec ${PREFIX}/bin/${f} +set fs_game ${PORTNAME} +set omnibot_path "${DATADIR}/omni-bot" "$$@"') > \
 		${WRKSRC}/${f}-${PORTNAME}
 .endfor
 
@@ -35,14 +35,11 @@ do-install:
 .for f in et etded
 	${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME} ${PREFIX}/bin
 .endfor
-	${MKDIR} ${DATADIR}/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/omni-bot/omnibot_et.so \
-		${DATADIR}/${PORTNAME}
-	cd ${WRKSRC}/omni-bot && ${CP} -R et global_scripts \
-		${DATADIR}/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/omnibot/qagame.mp.i386.so \
-		${DATADIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/omnibot/omnibot_et.pk3 ${DATADIR}/${PORTNAME}
+	${MKDIR} ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/omni-bot/omnibot_et.so ${DATADIR}
+	cd ${WRKSRC}/omni-bot && ${CP} -R et global_scripts ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/omnibot/qagame.mp.i386.so ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/omnibot/omnibot_et.pk3 ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .   for f in *.txt omni-bot/*.txt
diff --git a/games/linux-enemyterritory-omni-bot/pkg-plist b/games/linux-enemyterritory-omni-bot/pkg-plist
index e57004bd09bc..90bfe387a19d 100644
--- a/games/linux-enemyterritory-omni-bot/pkg-plist
+++ b/games/linux-enemyterritory-omni-bot/pkg-plist
@@ -1,51 +1,51 @@
 bin/et-omni-bot
 bin/etded-omni-bot
-%%DATADIR%%/omni-bot/et/nav/et_custom.zip
-%%DATADIR%%/omni-bot/et/nav/et_official.zip
-%%DATADIR%%/omni-bot/et/scripts/ammo_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/def_bot.gm
-%%DATADIR%%/omni-bot/et/scripts/difficulty.gm
-%%DATADIR%%/omni-bot/et/scripts/disguise_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/dispenseammo_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/dispensehealth_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/escortvehicle_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/et_autoexec.gm
-%%DATADIR%%/omni-bot/et/scripts/et_commands.gm
-%%DATADIR%%/omni-bot/et/scripts/et_navconfig.gm
-%%DATADIR%%/omni-bot/et/scripts/et_utilities.gm
-%%DATADIR%%/omni-bot/et/scripts/health_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/makemapgm.gm
-%%DATADIR%%/omni-bot/et/scripts/mountvehicle_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/poisoned.gm
-%%DATADIR%%/omni-bot/et/scripts/ridevehicle_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/sample.gm
-%%DATADIR%%/omni-bot/et/scripts/testbot.gm
-%%DATADIR%%/omni-bot/et/scripts/testmap.gm
-%%DATADIR%%/omni-bot/et/scripts/useswitch_goal.gm
-%%DATADIR%%/omni-bot/et/scripts/weapons/weapons.zip
-%%DATADIR%%/omni-bot/global_scripts/commands.gm
-%%DATADIR%%/omni-bot/global_scripts/config.gm
-%%DATADIR%%/omni-bot/global_scripts/testdebugger.gm
-%%DATADIR%%/omni-bot/global_scripts/testdebugwindows.gm
-%%DATADIR%%/omni-bot/global_scripts/testfilesystem.gm
-%%DATADIR%%/omni-bot/global_scripts/testmath.gm
-%%DATADIR%%/omni-bot/global_scripts/testmisc.gm
-%%DATADIR%%/omni-bot/global_scripts/testrequire.gm
-%%DATADIR%%/omni-bot/global_scripts/utilities.gm
-%%DATADIR%%/omni-bot/global_scripts/weapons/weapon_sample.gm
-%%DATADIR%%/omni-bot/omnibot_et.pk3
-%%DATADIR%%/omni-bot/omnibot_et.so
-%%DATADIR%%/omni-bot/qagame.mp.i386.so
+%%DATADIR%%/et/nav/et_custom.zip
+%%DATADIR%%/et/nav/et_official.zip
+%%DATADIR%%/et/scripts/ammo_goal.gm
+%%DATADIR%%/et/scripts/def_bot.gm
+%%DATADIR%%/et/scripts/difficulty.gm
+%%DATADIR%%/et/scripts/disguise_goal.gm
+%%DATADIR%%/et/scripts/dispenseammo_goal.gm
+%%DATADIR%%/et/scripts/dispensehealth_goal.gm
+%%DATADIR%%/et/scripts/escortvehicle_goal.gm
+%%DATADIR%%/et/scripts/et_autoexec.gm
+%%DATADIR%%/et/scripts/et_commands.gm
+%%DATADIR%%/et/scripts/et_navconfig.gm
+%%DATADIR%%/et/scripts/et_utilities.gm
+%%DATADIR%%/et/scripts/health_goal.gm
+%%DATADIR%%/et/scripts/makemapgm.gm
+%%DATADIR%%/et/scripts/mountvehicle_goal.gm
+%%DATADIR%%/et/scripts/poisoned.gm
+%%DATADIR%%/et/scripts/ridevehicle_goal.gm
+%%DATADIR%%/et/scripts/sample.gm
+%%DATADIR%%/et/scripts/testbot.gm
+%%DATADIR%%/et/scripts/testmap.gm
+%%DATADIR%%/et/scripts/useswitch_goal.gm
+%%DATADIR%%/et/scripts/weapons/weapons.zip
+%%DATADIR%%/global_scripts/commands.gm
+%%DATADIR%%/global_scripts/config.gm
+%%DATADIR%%/global_scripts/testdebugger.gm
+%%DATADIR%%/global_scripts/testdebugwindows.gm
+%%DATADIR%%/global_scripts/testfilesystem.gm
+%%DATADIR%%/global_scripts/testmath.gm
+%%DATADIR%%/global_scripts/testmisc.gm
+%%DATADIR%%/global_scripts/testrequire.gm
+%%DATADIR%%/global_scripts/utilities.gm
+%%DATADIR%%/global_scripts/weapons/weapon_sample.gm
+%%DATADIR%%/omnibot_et.pk3
+%%DATADIR%%/omnibot_et.so
+%%DATADIR%%/qagame.mp.i386.so
 %%PORTDOCS%%%%DOCSDIR%%/credits.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/Omni-bot Wiki.pdf
 %%PORTDOCS%%%%DOCSDIR%%/install.de.txt
 %%PORTDOCS%%%%DOCSDIR%%/install.en.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/omni-bot/global_scripts/weapons
-@dirrm %%DATADIR%%/omni-bot/global_scripts
-@dirrm %%DATADIR%%/omni-bot/et/scripts/weapons
-@dirrm %%DATADIR%%/omni-bot/et/scripts
-@dirrm %%DATADIR%%/omni-bot/et/nav
-@dirrm %%DATADIR%%/omni-bot/et
-@dirrm %%DATADIR%%/omni-bot
+@dirrm %%DATADIR%%/global_scripts/weapons
+@dirrm %%DATADIR%%/global_scripts
+@dirrm %%DATADIR%%/et/scripts/weapons
+@dirrm %%DATADIR%%/et/scripts
+@dirrm %%DATADIR%%/et/nav
+@dirrm %%DATADIR%%/et
+@dirrm %%DATADIR%%