f1spirit: Unbreak.

[i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By:	i3enedek
Date:		Wed Dec 19 17:57:24 2018 +0000
Changeset:	a823000d00f1b83aa5578d4956842cb864884406

Modified Files:
	f1spirit/Makefile
	f1spirit/distinfo
	f1spirit/patches/patch-build_linux_Makefile
	f1spirit/patches/patch-sources_F1Shttp.cpp

Log Message:
f1spirit: Unbreak.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a823000d00f1b83aa5578d4956842cb864884406

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 f1spirit/Makefile                           |  7 ++--
 f1spirit/distinfo                           |  4 +-
 f1spirit/patches/patch-build_linux_Makefile | 61 ++++++++++++++++++++++++++++-
 f1spirit/patches/patch-sources_F1Shttp.cpp  |  4 +-
 4 files changed, 67 insertions(+), 9 deletions(-)

diffs:
diff --git a/f1spirit/Makefile b/f1spirit/Makefile
index 9adbfb4b4e..4fded3bb3f 100644
--- a/f1spirit/Makefile
+++ b/f1spirit/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Remake the Konami MSX1 classic F-1 Spirit
 LICENSE=	unlicense
 
 WRKSRC=		${WRKDIR}/f1spirit-0.rc9.1615
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c++ c
+#USE_TOOLS+=	make
+USE_LANGUAGES=	c++03 c
 
 #LDFLAGS+=	-nostartfiles
 CFLAGS+=	-Wno-write-strings
@@ -29,6 +29,7 @@ SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
 
 pre-patch:
 	${CP} ${FILESDIR}/f1spirit ${WRKSRC}/f1spirit.sh
+	${MV} ${WRKSRC}/sources/* ${WRKSRC}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/f1spirit.sh \
@@ -51,6 +52,4 @@ do-install:
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/f1spirit/distinfo b/f1spirit/distinfo
index e64cd15d64..0419aec1e7 100644
--- a/f1spirit/distinfo
+++ b/f1spirit/distinfo
@@ -4,5 +4,5 @@ SHA1 (f1spirit.src_0.rc9-1615.tgz) = 90a6a0a3b5f7dc18a3497d32bb580bf47e688c95
 RMD160 (f1spirit.src_0.rc9-1615.tgz) = fa91ca937f9e12812376aa7571b4089b83a864a1
 SHA512 (f1spirit.src_0.rc9-1615.tgz) = 7eff68c5e33bb8ad07f8cf238ad1596b83dc5889828747d591b1e319cbef9359b6f134ad92e222ad7947c01278cfd692f6bf729de007dd91b03d12fd3d805335
 Size (f1spirit.src_0.rc9-1615.tgz) = 18522073 bytes
-SHA1 (patch-build_linux_Makefile) = 4407a77fca42e58b4f13a8b7a0781e70bd90c46a
-SHA1 (patch-sources_F1Shttp.cpp) = a94d7eaae754ef37cea83d675381be3ae2de516b
+SHA1 (patch-build_linux_Makefile) = b47cfb4431f4833b036f7f1801399474123fb95f
+SHA1 (patch-sources_F1Shttp.cpp) = 83e7c3e878aaa9be40e34807e0b05aabbe21e3c3
diff --git a/f1spirit/patches/patch-build_linux_Makefile b/f1spirit/patches/patch-build_linux_Makefile
index 1fd96a18ef..27780078ce 100644
--- a/f1spirit/patches/patch-build_linux_Makefile
+++ b/f1spirit/patches/patch-build_linux_Makefile
@@ -10,7 +10,56 @@ $NetBSD$
  EXTRADIR = ./build/linux
  
  GAMEDIR = $(PREFIX)/games
-@@ -40,8 +40,9 @@ OBJS = \
+@@ -14,34 +14,35 @@ ICON = f1spirit.png
+ DESKTOP = f1spirit.desktop
+ 
+ OBJS = \
+-	$(SRC)/2DCMC.o					$(SRC)/auxiliar.o				\
+-	$(SRC)/CCar.o					$(SRC)/CPlayer.o				\
+-	$(SRC)/debug.o					$(SRC)/EnemyCCar.o				\
+-	$(SRC)/F1SComputer.o			$(SRC)/F1Shttp.o				\
+-	$(SRC)/F1SpiritApp.o			$(SRC)/F1Spirit-auxiliar.o		\
+-	$(SRC)/F1SpiritGame.o			$(SRC)/F1SpiritTrackViewer.o	\
+-	$(SRC)/GameParameters.o			$(SRC)/geometrics.o				\
+-	$(SRC)/GLTile.o					$(SRC)/GLtile-f1.o				\
+-	$(SRC)/keyboardstate.o			$(SRC)/main.o					\
+-	$(SRC)/PlacedGLTile.o			$(SRC)/PlayerCCar.o				\
+-	$(SRC)/RacingCCar.o				$(SRC)/ranrotb.o				\
+-	$(SRC)/ReplayInfo.o				$(SRC)/RoadPiece.o				\
+-	$(SRC)/RotatedGLTile.o			$(SRC)/SDL_glutaux.o			\
+-	$(SRC)/sound.o					$(SRC)/state_disclaimer.o		\
+-	$(SRC)/state_endsequence.o		$(SRC)/state_gameoptions.o		\
+-	$(SRC)/state_gamestart.o		$(SRC)/state_hiscore.o			\
+-	$(SRC)/state_konami.o			$(SRC)/state_menu.o				\
+-	$(SRC)/state_menu_create_menu.o	$(SRC)/state_menu_draw.o		\
+-	$(SRC)/state_race.o				$(SRC)/state_race_result.o		\
+-	$(SRC)/state_replaymanager.o	$(SRC)/state_title.o			\
+-	$(SRC)/state_trackload.o		$(SRC)/track.o					\
+-	$(SRC)/Vector.o					$(SRC)/weather.o				\
+-	$(SRC)/filehandling.o			$(SRC)/CarEngineSound.o
++	2DCMC.o					auxiliar.o				\
++	CCar.o					CPlayer.o				\
++	debug.o					EnemyCCar.o				\
++	F1SComputer.o			F1Shttp.o				\
++	F1SpiritApp.o			F1Spirit-auxiliar.o		\
++	F1SpiritGame.o			F1SpiritTrackViewer.o	\
++	GameParameters.o			geometrics.o				\
++	GLTile.o					GLtile-f1.o				\
++	keyboardstate.o			main.o					\
++	PlacedGLTile.o			PlayerCCar.o				\
++	RacingCCar.o				ranrotb.o				\
++	ReplayInfo.o				RoadPiece.o				\
++	RotatedGLTile.o			SDL_glutaux.o			\
++	sound.o					state_disclaimer.o		\
++	state_endsequence.o		state_gameoptions.o		\
++	state_gamestart.o		state_hiscore.o			\
++	state_konami.o			state_menu.o				\
++	state_menu_create_menu.o	state_menu_draw.o		\
++	state_race.o				state_race_result.o		\
++	state_replaymanager.o	state_title.o			\
++	state_trackload.o		track.o					\
++	Vector.o					weather.o				\
++	filehandling.o			CarEngineSound.o
  
  CC = gcc
  #CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
@@ -22,3 +71,13 @@ $NetBSD$
  RM = rm -f
  CP = cp -r
  MD = mkdir -p
+@@ -49,7 +50,8 @@ ECHO = echo
+ CHMOD = chmod
+ STRIP = strip
+ 
+-all: $(EXE)
++all: $(OBJS)
++	$(CC) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
+ 
+ %.o: %.cpp
+ 	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/f1spirit/patches/patch-sources_F1Shttp.cpp b/f1spirit/patches/patch-sources_F1Shttp.cpp
index 4449183e20..2755300d03 100644
--- a/f1spirit/patches/patch-sources_F1Shttp.cpp
+++ b/f1spirit/patches/patch-sources_F1Shttp.cpp
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- sources/F1Shttp.cpp.orig	2009-02-06 09:54:49.000000000 +0000
-+++ sources/F1Shttp.cpp
+--- F1Shttp.cpp.orig	2009-02-06 09:54:49.000000000 +0000
++++ F1Shttp.cpp
 @@ -3,7 +3,6 @@
  #include "string.h"