From owner-svn-ports-all@freebsd.org  Sun Nov 13 12:43:23 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C022C3E32A;
 Sun, 13 Nov 2016 12:43:23 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0DA4611CD;
 Sun, 13 Nov 2016 12:43:22 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uADChMTd096415;
 Sun, 13 Nov 2016 12:43:22 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uADChMr8096413;
 Sun, 13 Nov 2016 12:43:22 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201611131243.uADChMr8096413@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 13 Nov 2016 12:43:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r426041 - in head: . editors/libreoffice
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Nov 2016 12:43:23 -0000

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@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@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 \