From nobody Thu Jan 01 21:10:07 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 4dhzxC3wP1z6Mjyv for ; Thu, 01 Jan 2026 21:10:07 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhzxC2NRvz43lX for ; Thu, 01 Jan 2026 21:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767301807; 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=JEiYuMipNsCr5W0+Y6xj2tACEPz69GOs1BvPugtF6kI=; b=MPaQsu502oMAAzVa/xb3HldYiToAQ6gwVPKUiUflpwPv2s0iSLyt6KjjKg6Qad7IzEfd0J OzMfd/5Xx2Uk7phM7TrROYDchFVrJAXyuTdXqGKCwldEykHF20HofSIzRwJ7WMMNK7k8Ma KlYRCtAxlV2wpubJFsbNRSe9lLzt+lWIt97QcgGHgvwBYoKZbwIGq945wdot0mUzL/GN8e ppK2N11Dd0sOAjX3i9u/et0pXk4D8IEOnAIX+eCV3OZ8DO7dit169YhSM8KRjDZGzZsIUt u1WGYbCeC7lrDM0R1X9FxRKg7BdDjbL5ukbQZNb/ebGCAZ66iBJ2q1yXTn37RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767301807; 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=JEiYuMipNsCr5W0+Y6xj2tACEPz69GOs1BvPugtF6kI=; b=PmfeCQ37GmKnIK5cSrTdCWyfEND0fhF+t11S/oHKCVx6FT2bM39E/cHBXwepCTM5S23MSK zeaNnSpiGKWQf8o2eqIstO2HupqAvWnFNkz559mC5g6haK+bnROJ0erJJgIEH38ZOtRDic CirGpdQri5lpHRohoE6FRITe6LXdDkYlWEu8oQmk9Tr+ZwECNlWFjzV1xJA+NbfIz1nROm T4h47JTEPIiRbidT9BMILuOYlszV11eBpk9v6TndDVwmgsfA3fsmUITcXDhl4S1yiDLA0v koIVLab7Z3mj7xElVbpErhbexZZG282jN3G54y4KOLw0OeAuJGHwzEX4/2VVrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767301807; a=rsa-sha256; cv=none; b=Vff3a1DJo+KuwORPp1ZALhZTqq4W6Xli4UI5ZQjXLGjVEYy0w7huWEU9wyMQle5n9cTr8A djPCPT26vJ7XrjAoyjJ650iz8Vwo9nZ7U8BZRhOpdPdquobGPWR8xwcwOTsMmkC55LnyfU tt3vSa4HwpaAhKnjqu/D8gWUQKbDhcrr0w8/ZoeE6cLN2elyarHLg/uI8ONBa30dguSsuG +7hu/QocgXmDJtKWgR/gbcp+nmqr6ILlwHWLsmpb/Gq+w52B23QocnNA8GAnoV6dFTCd+z VfIs76D5TEvkkUNPQQ5F8djegSlGAXf5RslVD2RfoERmiBKYj5pP8QBPIwm3xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhzxC16lpzpfl for ; Thu, 01 Jan 2026 21:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47b04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 21:10:07 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 0e73709c572b - main - games/lwjgl3: Unbreak after update lang/kotlin to 2.3.0 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e73709c572b05f47abca16f6cc3dd197d614f22 Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 21:10:07 +0000 Message-Id: <6956e2af.47b04.1568387b@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e73709c572b05f47abca16f6cc3dd197d614f22 commit 0e73709c572b05f47abca16f6cc3dd197d614f22 Author: Vladimir Druzenko AuthorDate: 2026-01-01 21:04:52 +0000 Commit: Vladimir Druzenko CommitDate: 2026-01-01 21:10:01 +0000 games/lwjgl3: Unbreak after update lang/kotlin to 2.3.0 Since Kotlin 2.3.0, Ant support has been removed, but lwjgl3 has complex long ongoing migration story from Ant to Gradle. Depends on new port lang/kotlin22 with Kotlin 2.2.21. Hopefully after migration the port may be removed. While here improve port: - Fix warnings from portclippy. - Optimize do-install goal. - Refresh patches. PR: 292099 --- games/lwjgl3/Makefile | 20 ++++++++---------- games/lwjgl3/files/patch-build.xml | 24 ++++++++++++++++++++++ .../files/patch-config_build-definitions.xml | 4 ++-- games/lwjgl3/files/patch-config_freebsd_build.xml | 6 +++--- 4 files changed, 38 insertions(+), 16 deletions(-) diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile index 62ec626bc982..9dc59b5a7edd 100644 --- a/games/lwjgl3/Makefile +++ b/games/lwjgl3/Makefile @@ -1,6 +1,6 @@ PORTNAME= lwjgl DISTVERSION= 3.3.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games java MASTER_SITES= https://repo1.maven.org/:source1 PKGNAMESUFFIX= 3 @@ -31,7 +31,7 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= Upstream support FreeBSD on amd64 only: https://github.com/LWJGL/lwjgl3/issues/421 BUILD_DEPENDS= ${LOCALBASE}/openjdk8/bin/java:java/openjdk8 \ - kotlinc-jvm:lang/kotlin + kotlinc-jvm:lang/kotlin22 LIB_DEPENDS= libdraco.so:archivers/draco \ libopenal.so:audio/openal-soft \ libopus.so:audio/opus \ @@ -49,12 +49,12 @@ LIB_DEPENDS= libdraco.so:archivers/draco \ libharfbuzz.so:print/harfbuzz USES= gl gnome java:ant,run -JAVA_VERSION= 17+ USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX} USE_GL= gl USE_GNOME= glib20 gtk30 +JAVA_VERSION= 17+ MAKE_ARGS= -Dbuild.offline=true \ -Djavadoc.skip=true \ @@ -112,13 +112,11 @@ post-patch: do-install: @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${ANT} release ${MAKE_ARGS} - @${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX} - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX} -.for x in ${WRKSRC}/bin/RELEASE/lwjgl*/*.jar - ${INSTALL_DATA} ${WRKSRC}${x} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}/ -.endfor -.for x in ${LIBSDIR}/liblwjgl.so ${LIBSDIR}/*/liblwjgl*.so - ${INSTALL_LIB} ${WRKSRC}${x} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}/ -.endfor + ${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX} \ + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX} + ${INSTALL_DATA} ${WRKSRC}/bin/RELEASE/lwjgl*/*.jar \ + ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX} + ${INSTALL_LIB} ${LIBSDIR}/liblwjgl.so ${LIBSDIR}/*/liblwjgl*.so \ + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX} .include diff --git a/games/lwjgl3/files/patch-build.xml b/games/lwjgl3/files/patch-build.xml new file mode 100644 index 000000000000..d828dd88ad87 --- /dev/null +++ b/games/lwjgl3/files/patch-build.xml @@ -0,0 +1,24 @@ +--- build.xml.orig 2025-01-04 19:11:17 UTC ++++ build.xml +@@ -132,8 +132,8 @@ + + + +- +- ++ ++ + + + +@@ -200,8 +200,8 @@ + + + +- +- ++ ++ + + + diff --git a/games/lwjgl3/files/patch-config_build-definitions.xml b/games/lwjgl3/files/patch-config_build-definitions.xml index a8664fe7cb93..e915e119bd76 100644 --- a/games/lwjgl3/files/patch-config_build-definitions.xml +++ b/games/lwjgl3/files/patch-config_build-definitions.xml @@ -1,6 +1,6 @@ ---- config/build-definitions.xml.orig 2023-12-18 14:22:59 UTC +--- config/build-definitions.xml.orig 2025-01-04 19:11:17 UTC +++ config/build-definitions.xml -@@ -100,7 +100,8 @@ This script is included in /build.xml and /config/upda +@@ -121,7 +121,8 @@ --> diff --git a/games/lwjgl3/files/patch-config_freebsd_build.xml b/games/lwjgl3/files/patch-config_freebsd_build.xml index 530d057d94a3..6e651e48968c 100644 --- a/games/lwjgl3/files/patch-config_freebsd_build.xml +++ b/games/lwjgl3/files/patch-config_freebsd_build.xml @@ -1,6 +1,6 @@ ---- config/freebsd/build.xml.orig 2023-12-18 14:22:59 UTC +--- config/freebsd/build.xml.orig 2025-01-04 19:11:17 UTC +++ config/freebsd/build.xml -@@ -159,16 +159,18 @@ +@@ -158,16 +158,18 @@ @@ -21,7 +21,7 @@ -@@ -410,7 +412,7 @@ +@@ -424,7 +426,7 @@