diff options
| author | clement <clement@FreeBSD.org> | 2005-11-04 06:19:41 +0800 |
|---|---|---|
| committer | clement <clement@FreeBSD.org> | 2005-11-04 06:19:41 +0800 |
| commit | 7812c61b0fbcb49e769c8c0f0245cc8fa5107998 (patch) | |
| tree | 28880d7815e6e68f2a0c747f6e0421abb1c90200 | |
| parent | d7255b84a3c7ee0c9cbafe1bc3e92d96da3fd523 (diff) | |
| download | freebsd-ports-gnome-7812c61b0fbcb49e769c8c0f0245cc8fa5107998.tar.gz freebsd-ports-gnome-7812c61b0fbcb49e769c8c0f0245cc8fa5107998.tar.zst freebsd-ports-gnome-7812c61b0fbcb49e769c8c0f0245cc8fa5107998.zip | |
- Sync with 1.68
| -rw-r--r-- | devel/portmk/Mk/bsd.java.mk | 5 | ||||
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.java.mk | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/devel/portmk/Mk/bsd.java.mk b/devel/portmk/Mk/bsd.java.mk index a82a744de9e5..114a8a6047f4 100644 --- a/devel/portmk/Mk/bsd.java.mk +++ b/devel/portmk/Mk/bsd.java.mk @@ -442,6 +442,11 @@ JAVA_PORT_OS_DESCRIPTION:= ${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/} . undef HAVE_JIKES +# Enforce USE_JIKES=NO if not defined and using Java 1.5 +# XXX: This is a temporary fix to be removed when Jikes supports Java 1.5 +. if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5" +USE_JIKES?= NO +. endif # First test if USE_JIKES has a valid value . if defined(USE_JIKES) && !(${USE_JIKES:U} == "YES") && !(${USE_JIKES:U} == "NO") check-makevars:: diff --git a/ports-mgmt/portmk/Mk/bsd.java.mk b/ports-mgmt/portmk/Mk/bsd.java.mk index a82a744de9e5..114a8a6047f4 100644 --- a/ports-mgmt/portmk/Mk/bsd.java.mk +++ b/ports-mgmt/portmk/Mk/bsd.java.mk @@ -442,6 +442,11 @@ JAVA_PORT_OS_DESCRIPTION:= ${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/} . undef HAVE_JIKES +# Enforce USE_JIKES=NO if not defined and using Java 1.5 +# XXX: This is a temporary fix to be removed when Jikes supports Java 1.5 +. if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5" +USE_JIKES?= NO +. endif # First test if USE_JIKES has a valid value . if defined(USE_JIKES) && !(${USE_JIKES:U} == "YES") && !(${USE_JIKES:U} == "NO") check-makevars:: |