gentoo resync : 24.06.2021

9 files changed, 17 insertions, 699 deletions

diff --git a/games-arcade/epiar/Manifest b/games-arcade/epiar/Manifest
index 1a23d18677b3..f2a3424e96b2 100644
--- a/games-arcade/epiar/Manifest
+++ b/games-arcade/epiar/Manifest
@@ -1,13 +1,5 @@
-AUX epiar-0.5-Makefile.linux.patch 630 BLAKE2B ff0d5db4ffaf7bcff729949850417f041656e0ad0c5de67fbcec677aa3c98ced091cff58f889d76dac48f08538dd54404b19d63e4209438ee63a2bddd2220412 SHA512 412c512c41c0858c590b6985c02725d6b0d05880ba4db720188227ac95327f0d3feb4feb77ef6bf2ce2bc595d99a341dcd048f6c0d6d1d48def9ed060548da8e
-AUX epiar-0.5-gcc41.patch 260 BLAKE2B e376243f0c9b6c68e214b2dde7944c785cea339968f2e638de5db8b91d314cfe22cc7cffe10586107c8e3850448adf1208889a279bc25fbab53bd3d57ff0f74b SHA512 3c46bf77afe021d7d9c1ee3ef5c6bda3faaf4568d09873c2d39ceb593bc1b07c9cdd3739c9c00ef4cec842a189641a8c729becde5373b54ff04bdc7429fa7075
-AUX epiar-0.5-paths.patch 2215 BLAKE2B 85c4ae921c974a015e5c53e170387d10a12d3f1bd22159dccc6661ea1b7ae42538d9f095a84074e113cc8e5c9d500adffd08b2de01afa8a1100071ef6966e412 SHA512 c5c06280bdba3591e7e12b8fd57726821eaa53244418be4bcc4054ee9fcc1bf28da8ca06a9b3ef1263e8c5ab091e47927c6fe9542d7ce146857e328b5e8517b2
-AUX epiar-0.5-respect-CC.patch 814 BLAKE2B 2a2ccb2f55288796c99ae2ece44b923136ebff2988cf5042510a723e4fa0dd2cc91c7d1847ad5f5ab57d98a07dcd75ad620bb2da6cad8c142d9c202e0f1fe60a SHA512 c7100d1aa495c81a08f644d681f069f527d1d3f80ae8fee8129a3230a8bd359e83d38786db029b7a829fc2a71affa51d0fc958794070de0bd797808c70dfbd5e
-AUX epiar-0.5-underlink.patch 746 BLAKE2B 43f42641e01052db79846da7915bd01769dc8532174aeb81bdba214e345140a2afe88a3f72635ea9545042bbc695a0a4210bf94ee661ef257280bf318483fcbc SHA512 bd832844b2061a9b96c4bb50184a54d08cc591f66429083354f3d88a87f0a49ac1f0db0d0f9d2184beee9f90810e1200d318fe82248212d5d86d383b12367916
-AUX epiar-0.5-unsilence-build.patch 14334 BLAKE2B bcb119fb4d69d33772267deda942b53984bf8e2dae265bca62a39cddde863f041b171e42ce193684cf37899074f3808dbd0939556857927de71033259acfb34b SHA512 eefe9b37a4115bb648fe49a134be8c7675b611bf58061db3d68c03b3e455ec38004d25363e4a735880a3f0d14219ed98966e447111b20428c8d7b590a334f9ae
 AUX epiar-0.5.1-fix-bashisms.patch 1030 BLAKE2B e0e1515239d7817e2048e6ced27a9fc145105553ad29678cc5eabeafd2d8a036e671e919fd4407838869e581fc4c087cc995cce0b479f328b32670332ac9fa3a SHA512 3ce20334179a31c71474db4ed6eb3659feb101545871706fa6c9fe0a437533e0f50ebc2e23a64ba067d01264e1f6855bf84214f7fdaa08a0859a96e7885b9691
 AUX epiar-0.5.1-unbundle-lua5.1.patch 1315 BLAKE2B 1c188513e9b787fc4c331c954d454db11c408756ddf80a5664e069b833fd14bf4c77684674f14922a6d43e2e7f9f1b758339221a0db6d72a821b3e7c1000cc06 SHA512 1a7747609bdaa8f910223f349d42e60fa4bbce3c52952faf56fc262db52b014a970a68669276790e0580bc4b439f47f16eedceeb72843c2119171c8279507b7d
-DIST epiar-0.5.0-src.zip 8809392 BLAKE2B c29c541f5841da91d13f7ccddfa2d2175265a434ae03e2ed87a64cd5c177d7139ff2cf44ec679ec023fe783427868f0f234c6f5f49d0d52ab08be852d424ba59 SHA512 22d8655aefd3aa071de064aeeed40d8780fb32ee702e657c8b8a723c381b6825ae9b5820cf5b29991e14bc264c443d0b24f88656b4997a6270383aa080c15f3e
 DIST epiar-0.5.1.tar.gz 35576547 BLAKE2B 6648eeccbe86e6935f53d83e5a58aa5839dbec2f5a8c408fd4d8a95e303daa8877c001f5dd4e37a2b72b3c24df646236c850c57c1a1d000fca63177cf075c729 SHA512 ce09aaafc455f3f9721d46a1703bf110ae00041234627b2b5fb4a9489f38672d0d0600b01a65d210728a50b596a51aacddc525d50d1138a6959db421b9384c40
-EBUILD epiar-0.5-r1.ebuild 1197 BLAKE2B 4f2dc48d2b421651d2000adc4b722d3e570fba1c35aba04508f14564b40a47b23bcd2c7c34b654b8fd656aa4a2d50791e08cae2b7814f110c88632796edaa4e4 SHA512 64e732bd2e0c3ca4b5f35a1fc6e4291a0bf391a9ad9125817318572ff74e70e87472c0495de189e1bc5f185754f989c94d4959a351e0bd935286439191271cbc
-EBUILD epiar-0.5.1.ebuild 873 BLAKE2B 41d337a56a03023011212bc858be0b90f7107eee990d149006e93b47dc84a6c545b47d66f27c1d0f30be7eaab3913117ad772cc43ab99ccd8c36d8bb809b8685 SHA512 29a1636387c2a6a8814bdf10c681efa147f67f4bb4e294f036d9ef7b59176a1adcce8364ce1d2f41c9a9ed9e8c4dfab08f39ccec89a81fe9e01f8a23a4691257
+EBUILD epiar-0.5.1-r1.ebuild 1021 BLAKE2B a2f6f02f776cb2d012c776e821bf15c2f3d4944345965cea7fe930c907d44bae96806b4759a9013184f8db8ec208ee7e9c5bb1ba17767e64849e9fcd319d809e SHA512 02189e1e5d5a93116366bdb128fe55cdbf2bef7f56df76d074c4ca3b54941747a0f7825314e18f3b436051ab510fc13577c89b354f75c9e89e89a41c935e7b45
 MISC metadata.xml 880 BLAKE2B 4f4dda3a961b4324d6f619579c35cf846f68522deb3d3da44af4632ba2d5b425188d9290f7b6616043d55f1b13f8bb95cf2f173f57ebd96333bc2615b56c3b92 SHA512 9ac27c5206acab0ed599e47b66a57d5c2f674075d72ebda527130745774bf95a8f3c0e2acc8d6f5938f82a695bfa3e12889fa90d5b2dda0b15410bf433858bcd
diff --git a/games-arcade/epiar/epiar-0.5-r1.ebuild b/games-arcade/epiar/epiar-0.5-r1.ebuild
deleted file mode 100644
index ba57731041dd..000000000000
--- a/games-arcade/epiar/epiar-0.5-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A space adventure/combat game"
-HOMEPAGE="https://sourceforge.net/projects/epiar/"
-SRC_URI="mirror://sourceforge/epiar/${P}.0-src.zip"
-S="${WORKDIR}"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-image[png]
-"
-DEPEND="
-	${RDEPEND}
-	x11-libs/libX11
-	virtual/opengl
-"
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-paths.patch
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-Makefile.linux.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-unsilence-build.patch
-	"${FILESDIR}"/${P}-respect-CC.patch
-)
-
-src_prepare() {
-	default
-
-	append-cflags -fcommon
-
-	sed -i \
-		-e "/^CFLAGS/s:-pg -g:${CFLAGS} ${CPPFLAGS} ${LDFLAGS}:" \
-		Makefile.linux || die
-
-	sed -i \
-		-e "s:GENTOO_DATADIR:/usr/share/${PN}/:" \
-		src/main.c || die
-}
-
-src_compile() {
-	emake \
-		-j1 \
-		-f Makefile.linux \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin epiar
-
-	insinto /usr/share/${PN}
-	doins -r missions *.eaf
-
-	keepdir /usr/share/${PN}/plugins
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/games-arcade/epiar/epiar-0.5.1.ebuild b/games-arcade/epiar/epiar-0.5.1-r1.ebuild
index 83ff1fd13f13..ba4c0b862a2c 100644
--- a/games-arcade/epiar/epiar-0.5.1.ebuild
+++ b/games-arcade/epiar/epiar-0.5.1-r1.ebuild
@@ -6,34 +6,26 @@ EAPI=7
 LUA_COMPAT=( lua5-1 )
 inherit autotools lua-single
 
-DESCRIPTION="A space adventure/combat game"
+DESCRIPTION="Space adventure/combat game"
 HOMEPAGE="https://epiar.net/"
 SRC_URI="https://github.com/cthielen/Epiar/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
+	${LUA_DEPS}
 	dev-games/physfs
 	dev-libs/libxml2
 	media-libs/ftgl
-	media-libs/libsdl[video]
+	media-libs/libsdl[opengl,sound,video]
 	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-	${LUA_DEPS}
-"
-DEPEND="
-	${RDEPEND}
-	x11-libs/libX11
-	virtual/opengl
-"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
+	media-libs/sdl-mixer[vorbis]
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.5.1-unbundle-lua5.1.patch
@@ -44,7 +36,15 @@ src_prepare() {
 	default
 
 	# Remove bundled Lua 5.1
-	rm -rf source/lua || die
+	rm -r source/lua || die
 
 	eautoreconf
 }
+
+src_install() {
+	default
+
+	# Game fails to start without this otherwise missing font.
+	insinto /usr/share/epiar/resources/Fonts
+	doins resources/Fonts/FreeSansBold.ttf
+}
diff --git a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch b/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch
deleted file mode 100644
index baf89abc3f9a..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -24,7 +24,7 @@
- 	@echo Building Epiar 0.5.0 ...
- 	@$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS)
- 	@echo Building plugins ...
--	@make -f Makefile.linux plugin
-+	@$(MAKE) -f Makefile.linux plugin
- 	@echo Epiar 0.5.0 build complete.
- 	@echo
- 	@echo Type './epiar' to play.
-@@ -33,7 +33,7 @@
- 	@echo Building Epiar 0.5.0 and linking statically ...
- 	@$(CC) $(CFLAGS) -L/usr/X11R6/lib -L/opt/gnome-2.1/lib $(OBJS) -o epiar $(STATIC_LIBS)
- 	@echo Building plugins ...
--	@make plugin
-+	@$(MAKE) plugin
- 	@echo Epiar 0.5.0 build complete.
- 	@echo
- 	@echo Type './epiar' to play.
diff --git a/games-arcade/epiar/files/epiar-0.5-gcc41.patch b/games-arcade/epiar/files/epiar-0.5-gcc41.patch
deleted file mode 100644
index 7bc0e28d99cf..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-gcc41.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/game/game.h
-+++ b/src/game/game.h
-@@ -2,7 +2,6 @@
- #include "includes.h"

- 

- extern Uint32 average_loop_time;

--extern Uint32 game_start_time;

- extern Uint32 total_play_time, total_frames_drawn;

- extern float average_session_fps, current_fps;

- 

diff --git a/games-arcade/epiar/files/epiar-0.5-paths.patch b/games-arcade/epiar/files/epiar-0.5-paths.patch
deleted file mode 100644
index 0401a029e03a..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-paths.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/src/input/input.c
-+++ b/src/input/input.c
-@@ -240,7 +240,10 @@
- *

- ******************************************************************************/

- int load_input_cfg(void) {

--	FILE *fp = fopen("./.epiar-input.ecf", "rb");

-+	char filename[PATH_MAX];
-+	FILE *fp;
-+	snprintf(filename, sizeof(filename), "%s/.epiar-input.ecf", getenv("HOME"));
-+	fp = fopen(filename, "rb");

- 

- 	/* make sure all keys are enabled */

- 	unlock_keys();

-@@ -282,7 +285,7 @@
- 	} else {

- 		float file_version = 0.0f;

- 		/* read the file into the struct */

--		fp = fopen("./.epiar-input.ecf", "rb");

-+		fp = fopen(filename, "rb");

- 

- 		if (fp == NULL) {

- 			fprintf(stdout, "Could not open \"./.epiar-input.ecf\" for reading, assuming default bindings.\n");

-@@ -472,10 +475,12 @@
- }

- 

- void save_keybindings(void) {

-+	char filename[PATH_MAX];
- 	float file_version = 0.2f;

- 	FILE *fp;

- 

--	fp = fopen("./.epiar-input.ecf", "wb");

-+	snprintf(filename, sizeof(filename), "%s/.epiar-input.ecf", getenv("HOME"));
-+	fp = fopen(filename, "wb");

- 	if (fp == NULL) {

- 		fprintf(stdout, "Could not create '~/.epiar-input.ecf' to save keybindings\n");

- 		return;

---- a/src/main.c
-+++ b/src/main.c
-@@ -16,7 +16,7 @@
- unsigned char view_mode = 0;

- int ship_to_follow = 0;

- int desired_bpp = 16;

--char *game_path;

-+const char * const game_path = "GENTOO_DATADIR";

- unsigned char use_ogl = 0;

- unsigned char skip_intro = 0;

- FILE *epiar_eaf = NULL, *main_eaf = NULL;

-@@ -78,8 +78,6 @@
- 

- 	parse_commandline(argc, argv);

- 

--	get_absolute_path(argv[0]);

--

- 	init(desired_bpp);

- 

- 	menu();

---- a/src/main.h
-+++ b/src/main.h
-@@ -1,2 +1,2 @@
- extern char epiar_version[6];

--extern char *game_path;

-+extern const char * const game_path;

---- a/src/system/init.c
-+++ b/src/system/init.c
-@@ -89,9 +89,6 @@
- 		main_eaf = NULL;

- 	}

- 

--	assert(game_path != NULL);

--	free(game_path);

--	game_path = NULL;

- 

- 	if (average_loop_time == 0) average_loop_time = 18; /* in case they quit on menu */

- #ifndef NDEBUG

---- a/src/system/path.c
-+++ b/src/system/path.c
-@@ -45,7 +45,7 @@
- }

- #endif

- 

--#ifdef LINUX

-+#if 0

- char *strip_path_of_binary(char *argv) {

- 	int len = 0, i, blen = 0;

- 	char *stripped = NULL;

diff --git a/games-arcade/epiar/files/epiar-0.5-respect-CC.patch b/games-arcade/epiar/files/epiar-0.5-respect-CC.patch
deleted file mode 100644
index cf2d1d866f95..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-respect-CC.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 74b0233e06365262ca6fc9bde1cfb70051acb83c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 6 Apr 2021 23:38:53 +0000
-Subject: [PATCH 2/2] respect CC
-
----
- Makefile.linux | 2 +-
- tools/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.linux b/Makefile.linux
-index 903e392..aad4b49 100644
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -18,7 +18,7 @@ timer.o target.o zoom.o r_ships.o warship.o maneuvers.o gate_defender.o
- 
- PLUGIN_OBJS=
- 
--CC=cc
-+CC?=cc
- 
- default: $(OBJS)
- 	echo Building Epiar 0.5.0 ...
-diff --git a/tools/Makefile b/tools/Makefile
-index 8491658..a3f940d 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -1,5 +1,5 @@
- default:
--	gcc -Wall main.c -o eaf_util
-+	$(CC) -Wall main.c -o eaf_util
- 
- clean:
- 	rm -rf eaf_util
--- 
-2.31.1
-
diff --git a/games-arcade/epiar/files/epiar-0.5-underlink.patch b/games-arcade/epiar/files/epiar-0.5-underlink.patch
deleted file mode 100644
index fb4669be90cb..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-underlink.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -1,6 +1,6 @@
- CFLAGS=-W -Wall `sdl-config --cflags` -Isrc/ -DLINUX -DDEVEL -export-dynamic -I/usr/include/SDL -I/usr/local/include/SDL -DBLIT_METHOD_2 -DNAUDIO -O2 -march=pentium4 -pipe -mfpmath=sse -ggdb -Wl,-O1 -Wl,--as-needed
- 
--LIBS=-lm `sdl-config --libs` -lSDL_image
-+LIBS=-lm `sdl-config --libs` -lSDL_image -ldl
- STATIC_LIBS=-lm /usr/local/lib/libSDL.a /usr/local/lib/libSDL_image.a /usr/local/lib/libSDL_ttf.a /usr/local/lib/libopenal.a /usr/local/lib/libvorbisfile.a /usr/local/lib/libvorbis.a /usr/local/lib/libogg.a /usr/lib/libpng.a /usr/lib/libz.a -lpthread -ldl -lfreetype /usr/lib/libjpeg.a -lX11 -lXext -lesd
- 
- OBJS=main.o init.o video.o backbuffer.o debug.o audio.o linux_video.o \
diff --git a/games-arcade/epiar/files/epiar-0.5-unsilence-build.patch b/games-arcade/epiar/files/epiar-0.5-unsilence-build.patch
deleted file mode 100644
index 20a6d6755c8a..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-unsilence-build.patch
+++ /dev/null
@@ -1,445 +0,0 @@
-From 5cc36cce65329d946140feb78f17fc3c91cc7496 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 6 Apr 2021 23:38:27 +0000
-Subject: [PATCH 1/2] unsilence build
-
----
- Makefile       |  20 ++---
- Makefile.linux | 218 ++++++++++++++++++++++++-------------------------
- 2 files changed, 119 insertions(+), 119 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d0aa7a8..f2c4641 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,13 +1,13 @@
- default:
--	@echo "To build Epiar, please type the command that corresponds to your system:"
--	@echo ""
--	@echo "Linux   - make -f Makefile.linux"
--	@echo "FreeBSD - make -f Makefile.freebsd"
--	@echo "Windows - Documentation not available yet"
-+	echo "To build Epiar, please type the command that corresponds to your system:"
-+	echo ""
-+	echo "Linux   - make -f Makefile.linux"
-+	echo "FreeBSD - make -f Makefile.freebsd"
-+	echo "Windows - Documentation not available yet"
- 
- clean:
--	@echo "Please specify your system:"
--	@echo ""
--	@echo "Linux   - make -f Makefile.linux clean"
--	@echo "FreeBSD - make -f Makefile.freebsd clean"
--	@echo "Windows - Documentation not available yet"
-+	echo "Please specify your system:"
-+	echo ""
-+	echo "Linux   - make -f Makefile.linux clean"
-+	echo "FreeBSD - make -f Makefile.freebsd clean"
-+	echo "Windows - Documentation not available yet"
-diff --git a/Makefile.linux b/Makefile.linux
-index 40ae1ff..903e392 100644
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -21,290 +21,290 @@ PLUGIN_OBJS=
- CC=cc
- 
- default: $(OBJS)
--	@echo Building Epiar 0.5.0 ...
--	@$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS)
--	@echo Building plugins ...
--	@$(MAKE) -f Makefile.linux plugin
--	@echo Epiar 0.5.0 build complete.
--	@echo
--	@echo Type './epiar' to play.
-+	echo Building Epiar 0.5.0 ...
-+	$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS)
-+	echo Building plugins ...
-+	$(MAKE) -f Makefile.linux plugin
-+	echo Epiar 0.5.0 build complete.
-+	echo
-+	echo Type './epiar' to play.
- 
- static:  $(OBJS)
--	@echo Building Epiar 0.5.0 and linking statically ...
--	@$(CC) $(CFLAGS) -L/usr/X11R6/lib -L/opt/gnome-2.1/lib $(OBJS) -o epiar $(STATIC_LIBS)
--	@echo Building plugins ...
--	@$(MAKE) plugin
--	@echo Epiar 0.5.0 build complete.
--	@echo
--	@echo Type './epiar' to play.
-+	echo Building Epiar 0.5.0 and linking statically ...
-+	$(CC) $(CFLAGS) -L/usr/X11R6/lib -L/opt/gnome-2.1/lib $(OBJS) -o epiar $(STATIC_LIBS)
-+	echo Building plugins ...
-+	$(MAKE) plugin
-+	echo Epiar 0.5.0 build complete.
-+	echo
-+	echo Type './epiar' to play.
- 
- clean:
--	@rm -f $(OBJS)
--	@rm -f plugins/*.so
--	@rm -f *~
--	@rm -f src/*~
--	@rm -f src/system/*~
--	@rm -f src/system/video/*~
--	@rm -f src/audio/*~
--	@rm -f epiar
-+	rm -f $(OBJS)
-+	rm -f plugins/*.so
-+	rm -f *~
-+	rm -f src/*~
-+	rm -f src/system/*~
-+	rm -f src/system/video/*~
-+	rm -f src/audio/*~
-+	rm -f epiar
- 
- main.o: src/main.c
--	@$(CC) $(CFLAGS) -c src/main.c
-+	$(CC) $(CFLAGS) -c src/main.c
- 
- init.o: src/system/init.c
--	@$(CC) $(CFLAGS) -c src/system/init.c
-+	$(CC) $(CFLAGS) -c src/system/init.c
- 
- video.o: src/system/video/video.c
--	@$(CC) $(CFLAGS) -c src/system/video/video.c
-+	$(CC) $(CFLAGS) -c src/system/video/video.c
- 
- backbuffer.o: src/system/video/backbuffer.c
--	@$(CC) $(CFLAGS) -c src/system/video/backbuffer.c
-+	$(CC) $(CFLAGS) -c src/system/video/backbuffer.c
- 
- debug.o: src/system/debug.c
--	@$(CC) $(CFLAGS) -c src/system/debug.c
-+	$(CC) $(CFLAGS) -c src/system/debug.c
- 
- audio.o: src/audio/audio.c
--	@$(CC) $(CFLAGS) -c src/audio/audio.c
-+	$(CC) $(CFLAGS) -c src/audio/audio.c
- 
- linux_video.o: src/osdep/linux/linux_video.c
--	@$(CC) $(CFLAGS) -c src/osdep/linux/linux_video.c
-+	$(CC) $(CFLAGS) -c src/osdep/linux/linux_video.c
- 
- sprite.o: src/sprite/sprite.c
--	@$(CC) $(CFLAGS) -c src/sprite/sprite.c
-+	$(CC) $(CFLAGS) -c src/sprite/sprite.c
- 
- menu.o: src/menu/menu.c
--	@$(CC) $(CFLAGS) -c src/menu/menu.c
-+	$(CC) $(CFLAGS) -c src/menu/menu.c
- 
- game.o: src/game/game.c
--	@$(CC) $(CFLAGS) -c src/game/game.c
-+	$(CC) $(CFLAGS) -c src/game/game.c
- 
- update.o: src/game/update.c
--	@$(CC) $(CFLAGS) -c src/game/update.c
-+	$(CC) $(CFLAGS) -c src/game/update.c
- 
- input.o: src/input/input.c
--	@$(CC) $(CFLAGS) -c src/input/input.c
-+	$(CC) $(CFLAGS) -c src/input/input.c
- 
- rander.o: src/system/rander.c
--	@$(CC) $(CFLAGS) -c src/system/rander.c
-+	$(CC) $(CFLAGS) -c src/system/rander.c
- 
- planet.o: src/sprite/planet.c src/sprite/planet.h
--	@$(CC) $(CFLAGS) -c src/sprite/planet.c
-+	$(CC) $(CFLAGS) -c src/sprite/planet.c
- 
- fire.o: src/sprite/fire.c src/sprite/fire.h
--	@$(CC) $(CFLAGS) -c src/sprite/fire.c
-+	$(CC) $(CFLAGS) -c src/sprite/fire.c
- 
- ai.o: src/ai/ai.c src/ai/ai.h
--	@$(CC) $(CFLAGS) -c src/ai/ai.c
-+	$(CC) $(CFLAGS) -c src/ai/ai.c
- 
- linux_misc.o: src/osdep/linux/linux_misc.c src/osdep/linux/linux_misc.h
--	@$(CC) $(CFLAGS) -c src/osdep/linux/linux_misc.c
-+	$(CC) $(CFLAGS) -c src/osdep/linux/linux_misc.c
- 
- flare.o: src/sprite/flare.c src/sprite/flare.h
--	@$(CC) $(CFLAGS) -c src/sprite/flare.c
-+	$(CC) $(CFLAGS) -c src/sprite/flare.c
- 
- particle.o: src/sprite/particle.c src/sprite/particle.h
--	@$(CC) $(CFLAGS) -c src/sprite/particle.c
-+	$(CC) $(CFLAGS) -c src/sprite/particle.c
- 
- music.o: src/audio/music.c src/audio/music.h
--	@$(CC) $(CFLAGS) -c src/audio/music.c
-+	$(CC) $(CFLAGS) -c src/audio/music.c
- 
- hud.o: src/hud/hud.c src/hud/hud.h
--	@$(CC) $(CFLAGS) -c src/hud/hud.c
-+	$(CC) $(CFLAGS) -c src/hud/hud.c
- 
- afont_base.o: src/system/afont_base.c src/system/afont.h
--	@$(CC) $(CFLAGS) -c src/system/afont_base.c
-+	$(CC) $(CFLAGS) -c src/system/afont_base.c
- 
- afont_sdl.o: src/system/afont_sdl.c src/system/afont_sdl.h
--	@$(CC) $(CFLAGS) -c src/system/afont_sdl.c
-+	$(CC) $(CFLAGS) -c src/system/afont_sdl.c
- 
- trig.o: src/system/trig.c src/system/trig.h
--	@$(CC) $(CFLAGS) -c src/system/trig.c
-+	$(CC) $(CFLAGS) -c src/system/trig.c
- 
- playlist.o: src/audio/playlist.c src/audio/playlist.h
--	@$(CC) $(CFLAGS) -c src/audio/playlist.c
-+	$(CC) $(CFLAGS) -c src/audio/playlist.c
- 
- options.o: src/menu/options.c src/menu/options.h
--	@$(CC) $(CFLAGS) -c src/menu/options.c
-+	$(CC) $(CFLAGS) -c src/menu/options.c
- 
- save.o: src/system/save.c src/system/save.h
--	@$(CC) $(CFLAGS) -c src/system/save.c
-+	$(CC) $(CFLAGS) -c src/system/save.c
- 
- land.o: src/land/land.c src/land/land.h
--	@$(CC) $(CFLAGS) -c src/land/land.c
-+	$(CC) $(CFLAGS) -c src/land/land.c
- 
- land_dlg.o: src/land/land_dlg.c src/land/land_dlg.h
--	@$(CC) $(CFLAGS) -c src/land/land_dlg.c
-+	$(CC) $(CFLAGS) -c src/land/land_dlg.c
- 
- math.o: src/system/math.c src/system/math.h
--	@$(CC) $(CFLAGS) -c src/system/math.c
-+	$(CC) $(CFLAGS) -c src/system/math.c
- 
- status.o: src/menu/status.c src/menu/status.h
--	@$(CC) $(CFLAGS) -c src/menu/status.c
-+	$(CC) $(CFLAGS) -c src/menu/status.c
- 
- shipyard.o: src/land/shipyard.c src/land/shipyard.h
--	@$(CC) $(CFLAGS) -c src/land/shipyard.c
-+	$(CC) $(CFLAGS) -c src/land/shipyard.c
- 
- gui_commdlg.o: src/gui/gui_commdlg.c src/gui/gui_commdlg.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_commdlg.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_commdlg.c
- 
- navigation.o: src/navigation/navigation.c src/navigation/navigation.h
--	@$(CC) $(CFLAGS) -c src/navigation/navigation.c
-+	$(CC) $(CFLAGS) -c src/navigation/navigation.c
- 
- gate.o: src/sprite/gate.c src/sprite/gate.h
--	@$(CC) $(CFLAGS) -c src/sprite/gate.c
-+	$(CC) $(CFLAGS) -c src/sprite/gate.c
- 
- comm.o: src/comm/comm.c src/comm/comm.h
--	@$(CC) $(CFLAGS) -c src/comm/comm.c
-+	$(CC) $(CFLAGS) -c src/comm/comm.c
- 
- plugin.o: src/system/plugin.c src/system/plugin.h
--	@$(CC) $(CFLAGS) -c src/system/plugin.c
-+	$(CC) $(CFLAGS) -c src/system/plugin.c
- 
- path.o: src/system/path.c src/system/path.h
--	@$(CC) $(CFLAGS) -c src/system/path.c
-+	$(CC) $(CFLAGS) -c src/system/path.c
- 
- tutorial.o: src/tutorial/tutorial.c src/tutorial/tutorial.h
--	@$(CC) $(CFLAGS) -c src/tutorial/tutorial.c
-+	$(CC) $(CFLAGS) -c src/tutorial/tutorial.c
- 
- defender.o: src/ai/defender.c src/ai/defender.h
--	@$(CC) $(CFLAGS) -c src/ai/defender.c
-+	$(CC) $(CFLAGS) -c src/ai/defender.c
- 
- missions.o: src/missions/missions.c src/missions/missions.h
--	@$(CC) $(CFLAGS) -c src/missions/missions.c
-+	$(CC) $(CFLAGS) -c src/missions/missions.c
- 
- trader.o: src/ai/trader.c src/ai/trader.h
--	@$(CC) $(CFLAGS) -c src/ai/trader.c
-+	$(CC) $(CFLAGS) -c src/ai/trader.c
- 
- explorer.o: src/ai/explorer.c src/ai/explorer.h
--	@$(CC) $(CFLAGS) -c src/ai/explorer.c
-+	$(CC) $(CFLAGS) -c src/ai/explorer.c
- 
- alliances.o: src/alliances/alliances.c src/alliances/alliances.h
--	@$(CC) $(CFLAGS) -c src/alliances/alliances.c
-+	$(CC) $(CFLAGS) -c src/alliances/alliances.c
- 
- summary.o: src/land/summary.c src/land/summary.h
--	@$(CC) $(CFLAGS) -c src/land/summary.c
-+	$(CC) $(CFLAGS) -c src/land/summary.c
- 
- employment.o: src/land/employment.c src/land/employment.h
--	@$(CC) $(CFLAGS) -c src/land/employment.c
-+	$(CC) $(CFLAGS) -c src/land/employment.c
- 
- bar.o: src/land/bar.c src/land/bar.h
--	@$(CC) $(CFLAGS) -c src/land/bar.c
-+	$(CC) $(CFLAGS) -c src/land/bar.c
- 
- track.o: src/racing/track.c src/racing/track.h
--	@$(CC) $(CFLAGS) -c src/racing/track.c
-+	$(CC) $(CFLAGS) -c src/racing/track.c
- 
- model.o: src/sprite/model.c src/sprite/model.h
--	@$(CC) $(CFLAGS) -c src/sprite/model.c
-+	$(CC) $(CFLAGS) -c src/sprite/model.c
- 
- force.o: src/force/force.c src/force/force.h
--	@$(CC) $(CFLAGS) -c src/force/force.c
-+	$(CC) $(CFLAGS) -c src/force/force.c
- 
- weapon.o: src/sprite/weapon.c src/sprite/weapon.h
--	@$(CC) $(CFLAGS) -c src/sprite/weapon.c
-+	$(CC) $(CFLAGS) -c src/sprite/weapon.c
- 
- asteroid.o: src/asteroid/asteroid.c src/asteroid/asteroid.h
--	@$(CC) $(CFLAGS) -c src/asteroid/asteroid.c
-+	$(CC) $(CFLAGS) -c src/asteroid/asteroid.c
- 
- network.o: src/network/network.c src/network/network.h
--	@$(CC) $(CFLAGS) -c src/network/network.c
-+	$(CC) $(CFLAGS) -c src/network/network.c
- 
- chunk.o: src/sprite/chunk.c src/sprite/chunk.h
--	@$(CC) $(CFLAGS) -c src/sprite/chunk.c
-+	$(CC) $(CFLAGS) -c src/sprite/chunk.c
- 
- gui_btab.o: src/gui/gui_btab.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_btab.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_btab.c
- 
- gui_button.o: src/gui/gui_button.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_button.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_button.c
- 
- gui.o: src/gui/gui.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui.c
-+	$(CC) $(CFLAGS) -c src/gui/gui.c
- 
- gui_checkbox.o: src/gui/gui_checkbox.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_checkbox.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_checkbox.c
- 
- gui_commondlg.o: src/gui/gui_commondlg.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_commondlg.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_commondlg.c
- 
- gui_frame.o: src/gui/gui_frame.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_frame.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_frame.c
- 
- gui_image.o: src/gui/gui_image.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_image.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_image.c
- 
- gui_keybox.o: src/gui/gui_keybox.c
--	@$(CC) $(CFLAGS) -c src/gui/gui_keybox.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_keybox.c
- 
- gui_label.o: src/gui/gui_label.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_label.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_label.c
- 
- gui_scrollbar.o: src/gui/gui_scrollbar.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_scrollbar.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_scrollbar.c
- 
- gui_session.o: src/gui/gui_session.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_session.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_session.c
- 
- gui_tab.o: src/gui/gui_tab.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_tab.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_tab.c
- 
- gui_textbox.o: src/gui/gui_textbox.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_textbox.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_textbox.c
- 
- gui_text_entry.o: src/gui/gui_text_entry.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_text_entry.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_text_entry.c
- 
- gui_window.o: src/gui/gui_window.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_window.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_window.c
- 
- gui_listbox.o: src/gui/gui_listbox.c src/gui/gui.h
--	@$(CC) $(CFLAGS) -c src/gui/gui_listbox.c
-+	$(CC) $(CFLAGS) -c src/gui/gui_listbox.c
- 
- net_sprite.o: src/network/net_sprite.c
--	@$(CC) $(CFLAGS) -c src/network/net_sprite.c
-+	$(CC) $(CFLAGS) -c src/network/net_sprite.c
- 
- upgrade.o: src/sprite/upgrade.c
--	@$(CC) $(CFLAGS) -c src/sprite/upgrade.c
-+	$(CC) $(CFLAGS) -c src/sprite/upgrade.c
- 
- eaf.o: src/system/eaf.c src/system/eaf.h
--	@$(CC) $(CFLAGS) -c src/system/eaf.c
-+	$(CC) $(CFLAGS) -c src/system/eaf.c
- 
- scenario.o: src/game/scenario.c src/game/scenario.h
--	@$(CC) $(CFLAGS) -c src/game/scenario.c
-+	$(CC) $(CFLAGS) -c src/game/scenario.c
- 
- pirate.o: src/ai/pirate.c src/ai/pirate.h
--	@$(CC) $(CFLAGS) -c src/ai/pirate.c
-+	$(CC) $(CFLAGS) -c src/ai/pirate.c
- 
- outfit.o: src/outfit/outfit.c src/outfit/outfit.h
--	@$(CC) $(CFLAGS) -c src/outfit/outfit.c
-+	$(CC) $(CFLAGS) -c src/outfit/outfit.c
- 
- esf.o: src/system/esf.c src/system/esf.h
--	@$(CC) $(CFLAGS) -c src/system/esf.c
-+	$(CC) $(CFLAGS) -c src/system/esf.c
- 
- timer.o: src/system/timer.c src/system/timer.h
--	@$(CC) $(CFLAGS) -c src/system/timer.c
-+	$(CC) $(CFLAGS) -c src/system/timer.c
- 
- font.o: src/system/font.c src/system/font.h
--	@$(CC) $(CFLAGS) -c src/system/font.c
-+	$(CC) $(CFLAGS) -c src/system/font.c
- 
- target.o: src/sprite/target.c src/sprite/target.h
--	@$(CC) $(CFLAGS) -c src/sprite/target.c
-+	$(CC) $(CFLAGS) -c src/sprite/target.c
- 
- zoom.o: src/system/video/zoom.c src/system/video/zoom.h
--	@$(CC) $(CFLAGS) -c src/system/video/zoom.c
-+	$(CC) $(CFLAGS) -c src/system/video/zoom.c
- 
- r_ships.o: src/sprite/r_ships.c src/sprite/r_ships.h
--	@$(CC) $(CFLAGS) -c src/sprite/r_ships.c
-+	$(CC) $(CFLAGS) -c src/sprite/r_ships.c
- 
- warship.o: src/ai/warship.c src/ai/warship.h
--	@$(CC) $(CFLAGS) -c src/ai/warship.c
-+	$(CC) $(CFLAGS) -c src/ai/warship.c
- 
- gate_defender.o: src/ai/gate_defender.c src/ai/gate_defender.h
--	@$(CC) $(CFLAGS) -c src/ai/gate_defender.c
-+	$(CC) $(CFLAGS) -c src/ai/gate_defender.c
- 
- maneuvers.o: src/ai/maneuvers.c src/ai/maneuvers.h
--	@$(CC) $(CFLAGS) -c src/ai/maneuvers.c
-+	$(CC) $(CFLAGS) -c src/ai/maneuvers.c
- 
- plugin: $(PLUGIN_OBJS)
--	@echo Plugins built.
-+	echo Plugins built.
- 
- plugins/radar.so: src/plugins/radar.c
--	@$(CC) $(CFLAGS) $(OBJS) -shared src/plugins/radar.c -o plugins/radar.so
-+	$(CC) $(CFLAGS) $(OBJS) -shared src/plugins/radar.c -o plugins/radar.so
--- 
-2.31.1
-