[Midnightbsd-cvs] mports: bsd.qt.mk: if qmake is used by a port, set DESTDIRNAME to
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Mon Oct 13 16:43:12 EDT 2008
Log Message:
-----------
if qmake is used by a port, set DESTDIRNAME to INSTALL_ROOT. This allows
the port to fake correctly.
Modified Files:
--------------
mports/Mk:
bsd.qt.mk (r1.3 -> r1.4)
-------------- next part --------------
Index: bsd.qt.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.qt.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -L Mk/bsd.qt.mk -L Mk/bsd.qt.mk -u -r1.3 -r1.4
--- Mk/bsd.qt.mk
+++ Mk/bsd.qt.mk
@@ -243,24 +243,28 @@
.endfor
.if defined(QT_COMPONENTS)
-.for ext in ${QT_COMPONENTS}
+. for ext in ${QT_COMPONENTS}
${ext}_QT4_PREFIX?= qt4-
${ext}_QT4_VERSION?= ${QT4_VERSION}
${ext}_NAME?= ${ext}
_${ext}= ${ext}
-.if ${_QT_COMPONENTS_SUFFIXED:M${ext}}!= ""
-.if ${_${ext}:M*_build}!= ""
+. 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}
-.elif ${_${ext}:M*_run}!= ""
+. elif ${_${ext}:M*_run}!= ""
RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME:S/_run//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-.else
+. else
BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-.endif
-.else
+. endif
+. else
IGNORE= cannot install: unknown Qt4 component -- ${ext}
-.endif
-.endfor
+. endif
+. endfor
+. if ${QT_COMPONENTS:Mqmake*} != ""
+# we're using qmake. Set up DESTDIRNAME so fake works correctly.
+DESTDIRNAME= INSTALL_ROOT
+. endif
.else
BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
More information about the Midnightbsd-cvs
mailing list