cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't print the company name in the version info

Browse Source 
This evidently breaks some software that does parsing of -version output

PR:		244634
Submitted by:	Stefan Ehmann <shoesoft@gmx.net>
This commit is contained in:
Greg Lewis 2020-07-13 05:29:33 +00:00
parent 71eae9dbee
commit d916436f2a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=542112
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/openjdk8/Makefile
View File

@ -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}

20
java/openjdk8/files/patch-jdk-src-share-classes-sun-misc-Version.java.template Normal file
View File

@ -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 + ")");
}