svn commit: r502628 - in head: Mk/Uses devel/qt5-qmake

[Tobias C. Berner]

Done in r502634.

mfg Tobias

On Sat, 25 May 2019 at 22:20, Piotr Kubaj <pkubaj at anongoth.pl> wrote:

> 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
> ${LOCALBASE},
> >    due to the missing 'g' flag to the sed call.
> >
> >  - with this change the gcc architectures should be able to build Qt5
> again.
> >
> >  PR:          237745
> >  Submitted by:        Mark Millard <marklmi26-fbsd at yahoo.com>, jwb
> >  Reported by: pkubaj
> >
> >Modified:
> >  head/Mk/Uses/qt-dist.mk
> >  head/devel/qt5-qmake/Makefile
> >
> >Modified: head/Mk/Uses/qt-dist.mk
>
> >==============================================================================
> >--- 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=         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
>
> >==============================================================================
> >--- 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=     qmake
> > DISTVERSION=  ${QT5_VERSION}
> >+PORTREVISION= 1
> > CATEGORIES=   devel
> > PKGNAMEPREFIX=        qt5-
> >
> >
> >
> >--
> >This message has been scanned for viruses and
> >dangerous content by MailScanner, and is
> >believed to be clean.
> >
>