Moving a big file to mirror

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 24 insertions, 726 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 71e31a118dff..937b8780c6f3 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/warsow
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.64 2014/10/09 15:26:25 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.65 2015/02/01 19:15:27 tupone Exp $
+
+  31 Jan 2015; Tupone Alfredo <tupone@gentoo.org> warsow-1.5.1-r1.ebuild,
+  -files/warsow-1.5.1-build.patch:
+  Moving a big file to mirror
 
   09 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org> warsow-1.5.1-r1.ebuild:
   don't build ref_gl for dedicated (bug #524796)
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index b85c07c3b784..e2025a18de0f 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -1,14 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX warsow-1.0-build.patch 16346 SHA256 626f23dc9c99eec2d1e1760e9247eb81079569ea139c165cb3ec908235e3aee7 SHA512 50131166cbd4ea39e9d77936d47ee9ca602f78f37f4f0351c188528deaebee1312b757ec4703b20a104cd23dbb5b68a948af774d67da07d1dac671c752bee4cf WHIRLPOOL 866797b10d0513269e72d2e71cda2d4860c8ca90322a426232dbcbd00cde68350a56ac484dacf350de11263ef329c5632dab5f8d0d8b08795191d6ac671ebe51
 AUX warsow-1.0-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854
-AUX warsow-1.5.1-build.patch 20729 SHA256 afeae3eebb8b143ba735b362a653ab770a4d01576d4d0d4d555b4b307bf031e5 SHA512 5393933a169767b1024bf8e0f55efed54f1aa332b0b740e02abdbeb04610d7530976f10f2c1411e64e17a1cc5014e0c2b5fc56f484648135c9fe6093d22de81b WHIRLPOOL d03ccd08d2b8a2ec2815aaf514101ddb25fb216522fb9c42fea588fd85531edf75e9062aa8cd2ae5b1e30a7dff8bccd7866dcc11e40b42cfc4644816797ae7c0
 AUX warsow-1.5.1-openal.patch 567 SHA256 b44ccb17b222d09dd6e27a450cece50f7499c79228ea9981898e80cba93259f0 SHA512 3d3a2c7f8c4167b07f5a8458a0f4d740eed38b518f3e4ce1cf71dc3c436fdaa705ffdf573c35bf8d49c1519212a7e50df6f742678d1d8a27f1f857acb152f7d1 WHIRLPOOL 2c3339eef47ee6b5109367ba351fa630315510ebd397b340490b80286b8d4fd4ef7243e57b4468b257831935c49dee98a710be7085904626342993569ef3ca5a
 AUX warsow-1.5.1-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854
+DIST warsow-1.5.1-build.patch.gz 4008 SHA256 7b1796cdc49a449772696fb4db96a654456c5f3514a82a966d98f8d72dae2b36 SHA512 3fb9eb00c1a5e28cfd3aa258a70b4c0cf4ca2618c13ff8ed1559c046e33cbd1842b836973b97eac8f90c5640c7045a34e2a6104e241f492fe794149ae4c6aac1 WHIRLPOOL 721d9a3e1ba535a52f00e45fae3aa2e9b0b741f05b81c5c171927f8de652ac4a81eb5f521abb6f9e8cd76fbda4f629a84731ddaea50fc80144e996f55e26283c
 DIST warsow.png 1692 SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 SHA512 76476fd6f624b4043405fbddeaa0fa46338b96bf46a9b64434940d9a84738a20c25243ef1316048159698b6a70b3e0f26218da3332203a93944312e77ba22c8f WHIRLPOOL 94b7c77641d5a8f581de4eb0e4e91b71f25347248a6aa6c1160e8fefda92951daa3fbbf04aee4920fc9b53fb07872d3fb7d870d4207d13844e07afa51c93e85b
 DIST warsow_1.0_sdk.tar.gz 56525636 SHA256 2e394b5c50ad206723a59636ab93448f69d8602e710ab334451badf746870e22 SHA512 dee6591fb5ed7150e3e18db20b18366777dbacd4a465074eb3c978a04b7df5140e8a7817a5248542af06d2a6eb972ad986690f16e57ac08f753cccb2470d7bfe WHIRLPOOL e30772b49f37dede19d54e129cc1ca05bf9f01c9a10f372c9c420ceba25514c6a928c12ba61e140efc5ea8d46cbd6db403ca03aee215964173662127b9dbfd59
 DIST warsow_1.0_unified.tar.gz 518459004 SHA256 f933d251de4c92b6107d4db1eef5326baf4873d32a6e2f1c3daae14bc92e85ec SHA512 78706093fb4b8684893d9b497fd10f1ce3ef096b68bbf7d36ed2bc775fa649738f0153a723b2788ef6a54d30826ec96bc36899d2e5c230bf09022b98cc105aad WHIRLPOOL efdffd7f358c704a6c08eb1d8c91543db3b76805edba775f88570debfa1b4a9ac64772958831fff7d0be4d72f2d29abbb7610d115e92cdb0fd897a8e31b1059c
 DIST warsow_1.51_sdk.tar.gz 89191554 SHA256 ac635c654e088566d30d53e8fab21abd2d40762d7f4ab0e09faa827aac5c4f97 SHA512 64de961de91eee781b90442b275d24e13239dc2b594ece665c24c1d8da75e206a00ab43a2a6f193a953e9b0173b4a93dd18fa94b9b33d92eebcb776493a8b158 WHIRLPOOL 0a1db561eedfb4cafa2bb8f91e4de121adbbb171405828936788c9fa537a821855d89dd7c5b8a9ec186ece0655f1c821b38fa07fc0c2477c61681cf354d3d657
 DIST warsow_1.51_unified.tar.gz 601553865 SHA256 94510d85e4a245b5f8c0c715ae41b1d162c96e06dbfe75ccd99fffb9a76426b5 SHA512 a6c3392010de192d9984655193cb2c4359e9e3959bb39176416936c0227e3f6060bb19149688b89e36285572045c2ab19c6ef8de71ace7cd514e30196da83da9 WHIRLPOOL 1f0bf896dd0aad18e3bf3090d856a6ecbfabfa1873d62f9f5c0ccb1fa8dd0e34f0a22e8c095030c309adf32c85894bbadc77496916bddc6302f7646f500aa6ac
 EBUILD warsow-1.0.ebuild 3438 SHA256 2718ea8e803b16d5ae1d291ada956e5993a17e120b08e651e2e3463fde1f7668 SHA512 9565869cec3087019dcf7a66cc9f19825b1e9f713f1fd8875aab053bbcbf8d4c83e24faac5452ef7c4f6b6a5547a0df8483c84d0b78f80deca587bceb823410e WHIRLPOOL fdbd305c14f3db93ff8200277eac6865bee014c04f2b8a81b1a1df3c699f05c8be889119782adfd7bf5e3c406393946b45d685400c4b7f5f4c02965fbb22a82d
-EBUILD warsow-1.5.1-r1.ebuild 3868 SHA256 9a17fcb914b9755fce046aad79b5f6692afa02eff9b4cb83fd42d82c1afb19bd SHA512 eba52970b6b066bb6b148f12f63520e50edf49b4e878df99f276be4ddcf814d4b3d45ee26656f5488dc02eb9a65c53fb2518dd43dd44c539ff90411434e3bc1d WHIRLPOOL 8bd8a9a54615db75d4311e44f8fe49dad67c3f401f92809910ea6008199f6ca09ffdf8ee9c1fe24e7635dfe00225c29a3811734b36f48f92e695059bb8f3c8f1
-MISC ChangeLog 9693 SHA256 4ebbeb7807235368f5ee332133541f2aa1ded271b9582f68fce7681842e8dea9 SHA512 ba5cd55cada1e0f37a5eedd46b0ba042ff25ebd3d2d699fc7a037294430b82f99a03274d2dca34be953f6db2ed94fe980e75b558214c96671dbe87a60ea11328 WHIRLPOOL c006d729c5d379337a042c1a8072e07ba6a7ab1391a67eb1d39b9b8fa0080d7a4723423b9f175aae1cc6a3481cc2b95e7691e04ec39f0cde90c7813a60b7533a
+EBUILD warsow-1.5.1-r1.ebuild 3901 SHA256 557748c3fe457688201e47feef7c0427451e379135a144bae0fbdb655b1280f6 SHA512 cb209d7bed5e0986506b88b4513d9bfdc5e6de397ea9c46fac0ec13dc849a332d70f43e87235a2c8a0f1d506adce235d3689609aefd038f99a0c4fae5f075e59 WHIRLPOOL 812296cff5e5ec4e33e7f1827006949725f4535c0c7e4174516ec7f962be31c84a931ea2d3d57543fc125f0f95e68303130379485a936aee898bae265e5ffa4d
+MISC ChangeLog 9830 SHA256 c0e81401a837f65a4e3ad4ef729f3b3da5f5a7cef2ef816bf8860a7e96ca39cd SHA512 8b68868ba5925f09d722ba723887397a67cbac868b67fd98d553eb26a335c6f14197ec6d4b6d9e7c4d9038af61042840642229a058b502901dd005f3efc27516 WHIRLPOOL 800fff18bacaa9578e3e95d7bef41e1fb97c82bede6e2e77162c4b10ac8b1016a92e8f3511a5051dc63efc1973dad390de63c2837064aec3f3f6496500595444
 MISC metadata.xml 347 SHA256 016dbabb997c28f241f054760d9b81b1c43f5161de6d53936a2ebeb78bccdbea SHA512 34e3d6eae3b4665eac573b096d83a2841aee4488cc1a237e54e6e12c0c7ad8caefbbde6b563d1421c9d68cf7fb2b6c2446dfeddb1390971a7630b5efa494cb77 WHIRLPOOL 9d4cbde23eacc798cb4f1ac0c504963d349619229a5c2e926d8fc1348b1fefc53e999cc21e0be0cdca58affd1bfd4a275ae633709af78ca3dc808431fa365db3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTOe1QACgkQIY77eQFFFC2gHgCgjJZAlTivBYygQjq8kkwP2wQv
