git: b630d5755e10 - main - editors/openoffice-devel: switch to upstream trunk

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Don Lewis <truckman_at_FreeBSD.org>
Date: Sat, 19 Sep 2026 08:18:42 UTC
The branch main has been updated by truckman:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b630d5755e107f881a4c840c8165ead7c1a49670

commit b630d5755e107f881a4c840c8165ead7c1a49670
Author:     Don Lewis <truckman@FreeBSD.org>
AuthorDate: 2026-09-19 08:13:24 +0000
Commit:     Don Lewis <truckman@FreeBSD.org>
CommitDate: 2026-09-19 08:18:34 +0000

    editors/openoffice-devel: switch to upstream trunk
    
    Switch to following the upstream trunk branch.  The AOO42X is likely a
    dead end, and the next major release will propably be 5.0.0.
---
 editors/openoffice-devel/Makefile                  | 22 ++++++++++------------
 editors/openoffice-devel/distinfo                  | 10 +++++-----
 .../files/patch-solenv_gbuild_platform_freebsd.mk  | 10 ----------
 .../files/patch-solenv_inc_unxfbsd.mk              | 11 -----------
 .../patch-testtools_source_bridgetest_makefile.mk  | 13 -------------
 5 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index f0a634a51c5e..ed49d738565e 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION=	4
+PORTREVISION=	0
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
@@ -51,9 +51,6 @@ LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
-# When building testtools ...
-#BROKEN_i386=	"creation of executable memory area failed: Permission denied"
-
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\
 		${LOCALBASE}/bin/unzip:archivers/unzip			\
@@ -124,15 +121,16 @@ USE_XORG=	ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 
 CONFLICTS_INSTALL=	apache-openoffice-4*
 
-AOOVERSION1=	4
-AOOVERSION2=	2
+AOOVERSION1=	5
+AOOVERSION2=	1
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG=		AOO420m6\(Build:9825\)
-GITREVISION=	38b1ce9df0
-TIMESTAMP=	1786138564
+AOOTAG=		AOO510m1\(Build:99000\)
+GITREVISION=	b81185736b
+TIMESTAMP=	1788900724
 #AOORC=rc3
-EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
+#EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
+EXTSRC=		ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
@@ -142,7 +140,7 @@ AOOSRC=		apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=
 TARTYPE=	bzip2
 .else
-AOOSRC=		apache-openoffice-${TIMESTAMP}-${GITREVISION}-src${EXTRACT_SUFX}
+AOOSRC=		apache-openoffice-${AOOVERSION}-${TIMESTAMP}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=	:snap
 TARTYPE=	xz
 .endif
@@ -251,7 +249,7 @@ CONFIGURE_ARGS+=	--without-commons-logging
 
 .include <${FILESDIR}/Makefile.localized>
 
-EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
+EXTRA_DISTFILES=	9dcd632441e4da04a461082ebbafd337-boost_1_84_0.tar.bz2 \
 			e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz \
 			128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz \
 			d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index d5de14792da1..ff548f2e2541 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1788924698
-SHA256 (openoffice/apache-openoffice-1786138564-38b1ce9df0-src.tar.xz) = 95696e6a07cf97e249944907c232b5936b11e35d9431da7323b6b0936b1fc78b
-SIZE (openoffice/apache-openoffice-1786138564-38b1ce9df0-src.tar.xz) = 249744200
+TIMESTAMP = 1789770007
+SHA256 (openoffice/apache-openoffice-5.1.0-1788900724-b81185736b-src.tar.xz) = 2411da7ba6a93cb4384bcf2751bceca7c880186689eb464b68bf15cc6cb648a8
+SIZE (openoffice/apache-openoffice-5.1.0-1788900724-b81185736b-src.tar.xz) = 249606864
 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
-SIZE (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = 58146647
+SHA256 (openoffice/9dcd632441e4da04a461082ebbafd337-boost_1_84_0.tar.bz2) = cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454
+SIZE (openoffice/9dcd632441e4da04a461082ebbafd337-boost_1_84_0.tar.bz2) = 123110547
 SHA256 (openoffice/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 814de31e1413df945cdd34939b424c4cf7a94d1c481f2d44c99c8ca52b288063
 SIZE (openoffice/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 13161131
 SHA256 (openoffice/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz) = 5677badffc48a8d332e345ea4fe225e3577f53fc95deeec8306000b256829655
diff --git a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk
deleted file mode 100644
index 181e832bbfc3..000000000000
--- a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- solenv/gbuild/platform/freebsd.mk.orig	2019-09-17 22:55:21 UTC
-+++ solenv/gbuild/platform/freebsd.mk
-@@ -125,6 +125,7 @@ gb_LinkTarget_LDFLAGS += \
- 	-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
- 	-Wl,-z,combreloc \
- 	-Wl,-z,defs \
-+	-Wl,--undefined-version \
- 	$(subst -L../lib , ,$(SOLARLIB)) \
- 	${FBSD_GCC_RPATH} \
- 	 \
diff --git a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk
deleted file mode 100644
index 5ef223b384a3..000000000000
--- a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/inc/unxfbsd.mk.orig	2019-09-17 22:55:21 UTC
-+++ solenv/inc/unxfbsd.mk
-@@ -173,7 +173,7 @@ LINKFLAGSRUNPATH_NONE=
- LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
- #LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
- LINKFLAGSRUNPATH_NONE=
--LINKFLAGS=-Wl,-z,combreloc $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
-+LINKFLAGS=-Wl,-z,combreloc -Wl,--undefined-version $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
diff --git a/editors/openoffice-devel/files/patch-testtools_source_bridgetest_makefile.mk b/editors/openoffice-devel/files/patch-testtools_source_bridgetest_makefile.mk
deleted file mode 100644
index 8cb7343f7340..000000000000
--- a/editors/openoffice-devel/files/patch-testtools_source_bridgetest_makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- testtools/source/bridgetest/makefile.mk.orig	2026-09-08 18:56:04 UTC
-+++ testtools/source/bridgetest/makefile.mk
-@@ -134,8 +134,8 @@ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_se
- 
- runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
-         $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
--.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(OS)$(CPU)"=="SOLARISS" || "$(OS)$(CPU)"=="FREEBSDP"
--	@echo "Mac OSX PPC GCC and Solaris fails this test! likely broken UNO bridge. Fix me."
-+.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(OS)$(CPU)"=="SOLARISS" || "$(OS)$(CPU)"=="FREEBSDP" || "$(OS)$(CPU)"=="FREEBSDI"
-+	@echo "Mac OSX PPC GCC X86 and Solaris fails this test! likely broken UNO bridge. Fix me."
- .ELSE
-         cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
- 		-ro uno_services.rdb -ro uno_types.rdb \