- Update to 1.5 [1]

- Reset maintainers [2]
- Remove MAPPACK from default options and mark it BROKEN, it's unfetchable [3]

PR:		ports/189477 and ports/189478 [1]
Submitted by:	lightside gmx com [1]
Approved by:	several maintainer timeouts on those ports [2]
Reported by:	pkg-fallout [3]

7 files changed, 58 insertions, 175 deletions

diff --git a/games/warsow-data/Makefile b/games/warsow-data/Makefile
index cb37547d9609..9e2741f521a5 100644
--- a/games/warsow-data/Makefile
+++ b/games/warsow-data/Makefile
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	data
-PORTVERSION=	1.0.2
+PORTVERSION=	1.5
 CATEGORIES=	games
-MASTER_SITES=	SF/warsow.mirror/Warsow%20${PORTVERSION:R}${PORTVERSION:E} \
-		http://www.warsow.net:1337/~warsow/${PORTVERSION:R}${PORTVERSION:E}/ \
+MASTER_SITES=	SF/warsow.mirror/Warsow%20${PORTVERSION} \
+		http://www.warsow.net:1337/~warsow/${PORTVERSION}/ \
 		http://static.warsow.net/release/:mappack \
 		http://rewq.de/scratch/wsw05/:mappack
 PKGNAMEPREFIX=	warsow-
-DISTNAME=	${PKGNAMEPREFIX:S/-//}_${PORTVERSION:R}${PORTVERSION:E}
+DISTNAME=	${PKGNAMEPREFIX:S/-//}_${PORTVERSION:S/.//}_unified
 DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 
-MAINTAINER=	acm@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Warsow data files
 
 LICENSE=	WARSOW GPLv2
@@ -25,6 +25,7 @@ LICENSE_PERMS_WARSOW=	dist-mirror pkg-mirror auto-accept
 # package game data port as well (even it is not being technically built)
 ONLY_FOR_ARCHS=	i386 amd64
 
+WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX:S/-//}_15
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX:S/-//}
@@ -33,12 +34,13 @@ PORTDATA=	basewsw
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	MAPPACK DOCS
-OPTIONS_DEFAULT=	MAPPACK
+#OPTIONS_DEFAULT=	MAPPACK
 MAPPACK_DESC=		Install community map pack
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMAPPACK}
+BROKEN=		Unfetchable
 MAPPACK_FILE= warsow_comunity_map_pack_01.zip
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MAPPACK_FILE}:mappack
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/warsow-data/distinfo b/games/warsow-data/distinfo
index 63bae4f035dc..c6f2e868182f 100644
--- a/games/warsow-data/distinfo
+++ b/games/warsow-data/distinfo
@@ -1,4 +1,4 @@
-SHA256 (warsow/warsow_1.02.tar.gz) = fe7e1469347f30822b1919d1f3e36a27b72435067b88df6310d8a65760d8252a
-SIZE (warsow/warsow_1.02.tar.gz) = 531283708
+SHA256 (warsow/warsow_15_unified.tar.gz) = 4b4715d45339bdabfc94d4385df4defac0974743061f63e6a025460ab24668d7
+SIZE (warsow/warsow_15_unified.tar.gz) = 584507931
 SHA256 (warsow/warsow_comunity_map_pack_01.zip) = 58b84b10d5fbaa22e29d59194b8c5ebbc633356fbc6545a715e44a73bdd3c7e7
 SIZE (warsow/warsow_comunity_map_pack_01.zip) = 130057143
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index 2e55551a8a31..b43a4e596569 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -2,42 +2,42 @@
 # $FreeBSD$
 
 PORTNAME=	warsow
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	games
-MASTER_SITES=	SF/warsow.mirror/Warsow%201.02 \
-		http://www.warsow.net:1337/~warsow/${PORTVERSION:R}${PORTVERSION:E}/
-DISTNAME=	${PORTNAME}_${PORTVERSION:R}${PORTVERSION:E}_sdk
+MASTER_SITES=	SF/warsow.mirror/Warsow%20${PORTVERSION} \
+		http://www.warsow.net:1337/~warsow/${PORTVERSION}/
+DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//}_sdk
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	danfe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Futuristic, fast-paced first person shooter
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${DATADIR}/basewsw/data0_10.pk3:${PORTSDIR}/games/warsow-data
+RUN_DEPENDS=	${DATADIR}/basewsw/data0_15.pk3:${PORTSDIR}/games/warsow-data
 
 ONLY_FOR_ARCHS=	i386 amd64
 MAKE_JOBS_UNSAFE=yes
 
-USES=		dos2unix gmake
-DOS2UNIX_FILES=	ui/as/asbind.h
+USES=		gmake
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
+WRKSRC=		${WRKDIR}/source/source
 ALL_TARGET=	game angelwrap
 RELEASEDIR=	${WRKSRC}/release
-AS_SDK_DIR=	${WRKSRC}/../libsrcs/angelscript/angelSVN/sdk
+AS_SDK_DIR=	${WRKSRC}/../libsrcs/angelscript/sdk
 
 PLIST_FILES=	%%DATADIR%%/basewsw/game_${ARCH}.so \
 		%%DATADIR%%/libs/angelwrap_${ARCH}.so
 PLIST_DIRS=	%%DATADIR%%/libs
 
-OPTIONS_DEFINE=	CLIENT SERVER QF OPENAL IRC CIN TV_SRV
-OPTIONS_DEFAULT=	CLIENT SERVER QF OPENAL IRC CIN TV_SRV
+OPTIONS_DEFINE=	CLIENT SERVER FTLIB REF_GL QF OPENAL IRC CIN TV_SRV
+OPTIONS_DEFAULT=	CLIENT SERVER FTLIB REF_GL QF OPENAL IRC CIN TV_SRV
 
 CLIENT_DESC=	Build game client
 SERVER_DESC=	Build dedicated server
+FTLIB_DESC=	Build FreeType library module
+REF_GL_DESC=	Build reference OpenGL module
 QF_DESC=	Build Qf sound module
 OPENAL_DESC=	Build OpenAL sound module
 IRC_DESC=	Build IRC client module
@@ -47,25 +47,35 @@ TV_SRV_DESC=	Build Warsow TV server
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-				libpng15.so:${PORTSDIR}/graphics/png \
-				libfreetype.so:${PORTSDIR}/print/freetype2
-PATCH_DEPENDS=	${DATADIR}/basewsw/ui_porkui.pk3:${PORTSDIR}/games/warsow-data
-USE_GL=		gl
-USE_SDL=	sdl
-USE_XORG=	xinerama xxf86dga xrandr
+USE_XORG=	xi xrandr
+
 ALL_TARGET+=	cgame ui client
 PLIST_FILES+=	bin/warsow %%DATADIR%%/basewsw/cgame_${ARCH}.so \
 		%%DATADIR%%/basewsw/ui_${ARCH}.so \
-		%%DATADIR%%/basewsw/ui/porkui/template.rml \
 		share/pixmaps/warsow128x128.xpm
-PLIST_DIRS+=	%%DATADIR%%/basewsw/ui \
-		%%DATADIR%%/basewsw/ui/porkui
 
 DESKTOP_ENTRIES="Warsow" "${COMMENT}" \
 	"${PREFIX}/share/pixmaps/warsow128x128.xpm" "${PORTNAME}" \
 	"Game;" false
 
+. if ${PORT_OPTIONS:MFTLIB} || ${PORT_OPTIONS:MREF_GL}
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
+. endif
+
+. if ${PORT_OPTIONS:MFTLIB}
+LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
+ALL_TARGET+=	ftlib
+PLIST_FILES+=	%%DATADIR%%/libs/ftlib_${ARCH}.so
+. endif
+
+. if ${PORT_OPTIONS:MREF_GL}
+USE_GL=		gl
+USE_XORG+=	xinerama
+LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+ALL_TARGET+=	ref_gl
+PLIST_FILES+=	%%DATADIR%%/libs/ref_gl_${ARCH}.so
+. endif
+
 . if ${PORT_OPTIONS:MQF} || ${PORT_OPTIONS:MOPENAL}
 LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 . endif
@@ -77,7 +87,7 @@ PLIST_FILES+=	%%DATADIR%%/libs/snd_qf_${ARCH}.so
 . endif
 
 . if ${PORT_OPTIONS:MOPENAL}
-USES+= openal:al
+USES+=		openal:al
 ALL_TARGET+=	openal
 PLIST_FILES+=	%%DATADIR%%/libs/snd_openal_${ARCH}.so
 . endif
@@ -104,20 +114,12 @@ ALL_TARGET+=	tv_server
 PLIST_FILES+=	bin/wswtv_server
 .endif
 
-pre-patch: .SILENT
-.if ${PORT_OPTIONS:MCLIENT}
-	${MKDIR} ${RELEASEDIR}/basewsw
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DATADIR}/basewsw/ui_porkui.pk3 --include="ui/porkui/template.rml" -C ${RELEASEDIR}/basewsw ${EXTRACT_AFTER_ARGS}
-.endif
-
 post-patch: .SILENT
 # Unmute build and link commands, respect CFLAGS
 	${REINPLACE_CMD} -e 's|@$$(DO_CC|$$(DO_CC| ; /> Linking $$@/d ; \
 		s|-O2 -fno-strict-aliasing -ffast-math -funroll-loops ||; \
 		s| -msse2||' \
 		${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|-g ||' \
-		${AS_SDK_DIR}/angelscript/projects/gnuc/makefile
 # Adjust architecture names, get rid of ``freebsd_'' prefix
 	${REINPLACE_CMD} -e 's/x86_64/amd64/ ; s/freebsd_//' \
 		${WRKSRC}/gameshared/q_arch.h
@@ -129,11 +131,6 @@ post-patch: .SILENT
 # ${DATADIR} base path instead of pack file(s)
 	${REINPLACE_CMD} -e 's|pure \&\& !FS_IsPureFile|0 \&\& !FS_IsPureFile|' \
 		${WRKSRC}/qcommon/library.c
-# Fix issue with utf8 characters for console and
-# return checks for delete character (ASCII code 127) from 0.62 version
-	${REINPLACE_CMD} -e '/x11display.ic = 0;/d; \
-		s|Key_CharEvent( key, wc );|if ( wc != 127 ) Key_CharEvent( key, wc );|' \
-		${WRKSRC}/unix/unix_input.c
 
 do-install:
 .for b in ${PLIST_FILES:Mbin/*:T}
diff --git a/games/warsow/distinfo b/games/warsow/distinfo
index 34585b3b3750..03f8b5103adf 100644
--- a/games/warsow/distinfo
+++ b/games/warsow/distinfo
@@ -1,2 +1,2 @@
-SHA256 (warsow/warsow_1.03_sdk.tar.gz) = 98cd7aa25707f9baf97a8e1feb78e1874b6b5dd95af759bf5edda10bc62ed97c
-SIZE (warsow/warsow_1.03_sdk.tar.gz) = 63908911
+SHA256 (warsow/warsow_15_sdk.tar.gz) = 277bbe87744352ee02476dc1bf9258ed5b204345b1b8eb394442dcec6a956949
+SIZE (warsow/warsow_15_sdk.tar.gz) = 89175325
diff --git a/games/warsow/files/patch-Makefile b/games/warsow/files/patch-Makefile
index d0cc79db4232..1e59627f1453 100644
--- a/games/warsow/files/patch-Makefile
+++ b/games/warsow/files/patch-Makefile
@@ -1,13 +1,13 @@
---- Makefile.orig	2012-12-02 21:36:10.000000000 +0400
-+++ Makefile	2014-02-06 06:54:02.000000000 +0400
-@@ -50,21 +50,13 @@
+--- Makefile.orig	2014-05-02 01:12:05.000000000 +0400
++++ Makefile	2014-05-07 12:00:03.000000000 +0400
+@@ -54,21 +54,13 @@
  else
  CC?=gcc
  CXX?=g++
 -LD=gcc
--LXX?=g++
+-LXX=g++
 +LD=$(CC)
-+LXX?=$(CXX)
++LXX=$(CXX)
  AR=ar
  RANLIB=ranlib
  
@@ -21,10 +21,10 @@
 -ARCH?=$(BASE_ARCH)
 -endif
 -
- SHARED_LIBRARY_EXTENSION=so
- endif
- 
-@@ -210,10 +202,11 @@
+ ifeq ($(ARCH),x86_64)
+ BITS?=64
+ else
+@@ -246,10 +238,11 @@
  CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
  
  LDFLAGS_COMMON=$(LDFLAGS)
@@ -32,13 +32,12 @@
 +LXXFLAGS_COMMON=$(LDFLAGS)#-lstdc++ -lsupc++ # disabled for Clang
  
  ifeq ($(OS),FreeBSD)
--LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
-+LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm -pthread
+ LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm
 +LXXFLAGS_COMMON+= -L$(LOCALBASE)/lib
  else
- LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -O1 -Wl,--as-needed
+ LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm -ldl -O1 -Wl,--as-needed
  endif
-@@ -298,12 +291,9 @@
+@@ -358,12 +351,9 @@
  ######################################################################################################
  # Helper functions
  ######################################################################################################
diff --git a/games/warsow/files/patch-release_basewsw_ui_porkui_template.rml b/games/warsow/files/patch-release_basewsw_ui_porkui_template.rml
deleted file mode 100644
index 6822ec6d3f63..000000000000
--- a/games/warsow/files/patch-release_basewsw_ui_porkui_template.rml
+++ /dev/null
@@ -1,37 +0,0 @@
---- release/basewsw/ui/porkui/template.rml.orig	2012-07-19 18:39:24.000000000 +0400
-+++ release/basewsw/ui/porkui/template.rml	2014-02-06 07:52:43.000000000 +0400
-@@ -135,32 +135,9 @@
- 			}
- 		}
- 
--		String menuloc;
--		void animOpenMenu( String menu ) // This function automatically animates the content away and opens a new menu after that.
-+		void animOpenMenu( String menu ) // Don't animate on FreeBSD, as the program will crash for some reason...
- 		{
--			if( menu.length() <= 0 )
--				return;				
--				
--			URL currentURL( window.document.URL );
--			String currentDocFilename = currentURL.getFileName() + '.' + currentURL.getFileExtension();
--			if( currentDocFilename == menu ) {
--				// FIXME: not sure this works correct in all cases of valid input URL
--				return;
--			}
--
--			menuloc = menu;
--			
--			Element @body = @window.document.body;
--			Element @content = @body.getElementById( "leftside" );
--			if( @content == null )
--				return;
--				
--			MoveAnimation anim( content, ANIMATION_DURATION_FAST, ANIM_ORIGIN, ANIM_LEFT, EASE_IN, animOpenMenuCallback );
--		}
--
--		void animOpenMenuCallback()
--		{
--			window.location = menuloc;
-+			window.location = menu;
- 		}
- 
- 		void quitGame( Element @self, Event @ev )
diff --git a/games/warsow/files/patch-ui_as_asbind.h b/games/warsow/files/patch-ui_as_asbind.h
deleted file mode 100644
index 32f8f58dc04e..000000000000
--- a/games/warsow/files/patch-ui_as_asbind.h
+++ /dev/null
@@ -1,78 +0,0 @@
---- ui/as/asbind.h.orig	2012-07-21 13:38:20.000000000 +0400
-+++ ui/as/asbind.h	2014-02-06 06:32:49.000000000 +0400
-@@ -268,7 +268,7 @@
- 	}
- 
- 	// throw ?
--	template<typename T> const char * typestr() { ctassert<false>(); return "ERROR"; }
-+	template<typename T> const char * typestr();
- 
- 	template<> inline const char *typestr<signed int>() { return "int"; }
- 	template<> inline const char *typestr<unsigned int>() { return "uint"; }
-@@ -436,13 +436,7 @@
- // function string
- 
- template<typename R>
--struct FunctionStringProxy {
--	std::string operator()( const char *s )
--	{
--		ctassert<false>();
--		throw Exception( std::string("FunctionStringProxy base called with " ) + s );
--	}
--};
-+struct FunctionStringProxy;
- 
- template<typename R>
- struct FunctionStringProxy<R (*)()> {
-@@ -539,13 +533,7 @@
- 
- // method string
- 
--template<typename T> struct MethodStringProxy {
--	std::string operator()( const char *s  )
--	{
--		ctassert<false>();
--		throw Exception( std::string( "MethodStringProxy: base class called in " ) + s );
--	}
--};
-+template<typename T> struct MethodStringProxy;
- 
- //==
- 
-@@ -902,17 +890,8 @@
- // functor object to call script-function
- 
- // first define structs to get/set arguments (struct to partial-specialize)
--template<typename T> struct SetArg {
--	void operator()( asIScriptContext *ctx, int idx, T &t ) {
--		ctassert<false>();
--	}
--};
--template<typename T> struct GetArg {
--	T operator()() {
--		ctassert<false>();
--		return T();
--	}
--};
-+template<typename T> struct SetArg;
-+template<typename T> struct GetArg;
- 
- template<> struct SetArg<signed int> {
- 	void operator()( asIScriptContext *ctx, int idx, signed int &t ) { ctx->SetArgDWord( idx, t ); }
-@@ -1042,15 +1021,7 @@
- //=================
- 
- template<typename R>
--struct FunctionPtr : FunctionPtrBase {
--	FunctionPtr( asIScriptFunction *fptr=NULL ) : FunctionPtrBase( fptr ) {}
--	R operator()( void )
--	{
--		ctassert<false>();
--		throw std::runtime_error( "FunctionPtr baseclass called!" );
--		return R();
--	}
--};
-+struct FunctionPtr;
- 
- //==
-