+nekAoLqmIIzRlYuj4pWPNJJLB5IFXP/4
+=qFE4
+-----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/warsow-1.5.1-build.patch b/games-fps/warsow/files/warsow-1.5.1-build.patch
deleted file mode 100644
index 97af14eeae3b..000000000000
--- a/games-fps/warsow/files/warsow-1.5.1-build.patch
+++ /dev/null
@@ -1,717 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Oct 11 15:00:18 UTC 2012
-Subject: build system
-
-a) respect flags/linker
-b) don't take ARCH from env (we set BASE_ARCH in the ebuild)
-c) split LDFLAGS and LDFLAGS_COMMON as per bug
-  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
-d) don't remove angel-lib (compilation fails, why is this?)
-e) make output verbose
-f) remove start-scripts
-g) address parallel make issues
-
---- source/Makefile
-+++ source/Makefile
-@@ -33,6 +33,17 @@
- # Build Warsow client without server capabilities?
- BUILD_THIN_CLIENT?=NO
- 
-+# use system libRocket
-+SYSTEM_LIBS=NO
-+
-+# enable verbosity
-+V=NO
-+
-+ifneq ($(V),YES)
-+Q=@
-+endif
-+
-+
- ###########################################################
- 
- ifeq ($(USE_MINGW),YES)
-@@ -54,10 +65,10 @@
- else
- CC?=gcc
- CXX?=g++
--LD=gcc
--LXX=g++
--AR=ar
--RANLIB=ranlib
-+LD=$(CC)
-+LXX=$(CXX)
-+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/)
-@@ -66,7 +77,7 @@
- ifeq ($(OS),FreeBSD)
- ARCH?=freebsd_$(BASE_ARCH)
- else
--ARCH?=$(BASE_ARCH)
-+ARCH=$(BASE_ARCH)
- endif
- 
- ifeq ($(ARCH),x86_64)
-@@ -83,7 +94,7 @@
- 
- ifeq ($(DEBUG_BUILD), YES)
- BINDIR=debug
--CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
-+CFLAGS_DEBUG=-D_DEBUG
- else
- BINDIR=release
- endif
-@@ -136,7 +147,11 @@
- LIBROCKET_INC=$(LIBROCKET_DIR)/Include
- LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
- 
-+ifneq ($(SYSTEM_LIBS),YES)
- CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
-+else
-+CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC)
-+endif
- # add the base of ui to inclusions
- CFLAGS_ROCKET+=-Iui
- 
-@@ -231,9 +246,9 @@
- ####################### NORMAL *NIX? ######################
- LOCALBASE?=/usr/local
- 
--CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden -Winvalid-pch
--CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG -msse2
--CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
-+CFLAGS_COMMON=-I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden
-+CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
-+CFLAGS_DEBUG=-D_DEBUG
- ifeq ($(DEBUG_BUILD),YES)
- CFLAGS_COMMON+=$(CFLAGS_DEBUG)
- else
-@@ -245,18 +260,18 @@
- CFLAGS_MODULE=-DPIC -fPIC
- CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
- 
--LDFLAGS_COMMON=$(LDFLAGS)
--LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
-+LDFLAGS_COMMON=
-+LXXFLAGS_COMMON=-lstdc++ -lsupc++
- 
- ifeq ($(OS),FreeBSD)
- LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm
- else
--LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm -ldl -O1 -Wl,--as-needed
-+LDFLAGS_COMMON+= -ldl -lm
- endif
- 
- ifneq ($(DEBUG_BUILD),YES)
--LDFLAGS_COMMON+= -s
--LXXFLAGS_COMMON+= -s
-+LDFLAGS_COMMON+=
-+LXXFLAGS_COMMON+=
- endif
- 
- ifeq ($(ARCH),x86_64)
-@@ -270,8 +285,12 @@
- LDFLAGS_MODULE=-shared
- LDFLAGS_TV_SERVER=-lz -lpthread $(shell curl-config --libs)
- 
-+ifneq ($(SYSTEM_LIBS),YES)
- # static link to custombuilt lib
- LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
-+else
-+LDFLAGS_ROCKET = -lRocketCore -lRocketControls
-+endif
- 
- # openal
- ifeq ($(BUILD_SND_OPENAL),YES)
-@@ -357,12 +376,18 @@
- ######################################################################################################
- # Helper functions
- ######################################################################################################
-+ifneq ($(V),YES)
- DO_CC=echo "  > Compiling $<" && \
- 	$(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 $@
-+else
-+DO_CC=$(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
-+DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
-+DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@
-+endif
- 
- DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
- DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
-@@ -627,10 +652,10 @@
- 
- all: client openal qf ded ui cgame game irc cin ftlib steamlib ref_gl angelwrap tv_server
- 
--client: $(BUILDDIRS) message-client compile-client link-client start-script-client
-+client: $(BUILDDIRS) message-client compile-client link-client
- openal: $(BUILDDIRS) message-openal compile-openal link-openal
- qf: $(BUILDDIRS) message-qf compile-qf link-qf
--ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
-+ded: $(BUILDDIRS) message-ded compile-ded link-ded
- ui: $(BUILDDIRS) message-ui compile-ui link-ui
- cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
- game: $(BUILDDIRS) message-game compile-game link-game
-@@ -640,7 +665,7 @@
- steamlib: $(BUILDDIRS) message-steamlib compile-steamlib link-steamlib
- ref_gl: $(BUILDDIRS) message-ref_gl compile-ref_gl link-ref_gl
- angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap
--tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server
-+tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server
- 
- clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-ui clean-librocket clean-cgame clean-game clean-irc clean-cin clean-ftlib clean-steamlib clean-ref_gl clean-angelwrap clean-tv_server
- 
-@@ -734,7 +759,12 @@
- 	@echo "> *********************************************************"
- 	@echo "> * Building ui"
- 	@echo "> *********************************************************"
-+ifneq ($(SYSTEM_LIBS),YES)
- compile-ui: $(PCH_UI_ROCKET) $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
-+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
-+else
-+compile-ui: $(PCH_UI_ROCKET) $(OBJS_UI_ROCKET)
-+endif
- link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
- clean-ui:
- 	@echo "  > Removing ui objects" && \
-@@ -742,7 +772,7 @@
- 
- $(LIBROCKET_LIB):
- 	@echo "> * Building Rocket library"
--	@CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
-+	@CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
- 	@echo "> * Done building RocketCore library."
- 	@echo "> *********************************************************"
- 	@echo "> * Continuing ui building..."
-@@ -828,7 +858,7 @@
- 
- $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
- 	@echo "> * Building Angelscript library first"
--	@CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
-+	@CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
- 	@echo "> * Done building angelscript library."
- 	@echo "> *********************************************************"
- 	@echo "> * Continuing angelwrap building..."
-@@ -863,80 +893,86 @@
- ########
- $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
- 	@echo "  > Linking $@" && \
--	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
- 
- #########
- # CLIENT
- #########
- ifeq ($(OS),Darwin)
- $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
--	@echo "  > Linking $@" && \
--	$(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
- else
- $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
--	@echo "  > Linking $@" && \
--	$(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
- endif
- 
- #########
- # OPENAL
- #########
- $(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
--	@echo "  > Linking $@" && \
--	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
- 
- #########
- # QF
- #########
- $(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
--	@echo "  > Linking $@" && \
--	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
- 
- ########
- # .SO
- ########
- $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
--	@echo "  > Linking $@" && \
--	$(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
- 
- $(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME)
--	@echo "  > Linking $@" && \
--	$(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE)
--
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-+
-+ifneq ($(SYSTEM_LIBS),YES)
- $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
--	@echo "  > Linking $@" && \
--	$(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
-+	@echo "  > Linking $@"
-+	$(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
-+else
-+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET)
-+	@echo "  > Linking $@"
-+	$(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
-+endif
- 
- $(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC)
--	@echo "  > Linking $@" && \
--	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
- 
- $(BINDIR)/libs/cin_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CIN)
--	@echo "  > Linking $@" && \
--	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
- 
- $(BINDIR)/libs/ftlib_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_FTLIB)
--	@echo "  > Linking $@" && \
--	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_FTLIB)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_FTLIB)
- 
- $(BINDIR)/libs/steamlib_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_STEAMLIB)
--	@echo "  > Linking $@" && \
--	$(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_STEAMLIB)
-+	@echo "  > Linking $@"
-+	$(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_STEAMLIB)
- 
- $(BINDIR)/libs/ref_gl_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_REF_GL)
--	@echo "  > Linking $@" && \
--	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_REF_GL)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_REF_GL)
- 
- $(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP) $(ANGELSCRIPT_LIB)
--	@echo "  > Linking $@" && \
--	$(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
-+	@echo "  > Linking $@"
-+	$(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
- 
- ########
- # TV
- ########
- $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
--	@echo "  > Linking $@" && \
--	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
-+	@echo "  > Linking $@"
-+	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
- 
- ######################################################################################################
- # Meta Rules
-@@ -948,181 +984,181 @@
- # CLIENT
- ########
- $(BUILDDIR)/client/%.o: qcommon/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- 
- $(BUILDDIR)/client/%.o: server/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- 
- $(BUILDDIR)/client/%.o: client/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- 
- $(BUILDDIR)/client/%.o: null/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- 
- $(BUILDDIR)/client/%.o: matchmaker/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- 
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/client/%.o: win32/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- 
- $(BUILDDIR)/client/%.o: win32/%.rc
--	@$(DO_RES_CLIENT)
-+	$(Q)$(DO_RES_CLIENT)
- else
- ifeq ($(OS),Darwin)
- $(BUILDDIR)/client/%.o: mac/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- $(BUILDDIR)/client/%.o: unix/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- else
- $(BUILDDIR)/client/%.o: unix/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- endif
- endif
- 
- $(BUILDDIR)/client/%.o: gameshared/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- $(BUILDDIR)/client/%.o: qalgo/%.c
--	@$(DO_CC_CLIENT)
-+	$(Q)$(DO_CC_CLIENT)
- 
- $(BINDIR)/warsow: unix/start_script.sh
--	@echo "  > Installing client start script" && \
--	cp $< $@ && \
-+	@echo "  > Installing client start script" \
-+	$(Q)cp $< $@ && \
- 	chmod a+x $@
- 
- ########
- # OPENAL
- ########
- $(BUILDDIR)/openal/%.o: snd_openal/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_OPENAL)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
- $(BUILDDIR)/openal/%.o: snd_common/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_OPENAL)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
- 	
- $(BUILDDIR)/openal/%.o: gameshared/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- $(BUILDDIR)/openal/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 	
- ########
- # QF
- ########
- $(BUILDDIR)/qf/%.o: snd_qf/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_QF)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_QF)
- $(BUILDDIR)/qf/%.o: snd_common/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_QF)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_QF)
- 
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/qf/win_snd.o: win32/win_snd.c
--	@$(DO_CC_MODULE) $(CFLAGS_DSOUND)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND)
- else
- $(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
--	@$(DO_CC_MODULE) $(CFLAGS_QF)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_QF)
- endif
- 
- $(BUILDDIR)/qf/%.o: gameshared/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- $(BUILDDIR)/qf/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- ########
- # DED
- ########
- $(BUILDDIR)/ded/%.o: qcommon/%.c
--	@$(DO_CC_DED)
-+	$(Q)$(DO_CC_DED)
- 
- $(BUILDDIR)/ded/%.o: server/%.c
--	@$(DO_CC_DED)
-+	$(Q)$(DO_CC_DED)
- 
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/ded/%.o: win32/%.c
--	@$(DO_CC_DED)
-+	$(Q)$(DO_CC_DED)
- else
- $(BUILDDIR)/ded/%.o: unix/%.c
--	@$(DO_CC_DED)
-+	$(Q)$(DO_CC_DED)
- endif
- 
- $(BUILDDIR)/ded/%.o: null/%.c
--	@$(DO_CC_DED)
-+	$(Q)$(DO_CC_DED)
- 
- $(BUILDDIR)/ded/%.o: game/%.c
--	@$(DO_CC_DED)
-+	$(Q)$(DO_CC_DED)
- 
- $(BUILDDIR)/ded/%.o: gameshared/%.c
--	@$(DO_CC_DED)
-+	$(Q)$(DO_CC_DED)
- 
- $(BUILDDIR)/ded/%.o: qalgo/%.c
--	@$(DO_CC_DED)
-+	$(Q)$(DO_CC_DED)
- 	
- $(BUILDDIR)/ded/%.o: matchmaker/%.c
--	@$(DO_CC_DED)
-+	$(Q)$(DO_CC_DED)
- 
- $(BINDIR)/wsw_server: unix/start_script.sh
--	@echo "  > Installing dedicated server start script" && \
--	cp $< $@ && \
-+	@echo "  > Installing dedicated server start script" \
-+	$(Q)cp $< $@ && \
- 	chmod a+x $@
- 
- ########
- # CGAME
- ########
- $(BUILDDIR)/cgame/%.o: cgame/%.cpp
--	@$(DO_CXX_MODULE)
-+	$(Q)$(DO_CXX_MODULE)
- 
- $(BUILDDIR)/cgame/%.o: gameshared/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/cgame/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- ########
- # GAME
- ########
- $(BUILDDIR)/game/%.o: game/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_GAME)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_GAME)
- 
- $(BUILDDIR)/game/%.o: game/ai/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_GAME)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_GAME)
- 
- $(BUILDDIR)/game/%.o: gameshared/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_GAME)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_GAME)
- 
- $(BUILDDIR)/game/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 	
- $(BUILDDIR)/game/%.o: matchmaker/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_GAME)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_GAME)
- 
- ########
- # UI.ROCKET
- ########
- $(BUILDDIR)/ui/pch/ui_precompiled.h.gch: ui/ui_precompiled.h
--	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
- 
- $(BUILDDIR)/ui/%.o: gameshared/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/ui/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/ui/%.o: ui/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
- 
- $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
- 
- $(BUILDDIR)/ui/%.o: ui/as/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(Q)@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
- 
- $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
- 
- $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
- 
- $(BUILDDIR)/ui/%.o: ui/parsers/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
- 
- $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
- 
- #$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
- #	@$(DO_CC_MODULE)
-@@ -1131,66 +1167,66 @@
- # IRC
- ########
- $(BUILDDIR)/irc/%.o: gameshared/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/irc/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/irc/%.o: irc/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- ########
- # CIN
- ########
- $(BUILDDIR)/cin/%.o: gameshared/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/cin/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/cin/%.o: cin/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_CIN)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
- 
- ########
- # FTLIB
- ########
- $(BUILDDIR)/ftlib/%.o: gameshared/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/ftlib/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/ftlib/%.o: ftlib/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_FTLIB)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_FTLIB)
- 
- ########
- # STEAMLIB
- ########
- $(BUILDDIR)/steamlib/%.o: steamlib/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_STEAMLIB)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_STEAMLIB)
- 
- ########
- # REF_GL
- ########
- $(BUILDDIR)/ref_gl/%.o: gameshared/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/ref_gl/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/ref_gl/%.o: qcommon/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/ref_gl/%.o: ref_gl/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_REF_GL)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_REF_GL)
- 
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/ref_gl/%.o: win32/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- else
- ifeq ($(OS),Darwin)
- $(BUILDDIR)/ref_gl/%.o: mac/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- else
- $(BUILDDIR)/ref_gl/%.o: unix/%.c
- 	@$(DO_CC_MODULE)
-@@ -1201,52 +1237,52 @@
- # ANGELWRAP
- ########
- $(BUILDDIR)/angelwrap/%.o: gameshared/%.c
--	@$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-+	$(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
- 
- $(BUILDDIR)/angelwrap/%.o: qalgo/%.c
--	@$(DO_CC_MODULE)
-+	$(Q)$(DO_CC_MODULE)
- 
- $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
- 
- $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
--	@$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
- 
- ########
- # TV SERVER
- ########
- $(BUILDDIR)/tv_server/%.o: qcommon/%.c
--	@$(DO_CC_TV_SERVER)
-+	$(Q)$(DO_CC_TV_SERVER)
- 
- $(BUILDDIR)/tv_server/%.o: client/%.c
--	@$(DO_CC_TV_SERVER)
-+	$(Q)$(DO_CC_TV_SERVER)
- 
- $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
--	@$(DO_CC_TV_SERVER)
-+	$(Q)$(DO_CC_TV_SERVER)
- 
- $(BUILDDIR)/tv_server/%.o: tv_server/%.c
--	@$(DO_CC_TV_SERVER)
-+	$(Q)$(DO_CC_TV_SERVER)
- 
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/tv_server/%.o: win32/%.c
--	@$(DO_CC_TV_SERVER)
-+	$(Q)$(DO_CC_TV_SERVER)
- else
- $(BUILDDIR)/tv_server/%.o: unix/%.c
--	@$(DO_CC_TV_SERVER)
-+	$(Q)$(DO_CC_TV_SERVER)
- endif
- 
- $(BUILDDIR)/tv_server/%.o: null/%.c
--	@$(DO_CC_TV_SERVER)
-+	$(Q)$(DO_CC_TV_SERVER)
- 
- $(BUILDDIR)/tv_server/%.o: gameshared/%.c
--	@$(DO_CC_TV_SERVER)
-+	$(Q)$(DO_CC_TV_SERVER)
- 
- $(BUILDDIR)/tv_server/%.o: qalgo/%.c
--	@$(DO_CC_TV_SERVER)
-+	$(Q)$(DO_CC_TV_SERVER)
- 
- $(BINDIR)/wswtv_server: unix/start_script.sh
--	@echo "  > Installing TV server start script" && \
--	cp $< $@ && \
-+	@echo "  > Installing TV server start script" \
-+	$(Q)cp $< $@ && \
- 	chmod a+x $@
- 
- ######################################################################################################
---- libsrcs/libRocket/libRocket/Build/Makefile.qfusion
-+++ libsrcs/libRocket/libRocket/Build/Makefile.qfusion
-@@ -15,9 +15,9 @@
- endif
- 
- ifeq ($(DEBUG_BUILD),YES)
--	CXXFLAGS += -g -DROCKET_DEBUG
-+	CXXFLAGS += -DROCKET_DEBUG
- else
--	CXXFLAGS += -O2
-+	CXXFLAGS +=
- endif
- 
- BUILDDIR=obj
diff --git a/games-fps/warsow/warsow-1.5.1-r1.ebuild b/games-fps/warsow/warsow-1.5.1-r1.ebuild
index 80895b2bf67c..2c08be60109b 100644
--- a/games-fps/warsow/warsow-1.5.1-r1.ebuild
+++ b/games-fps/warsow/warsow-1.5.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.5.1-r1.ebuild,v 1.3 2014/10/09 15:26:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.5.1-r1.ebuild,v 1.4 2015/02/01 19:15:27 tupone Exp $
 
 EAPI=5
 inherit eutils check-reqs gnome2-utils flag-o-matic games
@@ -16,7 +16,8 @@ DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
 HOMEPAGE="http://www.warsow.net/"
 SRC_URI="http://www.warsow.eu/${ENGINE_P}.tar.gz
 	http://www.warsow.eu/warsow_${DATA_PV}_unified.tar.gz
-	mirror://gentoo/warsow.png"
+	mirror://gentoo/warsow.png
+	mirror://gentoo/${P}-build.patch.gz"
 
 # ZLIB: bundled angelscript
 LICENSE="GPL-2 ZLIB warsow"
@@ -77,7 +78,7 @@ src_prepare() {
 	find . -type f -exec sed -i 's/\r$//' '{}' + || die
 
 	cd "${S}"/.. || die
-	epatch "${FILESDIR}"/${P}-build.patch \
+	epatch "${WORKDIR}"/${P}-build.patch \
 		"${FILESDIR}"/${P}-pic.patch \
 		"${FILESDIR}"/${P}-openal.patch
 	epatch_user