- Integrate games/warsow with games/warsow-data

- Fixes some problems with games/linux-warsow and games/warsow-data, now
  we can install games/warsow and games/linux-warsow at the same place.

Submitted by:	me
Approved by:	maintainer timeout (16 days), garga (mentor)

4 files changed, 117 insertions, 117 deletions

diff --git a/games/warsow-data/Makefile b/games/warsow-data/Makefile
index 67e68b283edc..f877999569c3 100644
--- a/games/warsow-data/Makefile
+++ b/games/warsow-data/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	data
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://ftp.club-internet.fr/pub/games/nofrag/warsow/
 MASTER_SITES=	http://ftp.club-internet.fr/pub/games/nofrag/warsow/ \
@@ -36,11 +37,11 @@ post-extract:
 	${RM} -R ${WRKSRC}/basewsw/screenshots ${WRKSRC}/basewsw/demos
 
 do-install:
-	@${MKDIR} ${DATADIR}/basewsw
+	@${MKDIR} ${DATADIR}
 	@cd ${WRKSRC}/basewsw && \
-		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/basewsw/{}" \; && \
+		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
 			${FIND} -E * -type f -iregex ".*\.(pk3|cfg|hud)" \
-				-exec ${INSTALL_DATA} "{}" "${DATADIR}/basewsw/{}" \;
+				-exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .	for FILE in Shader* bots_navigation.txt changelog.txt contact.txt dedicated* demoavi.txt \
diff --git a/games/warsow-data/pkg-deinstall b/games/warsow-data/pkg-deinstall
index e5681b6e459d..c5cdbfc55479 100644
--- a/games/warsow-data/pkg-deinstall
+++ b/games/warsow-data/pkg-deinstall
@@ -2,7 +2,7 @@
 
 case $2 in
 	DEINSTALL)
-		config_file=$PKG_PREFIX/share/warsow/basewsw/config.cfg
+		config_file=$PKG_PREFIX/share/warsow/config.cfg
 
 		if [ -e $config_file ] && ! [ -s $config_file ]; then
 			rm -f $config_file
@@ -10,7 +10,6 @@ case $2 in
 		;;
 
 	POST-DEINSTALL)
-		rmdir $PKG_PREFIX/share/warsow/basewsw 2>/dev/null || true
 		rmdir $PKG_PREFIX/share/warsow 2>/dev/null || true
 		;;
 esac
diff --git a/games/warsow-data/pkg-install b/games/warsow-data/pkg-install
index fd65a71818bb..c89ef0627920 100644
--- a/games/warsow-data/pkg-install
+++ b/games/warsow-data/pkg-install
@@ -2,7 +2,7 @@
 
 [ "$2" != "POST-INSTALL" ] && exit 0
 
-config_file=$PKG_PREFIX/share/warsow/basewsw/config.cfg
+config_file=$PKG_PREFIX/share/warsow/config.cfg
 
 if ! [ -e $config_file ]; then
 	touch $config_file
