svn commit: r542112 - in head/java/openjdk8: . files
Greg Lewis
glewis at FreeBSD.org
Mon Jul 13 05:29:34 UTC 2020
Author: glewis
Date: Mon Jul 13 05:29:33 2020
New Revision: 542112
URL: https://svnweb.freebsd.org/changeset/ports/542112
Log:
Don't print the company name in the version info
This evidently breaks some software that does parsing of -version output
PR: 244634
Submitted by: Stefan Ehmann <shoesoft at gmx.net>
Added:
head/java/openjdk8/files/patch-jdk-src-share-classes-sun-misc-Version.java.template (contents, props changed)
Modified:
head/java/openjdk8/Makefile
Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile Mon Jul 13 04:32:18 2020 (r542111)
+++ head/java/openjdk8/Makefile Mon Jul 13 05:29:33 2020 (r542112)
@@ -2,7 +2,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= LOCAL/jkim:jtreg
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
Added: head/java/openjdk8/files/patch-jdk-src-share-classes-sun-misc-Version.java.template
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjdk8/files/patch-jdk-src-share-classes-sun-misc-Version.java.template Mon Jul 13 05:29:33 2020 (r542112)
@@ -0,0 +1,20 @@
+--- jdk/src/share/classes/sun/misc/Version.java.template.orig 2020-07-12 22:11:20.576241000 -0700
++++ jdk/src/share/classes/sun/misc/Version.java.template 2020-07-12 22:12:30.301432000 -0700
+@@ -106,7 +106,7 @@
+
+ /* Second line: runtime version (ie, libraries). */
+
+- ps.print(java_runtime_name + " " + company_name + "(build " + java_runtime_version);
++ ps.print(java_runtime_name + " (build " + java_runtime_version);
+
+ if (java_profile_name.length() > 0) {
+ // profile name
+@@ -123,7 +123,7 @@
+ String java_vm_name = System.getProperty("java.vm.name");
+ String java_vm_version = System.getProperty("java.vm.version");
+ String java_vm_info = System.getProperty("java.vm.info");
+- ps.println(java_vm_name + " " + company_name + "(build " + java_vm_version + ", " +
++ ps.println(java_vm_name + " (build " + java_vm_version + ", " +
+ java_vm_info + ")");
+ }
+
More information about the svn-ports-head
mailing list