From owner-svn-ports-all@freebsd.org Fri Jul 14 18:09:12 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ADB16DA93DE; Fri, 14 Jul 2017 18:09:12 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8A5CC70915; Fri, 14 Jul 2017 18:09:12 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6EI9Bdh002806; Fri, 14 Jul 2017 18:09:11 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6EI9BaI002805; Fri, 14 Jul 2017 18:09:11 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201707141809.v6EI9BaI002805@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 14 Jul 2017 18:09:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445802 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 445802 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2017 18:09:12 -0000 Author: kevans (src committer) Date: Fri Jul 14 18:09:11 2017 New Revision: 445802 URL: https://svnweb.freebsd.org/changeset/ports/445802 Log: Minor cleanup to Java version/vendor/OS validation - Use POSIX compliant expressions instead of employing GNU extensions (branching in BREs) - Simplify regex generation using make(1)'s :ts modifier PR: 220054 Approved by: bapt (portmgr) Modified: head/Mk/bsd.java.mk Modified: head/Mk/bsd.java.mk ============================================================================== --- head/Mk/bsd.java.mk Fri Jul 14 18:05:32 2017 (r445801) +++ head/Mk/bsd.java.mk Fri Jul 14 18:09:11 2017 (r445802) @@ -214,44 +214,30 @@ check-makevars:: # 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