From owner-svn-ports-head@freebsd.org Sat May 25 20:20:08 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 3A92415B555B; Sat, 25 May 2019 20:20:08 +0000 (UTC) (envelope-from pkubaj@anongoth.pl) Received: from mail.anongoth.pl (mail.anongoth.pl [46.248.190.61]) (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 "anongoth.pl", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B6EE487B47; Sat, 25 May 2019 20:20:07 +0000 (UTC) (envelope-from pkubaj@anongoth.pl) Received: from anongoth.pl (unknown [192.168.1.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: pkubaj@anongoth.pl) by mail.anongoth.pl (Postfix) with ESMTPSA id 4280E18341; Sat, 25 May 2019 22:19:53 +0200 (CEST) Date: Sat, 25 May 2019 22:19:44 +0200 From: Piotr Kubaj To: "Tobias C. Berner" Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r502628 - in head: Mk/Uses devel/qt5-qmake Message-ID: <20190525201944.GD7887@ThinkPad-X200.g.anongoth.pl> References: <201905252002.x4PK2tTS060175@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tT4BDFGlxSktsPWG" Content-Disposition: inline In-Reply-To: <201905252002.x4PK2tTS060175@repo.freebsd.org> User-Agent: Mutt/1.11.4 (2019-03-13) X-Rspamd-Queue-Id: B6EE487B47 X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.989,0] 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: Sat, 25 May 2019 20:20:08 -0000 --tT4BDFGlxSktsPWG Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Could you MFH it? It unblocks over 1000 ports. On 19-05-25 20:02:55, Tobias C. Berner wrote: >Author: tcberner >Date: Sat May 25 20:02:55 2019 >New Revision: 502628 >URL: https://svnweb.freebsd.org/changeset/ports/502628 > >Log: > qt5: fix build on gcc architectures > > - the sed call was only replacing one of the %%LOCALBASE%% by ${LOCALBAS= E}, > due to the missing 'g' flag to the sed call. > > - with this change the gcc architectures should be able to build Qt5 aga= in. > > PR: 237745 > Submitted by: Mark Millard , jwb > Reported by: pkubaj > >Modified: > head/Mk/Uses/qt-dist.mk > head/devel/qt5-qmake/Makefile > >Modified: head/Mk/Uses/qt-dist.mk >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >--- head/Mk/Uses/qt-dist.mk Sat May 25 19:23:19 2019 (r502627) >+++ head/Mk/Uses/qt-dist.mk Sat May 25 20:02:55 2019 (r502628) >@@ -251,7 +251,7 @@ _QT5_BASE=3D core dbus gui network sql widgets > .if ${_QT_VER:M5} > post-patch: gcc-post-patch > gcc-post-patch: >- ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \ >+ ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ > ${WRKSRC}/mkspecs/common/gcc-base.conf \ > ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf > ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \ > >Modified: head/devel/qt5-qmake/Makefile >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >--- head/devel/qt5-qmake/Makefile Sat May 25 19:23:19 2019 (r502627) >+++ head/devel/qt5-qmake/Makefile Sat May 25 20:02:55 2019 (r502628) >@@ -2,6 +2,7 @@ > > PORTNAME=3D qmake > DISTVERSION=3D ${QT5_VERSION} >+PORTREVISION=3D 1 > CATEGORIES=3D devel > PKGNAMEPREFIX=3D qt5- > > > >--=20 >This message has been scanned for viruses and >dangerous content by MailScanner, and is >believed to be clean. > --tT4BDFGlxSktsPWG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEycyIeNkkgohzsoorelmbhSCDnJ0FAlzpo2BfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM5 Q0M4ODc4RDkyNDgyODg3M0IyOEEyQjdBNTk5Qjg1MjA4MzlDOUQACgkQelmbhSCD nJ1ciA/9G9pFsAnJh2RH8ysXnA4pUnOL5Ytlj9gS4uhDRIDOk1IvhAwyrgl6bLzw QYkO/J4a7PKJBCYaESinqwlp1Mhg976UsIYLqdl69/PXvuCEN069LAywLw4MWs0U dJV9AGeOJSmwBkvdN1YgHF6Jeun9zlAF3rPtU6Rgj4vMBgGiIp9p8m8CAjyuRj9s n8e9WwYjDto0i5phYSSsbcqERKQYJAHxlpPwOWN8k6jJZwazgB9e7sbKBopEri8y 31UPd1vlfEbwNkrUFr2+C7aRUN9pkhoXuWuSgGOQLgBGdVoC9SKJiLQA9w9J6ZC7 fp+002df73cDbXQMZEtMFzPpg0JgYwYY4CSkbZ7f8nsq36g4KV+RMIvoRtGqEsG0 Dg9b6woc6Ie0kkdICUGNDBvYI4vt54T4SjTKWkvjb/kpn09dudJX9XlDDF4xjM1k M1QLj9XsxVnafu6divdI+NOJyYQkpSJjNAoVE1AI41H1cjkRWBMN9/0iZpD5MxNk LvVk+QZ1JJFAL/0ChELAqAOIO+FB2nb0gimxyHf7DhqFSRUWhHoctb4iYyWvDFnI INZR7R2bsPrgRbAT58SYvowK4rU13KXJL/HvScu6y/UIfqeXskEoRov8jo00+/NQ FNhl5GO8s6acPGhESH9ldQRbGVdz06i08+jsPHaaUeY9AuqE16g= =CTd9 -----END PGP SIGNATURE----- --tT4BDFGlxSktsPWG--