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

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

java.diff (text/plain), 2.57 KB, created by Kyle Evans on 2017-06-16 17:56:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2017-06-16 17:56:36 UTC

Size: 2.57 KB

patch

obsolete

>Index: bsd.java.mk
>===================================================================
>--- bsd.java.mk	(revision 443611)
>+++ bsd.java.mk	(working copy)
>@@ -214,9 +214,9 @@
> 
> # Error checking: JAVA_VERSION
> .if !defined(_JAVA_VERSION_LIST_REGEXP)
>-.	for v in ${_JAVA_VERSION_LIST}
>+.	for v in ${_JAVA_VERSION_LIST:C/\+/\\+/}
> .		if defined(_JAVA_VERSION_LIST_REGEXP)
>-_JAVA_VERSION_LIST_REGEXP:=		${_JAVA_VERSION_LIST_REGEXP}\|
>+_JAVA_VERSION_LIST_REGEXP:=		${_JAVA_VERSION_LIST_REGEXP}|
> .		endif
> _JAVA_VERSION_LIST_REGEXP:=		${_JAVA_VERSION_LIST_REGEXP}$v
> .	endfor
>@@ -224,7 +224,7 @@
> 
> 
> check-makevars::
>-	@test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VERSION_LIST_REGEXP}" || \
>+	@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
> 
> # Error checking: JAVA_VENDOR
>@@ -231,13 +231,13 @@
> .if !defined(_JAVA_VENDOR_LIST_REGEXP)
> .	for v in ${_JAVA_VENDOR_LIST}
> .		if defined(_JAVA_VENDOR_LIST_REGEXP)
>-_JAVA_VENDOR_LIST_REGEXP:=		${_JAVA_VENDOR_LIST_REGEXP}\|
>+_JAVA_VENDOR_LIST_REGEXP:=		${_JAVA_VENDOR_LIST_REGEXP}|
> .		endif
> _JAVA_VENDOR_LIST_REGEXP:=		${_JAVA_VENDOR_LIST_REGEXP}$v
> .	endfor
> .endif
> check-makevars::
>-	@test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -q "${_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
> 
>@@ -245,13 +245,13 @@
> .if !defined(_JAVA_OS_LIST_REGEXP)
> .	for v in ${_JAVA_OS_LIST}
> .		if defined(_JAVA_OS_LIST_REGEXP)
>-_JAVA_OS_LIST_REGEXP:=		${_JAVA_OS_LIST_REGEXP}\|
>+_JAVA_OS_LIST_REGEXP:=		${_JAVA_OS_LIST_REGEXP}|
> .		endif
> _JAVA_OS_LIST_REGEXP:=		${_JAVA_OS_LIST_REGEXP}$v
> .	endfor
> .endif
> check-makevars::
>-	@test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -q "${_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
>

Actions: View | Diff

Attachments on bug 220054: 183541 | 183826 | 184305