git: f1aef852ca18 - main - editors/openoffice-*: sporadic parallel build fail

The branch main has been updated by truckman:

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

commit f1aef852ca18b2d749a8c14f35cdbf879f51095d
Author:     Don Lewis <truckman@FreeBSD.org>
AuthorDate: 2025-12-28 06:22:42 +0000
Commit:     Don Lewis <truckman@FreeBSD.org>
CommitDate: 2025-12-28 06:30:02 +0000

    editors/openoffice-*: sporadic parallel build fail
    
    Attempt to fix an intermittent parallel build failure in the icu module
    by tweaking a dependency in one of the makefiles.
    
    pet portlint
    
    No PORTREVISION bump because the package is not changed.
---
 .../files/patch-icu_icu-parallel-build.patch       | 23 ++++++++++++++++++++++
 editors/openoffice-4/files/patch-icu_makefile.mk   | 10 ++++++++++
 editors/openoffice-devel/Makefile                  |  2 +-
 .../files/patch-icu_icu-parallel-build.patch       | 23 ++++++++++++++++++++++
 .../openoffice-devel/files/patch-icu_makefile.mk   | 10 ++++++++++
 5 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/editors/openoffice-4/files/patch-icu_icu-parallel-build.patch b/editors/openoffice-4/files/patch-icu_icu-parallel-build.patch
new file mode 100644
index 000000000000..c2cddf33eb54
--- /dev/null
+++ b/editors/openoffice-4/files/patch-icu_icu-parallel-build.patch
@@ -0,0 +1,23 @@
+--- icu/icu-parallel-build.patch.orig	2025-12-27 09:03:46 UTC
++++ icu/icu-parallel-build.patch
+@@ -0,0 +1,20 @@
++diff -ur misc/icu/source/extra/uconv/Makefile.in misc/build/icu/source/extra/uconv/Makefile.in
++--- misc/icu/source/extra/uconv/Makefile.in	2009-07-01 11:50:32.000000000 -0700
+++++ misc/build/icu/source/extra/uconv/Makefile.in
++@@ -140,14 +140,14 @@
++ 	$(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS)
++ 	$(POST_BUILD_STEP)
++ 
++-resfiles: $(RESFILES) package-resfiles
+++resfiles: package-resfiles
++ 
++ ifeq ($(UCONVMSG_STATIC),YES)
++ $(UCONVMSG_LIB): resfiles
++ endif
++ 
++ 
++-package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc
+++package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc $(RESFILES)
++ 	$(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
++ 
++ $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
diff --git a/editors/openoffice-4/files/patch-icu_makefile.mk b/editors/openoffice-4/files/patch-icu_makefile.mk
new file mode 100644
index 000000000000..bfb383fe9db3
--- /dev/null
+++ b/editors/openoffice-4/files/patch-icu_makefile.mk
@@ -0,0 +1,10 @@
+--- icu/makefile.mk.orig	2025-12-27 09:25:15 UTC
++++ icu/makefile.mk
+@@ -44,6 +44,7 @@ PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch
+ 
+ # TODO file icu-mp.patch does not seem to be required
+ PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch \
++	icu-parallel-build.patch \
+ 	icu-format-security.patch icu-win-icutu-dll-version.patch
+ .IF "$(OS)"=="MACOSX"
+ PATCH_FILES+=icu-darwin.patch
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index d49fbb25f3ef..7693a29da70c 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -229,7 +229,7 @@ WITH=	SDK
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000
 # nm: '../unxfbsdi.pro/slo/b2dcubicbezier.o': Invalid argument
-EXTRA_PATCHES+=         ${FILESDIR}/extra-patch-nm
+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-nm
 .endif
 
 .if defined(WITH_DEBUG)
diff --git a/editors/openoffice-devel/files/patch-icu_icu-parallel-build.patch b/editors/openoffice-devel/files/patch-icu_icu-parallel-build.patch
new file mode 100644
index 000000000000..c2cddf33eb54
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-icu_icu-parallel-build.patch
@@ -0,0 +1,23 @@
+--- icu/icu-parallel-build.patch.orig	2025-12-27 09:03:46 UTC
++++ icu/icu-parallel-build.patch
+@@ -0,0 +1,20 @@
++diff -ur misc/icu/source/extra/uconv/Makefile.in misc/build/icu/source/extra/uconv/Makefile.in
++--- misc/icu/source/extra/uconv/Makefile.in	2009-07-01 11:50:32.000000000 -0700
+++++ misc/build/icu/source/extra/uconv/Makefile.in
++@@ -140,14 +140,14 @@
++ 	$(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS)
++ 	$(POST_BUILD_STEP)
++ 
++-resfiles: $(RESFILES) package-resfiles
+++resfiles: package-resfiles
++ 
++ ifeq ($(UCONVMSG_STATIC),YES)
++ $(UCONVMSG_LIB): resfiles
++ endif
++ 
++ 
++-package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc
+++package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc $(RESFILES)
++ 	$(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
++ 
++ $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
diff --git a/editors/openoffice-devel/files/patch-icu_makefile.mk b/editors/openoffice-devel/files/patch-icu_makefile.mk
new file mode 100644
index 000000000000..020ad4af9766
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-icu_makefile.mk
@@ -0,0 +1,10 @@
+--- icu/makefile.mk.orig	2025-09-13 05:44:18 UTC
++++ icu/makefile.mk
+@@ -44,6 +44,7 @@ PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch
+ 
+ # TODO file icu-mp.patch does not seem to be required
+ PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch \
++	icu-parallel-build.patch \
+ 	icu-format-security.patch icu-win-icutu-dll-version.patch
+ 
+ .IF "$(OS)"=="MACOSX"