From owner-svn-ports-all@freebsd.org Mon Apr 17 11:02:21 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3D05D4121F; Mon, 17 Apr 2017 11:02:21 +0000 (UTC) (envelope-from bar@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E15D1C1; Mon, 17 Apr 2017 11:02:21 +0000 (UTC) (envelope-from bar@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3HB2KdG058307; Mon, 17 Apr 2017 11:02:20 GMT (envelope-from bar@FreeBSD.org) Received: (from bar@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3HB2Kxm058304; Mon, 17 Apr 2017 11:02:20 GMT (envelope-from bar@FreeBSD.org) Message-Id: <201704171102.v3HB2Kxm058304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bar set sender to bar@FreeBSD.org using -f From: Barbara Guida Date: Mon, 17 Apr 2017 11:02:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438686 - in head/games/vavoom: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Apr 2017 11:02:21 -0000 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 -@comment %%LAUNCHER%%bin/vlaunch +%%LAUNCHER%%bin/vlaunch %%PORTDOCS%%%%DOCSDIR%%/vavoom.txt %%DATADIR%%/basev/common/basepak.pk3 %%DATADIR%%/basev/doom/basepak.pk3