3 files changed, 7 insertions, 27 deletions

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index d836a26a5271..f6ecd7cda423 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION=	6
+PORTREVISION=	0
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
@@ -54,7 +54,6 @@ BROKEN_powerpc64=	fails to compile: aoo-4.2.0/main/solver/420/unxfbsdppc64.pro/i
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\
-	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \
 		${LOCALBASE}/bin/unzip:archivers/unzip			\
 		zip:archivers/zip					\
 		ant:devel/apache-ant					\
@@ -133,20 +132,19 @@ AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m4\(Build:9823\)
-GITREVISION=	e501375395
-TIMESTAMP=	1678061694
+GITREVISION=	ed2e9b1ba7
+TIMESTAMP=	1707679630
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
+AOOSUFFIX=	${AOOVERSION1}.${AOOVERSION2}
 .if defined(AOORC)
-AOOSUFFIX=	${AOOVERSION}-${AOORC}
 AOOSRC=		apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=
 TARTYPE=	bzip2
 .else
-AOOSUFFIX=	${PORTVERSION}
 AOOSRC=		apache-openoffice-${TIMESTAMP}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=	:snap
 TARTYPE=	xz
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 0e5a8f0e774e..00e51ebb3863 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1678253253
-SHA256 (openoffice/apache-openoffice-1678061694-e501375395-src.tar.xz) = bbd933690fd09f0c059a03dc2918f1aa5a82497678bdee996bfe32b7b56c4de1
-SIZE (openoffice/apache-openoffice-1678061694-e501375395-src.tar.xz) = 247232044
+TIMESTAMP = 1707869994
+SHA256 (openoffice/apache-openoffice-1707679630-ed2e9b1ba7-src.tar.xz) = be7751598f3aed57d10cacdf4f3e50a7e113517b9190982048a8534f4b99b497
+SIZE (openoffice/apache-openoffice-1707679630-ed2e9b1ba7-src.tar.xz) = 246661448
 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
 SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
 SHA256 (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52
diff --git a/editors/openoffice-devel/files/patch-boost_boost__1__55__0.patch b/editors/openoffice-devel/files/patch-boost_boost__1__55__0.patch
deleted file mode 100644
index a2656de477ac..000000000000
--- a/editors/openoffice-devel/files/patch-boost_boost__1__55__0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- boost/boost_1_55_0.patch.orig	2021-04-02 12:58:20 UTC
-+++ boost/boost_1_55_0.patch
-@@ -359,3 +359,15 @@ +#  if defined(__VARIADIC_TEMPLATES)
-  #    define BOOST_HAS_VARIADIC_TMPL
-  #  else
-  #    define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+diff -ur misc/boost_1_55_0/boost/config/stdlib/libcpp.hpp misc/build/boost_1_55_0/boost/config/stdlib/libcpp.hpp
-+--- misc/boost_1_55_0/boost/config/stdlib/libcpp.hpp	2012-05-15 04:57:21.000000000 -0700
-++++ misc/build/boost_1_55_0/boost/config/stdlib/libcpp.hpp
-+@@ -19,7 +19,7 @@
-+ 
-+ #define BOOST_HAS_THREADS
-+ 
-+-#ifdef _LIBCPP_HAS_NO_VARIADICS
-++#if defined(_LIBCPP_HAS_NO_VARIADICS) || (__cplusplus < 201103)
-+ #    define BOOST_NO_CXX11_HDR_TUPLE
-+ #endif
-+