summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Engels <lme@FreeBSD.org>2014-07-20 15:57:59 +0000
committerLars Engels <lme@FreeBSD.org>2014-07-20 15:57:59 +0000
commit02c20b5f73406e135ee022b978b647eaa84b5b75 (patch)
tree0734bcbc73d416d688659f1d74ca57dcbb99d694
parent- add USES=readline to unbreak it on 11.0-CURRENT (diff)
Add CONFLICTS_INSTALL to both graphics/luminance{,-qt5} ports.
Notes
Notes: svn path=/head/; revision=362329
Diffstat (limited to '')
-rw-r--r--graphics/luminance-qt5/Makefile2
-rw-r--r--graphics/luminance/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
index cc21ac2feba5..062b0395c9f5 100644
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@@ -28,6 +28,8 @@ INSTALLS_ICONS= yes
MAKE_JOBS_UNSAFE=yes
+CONFLICTS_INSTALL= luminance-hdr-qt5-*
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.pre.mk>
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index 92ccd9b6dc59..e557b3a13b78 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -26,6 +26,8 @@ USE_QT4= gui sql webkit xml linguist_build moc_build qmake_build \
rcc_build uic_build imageformats_run
INSTALLS_ICONS= yes
+CONFLICTS_INSTALL= luminance-hdr-qt5-*
+
OPTIONS_DEFINE= DOCS
post-patch: