aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2007-02-24 00:53:13 +0800
committerlofi <lofi@FreeBSD.org>2007-02-24 00:53:13 +0800
commite69fe226c25786b0dae7fc45f4a4e899f440de22 (patch)
tree2ddc7dec7dd1b955fac3dfb67c1408717d46382b /Mk
parentb66ee1ce5e1ec3efd54e04c80f620cb0c65e6b71 (diff)
downloadfreebsd-ports-graphics-e69fe226c25786b0dae7fc45f4a4e899f440de22.tar.gz
freebsd-ports-graphics-e69fe226c25786b0dae7fc45f4a4e899f440de22.tar.zst
freebsd-ports-graphics-e69fe226c25786b0dae7fc45f4a4e899f440de22.zip
- (Re)add the sql dependency trigger. [1]
- Don't clobber BUILD/RUN_DEPENDS if no QT4_COMPONENTS are specified. [2] Submitted by: [1] Danny Pansters <danny@ricin.com>, [2] nivit
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.kde.mk5
-rw-r--r--Mk/bsd.kde4.mk5
2 files changed, 6 insertions, 4 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index 46ad8d644cd..5e58a5568af 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -195,6 +195,7 @@ qtconfig_DEPENDS= devel/qtconfig
qtestlib_DEPENDS= devel/qt4-qtestlib
qvfb_DEPENDS= devel/qt4-qvfb
rcc_DEPENDS= devel/qt4-rcc
+sql_DEPENDS= databases/qt4-sql
svg_DEPENDS= graphics/qt4-svg
uic_DEPENDS= devel/qt4-uic
uic3_DEPENDS= devel/qt4-uic3
@@ -213,8 +214,8 @@ IGNORE= cannot install: unknown Qt4 component -- ${ext}
.endif
.endfor
.else
-BUILD_DEPENDS= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-RUN_DEPENDS= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
.endif
.else
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 46ad8d644cd..5e58a5568af 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -195,6 +195,7 @@ qtconfig_DEPENDS= devel/qtconfig
qtestlib_DEPENDS= devel/qt4-qtestlib
qvfb_DEPENDS= devel/qt4-qvfb
rcc_DEPENDS= devel/qt4-rcc
+sql_DEPENDS= databases/qt4-sql
svg_DEPENDS= graphics/qt4-svg
uic_DEPENDS= devel/qt4-uic
uic3_DEPENDS= devel/qt4-uic3
@@ -213,8 +214,8 @@ IGNORE= cannot install: unknown Qt4 component -- ${ext}
.endif
.endfor
.else
-BUILD_DEPENDS= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-RUN_DEPENDS= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
.endif
.else