svn commit: r438686 - in head/games/vavoom: . files

[Barbara Guida]

Author: bar
Date: Mon Apr 17 11:02:20 2017
New Revision: 438686
URL: https://svnweb.freebsd.org/changeset/ports/438686

Log:
  Build using LLVM because after r438668 it builds fine using llvm40.
  This also allows to restore LAUNCHER option, because contrarily to
  default gcc version, llvm still produces working binary for vlaunch.

Modified:
  head/games/vavoom/Makefile
  head/games/vavoom/files/pkg-message.in
  head/games/vavoom/pkg-plist

Modified: head/games/vavoom/Makefile
==============================================================================
--- head/games/vavoom/Makefile	Mon Apr 17 10:52:34 2017	(r438685)
+++ head/games/vavoom/Makefile	Mon Apr 17 11:02:20 2017	(r438686)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vavoom
 PORTVERSION=	1.33
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Vavoom-source/${PORTVERSION}
 
@@ -15,16 +15,12 @@ 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)$$)
 
-# 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
+OPTIONS_DEFINE=	FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS
+OPTIONS_DEFAULT=	LAUNCHER OPENGL SDL
+LAUNCHER_DESC=	Build GUI launcher
 OPENAL_DESC=	Enable OpenAL support
 SDL_DESC=	Use SDL for OpenGL support
 
@@ -41,13 +37,10 @@ FLAC_LIB_DEPENDS=			libFLAC.so:audio/fla
 FLAC_CMAKE_ON=				-DWITH_FLAC:BOOL=ON
 FLAC_CMAKE_OFF=				-DWITH_FLAC: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
+LAUNCHER_USE=				WX=2.8+
+LAUNCHER_CMAKE_ON=			-DENABLE_LAUNCHER:BOOL=ON \
+	-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}"
+LAUNCHER_CMAKE_OFF=			-DENABLE_LAUNCHER:BOOL=OFF
 
 MAD_LIB_DEPENDS=			libmad.so:audio/libmad
 MAD_CMAKE_ON=				-DWITH_LIBMAD:BOOL=ON

Modified: head/games/vavoom/files/pkg-message.in
==============================================================================
--- head/games/vavoom/files/pkg-message.in	Mon Apr 17 10:52:34 2017	(r438685)
+++ head/games/vavoom/files/pkg-message.in	Mon Apr 17 11:02:20 2017	(r438686)
@@ -16,5 +16,6 @@ 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.
 
 ==============================================================================

Modified: head/games/vavoom/pkg-plist
==============================================================================
--- head/games/vavoom/pkg-plist	Mon Apr 17 10:52:34 2017	(r438685)
+++ head/games/vavoom/pkg-plist	Mon Apr 17 11:02:20 2017	(r438686)
@@ -2,7 +2,7 @@ bin/vavoom
 bin/vavoom.bin
 bin/vavoom-dedicated
 bin/vavoom-dedicated.bin
- at comment %%LAUNCHER%%bin/vlaunch
+%%LAUNCHER%%bin/vlaunch
 %%PORTDOCS%%%%DOCSDIR%%/vavoom.txt
 %%DATADIR%%/basev/common/basepak.pk3
 %%DATADIR%%/basev/doom/basepak.pk3