- Update Warsow game and data ports to version 0.6

- Clean up distfile mirror list (via distilator)
- Add LICENSE (GPLv2, applies to game engine only)
- Add NO_PACKAGE to data port as its size is 550MB now

Feature safe:	yes

4 files changed, 25 insertions, 48 deletions

diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index f3637c205631..8972e8ffc32f 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -6,23 +6,20 @@
 #
 
 PORTNAME=	warsow
-PORTVERSION=	0.5
-PORTREVISION=	4
+PORTVERSION=	0.6
 CATEGORIES=	games
-MASTER_SITES=	http://woe.crying-wolves.net/ \
-		http://www.derchris.eu/warsow/ \
-		http://warsow.hangy.de/ \
-		http://static.warsow.net/release/ \
-		http://rewq.de/scratch/wsw05/ \
-		http://weseo.de/downloads/
+MASTER_SITES=	http://www.zcdn.org/dl/ \
+		http://www.derchris.eu/warsow/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_sdk
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A fast paced first person shooter game
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${DATADIR}/basewsw/data0_05.pk3:${PORTSDIR}/games/warsow-data
+RUN_DEPENDS=	${DATADIR}/basewsw/data0_06.pk3:${PORTSDIR}/games/warsow-data
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
@@ -30,7 +27,6 @@ USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/source
 ALL_TARGET=	game
-MAKE_ARGS=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 RELEASEDIR=	${WRKSRC}/release
 WSWSUBDIR=	basewsw
 
@@ -117,17 +113,17 @@ post-patch: .SILENT
 # so allows us not to install any wrapper scripts.
 	${REINPLACE_CMD} -e 's|path", "\.|path", "${DATADIR}|' \
 		${WRKSRC}/qcommon/files.c
-# FreeBSD does not use stupid `64' suffix for 64-bit readdir(3)
-	${REINPLACE_CMD} -e 's/FILE64_SOURCE)/& || defined(__FreeBSD__)/' \
-		${WRKSRC}/unix/unix_fs.c
 # Adjust architecture names, get rid of ``freebsd_'' prefix
 	${REINPLACE_CMD} -e 's/x86_64/amd64/ ; s/freebsd_//' \
 		${WRKSRC}/gameshared/q_arch.h
 # Resolve name collision with jpeg-8
 	${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
 		${WRKSRC}/ref_gl/r_image.c
-
-
+# Add missing #include's
+	${REINPLACE_CMD} -e '24s|^|#include <sys/socket.h>|' \
+		${WRKSRC}/qcommon/net.c
+	${REINPLACE_CMD} -e '19s|^|#include <stdint.h>|' \
+		${WRKSRC}/unix/unix_xpm.c
 
 do-install:
 .for b in ${WSWBIN}
diff --git a/games/warsow/distinfo b/games/warsow/distinfo
index 86ea789ccf48..542ddf178b1d 100644
--- a/games/warsow/distinfo
+++ b/games/warsow/distinfo
@@ -1,3 +1,2 @@
-MD5 (warsow/warsow_0.5_sdk.zip) = acd0244435cc63967b0eb3468c21c454
-SHA256 (warsow/warsow_0.5_sdk.zip) = 35cc937b4b38659df803d84f6b3fd6e9d5a5480ecadb4b642d991b99e3401f05
-SIZE (warsow/warsow_0.5_sdk.zip) = 34213675
+SHA256 (warsow/warsow_0.6_sdk.zip) = d88e5ee2dc1b2bd81fd1f5787b6f09aae76348cec638c1a8262072e214c93ad7
+SIZE (warsow/warsow_0.6_sdk.zip) = 36597211
diff --git a/games/warsow/files/patch-Makefile b/games/warsow/files/patch-Makefile
index 1df4f1a2be90..90573fbbb6dc 100644
--- a/games/warsow/files/patch-Makefile
+++ b/games/warsow/files/patch-Makefile
@@ -1,38 +1,28 @@
 --- Makefile.orig
 +++ Makefile
-@@ -51,19 +51,12 @@
- #CC=gcc
- #LD=gcc
+@@ -48,20 +48,12 @@
  else
--CC?=gcc
+ CC?=gcc
+ CXX?=g++
 -LD=gcc
-+CC?=cc
 +LD=$(CC)
+ AR=ar
+ RANLIB=ranlib
  
 -# this nice line comes from the linux kernel makefile
 -BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
-+ARCH=$(shell uname -m)
  OS=$(shell uname)
  
 -ifeq ($(OS),FreeBSD)
--ARCH=freebsd_$(BASE_ARCH)
+-ARCH?=freebsd_$(BASE_ARCH)
 -else
--ARCH=$(BASE_ARCH)
+-ARCH?=$(BASE_ARCH)
 -endif
 -
  SHARED_LIBRARY_EXTENSION=so
  endif
  
-@@ -161,7 +154,7 @@
- LIB=lib
- endif
- 
--LDFLAGS_CLIENT=-ljpeg -lz -L$(X11BASE)/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lXinerama $(shell curl-config --libs)
-+LDFLAGS_CLIENT=-ljpeg -lz -L$(X11BASE)/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lXinerama $(shell curl-config --libs) $(PTHREAD_LIBS)
- LDFLAGS_DED=-lz $(shell curl-config --libs)
- LDFLAGS_MODULE=-shared
- LDFLAGS_TV_SERVER=-lz
-@@ -217,10 +210,8 @@
+@@ -252,12 +244,9 @@
  ######################################################################################################
  # Helper functions
  ######################################################################################################
@@ -40,8 +30,11 @@
 -	$(CC) $(CFLAGS_COMMON) -c $< -o $@
 -DO_CXX=echo "  > Compiling (c++) $<" && \
 -	$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
+-DO_RES=echo "  > Compiling resource $<" && \
+-	$(RES) $(RESFLAGS_COMMON) -i $< -o $@
 +DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@
 +DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
- 
++DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@
  
  DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
+ DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
diff --git a/games/warsow/files/patch-snd_openal_snd_main.c b/games/warsow/files/patch-snd_openal_snd_main.c
deleted file mode 100644
index 84c1d6ed71b6..000000000000
--- a/games/warsow/files/patch-snd_openal_snd_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./snd_openal/snd_main.c.orig	2009-12-26 19:07:05.000000000 +0100
-+++ ./snd_openal/snd_main.c	2009-12-26 19:07:13.000000000 +0100
-@@ -231,7 +231,7 @@
- #define ALDRIVER "/System/Library/Frameworks/OpenAL.framework/OpenAL"
- #define ALDEVICE_DEFAULT NULL
- #else
--#define ALDRIVER "libopenal.so.0"
-+#define ALDRIVER "libopenal.so"
- #define ALDEVICE_DEFAULT NULL
- #endif
-