git: 6be8da973f22 - main - Mk/Uses/java.mk: Fix indentation
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 29 Mar 2025 13:43:36 UTC
The branch main has been updated by jrm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6be8da973f228d1b8ebaea7ebad211c425ccc68b
commit 6be8da973f228d1b8ebaea7ebad211c425ccc68b
Author: Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2025-03-29 13:33:14 +0000
Commit: Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2025-03-29 13:41:48 +0000
Mk/Uses/java.mk: Fix indentation
The check_mk_indentations pre-commit hook is preventing changes to the
file until the indentation is fixed.
Sponsored by: The FreeBSD Foundation
---
Mk/Uses/java.mk | 138 ++++++++++++++++++++++++++++----------------------------
1 file changed, 69 insertions(+), 69 deletions(-)
diff --git a/Mk/Uses/java.mk b/Mk/Uses/java.mk
index 96f42f5546b9..78debf0affcc 100644
--- a/Mk/Uses/java.mk
+++ b/Mk/Uses/java.mk
@@ -190,15 +190,15 @@ PLIST_SUB+= JAVASHAREDIR="${JAVASHAREDIR:S,^${PREFIX}/,,}" \
SUB_LIST+= JAVASHAREDIR="${JAVASHAREDIR}" \
JAVAJARDIR="${JAVAJARDIR}" \
JAVALIBDIR="${JAVALIBDIR}"
-. if defined(JAVA_VERSION)
+. if defined(JAVA_VERSION)
SUB_LIST+= JAVA_VERSION="${JAVA_VERSION}"
-. endif
-. if defined(JAVA_VENDOR)
+. endif
+. if defined(JAVA_VENDOR)
SUB_LIST+= JAVA_VENDOR="${JAVA_VENDOR}"
-. endif
-. if defined(JAVA_OS)
+. endif
+. if defined(JAVA_OS)
SUB_LIST+= JAVA_OS="${JAVA_OS}"
-. endif
+. endif
# The complete list of Java versions, os and vendors supported.
__JAVA_VERSION_LIST= 8 11 17 18 19 20 21 22 23
@@ -264,96 +264,96 @@ _JDK_FILE=bin/javac
# Error checking: defined JAVA_{HOME,PORT,PORT_VERSION,PORT_VENDOR,PORT_OS}
-. for variable in JAVA_HOME JAVA_PORT JAVA_PORT_VERSION JAVA_PORT_VENDOR JAVA_PORT_OS
-. if defined(${variable})
+. for variable in JAVA_HOME JAVA_PORT JAVA_PORT_VERSION JAVA_PORT_VENDOR JAVA_PORT_OS
+. if defined(${variable})
check-makevars::
@${ECHO_CMD} "${PKGNAME}: Environment error: \"${variable}\" should not be defined -- clearing."
.undef ${variable}
-. endif
-. endfor
+. endif
+. endfor
# Error checking: JAVA_VERSION
-. if defined(JAVA_VERSION)
-. if !defined(_JAVA_VERSION_LIST_REGEXP)
+. if defined(JAVA_VERSION)
+. if !defined(_JAVA_VERSION_LIST_REGEXP)
_JAVA_VERSION_LIST_REGEXP= ${_JAVA_VERSION_LIST:C/\+/\\+/:ts|}
-. endif
+. endif
check-makevars::
@( test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VERSION_LIST_REGEXP}")) || \
(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; ${FALSE})
-. endif
+. endif
# Error checking: JAVA_VENDOR
-. if defined(JAVA_VENDOR)
-. if !defined(_JAVA_VENDOR_LIST_REGEXP)
+. if defined(JAVA_VENDOR)
+. if !defined(_JAVA_VENDOR_LIST_REGEXP)
_JAVA_VENDOR_LIST_REGEXP= ${_JAVA_VENDOR_LIST:ts|}
-. endif
+. endif
check-makevars::
@( test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VENDOR_LIST_REGEXP}" )) || \
(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; \
${FALSE})
-. endif
+. endif
# Error checking: JAVA_OS
-. if defined(JAVA_OS)
-. if !defined(_JAVA_OS_LIST_REGEXP)
+. if defined(JAVA_OS)
+. if !defined(_JAVA_OS_LIST_REGEXP)
_JAVA_OS_LIST_REGEXP= ${_JAVA_OS_LIST:ts|}
-. endif
+. endif
check-makevars::
@( test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_OS_LIST_REGEXP}")) || \
(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; \
${FALSE})
-. endif
+. endif
# JDK dependency setting
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
-. if defined(JAVA_VERSION)
+. if defined(JAVA_VERSION)
_JAVA_VERSION= ${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23/}
-. else
+. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
-. endif
-. if defined(JAVA_OS)
+. endif
+. if defined(JAVA_OS)
_JAVA_OS= ${JAVA_OS}
-. else
+. else
_JAVA_OS= ${_JAVA_OS_LIST}
-. endif
-. if defined(JAVA_VENDOR)
+. endif
+. if defined(JAVA_VENDOR)
_JAVA_VENDOR= ${JAVA_VENDOR}
-. else
+. else
_JAVA_VENDOR= ${_JAVA_VENDOR_LIST}
-. endif
+. endif
-. for A_JAVA_PORT in ${_JAVA_PORTS_ALL}
+. for A_JAVA_PORT in ${_JAVA_PORTS_ALL}
A_JAVA_PORT_INFO:= ${A_JAVA_PORT:S/^/\${_/:S/$/_INFO}/}
A_JAVA_PORT_HOME= ${A_JAVA_PORT_INFO:MHOME=*:S,HOME=,,}
A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:S,VERSION=,,}
A_JAVA_PORT_OS= ${A_JAVA_PORT_INFO:MOS=*:S,OS=,,}
A_JAVA_PORT_VENDOR= ${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,}
-. if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE})
+. if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE})
__JAVA_PORTS_INSTALLED+= ${A_JAVA_PORT}
-. endif
+. endif
# Because variables inside for loops are special (directly replaced as strings),
# we are allowed to use them inside modifiers, where normally ${FOO:M${BAR}} is
# not allowed.
#
-. for ver in ${A_JAVA_PORT_VERSION}
-. for os in ${A_JAVA_PORT_OS}
-. for vendor in ${A_JAVA_PORT_VENDOR}
-. if ${_JAVA_VERSION:M${ver}} && ${_JAVA_OS:M${os}} && ${_JAVA_VENDOR:M${vendor}}
+. for ver in ${A_JAVA_PORT_VERSION}
+. for os in ${A_JAVA_PORT_OS}
+. for vendor in ${A_JAVA_PORT_VENDOR}
+. if ${_JAVA_VERSION:M${ver}} && ${_JAVA_OS:M${os}} && ${_JAVA_VENDOR:M${vendor}}
__JAVA_PORTS_POSSIBLE+= ${A_JAVA_PORT}
-. endif
-. endfor
+. endif
. endfor
. endfor
-
. endfor
-. if !defined(_JAVA_PORTS_INSTALLED)
+
+. endfor
+. if !defined(_JAVA_PORTS_INSTALLED)
_JAVA_PORTS_INSTALLED= ${__JAVA_PORTS_INSTALLED:C/ [ ]+/ /g}
-. endif
+. endif
_JAVA_PORTS_POSSIBLE= ${__JAVA_PORTS_POSSIBLE:C/ [ ]+/ /g}
@@ -365,27 +365,27 @@ _JAVA_PORTS_POSSIBLE= ${__JAVA_PORTS_POSSIBLE:C/ [ ]+/ /g}
. undef _JAVA_PORTS_INSTALLED_POSSIBLE
-. for A_JAVA_PORT in ${_JAVA_PORTS_POSSIBLE}
+. for A_JAVA_PORT in ${_JAVA_PORTS_POSSIBLE}
__JAVA_PORTS_INSTALLED_POSSIBLE+= ${_JAVA_PORTS_INSTALLED:M${A_JAVA_PORT}}
-. endfor
+. endfor
_JAVA_PORTS_INSTALLED_POSSIBLE= ${__JAVA_PORTS_INSTALLED_POSSIBLE:C/[ ]+//g}
-. if ${_JAVA_PORTS_INSTALLED_POSSIBLE} != ""
-. for i in ${_JAVA_PORTS_INSTALLED_POSSIBLE}
-. if !defined(_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit)
+. if ${_JAVA_PORTS_INSTALLED_POSSIBLE} != ""
+. for i in ${_JAVA_PORTS_INSTALLED_POSSIBLE}
+. if !defined(_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit)
_JAVA_PORT= $i
_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit= 1
-. endif
-. endfor
+. endif
+. endfor
# If no installed JDK port fits, then pick one from the list of possible ones
-. else
-. for i in ${_JAVA_PORTS_POSSIBLE}
-. if !defined(_JAVA_PORTS_POSSIBLE_shortcircuit)
+. else
+. for i in ${_JAVA_PORTS_POSSIBLE}
+. if !defined(_JAVA_PORTS_POSSIBLE_shortcircuit)
_JAVA_PORT= $i
_JAVA_PORTS_POSSIBLE_shortcircuit= 1
-. endif
-. endfor
-. endif
+. endif
+. endfor
+. endif
_JAVA_PORT_INFO:= ${_JAVA_PORT:S/^/\${_/:S/$/_INFO}/}
JAVA_PORT= ${_JAVA_PORT_INFO:MPORT=*:S,PORT=,,}
@@ -403,36 +403,36 @@ JAVA_PORT_OS_DESCRIPTION:= ${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/}
# Add the JDK port to the dependencies
DEPEND_JAVA= ${JAVA}:${JAVA_PORT}
-. if defined(_USE_JAVA_EXTRACT)
+. if defined(_USE_JAVA_EXTRACT)
EXTRACT_DEPENDS+= ${DEPEND_JAVA}
-. endif
-. if defined(_USE_JAVA_BUILD)
+. endif
+. if defined(_USE_JAVA_BUILD)
BUILD_DEPENDS+= ${DEPEND_JAVA}
-. endif
-. if defined(_USE_JAVA_RUN)
+. endif
+. if defined(_USE_JAVA_RUN)
RUN_DEPENDS+= ${DEPEND_JAVA}
-. endif
+. endif
# Ant support: default do-build target
-. if defined(_USE_JAVA_ANT)
+. if defined(_USE_JAVA_ANT)
DESTDIRNAME= -Dfreebsd.ports.destdir
ANT?= ${LOCALBASE}/bin/ant
MAKE_ENV+= JAVA_HOME=${JAVA_HOME}
BUILD_DEPENDS+= ${ANT}:devel/apache-ant
ALL_TARGET?=
-. if !target(do-build)
+. if !target(do-build)
do-build:
@(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
${ANT} ${MAKE_ARGS} ${ALL_TARGET})
-. endif
-. if !target(do-test) && defined(TEST_TARGET)
+. endif
+. if !target(do-test) && defined(TEST_TARGET)
TEST_DEPENDS+= ${DEPEND_JAVA}
TEST_DEPENDS+= ${ANT}:devel/apache-ant
do-test:
@(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
${ANT} ${MAKE_ARGS} ${TEST_TARGET})
-. endif
. endif
+. endif
#-----------------------------------------------------------------------------
# Stage 5: Define all settings for the port to use
@@ -445,9 +445,9 @@ do-test:
#. undef JAVAC
# Then test if a JAVAC has to be set (JAVA_BUILD==jdk)
-. if defined(_USE_JAVA_BUILD) && !defined(JAVAC)
+. if defined(_USE_JAVA_BUILD) && !defined(JAVAC)
JAVAC?= ${JAVA_HOME}/bin/javac
-. endif
+. endif
# Define the location of some more executables.
APPLETVIEWER?= ${JAVA_HOME}/bin/appletviewer