diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-02-23 16:53:13 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-02-23 16:53:13 +0000 |
| commit | c264578105ead2d5f7148e54b5081c43d0bfb63d (patch) | |
| tree | d087527c282376a6e3562bb01cbd5f435ab74cad /Mk | |
| parent | - Update to 2.2.4 (diff) | |
- (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
Notes
Notes:
svn path=/head/; revision=185750
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.kde.mk | 5 | ||||
| -rw-r--r-- | Mk/bsd.kde4.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 46ad8d644cdb..5e58a5568af6 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 46ad8d644cdb..5e58a5568af6 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 |