From nobody Thu Apr 9 09:29:19 2026 X-Original-To: dev-commits-ports-main@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 4frvlM64Z5z6Yqc1 for ; Thu, 09 Apr 2026 09:29:19 +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 4frvlM3n1gz3NpC for ; Thu, 09 Apr 2026 09:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775726959; 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=+HJbVkwKwqB10PS+/Bg9/YBmJuQPVzOowuGl+cwU/k0=; b=IOoD8ttdZKzhKixdPb87HnxMSiDFnNx2s3wvrE0KDwbpFGMUVp29GvD68R09I9zaBD4AaL tmBbd/dIhjXwhVSqL/wADh2YWRLK43RK87bg0fJYbNMidBxG/2X9aILbHeBv59woltuC34 lyrvpmspk6B0EMYavZ/3GPt6AXnrNs/+DAf6rOj/8WdCGDpb3eZTMDdBlC9Y/Nskrp/qeW 8YBtA3s4chuNoF3PMIQfayGrkWgyw55tHXyefO21fkg3bcVV2CsNWVDDzUXrdaA9QuiLIT 3fYLt7TKW71nqpa3gVgPA8mNctz4Q+Z7cBS+V3MRfkWntpDUeXggheOisXmTVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775726959; a=rsa-sha256; cv=none; b=OlulOVH7I+rwwZTCby5YZ5OtZ9UqR/slmTWpHxuGYuydPwyIElbL5LSfcYqhEYA5hQTnOv 3NalPkLR7b2qmfyNUlHYapltMPZqDCkVqHcWBzaNTa8ikauPla8u4zrmZqc8zHMGow1lWQ gY1HwUFKBq+O68I5TXJGz3DLl3t0F0Jxy6hj7CQje9kH68SIVhd0kbcJgIPhCUlC/qM86R 7hjH7coELTAQuTicT4YYgMXLocP0SK330B0nIdcD9uKvztzPP4LM8H9aHgbua5ZwMlVMQZ L7O3aU4eiNV6XB7y4pJe77BBdA7uqoasvI1EoxtFpSc2Hxc/yV3JUZfB3GBzCQ== 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=1775726959; 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=+HJbVkwKwqB10PS+/Bg9/YBmJuQPVzOowuGl+cwU/k0=; b=Z26eNHLnHDCOXeoMnbKA8oWK/VCGolM5F4kdjdhP4iio54a7qcDWkv+4kvNBYyRBmz/rGk n+9lXY8srb/LUjqC/TrueToOcsfnQ+IerVvtE2/4th57Y+WK/APokgLMRJgRkg547Z3RVK Jil+Dr6VQAmisLKK40tj7HneBxdOd04Y0GUvgDLoayIQM7ZdOim/dEAH5Z0Vg0Oes/s37+ QcLMTiiwVUre5RZe/Gihj5vPZE+VBY1caH+TWsIAGcJS1jlRkaE0gohuiCNiAo2LvP0T9h zFB+TLYdCiEiHiajNfWEOhNOyDV7nX8rYCH6fiyc21NzQHkflwZc0XdLVM41Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frvlM3Lwdz16rS for ; Thu, 09 Apr 2026 09:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44ce7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 09:29:19 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 821f1e07ca6b - main - java/java3d: split combined patches List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 821f1e07ca6bcbbed34a57dd6216719a5d681097 Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 09:29:19 +0000 Message-Id: <69d7716f.44ce7.6f2f9e39@gitrepo.freebsd.org> The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=821f1e07ca6bcbbed34a57dd6216719a5d681097 commit 821f1e07ca6bcbbed34a57dd6216719a5d681097 Author: Ronald Klop AuthorDate: 2026-04-09 07:06:26 +0000 Commit: Ronald Klop CommitDate: 2026-04-09 09:29:05 +0000 java/java3d: split combined patches Redo make makepatch to have "modern" port patches. No functional change intended. Approved-by: no maintainer --- java/java3d/files/patch-freebsd | 176 --------------------- ...state_javax_media_j3d_ImageComponentState.java} | 9 +- java/java3d/files/patch-j3d-core_build.xml | 28 ++++ .../files/patch-j3d-core_src_classes_build.xml | 19 +++ .../files/patch-j3d-core_src_native_build.xml | 48 ++++++ ...patch-j3d-core_src_native_ogl_build-freebsd.xml | 77 +++++++++ 6 files changed, 176 insertions(+), 181 deletions(-) diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd deleted file mode 100644 index 7e5635a72e8e..000000000000 --- a/java/java3d/files/patch-freebsd +++ /dev/null @@ -1,176 +0,0 @@ -diff -ruN ../java3d-1.5.2/j3d-core/build.xml ./j3d-core/build.xml ---- ../java3d-1.5.2/j3d-core/build.xml 2008-05-24 08:31:19.000000000 +1200 -+++ ./j3d-core/build.xml 2009-07-12 13:20:26.000000000 +1200 -@@ -142,6 +142,16 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -232,7 +242,7 @@ - - - -+ depends="init, setupBuildType, setupFreeBSD, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl"> - - - -diff -ruN ../java3d-1.5.2/j3d-core/src/classes/build.xml ./j3d-core/src/classes/build.xml ---- ../java3d-1.5.2/j3d-core/src/classes/build.xml 2008-02-29 09:17:18.000000000 +1300 -+++ ./j3d-core/src/classes/build.xml 2009-07-12 13:19:17.000000000 +1200 -@@ -95,6 +95,7 @@ - -diff -ruN ../java3d-1.5.2/j3d-core/src/native/build.xml ./j3d-core/src/native/build.xml ---- ../java3d-1.5.2/j3d-core/src/native/build.xml 2008-02-29 09:17:58.000000000 +1300 -+++ ./j3d-core/src/native/build.xml 2009-07-12 13:19:17.000000000 +1200 -@@ -3,6 +3,19 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -62,7 +75,7 @@ - - - -- -+ - - -@@ -128,7 +141,7 @@ - - - -- -+ - - -@@ -347,6 +360,7 @@ - - - -+ - - - -diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/src/native/ogl/build-freebsd.xml ---- ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml 1970-01-01 12:00:00.000000000 +1200 -+++ ./j3d-core/src/native/ogl/build-freebsd.xml 2009-07-12 13:21:41.000000000 +1200 -@@ -0,0 +1,74 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/java/java3d/files/patch-ImageComponentState.java b/java/java3d/files/patch-j3d-core-utils_src_classes_share_com_sun_j3d_utils_scenegraph_io_state_javax_media_j3d_ImageComponentState.java similarity index 84% rename from java/java3d/files/patch-ImageComponentState.java rename to java/java3d/files/patch-j3d-core-utils_src_classes_share_com_sun_j3d_utils_scenegraph_io_state_javax_media_j3d_ImageComponentState.java index 6eacc3fa0a09..9a230c2f8413 100644 --- a/java/java3d/files/patch-ImageComponentState.java +++ b/java/java3d/files/patch-j3d-core-utils_src_classes_share_com_sun_j3d_utils_scenegraph_io_state_javax_media_j3d_ImageComponentState.java @@ -1,7 +1,6 @@ -work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d ---- j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java.orig +--- j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java.orig 2007-02-09 17:20:35 UTC +++ j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java -@@ -61,10 +61,7 @@ import com.sun.j3d.utils.scenegraph.io.r +@@ -61,10 +61,7 @@ import java.awt.image.DataBuffer; import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException; import java.awt.color.ColorSpace; import java.awt.image.DataBuffer; @@ -13,7 +12,7 @@ work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/ public abstract class ImageComponentState extends NodeComponentState { -@@ -203,10 +200,9 @@ public abstract class ImageComponentStat +@@ -203,10 +200,9 @@ public abstract class ImageComponentState extends Node private void writeBufferedImageJpegCompression( DataOutput out, BufferedImage image ) throws IOException { ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); @@ -27,7 +26,7 @@ work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/ byte[] buffer = byteStream.toByteArray(); out.writeInt( buffer.length ); -@@ -261,11 +257,15 @@ public abstract class ImageComponentStat +@@ -261,11 +257,15 @@ public abstract class ImageComponentState extends Node byte[] buffer = new byte[ size ]; in.readFully( buffer ); ByteArrayInputStream byteStream = new ByteArrayInputStream( buffer ); diff --git a/java/java3d/files/patch-j3d-core_build.xml b/java/java3d/files/patch-j3d-core_build.xml new file mode 100644 index 000000000000..27cf7573bdb2 --- /dev/null +++ b/java/java3d/files/patch-j3d-core_build.xml @@ -0,0 +1,28 @@ +--- j3d-core/build.xml.orig 2008-05-23 20:31:19 UTC ++++ j3d-core/build.xml +@@ -142,6 +142,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -232,7 +242,7 @@ + + + ++ depends="init, setupBuildType, setupFreeBSD, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl"> + + + diff --git a/java/java3d/files/patch-j3d-core_src_classes_build.xml b/java/java3d/files/patch-j3d-core_src_classes_build.xml new file mode 100644 index 000000000000..7bfc8635f7e5 --- /dev/null +++ b/java/java3d/files/patch-j3d-core_src_classes_build.xml @@ -0,0 +1,19 @@ +--- j3d-core/src/classes/build.xml.orig 2008-02-28 20:17:18 UTC ++++ j3d-core/src/classes/build.xml +@@ -95,6 +95,7 @@ + diff --git a/java/java3d/files/patch-j3d-core_src_native_build.xml b/java/java3d/files/patch-j3d-core_src_native_build.xml new file mode 100644 index 000000000000..905364d04866 --- /dev/null +++ b/java/java3d/files/patch-j3d-core_src_native_build.xml @@ -0,0 +1,48 @@ +--- j3d-core/src/native/build.xml.orig 2008-02-28 20:17:58 UTC ++++ j3d-core/src/native/build.xml +@@ -3,6 +3,19 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -62,7 +75,7 @@ + + + +- ++ + + +@@ -128,7 +141,7 @@ + + + +- ++ + + +@@ -347,6 +360,7 @@ + + + ++ + + + diff --git a/java/java3d/files/patch-j3d-core_src_native_ogl_build-freebsd.xml b/java/java3d/files/patch-j3d-core_src_native_ogl_build-freebsd.xml new file mode 100644 index 000000000000..738dbc9f237d --- /dev/null +++ b/java/java3d/files/patch-j3d-core_src_native_ogl_build-freebsd.xml @@ -0,0 +1,77 @@ +--- j3d-core/src/native/ogl/build-freebsd.xml.orig 2026-04-09 07:04:07 UTC ++++ j3d-core/src/native/ogl/build-freebsd.xml +@@ -0,0 +1,74 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++