diff options
author | Max Brazhnikov <makc@FreeBSD.org> | 2010-12-30 08:25:11 +0000 |
---|---|---|
committer | Max Brazhnikov <makc@FreeBSD.org> | 2010-12-30 08:25:11 +0000 |
commit | 39d515c0da84cb6cf0d26d1ffddb97d03db47823 (patch) | |
tree | 2788829e0d5bc4929229ca3570bebd6472cba294 /x11 | |
parent | - Update MASTER_SITE (diff) |
Mark build conflict with openssl from ports.
Notes
Notes:
svn path=/head/; revision=267157
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kdelibs3/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 91bb67f4e006..e385c928ced5 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -37,6 +37,7 @@ RUN_DEPENDS= kdehier>0:${PORTSDIR}/misc/kdehier \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ iceauth:${PORTSDIR}/x11/iceauth +CONFLICTS_BUILD= openssl-1.* CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2* .if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS) CONFLICTS+= kdelibs-[0-9]* |