Max Brazhnikov написав(ла):
I can't say it will really break something (at least for different revisions),
however having mixed qt4 parts of several versions is not supposed. Qt
provides single package for qt4 and it doesn't support by component build.
While our ports allow to build qt4 by parts, it's primary for reducing the
total qt4 components installed.
The following tiny patch relaxes the current requirements a little bit
-- and makes the use of ">=" a little more sensible -- by demanding,
only the major and the minor version numbers match, but not necessarily
the micro. It will still be impossible to use qmake-4.4.3 to build
qt-4.5.x, but it is an improvement over the current situation...
Longer term, qmake (and possibly, some other components) may need to be
treated separately from the rest of the Qt4-components to apply even
more relaxed requirements to them.
Yours,
-mi
Index: bsd.qt.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.qt.mk,v
retrieving revision 1.12
diff -U2 -r1.12 bsd.qt.mk
--- bsd.qt.mk 14 Feb 2009 22:58:49 -0000 1.12
+++ bsd.qt.mk 22 Feb 2009 09:34:33 -0000
@@ -261,9 +261,9 @@
.if ${_QT_COMPONENTS_SUFFIXED:M${ext}}!= ""
.if ${_${ext}:M*_build}!= ""
-BUILD_DEPENDS+=
${${ext}_QT4_PREFIX}${${ext}_NAME:S/_build//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+BUILD_DEPENDS+=
${${ext}_QT4_PREFIX}${${ext}_NAME:S/_build//}>=${${ext}_QT4_VERSION:R}:${PORTSDIR}/${${ext}_DEPENDS}
.elif ${_${ext}:M*_run}!= ""
RUN_DEPENDS+=
${${ext}_QT4_PREFIX}${${ext}_NAME:S/_run//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
.else
-BUILD_DEPENDS+=
${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+BUILD_DEPENDS+=
${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION:R}:${PORTSDIR}/${${ext}_DEPENDS}
RUN_DEPENDS+=
${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
.endif
_______________________________________________
kde-freebsd mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information
