From owner-svn-ports-head@freebsd.org  Wed Apr 18 21:06:01 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A3A9FA98E6;
 Wed, 18 Apr 2018 21:06:01 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id EB77E7E1F9;
 Wed, 18 Apr 2018 21:06:00 +0000 (UTC)
 (envelope-from truckman@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E40CA2026F;
 Wed, 18 Apr 2018 21:06:00 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3IL60ed007192;
 Wed, 18 Apr 2018 21:06:00 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3IL60VS007190;
 Wed, 18 Apr 2018 21:06:00 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201804182106.w3IL60VS007190@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Wed, 18 Apr 2018 21:06:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r467736 - in head/editors/openoffice-4: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: truckman
X-SVN-Commit-Paths: in head/editors/openoffice-4: . files
X-SVN-Commit-Revision: 467736
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2018 21:06:01 -0000

Author: truckman
Date: Wed Apr 18 21:06:00 2018
New Revision: 467736
URL: https://svnweb.freebsd.org/changeset/ports/467736

Log:
  Fix editors/openoffice-4 build with boost 1.67 by checking the boost
  version and including <boost/next_prior.hpp> instead of
  <boost/utility.hpp> when the new version of boost is detected.
  
  PR:		227553
  Reported by:	jbeich

Added:
  head/editors/openoffice-4/files/patch-boost1.67   (contents, props changed)
Modified:
  head/editors/openoffice-4/Makefile

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Wed Apr 18 20:54:46 2018	(r467735)
+++ head/editors/openoffice-4/Makefile	Wed Apr 18 21:06:00 2018	(r467736)
@@ -48,7 +48,6 @@ LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror 
 LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
-BROKEN=		fails to build with boost 1.67, see bug 227553
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\

Added: head/editors/openoffice-4/files/patch-boost1.67
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-boost1.67	Wed Apr 18 21:06:00 2018	(r467736)
@@ -0,0 +1,36 @@
+Index: basegfx/source/range/b2drangeclipper.cxx
+===================================================================
+--- basegfx/source/range/b2drangeclipper.cxx	(revision 1829412)
++++ basegfx/source/range/b2drangeclipper.cxx	(working copy)
+@@ -35,7 +35,12 @@
+ 
+ #include <o3tl/vector_pool.hxx>
+ #include <boost/bind.hpp>
+-#include <boost/utility.hpp>
++#include <boost/version.hpp>
++#if BOOST_VERSION < 106700
++# include <boost/utility.hpp>
++#else
++# include <boost/next_prior.hpp>
++#endif
+ 
+ #include <algorithm>
+ #include <deque>
+Index: slideshow/source/inc/listenercontainer.hxx
+===================================================================
+--- slideshow/source/inc/listenercontainer.hxx	(revision 1829412)
++++ slideshow/source/inc/listenercontainer.hxx	(working copy)
+@@ -24,7 +24,12 @@
+ #define INCLUDED_SLIDESHOW_LISTENERCONTAINER_HXX
+ 
+ #include <osl/mutex.hxx>
+-#include <boost/utility.hpp>
++#include <boost/version.hpp>
++#if BOOST_VERSION < 106700
++# include <boost/utility.hpp>
++#else
++# include <boost/next_prior.hpp>
++#endif
+ #include <algorithm>
+ #include <vector>
+