git: 1d21972efd0a - main - editirs/libreoffice: cleanup unused dependencies

The branch main has been updated by fluffy:

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

commit 1d21972efd0a1cea3cf92030cc3115705759bac8
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2026-02-22 21:01:09 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2026-02-25 22:47:02 +0000

    editirs/libreoffice: cleanup unused dependencies
    
    Apparently we supply a couple of removed options to configure.
    
    ===>  Configuring for libreoffice-26.2.0.3_1
    configure: WARNING: unrecognized options: --with-build-version, --with-system-cuckoo, --with-commons-codec-jar, --with-commons-httpclient-jar, --with-commons-lang-jar, --with-commons-logging-jar
    
    ${WRKSRC}/ChangeLog says:
    https://git.libreoffice.org/core/+/5fdf2009d21fa220dfee70ea755bd698c16257a7%5E!/
    2020-07-23  Rene Engelhard  <rene at debian.org>  [5fdf2009d21fa220dfee70ea755bd698c16257a7]
    
            tdf#134522 remove --with-build-version ./configure flag
    
            Noop. Use --with-extra-buildid
    ...
    https://git.libreoffice.org/core/+/938c899831bd5b165b2b7db3945867a1ce155483%5E!/
    2022-08-17  Xisco Fauli  <xiscofauli at libreoffice.org>  [938c899831bd5b165b2b7db3945867a1ce155483]
    
            tdf#150452: Revert "tdf#130795 use concurrent hashmap in SharedStringPool"
    
            This commit reverts 3749d9af3745c0eaff7239e379578e4e2af89e9d
            which removes the dependency on the external library cuckoo
    ...
    https://git.libreoffice.org/core/+/f7d149a731a0284d3d7b7b1c26c736654e0712fd%5E!/
    2015-10-09  Michael Stahl  <mstahl at redhat.com>  [f7d149a731a0284d3d7b7b1c26c736654e0712fd]
    
            swext: remove commons-httpclient dependency from Wiki Publisher
    
            JRE 6 has sufficient HttpURLConnection etc. stuff to make this work
            without bundling external libraries.
    ...
    https://git.libreoffice.org/core/+/4b6ceed4a4a9b152905a8b1712ffb9bd61373c16%5E!/
    2015-10-09  Michael Stahl  <mstahl at redhat.com>  [4b6ceed4a4a9b152905a8b1712ffb9bd61373c16]
    
            swext: Wiki Publisher does not use those apache-commons libraries
    
            ... itself, they were apparently just dependencies of
            commons-httpclient, so remove them.
    
    PR:             293402
    Approved-by:    fluffy
---
 editors/libreoffice/Makefile | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 683b4e86160e..cc0db969a7a7 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	1
+PORTREVISION=	2
 
 .include "${.CURDIR}/Makefile.common"
 
@@ -20,7 +20,6 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		cppunit-config:devel/cppunit \
 		dmake:devel/dmake \
 		gperf>=3.1:devel/gperf \
-		${LOCALBASE}/include/libcuckoo/cuckoohash_map.hh:devel/libcuckoo \
 		mdds>=${MDDS_VERSION}:devel/mdds \
 		gpatch:devel/patch \
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
@@ -194,17 +193,9 @@ GTK4_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 GTK4_USE=	GNOME=gtk40
 
 JAVA_BUILD_DEPENDS=	ant:devel/apache-ant \
-			${JAVAJARDIR}/commons-codec.jar:java/apache-commons-codec \
-			${JAVAJARDIR}/commons-httpclient.jar:java/apache-commons-httpclient \
-			${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3 \
-			${JAVAJARDIR}/commons-logging.jar:java/apache-commons-logging \
 			${JAVAJARDIR}/junit.jar:java/junit
 JAVA_CATEGORIES=	java
 JAVA_CONFIGURE_ON=	--with-ant-home=${LOCALBASE}/share/java/apache-ant \
-			--with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \
-			--with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \
-			--with-commons-lang-jar=${JAVAJARDIR}/commons-lang3.jar \
-			--with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \
 			--with-jdk-home="${JAVA_HOME}" \
 			--with-junit=${JAVAJARDIR}/junit.jar \
 			--with-hamcrest=${JAVAJARDIR}/hamcrest.jar \
@@ -308,7 +299,7 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--disable-mpl-subset \
 		--exec-prefix=${PREFIX} \
 		--with-boost=${LOCALBASE} \
-		--with-build-version="FreeBSD ports ${PKGVERSION}" \
+		--with-extra-buildid="FreeBSD ports ${PKGVERSION}" \
 		--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 		--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 		--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
@@ -320,7 +311,6 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-system-argon2=no \
 		--with-system-afdko=no \
 		--with-system-cppunit \
-		--with-system-cuckoo \
 		--with-system-curl \
 		--with-system-dicts \
 		--with-system-dragonbox=no \