Attachment 183826 Details for Bug 220054 – diff -U10 of bsd.java.mk; potentially improved

[patch] diff -U10 of bsd.java.mk; potentially improved

bsd.java.mk.diff (text/plain), 3.00 KB, created by Kyle Evans on 2017-06-27 02:45:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2017-06-27 02:45:39 UTC

Size: 3.00 KB

patch

obsolete

>--- bsd.java.mk.orig	2017-06-26 21:29:27.365918000 -0500
>+++ bsd.java.mk	2017-06-26 21:40:41.656832000 -0500
>@@ -207,58 +207,44 @@
> .		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
> 
> # Error checking: JAVA_VERSION
> .if !defined(_JAVA_VERSION_LIST_REGEXP)
>-.	for v in ${_JAVA_VERSION_LIST}
>-.		if defined(_JAVA_VERSION_LIST_REGEXP)
>-_JAVA_VERSION_LIST_REGEXP:=		${_JAVA_VERSION_LIST_REGEXP}\|
>-.		endif
>-_JAVA_VERSION_LIST_REGEXP:=		${_JAVA_VERSION_LIST_REGEXP}$v
>-.	endfor
>+_JAVA_VERSION_LIST_REGEXP=	${_JAVA_VERSION_LIST:C/\+/\\+/:ts|}
> .endif
> 
>-
> 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
> .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}\|
>-.		endif
>-_JAVA_VENDOR_LIST_REGEXP:=		${_JAVA_VENDOR_LIST_REGEXP}$v
>-.	endfor
>+_JAVA_VENDOR_LIST_REGEXP=	${_JAVA_VENDOR_LIST:ts|}
> .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
> 
> # Error checking: JAVA_OS
> .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}\|
>-.		endif
>-_JAVA_OS_LIST_REGEXP:=		${_JAVA_OS_LIST_REGEXP}$v
>-.	endfor
>+_JAVA_OS_LIST_REGEXP=	${_JAVA_OS_LIST:ts|}
> .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
> 
> # Set default values for JAVA_BUILD and JAVA_RUN
> # When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre
> # (unless NO_BUILD is set)
> .		if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN)
> .			if !defined(NO_BUILD)
> JAVA_BUILD=	jdk
> .			endif

Actions: View | Diff

Attachments on bug 220054: 183541 | 183826 | 184305