Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Jul 2017 03:50:13 +0000 (UTC)
From:      Don Lewis <truckman@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r446366 - in head/editors: openoffice-4 openoffice-4/files openoffice-devel openoffice-devel/files
Message-ID:  <201707220350.v6M3oDH9088168@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: truckman
Date: Sat Jul 22 03:50:12 2017
New Revision: 446366
URL: https://svnweb.freebsd.org/changeset/ports/446366

Log:
  Include <complex> instead of the obsolete <boost/tr1/complex.hpp>.  The
  upcoming boost 1.65 upgrade removes support for tr1.
  
  Sort ONLY_FOR_ARCHS to pacify portlint.
  
  No PORTREVISION bump since the code does not appear to change.
  
  PR:		220723

Added:
  head/editors/openoffice-4/files/patch-scaddins_source_analysis_analysishelper.hxx   (contents, props changed)
  head/editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx   (contents, props changed)
Modified:
  head/editors/openoffice-4/Makefile
  head/editors/openoffice-devel/Makefile

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Sat Jul 22 03:38:18 2017	(r446365)
+++ head/editors/openoffice-4/Makefile	Sat Jul 22 03:50:12 2017	(r446366)
@@ -115,7 +115,7 @@ XDGDIR=			${OOPATH}/share/xdg
 XDGREL=			../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
 EXECBASE?=		openoffice-${AOOSUFFIX}
 
-ONLY_FOR_ARCHS=	i386 amd64 powerpc64
+ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20

Added: head/editors/openoffice-4/files/patch-scaddins_source_analysis_analysishelper.hxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-scaddins_source_analysis_analysishelper.hxx	Sat Jul 22 03:50:12 2017	(r446366)
@@ -0,0 +1,11 @@
+--- scaddins/source/analysis/analysishelper.hxx.orig	2014-09-19 18:07:44 UTC
++++ scaddins/source/analysis/analysishelper.hxx
+@@ -35,7 +35,7 @@
+ 
+ #include <math.h>
+ 
+-#include <boost/tr1/complex.hpp>
++#include <complex>
+ #ifndef double_complex
+ typedef std::complex<double>		double_complex;
+ #endif

Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile	Sat Jul 22 03:38:18 2017	(r446365)
+++ head/editors/openoffice-devel/Makefile	Sat Jul 22 03:50:12 2017	(r446366)
@@ -127,7 +127,7 @@ XDGDIR=			${OOPATH}/share/xdg
 XDGREL=			../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
 EXECBASE?=		openoffice-${AOOSUFFIX}
 
-ONLY_FOR_ARCHS=	i386 amd64 powerpc64
+ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20

Added: head/editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx	Sat Jul 22 03:50:12 2017	(r446366)
@@ -0,0 +1,11 @@
+--- scaddins/source/analysis/analysishelper.hxx.orig	2014-09-19 18:07:44 UTC
++++ scaddins/source/analysis/analysishelper.hxx
+@@ -35,7 +35,7 @@
+ 
+ #include <math.h>
+ 
+-#include <boost/tr1/complex.hpp>
++#include <complex>
+ #ifndef double_complex
+ typedef std::complex<double>		double_complex;
+ #endif



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