Attachment 184363 Details for Bug 220737 – svn(1) diff of Mk/bsd.java.mk

[patch] svn(1) diff of Mk/bsd.java.mk

java-validate.diff (text/plain), 2.36 KB, created by Kyle Evans on 2017-07-14 20:05:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2017-07-14 20:05:05 UTC

Size: 2.36 KB

patch

obsolete

>Index: Mk/bsd.java.mk
>===================================================================
>--- Mk/bsd.java.mk	(revision 445802)
>+++ Mk/bsd.java.mk	(working copy)
>@@ -213,33 +213,39 @@
> .		endfor
> 
> # Error checking: JAVA_VERSION
>+.if defined(JAVA_VERSION)
> .if !defined(_JAVA_VERSION_LIST_REGEXP)
> _JAVA_VERSION_LIST_REGEXP=	${_JAVA_VERSION_LIST:C/\+/\\+/:ts|}
> .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})) || true
>+	@( 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
> 
> # Error checking: JAVA_VENDOR
>+.if defined(JAVA_VENDOR)
> .if !defined(_JAVA_VENDOR_LIST_REGEXP)
> _JAVA_VENDOR_LIST_REGEXP=	${_JAVA_VENDOR_LIST:ts|}
> .endif
> 
> check-makevars::
>-	@test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VENDOR_LIST_REGEXP}" || \
>+	@( 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})) || true
>+	${FALSE})
>+.endif
> 
> # Error checking: JAVA_OS
>+.if defined(JAVA_OS)
> .if !defined(_JAVA_OS_LIST_REGEXP)
> _JAVA_OS_LIST_REGEXP=	${_JAVA_OS_LIST:ts|}
> .endif
> 
> check-makevars::
>-	@test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_OS_LIST_REGEXP}" || \
>+	@( 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})) || true
>+	${FALSE})
>+.endif
> 
> # Set default values for JAVA_BUILD and JAVA_RUN
> # When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre

Flags:

koobs: maintainer-approval? (java)
koobs: maintainer-approval? (portmgr)

Actions: View | Diff

Attachments on bug 220737: 184363