From nobody Mon Feb 23 13:28:49 2026 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fKMBZ4bk8z6TNKr for ; Mon, 23 Feb 2026 13:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKMBZ2WvTz3HQg for ; Mon, 23 Feb 2026 13:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771853334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Us7StwCidPIhoE5/C4Zi6iZa01WZWMc+nxTJUcNHCXY=; b=XwV6hRg96RbPCMK8kmJ5ZqG0kn5qAdL2mPmbuRshqcx8HJdfVbrTDqrIlEKSlm7fylbK8o 0pLqDC2zLTo3XclMpJ1UDcIhh2ziC1xvKhznCcYJE61+WhrK/DPGxzi3aV5ZW+KW6//vpN IU+DC1HOn77KOfaCD31gFRKyZyq2lzUTH+dRtGkYNvp/gB+hvFpYWgLwniUlIdvfduEzn3 Tp7tovB1aIooOVLrHhwVYSmbFrHRm9zd7+tL+IiiQ/5dK7H0NiZ4kNI27Y+znt/s2G+rw3 G+IZgV/dfyZud0JK98DnwzThzzz42uTxmX+1/OoxfLsnixG7jskAccJKpWUqQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771853334; a=rsa-sha256; cv=none; b=uJZyTVBBfuNJbgCLWkYPV2544kexNJNRTO2y57lh2EDmg9nljT958NeM3SPei7fXMKCotP 8TKCFj3vNrRLUMPsBVfzVApdxyTEZEEP+rGlWppocFAqFU/adMfmfo6DBOb/ELbueGk5An q/dObxTGtrieRev26aqVKHwnE2LMCGOaqYuMu1n3KA6ASSFd9t5ZpZ1dWTtGwq/tY+Oe9W ZsHYGJfNrFV/Nu6908EqFB2zBtBMm+BguFh1snKpQWl61wX8s9/IMnDSb40f9eEPtqqnGX zYk0uONe3D6CT39Opla65J+1DuQbtk7Ww/VKaMvDYCNsSFKTlENPHeXobiAODw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771853334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Us7StwCidPIhoE5/C4Zi6iZa01WZWMc+nxTJUcNHCXY=; b=hTpzhCWUYhtrcITm9Vczslvykf3u5dWwUA08I2cYAaqFSNNq0rS4HAZilXndyCCR5H2DwW cy8Sj+a6cHy3Jtc6vcDh+la4MCS1x0blbNMv1MAMoQDeSlINjtJJkJCESPLPphQzmkHLaz +YnqQck1YOqbhkOBZEHRH/krCqyx6rkH5yGomjBrakPaa8qJtr7s4TBP8huRFc8wagr46t msv/T8sIqPCF2PdPBCsqRe3NO6SxYAbi1kK33F2QUEYYIdMWzO/zo75ZAL0TUfU/rQ2c5s l9prGIbZtlwbMb6fSypzSLybcKOH9OumAOimqmDx6oFuIJ+UsqpvFnepYV83eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKMBZ1nTMzXMZ for ; Mon, 23 Feb 2026 13:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4680c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 13:28:49 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: d33ede1043fa - main - java/apache-commons-httpclient: make backwards compatible with java 8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d33ede1043fa5f4dd20a3cbaf5a1ef9c83d5bb6c Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 13:28:49 +0000 Message-Id: <699c5611.4680c.382602b5@gitrepo.freebsd.org> The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=d33ede1043fa5f4dd20a3cbaf5a1ef9c83d5bb6c commit d33ede1043fa5f4dd20a3cbaf5a1ef9c83d5bb6c Author: Ronald Klop AuthorDate: 2026-02-20 19:55:06 +0000 Commit: Ronald Klop CommitDate: 2026-02-23 13:28:12 +0000 java/apache-commons-httpclient: make backwards compatible with java 8 Dependency openoffice needs java 8. Without this patch openoffice fails with: bad class file: /usr/local/share/java/classes/commons-httpclient.jar(org/apache/commons/httpclient/HttpClient.class) class file has wrong version 65.0, should be 52.0 Please remove or make sure it appears in the correct subdirectory of the classpath. So make httpclient target java 8 for now. While here I added encoding= to javac instead of the REINPLACE_CMD statement. PR: 293317 Approved-by: Alex Dupre (maintainer) --- java/apache-commons-httpclient/Makefile | 5 ---- .../files/patch-build.xml | 34 ++++++++++++++++++++-- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/java/apache-commons-httpclient/Makefile b/java/apache-commons-httpclient/Makefile index fcb964cfcfbd..4ca6b44aef3f 100644 --- a/java/apache-commons-httpclient/Makefile +++ b/java/apache-commons-httpclient/Makefile @@ -32,11 +32,6 @@ PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar PORTDOCS= * -post-patch: - @${REINPLACE_CMD} 's/Ortwin Gl.*ck/Ortwin Glueck/' \ - ${WRKSRC}/src/java/org/apache/commons/httpclient/*.java \ - ${WRKSRC}/src/java/org/apache/commons/httpclient/*/*.java - do-install: @${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..." @${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/ diff --git a/java/apache-commons-httpclient/files/patch-build.xml b/java/apache-commons-httpclient/files/patch-build.xml index 98ba3dfbfef7..c1458323a02f 100644 --- a/java/apache-commons-httpclient/files/patch-build.xml +++ b/java/apache-commons-httpclient/files/patch-build.xml @@ -1,12 +1,23 @@ ---- build.xml.orig 2007-10-28 09:00:18.000000000 +0100 -+++ build.xml 2007-10-28 09:00:37.000000000 +0100 -@@ -184,13 +184,13 @@ +--- build.xml.orig 2007-08-18 09:02:14 UTC ++++ build.xml +@@ -179,24 +179,33 @@ --> + description="Compile shareable components"> + - @@ -16,3 +27,20 @@ + +@@ -248,6 +257,7 @@ --> + doctitle ="<h1>${component.title}</h1>" + windowtitle ="${component.title} (Version ${component.version})" + bottom ="Copyright (c) 1999-2005 - Apache Software Foundation" ++ encoding ="ISO-8859-1" + > + +