7b5da0fa70
As noticed in x11-toolkits/qt5-charts we never corrected the way in which qmake sets the pkgconfig path for Qt5-modules. Instead there was a sed-call on the generated Makefiles in bsd.qt.mk in the target qt-pre-install. This diff modifies devel/qmake5 to set QMAKE_PKGCONFIG_DESTDIR to ../libdata/pkgconfig from the default pkgconfig. As we split Qt-base into multiple ports, simply patching devel/qmake5 is not enough, as the other base-ports will use the file from inside the tarball. Therefore add it as an extrapatch for the Qt-base ports. As this affects the same file extrapatch-libtool in devel/qt5 touched, rename this one and add a hunk to do this change too. Note: qt4 ports are unaffected, as they never were converted to used the qt-preinstall target, and still contain the sed-call in their Makefiles. Reviewed by: rakuco Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D8713 |
||
---|---|---|
.. | ||
Scripts | ||
Uses | ||
bsd.apache.mk | ||
bsd.autotools.mk | ||
bsd.ccache.mk | ||
bsd.commands.mk | ||
bsd.default-versions.mk | ||
bsd.destdir.mk | ||
bsd.emacs.mk | ||
bsd.fpc.mk | ||
bsd.gcc.mk | ||
bsd.gecko.mk | ||
bsd.gstreamer.mk | ||
bsd.java.mk | ||
bsd.ldap.mk | ||
bsd.licenses.db.mk | ||
bsd.licenses.mk | ||
bsd.local.mk | ||
bsd.ocaml.mk | ||
bsd.octave.mk | ||
bsd.options.desc.mk | ||
bsd.options.mk | ||
bsd.port.mk | ||
bsd.port.options.mk | ||
bsd.port.post.mk | ||
bsd.port.pre.mk | ||
bsd.port.subdir.mk | ||
bsd.qt.mk | ||
bsd.ruby.mk | ||
bsd.sanity.mk | ||
bsd.sdl.mk | ||
bsd.sites.mk | ||
bsd.ssp.mk | ||
bsd.tex.mk | ||
bsd.wx.mk | ||
bsd.xorg.mk |