From nobody Fri May 27 19:29:59 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 276991B509A7; Fri, 27 May 2022 19:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L8vyb54G4z4sh4; Fri, 27 May 2022 19:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653679799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0eLRyq4R5fdF7ASw6+ZQ+0RGllwCYnTMbz2TYJ6vjM=; b=iDHs5SW1AU/niD5rasp4i0Wdaatp0cAixmfPRUCzn9PUMSM1g7Pd9Po/wkAqgJ3hqB2K3k h9avK6PlI2/TWc9rlCztdQFDjYxpeWvP44vKivayLmFQ92kZujEM8XY4rgwtjrv0O4YDEN cMrqQJLdnmKAAR6kC10TixR63G3b1qAgaSn7aQL5fTe5Ly0+DiXkSUzoJwPM2sR2ti1riy FAFR7Qj79sE2zlwde5oKNr40DjZzHDAfoo+mcu5c+2lXacsn5/OT97E/rwqlKoKe2iKI4E 7IuVsSvE2UtH3TPgGuLNO6tyXmh6Rxh+MQXptqB2DYvqJgoH3pn3I+QnZTVmjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7CEEA28613; Fri, 27 May 2022 19:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24RJTxDx040680; Fri, 27 May 2022 19:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24RJTxjv040679; Fri, 27 May 2022 19:29:59 GMT (envelope-from git) Date: Fri, 27 May 2022 19:29:59 GMT Message-Id: <202205271929.24RJTxjv040679@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 31235d9fe681 - main - lang/njs: add flavors List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31235d9fe681424e39052d635b27b552f00c3963 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653679799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0eLRyq4R5fdF7ASw6+ZQ+0RGllwCYnTMbz2TYJ6vjM=; b=wUeolPOfrnb/l1uTHk2x1qL8qcKw7XdXEjIBScAArw0rOhUERllJHbsvOWR/WIneR/cHHM LJn3RE3ZoxELkRZTn4I05LM1eCAViUarSkAkQTeV49LUbH8UCBo6E6iJrPJLjX+/TX6YMj xV+SOYVcD+sNyw40WuwrE2DIvckVHt0yo+fLtJXHFdmqMZbHfs8DgmVHMN6uFheHJRb5LF 5VMsjEHJn0tgOcM7LvgQXVPBmhBS9kPzB/KrdOaAvAzg9xhSl8xbGHG5Nr/U7SR1aZbk7b 62C81ITErJDY35SRBlPF3UopIg8+WZMsjNRxzesQ8kuLRWpcZjwYrBZbpWqB0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653679799; a=rsa-sha256; cv=none; b=kR4mdFsoc5faaA315tcUkM7rjr6k4oYleNWl/f95lpeZL31ujuhoOkkeuIZxkUl/i0de+i rdlAICe3aNsHEsH5dKk36b98DOzWQpe/76oqLvbyIQcryZnl3hCRpikuyhKGHulz6lW2oa tXYZajAj/qbS8LlcFt7fTq+DxdOFazVt9B7nY8OJsLyVqtBgknXbsQXJsECYomAa8TcCB0 M5HhUDKsMjqGF+6SiL8ikhY7+blfnYa2R9xW3x+AW4MYSeST6J/Sid5dH27Y77P01RTlnT 12ekVFxNa34FJsREC4m7/0tVv47Z+12tv/ZvrrtfLNhT69oVl/3jOlH7D+P9Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=31235d9fe681424e39052d635b27b552f00c3963 commit 31235d9fe681424e39052d635b27b552f00c3963 Author: Sergey A. Osokin AuthorDate: 2022-05-27 19:28:26 +0000 Commit: Sergey A. Osokin CommitDate: 2022-05-27 19:29:54 +0000 lang/njs: add flavors Build both flavors (pcre and pcre2) for NGINX JavaScript command-line tool. Bump PORTREVISION. --- lang/njs/Makefile | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/lang/njs/Makefile b/lang/njs/Makefile index 9eec92d2b98a..383deb57faef 100644 --- a/lang/njs/Makefile +++ b/lang/njs/Makefile @@ -2,6 +2,7 @@ PORTNAME= njs DISTVERSION= 0.7.4 +PORTREVISION= 1 CATEGORIES= lang www MAINTAINER= osa@FreeBSD.org @@ -18,21 +19,23 @@ USE_GITHUB= yes GH_TUPLE= nginx:njs:${DISTVERSION} HAS_CONFIGURE= yes -OPTIONS_DEFINE= SSL -OPTIONS_RADIO+= PCRE -OPTIONS_RADIO_PCRE= NOPCRE PCRE_ONE PCRE_TWO -NOPCRE_CONFIGURE_ON= --no-pcre -PCRE_ONE_LIB_DEPENDS= libpcre.so:devel/pcre -PCRE_ONE_CONFIGURE_ON= --no-pcre2 -PCRE_TWO_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 -OPTIONS_DEFAULT= PCRE_ONE SSL -SSL_CONFIGURE_OFF= --no-openssl -SSL_USES= ssl - -NOPCRE_DESC= Disable PCRE support -PCRE_ONE_DESC= Enable PCRE1 support -PCRE_TWO_DESC= Enable PCRE2 support -SSL_DESC= Enable OpenSSL support +FLAVORS= pcre pcre2 +FLAVOR?= ${FLAVORS:[1]} + +pcre_PKGNAMESUFFIX= +pcre2_PKGNAMESUFFIX= -pcre2 + +pcre_CONFLICTS_INSTALL= ${PORTNAME}-pcre2 +pcre2_CONFLICTS_INSTALL= ${PORTNAME} + +USES= ssl + +.if ${FLAVOR} == pcre +LIB_DEPENDS= libpcre.so:devel/pcre +CONFIGURE_FLAGS+= --no-pcre2 +.else +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 +.endif PLIST_FILES= bin/njs