Bug 238758
| Summary: | Update for bsd.java.mk | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Greg Lewis <glewis> | ||||||
| Component: | Ports Framework | Assignee: | Greg Lewis <glewis> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Only Me | CC: | jonc, ports-bugs | ||||||
| Priority: | --- | Flags: | antoine:
exp-run+
|
||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Bug Depends on: | 238976, 238977, 238978, 238979, 238980, 238981, 238982, 238983 | ||||||||
| Bug Blocks: | |||||||||
| Attachments: |
|
||||||||
A few ports that may need patching:
databases/hbase/Makefile:.if ${JAVA_PORT_VERSION:M1.8.*}
databases/mysql-connector-java51/Makefile:.if ${JAVA_PORT_VERSION:M1.8.*}
databases/mysql-connector-java51/Makefile:.if ${JAVA_PORT_VERSION:N1.8.*}
devel/luajava/Makefile:.if ${JAVA_PORT_VERSION} == 1.7
devel/statcvs/Makefile:.if ${JAVA_PORT_VERSION} == "1.6.0"
dns/dnsjava/Makefile:.if ${JAVA_PORT_VERSION} == "1.6.0"
dns/dnsjava/Makefile:.if ${JAVA_PORT_VERSION} == "1.8.0"
games/jin/Makefile:SUB_LIST= JINJAR=${JINJAR:Q} JAVA_VERSION=${JAVA_PORT_VERSION:R}
graphics/jogl/Makefile:.if ${JAVA_PORT_VERSION:M1.6.*}
graphics/jogl/Makefile:.if ${JAVA_PORT_VERSION:M1.7.*}
graphics/jogl/Makefile:.if ${JAVA_PORT_VERSION:M1.8.*}
graphics/jogl/Makefile:.if ${JAVA_PORT_VERSION:M1.8.*}
java/icedtea-web/Makefile:.if ${JAVA_PORT_VERSION} == "1.6.0"
java/bouncycastle/Makefile:JDKMVERSION= 1.6 # ${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/}
java/bouncycastle/Makefile:JDKNVERSION= 16 # ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/}
lang/kawa/Makefile: --with-java-source=${JAVA_PORT_VERSION}
math/scilab/Makefile:.if ${PORT_OPTIONS:MGUI} && ${JAVA_PORT_VERSION:M1.8.*}
print/pdf-renderer/Makefile:.if ${JAVA_PORT_VERSION:M1.8.*}
textproc/jakarta-commons-digester/Makefile:.if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} != "1.4"
www/htmlcompressor/Makefile:SUB_LIST+= JAVA_VERSION=${JAVA_PORT_VERSION:R}
Thanks. Let me take a crack at them first. Committed a fix for textproc/jakarta-commons-digester Note that java/bouncycastle only has JAVA_PORT_VERSION in a comment, it doesn't actually use it I don't believe this change will impact lang/kawa. I reviewed the configure script, and it handles the --with-java-source argument in a case statement that checks for versions either with or with a leading 1.8. E.g.
/8/|/1.8*/) # Java 8
JAVA_SOURCE=8; JAVA_SOURCE_SELECTOR='%java8' ;;
So switching from 1.8 to 8, for example, will make no difference.
I will create PRs for all the other fixes and link them in here. databases/hbase: bug #238976 databases/mysql-connector-java51: bug #238977 devel/luajava: bug #238978 devel/statcvs: Fix committed dns/dnsjava: bug #238979 games/jin: bug #238980 graphics/jogl: bug #238981 java/icedtea-web: Fix committed math/scilab: bug #238982 print/pdf-renderer: bug #238983 www/htmlcompressor: Fix committed As a side note, the old Mk/bsd.java.mk should be moved to the new way we do things, which is a Mk/Uses/java.mk. It would be great if someone who actually knows what bsd.java.mk does did the job instead of a member of portmgr doing it with an axe. (In reply to Mathieu Arnold from comment #8) Agreed, but I do not want to mix multiple major changes together at once. I'd like to get this done first. Can you provide a patch combining all the different patches together for the exp-run? Created attachment 205692 [details]
Overall Patch
Here is a patch that combines the changes to bsd.java.mk and all remaining patches for the ports tree.
Exp-run looks fine Thanks for doing the exp run! I'll commit the other changes and the bsd.java.mk changes given that there were no problems A commit references this bug: Author: glewis Date: Wed Jul 31 16:06:32 UTC 2019 New revision: 507714 URL: https://svnweb.freebsd.org/changeset/ports/507714 Log: Support newer Java versions * Add configuration for newer versions of the JDK (11, 12) * Switch to modern Java versioning (e.g. 8 rather than 1.8) * Retain backwards compatibility with existing version specification * Support the few ports that set USE_JAVA to the requested version PR: 237054, 238758 (exp-run) Changes: head/Mk/bsd.java.mk Thanks for the exp-run, I've committed the changes. |
Created attachment 205278 [details] Proposed change for bsd.java.mk Updates for bsd.java.mk * Support for newer versions of the JDK (primary change) * Switch to modern Java versioning (e.g. 8 rather than 1.8) * Support ports that set the version as the USE_JAVA value (a few still do) Note that the default JDK (openjdk8) is unchanged. exp-run requested