- 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)

10 files changed, 359 insertions, 317 deletions

diff --git a/games/linux-warsow/Makefile b/games/linux-warsow/Makefile
index 69035ed2398f..97898b514d98 100644
--- a/games/linux-warsow/Makefile
+++ b/games/linux-warsow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	warsow
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://ftp.club-internet.fr/pub/games/nofrag/warsow/ \
@@ -26,7 +26,7 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free multiplayer first person shooter with cartoon design
 
 RUN_DEPENDS=	${LINUXBASE}/lib/libssl.so.5:${PORTSDIR}/security/linux-openssl \
-		${DATADIR}/basewsw/data0.pk3:${PORTSDIR}/games/warsow-data
+		${DATADIR}/data0.pk3:${PORTSDIR}/games/warsow-data
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
@@ -100,14 +100,13 @@ PLIST_SUB+=	SERVER="@comment "
 .endif
 
 do-install:
-	${MKDIR} ${DATADIR}/basewsw
-	${INSTALL_DATA} ${WRKSRC}/basewsw/*.so ${DATADIR}/basewsw
-	${MKDIR} ${WARSOW_DIR}
+	${MKDIR} ${WARSOW_DIR}/basewsw
+	${INSTALL_DATA} ${WRKSRC}/basewsw/*.so ${WARSOW_DIR}/basewsw
 .for FILE in ${WARSOW_TARGET}
 	${BRANDELF} -t Linux ${WRKSRC}/${FILE}${ENGINESUFFIX}
 	${INSTALL_PROGRAM} ${WRKSRC}/${FILE}${ENGINESUFFIX} ${WARSOW_DIR}/${FILE}
 	${INSTALL_SCRIPT} ${WRKDIR}/${FILE}-wrapper ${PREFIX}/bin/${PKGNAMEPREFIX}${FILE}
 .endfor
-	${LN} -s ${DATADIR}/* ${WARSOW_DIR}
+	${LN} -s ${DATADIR}/* ${WARSOW_DIR}/basewsw
 
 .include <bsd.port.post.mk>
diff --git a/games/linux-warsow/pkg-plist b/games/linux-warsow/pkg-plist
index 14f70c175d47..da4003788925 100644
--- a/games/linux-warsow/pkg-plist
+++ b/games/linux-warsow/pkg-plist
@@ -2,10 +2,25 @@
 %%SERVER%%bin/linux-wsw_server
 %%CLIENT%%lib/linux-warsow/warsow
 %%SERVER%%lib/linux-warsow/wsw_server
-lib/linux-warsow/basewsw
-%%CLIENT%%%%DATADIR%%/basewsw/cgame%%ARCHSUFFIX%%.so
-%%DATADIR%%/basewsw/game%%ARCHSUFFIX%%.so
-%%CLIENT%%%%DATADIR%%/basewsw/ui%%ARCHSUFFIX%%.so
+lib/linux-warsow/basewsw/cfgs
+%%CLIENT%%lib/linux-warsow/basewsw/cgame%%ARCHSUFFIX%%.so
+lib/linux-warsow/basewsw/config.cfg
+lib/linux-warsow/basewsw/data0.pk3
+lib/linux-warsow/basewsw/data0fix1.pk3
+lib/linux-warsow/basewsw/data0fix2.pk3
+lib/linux-warsow/basewsw/dedicated_autoexec.cfg
+lib/linux-warsow/basewsw/game%%ARCHSUFFIX%%.so
+lib/linux-warsow/basewsw/huds
+lib/linux-warsow/basewsw/map_wctf1.pk3
+lib/linux-warsow/basewsw/map_wdm1.pk3
+lib/linux-warsow/basewsw/map_wdm2.pk3
+lib/linux-warsow/basewsw/map_wdm5.pk3
+lib/linux-warsow/basewsw/map_wmid1.pk3
+lib/linux-warsow/basewsw/map_wmid2.pk3
+lib/linux-warsow/basewsw/map_wmid3.pk3
+lib/linux-warsow/basewsw/map_wtest1.pk3
+lib/linux-warsow/basewsw/map_wtest3.pk3
+lib/linux-warsow/basewsw/map_wtest4.pk3
+%%CLIENT%%lib/linux-warsow/basewsw/ui%%ARCHSUFFIX%%.so
+@dirrm lib/linux-warsow/basewsw
 @dirrm lib/linux-warsow
-@dirrmtry %%DATADIR%%/basewsw
-@dirrmtry %%DATADIR%%
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%%
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index bf18e6e2ed19..791f0d60626b 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -7,29 +7,29 @@
 
 PORTNAME=	warsow
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://warsow.aditsystems.com/ \
 		http://ftp.club-internet.fr/pub/games/nofrag/warsow/ \
 		http://wsw.surreal-xenotronic.com/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_sdk
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PORTNAME}_${PORTVERSION}_linux.tar.gz
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A fast paced first person shooter game
 
+RUN_DEPENDS=	${DATADIR}/data0.pk3:${PORTSDIR}/games/warsow-data
+
+ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
-USE_GCC=	3.3+
+USE_GCC=	3.4+
 USE_ZIP=	yes
 USE_DOS2UNIX=	linux/in_x11.c linux/sys_linux.c
 
-ALL_TARGET=	game
 WRKSRC=		${WRKDIR}/source/source012
+ALL_TARGET=	game
 RELEASEDIR=	${WRKSRC}/release
-DATADIR=	${PREFIX}/lib/${PORTNAME}
+WSWDATADIR=	${PREFIX}/lib/${PORTNAME}
 
 OPTIONS=	CLIENT	"Build client executable"		on \
 		SERVER	"Build dedicated server executable"	on
@@ -40,6 +40,14 @@ OPTIONS=	CLIENT	"Build client executable"		on \
 IGNORE=		requires at least one of CLIENT and SERVER options
 .endif
 
+.if ${ARCH} == "i386"
+ARCHSUFFIX=	"_i386"
+PLIST_SUB+=	ARCHSUFFIX=${ARCHSUFFIX}
+.elif ${ARCH} == "amd64"
+ARCHSUFFIX=	"_x86_64"
+PLIST_SUB+=	ARCHSUFFIX=${ARCHSUFFIX}
+.endif
+
 .if !defined(WITHOUT_CLIENT)
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -62,26 +70,17 @@ PLIST_SUB+=	SERVER="@comment "
 
 post-patch: .SILENT
 	${REINPLACE_CMD} -e 's#@$$(DO_CC#$$(DO_CC#; \
-		s#_$$(ARCH)##; s#-O2 ##' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's#path", "\.#path", "${DATADIR}#; \
+		s#-O2 ##' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's#path", "\.#path", "${WSWDATADIR}#; \
 		s#dir", "0#dir", "1#' ${WRKSRC}/qcommon/files.c
 	${REINPLACE_CMD} -e 's#Linux#FreeBSD#' ${WRKSRC}/game/q_shared.h
 
 do-install:
-.for bin in ${WSBIN}
-	${INSTALL_PROGRAM} ${RELEASEDIR}/${bin} ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/lib/${PORTNAME}/basewsw
+.for FILE in ${WSBIN}
+	${INSTALL_PROGRAM} ${RELEASEDIR}/${FILE} ${PREFIX}/bin
 .endfor
-	@${MKDIR} ${DATADIR}/basewsw
-	${INSTALL_PROGRAM} ${RELEASEDIR}/basewsw/*.so ${DATADIR}/basewsw
-	@${TAR} xzvf ${_DISTDIR}/${PORTNAME}_${PORTVERSION}_linux.tar.gz \
-		-C ${PREFIX}/lib warsow/basewsw/cfgs warsow/basewsw/huds \
-		warsow/basewsw/dedicated_autoexec.cfg \
-		warsow/basewsw/\*.pk3 && ${CHOWN} -R root:wheel ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${TAR} xzvf ${_DISTDIR}/${PORTNAME}_${PORTVERSION}_linux.tar.gz \
-		-C ${WRKDIR} warsow/docs && ${CP} -R ${WRKDIR}/warsow/docs/ \
-		${DOCSDIR} && ${CHMOD} -R 777 ${WRKDIR}/warsow
-.endif
+	${INSTALL_DATA} ${RELEASEDIR}/basewsw/*.so ${PREFIX}/lib/${PORTNAME}/basewsw
+	${LN} -s ${DATADIR}/* ${PREFIX}/lib/${PORTNAME}/basewsw
 
 .include <bsd.port.post.mk>
diff --git a/games/warsow/files/patch-Makefile b/games/warsow/files/patch-Makefile
index 1fc4a7917011..44da79ad3c5c 100644
--- a/games/warsow/files/patch-Makefile
+++ b/games/warsow/files/patch-Makefile
@@ -1,6 +1,14 @@
---- Makefile.orig	Tue Jun 27 21:28:20 2006
-+++ Makefile	Tue Jun 27 21:32:49 2006
-@@ -26,7 +26,7 @@
+--- Makefile	Thu Jun  8 22:44:02 2006
++++ Makefile	Sat Aug 19 20:50:05 2006
+@@ -19,14 +19,14 @@
+ CC?=gcc
+ 
+ CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D__linux__ -Wall
+-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops
++CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops
+ CFLAGS_DEBUG=-O0 -ggdb -DDEBUG
+ CFLAGS_COMMON+=$(CFLAGS_RELEASE)
+ 
  CFLAGS_DED=-DDEDICATED_ONLY -DC_ONLY
  CFLAGS_MODULE=-fPIC
  
@@ -9,18 +17,55 @@
  
  ifeq ($(ARCH),x86_64)
  LIB=lib64
-@@ -53,8 +53,8 @@
+@@ -48,13 +48,19 @@
+ LDFLAGS_SDL=$(shell $(SDL_CONFIG) --libs)
+ 
+ ifeq ($(OS),FreeBSD)
+-ARCH=freebsd_$(BASE_ARCH)
++ARCH=_$(BASE_ARCH)
+ else
  ARCH=$(BASE_ARCH)
  endif
  
 -SERVER_EXE=wsw_server.$(ARCH)
 -CLIENT_EXE=warsow.$(ARCH)
++ifeq ($(BASE_ARCH),i386)
++ARCHSUFFIX=i386
++else
++ARCHSUFFIX=x86_64
++endif
++
 +SERVER_EXE=wsw_server
 +CLIENT_EXE=warsow
  
  ######################################################################################################
  # Helper functions
-@@ -220,29 +220,29 @@
+@@ -196,21 +202,21 @@
+ 	@echo "> * Building cgame"
+ 	@echo "> *********************************************************"
+ compile-cgame: $(OBJS_CGAME)
+-link-cgame: $(BINDIR)/basewsw $(BINDIR)/basewsw/cgame_$(ARCH).so
++link-cgame: $(BINDIR)/basewsw $(BINDIR)/basewsw/cgame_$(ARCHSUFFIX).so
+ 
+ message-game:
+ 	@echo "> *********************************************************"
+ 	@echo "> * Building game"
+ 	@echo "> *********************************************************"
+ compile-game: $(OBJS_GAME)
+-link-game: $(BINDIR)/basewsw $(BINDIR)/basewsw/game_$(ARCH).so
++link-game: $(BINDIR)/basewsw $(BINDIR)/basewsw/game_$(ARCHSUFFIX).so
+ 
+ message-ui:
+ 	@echo "> *********************************************************"
+ 	@echo "> * Building ui"
+ 	@echo "> *********************************************************"
+ compile-ui: $(OBJS_UI)
+-link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).so
++link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCHSUFFIX).so
+ 
+ 
+ ######################################################################################################
+@@ -220,29 +226,29 @@
  # DED
  ########
  $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
@@ -39,19 +84,119 @@
  ########
  # .SO
  ########
- $(BINDIR)/basewsw/cgame_$(ARCH).so: $(OBJS_CGAME)
+-$(BINDIR)/basewsw/cgame_$(ARCH).so: $(OBJS_CGAME)
 -	@echo "  > Linking $@" && \
++$(BINDIR)/basewsw/cgame_$(ARCHSUFFIX).so: $(OBJS_CGAME)
 +	echo "  > Linking $@" && \
  	$(CC) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
  
- $(BINDIR)/basewsw/game_$(ARCH).so: $(OBJS_GAME)
+-$(BINDIR)/basewsw/game_$(ARCH).so: $(OBJS_GAME)
 -	@echo "  > Linking $@" && \
++$(BINDIR)/basewsw/game_$(ARCHSUFFIX).so: $(OBJS_GAME)
 +	echo "  > Linking $@" && \
  	$(CC) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
  
- $(BINDIR)/basewsw/ui_$(ARCH).so: $(OBJS_UI)
+-$(BINDIR)/basewsw/ui_$(ARCH).so: $(OBJS_UI)
 -	@echo "  > Linking $@" && \
++$(BINDIR)/basewsw/ui_$(ARCHSUFFIX).so: $(OBJS_UI)
 +	echo "  > Linking $@" && \
  	$(CC) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
  
  
+@@ -253,76 +259,76 @@
+ # CLIENT
+ ########
+ $(BUILDDIR)/client/%.o: qcommon/%.c
+-	@$(DO_CC)
++	$(DO_CC)
+ 
+ $(BUILDDIR)/client/%.o: server/%.c
+-	@$(DO_CC)
++	$(DO_CC)
+ 
+ $(BUILDDIR)/client/%.o: client/%.c
+-	@$(DO_CC)
++	$(DO_CC)
+ 
+ $(BUILDDIR)/client/%.o: ref_gl/%.c
+-	@$(DO_CC)
++	$(DO_CC)
+ 
+ $(BUILDDIR)/client/%.o: linux/%.c
+-	@$(DO_CC)
++	$(DO_CC)
+ 
+ $(BUILDDIR)/client/snd_sdl.o: linux/snd_sdl.c
+-	@$(DO_CC) $(CFLAGS_SDL)
++	$(DO_CC) $(CFLAGS_SDL)
+ 
+ $(BUILDDIR)/client/%.o: game/%.c
+-	@$(DO_CC)
++	$(DO_CC)
+ 
+ ########
+ # DED
+ ########
+ $(BUILDDIR)/ded/%.o: qcommon/%.c 
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: server/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: linux/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: null/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: game/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ ########
+ # CGAME
+ ########
+ $(BUILDDIR)/cgame/%.o: cgame/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/cgame/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/cgame/%.o: game/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # GAME
+ ########
+ $(BUILDDIR)/game/%.o: game/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: game/ai/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # UI
+ ########
+ $(BUILDDIR)/ui/%.o: game/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/ui/%.o: ui/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ 
+ ######################################################################################################
diff --git a/games/warsow/files/patch-linux+sys_linux.c b/games/warsow/files/patch-linux+sys_linux.c
index 96c142c57225..0b55adac9fbe 100644
--- a/games/warsow/files/patch-linux+sys_linux.c
+++ b/games/warsow/files/patch-linux+sys_linux.c
@@ -1,29 +1,20 @@
---- linux/sys_linux.c.orig	Thu May 11 22:18:54 2006
-+++ linux/sys_linux.c	Thu Jun  1 15:44:44 2006
-@@ -434,7 +392,7 @@
- 			APIfunc = GetGameAPI;
+--- linux/sys_linux.c	Sat Aug 19 21:04:32 2006
++++ linux/sys_linux.c	Sat Aug 19 21:04:55 2006
+@@ -380,7 +380,7 @@
+ 
+ #if defined __FreeBSD__
+ #if defined __i386__
+-#define ARCH "freebsd_i386"
++#define ARCH "i386"
+ 
+ #ifdef NDEBUG
+ 	const char *debugdir = "freebsd_releasei386";
+@@ -389,7 +389,7 @@
  #endif
- 			lib = &game_library;
--			libname = "game_" ARCH ".so";
-+			libname = "game.so";
- 			apifuncname = "GetGameAPI";
- 			break;
- 		}
-@@ -445,7 +403,7 @@
- 			APIfunc = GetCGameAPI;
- #endif
- 			lib = &cgame_library;
--			libname = "cgame_" ARCH ".so";
-+			libname = "cgame.so";
- 			apifuncname = "GetCGameAPI";
- 			break;
- 		}
-@@ -456,7 +414,7 @@
- 			APIfunc = GetUIAPI;
- #endif
- 			lib = &ui_library;
--			libname = "ui_" ARCH ".so";
-+			libname = "ui.so";
- 			apifuncname = "GetUIAPI";
- 			break;
- 		}
+ 
+ #elif defined __x86_64__
+-#define ARCH "xfreebsd_86_64"
++#define ARCH "x86_64"
+ #ifdef NDEBUG
+ 	const char *debugdir = "releasex86_64";
+ #else
diff --git a/games/warsow/pkg-plist b/games/warsow/pkg-plist
index c5caef11ea23..588095654114 100644
--- a/games/warsow/pkg-plist
+++ b/games/warsow/pkg-plist
@@ -1,131 +1,24 @@
 %%CLIENT%%bin/warsow
 %%SERVER%%bin/wsw_server
-%%CLIENT%%%%DATADIR%%/basewsw/cgame.so
-%%DATADIR%%/basewsw/game.so
-%%CLIENT%%%%DATADIR%%/basewsw/ui.so
-%%DATADIR%%/basewsw/data0.pk3
-%%DATADIR%%/basewsw/data0fix1.pk3
-%%DATADIR%%/basewsw/data0fix2.pk3
-%%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%%/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
-@dirrm %%DATADIR%%/basewsw/cfgs
-%%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
-@dirrm %%DATADIR%%/basewsw/huds/inc/nip
-%%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
-@dirrm %%DATADIR%%/basewsw/huds/inc/1oooK
-%%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/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
-@dirrm %%DATADIR%%/basewsw/huds/inc/ETR
-%%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
-@dirrm %%DATADIR%%/basewsw/huds/inc
-%%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
-@dirrm %%DATADIR%%/basewsw/huds
-%%DATADIR%%/basewsw/dedicated_autoexec.cfg
-@dirrm %%DATADIR%%/basewsw
-@dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/Shader_Manual.rtf
-%%PORTDOCS%%%%DOCSDIR%%/bots_navigation.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/contact.txt
-%%PORTDOCS%%%%DOCSDIR%%/dedicated_server_quide.txt
-%%PORTDOCS%%%%DOCSDIR%%/demoavi.txt
-%%PORTDOCS%%%%DOCSDIR%%/gnu.txt
-%%PORTDOCS%%%%DOCSDIR%%/huds.txt
-%%PORTDOCS%%%%DOCSDIR%%/linux_sound_sdl.txt
-%%PORTDOCS%%%%DOCSDIR%%/new_features.txt
-%%PORTDOCS%%%%DOCSDIR%%/old_changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/query_protocols.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+lib/warsow/basewsw/cfgs
+%%CLIENT%%lib/warsow/basewsw/cgame%%ARCHSUFFIX%%.so
+lib/warsow/basewsw/config.cfg
+lib/warsow/basewsw/data0.pk3
+lib/warsow/basewsw/data0fix1.pk3
+lib/warsow/basewsw/data0fix2.pk3
+lib/warsow/basewsw/dedicated_autoexec.cfg
+lib/warsow/basewsw/game%%ARCHSUFFIX%%.so
+lib/warsow/basewsw/huds
+lib/warsow/basewsw/map_wctf1.pk3
+lib/warsow/basewsw/map_wdm1.pk3
+lib/warsow/basewsw/map_wdm2.pk3
+lib/warsow/basewsw/map_wdm5.pk3
+lib/warsow/basewsw/map_wmid1.pk3
+lib/warsow/basewsw/map_wmid2.pk3
+lib/warsow/basewsw/map_wmid3.pk3
+lib/warsow/basewsw/map_wtest1.pk3
+lib/warsow/basewsw/map_wtest3.pk3
+lib/warsow/basewsw/map_wtest4.pk3
+%%CLIENT%%lib/warsow/basewsw/ui%%ARCHSUFFIX%%.so
+@dirrm lib/warsow/basewsw
+@dirrm lib/warsow