From owner-svn-ports-all@freebsd.org Sat May 25 07:50:30 2019 Return-Path: Delivered-To: svn-ports-all@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 9741515A5281; Sat, 25 May 2019 07:50:30 +0000 (UTC) (envelope-from yuri@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 3400893640; Sat, 25 May 2019 07:50:30 +0000 (UTC) (envelope-from yuri@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 17D7D1273; Sat, 25 May 2019 07:50:30 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4P7oTM2060941; Sat, 25 May 2019 07:50:29 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4P7oTbV060940; Sat, 25 May 2019 07:50:29 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201905250750.x4P7oTbV060940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 25 May 2019 07:50:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502504 - head/multimedia/webcamoid X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/multimedia/webcamoid X-SVN-Commit-Revision: 502504 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3400893640 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 25 May 2019 07:50:30 -0000 Author: yuri Date: Sat May 25 07:50:29 2019 New Revision: 502504 URL: https://svnweb.freebsd.org/changeset/ports/502504 Log: multimedia/webcamoid: Add .if/.endif for the g++ binary alias This is a followup to the commit r494857 Reminded by: gerald Modified: head/multimedia/webcamoid/Makefile Modified: head/multimedia/webcamoid/Makefile ============================================================================== --- head/multimedia/webcamoid/Makefile Sat May 25 06:27:52 2019 (r502503) +++ head/multimedia/webcamoid/Makefile Sat May 25 07:50:29 2019 (r502504) @@ -30,7 +30,11 @@ QMAKE_ARGS= INSTALLQMLDIR=${QT_QMLDIR} \ LIBDIR=${PREFIX}/lib \ MANDIR=${PREFIX}/man +.include + +.if ${CHOSEN_COMPILER_TYPE} == gcc # Workaround for Bug#224137: devel/qt5-qmake: Doesn't use the right compiler in case USE_GCC is selected BINARY_ALIAS= g++=${CXX} +.endif -.include +.include