Date: Mon, 5 Apr 2004 16:22:43 +0200 (CEST)
From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: java/65210: bsd.java.mk: use ${CMD} macros provided by bsd.port.mk
Message-ID: <200404051422.i35EMhKx042287@arabica.esil.univ-mrs.fr>
Resent-Message-ID: <200404051430.i35EUIVZ040009@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65210
>Category: java
>Synopsis: bsd.java.mk: use ${CMD} macros provided by bsd.port.mk
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-java
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 05 07:30:18 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #0: Fri Feb 27 11:36:17 CET 2004 root@arabica.esil.univ-mrs.fr:/usr/obj/usr/src/sys/ASSIMILATED i386
>Description:
This patch changes every command call by the corresponding macro (if available)
provided by bsd.port.mk.
I changed ${ECHO} to ${ECHO_CMD} also as it is told in bsd.port.mk: "Use
ECHO_CMD where you mean the echo command".
NOTE: there's no ${UNIQ} macro in bsd.port.mk. Maybe this is a right time to
implement it. I can provide the patch if you want... For now, I replaced 'uniq'
by '/usr/bin/uniq' for better security.
>How-To-Repeat:
>Fix:
--- bsd.java.mk.original Mon Apr 5 15:35:01 2004
+++ bsd.java.mk Mon Apr 5 16:03:57 2004
@@ -42,7 +42,7 @@
# The complete list of Java versions, os and vendors supported.
_JAVA_VERSIONS= 1.1 1.2 1.3 1.4
-_JAVA_VERSIONS_ALL= ${_JAVA_VERSIONS} ${_JAVA_VERSIONS:S/$/+/}
+_JAVA_VERSIONS_ALL= ${_JAVA_VERSIONS} ${_JAVA_VERSIONS:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDORS= freebsd bsdjava sun blackdown ibm
@@ -72,34 +72,34 @@
_JAVA_OS_linux= Linux
# Set the JAVA_HOME directories for all recognized JDK's
-_JAVA_HOME_NATIVE_BSDJAVA_JDK_1_1!= echo "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_NATIVE_BSDJAVA_JDK_1_2!= echo "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_NATIVE_BSDJAVA_JDK_1_3!= echo "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_NATIVE_BSDJAVA_JDK_1_4!= echo "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_NATIVE_FREEBSD_JDK_1_3!= echo "${_JAVA_PORT_NATIVE_FREEBSD_JDK_1_3_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_LINUX_BLACKDOWN_JDK_1_2!= echo "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_LINUX_BLACKDOWN_JDK_1_3!= echo "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_LINUX_BLACKDOWN_JDK_1_4!= echo "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_LINUX_IBM_JDK_1_3!= echo "${_JAVA_PORT_LINUX_IBM_JDK_1_3_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_LINUX_IBM_JDK_1_4!= echo "${_JAVA_PORT_LINUX_IBM_JDK_1_4_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_LINUX_SUN_JDK_1_2!= echo "${_JAVA_PORT_LINUX_SUN_JDK_1_2_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_LINUX_SUN_JDK_1_3!= echo "${_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO}" | awk '{ print $$2 }'
-_JAVA_HOME_LINUX_SUN_JDK_1_4!= echo "${_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO}" | awk '{ print $$2 }'
+_JAVA_HOME_NATIVE_BSDJAVA_JDK_1_1!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_NATIVE_BSDJAVA_JDK_1_2!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_NATIVE_BSDJAVA_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_NATIVE_BSDJAVA_JDK_1_4!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_NATIVE_FREEBSD_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_FREEBSD_JDK_1_3_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_LINUX_BLACKDOWN_JDK_1_2!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_LINUX_BLACKDOWN_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_LINUX_BLACKDOWN_JDK_1_4!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_LINUX_IBM_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_IBM_JDK_1_3_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_LINUX_IBM_JDK_1_4!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_IBM_JDK_1_4_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_LINUX_SUN_JDK_1_2!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_SUN_JDK_1_2_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_LINUX_SUN_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO}" | ${AWK} '{ print $$2 }'
+_JAVA_HOME_LINUX_SUN_JDK_1_4!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO}" | ${AWK} '{ print $$2 }'
# Set the JDK ports for all recognized JDK's
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1!= echo "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2!= echo "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3!= echo "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4!= echo "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_NATIVE_FREEBSD_JDK_1_3!= echo "${_JAVA_PORT_NATIVE_FREEBSD_JDK_1_3_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2!= echo "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3!= echo "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4!= echo "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_LINUX_IBM_JDK_1_3!= echo "${_JAVA_PORT_LINUX_IBM_JDK_1_3_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_LINUX_IBM_JDK_1_4!= echo "${_JAVA_PORT_LINUX_IBM_JDK_1_4_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_LINUX_SUN_JDK_1_2!= echo "${_JAVA_PORT_LINUX_SUN_JDK_1_2_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_LINUX_SUN_JDK_1_3!= echo "${_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO}" | awk '{ print $$1 }'
-_JAVA_PORT_LINUX_SUN_JDK_1_4!= echo "${_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO}" | awk '{ print $$1 }'
+_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_NATIVE_FREEBSD_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_NATIVE_FREEBSD_JDK_1_3_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_LINUX_IBM_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_IBM_JDK_1_3_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_LINUX_IBM_JDK_1_4!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_IBM_JDK_1_4_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_LINUX_SUN_JDK_1_2!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_SUN_JDK_1_2_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_LINUX_SUN_JDK_1_3!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO}" | ${AWK} '{ print $$1 }'
+_JAVA_PORT_LINUX_SUN_JDK_1_4!= ${ECHO_CMD} "${_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO}" | ${AWK} '{ print $$1 }'
# Set the name of the file that indicates that a JDK is indeed installed, as a
# relative path within the JAVA_HOME directory.
@@ -203,9 +203,9 @@
#
# First detect if we are using bsd.java.mk v1.0
-_USE_BSD_JAVA_MK_1_0!= echo "${_JAVA_VERSIONS_ALL}" \
- | tr " " "\n" \
- | grep -q "^${USE_JAVA}$$" && echo "yes" || echo "no"
+_USE_BSD_JAVA_MK_1_0!= ${ECHO_CMD} "${_JAVA_VERSIONS_ALL}" \
+ | ${TR} " " "\n" \
+ | ${GREP} -q "^${USE_JAVA}$$" && ${ECHO_CMD} "yes" || ${ECHO_CMD} "no"
. if (${_USE_BSD_JAVA_MK_1_0} == "yes") && !defined(JAVA_VERSION)
# Then affect the variables so that we may use v2.0
JAVA_VERSION= ${USE_JAVA}
@@ -281,7 +281,7 @@
. endif
. if !defined(_JAVA_PORTS_BY_VERSION)
.BEGIN:
- @${ECHO} "${PKGNAME}: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${_JAVA_VERSIONS} (with an optional \"+\" suffix.)";
+ @${ECHO_CMD} "${PKGNAME}: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${_JAVA_VERSIONS} (with an optional \"+\" suffix.)";
@${FALSE}
. endif
. else
@@ -299,7 +299,7 @@
. endif
. if !defined(_JAVA_PORTS_BY_OS)
.BEGIN:
- @${ECHO} "${PKGNAME}: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}";
+ @${ECHO_CMD} "${PKGNAME}: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}";
@${FALSE}
. endif
. else
@@ -326,7 +326,7 @@
. endif
. if !defined(_JAVA_PORTS_BY_VENDOR)
.BEGIN:
- @${ECHO} "${PKGNAME}: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDORS}";
+ @${ECHO_CMD} "${PKGNAME}: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDORS}";
@${FALSE}
. endif
. else
@@ -336,44 +336,44 @@
_MY_JAVA_PORTS:= ${_JAVA_PORTS_ALL:S/^/\${_/:S/$/_INFO} @ /}
# Build the list of possible JDK ports by version, OS and vendor
-_JAVA_PORTS_BY_VERSION!= echo "${_JAVA_PORTS_BY_VERSION}" | tr " " "\n" | sort | uniq
-_JAVA_PORTS_BY_OS!= echo "${_JAVA_PORTS_BY_OS}" | tr " " "\n" | sort | uniq
-_JAVA_PORTS_BY_VENDOR!= echo "${_JAVA_PORTS_BY_VENDOR}" | tr " " "\n" | sort | uniq
-_JAVA_PORTS_POSSIBLE!= echo "${_JAVA_PORTS_BY_VERSION} ${_JAVA_PORTS_BY_OS} ${_JAVA_PORTS_BY_VENDOR}" \
- | tr " " "\n" \
- | sort -r \
- | uniq -c \
- | sed "s/^\( *\)//" \
- | grep "^3 " \
- | awk '{ print $$2 }'
+_JAVA_PORTS_BY_VERSION!= ${ECHO_CMD} "${_JAVA_PORTS_BY_VERSION}" | ${TR} " " "\n" | ${SORT} | /usr/bin/uniq
+_JAVA_PORTS_BY_OS!= ${ECHO_CMD} "${_JAVA_PORTS_BY_OS}" | ${TR} " " "\n" | ${SORT} | /usr/bin/uniq
+_JAVA_PORTS_BY_VENDOR!= ${ECHO_CMD} "${_JAVA_PORTS_BY_VENDOR}" | ${TR} " " "\n" | ${SORT} | /usr/bin/uniq
+_JAVA_PORTS_POSSIBLE!= ${ECHO_CMD} "${_JAVA_PORTS_BY_VERSION} ${_JAVA_PORTS_BY_OS} ${_JAVA_PORTS_BY_VENDOR}" \
+ | ${TR} " " "\n" \
+ | ${SORT} -r \
+ | /usr/bin/uniq -c \
+ | ${SED} "s/^\( *\)//" \
+ | ${GREP} "^3 " \
+ | ${AWK} '{ print $$2 }'
#-----------------------------------------------------------------------------
# Stage 5: Decide the exact JDK to use (or install)
#
# Find an installed JDK port that matches the requirements of the port
-_JAVA_PORTS_INSTALLED_POSSIBLE!= echo "${_JAVA_PORTS_POSSIBLE} ${_JAVA_PORTS_INSTALLED}" \
- | tr " " "\n" \
- | sort -r \
- | uniq -c \
- | sed "s/^\( *\)//" \
- | grep "^2 " \
- | awk '{ print $$2 }'
+_JAVA_PORTS_INSTALLED_POSSIBLE!= ${ECHO_CMD} "${_JAVA_PORTS_POSSIBLE} ${_JAVA_PORTS_INSTALLED}" \
+ | ${TR} " " "\n" \
+ | ${SORT} -r \
+ | /usr/bin/uniq -c \
+ | ${SED} "s/^\( *\)//" \
+ | ${GREP} "^2 " \
+ | ${AWK} '{ print $$2 }'
. if ${_JAVA_PORTS_INSTALLED_POSSIBLE} != ""
-_JAVA_PORT!= echo "${_JAVA_PORTS_INSTALLED_POSSIBLE}" \
- | awk '{ print $$1 }'
+_JAVA_PORT!= ${ECHO_CMD} "${_JAVA_PORTS_INSTALLED_POSSIBLE}" \
+ | ${AWK} '{ print $$1 }'
# If no installed JDK port fits, then pick one from the list of possible ones
. else
-_JAVA_PORT!= echo "${_JAVA_PORTS_POSSIBLE}" \
- | awk '{ print $$1 }'
+_JAVA_PORT!= ${ECHO_CMD} "${_JAVA_PORTS_POSSIBLE}" \
+ | ${AWK} '{ print $$1 }'
. endif
_JAVA_PORT_INFO:= ${_JAVA_PORT:S/^/\${_/:S/$/_INFO}/}
-JAVA_PORT!= echo "${_JAVA_PORT_INFO}" | awk '{ print $$1 }'
-JAVA_HOME!= echo "${_JAVA_PORT_INFO}" | awk '{ print $$2 }'
-JAVA_PORT_VERSION!= echo "${_JAVA_PORT_INFO}" | awk '{ print $$3 }'
-JAVA_PORT_OS!= echo "${_JAVA_PORT_INFO}" | awk '{ print $$4 }'
-JAVA_PORT_VENDOR!= echo "${_JAVA_PORT_INFO}" | awk '{ print $$5 }'
+JAVA_PORT!= ${ECHO_CMD} "${_JAVA_PORT_INFO}" | ${AWK} '{ print $$1 }'
+JAVA_HOME!= ${ECHO_CMD} "${_JAVA_PORT_INFO}" | ${AWK} '{ print $$2 }'
+JAVA_PORT_VERSION!= ${ECHO_CMD} "${_JAVA_PORT_INFO}" | ${AWK} '{ print $$3 }'
+JAVA_PORT_OS!= ${ECHO_CMD} "${_JAVA_PORT_INFO}" | ${AWK} '{ print $$4 }'
+JAVA_PORT_VENDOR!= ${ECHO_CMD} "${_JAVA_PORT_INFO}" | ${AWK} '{ print $$5 }'
JAVA_PORT_VENDOR_DESCRIPTION:= ${JAVA_PORT_VENDOR:S/^/\${_JAVA_VENDOR_/:S/$/}/}
JAVA_PORT_OS_DESCRIPTION:= ${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/}
@@ -381,26 +381,26 @@
# Debug target
# (will probably get removed in the final version)
java-debug:
- @${ECHO} "_USE_BSD_JAVA_MK_1_0= ${_USE_BSD_JAVA_MK_1_0}"
- @${ECHO}
- @${ECHO} "# User specified parameters:"
- @${ECHO} "JAVA_VERSION= ${JAVA_VERSION} (${_JAVA_VERSION})"
- @${ECHO} "JAVA_OS= ${JAVA_OS}"
- @${ECHO} "JAVA_VENDOR= ${JAVA_VENDOR}"
- @${ECHO}
- @${ECHO} "# JDK port dependency selection process:"
- @${ECHO} "_JAVA_PORTS_POSSIBLE= ${_JAVA_PORTS_POSSIBLE}"
- @${ECHO} "_JAVA_PORTS_INSTALLED= ${_JAVA_PORTS_INSTALLED}"
- @${ECHO} "_JAVA_PORTS_INSTALLED_POSSIBLE= ${_JAVA_PORTS_INSTALLED_POSSIBLE}"
- @${ECHO} "_JAVA_PORT= ${_JAVA_PORT}"
- @${ECHO} "_JAVA_PORT_INFO= ${_JAVA_PORT_INFO:S/\t/ /}"
- @${ECHO}
- @${ECHO} "# Selected JDK port:"
- @${ECHO} "JAVA_PORT= ${JAVA_PORT}"
- @${ECHO} "JAVA_HOME= ${JAVA_HOME}"
- @${ECHO} "JAVA_PORT_VERSION= ${JAVA_PORT_VERSION}"
- @${ECHO} "JAVA_PORT_OS= ${JAVA_PORT_OS} (${JAVA_PORT_OS_DESCRIPTION})"
- @${ECHO} "JAVA_PORT_VENDOR= ${JAVA_PORT_VENDOR} (${JAVA_PORT_VENDOR_DESCRIPTION})"
+ @${ECHO_CMD} "_USE_BSD_JAVA_MK_1_0= ${_USE_BSD_JAVA_MK_1_0}"
+ @${ECHO_CMD}
+ @${ECHO_CMD} "# User specified parameters:"
+ @${ECHO_CMD} "JAVA_VERSION= ${JAVA_VERSION} (${_JAVA_VERSION})"
+ @${ECHO_CMD} "JAVA_OS= ${JAVA_OS}"
+ @${ECHO_CMD} "JAVA_VENDOR= ${JAVA_VENDOR}"
+ @${ECHO_CMD}
+ @${ECHO_CMD} "# JDK port dependency selection process:"
+ @${ECHO_CMD} "_JAVA_PORTS_POSSIBLE= ${_JAVA_PORTS_POSSIBLE}"
+ @${ECHO_CMD} "_JAVA_PORTS_INSTALLED= ${_JAVA_PORTS_INSTALLED}"
+ @${ECHO_CMD} "_JAVA_PORTS_INSTALLED_POSSIBLE= ${_JAVA_PORTS_INSTALLED_POSSIBLE}"
+ @${ECHO_CMD} "_JAVA_PORT= ${_JAVA_PORT}"
+ @${ECHO_CMD} "_JAVA_PORT_INFO= ${_JAVA_PORT_INFO:S/\t/ /}"
+ @${ECHO_CMD}
+ @${ECHO_CMD} "# Selected JDK port:"
+ @${ECHO_CMD} "JAVA_PORT= ${JAVA_PORT}"
+ @${ECHO_CMD} "JAVA_HOME= ${JAVA_HOME}"
+ @${ECHO_CMD} "JAVA_PORT_VERSION= ${JAVA_PORT_VERSION}"
+ @${ECHO_CMD} "JAVA_PORT_OS= ${JAVA_PORT_OS} (${JAVA_PORT_OS_DESCRIPTION})"
+ @${ECHO_CMD} "JAVA_PORT_VENDOR= ${JAVA_PORT_VENDOR} (${JAVA_PORT_VENDOR_DESCRIPTION})"
#-----------------------------------------------------------------------------
# Stage 6: Define all settings for the port to use
@@ -429,7 +429,7 @@
WITH_JIKES= YES
. elif !((${USE_JIKES} == "NO") || (${USE_JIKES} == "no"))
.BEGIN:
- @${ECHO} "${PKGNAME}: \"${USE_JIKES}\" is not a valid value for USE_JIKES. It should be YES or NO, or it should be undefined.";
+ @${ECHO_CMD} "${PKGNAME}: \"${USE_JIKES}\" is not a valid value for USE_JIKES. It should be YES or NO, or it should be undefined.";
@${FALSE}
. endif
. elif exists(${_JIKES_PATH}) && !defined(NO_BUILD)
@@ -484,12 +484,12 @@
# Add the JDK port to the dependencies
. if defined(NO_BUILD_DEPENDS_JAVA) && defined(NO_RUN_DEPENDS_JAVA)
.BEGIN:
- @${ECHO} "${PKGNAME}: NO_BUILD_DEPENDS_JAVA and NO_RUN_DEPENDS_JAVA cannot be set at the same time.";
+ @${ECHO_CMD} "${PKGNAME}: NO_BUILD_DEPENDS_JAVA and NO_RUN_DEPENDS_JAVA cannot be set at the same time.";
@${FALSE}
. endif
. if defined(JAVA_BUILD) && defined(NO_BUILD)
.BEGIN:
- @${ECHO} "${PKGNAME}: JAVA_BUILD and NO_BUILD cannot be set at the same time.";
+ @${ECHO_CMD} "${PKGNAME}: JAVA_BUILD and NO_BUILD cannot be set at the same time.";
@${FALSE}
. endif
_DEPEND_JAVA= ${JAVA}:${PORTSDIR}/${JAVA_PORT}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404051422.i35EMhKx042287>