From owner-svn-ports-all@freebsd.org Sat Apr 8 13:49:15 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 50A71D138D4; Sat, 8 Apr 2017 13:49:15 +0000 (UTC) (envelope-from riggs@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 06F00EF0; Sat, 8 Apr 2017 13:49:14 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v38DnExh076035; Sat, 8 Apr 2017 13:49:14 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v38DnEHk076033; Sat, 8 Apr 2017 13:49:14 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201704081349.v38DnEHk076033@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 8 Apr 2017 13:49:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438043 - in head/multimedia/handbrake: . 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: Sat, 08 Apr 2017 13:49:15 -0000 Author: riggs Date: Sat Apr 8 13:49:13 2017 New Revision: 438043 URL: https://svnweb.freebsd.org/changeset/ports/438043 Log: Honour CC var instead of hardcoded gcc PR: 218470 Submitted by: naito.yuichiro@gmail.com Reported by: gerald Modified: head/multimedia/handbrake/Makefile head/multimedia/handbrake/files/patch-make_configure.py Modified: head/multimedia/handbrake/Makefile ============================================================================== --- head/multimedia/handbrake/Makefile Sat Apr 8 13:02:36 2017 (r438042) +++ head/multimedia/handbrake/Makefile Sat Apr 8 13:49:13 2017 (r438043) @@ -3,6 +3,7 @@ PORTNAME= handbrake PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= multimedia DIST_SUBDIR= ${PORTNAME} @@ -120,6 +121,9 @@ post-extract: .SILENT ${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/download .endfor +#post-patch: +# ${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/make/configure.py + post-install-X11-on: ${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake Modified: head/multimedia/handbrake/files/patch-make_configure.py ============================================================================== --- head/multimedia/handbrake/files/patch-make_configure.py Sat Apr 8 13:02:36 2017 (r438042) +++ head/multimedia/handbrake/files/patch-make_configure.py Sat Apr 8 13:49:13 2017 (r438043) @@ -36,6 +36,15 @@ grp.add_option( '--flatpak', default=False, action='store_true', help=h ) cli.add_option_group( grp ) +@@ -1517,7 +1520,7 @@ try: + class Tools: + ar = ToolProbe( 'AR.exe', 'ar' ) + cp = ToolProbe( 'CP.exe', 'cp' ) +- gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( 'gcc-4', '*-*-cygwin*' )) ++ gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( os.environ['CC'], '*-*-freebsd*' )) + + if host.match( '*-*-darwin*' ): + gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' ) @@ -1924,10 +1927,15 @@ int main() doc.add( 'GCC.sysroot', '' ) doc.add( 'GCC.minver', '' )