Date: Fri, 22 Jun 2018 21:04:21 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473074 - in head/games/stormbaancoureur: . files Message-ID: <201806222104.w5ML4MfS095925@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Jun 22 21:04:21 2018 New Revision: 473074 URL: https://svnweb.freebsd.org/changeset/ports/473074 Log: - Add LICENSE - Add missing gl depends - Fix build with clang 6 - Regenerate patches Modified: head/games/stormbaancoureur/Makefile head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.cxx head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.h head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile head/games/stormbaancoureur/files/patch-src-stormbaancoureur-controllerpad.cxx head/games/stormbaancoureur/files/patch-src-stormbaancoureur-main.cxx Modified: head/games/stormbaancoureur/Makefile ============================================================================== --- head/games/stormbaancoureur/Makefile Fri Jun 22 21:00:29 2018 (r473073) +++ head/games/stormbaancoureur/Makefile Fri Jun 22 21:04:21 2018 (r473074) @@ -11,12 +11,16 @@ MASTER_SITES= http://www.stolk.org/stormbaancoureur/do MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simulated obstacle course for automobiles +LICENSE= GPLv3 + BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/lib/libode.a:devel/ode -USE_GL= glut +USE_GL= gl glu glut MAKE_ENV= DATADIR="${DATADIR}" + +CXXFLAGS+= -Wno-c++11-narrowing BUILD_WRKSRC= ${WRKSRC}/src-stormbaancoureur INSTALL_WRKSRC= ${WRKSRC}/src-stormbaancoureur Modified: head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.cxx ============================================================================== --- head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.cxx Fri Jun 22 21:00:29 2018 (r473073) +++ head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.cxx Fri Jun 22 21:04:21 2018 (r473074) @@ -1,6 +1,6 @@ ---- src-common/soundenginealsa.cxx.orig 2008-03-22 21:45:22.000000000 +0300 -+++ src-common/soundenginealsa.cxx 2008-03-30 17:58:09.000000000 +0400 -@@ -38,219 +38,46 @@ +--- src-common/soundenginealsa.cxx.orig 2008-06-18 01:36:34 UTC ++++ src-common/soundenginealsa.cxx +@@ -38,219 +38,46 @@ SoundEngineAlsa::SoundEngineAlsa(int lag complexfeed(0), enginefeed(0), activefeed(0), Modified: head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.h ============================================================================== --- head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.h Fri Jun 22 21:00:29 2018 (r473073) +++ head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.h Fri Jun 22 21:04:21 2018 (r473074) @@ -1,15 +1,15 @@ ---- src-common/soundenginealsa.h.orig 2008-01-03 07:29:23.000000000 +0300 -+++ src-common/soundenginealsa.h 2008-02-09 00:52:09.000000000 +0300 -@@ -2,8 +2,6 @@ - #ifndef SOUNDENGINE_ALSA_H - #define SOUNDENGINE_ALSA_H +--- src-common/soundenginealsa.h.orig 2008-04-20 16:00:03 UTC ++++ src-common/soundenginealsa.h +@@ -4,8 +4,6 @@ + #include <string> + -#include <alsa/asoundlib.h> - class SoundClip; class SoundFeed; class SoundFeedSimple; -@@ -29,9 +27,6 @@ +@@ -31,9 +29,6 @@ class SoundEngineAlsa SoundFeedModulated *modulatedfeed; SoundFeedEngine *enginefeed; SoundFeed *activefeed; Modified: head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile ============================================================================== --- head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile Fri Jun 22 21:00:29 2018 (r473073) +++ head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile Fri Jun 22 21:04:21 2018 (r473074) @@ -1,6 +1,6 @@ ---- src-stormbaancoureur/Makefile.orig 2008-06-11 18:12:01.000000000 +0400 -+++ src-stormbaancoureur/Makefile 2013-09-30 06:14:07.576519380 +0400 -@@ -5,23 +5,20 @@ +--- src-stormbaancoureur/Makefile.orig 2009-12-01 03:23:51 UTC ++++ src-stormbaancoureur/Makefile +@@ -5,23 +5,20 @@ VERSION=2.1.6-generic GLPREFIX=/usr PLIBPREFIX=/usr ODEPREFIX=/usr @@ -29,7 +29,7 @@ OBJS=\ -@@ -39,15 +36,15 @@ +@@ -39,15 +36,15 @@ OBJS=\ LIBS=\ @@ -48,7 +48,7 @@ $(CXX) -o stormbaancoureur $(OBJS) $(LFLAGS) $(LIBS) staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h -@@ -92,16 +89,15 @@ +@@ -92,16 +89,15 @@ run: stormbaancoureur clean: rm -f *.o stormbaancoureur Modified: head/games/stormbaancoureur/files/patch-src-stormbaancoureur-controllerpad.cxx ============================================================================== --- head/games/stormbaancoureur/files/patch-src-stormbaancoureur-controllerpad.cxx Fri Jun 22 21:00:29 2018 (r473073) +++ head/games/stormbaancoureur/files/patch-src-stormbaancoureur-controllerpad.cxx Fri Jun 22 21:04:21 2018 (r473074) @@ -1,6 +1,6 @@ ---- src-stormbaancoureur/controllerpad.cxx.orig Mon Jul 17 00:26:08 2006 -+++ src-stormbaancoureur/controllerpad.cxx Mon Jul 17 00:28:23 2006 -@@ -14,7 +14,6 @@ +--- src-stormbaancoureur/controllerpad.cxx.orig 2008-04-20 15:56:35 UTC ++++ src-stormbaancoureur/controllerpad.cxx +@@ -15,7 +15,6 @@ #include <windows.h> #include <mmsystem.h> #else @@ -8,7 +8,7 @@ #include <sys/ioctl.h> // for ioctl() #include <unistd.h> // for close() #include <stdio.h> // for perror() -@@ -81,100 +80,7 @@ +@@ -82,100 +81,7 @@ action_button(-1), accel_axis(-1), accel_button(-1) { @@ -110,7 +110,7 @@ } -@@ -194,80 +100,6 @@ +@@ -195,80 +101,6 @@ ControllerPad::~ControllerPad() void ControllerPad::Sustain(float dt) { Modified: head/games/stormbaancoureur/files/patch-src-stormbaancoureur-main.cxx ============================================================================== --- head/games/stormbaancoureur/files/patch-src-stormbaancoureur-main.cxx Fri Jun 22 21:00:29 2018 (r473073) +++ head/games/stormbaancoureur/files/patch-src-stormbaancoureur-main.cxx Fri Jun 22 21:04:21 2018 (r473074) @@ -1,6 +1,6 @@ ---- src-stormbaancoureur/main.cxx.orig 2007-12-28 23:09:41.000000000 +0300 -+++ src-stormbaancoureur/main.cxx 2007-12-31 16:48:41.000000000 +0300 -@@ -1176,12 +1176,7 @@ +--- src-stormbaancoureur/main.cxx.orig 2008-04-20 15:58:29 UTC ++++ src-stormbaancoureur/main.cxx +@@ -837,12 +837,7 @@ int main(int argc, char *argv[]) fprintf(stderr,"OpenDE is (c) by Russel L. Smith\n"); char *bindirname = dirname(argv[0]);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806222104.w5ML4MfS095925>