From 5fa838568e4cc2a04bd02f459b19fff0e091c73a Mon Sep 17 00:00:00 2001 From: Don Lewis Date: Sat, 22 Jul 2017 03:50:12 +0000 Subject: [PATCH] Include instead of the obsolete . 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 --- editors/openoffice-4/Makefile | 2 +- .../patch-scaddins_source_analysis_analysishelper.hxx | 11 +++++++++++ editors/openoffice-devel/Makefile | 2 +- .../patch-scaddins_source_analysis_analysishelper.hxx | 11 +++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 editors/openoffice-4/files/patch-scaddins_source_analysis_analysishelper.hxx create mode 100644 editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 06f793532f16..23ed26c76105 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -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 diff --git a/editors/openoffice-4/files/patch-scaddins_source_analysis_analysishelper.hxx b/editors/openoffice-4/files/patch-scaddins_source_analysis_analysishelper.hxx new file mode 100644 index 000000000000..adef7313dad3 --- /dev/null +++ b/editors/openoffice-4/files/patch-scaddins_source_analysis_analysishelper.hxx @@ -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 + +-#include ++#include + #ifndef double_complex + typedef std::complex double_complex; + #endif diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index c2d082128ef4..60dc91ddacd3 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -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 diff --git a/editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx b/editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx new file mode 100644 index 000000000000..adef7313dad3 --- /dev/null +++ b/editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx @@ -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 + +-#include ++#include + #ifndef double_complex + typedef std::complex double_complex; + #endif