6 files changed, 130 insertions, 16 deletions

diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index cda953dae027..dfb7c881c26b 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	omni-bot
-PORTVERSION=	0.531
+PORTVERSION=	0.6
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
diff --git a/games/linux-enemyterritory-omni-bot-0660/distinfo b/games/linux-enemyterritory-omni-bot-0660/distinfo
index d0ad1b3d5f9d..111988692259 100644
--- a/games/linux-enemyterritory-omni-bot-0660/distinfo
+++ b/games/linux-enemyterritory-omni-bot-0660/distinfo
@@ -1,3 +1,3 @@
-MD5 (omni-bot-0.531.zip) = fce93e3ae84cf9d485b1d907f2e95ba5
-SHA256 (omni-bot-0.531.zip) = d5f9796594d40747f5de91ee280fde4ef83cc06cc8b756e1a7d7caab8f4d00dc
-SIZE (omni-bot-0.531.zip) = 3675469
+MD5 (omni-bot-0.6.zip) = 2a2e71979bcd1f1cfc4d9b188a2b2545
+SHA256 (omni-bot-0.6.zip) = 7a1f9caa72dbac1f8f8e94dbac7e1b5e4dfb95547d5c988f7a58512c76b17f55
+SIZE (omni-bot-0.6.zip) = 5215382
diff --git a/games/linux-enemyterritory-omni-bot-0660/pkg-plist b/games/linux-enemyterritory-omni-bot-0660/pkg-plist
index e5b2e6d29b86..ca42cf57ad16 100644
--- a/games/linux-enemyterritory-omni-bot-0660/pkg-plist
+++ b/games/linux-enemyterritory-omni-bot-0660/pkg-plist
@@ -1,19 +1,76 @@
 bin/et-omni-bot
 bin/etded-omni-bot
-%%DATADIR%%/omni-bot/et/nav/et_custom_wps.zip
-%%DATADIR%%/omni-bot/et/nav/et_mapscripts.zip
-%%DATADIR%%/omni-bot/et/nav/et_official_wps.zip
+%%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/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/et_weapons.ppr
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_adrenaline.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_akimbo_colt.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_akimbo_luger.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_akimbo_silenced_colt.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_akimbo_silenced_luger.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_ammopack.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_binoculars.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_carbine.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_colt.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_defaults.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_dynamite.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_fg42.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_fg42_scoped.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_flamethrower.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_garand.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_garand_scope.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_gpg40.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_grenade_allies.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_grenade_axis.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_adrenalineshare.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_landmine_bbetty.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_landmine_poisongas.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_m97shotgun.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_poisongas.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_poisonsyringe.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_k43.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_k43_scoped.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_kar98.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_knife.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_landmine.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_luger.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_m7.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_medkit.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mobile_mg42.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mobile_mg42_set.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mortar.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mortar_set.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mp40.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_panzerfaust.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_pliers.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_satchel.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_satchel_det.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_silenced_colt.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_silenced_luger.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_smoke_grenade.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_smoke_marker.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_sten.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_syringe.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_thompson.gm
 %%DATADIR%%/omni-bot/omnibot_et.pk3
 %%DATADIR%%/omni-bot/omnibot_et.so
 %%DATADIR%%/omni-bot/qagame.mp.i386.so
@@ -27,11 +84,11 @@ bin/etded-omni-bot
 %%PORTDOCS%%%%DOCSDIR%%/docs/Wegpunkte Tutorial.pdf
 %%PORTDOCS%%%%DOCSDIR%%/docs_changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/et_changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/etpub_changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/install.de.txt
 %%PORTDOCS%%%%DOCSDIR%%/install.en.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/omni-bot/et/scripts/weapons
 @dirrm %%DATADIR%%/omni-bot/et/scripts
 @dirrm %%DATADIR%%/omni-bot/et/nav
 @dirrm %%DATADIR%%/omni-bot/et
diff --git a/games/linux-enemyterritory-omni-bot/Makefile b/games/linux-enemyterritory-omni-bot/Makefile
index cda953dae027..dfb7c881c26b 100644
--- a/games/linux-enemyterritory-omni-bot/Makefile
+++ b/games/linux-enemyterritory-omni-bot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	omni-bot
-PORTVERSION=	0.531
+PORTVERSION=	0.6
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
diff --git a/games/linux-enemyterritory-omni-bot/distinfo b/games/linux-enemyterritory-omni-bot/distinfo
index d0ad1b3d5f9d..111988692259 100644
--- a/games/linux-enemyterritory-omni-bot/distinfo
+++ b/games/linux-enemyterritory-omni-bot/distinfo
@@ -1,3 +1,3 @@
-MD5 (omni-bot-0.531.zip) = fce93e3ae84cf9d485b1d907f2e95ba5
-SHA256 (omni-bot-0.531.zip) = d5f9796594d40747f5de91ee280fde4ef83cc06cc8b756e1a7d7caab8f4d00dc
-SIZE (omni-bot-0.531.zip) = 3675469
+MD5 (omni-bot-0.6.zip) = 2a2e71979bcd1f1cfc4d9b188a2b2545
+SHA256 (omni-bot-0.6.zip) = 7a1f9caa72dbac1f8f8e94dbac7e1b5e4dfb95547d5c988f7a58512c76b17f55
+SIZE (omni-bot-0.6.zip) = 5215382
diff --git a/games/linux-enemyterritory-omni-bot/pkg-plist b/games/linux-enemyterritory-omni-bot/pkg-plist
index e5b2e6d29b86..ca42cf57ad16 100644
--- a/games/linux-enemyterritory-omni-bot/pkg-plist
+++ b/games/linux-enemyterritory-omni-bot/pkg-plist
@@ -1,19 +1,76 @@
 bin/et-omni-bot
 bin/etded-omni-bot
-%%DATADIR%%/omni-bot/et/nav/et_custom_wps.zip
-%%DATADIR%%/omni-bot/et/nav/et_mapscripts.zip
-%%DATADIR%%/omni-bot/et/nav/et_official_wps.zip
+%%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/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/et_weapons.ppr
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_adrenaline.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_akimbo_colt.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_akimbo_luger.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_akimbo_silenced_colt.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_akimbo_silenced_luger.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_ammopack.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_binoculars.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_carbine.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_colt.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_defaults.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_dynamite.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_fg42.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_fg42_scoped.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_flamethrower.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_garand.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_garand_scope.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_gpg40.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_grenade_allies.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_grenade_axis.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_adrenalineshare.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_landmine_bbetty.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_landmine_poisongas.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_m97shotgun.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_poisongas.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_jaymod_poisonsyringe.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_k43.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_k43_scoped.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_kar98.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_knife.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_landmine.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_luger.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_m7.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_medkit.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mobile_mg42.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mobile_mg42_set.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mortar.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mortar_set.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_mp40.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_panzerfaust.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_pliers.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_satchel.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_satchel_det.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_silenced_colt.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_silenced_luger.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_smoke_grenade.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_smoke_marker.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_sten.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_syringe.gm
+%%DATADIR%%/omni-bot/et/scripts/weapons/weapon_thompson.gm
 %%DATADIR%%/omni-bot/omnibot_et.pk3
 %%DATADIR%%/omni-bot/omnibot_et.so
 %%DATADIR%%/omni-bot/qagame.mp.i386.so
@@ -27,11 +84,11 @@ bin/etded-omni-bot
 %%PORTDOCS%%%%DOCSDIR%%/docs/Wegpunkte Tutorial.pdf
 %%PORTDOCS%%%%DOCSDIR%%/docs_changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/et_changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/etpub_changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/install.de.txt
 %%PORTDOCS%%%%DOCSDIR%%/install.en.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/omni-bot/et/scripts/weapons
 @dirrm %%DATADIR%%/omni-bot/et/scripts
 @dirrm %%DATADIR%%/omni-bot/et/nav
 @dirrm %%DATADIR%%/omni-bot/et