warsow: 0.21 -> 0.41 and taken maintainer

2008-02-23 07:48:17 +11:00 · 2008-02-23 07:48:17 +11:00 · 20b08110e5
commit 20b08110e5
parent 858aa6ef0d
4 changed files with 111 additions and 46 deletions
--- a/warsow/.footprint
+++ b/warsow/.footprint
@ -1,32 +1,67 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/warsow
-drwxr-xr-x	root/root	usr/games/
-drwxr-xr-x	root/root	usr/games/warsow/
-drwxr-xr-x	root/root	usr/games/warsow/basewsw/
-rwxr-xr-x	root/root	usr/games/warsow/basewsw/cgame_i386.so
-rw-r--r--	root/root	usr/games/warsow/basewsw/data0.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/data0pure.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/data1.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/data1pure.pk3
-rwxr-xr-x	root/root	usr/games/warsow/basewsw/game_i386.so
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wctf1.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wctf2.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wdm1.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wdm2.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wdm3.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wdm5.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wdm6.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wmid1.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wmid2.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wmid3.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wrace1.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wtest13.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wtest4.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/map_wtest7.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/modules_02.pk3
-rw-r--r--	root/root	usr/games/warsow/basewsw/modules_021.pk3
-rwxr-xr-x	root/root	usr/games/warsow/basewsw/ui_i386.so
-drwxr-xr-x	root/root	usr/games/warsow/libs/
-rwxr-xr-x	root/root	usr/games/warsow/libs/irc_i386.so
-rwxr-xr-x	root/root	usr/games/warsow/libs/snd_qf_i386.so
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/warsow/
+drwxr-xr-x	root/root	usr/lib/warsow/basewsw/
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/billboard.pk3
+-rwxr-xr-x	root/root	usr/lib/warsow/basewsw/cgame_i386.so
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/data0.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/data0_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/data1.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/data1_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/editortextures.pk3
+-rwxr-xr-x	root/root	usr/lib/warsow/basewsw/game_i386.so
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wamphi.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wca1.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wca2.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wca4.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wctf1.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wctf2.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wctf3.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wctf5.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wda1.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wda2.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wda3.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wda4.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wda5.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wda6.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm1.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm10.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm10a.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm11.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm14.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm15.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm17.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm19.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm2.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm3.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm4.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm5.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm6.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm7.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm8.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wdm9.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wtest13.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/map_wtest18.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/modules_04.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/modules_041.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_blx_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_blxbis_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_chaoswsw_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_ecel_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_exwsw_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_factory_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_hazelh_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_hexagons_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_refly_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_russus_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_supersymmetry_ctf_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_supersymmetry_pure.pk3
+-rw-r--r--	root/root	usr/lib/warsow/basewsw/tex_terrain_pure.pk3
+-rwxr-xr-x	root/root	usr/lib/warsow/basewsw/ui_i386.so
+drwxr-xr-x	root/root	usr/lib/warsow/libs/
+-rwxr-xr-x	root/root	usr/lib/warsow/libs/irc_i386.so
+-rwxr-xr-x	root/root	usr/lib/warsow/libs/libcurl.so.3
+-rwxr-xr-x	root/root	usr/lib/warsow/libs/snd_qf_i386.so
+-rwxr-xr-x	root/root	usr/lib/warsow/warsow.i386
--- a/warsow/.md5sum
+++ b/warsow/.md5sum
@ -1,2 +1,3 @@
-0ee0835a1fe9092c9562113253d0f79a  warsow_0.21_linux.tar.gz
-ce66288c5d345c8cf3985cbb1e51e199  warsow_0.21_sdk.zip
+f19a45244749734a027428f9b6a0be60  warsow.sh
+0ba035adac917cf30d8bacff9dd9acb0  warsow_0.41_sdk.zip
+7dc8e3ca36d24055173f9a821d85309b  warsow_0.41_unified.zip
--- a/warsow/Pkgfile
+++ b/warsow/Pkgfile
@ -1,24 +1,49 @@
-# Description:	Fast paced first person shooter game
-# URL:		http://www.warsow.net/
-# Maintainer:	Mark Rosenstand, mark at borkware dot net
-# Depends on:	curl, libjpeg, libsdl, libvorbis, mesa3d
+# Description: Fast paced first person shooter game.
+# URL: http://www.warsow.net/
+# Maintainer: Danny Rawlins, romster at shortcircuit dot net dot au
+# Packager: Mark Rosenstand, mark at borkware dot net
+# Depends on: zlib libjpeg libsdl libvorbis mesa3d

 name=warsow
-version=0.21
-release=2
-source=(http://ftp.club-internet.fr/pub/games/nofrag/warsow/warsow_${version}_linux.tar.gz
-	http://ftp.club-internet.fr/pub/games/nofrag/warsow/warsow_${version}_sdk.zip)
+version=0.41
+release=1
+source=(http://www.speltips.org/~web1_mans/files/warsow_${version}_unified.zip
+	http://www.speltips.org/~web1_mans/files/warsow_0.41_sdk.zip \
+	warsow.sh)

 build() {
+	cd warsow_${version}_src
+
 	sed -i source/qcommon/files.c \
-		-e '/fs_basepath = Cvar_Get/s,"\.","/usr/games/warsow",' \
-		-e '/fs_usehomedir = Cvar_Get/s,"0","1",'
+		-e '/fs_basepath = Cvar_Get/s|"\."|"/usr/lib/warsow"|' \
+		-e '/fs_usehomedir = Cvar_Get/s|"0"|"1"|'
+	
+	sed -i source/Makefile \
+		-e 's|-I$(X11BASE)/include|-I$(X11BASE)/include/X11|g' \
+		-e '/^all:/s| client openal qf ded cgame game ui irc tv_server| client openal qf cgame game ui irc |'
+
+	make -C source clean
+
 	make -C source \
 		BUILD_SERVER=NO \
 		BUILD_SND_OPENAL=NO \
-		CLIENT_EXE=warsow
-	mkdir -p $PKG/usr/{bin,games/warsow}
-	mv source/release/warsow	$PKG/usr/bin
-	cp -r source/release/*		$PKG/usr/games/warsow
-	cp -r warsow/basewsw/*.pk3	$PKG/usr/games/warsow/basewsw
+		BUILD_TV_SERVER=NO \
+		CLIENT_EXE=warsow \
+		LOCALBASE=/usr \
+		X11BASE=/usr
+
+	install -d $PKG/usr/lib/warsow/libs $PKG/usr/bin/
+	install -m 0755 $SRC/warsow.sh $PKG/usr/bin/warsow
+	install -m 0755 ../warsow.i386 $PKG/usr/lib/warsow/
+	#mv ../basewsw/*.so $PKG/usr/lib/warsow/libs/
+	cp -r source/release/* $PKG/usr/lib/warsow/
+	cp -r ../basewsw/*.pk3 $PKG/usr/lib/warsow/basewsw/
+	rm $PKG/usr/lib/warsow/warsow
+	
+	cd libsrcs/curl-*/
+	chmod +x configure
+	./configure --enable-ipv6 --disable-static
+	make -C lib
+	install -s -m 0755 lib/.libs/libcurl.so.3.0.0 $PKG/usr/lib/warsow/libs/libcurl.so.3
 }
+
--- a/warsow/warsow.sh
+++ b/warsow/warsow.sh
@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+cd /usr/lib/warsow
+LD_LIBRARY_PATH="$LD_LIBRARY_PATH:libs" ./warsow.i386