PR ports/48658, please commit it, old one no longer works

[Ari Suutari]

Hi,

Please commit PR#  ports/48658, I have received
reports that the old port no longer works (distfile is
no longer available).

This PR also fixes things mentioned in PR# java/44380.

	Ari S.