Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Jul 2014 15:58:00 +0000 (UTC)
From:      Lars Engels <lme@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r362329 - in head/graphics: luminance luminance-qt5
Message-ID:  <201407201558.s6KFw0RH022196@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lme
Date: Sun Jul 20 15:57:59 2014
New Revision: 362329
URL: http://svnweb.freebsd.org/changeset/ports/362329
QAT: https://qat.redports.org/buildarchive/r362329/

Log:
  Add CONFLICTS_INSTALL to both graphics/luminance{,-qt5} ports.

Modified:
  head/graphics/luminance-qt5/Makefile
  head/graphics/luminance/Makefile

Modified: head/graphics/luminance-qt5/Makefile
==============================================================================
--- head/graphics/luminance-qt5/Makefile	Sun Jul 20 15:53:49 2014	(r362328)
+++ head/graphics/luminance-qt5/Makefile	Sun Jul 20 15:57:59 2014	(r362329)
@@ -28,6 +28,8 @@ INSTALLS_ICONS=	yes
 
 MAKE_JOBS_UNSAFE=yes
 
+CONFLICTS_INSTALL=	luminance-hdr-qt5-*
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>

Modified: head/graphics/luminance/Makefile
==============================================================================
--- head/graphics/luminance/Makefile	Sun Jul 20 15:53:49 2014	(r362328)
+++ head/graphics/luminance/Makefile	Sun Jul 20 15:57:59 2014	(r362329)
@@ -26,6 +26,8 @@ USE_QT4=	gui sql webkit xml linguist_bui
 		rcc_build uic_build imageformats_run
 INSTALLS_ICONS=	yes
 
+CONFLICTS_INSTALL=	luminance-hdr-qt5-*
+
 OPTIONS_DEFINE=	DOCS
 
 post-patch:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407201558.s6KFw0RH022196>