diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2003-10-17 06:09:39 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2003-10-17 06:09:39 +0000 |
| commit | 803e4048dc6d15dbbbad172b79257ae00975272f (patch) | |
| tree | 35ce84dbb52c7c6ae12bc9903b22d72c752ba382 /x11-toolkits | |
| parent | Add a missing dependency on libart_lgpl2. (diff) | |
Declare (or resolve) conflicts for KDE and QT.
Notes
Notes:
svn path=/head/; revision=91475
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/qt23/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt32/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt33/Makefile | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile index 2539e026b67f..38b631ccd899 100644 --- a/x11-toolkits/qt23/Makefile +++ b/x11-toolkits/qt23/Makefile @@ -22,6 +22,8 @@ LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \ jpeg.9:${PORTSDIR}/graphics/jpeg \ Xft.2:${PORTSDIR}/x11-fonts/Xft +CONFLICTS= qt-3.* + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_MESA= yes USE_GMAKE= yes diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile index ac99826d63bd..e3265004d74a 100644 --- a/x11-toolkits/qt32/Makefile +++ b/x11-toolkits/qt32/Makefile @@ -23,6 +23,8 @@ LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg +CONFLICTS= linguist-0.* qt-2.* qt-designer-2.* xfmail-1.5.* + USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index ac99826d63bd..e3265004d74a 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -23,6 +23,8 @@ LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg +CONFLICTS= linguist-0.* qt-2.* qt-designer-2.* xfmail-1.5.* + USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes |