svn commit: r426041 - in head: . editors/libreoffice

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 13 12:43:21 2016
New Revision: 426041
URL: https://svnweb.freebsd.org/changeset/ports/426041

Log:
  Replace UPDATING entry by CONFLICTS_BUILD which is designed for that
  
  Reported by:	jbeich

Modified:
  head/UPDATING
  head/editors/libreoffice/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Nov 13 12:42:09 2016	(r426040)
+++ head/UPDATING	Sun Nov 13 12:43:21 2016	(r426041)
@@ -6,16 +6,6 @@ You should get into the habit of checkin
 you update your ports collection, before attempting any port upgrades.
 
 20161113:
-  AFFECTS: users of editors/libreoffice
-  AUTHOR: bapt at FreeBSD.org
-
-  Building libreoffice with devel/mdds0 installed is known to fail.
-  Users of portmaster/portupgrade and the one building in place should
-  first remove devel/mdds0:
-
-  # pkg delete mdds0
-
-20161113:
   AFFECTS: users of devel/libosinfo
   AUTHOR: novel at FreeBSD.org
 

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Sun Nov 13 12:42:09 2016	(r426040)
+++ head/editors/libreoffice/Makefile	Sun Nov 13 12:43:21 2016	(r426041)
@@ -12,6 +12,8 @@ EXTRACT_ONLY:=	${DISTFILES}
 
 COMMENT=	Full integrated office productivity suite
 
+CONFLICTS_BUILD=	mdds0
+
 BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		zip:archivers/zip \
 		${LOCALBASE}/include/sqlext.h:databases/unixODBC \