Index: head/games/torcs/Makefile =================================================================== --- head/games/torcs/Makefile (revision 462753) +++ head/games/torcs/Makefile (revision 462754) @@ -1,106 +1,107 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= torcs DISTVERSION= 1.3.7 PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/all-in-one/${PORTVERSION} MAINTAINER= monwarez@mailoo.org COMMENT= Free open source racing car simulator LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib LIB_DEPENDS= libpng.so:graphics/png \ libvorbis.so:audio/libvorbis RUN_DEPENDS= bash:shells/bash MAKE_JOBS_UNSAFE= yes -USES= cpe gmake openal:al,alut shebangfix tar:bzip2 +USES= compiler:c++11-lang cpe gmake openal:al,alut shebangfix tar:bzip2 CPE_VENDOR= bernhard_wymann SHEBANG_FILES= src/tools/accc/accc.in src/tools/nfsperf/nfsperf.in \ src/tools/texmapper/texmapper.in src/tools/nfs2ac/nfs2ac.in \ src/tools/trackgen/trackgen.in \ src/modules/telemetry/telemetry.sh robotgen +USE_CXXSTD= c++11 USE_XORG= xrender xmu ice xext x11 xxf86vm xrandr xi xt sm USE_GL= glut glu gl GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ALL_TARGET= default INSTALL_TARGET= install datainstall INSTDIR= ${PREFIX}/share/games/${PORTNAME} PORTDOCS= faq.html BASH2FIX= src/linux/torcs.in Make-default.mk STRIPFILES= drivers/berniw/berniw.so \ drivers/berniw2/berniw2.so \ drivers/berniw3/berniw3.so \ drivers/bt/bt.so \ drivers/damned/damned.so \ drivers/human/human.so \ drivers/inferno/inferno.so \ drivers/inferno2/inferno2.so \ drivers/lliaw/lliaw.so \ drivers/olethros/olethros.so \ drivers/sparkle/sparkle.so \ drivers/tita/tita.so \ lib/libclient.so \ lib/libconfscreens.so \ lib/liblearning.so \ lib/libmusicplayer.so \ lib/libraceengine.so \ lib/libracescreens.so \ lib/librobottools.so \ lib/libtgf.so \ lib/libtgfclient.so \ lib/libtxml.so \ modules/graphic/ssggraph.so \ modules/simu/simuv2.so \ modules/telemetry/telemetry.so \ modules/track/track.so DESKTOP_ENTRIES= "TORCS" \ "The Open Racing Car Simulator" \ "${INSTDIR}/Ticon.png" \ "torcs" \ "Game;Simulation;" \ false OPTIONS_DEFINE= DOCS EMPTYDIR= champ dtmrace endrace ncrace practice quickrace # shebangfix does not catch these two (not at top of file): post-patch: .for FILE in ${BASH2FIX} @${REINPLACE_CMD} -E -e "s|/bin/bash|${LOCALBASE}/bin/bash|" \ ${WRKSRC}/${FILE} .endfor post-build: .for FILE in ${STRIPFILES} ${STRIP_CMD} ${WRKSRC}/export/${FILE} .endfor pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/games post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/faq/|} ${STAGEDIR}${DOCSDIR} # strip simuv2.so as reported by Q/A tests ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/torcs/modules/simu/simuv2.so .for ed in ${EMPTYDIR} ${TOUCH} ${STAGEDIR}${INSTDIR}/results/${ed}/.keep_me .endfor .include Index: head/games/torcs/files/patch-Make-default.mk =================================================================== --- head/games/torcs/files/patch-Make-default.mk (revision 462753) +++ head/games/torcs/files/patch-Make-default.mk (revision 462754) @@ -1,11 +1,20 @@ --- Make-default.mk.orig 2013-01-12 14:25:08 UTC +++ Make-default.mk @@ -134,7 +134,7 @@ include .depend endif .depend: - $(CPP) $(INCFLAGS) $(CFLAGSD) $(COMPILFLAGS) $(SOURCES) > .depend + #$(CPP) $(INCFLAGS) $(CFLAGSD) $(COMPILFLAGS) $(SOURCES) > .depend dep: .depend +@@ -181,7 +181,7 @@ win32setup: win32start exportswin32 installshipswin32 + + linuxconfstart: + @rm -f ${SETUP_LINUX} +- @echo '#! /bin/bash' >> ${SETUP_LINUX} ++ @echo '#! /usr/local/bin/bash' >> ${SETUP_LINUX} + @echo '' >> ${SETUP_LINUX} + @echo '[ -z "$$1" ] && exit 1' >> ${SETUP_LINUX} + @echo '[ ! -d "$$1" ] && exit 1' >> ${SETUP_LINUX} Index: head/games/torcs/files/patch-src_drivers_olethros_driver.cpp =================================================================== --- head/games/torcs/files/patch-src_drivers_olethros_driver.cpp (nonexistent) +++ head/games/torcs/files/patch-src_drivers_olethros_driver.cpp (revision 462754) @@ -0,0 +1,11 @@ +--- src/drivers/olethros/driver.cpp.orig 2018-02-11 21:23:59 UTC ++++ src/drivers/olethros/driver.cpp +@@ -802,7 +802,7 @@ namespace olethros { + rpmMaxTq, + rpmMaxPw, + rpmMax, +- rpmMax*2.0 ++ rpmMax*2.0f + }; + int N = 5; + for (int i=0; iread(pcm, BUFFERSIZE, &size, &error)) { + GfError("OpenALMusicPlayer: Stream read error: %s\n", error); +@@ -268,4 +268,4 @@ bool OpenALMusicPlayer::startPlayback() + alSourcePlay(source); + + return true; +-} +\ No newline at end of file ++} Property changes on: head/games/torcs/files/patch-src_libs_musicplayer_OpenALMusicPlayer.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property