svn commit: r566427 - in head: Mk/Uses devel/qt5/files

[Antoine Brodin]

On Wed, Feb 24, 2021 at 8:23 AM Antoine Brodin <antoine at freebsd.org> wrote:
>
> On Tue, Feb 23, 2021 at 9:12 PM Adriaan de Groot <adridg at freebsd.org> wrote:
> >
> > Author: adridg
> > Date: Tue Feb 23 20:11:56 2021
> > New Revision: 566427
> > URL: https://svnweb.freebsd.org/changeset/ports/566427
> >
> > Log:
> >   Re-work Qt5 install- and deinstall scripts.
> >
> >   Qt5 packages *together* manage a header file qconfig-modules.h which
> >   `#includes` other headers. A given Qt5 package may get a line in there,
> >   or it might not: that depends on package settings.
> >
> >   On installing a package, add the line (if needed), on deinstall, remove
> >   the line (if it was there). There's a tricky case, too: upgrading
> >   a package that *had* a line, but no longer has one. That behaves like
> >   deinstall. Previously we used @postexec and @postunexec lines, but
> >   these were fragile in their own special way. See the linked PRs for
> >   examples -- or tcberner's comment that his qconfig-modules.h file
> >   *was* a screenful, and is now much shorter (and alphabetical, too!)
> >
> >   An additional complication comes from needing to update qtchooser,
> >   *if* it is installed and *if* the package needs it. There was another
> >   set of @postexec lines for that.
> >
> >   Migrate all the update logic to a shell script (there already was one
> >   for deinstall, now make it do triple-duty). From the template file,
> >   `pkg-change.in`, we generate a pkg-install and a pkg-deinstall
> >   script that does the right thing.
> >
> >   PR:           253356 253360
> >   Reported by:  Nimaje on IRC
> >   Reviewed by:  tcberner
>
> Hi,
>
> A lot of qt5 ports fail to build after this change.
> /usr/local/include/qt5/QtCore/qconfig.h:1:10: fatal error:
> 'QtCore/qconfig-modules.h' file not found
> #include <QtCore/qconfig-modules.h>
>          ^~~~~~~~~~~~~~~~~~~~~~~~~~

I see this error message when installing qt5-core too:
Extracting qt5-core-5.15.2_1: .......... done
/bin/sh: /usr/bin/sor: not found
mv: rename /usr/local/include/q5/QCore/qconfig-modules.h.new to
/usr/local/include/q5/QCore/qconfig-modules.h: No such file or
directory

Antoine