Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Nov 2018 17:32:12 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r484704 - head/x11-toolkits/qt5-declarative
Message-ID:  <201811111732.wABHWCkh007183@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Sun Nov 11 17:32:11 2018
New Revision: 484704
URL: https://svnweb.freebsd.org/changeset/ports/484704

Log:
  x11-toolkits/qt5-declarative mark conflict on replaced ports
  
  - this should help portmaster figuring out what's up
  
  Reported by:	se

Modified:
  head/x11-toolkits/qt5-declarative/Makefile

Modified: head/x11-toolkits/qt5-declarative/Makefile
==============================================================================
--- head/x11-toolkits/qt5-declarative/Makefile	Sun Nov 11 17:19:05 2018	(r484703)
+++ head/x11-toolkits/qt5-declarative/Makefile	Sun Nov 11 17:32:11 2018	(r484704)
@@ -16,7 +16,7 @@ USE_QT=		core gui network sql testlib \
 		widgets xmlpatterns buildtools_build
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-CONFLICTS=	qt5-declarative-render2d-*
+CONFLICTS=	qt5-declarative-render2d-* qt5-qml qt5-quick
 
 QT_DEFINES=	ACCESSIBILITY
 QT_CONFIG=	accessibility accessibility-atspi-bridge



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