diff --git a/games/warsow-data/pkg-plist b/games/warsow-data/pkg-plist
index f6ff821cf2f6..3329abc84467 100644
--- a/games/warsow-data/pkg-plist
+++ b/games/warsow-data/pkg-plist
@@ -1,108 +1,108 @@
-%%DATADIR%%/basewsw/cfgs/Medar.cfg
-%%DATADIR%%/basewsw/cfgs/pb.cfg
-%%DATADIR%%/basewsw/cfgs/nip.cfg
-%%DATADIR%%/basewsw/cfgs/jal.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_ffa.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_ctf.cfg
-%%DATADIR%%/basewsw/cfgs/ekse.cfg
-%%DATADIR%%/basewsw/cfgs/ETR.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_tdm_ctf.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_allaround.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_duel_quad.cfg
-%%DATADIR%%/basewsw/cfgs/chas.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_tdm.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_duel.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_quad.cfg
-%%DATADIR%%/basewsw/huds/inc/nip/speed_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/nip/health_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/nip/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/nip/selected_weapon.hud
-%%DATADIR%%/basewsw/huds/inc/nip/pointing_middle.hud
-%%DATADIR%%/basewsw/huds/inc/nip/selected_item.hud
-%%DATADIR%%/basewsw/huds/inc/nip/race_timer.hud
-%%DATADIR%%/basewsw/huds/inc/nip/armor_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/nip/fps_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/nip/frag_counter.hud
-%%DATADIR%%/basewsw/huds/inc/nip/powerup_item.hud
-%%DATADIR%%/basewsw/huds/inc/nip/picked_up_item.hud
-%%DATADIR%%/basewsw/huds/inc/nip/clock_right_mid.hud
-%%DATADIR%%/basewsw/huds/inc/nip/ammo.hud
-%%DATADIR%%/basewsw/huds/inc/nip/help_message_center.hud
-%%DATADIR%%/basewsw/huds/inc/nip/weaponlist_up.hud
-%%DATADIR%%/basewsw/huds/inc/nip/crosshair.hud
-%%DATADIR%%/basewsw/huds/inc/nip/chasing_top.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/speed_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/health_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/clock_right_mid.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/armor_bar.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/selected_item.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/chasing_left.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/armor_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/health_bar.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/weaponlist_down.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/crosshair.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/fps_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/1oooK/frag_counter.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/health_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/picked_up_item.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/speed_mid_mid.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/clock_mid_big.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/pointing_middle.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/chasing_left.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/armor_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/weaponlist_down.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/fps_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/crosshair.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/frag_counter.hud
-%%DATADIR%%/basewsw/huds/inc/ETR/scores.hud
-%%DATADIR%%/basewsw/huds/inc/health_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/selected_weapon.hud
-%%DATADIR%%/basewsw/huds/inc/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/pointing_middle.hud
-%%DATADIR%%/basewsw/huds/inc/health_pic_bar2.hud
-%%DATADIR%%/basewsw/huds/inc/selected_item.hud
-%%DATADIR%%/basewsw/huds/inc/net.hud
-%%DATADIR%%/basewsw/huds/inc/race_timer.hud
-%%DATADIR%%/basewsw/huds/inc/clock_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/armor_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/weaponlist_down.hud
-%%DATADIR%%/basewsw/huds/inc/fps_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/powerup_item.hud
-%%DATADIR%%/basewsw/huds/inc/speed_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/picked_up_item.hud
-%%DATADIR%%/basewsw/huds/inc/clock_right_mid.hud
-%%DATADIR%%/basewsw/huds/inc/armor_pic_bar2.hud
-%%DATADIR%%/basewsw/huds/inc/weaponlist_right.hud
-%%DATADIR%%/basewsw/huds/inc/health_pic_bar.hud
-%%DATADIR%%/basewsw/huds/inc/armor_pic_bar.hud
-%%DATADIR%%/basewsw/huds/inc/chasing_left.hud
-%%DATADIR%%/basewsw/huds/inc/ammo.hud
-%%DATADIR%%/basewsw/huds/inc/crosshair.hud
-%%DATADIR%%/basewsw/huds/inc/help_message_center.hud
-%%DATADIR%%/basewsw/huds/inc/scores.hud
-%%DATADIR%%/basewsw/huds/inc/weaponlist_left.hud
-%%DATADIR%%/basewsw/huds/default.hud
-%%DATADIR%%/basewsw/huds/nip.hud
-%%DATADIR%%/basewsw/huds/1oooK.hud
-%%DATADIR%%/basewsw/huds/hud_left.hud
-%%DATADIR%%/basewsw/huds/ETR.hud
-%%DATADIR%%/basewsw/huds/hud_right.hud
-%%DATADIR%%/basewsw/data0.pk3
-%%DATADIR%%/basewsw/data0fix1.pk3
-%%DATADIR%%/basewsw/data0fix2.pk3
-%%DATADIR%%/basewsw/dedicated_autoexec.cfg
-%%DATADIR%%/basewsw/map_wctf1.pk3
-%%DATADIR%%/basewsw/map_wdm1.pk3
-%%DATADIR%%/basewsw/map_wdm2.pk3
-%%DATADIR%%/basewsw/map_wdm5.pk3
-%%DATADIR%%/basewsw/map_wmid1.pk3
-%%DATADIR%%/basewsw/map_wmid2.pk3
-%%DATADIR%%/basewsw/map_wmid3.pk3
-%%DATADIR%%/basewsw/map_wtest1.pk3
-%%DATADIR%%/basewsw/map_wtest3.pk3
-%%DATADIR%%/basewsw/map_wtest4.pk3
+%%DATADIR%%/cfgs/Medar.cfg
+%%DATADIR%%/cfgs/pb.cfg
+%%DATADIR%%/cfgs/nip.cfg
+%%DATADIR%%/cfgs/jal.cfg
+%%DATADIR%%/cfgs/dedicated_ffa.cfg
+%%DATADIR%%/cfgs/dedicated_ctf.cfg
+%%DATADIR%%/cfgs/ekse.cfg
+%%DATADIR%%/cfgs/ETR.cfg
+%%DATADIR%%/cfgs/dedicated_tdm_ctf.cfg
+%%DATADIR%%/cfgs/dedicated_allaround.cfg
+%%DATADIR%%/cfgs/dedicated_duel_quad.cfg
+%%DATADIR%%/cfgs/chas.cfg
+%%DATADIR%%/cfgs/dedicated_tdm.cfg
+%%DATADIR%%/cfgs/dedicated_duel.cfg
+%%DATADIR%%/cfgs/dedicated_quad.cfg
+%%DATADIR%%/huds/inc/nip/speed_right_small.hud
+%%DATADIR%%/huds/inc/nip/health_numbers.hud
+%%DATADIR%%/huds/inc/nip/team_info.hud
+%%DATADIR%%/huds/inc/nip/selected_weapon.hud
+%%DATADIR%%/huds/inc/nip/pointing_middle.hud
+%%DATADIR%%/huds/inc/nip/selected_item.hud
+%%DATADIR%%/huds/inc/nip/race_timer.hud
+%%DATADIR%%/huds/inc/nip/armor_numbers.hud
+%%DATADIR%%/huds/inc/nip/fps_right_small.hud
+%%DATADIR%%/huds/inc/nip/frag_counter.hud
+%%DATADIR%%/huds/inc/nip/powerup_item.hud
+%%DATADIR%%/huds/inc/nip/picked_up_item.hud
+%%DATADIR%%/huds/inc/nip/clock_right_mid.hud
+%%DATADIR%%/huds/inc/nip/ammo.hud
+%%DATADIR%%/huds/inc/nip/help_message_center.hud
+%%DATADIR%%/huds/inc/nip/weaponlist_up.hud
+%%DATADIR%%/huds/inc/nip/crosshair.hud
+%%DATADIR%%/huds/inc/nip/chasing_top.hud
+%%DATADIR%%/huds/inc/1oooK/speed_right_small.hud
+%%DATADIR%%/huds/inc/1oooK/health_numbers.hud
+%%DATADIR%%/huds/inc/1oooK/clock_right_mid.hud
+%%DATADIR%%/huds/inc/1oooK/team_info.hud
+%%DATADIR%%/huds/inc/1oooK/armor_bar.hud
+%%DATADIR%%/huds/inc/1oooK/selected_item.hud
+%%DATADIR%%/huds/inc/1oooK/chasing_left.hud
+%%DATADIR%%/huds/inc/1oooK/armor_numbers.hud
+%%DATADIR%%/huds/inc/1oooK/health_bar.hud
+%%DATADIR%%/huds/inc/1oooK/weaponlist_down.hud
+%%DATADIR%%/huds/inc/1oooK/crosshair.hud
+%%DATADIR%%/huds/inc/1oooK/fps_right_small.hud
+%%DATADIR%%/huds/inc/1oooK/frag_counter.hud
+%%DATADIR%%/huds/inc/ETR/health_numbers.hud
+%%DATADIR%%/huds/inc/ETR/picked_up_item.hud
+%%DATADIR%%/huds/inc/ETR/team_info.hud
+%%DATADIR%%/huds/inc/ETR/speed_mid_mid.hud
+%%DATADIR%%/huds/inc/ETR/clock_mid_big.hud
+%%DATADIR%%/huds/inc/ETR/pointing_middle.hud
+%%DATADIR%%/huds/inc/ETR/chasing_left.hud
+%%DATADIR%%/huds/inc/ETR/armor_numbers.hud
+%%DATADIR%%/huds/inc/ETR/weaponlist_down.hud
+%%DATADIR%%/huds/inc/ETR/fps_right_small.hud
+%%DATADIR%%/huds/inc/ETR/crosshair.hud
+%%DATADIR%%/huds/inc/ETR/frag_counter.hud
+%%DATADIR%%/huds/inc/ETR/scores.hud
+%%DATADIR%%/huds/inc/health_numbers.hud
+%%DATADIR%%/huds/inc/selected_weapon.hud
+%%DATADIR%%/huds/inc/team_info.hud
+%%DATADIR%%/huds/inc/pointing_middle.hud
+%%DATADIR%%/huds/inc/health_pic_bar2.hud
+%%DATADIR%%/huds/inc/selected_item.hud
+%%DATADIR%%/huds/inc/net.hud
+%%DATADIR%%/huds/inc/race_timer.hud
+%%DATADIR%%/huds/inc/clock_right_small.hud
+%%DATADIR%%/huds/inc/armor_numbers.hud
+%%DATADIR%%/huds/inc/weaponlist_down.hud
+%%DATADIR%%/huds/inc/fps_right_small.hud
+%%DATADIR%%/huds/inc/powerup_item.hud
+%%DATADIR%%/huds/inc/speed_right_small.hud
+%%DATADIR%%/huds/inc/picked_up_item.hud
+%%DATADIR%%/huds/inc/clock_right_mid.hud
+%%DATADIR%%/huds/inc/armor_pic_bar2.hud
+%%DATADIR%%/huds/inc/weaponlist_right.hud
+%%DATADIR%%/huds/inc/health_pic_bar.hud
+%%DATADIR%%/huds/inc/armor_pic_bar.hud
+%%DATADIR%%/huds/inc/chasing_left.hud
+%%DATADIR%%/huds/inc/ammo.hud
+%%DATADIR%%/huds/inc/crosshair.hud
+%%DATADIR%%/huds/inc/help_message_center.hud
+%%DATADIR%%/huds/inc/scores.hud
+%%DATADIR%%/huds/inc/weaponlist_left.hud
+%%DATADIR%%/huds/default.hud
+%%DATADIR%%/huds/nip.hud
+%%DATADIR%%/huds/1oooK.hud
+%%DATADIR%%/huds/hud_left.hud
+%%DATADIR%%/huds/ETR.hud
+%%DATADIR%%/huds/hud_right.hud
+%%DATADIR%%/data0.pk3
+%%DATADIR%%/data0fix1.pk3
+%%DATADIR%%/data0fix2.pk3
+%%DATADIR%%/dedicated_autoexec.cfg
+%%DATADIR%%/map_wctf1.pk3
+%%DATADIR%%/map_wdm1.pk3
+%%DATADIR%%/map_wdm2.pk3
+%%DATADIR%%/map_wdm5.pk3
+%%DATADIR%%/map_wmid1.pk3
+%%DATADIR%%/map_wmid2.pk3
+%%DATADIR%%/map_wmid3.pk3
+%%DATADIR%%/map_wtest1.pk3
+%%DATADIR%%/map_wtest3.pk3
+%%DATADIR%%/map_wtest4.pk3
 %%PORTDOCS%%%%DOCSDIR%%/Shader_Manual.rtf
 %%PORTDOCS%%%%DOCSDIR%%/bots_navigation.txt
 %%PORTDOCS%%%%DOCSDIR%%/contact.txt
@@ -113,10 +113,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/linux_sound_sdl.txt
 %%PORTDOCS%%%%DOCSDIR%%/new_features.txt
 %%PORTDOCS%%%%DOCSDIR%%/query_protocols.txt
-@dirrm %%DATADIR%%/basewsw/huds/inc/nip
-@dirrm %%DATADIR%%/basewsw/huds/inc/ETR
-@dirrm %%DATADIR%%/basewsw/huds/inc/1oooK
-@dirrm %%DATADIR%%/basewsw/huds/inc
-@dirrm %%DATADIR%%/basewsw/huds
-@dirrm %%DATADIR%%/basewsw/cfgs
+@dirrm %%DATADIR%%/huds/inc/nip
+@dirrm %%DATADIR%%/huds/inc/ETR
+@dirrm %%DATADIR%%/huds/inc/1oooK
+@dirrm %%DATADIR%%/huds/inc
+@dirrm %%DATADIR%%/huds
+@dirrm %%DATADIR%%/cfgs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%