java/openjdk{25,26}: Don't req xorg for headless
ClosedPublic
Actions

Authored by haraldei on Tue, Aug 25, 9:39 AM.

Details

Reviewers

emaste
jrm
glewis

Commits

R11:9c0054517dd7: java/openjdk{25,26}: Don't req xorg for headless

Summary

Turn xorg and related libs into BUILD_DEPENDS to avoid requiring them
when installing from packages.

PR: 294358
Reported by: raivo@lehma.com

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

haraldei requested review of this revision.Tue, Aug 25, 9:39 AM

haraldei created this revision.

Harbormaster completed remote builds in B76138: Diff 185017.Tue, Aug 25, 9:39 AM

Mainly just a check that I got the field in the commit message right, but feel free to have a look to see if the patches looks ok too.

jrm added inline comments.Tue, Aug 25, 2:44 PM

java/openjdk25/Makefile
4	typo
71–75	Spaces here should be tabs. Also, I'm unclear on why these `BUILD_DEPENDS` are necessary. I did a `poudriere testport` with them removed, and the build succeeded. https://pkg.ftfl.ca/data/16amd64-default/2026-08-25_11h23m47s/logs/openjdk25-headless-25.0.4+7.f.1.log
java/openjdk26/Makefile
71–75	Same `BUILD_DEPENDS` comments as above.

Address review comments.

Kept the BUILD_DEPENDS lines while waiting for feedback from original author.

Harbormaster completed remote builds in B76189: Diff 185152.Wed, Aug 26, 1:54 PM

Removed BUILD_DEPENDS lines no longer needed after 25.0.4 and 26.0.2, and
updates commit message to reflect this.

Harbormaster completed remote builds in B76198: Diff 185192.Thu, Aug 27, 8:38 AM

haraldei marked 2 inline comments as done.Thu, Aug 27, 8:39 AM

haraldei marked an inline comment as done.

jrm accepted this revision.Fri, Aug 28, 7:16 PM

This revision is now accepted and ready to land.Fri, Aug 28, 7:16 PM

Closed by commit R11:9c0054517dd7: java/openjdk{25,26}: Don't req xorg for headless (authored by Raivo Hool <raivo@lehma.com>, committed by haraldei). · Explain WhyTue, Sep 1, 8:09 AM

This revision was automatically updated to reflect the committed changes.

haraldei added a commit: R11:9c0054517dd7: java/openjdk{25,26}: Don't req xorg for headless.

Is there any specific reason for checking flavor twice? Putting USES + USE_XORG into same conditional would be nicer. Or just leaving USE_XORG as is because it's no-op without USES=... xorg ....

In D59167#1360507, @vsasjason_gmail.com wrote:

Is there any specific reason for checking flavor twice? Putting USES + USE_XORG into same conditional would be nicer. Or just leaving USE_XORG as is because it's no-op without USES=... xorg ....

I think the checks were just added around where the USES and USE_XORG lines already were placed.

Portclippy complains if I put the USES and USE_XORG lines together, but moving the additions to RUN_DEPENDS into the same conditional as USES causes no complains. I'll clean up some more portclippy issues, and test a bit more before submitting a new patch for review.