From owner-svn-ports-head@freebsd.org Sun May 26 04:50:19 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7139715BF455; Sun, 26 May 2019 04:50:19 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0D8B47131A; Sun, 26 May 2019 04:50:19 +0000 (UTC) (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F24F5EC9C; Sun, 26 May 2019 04:50:18 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4Q4oInX037851; Sun, 26 May 2019 04:50:18 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4Q4oIWR037850; Sun, 26 May 2019 04:50:18 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201905260450.x4Q4oIWR037850@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 26 May 2019 04:50:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502682 - head/emulators/visualboyadvance-m X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/emulators/visualboyadvance-m X-SVN-Commit-Revision: 502682 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0D8B47131A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.93)[-0.930,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 May 2019 04:50:19 -0000 Author: tobik Date: Sun May 26 04:50:18 2019 New Revision: 502682 URL: https://svnweb.freebsd.org/changeset/ports/502682 Log: emulators/visualboyadvance-m: Fix ASMSCALERS option - There is no opt_CMAKE_ARGS helper - It requires Nasm - Ninja breaks the build with it on: ninja: error: build.ninja:737: bad $-escape (literal $ must be written as $$) FLAGS = -I$(CMAKE_SOURCE_DIR)/src/filters/hq/asm/ -O1 -DELF -w-orphan-... ^ near here Modified: head/emulators/visualboyadvance-m/Makefile Modified: head/emulators/visualboyadvance-m/Makefile ============================================================================== --- head/emulators/visualboyadvance-m/Makefile Sun May 26 04:45:54 2019 (r502681) +++ head/emulators/visualboyadvance-m/Makefile Sun May 26 04:50:18 2019 (r502682) @@ -3,7 +3,7 @@ PORTNAME= visualboyadvance-m PORTVERSION= 2.0.0b2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= emulators MAINTAINER= root@cooltrainer.org @@ -40,7 +40,7 @@ DOS2UNIX_REGEX= .*\.(c|cpp|h|ypp) USE_XORG= x11 xext USE_GL= gl glu USE_SDL= sdl -USES= compiler:c++11-lang cmake:insource dos2unix gnome gl pkgconfig +USES= compiler:c++11-lang cmake:insource,noninja dos2unix gnome gl pkgconfig INSTALLS_ICONS= yes CMAKE_ARGS= -DVERSION:STRING="${PORTVERSION}" \ -DSYSCONFDIR:STRING="${PREFIX}/etc" \ @@ -49,8 +49,8 @@ CMAKE_ARGS= -DVERSION:STRING="${PORTVERSION}" \ ASMCORE_BUILD_DEPENDS= as:devel/binutils ASMCORE_CMAKE_BOOL= ENABLE_ASM_CORE -ASMSCALERS_BUILD_DEPENDS= as:devel/binutils -ASMSCALERS_CMAKE_ARGS= ENABLE_ASM_SCALERS +ASMSCALERS_BUILD_DEPENDS= nasm:devel/nasm +ASMSCALERS_CMAKE_BOOL= ENABLE_ASM_SCALERS GVBAM_USE_GNOME= gtk20 GVBAM_LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24 \