Index: head/games/vavoom/Makefile =================================================================== --- head/games/vavoom/Makefile (revision 438686) +++ head/games/vavoom/Makefile (revision 438687) @@ -1,94 +1,101 @@ # Created by: Igor Pokrovsky # $FreeBSD$ PORTNAME= vavoom PORTVERSION= 1.33 PORTREVISION= 12 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Vavoom-source/${PORTVERSION} MAINTAINER= bar@FreeBSD.org COMMENT= Doom, Doom II, Heretic, Hexen, and Strife source port LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png USES= cmake dos2unix jpeg tar:bzip2 - +# Force GCC because llvm (starting from 4.0) generates +# non working binary for vcc +USE_GCC= yes DOS2UNIX_REGEX= ((.*\.(c|cpp|h|s|asm|inc|vc|ls|acs|cfg|txt|vs|mak|mgw"))$$|\/(makefile\..*|makefile|Makefile)$$) -OPTIONS_DEFINE= FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS -OPTIONS_DEFAULT= LAUNCHER OPENGL SDL -LAUNCHER_DESC= Build GUI launcher +# Removed LAUNCHER because it segfaults +#OPTIONS_DEFINE= FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS +OPTIONS_DEFINE= FLAC MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS +OPTIONS_DEFAULT= OPENGL SDL +#LAUNCHER_DESC= Build GUI launcher OPENAL_DESC= Enable OpenAL support SDL_DESC= Use SDL for OpenGL support SUB_FILES= pkg-message # The `-fno-strict-aliasing' flag (default on FreeBSD 6.0+) produces # non-working code for `vcc', so we remove it here if present. CFLAGS:= ${CFLAGS:N-fno-strict-aliasing} CXXFLAGS:= ${CFLAGS:N-fno-strict-aliasing} OPTIONS_SUB= yes FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CMAKE_ON= -DWITH_FLAC:BOOL=ON FLAC_CMAKE_OFF= -DWITH_FLAC:BOOL=OFF -LAUNCHER_USE= WX=2.8+ -LAUNCHER_CMAKE_ON= -DENABLE_LAUNCHER:BOOL=ON \ - -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" -LAUNCHER_CMAKE_OFF= -DENABLE_LAUNCHER:BOOL=OFF +# Removed LAUNCHER because it segfaults - check also pkg-plist +#LAUNCHER_USE= WX=2.8+ +#LAUNCHER_CMAKE_ON= -DENABLE_LAUNCHER:BOOL=ON \ +# -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" +#LAUNCHER_CMAKE_OFF= -DENABLE_LAUNCHER:BOOL=OFF +# Force disable LAUNCHER +CMAKE_ARGS+= -DENABLE_LAUNCHER:BOOL=OFF MAD_LIB_DEPENDS= libmad.so:audio/libmad MAD_CMAKE_ON= -DWITH_LIBMAD:BOOL=ON MAD_CMAKE_OFF= -DWITH_LIBMAD:BOOL=OFF MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod MIKMOD_CMAKE_ON= -DWITH_MIKMOD:BOOL=ON MIKMOD_CMAKE_OFF= -DWITH_MIKMOD:BOOL=OFF OPENAL_USES= openal:al OPENAL_CMAKE_ON= -DWITH_OPENAL:BOOL=ON OPENAL_CMAKE_OFF= -DWITH_OPENAL:BOOL=OFF VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis VORBIS_CMAKE_ON= -DWITH_VORBIS:BOOL=ON VORBIS_CMAKE_OFF= -DWITH_VORBIS:BOOL=OFF SDL_USE= SDL=mixer,sdl GL=yes SDL_CMAKE_ON= -DWITH_SDL:BOOL=ON -DWITH_OPENGL:BOOL=ON SDL_CMAKE_OFF= -DWITH_SDL:BOOL=OFF -DWITH_OPENGL:BOOL=OFF OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math -fomit-frame-pointer .include post-patch: @${REINPLACE_CMD} -e 's|$$\* ||; s|$${IWADDIR}|-iwaddir ${DMDIR} $$*|' \ ${WRKSRC}/source/CMakeLists.txt @${REINPLACE_CMD} -e 's///' \ ${WRKSRC}/utils/acc/parse.c @${REINPLACE_CMD} -e 's///' \ ${WRKSRC}/utils/acc/strlist.c post-configure: .if ${PORT_OPTIONS:MLAUNCHER} @${REINPLACE_CMD} -e 's/-pthread;-D_THREAD_SAFE //; \ s/-isystem /-I/g' \ ${WRKSRC}/utils/vlaunch/CMakeFiles/vlaunch.dir/flags.make .endif post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${STAGEDIR}${DOCSDIR} .endif ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vavoom.bin ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vavoom-dedicated.bin .include "${PORTSDIR}/games/doom-data/Makefile.include" .include Index: head/games/vavoom/files/pkg-message.in =================================================================== --- head/games/vavoom/files/pkg-message.in (revision 438686) +++ head/games/vavoom/files/pkg-message.in (revision 438687) @@ -1,21 +1,20 @@ ============================================================================== Vavoom has been installed. There are 2 wrapper scripts: "vavoom" and "vavoom-dedicated", calling the real executables (suffixed with ".bin") from the data directory, and using the common WAD directory. If you have extra WAD files, specify the full path of the containing directory as the first argument of the wrapper script. To run in OpenGL mode add the "-opengl" parameter, and "-openal" for OpenAL. If you want to install enhanced textures, models or soundtracks use the "games/vavoom-extras" port. Note that textures require OPENGL and soundtracks need VORBIS (build options). Refer to %%DOCSDIR%%/vavoom.txt for other options such as game selection, network options and so on. -If you enabled LAUNCHER (build option), run "vlaunch" for a launcher GUI. ============================================================================== Index: head/games/vavoom/pkg-plist =================================================================== --- head/games/vavoom/pkg-plist (revision 438686) +++ head/games/vavoom/pkg-plist (revision 438687) @@ -1,21 +1,21 @@ bin/vavoom bin/vavoom.bin bin/vavoom-dedicated bin/vavoom-dedicated.bin -%%LAUNCHER%%bin/vlaunch +@comment %%LAUNCHER%%bin/vlaunch %%PORTDOCS%%%%DOCSDIR%%/vavoom.txt %%DATADIR%%/basev/common/basepak.pk3 %%DATADIR%%/basev/doom/basepak.pk3 %%DATADIR%%/basev/doom1/base.txt %%DATADIR%%/basev/doom1/basepak.pk3 %%DATADIR%%/basev/doom2/base.txt %%DATADIR%%/basev/doom2/basepak.pk3 %%DATADIR%%/basev/games.txt %%DATADIR%%/basev/heretic/basepak.pk3 %%DATADIR%%/basev/hexen/basepak.pk3 %%DATADIR%%/basev/plutonia/base.txt %%DATADIR%%/basev/plutonia/basepak.pk3 %%DATADIR%%/basev/strife/basepak.pk3 %%DATADIR%%/basev/tnt/base.txt %%DATADIR%%/basev/tnt/basepak.pk3 %%DATADIR%%/vavoom.png