Sync files/java-patch-hier with the lang/gcc port (the only difference
being a marker to avoid a portlint warning re patch format).